Merge pull request #99 from Neur0toxine/master

Исправлена ошибка передачи заказов в retailCRM
retailcrm · May 7, 2019 · c51fb0f · c51fb0f
2 parents b7760f2 + 540564b
commit c51fb0f
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2019-04-22 3.5.2
+* Исправлен баг с выгрузкой заказов в retailCRM
+* Исправлена ошибка переводов
+
 ## 2019-04-16 3.5.1
 * Исправлен баг при активации плагина
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.5.1
+3.5.2
diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot
@@ -202,8 +202,8 @@ msgstr "Active esta configuración para activar Daemon Collector en la página w
 msgid "Site key"
 msgstr "Clave de la página web"
 
-msgid "Enable data editing in retailCRM"
-msgstr "Activar edición de datos en retailCRM"
+msgid "Disable data editing in retailCRM"
+msgstr "Desactivar edición de datos en retailCRM"
 
 msgid "Data updating in retailCRM"
 msgstr "Actualización de datos en retailCRM"

diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot
@@ -211,8 +211,8 @@ msgstr "Активируйте эту настройку для активаци
 msgid "Site key"
 msgstr "Ключ сайта"
 
-msgid "Enable data editing in retailCRM"
-msgstr "Активировать редактирование данных в retailCRM"
+msgid "Disable data editing in retailCRM"
+msgstr "Деактивировать редактирование данных в retailCRM"
 
 msgid "Data updating in retailCRM"
 msgstr "Обновление данных в retailCRM"

diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
@@ -459,7 +459,7 @@ public function init_form_fields()
                 );
 
                 $this->form_fields['deactivate_update_order'] = array(
-                     'label'       => __('Enable data editing in retailCRM', 'retailcrm'),
+                     'label'       => __('Disable data editing in retailCRM', 'retailcrm'),
                      'title'       => __('Data updating in retailCRM', 'retailcrm'),
                      'class'       => 'checkbox',
                      'type'        => 'checkbox'

diff --git a/src/include/order/class-wc-retailcrm-order-payment.php b/src/include/order/class-wc-retailcrm-order-payment.php
@@ -52,7 +52,7 @@ public function __construct($settings)
     public function build($order, $externalId = false)
     {
         $data = array(
-            'amount' => $order->get_total()
+            'amount' => (double) $order->get_total()
         );
 
         if (!$this->is_new) {

diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo
diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo
diff --git a/src/readme.txt b/src/readme.txt
@@ -46,6 +46,9 @@ API-ключ должен быть для отдельного магазина
 
 == Changelog ==
 
+= 3.5.2 =
+* Исправлен баг с выгрузкой заказов в retailCRM
+
 = 3.5.1 =
 * Исправлен баг при активации плагина
 

diff --git a/src/retailcrm.php b/src/retailcrm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Version: 3.5.1
+ * Version: 3.5.2
  * WC requires at least: 3.0
  * WC tested up to: 3.5.5
  * Plugin Name: WooCommerce RetailCRM

diff --git a/src/uninstall.php b/src/uninstall.php
@@ -15,7 +15,7 @@
  *
  *
  * @link       https://wordpress.org/plugins/woo-retailcrm/
- * @version    3.5.1
+ * @version    3.5.2
  *
  * @package    RetailCRM
  */