From 29bdecfc96d0303e5ea8b3aedb604a93e3019121 Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <iyzoer@users.noreply.github.com>
Date: Thu, 3 Dec 2020 12:07:20 +0300
Subject: [PATCH] Closes #201. Remove payments with empty payment type (#208)

---
 .../lib/service/RetailcrmOrderConverter.php   |  4 ++-
 .../service/RetailcrmOrderConverterTest.php   | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php b/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php
index 9c060a8..d13e9e3 100644
--- a/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php
+++ b/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php
@@ -120,7 +120,9 @@ class RetailcrmOrderConverter {
             );
         }
 
-        $this->data['payments'][] = $payment;
+        if (!empty($payment['type'])) {
+            $this->data['payments'][] = $payment;
+        }
 
         return $this;
     }
diff --git a/tests/system/lib/service/RetailcrmOrderConverterTest.php b/tests/system/lib/service/RetailcrmOrderConverterTest.php
index c728a88..6234ace 100644
--- a/tests/system/lib/service/RetailcrmOrderConverterTest.php
+++ b/tests/system/lib/service/RetailcrmOrderConverterTest.php
@@ -72,6 +72,35 @@ class RetailcrmOrderConverterTest extends TestCase {
         $this->assertEquals('cod', $order['payments'][0]['type']);
     }
 
+    public function testSetEmptyPayment() {
+        $order_checkout_model = $this->loadModel('checkout/order');
+        $order_account_model = $this->loadModel('account/order');
+
+        $order_data = $order_checkout_model->getOrder(static::ORDER_WITH_CUST_ID);
+        $products = $order_account_model->getOrderProducts(static::ORDER_WITH_CUST_ID);
+        $totals = $order_account_model->getOrderTotals(static::ORDER_WITH_CUST_ID);
+
+        foreach ($products as $key => $product) {
+            $productOptions = $order_account_model->getOrderOptions(static::ORDER_WITH_CUST_ID, $product['order_product_id']);
+
+            if (!empty($productOptions)) {
+                $products[$key]['option'] = $productOptions;
+            }
+        }
+
+        $converter = \retailcrm\factory\OrderConverterFactory::create(static::$registry);
+
+        unset($order_data['payment_code']);
+
+        $order = $converter->initOrderData(
+            $order_data,
+            $products,
+            $totals
+        )->setPayment()->getOrder();
+
+        $this->assertArrayNotHasKey('payments', $order);
+    }
+
     public function testSetDelivery() {
         $order_checkout_model = $this->loadModel('checkout/order');
         $order_account_model = $this->loadModel('account/order');