From 07aab1078e26405382d3d427c2ac6a78a3eaead4 Mon Sep 17 00:00:00 2001 From: Dima Uryvskiy Date: Mon, 16 Aug 2021 11:14:53 +0300 Subject: [PATCH] Delete option 'Do not transmit the cost of delivery' --- resources/pot/retailcrm-es_ES.pot | 3 --- resources/pot/retailcrm-ru_RU.pot | 3 --- .../class-wc-retailcrm-abstracts-settings.php | 9 --------- src/include/class-wc-retailcrm-history.php | 4 +--- src/include/class-wc-retailcrm-orders.php | 8 +------- src/languages/retailcrm-es_ES.mo | Bin 8417 -> 8331 bytes src/languages/retailcrm-ru_RU.mo | Bin 10339 -> 10216 bytes 7 files changed, 2 insertions(+), 25 deletions(-) diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot index 5714022..e845cea 100644 --- a/resources/pot/retailcrm-es_ES.pot +++ b/resources/pot/retailcrm-es_ES.pot @@ -226,9 +226,6 @@ msgstr "Activar la transferencia de números en Simla.com" msgid "Transferring the order number" msgstr "Transferencia de un número de pedido" -msgid "Do not transmit the cost of delivery" -msgstr "No transferir el costo de envío" - msgid "Corporate customers support" msgstr "Soporte a clientes corporativos" diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot index 7ac7369..bb47344 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -235,9 +235,6 @@ msgstr "Активировать передачу номера в Simla.com" msgid "Transferring the order number" msgstr "Передача номера заказа" -msgid "Do not transmit the cost of delivery" -msgstr "Не передавать себестоимости доставки" - msgid "Corporate customers support" msgstr "Поддержка корпоративных клиентов" diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php index 7fd2e60..d551ffe 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -124,15 +124,6 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration 'id' => 'api_options' ); - $this->form_fields['send_delivery_net_cost'] = array( - 'title' => __( 'Do not transmit the cost of delivery', 'retailcrm' ), - 'label' => ' ', - 'description' => '', - 'class' => 'checkbox', - 'type' => 'checkbox', - 'desc_tip' => true - ); - $this->form_fields['corporate_enabled'] = array( 'title' => __('Corporate customers support', 'retailcrm'), 'label' => __('Enabled'), diff --git a/src/include/class-wc-retailcrm-history.php b/src/include/class-wc-retailcrm-history.php index 252dbe9..52a4862 100644 --- a/src/include/class-wc-retailcrm-history.php +++ b/src/include/class-wc-retailcrm-history.php @@ -287,9 +287,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) : $shipping->set_total($order['delivery']['cost']); } - $activeNetCost = $this->retailcrmSettings['send_delivery_net_cost']; - - if (isset($order['delivery']['netCost']) && wc_tax_enabled() && $activeNetCost != 'yes') { + if (!empty($order['delivery']['netCost']) && wc_tax_enabled()) { $shipping->set_total($order['delivery']['netCost']); } diff --git a/src/include/class-wc-retailcrm-orders.php b/src/include/class-wc-retailcrm-orders.php index d176461..11f6586 100644 --- a/src/include/class-wc-retailcrm-orders.php +++ b/src/include/class-wc-retailcrm-orders.php @@ -363,13 +363,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) : $order_data['delivery']['cost'] = $shipping_cost; } - $activeNetCost = null; - - if (isset($this->retailcrm_settings['send_delivery_net_cost'])){ - $activeNetCost = $this->retailcrm_settings['send_delivery_net_cost']; - } - - if ($shipping['total'] && $activeNetCost != 'yes') { + if (!empty($shipping['total'])) { $order_data['delivery']['netCost'] = $shipping['total']; } } diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index 0af69857184e0fc054d14dae903c854c4a58477b..192eaa75b89cbab31d967063124ee1e7e19967dc 100644 GIT binary patch delta 1911 zcmYk+TZmOv7zgm>WX+6e>P$I0**I3FHIC-}GEO#{d6`kOOfyI!5upbkD(FG$5QJ$L zutcBiAxXRtJv8)`A_d)E?4dvk2`9pc270OxBl`W%IRh=`+rPEf>~q#y-}?3$>U*=V z@>9#`V@2C8ri$+yN~!Rzn_aX+jivZ2hh4_-9ggJ*-paF_z)v`ZU)IO3@^1ITT*mQD zr3`RA^Zaq%k*QAW+-cwf^MN1g5B$S?;kf2f+BuUGxr$lHR^G;4oX&mB_Z(p+{E)MG zjnA>whr0L*t*M;joNV=DolG>uEZ_#0u*3E?aU0usidp#uj^ibc=M^R+!}a^?%=66# z@8fjN;W~EnC1##eoS#&Gt&=aj!A#KXCbl!GZT+? zNwKwa8W(d0x6vBQf%^a7W-@k`S>Pp_stncd|4jbxH_&8TS^0c!;4aSPIX=%HIgcAv zRu)*{3ckTC;441BU%7-WcJnwlFdKP~+3`gtBi}Nas9e#>8UJ1%xK4AGCa**mFpZ13 znag>Qndmca;xO%@^ms?Jvn|a19%e)P`4rEvgQKKPw{%jbDy2s!D;}r~l-HQzImSI4 zq~k49lyKhLE@q+y%=lWScz4j|%WkIF_A}M~I+M90bb94;KElhazW-Crw#`64ALU8r zEPrFFcf4gMLoM`~(#iZd_A;4T%@ps`OlDr@GM=Hem!G+U|1w9>-`bd9_?*xTeQ4>yNLPa%NvlkQltobb5n1tn8I!wJlxpUF!)9D M$+3fnChZvWAHejR*8l(j delta 1997 zcmYk+U2IfE7{>7z3iQJYrMBHdt(-!u*e^<@w8ggAf`|xRr9gp1;|E(>#GbfaHo>SX zcbZ<9W@7?LNhl3?Q=?>2LwYA6gb*(p0*0m{4GG40W5o+DwDJF(GbBuQ&Tr=I*)ucm zytBidvz@6sg^Rv2%6{t8)R~25DI8tQg>o|6jE|k-l80lMj}!O=Ucv&rf-CTryZ;xi zrvERt;;J08op=EC{COa4Gs&fuCX} zo{ZbOg6!4Q4P~OZ|;TJvV+wt)PTuX(A2Sj6K+m!x+J7)C&H_Cozj~ zEW_o<$0}UE9`$?&K8yQM<9vd3IDxAb>S-E{_#f(p4O}!phck-0|2CHmIEaNfjz#zb z^0Dh&G{9}t?{k)h&#k~$>DQvRIEe(=(wNce;SoUe_{-CNny6xeB{5yPM`+*!recOO5$&kVAv&8(oLbV{#R7w?qiY8 ze<^R@%8fcya>a2Uj^Q?Zh}zT5OjlVPLq(_`d50xYf0k)fq)wrd_&Zc&ZeT0UBWti0 z_NNW^U{f7OwfF7Rl#)V4q3Q`*VYqkD*1wjD!u6=sxW>y)g;qsdw~4xo+Dm1zLDBKv zNmT?N7483?u#*bd%+;gj1wFIZP@&_L1tC*{DuhZP6@~rrqU}&f*HHDxqwP~sUMMNG zttw4aZHc+BS^FE*IG{EeSkUve<-f5Jk$m;e9( diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 9496683f35fc672a79103bfad4c47f75a78c01fc..84ba1a690ea481403445cae7fa7acd77a11db1b8 100644 GIT binary patch delta 1955 zcmY+_TZmOv7zgmBUB+f=yiGZllb6Y|bjH!Vr)gT2llMw<%D^r{iDV>35}kTVuml@~ zE|fha6-h>dY4(s9A*2ZrK|vyxIOX=NKnaSEq% z6&JFX12WY~oy*<$l~=LhlG+#A>47qznP4Ta2l*7JK14dnecvQ<(s&euW|^_Fbhi>F2g|f=WzO0#@DZBGS4q$ z#(9|6@&#s|57?1Z|4@IR$!HT@cQOO7@sWuhulrp6{&r4seNU9@pMl~>tHNi5q2$bWYDnvaY5K6Az&@d_SeQuh-_u))Dk;}}|7S;J0lV4mN} zY+xS`@+h?!GGR*U>A*wStL8DKfhRUYN_+{_fy+e~qN#yfe6H?q@g z5Ai`h$uHQ>83xP39^lP+j?F5}a@gJ0HdanL#Q)tt>;+{n{R279iq?fe-Uw^H8H$;yr}JNt`c`H1ajqV2SX z@(FL_x6BTQji?RS!Ixbx;S8Rl<1KAw%lEpNR4-(TdIJY@Gn@1NZ>x4nd4t)>Ze{_0 za4kowz@%&oxAG95=OUvfbH~}2e>27R4?R)_do{9T*DT!?;wG_JWV6VF_feX^1>&W}>gK0iWBgj)Px^D|Ip2`5uM;(M7R zYst^pQXQOcIlHu^c&=EP3oUQQ^4BWK35kl>QY~9x+q5s8t}i}l z+X!CT#8TrW(P+FO3ErEwQL08~6HU|@qtT>QU)n^{G)P$54$@G6P#H>tFTjs5i2A`)QX@uT(#wl834Eq8mzZ3f3bZvzspsbkMWQYrlfiXuplA z7$6O4I1*_xA6_t{v1ZD?!HA5dWz%-^UE{47IT5=63S@=$-D;aP$jpaLgj z4JzeZF%OU7IJ}QF=x6l#xCS$EKl<^Ghm}S*ovA^2Ts5f zsKay*b;x?L5`&B~73;Ac_h2jjgQGD*XPQ_$7U54g8+{xI^&hsW=*BA4jm@Y5_n{8o zHO#`NxE%ZPOwGepI2Su`6F$aTtl~#M;1Mjv3eu>7zQXC)fh+J17N9+mWzD2gi(lYQ zoQOj>7~Erukg?5b)P$N*d%MkR@5J$3U&m^Ei3_ltjh5e__WmvwqxCka$F)c%ZF7f; zGVm9w;}I-ZGb=@{EQ-1K2sKc$mDq|xR3@rXE8K(Hn#0(J*Kju0(Wt%u7FnA)iW=`K z2K4;DpfZGpUesXJa{d#f)$Mq!Px^n8cnn;cBi=V+fOZTU22Y>Wpkhb$lMHeY}!U9gikG>UcWR z>`rDH@)WvzUx|GPl|q8x^`k~AA2e9?k=Cdc*=TKO*xdMOL(Au#_X3pz%f5HIEa$S*75~!da?Us>ozu?A u_?Gx~D;}fa6n}`tw>X!aZs&q?$*p%=+?S~8?sHCe`{T6Xo#FIjDgOawQ0t=r