From 3238ff3a421df37641fe141f69039e75c578ae12 Mon Sep 17 00:00:00 2001
From: Dima Uryvskiy <dima-uryvskiyy@rambler.ru>
Date: Fri, 21 Aug 2020 12:48:33 +0300
Subject: [PATCH] Add option transfering net cost (#149)

---
 CHANGELOG.md                                             | 4 ++++
 VERSION                                                  | 2 +-
 resources/pot/retailcrm-ru_RU.pot                        | 3 +++
 .../abstracts/class-wc-retailcrm-abstracts-settings.php  | 9 +++++++++
 src/include/class-wc-retailcrm-history.php               | 4 +++-
 src/include/class-wc-retailcrm-orders.php                | 8 +++++++-
 src/readme.txt                                           | 4 ++++
 src/retailcrm.php                                        | 2 +-
 src/uninstall.php                                        | 2 +-
 9 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5ca9f6..58ad1aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2020-08-20 4.1.3
+* Добавлены переводы для опции роли клиентов
+* Добавлена возможность опционально передавать себестоимость доставки
+
 ## 2020-08-20 4.1.2
 * Исправлен баг с отсутствием настроек справочников
 
diff --git a/VERSION b/VERSION
index 4d0dcda..de197cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.2
+4.1.3
diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot
index a476eac..a632a47 100644
--- a/resources/pot/retailcrm-ru_RU.pot
+++ b/resources/pot/retailcrm-ru_RU.pot
@@ -247,6 +247,9 @@ msgstr "Передача номера заказа"
 msgid "Transferring the payment amount"
 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 aae9d8e..95b3173 100644
--- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
+++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
@@ -138,6 +138,15 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
             'desc_tip'    =>  true
         );
 
+        $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 a5a540c..1a80ac1 100644
--- a/src/include/class-wc-retailcrm-history.php
+++ b/src/include/class-wc-retailcrm-history.php
@@ -284,7 +284,9 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
                 $shipping->set_total($order['delivery']['cost']);
             }
 
-            if (isset($order['delivery']['netCost']) && wc_tax_enabled()) {
+            $activeNetCost = $this->retailcrm_settings['send_delivery_net_cost'];
+
+            if (isset($order['delivery']['netCost']) && wc_tax_enabled() && $activeNetCost != 'yes') {
                 $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 6c39b82..0f15610 100644
--- a/src/include/class-wc-retailcrm-orders.php
+++ b/src/include/class-wc-retailcrm-orders.php
@@ -400,7 +400,13 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
                     $order_data['delivery']['cost'] = $shipping_cost;
                 }
 
-                if ($shipping['total']) {
+                $activeNetCost = null;
+
+                if (isset($this->retailcrm_settings['send_delivery_net_cost'])){
+                    $activeNetCost = $this->retailcrm_settings['send_delivery_net_cost'];
+                }
+
+                if ($shipping['total'] && $activeNetCost != 'yes') {
                     $order_data['delivery']['netCost'] = $shipping['total'];
                 }
             }
diff --git a/src/readme.txt b/src/readme.txt
index 0e107d0..7276b81 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -45,6 +45,10 @@ API-ключ должен быть для отдельного магазина
 2. В появившихся списках справочников настройте соответствие способов доставки и оплаты, а так же статусов заказов. Отметьте галочку "Выгружать остатки", если хотите выгружать остатки из Retailcrm в магазин (подробнее смотрите в описании).
 
 == Changelog ==
+= 4.1.3 =
+* Добавлены переводы для опции роли клиентов
+* Добавлена возможность опционально передавать себестоимость доставки
+
 = 4.1.2 =
 * Исправлен баг с отсутствием настроек справочников
 
diff --git a/src/retailcrm.php b/src/retailcrm.php
index 91b6243..e502d3b 100644
--- a/src/retailcrm.php
+++ b/src/retailcrm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Version: 4.1.2
+ * Version: 4.1.3
  * WC requires at least: 3.0
  * WC tested up to: 3.9.3
  * Plugin Name: WooCommerce retailCRM
diff --git a/src/uninstall.php b/src/uninstall.php
index 252d6dc..cff47ea 100644
--- a/src/uninstall.php
+++ b/src/uninstall.php
@@ -15,7 +15,7 @@
  *
  *
  * @link       https://wordpress.org/plugins/woo-retailcrm/
- * @version    4.1.2
+ * @version    4.1.3
  *
  * @package    RetailCRM
  */