From 415c2edf0ef24cafbc0abeb30ce7284cb0708be6 Mon Sep 17 00:00:00 2001 From: Dima Uryvskiy Date: Wed, 2 Dec 2020 12:36:32 +0300 Subject: [PATCH] Delete option 'Transferring the payment amount' --- resources/pot/retailcrm-es_ES.pot | 4 ++-- resources/pot/retailcrm-ru_RU.pot | 3 --- .../class-wc-retailcrm-abstracts-settings.php | 9 --------- .../class-wc-retailcrm-order-payment.php | 11 ----------- src/languages/retailcrm-es_ES.mo | Bin 6959 -> 6963 bytes src/languages/retailcrm-ru_RU.mo | Bin 8713 -> 8616 bytes .../order/test-wc-retailcrm-order-payment.php | 4 ---- tests/test-wc-retailcrm-orders.php | 7 +------ 8 files changed, 3 insertions(+), 35 deletions(-) diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot index 0ba0ccb..4b9533b 100644 --- a/resources/pot/retailcrm-es_ES.pot +++ b/resources/pot/retailcrm-es_ES.pot @@ -235,8 +235,8 @@ msgstr "Activar la transferencia de números en retailCRM" msgid "Transferring the order number" msgstr "Transferencia de un número de pedido" -msgid "Transferring the payment amount" -msgstr "Transferencia de un monto de pago" +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 a632a47..c7a380d 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -244,9 +244,6 @@ msgstr "Активировать передачу номера в retailCRM" msgid "Transferring the order number" msgstr "Передача номера заказа" -msgid "Transferring the payment amount" -msgstr "Передача суммы оплаты" - msgid "Do not transmit the cost of delivery" msgstr "Не передавать себестоимости доставки" diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php index 95b3173..af8c6d3 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -129,15 +129,6 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration 'id' => 'api_options' ); - $this->form_fields['send_payment_amount'] = array( - 'title' => __( 'Transferring the payment amount', 'retailcrm' ), - 'label' => ' ', - 'description' => '', - 'class' => 'checkbox', - 'type' => 'checkbox', - 'desc_tip' => true - ); - $this->form_fields['send_delivery_net_cost'] = array( 'title' => __( 'Do not transmit the cost of delivery', 'retailcrm' ), 'label' => ' ', diff --git a/src/include/order/class-wc-retailcrm-order-payment.php b/src/include/order/class-wc-retailcrm-order-payment.php index 7c9da2e..24657e3 100644 --- a/src/include/order/class-wc-retailcrm-order-payment.php +++ b/src/include/order/class-wc-retailcrm-order-payment.php @@ -53,10 +53,6 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data $this->reset_data(); $data = array(); - if (!empty($this->settings['send_payment_amount']) && $this->settings['send_payment_amount'] === WC_Retailcrm_Base::YES) { - $data['amount'] = (double) $order->get_total(); - } - if (!$this->is_new) { $data['externalId'] = $externalId; } else { @@ -105,12 +101,6 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data return array(); } - if (!empty($this->settings['send_payment_amount']) - && $this->settings['send_payment_amount'] === WC_Retailcrm_Base::NO - ) { - unset($data['amount']); - } - return $data; } @@ -118,7 +108,6 @@ class WC_Retailcrm_Order_Payment extends WC_Retailcrm_Abstracts_Data { $this->data = array( 'externalId' => '', - 'amount' => 0.00, 'type' => '', 'status' => '', 'paidAt' => '', diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index 31cf39da0c4bf50adc28f3d375e127750d39081c..3484bb0e20175af7624f7a083e64ab19f2d1e3fe 100644 GIT binary patch delta 1524 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 t@5STxOHet&lga=9 delta 1891 zcmXxkeN4?!9LMn!=^`abl!tyE5-Ld-c}((@5>Yb`|HST1T4lM6dAQ|aX8o73`HPKt zm?2B1xfmNZHh$Oeho|WuTlj}zW;5QO-~HXQ&hK@8zwSA|bH3+$eiuuQEe?K2jy+*0 zmDEwxbA60yz?^pzgD91Qy^pEXO2l!eQ8g>VFdR zjR~5wG)D5^6{^EGREL!Qk%2QYo%u>_L;cV={9Q=&iaQFaYvhg4?q`8V- zyopos3#RdYlg_fVaxYe3C29g^FafXQV7!N#`E&RF9S-OID{A7gEPo`q9sB_)> z64!F%&s1~C!z~z82#?dq#aoz#pKu)}67OR4<7m8y8TbfE6Y~j~v*|@m@F$WMCXR4v z%MvgZC!r!#gcfebLOe8>_|wOPc%T_SMRn-G9Q=)JlgVWCKn$}+7HiH8iR|fh)bG1d z6R>eI_Mmbqo^X|678c+R9FG@pDn3mn{>t7zJXnJ%LycL0wKxaQqXzClb^MO%n9BYr z5=(F``fv$$V?F-EjabjBPUB-N!CGdk@h+p1HWZ{$MdKGv!!j~Tq1lHAunQGRFK3FT zS%sQ#Eo!S;-RGBZ68HD95P1N;5WzEE)Rr%g7&Pl>Xoh~&3$LLc z-(n#y8p9dKz1WH#;ywkBp(b_%m5lFEIrI^gY`;(wNV6ijl!Hawug7_K3QKhUU(;C6 zgLIaYj{(#`=UqdnWPE{2#(x-tdbx_u{0yr0*ZpWZIii;=r1E)iwrnM`250pe-=dD= z{m#cl14oOZK{TDr)-&xVi*dre6l19>I=X$GR^*s2qCK6eBgg@8qUl9_E9O$Q4T`AB zY-#~D=;0DijTVl+Q&5*f;yk7q9l%%S#E>V=p1WPyt>q? z_w8|P@>|twI^V>-^kh^u*EH_%`15!F<{j+H0^8*bY4k(o|J8$ yw!6YDc9(s_?g$^XJFIYP_>dj4L*X{dzH8sJZ}a?MxXn}-A8#3w(%GJo+UGy2D8{J( diff --git a/tests/order/test-wc-retailcrm-order-payment.php b/tests/order/test-wc-retailcrm-order-payment.php index 6f029f8..5c3f848 100644 --- a/tests/order/test-wc-retailcrm-order-payment.php +++ b/tests/order/test-wc-retailcrm-order-payment.php @@ -30,7 +30,6 @@ class WC_Retailcrm_Order_Payment_Test extends WC_Retailcrm_Test_Case_Helper public function test_build($externalId) { $settings = $this->getOptions(); - $settings['send_payment_amount'] = 'no'; $order_payment = new WC_Retailcrm_Order_Payment($settings); $data = $order_payment->build($this->order, $externalId)->get_data(); @@ -42,7 +41,6 @@ class WC_Retailcrm_Order_Payment_Test extends WC_Retailcrm_Test_Case_Helper } $this->assertArrayHasKey('type', $data); - $this->assertArrayNotHasKey('amount', $data); $this->assertArrayHasKey('order', $data); } @@ -54,7 +52,6 @@ class WC_Retailcrm_Order_Payment_Test extends WC_Retailcrm_Test_Case_Helper public function test_build_with_amount($externalId) { $settings = $this->getOptions(); - $settings['send_payment_amount'] = 'yes'; $order_payment = new WC_Retailcrm_Order_Payment($settings); $data = $order_payment->build($this->order, $externalId)->get_data(); @@ -66,7 +63,6 @@ class WC_Retailcrm_Order_Payment_Test extends WC_Retailcrm_Test_Case_Helper } $this->assertArrayHasKey('type', $data); - $this->assertArrayHasKey('amount', $data); $this->assertArrayHasKey('order', $data); } diff --git a/tests/test-wc-retailcrm-orders.php b/tests/test-wc-retailcrm-orders.php index b13b964..888a4d5 100644 --- a/tests/test-wc-retailcrm-orders.php +++ b/tests/test-wc-retailcrm-orders.php @@ -204,12 +204,7 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper $this->assertArrayHasKey('order', $payment); $this->assertArrayHasKey('externalId', $payment); $this->assertEquals('payment1', $payment['type']); - - if (!empty($this->options['send_payment_amount']) && $this->options['send_payment_amount'] == 'yes') { - $this->assertArrayHasKey('amount', $payment); - } else { - $this->assertArrayNotHasKey('amount', $payment); - } + $this->assertArrayNotHasKey('amount', $payment); } else { $this->assertEquals(array(), $payment); }