Send in history

retailcrm/lib/RetailcrmHistory.php

@@ -1525,10 +1525,13 @@ class RetailcrmHistory
 
             return;
         }
+
         if (RetailcrmTools::validateEntity($addressInvoice, null, true)) {
             $addressInvoice->id_customer = $customer->id;
             RetailcrmTools::assignAddressIdsByFields($customer, $addressInvoice);
 
+            self::setCompanyAndVatNumberForInvoiceAddress($order, $addressInvoice);
+
             if (empty($addressInvoice->id)) {
                 self::loadInPrestashop($addressInvoice, 'save');
 
@@ -1954,6 +1957,24 @@ class RetailcrmHistory
         return $orderDetail;
     }
 
+    private static function setCompanyAndVatNumberForInvoiceAddress($crmOrder, $addressInvoice)
+    {
+        if (!RetailcrmTools::isCorporateEnabled()
+            && RetailcrmTools::isCampanyAndVatNumberSendEnabled()
+        ) {
+            $company = $crmOrder['customFields']['ps_company'] ?? '';
+            $vatNumber = $crmOrder['customFields']['ps_vat_number'] ?? '';
+
+            if ('' !== $company) {
+                $addressInvoice->company = $company;
+            }
+
+            if ('' !== $vatNumber) {
+                $addressInvoice->vat_number = $vatNumber;
+            }
+        }
+    }
+
     private static function handleError($order, $e)
     {
         RetailcrmLogger::writeCaller(