closes #2043 for magento 2.3.6-p1

mailchimp · Dec 16, 2024 · 7db5c5e · 7db5c5e
1 parent 60fcda4
commit 7db5c5e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/Block/Adminhtml/System/Config/Form/Field/VarsMap.php b/Block/Adminhtml/System/Config/Form/Field/VarsMap.php
@@ -43,13 +43,15 @@ protected function _getAddressAtt()
         $ret['default_shipping##state']   = __('Shipping State');
         $ret['default_shipping##telephone']   = __('Shipping Telephone');
         $ret['default_shipping##company']   = __('Shipping Company');
+        $ret['default_shipping##street']   = __('Shipping Street');
 
         $ret['default_billing##zip']      = __('Billing Zip Code');
         $ret['default_billing##country']  = __('Billing Country');
         $ret['default_billing##city']     = __('Billing City');
         $ret['default_billing##state']    = __('Billing State');
         $ret['default_billing##telephone']   = __('Billing Telephone');
         $ret['default_billing##company']   = __('Billing Company');
+        $ret['default_billing##street']   = __('Billing Street');
 
 
         return $ret;

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -411,12 +411,14 @@ private function getAddressAtt()
                 'default_shipping##state',
                 'default_shipping##telephone',
                 'default_shipping##company',
+                'default_shipping##street',
                 'default_billing##zip',
                 'default_billing##country',
                 'default_billing##city',
                 'default_billing##state',
                 'default_billing##telephone',
-                'default_billing##company'
+                'default_billing##company',
+                'default_billing##street'
             ];
 
             foreach($elements as $item) {
@@ -753,11 +755,10 @@ private function _getAddressValues(\Magento\Customer\Model\Address\AbstractAddre
         if ($address) {
             $street = $address->getStreet();
             if (count($street) > 1) {
-                $addressData["addr1"] = $street[0];
-                $addressData["addr2"] = $street[1];
+                $addressData["street"] = $street[0].' '.$street[1];
             } else {
                 if (!empty($street[0])) {
-                    $addressData["addr1"] = $street[0];
+                    $addressData["street"] = $street[0];
                 }
             }
             if ($address->getCity()) {

diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv
@@ -34,12 +34,14 @@ Shipping City,Ciudad de Envío
 Shipping State,Estado de Envío
 Shipping Telephone,Teléfono de Envío
 Shipping Company,Empresa de Envío
+Shipping Street,Calle de envío
 Billing Zip Code,Código Postal de Facturación
 Billing Country,País de Facturación
 Billing City,Ciudad de Facturación
 Billing State,Estado de Facturación
 Billing Telephone,Teléfono de Facturación
 Billing Company,Empresa de Facturación
+Billing Street, Calle de facturación
 Mailchimp Batches,Lotes de Mailchimp
 Mailchimp Cron,Mailchimp Cron
 User name:,Nombre de usuario:

diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
@@ -34,12 +34,14 @@ Shipping City,Ville d'expédition
 Shipping State,État d'expédition
 Shipping Telephone,Téléphone d'expédition
 Shipping Company,Société de livraison
+Shipping Street,Rue de la navigation
 Billing Zip Code,Code postal de facturation
 Billing Country,Pays de facturation
 Billing City,Ville de facturation
 Billing State,État de facturation
 Billing Telephone,Téléphone de facturation
 Billing Company,Société de facturation
+Billing Street,Rue de la facturation
 Mailchimp Batches,Lots Mailchimp
 Mailchimp Cron,Mailchimp Cron
 User name:,Nom d'utilisateur :

diff --git a/i18n/it_IT.csv b/i18n/it_IT.csv
@@ -34,12 +34,14 @@ Shipping City,Città di spedizione
 Shipping State,Stato spedizione
 Shipping Telephone,Telefono spedizione
 Shipping Company,Compagnia di spedizione
+Shipping Street,Via di spedizione
 Billing Zip Code,CAP fatturazione
 Billing Country,Paese fatturazione
 Billing City,Città  fatturazione
 Billing State,Stato fatturazione
 Billing Telephone,Telefono fatturazione
 Billing Company,Compagnia fatturazione
+Billing Street,Via della fatturazione
 Mailchimp Batches,Batch Mailchimp
 Mailchimp Cron,Cron Mailchimp
 User name:,Nome utente: