From 660fc0ab216eee39f6879bd2206d45e3d8643f30 Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Wed, 31 Jul 2024 15:42:44 +0300
Subject: [PATCH] Change address logic

---
 retailcrm/lib/RetailcrmOrderBuilder.php | 37 ++++++++-----------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/retailcrm/lib/RetailcrmOrderBuilder.php b/retailcrm/lib/RetailcrmOrderBuilder.php
index b7654da..dac55e3 100644
--- a/retailcrm/lib/RetailcrmOrderBuilder.php
+++ b/retailcrm/lib/RetailcrmOrderBuilder.php
@@ -981,35 +981,22 @@ class RetailcrmOrderBuilder
 
         $isCorporateEnabled = RetailcrmTools::isCorporateEnabled();
 
-        $crmOrder['contragent']['contragentType'] = $isCorporateEnabled && RetailcrmTools::isOrderCorporate($order)
-            ? 'legal-entity'
-            : 'individual';
+        if ($isCorporateEnabled && RetailcrmTools::isOrderCorporate($order)) {
+            $crmOrder['contragent']['contragentType'] = 'legal-entity';
+            $crmOrder['contragent']['legalName'] = $addressInvoice->company ?? '';
+            $crmOrder['contragent']['INN'] = $addressInvoice->vat_number ?? '';
+        } else {
+            $crmOrder['contragent']['contragentType'] = 'individual';
 
-        if ($addressInvoice instanceof Address && !empty($addressInvoice->company)) {
-            $crmOrder['contragent']['legalName'] = $addressInvoice->company;
-
-            if (!empty($addressInvoice->vat_number)) {
-                $crmOrder['contragent']['INN'] = $addressInvoice->vat_number;
+            if (
+                RetailcrmTools::isCampanyAndVatNumberSendEnabled()
+                && Configuration::get(RetailCRM::COMPANY_AND_VAT_NUMBER_CREATED)
+            ) {
+                $crmOrder['customFields']['ps_company'] = $addressInvoice->company ?? '';
+                $crmOrder['customFields']['ps_vat_number'] = $addressInvoice->vat_number ?? '';
             }
         }
 
-        if (
-            !$isCorporateEnabled
-            && RetailcrmTools::isCampanyAndVatNumberSendEnabled()
-            && Configuration::get(RetailCRM::COMPANY_AND_VAT_NUMBER_CREATED)
-        ) {
-            $company = $addressDelivery->company;
-            $vatNumber = $addressDelivery->vat_number;
-
-            if ($addressInvoice instanceof Address) {
-                $company = !empty($addressInvoice->company) ? $addressInvoice->company : $company;
-                $vatNumber = !empty($addressInvoice->vat_number) ? $addressInvoice->vat_number : $vatNumber;
-            }
-
-            $crmOrder['customFields']['ps_company'] = $company;
-            $crmOrder['customFields']['ps_vat_number'] = $vatNumber;
-        }
-
         if (!empty($payment[$paymentType])) {
             $order_payment = [
                 'externalId' => $order->id . '#' . $order->reference,