RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-02-21 01:13:13 +03:00
Code Issues Projects Releases Wiki Activity

Delete option 'Transferring the payment amount'

Browse Source
This commit is contained in:
Dima Uryvskiy 2020-12-02 12:36:32 +03:00 committed by GitHub
parent 2fd1a1088b
commit 415c2edf0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/pot/retailcrm-es_ES.pot
View File

@ -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"

3
resources/pot/retailcrm-ru_RU.pot
View File

@ -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 "Не передавать себестоимости доставки"

9
src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
View File

@ -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' => ' ',

11
src/include/order/class-wc-retailcrm-order-payment.php
View File

@ -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' => '',

BIN
src/languages/retailcrm-es_ES.mo
View File

Binary file not shown.

BIN
src/languages/retailcrm-ru_RU.mo
View File

Binary file not shown.

4
tests/order/test-wc-retailcrm-order-payment.php
View File

@ -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);
}

7
tests/test-wc-retailcrm-orders.php
View File

@ -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);
}