Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue2043 2.2 #2046

Open
wants to merge 5 commits into
base: develop-2.2
Choose a base branch
from
+14 −5
Open

Issue2043 2.2 #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b35392
Added street address to mapping dropdown
agustinbv Dec 16, 2024
3618d4e
Modified _getAddressValues(), modified listed customer attributes acc…
agustinbv Dec 16, 2024
8e539f0
Updated es_ES.csv
agustinbv Dec 16, 2024
4b08426
Updated fr_FR.csv
agustinbv Dec 16, 2024
0ef3558
Updated it_IT.csv
agustinbv Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Block/Adminhtml/System/Config/Form/Field/VarsMap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
9 changes: 5 additions & 4 deletions Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,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) {
Expand Down Expand Up @@ -745,11 +747,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()) {
Expand Down
4 changes: 3 additions & 1 deletion i18n/es_ES.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -177,4 +179,4 @@ MC Account name,Nombre de la cuenta de MC
Store name,Nombre de la tienda
List name,Nombre de la lista
Mailchimp Sync,Sincronización de Mailchimp
Sync all customers or only customer with orders, Sincronza todos los clientes o solo los que tienen ordenes
Sync all customers or only customer with orders, Sincronza todos los clientes o solo los que tienen ordenes
2 changes: 2 additions & 0 deletions i18n/fr_FR.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand Down
2 changes: 2 additions & 0 deletions i18n/it_IT.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down