From ec8f5ac661a3d27034f06b4f7bf0a39a6e7e4c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A7=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2?= <45812598+Chazovs@users.noreply.github.com>
Date: Mon, 28 Sep 2020 13:02:03 +0300
Subject: [PATCH] fix unseting delivery fields method (#141)

---
 .../general/RetailcrmConfigProvider.php       | 12 ++-
 .../general/services/RetailCrmService.php     | 72 +++++++++++++-----
 .../general/services/RetailCrmServiceTest.php | 74 ++++++-------------
 3 files changed, 90 insertions(+), 68 deletions(-)

diff --git a/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php b/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
index 5b750462..09639809 100644
--- a/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
+++ b/intaro.retailcrm/classes/general/RetailcrmConfigProvider.php
@@ -623,7 +623,17 @@ class RetailcrmConfigProvider
     {
         return COption::GetOptionString("main", "new_user_phone_required") === 'Y';
     }
-
+    
+    /**
+     * Return integration_delivery option
+     *
+     * @return mixed
+     */
+    public static function getCrmIntegrationDelivery()
+    {
+        return static::getUnserializedOption(RetailcrmConstants::CRM_INTEGRATION_DELIVERY);
+    }
+    
     /**
      * Wraps Bitrix COption::GetOptionString(...)
      *
diff --git a/intaro.retailcrm/classes/general/services/RetailCrmService.php b/intaro.retailcrm/classes/general/services/RetailCrmService.php
index 4820f9a7..c05715fd 100644
--- a/intaro.retailcrm/classes/general/services/RetailCrmService.php
+++ b/intaro.retailcrm/classes/general/services/RetailCrmService.php
@@ -1,39 +1,77 @@
 <?php
+
+/**
+ * Class RetailCrmService
+ */
 class RetailCrmService
 {
-    public static function unsetIntegrationDeliveryFields($order)
+    /**
+     * @param $order
+     *
+     * @return array
+     */
+    public static function unsetIntegrationDeliveryFields(array $order): array
     {
-        $integrationDelivery = unserialize(COption::GetOptionString(RetailcrmConstants::MODULE_ID, RetailcrmConstants::CRM_INTEGRATION_DELIVERY, 0));
-        $deliveryCode = $order['delivery']['code'];
-        if ($deliveryCode) {
+       $integrationDelivery = RetailcrmConfigProvider::getCrmIntegrationDelivery();
+        
+        if (isset($order['delivery']['code'])) {
+            $deliveryCode = $order['delivery']['code'];
+        
+            if (!empty($integrationDelivery[$deliveryCode])
+                && $integrationDelivery[$deliveryCode] !== 'sdek'
+                && $integrationDelivery[$deliveryCode] !== 'dpd'
+                && $integrationDelivery[$deliveryCode] !== 'newpost'
+            ) {
+                unset($order['weight']);
+                unset($order['firstName']);
+                unset($order['lastName']);
+                unset($order['phone']);
+                unset($order['delivery']['cost']);
+                unset($order['paymentType']);
+                unset($order['shipmentStore']);
+                unset($order['delivery']['address']);
+                unset($order['delivery']['data']);
+            }
+            
             switch ($integrationDelivery[$deliveryCode]) {
                 case "sdek":
-                    unset($order['number']);
-                    unset($order['height']);
+                    unset($order['weight']);
                     unset($order['length']);
                     unset($order['width']);
+                    unset($order['height']);
+                    unset($order['phone']);
+                    unset($order['delivery']['cost']);
+                    unset($order['paymentType']);
+                    unset($order['shipmentStore']);
+                    unset($order['number']);
+                    unset($order['delivery']['address']);
+                    unset($order['delivery']['data']);
                     break;
                 case "dpd":
+                    unset($order['weight']);
                     unset($order['manager']);
+                    unset($order['phone']);
                     unset($order['firstName']);
                     unset($order['lastName']);
+                    unset($order['delivery']['cost']);
+                    unset($order['paymentType']);
+                    unset($order['shipmentStore']);
+                    unset($order['delivery']['address']);
+                    unset($order['delivery']['data']);
                     break;
                 case "newpost":
+                    unset($order['weight']);
                     unset($order['customer']);
+                    unset($order['phone']);
+                    unset($order['shipmentStore']);
+                    unset($order['paymentType']);
+                    unset($order['delivery']['cost']);
+                    unset($order['delivery']['address']);
+                    unset($order['delivery']['data']);
                     break;
-                default:
-                    unset($order['firstName']);
-                    unset($order['lastName']);
             }
-
-            unset($order['weight']);
-            unset($order['phone']);
-            unset($order['delivery']['cost']);
-            unset($order['shipmentStore']);
-            unset($order['delivery']['address']);
-            unset($order['delivery']['data']);
         }
-
+       
         return $order;
     }
 }
diff --git a/tests/classes/general/services/RetailCrmServiceTest.php b/tests/classes/general/services/RetailCrmServiceTest.php
index dc01b8fa..89ec02ad 100644
--- a/tests/classes/general/services/RetailCrmServiceTest.php
+++ b/tests/classes/general/services/RetailCrmServiceTest.php
@@ -5,58 +5,32 @@
  */
 class RetailCrmServiceTest extends PHPUnit\Framework\TestCase
 {
-    private $paramsExample = array (
-        'number' => '5958C',
-        'externalId' => '8',
-        'createdAt' => '2020-06-22 16:47:49',
-        'customer' => array (
-            'externalId' => '3',
-        ),
-        'orderType' => 'eshop-individual',
-        'status' => 'prepayed',
-        'delivery' => array (
-            'cost' => '0',
-            'address' => array (
-                'text' => 'ул. Первомайская 41',
-            ),
-            'code' => 'boxberry',
-        ),
-        'contragent' => array (
-            'contragentType' => 'individual',
-        ),
-        'discountManualAmount' => '0',
-        'discountManualPercent' => '0',
-        'items' => array (
-            array (
-                'externalIds' => array (
-                    array (
-                        'code' => 'bitrix',
-                        'value' => '0_88',
-                    ),
-                ),
-                'quantity' => '1',
-                'offer' => array (
-                    'externalId' => '88',
-                    'xmlId' => '248',
-                ),
-                'productName' => 'Agustí Torelló Mata GR Barrica 2011',
-                'id' => '9072',
-                'discountManualPercent' => '0',
-                'discountManualAmount' => '0',
-                'initialPrice' => '21.25',
-            ),
-        ),
-    );
-
+    private $paramsExample = [
+        'delivery'      => [
+            'code'    => 'boxberry',
+            'cost'    => 'test',
+            'address' => 'test',
+            'data'    => 'test',
+        ],
+        'weight'        => 'test',
+        'firstName'     => 'test',
+        'lastName'      => 'test',
+        'phone'         => 'test',
+        'paymentType'   => 'test',
+        'shipmentStore' => 'test',
+    ];
+    
     public function testOnUnsetIntegrationDeliveryFields()
     {
-        $newParams = RetailCrmService::unsetIntegrationDeliveryFields($this->paramsExample);
-        $expectedArray = $this->paramsExample;
-        unset($expectedArray['firstName']);
-        unset($expectedArray['lastName']);
-        unset($expectedArray['delivery']['address']);
-        unset($expectedArray['delivery']['cost']);
-
+        $value = serialize(['boxberry' => 'test']);
+        COption::SetOptionString(RetailcrmConstants::MODULE_ID, RetailcrmConstants::CRM_INTEGRATION_DELIVERY, $value);
+        $newParams     = RetailCrmService::unsetIntegrationDeliveryFields($this->paramsExample);
+        $expectedArray = [
+            'delivery' => [
+                'code' => 'boxberry',
+            ],
+        ];
+        
         $this->assertEquals($newParams, $expectedArray);
     }
 }