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 0af6985..192eaa7 100644 Binary files a/src/languages/retailcrm-es_ES.mo and b/src/languages/retailcrm-es_ES.mo differ diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 9496683..84ba1a6 100644 Binary files a/src/languages/retailcrm-ru_RU.mo and b/src/languages/retailcrm-ru_RU.mo differ