From 540564b5f93f34a69a9864c1b4c4f39b0950a967 Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 22 Apr 2019 15:07:14 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=B2=20retailCRM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ VERSION | 2 +- resources/pot/retailcrm-es_ES.pot | 4 ++-- resources/pot/retailcrm-ru_RU.pot | 4 ++-- .../class-wc-retailcrm-abstracts-settings.php | 2 +- .../class-wc-retailcrm-order-payment.php | 2 +- src/languages/retailcrm-es_ES.mo | Bin 6248 -> 6252 bytes src/languages/retailcrm-ru_RU.mo | Bin 7708 -> 7713 bytes src/readme.txt | 3 +++ src/retailcrm.php | 2 +- src/uninstall.php | 2 +- 11 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9c272..e8b4c81 100644 --- 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 index d5c0c99..87ce492 100644 --- 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 index d8b64b9..034c141 100644 --- 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 index 5da055c..49f83db 100644 --- 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 index 9737e0a..45bde07 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -459,7 +459,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration ); $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 index da836ee..7b0133e 100644 --- a/src/include/order/class-wc-retailcrm-order-payment.php +++ b/src/include/order/class-wc-retailcrm-order-payment.php @@ -52,7 +52,7 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data 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 index 6eb92d7d6f430d62d9dd80333ed3943b4342e6b5..ab3f8c43638c9d5d739c087002577291c8adf05d 100644 GIT binary patch delta 1051 zcmXZbOK1~O6vpurlQD_48m%@)+i0t8w5@%B6{8g?rWU1kQ6Cj`lVXGsRIu47!RbZ> zg`!SZK5!?91<`CP7DNScD}tp9K|wGsiXd1J{C~|rnBTc`=iWK@%*l`LO81>9ugT1u zs96>>*nxSxfRoscf3Xu=VrD5kjtzJT_u*|E#`l=O`nXvwW^gt3;z}F{#v_T2R6c^pPUiEEYp%ACRSXfcg^J5NiEtPM*kU*jh9J`uDKETA$@a?!+gR0VRVlDoJAOLzpIU>7dn6>M5#)`L^nhwpGRhFRQ( zTT#6-j3ampd8KFb1Uktt)Cm?*CyLiq$4OKrT5&h-$GuoYo#c7oTU4dy@D#>qkTm9T zBTgW>+JnGpY~=m+ilD&69Fny4vnvg6$57)lsBXQ8`nESv&2$%g@IJECK4K2PVkfqe z^+`N|hj1EI>EEbcNwI0|S%L-vb!i(qIEXxBM^Vjk4pqXNsK4n;)F-MS@3I&lTF<9Z z73f9v%9!s)e(D5EX=z5Q4*CUWFqH6LICbS&XCM^Lx#Q(%v>1=%3gh{5DN%|32glB3 AN3oJ>$uc zx&Jr5%8diuD54g=Lv8fQ8~?x_##^?T)nW>F;VA0)4C?u5Z{EdW#tW!K-y^x%Z;YV7 zvOJDfy5*pS8``KHyD){Vm_sF&$2MHT3H*oy*w3+Icpd$CADOa;sDvKlR$Rh5T*f%A zV>AA72~q?x-o69JQ5j}Y3udtc7my;@OPukUtsqP72=yhjQPlb~$j@?IqId;4w9R7+ zK0xjN0{5W1O0bXMJ1XNkE}CdVRUnNjc@7geizE05yYMSs##oJ666f#`E@Kn^#dd6B z6ZOgnp2XY8D_vVB&`Ca{PVf_TA}3rPhf$S?<3a4jKD>lF$rI1ls7kHjX$;UHjd%_l z@EVe<-SaGBjQ87ff-DnjNV0aAU1@kbff`Ssx^)WmZEvEQDUV6Ki!8ObIEWvx6XRq( zj$?Qfi>OL}L-k68O{>llLOV diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 3bf2649bb95e57b9b53b5050c7805bfda7d55f14..8c3749c34b24eca39802dbbec250854791ba998c 100644 GIT binary patch delta 1097 zcmXZaUr1AN6u|K_^}43Ewx(%i*eYr@by+=FtbbGdQ!$i;O2LYtoIw~BJ>?}zM2s43 zL4qx$Am}Msy-86IJ%q)G3(`|W=z~@aMA(B5eGm6OeSUxLJ-_oizcU$~iY6z`poqlX zA_s8@>+v-X;v9xCwnpRtUc*LwfgABV*5V(GqsJrS!?U;+6Sxjn^E6g7f9VlZ zwlSDtK?DE92K1KM0ivh@PdM{F)I<`v9y3^p)6V{9)bA~4e;zxT7f=(8m5Y$8oX090 zC^zkeVP|6$HS;7!FoQer8){<9xC?_^=L~k@ah$>}_#2DRMG!uf64ZozSc*a1gdyC3 zEhYo4Kre2^JJ^gF^x_<9rVFS)tYSR|*rZr;3~#!q5OTJBpx(Ti%%Xm8p(e0|yKxma z<4zV&q8VebpTR@ij-Rj*7w`~P`RxE*sQVXD_eZb}-{NVs@G6FQmp)A6bIfB4CIfbl zS=hte%e(F6e7VFxZ=A+q{EAwlQ(Rk{%mQ^JD;^Ao75v;P4=%pQt=a?^nT3J|bno);YgRw@FjB>Q)W4pEL^*g;~^ zub{wD*(vA{>=01|9i%`)V&O3=+M#x_Jamwv_ow|%ukWAV@A*E@^Zh=G&O~p`WP@fl zRAV-P7ch)Z@C+_u2;;S8`|uq0;Vf>z57>zn9Ku?^Su>7cBaUMeUd9HTa_0`VGk@&2 ztZifPk_83+guU2UR}F9g6)@$_kE0S9#{d?v4WGIDbExl2?*2DSG5?K9G+s}Vn89^; zx;|T7xaMw5p)$|oZYeg7B%WLM7CMYcPl#u^ZRp z!7KxHU=)LR6(d-{wYZ4Nw2b;;1;ZF%lV({AFL|gEIon>-Z*I-zQQwzP3H-oaxPqH- z2a88A8)vYW!AdQ7)c|SK{t4864!2+t(^$d@?BZU=Fpm$gf(e{%t-i4Z zJjUG5z4ddxWf-X9JWk>}REv_7tw(Ya_1LbUT7Sn~e}y}lf5c(@gM*l+>?Gd9t@s)B zpO;`9Xg#Pz$1ueC_LhMHEu&h~*-@=Hf(nqr+c<&h$X}!=8z3un Date: Thu, 25 Apr 2019 15:10:57 +0300 Subject: [PATCH 2/7] fix calculate_discount --- woocommerce-module | 1 + 1 file changed, 1 insertion(+) create mode 160000 woocommerce-module diff --git a/woocommerce-module b/woocommerce-module new file mode 160000 index 0000000..51a9ab3 --- /dev/null +++ b/woocommerce-module @@ -0,0 +1 @@ +Subproject commit 51a9ab380531935ada9f02daece91356bfe59f09 From 901af9b7673113ca7a0a0cbd3d16d5fc449799d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D1=83=D0=B3=D0=BB=D0=BE=D0=B2=20=D0=94=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Thu, 25 Apr 2019 15:24:16 +0300 Subject: [PATCH 3/7] fix calculate_discount --- src/include/order/class-wc-retailcrm-order-item.php | 2 +- woocommerce-module | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 160000 woocommerce-module diff --git a/src/include/order/class-wc-retailcrm-order-item.php b/src/include/order/class-wc-retailcrm-order-item.php index 42e71aa..950053a 100644 --- a/src/include/order/class-wc-retailcrm-order-item.php +++ b/src/include/order/class-wc-retailcrm-order-item.php @@ -104,7 +104,7 @@ class WC_Retailcrm_Order_Item extends WC_Retailcrm_Abstracts_Data */ private function calculate_discount(WC_Order_Item_Product $item, $price) { - $product_price = $item->get_total() ? $item->get_total() / $item->get_quantity() : 0; + $product_price = max(0, round($item->get_total() ? $item->get_total() / $item->get_quantity() : 0)); $product_tax = $item->get_total_tax() ? $item->get_total_tax() / $item->get_quantity() : 0; $price_item = $product_price + $product_tax; $discount_price = $price - $price_item; diff --git a/woocommerce-module b/woocommerce-module deleted file mode 160000 index 51a9ab3..0000000 --- a/woocommerce-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51a9ab380531935ada9f02daece91356bfe59f09 From 37d8eb660ba839f6f2216360697fabfde7b414c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D1=83=D0=B3=D0=BB=D0=BE=D0=B2=20=D0=94=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Thu, 16 May 2019 12:05:56 +0300 Subject: [PATCH 4/7] fix price in calculate_discount --- src/include/order/class-wc-retailcrm-order-item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/order/class-wc-retailcrm-order-item.php b/src/include/order/class-wc-retailcrm-order-item.php index 950053a..210cb08 100644 --- a/src/include/order/class-wc-retailcrm-order-item.php +++ b/src/include/order/class-wc-retailcrm-order-item.php @@ -107,7 +107,7 @@ class WC_Retailcrm_Order_Item extends WC_Retailcrm_Abstracts_Data $product_price = max(0, round($item->get_total() ? $item->get_total() / $item->get_quantity() : 0)); $product_tax = $item->get_total_tax() ? $item->get_total_tax() / $item->get_quantity() : 0; $price_item = $product_price + $product_tax; - $discount_price = $price - $price_item; + $discount_price = max(0, round($price)) - $price_item; return $discount_price; } From f8d1febe47a4ee33c14fb60233aced2cf34ac185 Mon Sep 17 00:00:00 2001 From: kolyasapphire Date: Thu, 6 Jun 2019 18:33:18 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0?= =?UTF-8?q?=D1=82=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=BE=D0=B2=20=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=80=D0=BE=D0=B2=20=D0=B2=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wc_attribute_taxonomy_name_by_id принимает int, необходим intval. --- src/include/class-wc-retailcrm-icml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/class-wc-retailcrm-icml.php b/src/include/class-wc-retailcrm-icml.php index f06e6b0..5ef9357 100644 --- a/src/include/class-wc-retailcrm-icml.php +++ b/src/include/class-wc-retailcrm-icml.php @@ -345,7 +345,7 @@ if ( ! class_exists( 'WC_Retailcrm_Icml' ) ) : $product_attributes = array(); foreach ($attribute_taxonomies as $product_attribute) { - $attribute_id = wc_attribute_taxonomy_name_by_id($product_attribute->attribute_id); + $attribute_id = wc_attribute_taxonomy_name_by_id(intval($product_attribute->attribute_id)); $product_attributes[$attribute_id] = $product_attribute->attribute_label; } From 36d973dbaef5ee8ade04f087f381e6ed84f26c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D1=80=D1=83=D0=B3=D0=BB=D0=BE=D0=B2=20=D0=94=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Fri, 7 Jun 2019 16:51:18 +0300 Subject: [PATCH 6/7] fix discount calculation --- src/include/order/class-wc-retailcrm-order-item.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/order/class-wc-retailcrm-order-item.php b/src/include/order/class-wc-retailcrm-order-item.php index 210cb08..96404e2 100644 --- a/src/include/order/class-wc-retailcrm-order-item.php +++ b/src/include/order/class-wc-retailcrm-order-item.php @@ -104,12 +104,12 @@ class WC_Retailcrm_Order_Item extends WC_Retailcrm_Abstracts_Data */ private function calculate_discount(WC_Order_Item_Product $item, $price) { - $product_price = max(0, round($item->get_total() ? $item->get_total() / $item->get_quantity() : 0)); + $product_price = $item->get_total() ? $item->get_total() / $item->get_quantity() : 0; $product_tax = $item->get_total_tax() ? $item->get_total_tax() / $item->get_quantity() : 0; $price_item = $product_price + $product_tax; - $discount_price = max(0, round($price)) - $price_item; + $discount_price = $price - $price_item; - return $discount_price; + return round($discount_price, 2); } /** From 1fb010e4214926241972b664063833727199bec7 Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Mon, 1 Jul 2019 11:51:12 +0300 Subject: [PATCH 7/7] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 87ce492..444877d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.2 +3.5.3