From 9e4323623486421d5dc3d680d8e05c783af23019 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 16 May 2024 19:01:40 +0530 Subject: [PATCH 01/16] Fixed: Customer phone number not saving during account creation --- .../customers/helpers/view/view.tpl | 6 +++ .../controllers/orders/helpers/view/view.tpl | 11 +++--- classes/CartCustomerGuestDetail.php | 39 +++++++++++++++++++ classes/Customer.php | 6 +++ .../AdminCustomerPreferencesController.php | 2 +- .../admin/AdminCustomersController.php | 26 ++++++++++++- controllers/front/AuthController.php | 28 ++++++++----- controllers/front/IdentityController.php | 12 ++++++ controllers/front/OrderOpcController.php | 22 ++++++----- .../authentication.tpl | 4 ++ themes/hotel-reservation-theme/identity.tpl | 6 +++ .../hotel-reservation-theme/order-detail.tpl | 10 +++++ .../order-opc-edit-guest-info.tpl | 5 +-- themes/hotel-reservation-theme/order-opc.tpl | 27 ++++++------- 14 files changed, 157 insertions(+), 47 deletions(-) diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl index 88da2734e..163ab3c48 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -54,6 +54,12 @@

{if $gender->name}{$gender->name}{else}{l s='Unknown'}{/if}

+
+ +
+

{$customer->phone}

+
+
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index f28080e92..3ead0f42d 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -541,13 +541,12 @@ {if (!Customer::customerExists($customer->email))}
- +
 {$customer->firstname} {$customer->lastname}
 {$customer->email}
- {if $addresses.invoice->phone_mobile || $addresses.invoice->phone} -
 {if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}
+ {if $customer->phone} +
 {$customer->phone}
{/if}
-
@@ -564,8 +563,8 @@
 {$customer->firstname} {$customer->lastname}
 {$customer->email}
- {if $addresses.invoice->phone_mobile || $addresses.invoice->phone} -
 {if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}
+ {if $customer->phone} +
 {$customer->phone}
{/if}
diff --git a/classes/CartCustomerGuestDetail.php b/classes/CartCustomerGuestDetail.php index d21c56c68..7531c44b3 100644 --- a/classes/CartCustomerGuestDetail.php +++ b/classes/CartCustomerGuestDetail.php @@ -63,6 +63,45 @@ class CartCustomerGuestDetailCore extends ObjectModel ); } + public static function getCustomerDefaultDetails($email) + { + return Db::getInstance()->getRow( + 'SELECT * FROM `'._DB_PREFIX_.'cart_customer_guest_detail` + WHERE `id_cart` = 0 AND `email` = "'.pSQL($email).'"' + ); + } + + public static function updateCustomerPhoneNumber($email, $phone) + { + if ($customerDetail = self::getCustomerDefaultDetails($email)) { + $objCartCustomerGuestDetail = new CartCustomerGuestDetail($customerDetail['id_customer_guest_detail']); + $objCartCustomerGuestDetail->phone = $phone; + return $objCartCustomerGuestDetail->save(); + } else { + $objCustomer = new Customer(); + if (Validate::isLoadedObject($customer = $objCustomer->getByEmail($email, null, false))) { + $objCartCustomerGuestDetail = new CartCustomerGuestDetail(); + $objCartCustomerGuestDetail->id_cart = 0; + $objCartCustomerGuestDetail->id_gender = $customer->id_gender; + $objCartCustomerGuestDetail->firstname = $customer->firstname; + $objCartCustomerGuestDetail->lastname = $customer->lastname; + $objCartCustomerGuestDetail->email = $customer->email; + $objCartCustomerGuestDetail->phone = $phone; + return $objCartCustomerGuestDetail->save(); + } + } + + return false; + } + + public static function getCustomerPhone($email) + { + return Db::getInstance()->getValue( + 'SELECT `phone` FROM `'._DB_PREFIX_.'cart_customer_guest_detail` + WHERE `id_cart` = 0 AND `email` = "'.pSQL($email).'"' + ); + } + public function validateGuestInfo() { $isValid = true; diff --git a/classes/Customer.php b/classes/Customer.php index a8c4c3609..e80ba8525 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -135,6 +135,8 @@ class CustomerCore extends ObjectModel public $groupBox; + public $phone; + protected $webserviceParameters = array( 'fields' => array( 'id_default_group' => array('xlink_resource' => 'groups'), @@ -199,6 +201,10 @@ class CustomerCore extends ObjectModel { $this->id_default_group = (int)Configuration::get('PS_CUSTOMER_GROUP'); parent::__construct($id); + + if ($this->email) { + $this->phone = CartCustomerGuestDetail::getCustomerPhone($this->email); + } } public function add($autodate = true, $null_values = true) diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 98a5db874..dfadfc969 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -64,7 +64,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController ), 'PS_ONE_PHONE_AT_LEAST' => array( 'title' => $this->l('Phone number is mandatory'), - 'hint' => $this->l('If you chose yes, your customer will have to provide at least one phone number to register.'), + 'hint' => $this->l('If you chose yes, your customer will have to provide phone number to register.'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool' diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 6c763f10c..e07e38526 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -420,6 +420,15 @@ class AdminCustomersControllerCore extends AdminController 'required' => true, 'autocomplete' => false ), + array( + 'type' => 'text', + 'prefix' => '', + 'label' => $this->l('Phone'), + 'name' => 'phone', + 'col' => '4', + 'required' => true, + 'autocomplete' => false + ), array( 'type' => 'password', 'label' => $this->l('Password'), @@ -1054,6 +1063,7 @@ class AdminCustomersControllerCore extends AdminController $this->errors[] = Tools::displayError('Password can not be empty.'); $this->display = 'edit'; } elseif ($customer = parent::processAdd()) { + CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, Tools::getValue('phone')); $this->context->smarty->assign('new_customer', $customer); return $customer; } @@ -1076,7 +1086,10 @@ class AdminCustomersControllerCore extends AdminController } } - return parent::processUpdate(); + if ($res = parent::processUpdate()) { + CartCustomerGuestDetail::updateCustomerPhoneNumber($this->object->email, Tools::getValue('phone')); + return $res; + } } else { $this->errors[] = Tools::displayError('An error occurred while loading the object.').' '.$this->table.' '.Tools::displayError('(cannot load object)'); @@ -1106,6 +1119,17 @@ class AdminCustomersControllerCore extends AdminController } } + $phone = Tools::getValue('phone'); + if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { + if ($phone == '') { + $this->errors[] = Tools::displayError('Phone number is required.'); + } + } + if ($phone && !Validate::isPhoneNumber($phone)) { + $this->errors[] = Tools::displayError('Invaid phone number.'); + } + + $customer = new Customer(); $this->errors = array_merge($this->errors, $customer->validateFieldsRequiredDatabase()); diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index fe8caa4a3..cc6c86a44 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -422,22 +422,24 @@ class AuthControllerCore extends FrontController $error_phone = false; if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { - if (Tools::isSubmit('submitGuestAccount') || !Tools::getValue('is_new_customer')) { - if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')) { - $error_phone = true; - } - } elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE')) - || (Configuration::get('PS_ORDER_PROCESS_TYPE') && !Tools::getValue('email_create')) - || (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Tools::getValue('email_create'))) - && (!Tools::getValue('phone') && !Tools::getValue('phone_mobile'))) { + if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')) { $error_phone = true; } } if ($error_phone) { - $this->errors[] = Tools::displayError('You must register at least one phone number.'); + $this->errors[] = Tools::displayError('Phone number is required.'); + } else { + if (Tools::getValue('phone') && !Validate::isPhoneNumber(Tools::getValue('phone'))) { + $this->errors[] = Tools::displayError('Invald phone number.'); + } + if (Tools::getValue('phone_mobile') && !Validate::isPhoneNumber(Tools::getValue('phone_mobile'))) { + $this->errors[] = Tools::displayError('Invald mobile phone number.'); + } } + + $this->errors = array_unique(array_merge($this->errors, $customer->validateController())); // Check the requires fields which are settings in the BO @@ -462,6 +464,7 @@ class AuthControllerCore extends FrontController if (!count($this->errors)) { if ($customer->add()) { + CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, Tools::getValue('phone')); if (!$customer->is_guest) { if (!$this->sendConfirmationMail($customer)) { $this->errors[] = Tools::displayError('The email cannot be sent.'); @@ -607,13 +610,18 @@ class AuthControllerCore extends FrontController $customer->firstname = Tools::getValue('firstname'); $customer->lastname = Tools::getValue('lastname'); } - $customer->is_guest = 1; + $customer->is_guest = !Tools::getValue('is_new_customer', 1);; } else { $customer->is_guest = 0; } if (!$customer->save()) { $this->errors[] = Tools::displayError('An error occurred while creating your account.'); } else { + ddd('dasdasda'); + // save customer phone number in cart_customer_guest_detail + $phone = Tools::getValue('phone_mobile'); + CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $phone); + foreach ($addresses_types as $addresses_type) { $$addresses_type->id_customer = (int)$customer->id; if ($addresses_type == 'address_invoice') { diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 525168380..aeaf3bc70 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -82,6 +82,16 @@ class IdentityControllerCore extends FrontController $this->errors = array_merge($this->errors, $this->customer->validateController()); } + $phone = Tools::getValue('phone'); + if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { + if ($phone == '') { + $this->errors[] = Tools::displayError('Phone number is required.'); + } + } + if ($phone && !Validate::isPhoneNumber($phone)) { + $this->errors[] = Tools::displayError('Invaid phone number.'); + } + if (!count($this->errors)) { $this->customer->id_default_group = (int)$prev_id_default_group; $this->customer->firstname = Tools::ucwords($this->customer->firstname); @@ -109,6 +119,7 @@ class IdentityControllerCore extends FrontController $this->context->cookie->passwd = $this->customer->passwd; } if ($this->customer->update()) { + CartCustomerGuestDetail::updateCustomerPhoneNumber($this->customer->email, $phone); $this->context->cookie->customer_lastname = $this->customer->lastname; $this->context->cookie->customer_firstname = $this->customer->firstname; $this->context->smarty->assign('confirmation', 1); @@ -118,6 +129,7 @@ class IdentityControllerCore extends FrontController } } else { $_POST = array_map('stripslashes', $this->customer->getFields()); + $_POST['phone'] = $this->customer->phone; } return $this->customer; diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 2cd2a223c..43bf1ceb5 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -115,6 +115,14 @@ class OrderOpcControllerCore extends ParentOrderController $this->context->customer->birthday = (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days'); } + $phone = Tools::getValue('phone'); + if (Configuration::get('PS_ONE_PHONE_AT_LEAST') && !$phone) { + $this->errors[] = Tools::displayError('Phone number is a required field.', false); + } + if (!Validate::isPhoneNumber($phone)) { + $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); + } + $_POST['lastname'] = $_POST['customer_lastname']; $_POST['firstname'] = $_POST['customer_firstname']; $this->errors = array_merge($this->errors, $this->context->customer->validateController()); @@ -125,18 +133,9 @@ class OrderOpcControllerCore extends ParentOrderController if ($idAddressDelivery = Tools::getValue('opc_id_address_delivery')) { $objAddress = new Address($idAddressDelivery); if (Validate::isLoadedObject($objAddress)) { - $phoneMobile = Tools::getValue('phone_mobile'); - - if (Configuration::get('PS_ONE_PHONE_AT_LEAST') && !$phoneMobile) { - $this->errors[] = Tools::displayError('Mobile phone number is a required field.', false); - } - - if (!Validate::isPhoneNumber($phoneMobile)) { - $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); - } if (!count($this->errors)) { - $objAddress->phone_mobile = $phoneMobile; + $objAddress->phone_mobile = $phone; $objAddress->firstname = $this->context->customer->firstname; $objAddress->lastname = $this->context->customer->lastname; if (!$objAddress->save()) { @@ -154,6 +153,8 @@ class OrderOpcControllerCore extends ParentOrderController ); if (!count($this->errors)) { $return['isSaved'] = (bool)$this->context->customer->update(); + CartCustomerGuestDetail::updateCustomerPhoneNumber($this->context->customer->email, $phone); + } else { $return['isSaved'] = false; } @@ -685,6 +686,7 @@ class OrderOpcControllerCore extends ParentOrderController 'id_country' => (int)$address_delivery->id_country, 'id_state' => (int)$address_delivery->id_state, 'id_gender' => (int)$customer->id_gender, + 'phone' => (int)$customer->phone, 'sl_year' => $birthday[0], 'sl_month' => $birthday[1], 'sl_day' => $birthday[2], diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl index 25107f0f0..f0600b7b1 100644 --- a/themes/hotel-reservation-theme/authentication.tpl +++ b/themes/hotel-reservation-theme/authentication.tpl @@ -460,6 +460,10 @@
+
+ + +
diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl index 63d5645b5..12ce54882 100644 --- a/themes/hotel-reservation-theme/identity.tpl +++ b/themes/hotel-reservation-theme/identity.tpl @@ -84,6 +84,12 @@
+
+ + +
{if isset($birthday) && $birthday}
{l s='Email'}
-
{$guestInformations['email']}
+
{$guestInformations['email']|escape:'html':'UTF-8'}
- {if (isset($delivery->phone_mobile) && $delivery->phone_mobile) || (isset($delivery->phone) && $delivery->phone)} + {if (isset({$guestInformations['phone']}) && {$guestInformations['phone']})}
- {if isset($delivery->phone_mobile) && $delivery->phone_mobile} - {l s='Mobile Number'} - {else} {l s='Phone Number'} - {/if}
- {if isset($delivery->phone_mobile) && $delivery->phone_mobile} - {$delivery->phone_mobile|escape:'html':'UTF-8'} - {else} - {$delivery->phone|escape:'html':'UTF-8'} - {/if} + {$guestInformations['phone']|escape:'html':'UTF-8'}
{/if} @@ -180,9 +172,11 @@ {include file="$tpl_dir./order-opc-new-account.tpl"} {/if}
- + {if $is_logged || $isGuest} + + {/if} {/if} @@ -476,6 +470,7 @@ {addJsDef addresses=array()} {addJsDef isVirtualCart=$isVirtualCart|intval} {addJsDef isPaymentStep=$isPaymentStep|intval} + {addJsDef PS_REGISTRATION_PROCESS_TYPE=$PS_REGISTRATION_PROCESS_TYPE|intval} {addJsDefL name=txtWithTax}{l s='(tax incl.)' js=1}{/addJsDefL} {addJsDefL name=txtWithoutTax}{l s='(tax excl.)' js=1}{/addJsDefL} {addJsDefL name=txtHasBeenSelected}{l s='has been selected' js=1}{/addJsDefL} From dcd1f0f4dad83874e184cb8c5a408a219e07ae59 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 23 May 2024 20:27:05 +0530 Subject: [PATCH 02/16] update pdf address tab --- controllers/front/AuthController.php | 1 - install/data/xml/address_format.xml | 732 +++++++++------------------ pdf/invoice.addresses-tab.tpl | 14 +- 3 files changed, 254 insertions(+), 493 deletions(-) diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index cc6c86a44..ebcb664d5 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -617,7 +617,6 @@ class AuthControllerCore extends FrontController if (!$customer->save()) { $this->errors[] = Tools::displayError('An error occurred while creating your account.'); } else { - ddd('dasdasda'); // save customer phone number in cart_customer_guest_detail $phone = Tools::getValue('phone_mobile'); CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $phone); diff --git a/install/data/xml/address_format.xml b/install/data/xml/address_format.xml index 53107b786..e9549056e 100644 --- a/install/data/xml/address_format.xml +++ b/install/data/xml/address_format.xml @@ -13,8 +13,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -24,8 +23,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -35,8 +33,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -45,8 +42,7 @@ address1 address2 city State:name postcode Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -56,8 +52,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -67,8 +62,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -78,8 +72,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -89,8 +82,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -100,8 +92,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -112,8 +103,7 @@ address2 postcode city State:name Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -124,8 +114,7 @@ address2 postcode city State:name Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -135,8 +124,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -146,8 +134,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -157,8 +144,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -168,8 +154,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -179,8 +164,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -191,8 +175,7 @@ address2 city postcode Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -202,8 +185,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -213,8 +195,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -224,8 +205,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -233,8 +213,7 @@ company address1 address2 city, State:name postcode Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -244,8 +223,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -255,8 +233,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -266,8 +243,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -277,8 +253,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -288,8 +263,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -299,8 +273,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -310,8 +283,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -321,8 +293,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -332,8 +303,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -343,8 +313,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -354,8 +323,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -365,8 +333,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -376,8 +343,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -387,8 +353,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -398,8 +363,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -409,8 +373,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -420,8 +383,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -431,8 +393,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -442,8 +403,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -453,8 +413,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -464,8 +423,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -475,8 +433,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -487,8 +444,7 @@ address2 postcode city State:name Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -498,8 +454,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -509,8 +464,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -520,8 +474,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -531,8 +484,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -542,8 +494,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -553,8 +504,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -564,8 +514,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -575,8 +524,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -586,8 +534,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -597,8 +544,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -608,8 +554,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -619,8 +564,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -630,8 +574,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -641,8 +584,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -652,8 +594,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -663,8 +604,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -674,8 +614,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -685,8 +624,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -696,8 +634,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -707,8 +644,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -718,8 +654,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -729,8 +664,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -740,8 +674,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -751,8 +684,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -762,8 +694,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -773,8 +704,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -784,8 +714,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -795,8 +724,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -806,8 +734,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -817,8 +744,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -828,8 +754,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -839,8 +764,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -850,8 +774,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -861,8 +784,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -872,8 +794,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -883,8 +804,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -894,8 +814,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -905,8 +824,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -916,8 +834,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -927,8 +844,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -938,8 +854,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -949,8 +864,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -960,8 +874,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -971,8 +884,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -982,8 +894,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -993,8 +904,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1004,8 +914,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1015,8 +924,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1026,8 +934,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1037,8 +944,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1048,8 +954,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1059,8 +964,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1070,8 +974,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1081,8 +984,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1092,8 +994,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1103,8 +1004,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1114,8 +1014,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1125,8 +1024,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1136,8 +1034,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1147,8 +1044,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1158,8 +1054,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1169,8 +1064,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1180,8 +1074,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1191,8 +1084,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1202,8 +1094,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1213,8 +1104,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1225,8 +1115,7 @@ address2 postcode city State:name Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1236,8 +1125,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1247,8 +1135,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1258,8 +1145,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1269,8 +1155,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1280,8 +1165,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1291,8 +1175,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1302,8 +1185,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1313,8 +1195,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1324,8 +1205,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1335,8 +1215,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1346,8 +1225,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1357,8 +1235,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1368,8 +1245,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1379,8 +1255,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1390,8 +1265,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1401,8 +1275,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1412,8 +1285,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1423,8 +1295,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1434,8 +1305,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1445,8 +1315,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1456,8 +1325,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1467,8 +1335,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1478,8 +1345,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1489,8 +1355,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1500,8 +1365,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1511,8 +1375,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1522,8 +1385,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1533,8 +1395,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1544,8 +1405,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1555,8 +1415,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1566,8 +1425,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1577,8 +1435,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1588,8 +1445,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1600,8 +1456,7 @@ address2 postcode city State:name Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1611,8 +1466,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1622,8 +1476,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1633,8 +1486,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1644,8 +1496,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1655,8 +1506,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1666,8 +1516,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1677,8 +1526,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1688,8 +1536,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1699,8 +1546,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1710,8 +1556,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1721,8 +1566,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1732,8 +1576,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1743,8 +1586,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1754,8 +1596,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1765,8 +1606,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1776,8 +1616,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1787,8 +1626,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1798,8 +1636,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1809,8 +1646,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1820,8 +1656,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1831,8 +1666,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1842,8 +1676,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1853,8 +1686,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1864,8 +1696,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1875,8 +1706,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1886,8 +1716,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1897,8 +1726,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1908,8 +1736,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1919,8 +1746,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1930,8 +1756,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1941,8 +1766,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1952,8 +1776,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1963,8 +1786,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1974,8 +1796,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1985,8 +1806,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -1996,8 +1816,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2007,8 +1826,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2018,8 +1836,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2029,8 +1846,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2040,8 +1856,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2051,8 +1866,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2062,8 +1876,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2073,8 +1886,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2084,8 +1896,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2095,8 +1906,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2106,8 +1916,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2117,8 +1926,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2128,8 +1936,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2139,8 +1946,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2150,8 +1956,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2161,8 +1966,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2172,8 +1976,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2183,8 +1986,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2194,8 +1996,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2205,8 +2006,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2216,8 +2016,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2227,8 +2026,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2238,8 +2036,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2249,8 +2046,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2260,8 +2056,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2271,8 +2066,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2282,8 +2076,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2293,8 +2086,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2304,8 +2096,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2315,8 +2106,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2326,8 +2116,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2337,8 +2126,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2348,8 +2136,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2359,8 +2146,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2370,8 +2156,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2381,8 +2166,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2392,8 +2176,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2403,8 +2186,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2414,8 +2196,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2425,8 +2206,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2436,8 +2216,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2447,8 +2226,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2458,8 +2236,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2469,8 +2246,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2480,8 +2256,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2491,8 +2266,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2502,8 +2276,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2513,8 +2286,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2524,8 +2296,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2535,8 +2306,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2546,8 +2316,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2557,8 +2326,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2568,8 +2336,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2579,8 +2346,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2590,8 +2356,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2601,8 +2366,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2612,8 +2376,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2623,8 +2386,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2634,8 +2396,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2645,8 +2406,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2656,8 +2416,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2667,8 +2426,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2678,8 +2436,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone firstname lastname @@ -2689,8 +2446,7 @@ address1 address2 postcode city Country:name -phone -phone_mobile +Customer:phone diff --git a/pdf/invoice.addresses-tab.tpl b/pdf/invoice.addresses-tab.tpl index d4d9f0701..c7f4c9fe0 100644 --- a/pdf/invoice.addresses-tab.tpl +++ b/pdf/invoice.addresses-tab.tpl @@ -22,7 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{if $invoice_address} - -
{l s='Customer Address' pdf='true'}

+
+ {if $invoice_address} + {l s='Customer Address' pdf='true'}

{$invoice_address} + {else} + {l s='Customer Detail' pdf='true'}

+ {$customer->firstname} {$customer->lastname} +
+ {$customer->phone} + {/if}
-{/if} \ No newline at end of file + \ No newline at end of file From 23a29b7574108749049338b6b46d9a667c5382fb Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 18 Jun 2024 13:07:46 +0530 Subject: [PATCH 03/16] Fixed phone number field is visible when phone is not provided | fixed address form issue on opc page --- .../js/tools/statesManagement.js | 5 ++++- .../hotel-reservation-theme/order-detail.tpl | 22 ++++++++++--------- .../order-opc-edit-guest-info.tpl | 4 +--- .../order-opc-new-account.tpl | 5 +++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/themes/hotel-reservation-theme/js/tools/statesManagement.js b/themes/hotel-reservation-theme/js/tools/statesManagement.js index a38bb793f..07d365a48 100644 --- a/themes/hotel-reservation-theme/js/tools/statesManagement.js +++ b/themes/hotel-reservation-theme/js/tools/statesManagement.js @@ -100,6 +100,7 @@ function bindStateInputAndUpdate() $(document).on('change', '#id_country', function(e) { + console.log('change country'); updateState(); updateNeedIDNumber(); updateZipCode(); @@ -142,8 +143,10 @@ function updateState(suffix) $('.id_state' + (typeof suffix !== 'undefined' ? '_' + suffix : '') + ':hidden').fadeIn('slow'); $('#id_state_invoice').uniform(); } - else + else { + console.log('else'); $('.id_state' + (typeof suffix !== 'undefined' ? '_' + suffix : '')).fadeOut('fast'); + } } function updateNeedIDNumber(suffix) diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index bd8abeebe..31b6a8aba 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -349,10 +349,12 @@ {$guestInformations['email']|escape:'html':'UTF-8'} - - {l s='Phone'} - {$guestInformations['phone']|escape:'html':'UTF-8'} - + {if isset($guestInformations['phone']) && $guestInformations['phone']} + + {l s='Phone'} + {$guestInformations['phone']|escape:'html':'UTF-8'} + + {/if} {if isset($address_invoice->phone_mobile) && $address_invoice->phone_mobile} @@ -692,12 +694,12 @@ {l s='Email'} {$guestInformations['email']|escape:'html':'UTF-8'} - - - {l s='Phone'} - {$guestInformations['phone']|escape:'html':'UTF-8'} - - + {if isset($guestInformations['phone']) && $guestInformations['phone']} + + {l s='Phone'} + {$guestInformations['phone']|escape:'html':'UTF-8'} + + {/if} {if isset($address_invoice->phone_mobile) && $address_invoice->phone_mobile} {l s='Mobile'} diff --git a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl index f4b3de27a..9b0dc442d 100644 --- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl +++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl @@ -313,7 +313,5 @@ {else} {addJsDef idSelectedCountryInvoice=false} {/if} - {if isset($countries)} - {addJsDef countries=$countries} - {/if} + {/strip} diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl index 9e8cb16a6..3806ce71e 100644 --- a/themes/hotel-reservation-theme/order-opc-new-account.tpl +++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl @@ -394,3 +394,8 @@ +{strip} + {if isset($countries)} + {addJsDef countries=$countries} + {/if} +{/strip} \ No newline at end of file From df1874fa87454ba1f2aa0614c0acf301a27428bd Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 18 Jun 2024 13:13:19 +0530 Subject: [PATCH 04/16] removed extra code --- themes/hotel-reservation-theme/js/tools/statesManagement.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/themes/hotel-reservation-theme/js/tools/statesManagement.js b/themes/hotel-reservation-theme/js/tools/statesManagement.js index 07d365a48..a38bb793f 100644 --- a/themes/hotel-reservation-theme/js/tools/statesManagement.js +++ b/themes/hotel-reservation-theme/js/tools/statesManagement.js @@ -100,7 +100,6 @@ function bindStateInputAndUpdate() $(document).on('change', '#id_country', function(e) { - console.log('change country'); updateState(); updateNeedIDNumber(); updateZipCode(); @@ -143,10 +142,8 @@ function updateState(suffix) $('.id_state' + (typeof suffix !== 'undefined' ? '_' + suffix : '') + ':hidden').fadeIn('slow'); $('#id_state_invoice').uniform(); } - else { - console.log('else'); + else $('.id_state' + (typeof suffix !== 'undefined' ? '_' + suffix : '')).fadeOut('fast'); - } } function updateNeedIDNumber(suffix) From 3df06b413f57c91632247558f822ecbfd2fe5a7f Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 24 Jun 2024 11:19:58 +0530 Subject: [PATCH 05/16] removed guest name field from admin order detail --- .../default/template/controllers/orders/helpers/view/view.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 290bdd877..4f5366e33 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -541,7 +541,6 @@ {if (!Customer::customerExists($customer->email))}
-
 {$customer->firstname} {$customer->lastname}
 {$customer->email}
{if $customer->phone}
 {$customer->phone}
From 198e119c83d2e71792f77cb28139d7d5fdafb5f3 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 28 Jun 2024 00:00:34 +0530 Subject: [PATCH 06/16] Updated: change customer phone number when deleting customer --- classes/CartCustomerGuestDetail.php | 2 +- controllers/admin/AdminCustomersController.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/classes/CartCustomerGuestDetail.php b/classes/CartCustomerGuestDetail.php index 7531c44b3..cddcc19e3 100644 --- a/classes/CartCustomerGuestDetail.php +++ b/classes/CartCustomerGuestDetail.php @@ -39,7 +39,7 @@ class CartCustomerGuestDetailCore extends ObjectModel 'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), 'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), 'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'size' => 128), - 'phone' => array('type' => self::TYPE_STRING, 'validate' => 'isPhoneNumber', 'size' => 32), + 'phone' => array('type' => self::TYPE_STRING, 'size' => 32), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index e07e38526..e5f598aa4 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -967,11 +967,19 @@ class AdminCustomersControllerCore extends AdminController // If customer is going to be deleted permanently then if customer has orders the change this customer as an anonymous customer if (Validate::isLoadedObject($objCustomer = $this->loadObject())) { if ($this->delete_mode == 'real' && Order::getCustomerOrders($objCustomer->id, true)) { + $customerEmail = $objCustomer->email; $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::getShopDomain(); $objCustomer->deleted = 1; if (!$objCustomer->update()) { $this->errors[] = Tools::displayError('Some error ocurred while deleting the Customer'); return; + } else { + if ($customerDetail = CartCustomerGuestDetail::getCustomerDefaultDetails($customerEmail)) { + $objCartCustomerGuestDetail = new CartCustomerGuestDetail($customerDetail['id_customer_guest_detail']); + $objCartCustomerGuestDetail->phone = preg_replace('/[0-p]/', 'x', $objCustomer->phone); + $objCartCustomerGuestDetail->email = $objCustomer->email; + $objCartCustomerGuestDetail->save(); + } } $this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token; From aa35c3637f4a2d47743f73e0281328dc0b7bf11d Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 28 Jun 2024 13:34:49 +0530 Subject: [PATCH 07/16] update customer number when deleting customer --- classes/CartCustomerGuestDetail.php | 2 +- controllers/admin/AdminCustomersController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/CartCustomerGuestDetail.php b/classes/CartCustomerGuestDetail.php index cddcc19e3..7531c44b3 100644 --- a/classes/CartCustomerGuestDetail.php +++ b/classes/CartCustomerGuestDetail.php @@ -39,7 +39,7 @@ class CartCustomerGuestDetailCore extends ObjectModel 'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), 'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), 'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'size' => 128), - 'phone' => array('type' => self::TYPE_STRING, 'size' => 32), + 'phone' => array('type' => self::TYPE_STRING, 'validate' => 'isPhoneNumber', 'size' => 32), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index e5f598aa4..d4b1e1ced 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -967,7 +967,7 @@ class AdminCustomersControllerCore extends AdminController // If customer is going to be deleted permanently then if customer has orders the change this customer as an anonymous customer if (Validate::isLoadedObject($objCustomer = $this->loadObject())) { if ($this->delete_mode == 'real' && Order::getCustomerOrders($objCustomer->id, true)) { - $customerEmail = $objCustomer->email; + $customerEmail = $objCustomer->email; $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::getShopDomain(); $objCustomer->deleted = 1; if (!$objCustomer->update()) { @@ -976,7 +976,7 @@ class AdminCustomersControllerCore extends AdminController } else { if ($customerDetail = CartCustomerGuestDetail::getCustomerDefaultDetails($customerEmail)) { $objCartCustomerGuestDetail = new CartCustomerGuestDetail($customerDetail['id_customer_guest_detail']); - $objCartCustomerGuestDetail->phone = preg_replace('/[0-p]/', 'x', $objCustomer->phone); + $objCartCustomerGuestDetail->phone = preg_replace('/[0-p]/', '0', $objCustomer->phone); $objCartCustomerGuestDetail->email = $objCustomer->email; $objCartCustomerGuestDetail->save(); } From caeaf41a586ae15f31ca807a2880eb5f6f705592 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 24 Jun 2024 11:14:09 +0530 Subject: [PATCH 08/16] removed address field from order confirmation mail --- classes/PaymentModule.php | 10 ---------- mails/en/order_conf.html | 30 ------------------------------ mails/en/order_conf.txt | 3 --- mails/en/overbooking.html | 29 ----------------------------- mails/en/overbooking.txt | 3 --- 5 files changed, 75 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index d7e75b7d2..98c00d8c3 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -1152,16 +1152,6 @@ abstract class PaymentModuleCore extends Module $this->context->currency, false ), - '{delivery_block_txt}' => $this->_getFormatedAddress($delivery, "\n"), - '{invoice_block_txt}' => $this->_getFormatedAddress($invoice, "\n"), - '{delivery_block_html}' => $this->_getFormatedAddress($delivery, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), - '{invoice_block_html}' => $this->_getFormatedAddress($invoice, '
', array( - 'firstname' => '%s', - 'lastname' => '%s' - )), '{delivery_company}' => $delivery->company, '{delivery_firstname}' => $delivery->firstname, '{delivery_lastname}' => $delivery->lastname, diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 1f701f139..c5990d109 100755 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -317,36 +317,6 @@   - - - - - - - -
  - - - - - - -
  - -

- Customer address

- - {invoice_block_html} - - -
-
 
-
- - - -   - diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt index 06eeabbb7..2f6384972 100644 --- a/mails/en/order_conf.txt +++ b/mails/en/order_conf.txt @@ -37,9 +37,6 @@ Extra Services Tax Final Booking Amount {total_paid} -Customer address -{invoice_block_html} - You can review your order and download your invoice from the "Order history" [{history_url}] section of your customer account by clicking "My account" diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html index 4fc0e43c6..95631ee77 100755 --- a/mails/en/overbooking.html +++ b/mails/en/overbooking.html @@ -318,35 +318,6 @@   - - - - - - -
- - - - - - -
  - -

- Customer address

- - {invoice_block_html} - - -
-
 
-
- - - -   - diff --git a/mails/en/overbooking.txt b/mails/en/overbooking.txt index a6bd05b32..6a8f8975a 100644 --- a/mails/en/overbooking.txt +++ b/mails/en/overbooking.txt @@ -43,9 +43,6 @@ Extra Services Tax Final Booking Amount {total_paid} -Customer address -{invoice_block_html} - You can review your order and download your invoice from the "Order history" [{history_url}] section of your customer account by clicking "My account" From 206b5bcf0718081e84a2ccb018064bc79a0fa252 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 10 Jul 2024 17:37:07 +0530 Subject: [PATCH 09/16] Fixed: Notice on the order-opc page when admin creates address using inactive country for a customer --- controllers/front/ParentOrderController.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 7bac1b5d9..655d805ac 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -423,25 +423,6 @@ class ParentOrderControllerCore extends FrontController $customerAddresses = array_values($customerAddresses); - if (!count($customerAddresses) && !Tools::isSubmit('ajax')) { - $bad_delivery = false; - if (($bad_delivery = (bool)!Address::isCountryActiveById((int)$this->context->cart->id_address_delivery)) || !Address::isCountryActiveById((int)$this->context->cart->id_address_invoice)) { - $params = array(); - if ($this->step) { - $params['step'] = (int)$this->step; - } - if ($multi = (int)Tools::getValue('multi-shipping')) { - $params['multi-shipping'] = $multi; - } - $back_url = $this->context->link->getPageLink('order', true, (int)$this->context->language->id, $params); - - $params = array('back' => $back_url, 'id_address' => ($bad_delivery ? (int)$this->context->cart->id_address_delivery : (int)$this->context->cart->id_address_invoice)); - if ($multi) { - $params['multi-shipping'] = $multi; - } - - } - } $this->context->smarty->assign(array( 'addresses' => $customerAddresses, 'formatedAddressFieldsValuesList' => $formatedAddressFieldsValuesList) From 4c31e2a86d500fd0bbcb2cd165374968d635e404 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 5 Aug 2024 20:28:34 +0530 Subject: [PATCH 10/16] fixed phone number validation error on opc page --- controllers/admin/AdminCustomersController.php | 4 ++++ controllers/front/AuthController.php | 6 ++++++ controllers/front/IdentityController.php | 4 ++++ controllers/front/OrderOpcController.php | 4 ++++ .../hotel-reservation-theme/order-opc-edit-guest-info.tpl | 2 +- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 3a9898d5a..390532573 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -1159,8 +1159,12 @@ class AdminCustomersControllerCore extends AdminController $this->errors[] = Tools::displayError('Phone number is required.'); } } + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); if ($phone && !Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Invaid phone number.'); + } elseif ($phone && Tools::strlen($phone) > $rules['size']['phone']) { + $this->errors[] = Tools::displayError('Invaid phone number.'); } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 2a1e27120..e75224510 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -427,14 +427,20 @@ class AuthControllerCore extends FrontController } } + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); if ($error_phone) { $this->errors[] = Tools::displayError('Phone number is required.'); } else { if (Tools::getValue('phone') && !Validate::isPhoneNumber(Tools::getValue('phone'))) { $this->errors[] = Tools::displayError('Invald phone number.'); + } elseif (Tools::getValue('phone') && Tools::strlen(Tools::getValue('phone')) > $rules['size']['phone']) { + $this->errors[] = Tools::displayError('Invald phone number.'); } if (Tools::getValue('phone_mobile') && !Validate::isPhoneNumber(Tools::getValue('phone_mobile'))) { $this->errors[] = Tools::displayError('Invald mobile phone number.'); + } elseif (Tools::getValue('phone_mobile') && Tools::strlen(Tools::getValue('phone_mobile')) > $rules['size']['phone']) { + $this->errors[] = Tools::displayError('Invald mobile phone number.'); } } diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index aeaf3bc70..9fe263c30 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -88,8 +88,12 @@ class IdentityControllerCore extends FrontController $this->errors[] = Tools::displayError('Phone number is required.'); } } + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); if ($phone && !Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Invaid phone number.'); + } elseif ($phone && Tools::strlen($phone) > $rules['size']['phone']) { + $this->errors[] = Tools::displayError('Invaid phone number.'); } if (!count($this->errors)) { diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index a846d0a67..7d125a7d1 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -119,8 +119,12 @@ class OrderOpcControllerCore extends ParentOrderController if (Configuration::get('PS_ONE_PHONE_AT_LEAST') && !$phone) { $this->errors[] = Tools::displayError('Phone number is a required field.', false); } + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); if (!Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); + } elseif (Tools::strlen($phone) > $rules['size']['phone']) { + $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); } $_POST['lastname'] = $_POST['customer_lastname']; diff --git a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl index 9b0dc442d..ec645221d 100644 --- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl +++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl @@ -86,7 +86,7 @@
- +
From 22f3c2c02414a4d23604d3837789d46aac59cb08 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 8 Aug 2024 14:34:11 +0530 Subject: [PATCH 11/16] Update invoice address panel --- pdf/invoice.addresses-tab.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pdf/invoice.addresses-tab.tpl b/pdf/invoice.addresses-tab.tpl index c7f4c9fe0..0b743c4f0 100644 --- a/pdf/invoice.addresses-tab.tpl +++ b/pdf/invoice.addresses-tab.tpl @@ -34,11 +34,10 @@ + {l s='Customer Detail' pdf='true'}

{if $invoice_address} - {l s='Customer Address' pdf='true'}

{$invoice_address} {else} - {l s='Customer Detail' pdf='true'}

{$customer->firstname} {$customer->lastname}
{$customer->phone} From 2d7979e43dad3cf74311ac6eeaddc5d6e1b2978c Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 8 Aug 2024 14:53:31 +0530 Subject: [PATCH 12/16] update validation and error message --- controllers/admin/AdminCustomersController.php | 4 ++-- controllers/front/AuthController.php | 4 ++-- controllers/front/IdentityController.php | 2 +- controllers/front/OrderOpcController.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index f6014c996..7161974ea 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -992,7 +992,7 @@ class AdminCustomersControllerCore extends AdminController } else { if ($customerDetail = CartCustomerGuestDetail::getCustomerDefaultDetails($customerEmail)) { $objCartCustomerGuestDetail = new CartCustomerGuestDetail($customerDetail['id_customer_guest_detail']); - $objCartCustomerGuestDetail->phone = preg_replace('/[0-p]/', '0', $objCustomer->phone); + $objCartCustomerGuestDetail->phone = preg_replace('/[0-9]/', '0', $objCustomer->phone); $objCartCustomerGuestDetail->email = $objCustomer->email; $objCartCustomerGuestDetail->save(); } @@ -1165,7 +1165,7 @@ class AdminCustomersControllerCore extends AdminController if ($phone && !Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Invaid phone number.'); } elseif ($phone && Tools::strlen($phone) > $rules['size']['phone']) { - $this->errors[] = Tools::displayError('Invaid phone number.'); + $this->errors[] = sprintf(Tools::displayError('Phone number is too long. (%s chars max).'), $rules['size']['phone']); } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index e75224510..414705a96 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -435,12 +435,12 @@ class AuthControllerCore extends FrontController if (Tools::getValue('phone') && !Validate::isPhoneNumber(Tools::getValue('phone'))) { $this->errors[] = Tools::displayError('Invald phone number.'); } elseif (Tools::getValue('phone') && Tools::strlen(Tools::getValue('phone')) > $rules['size']['phone']) { - $this->errors[] = Tools::displayError('Invald phone number.'); + $this->errors[] = sprintf(Tools::displayError('Phone number is too long. (%s chars max).'), $rules['size']['phone']); } if (Tools::getValue('phone_mobile') && !Validate::isPhoneNumber(Tools::getValue('phone_mobile'))) { $this->errors[] = Tools::displayError('Invald mobile phone number.'); } elseif (Tools::getValue('phone_mobile') && Tools::strlen(Tools::getValue('phone_mobile')) > $rules['size']['phone']) { - $this->errors[] = Tools::displayError('Invald mobile phone number.'); + $this->errors[] = sprintf(Tools::displayError('mobile phone number is too long. (%s chars max).'), $rules['size']['phone']);; } } diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 9fe263c30..74dd6e667 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -93,7 +93,7 @@ class IdentityControllerCore extends FrontController if ($phone && !Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Invaid phone number.'); } elseif ($phone && Tools::strlen($phone) > $rules['size']['phone']) { - $this->errors[] = Tools::displayError('Invaid phone number.'); + $this->errors[] = sprintf(Tools::displayError('Phone number is too long. (%s chars max).'), $rules['size']['phone']);; } if (!count($this->errors)) { diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 7d125a7d1..ff1248344 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -124,7 +124,7 @@ class OrderOpcControllerCore extends ParentOrderController if (!Validate::isPhoneNumber($phone)) { $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); } elseif (Tools::strlen($phone) > $rules['size']['phone']) { - $this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false); + $this->errors[] = sprintf(Tools::displayError('Mobile phone number is too long. (%s chars max).'), $rules['size']['phone']); } $_POST['lastname'] = $_POST['customer_lastname']; From 02c8c76a04a2410a4cf93f0577aebb4765848f91 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 13 Aug 2024 15:46:28 +0530 Subject: [PATCH 13/16] add demo phone number for demo user --- .../fashion/data/cart_customer_guest_detail.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 install/fixtures/fashion/data/cart_customer_guest_detail.xml diff --git a/install/fixtures/fashion/data/cart_customer_guest_detail.xml b/install/fixtures/fashion/data/cart_customer_guest_detail.xml new file mode 100644 index 000000000..d8403ad87 --- /dev/null +++ b/install/fixtures/fashion/data/cart_customer_guest_detail.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From ed9cecd7921814c775c312a7adfbc10bb46b2613 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 13 Aug 2024 16:39:00 +0530 Subject: [PATCH 14/16] update phone number save proceess when address is created during registration --- controllers/front/AuthController.php | 20 +++++-------------- .../authentication.tpl | 4 ++-- .../order-opc-new-account.tpl | 4 ++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 414705a96..ad442f61f 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -409,8 +409,10 @@ class AuthControllerCore extends FrontController $customer = new Customer(); $lastnameAddress = Tools::getValue('lastname'); $firstnameAddress = Tools::getValue('firstname'); + $phoneAddress = Tools::getValue('phone'); $_POST['lastname'] = Tools::getValue('customer_lastname', $lastnameAddress); $_POST['firstname'] = Tools::getValue('customer_firstname', $firstnameAddress); + $_POST['phone'] = Tools::getValue('customer_phone', $phoneAddress); $addresses_types = []; if (Configuration::get('PS_REGISTRATION_PROCESS_TYPE')) { $addresses_types[] = 'address'; @@ -420,16 +422,9 @@ class AuthControllerCore extends FrontController $addresses_types[] = 'address_invoice'; } - $error_phone = false; - if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { - if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')) { - $error_phone = true; - } - } - $className = 'CartCustomerGuestDetail'; $rules = call_user_func(array($className, 'getValidationRules'), $className); - if ($error_phone) { + if (Configuration::get('PS_ONE_PHONE_AT_LEAST') && !Tools::getValue('phone')) { $this->errors[] = Tools::displayError('Phone number is required.'); } else { if (Tools::getValue('phone') && !Validate::isPhoneNumber(Tools::getValue('phone'))) { @@ -437,11 +432,6 @@ class AuthControllerCore extends FrontController } elseif (Tools::getValue('phone') && Tools::strlen(Tools::getValue('phone')) > $rules['size']['phone']) { $this->errors[] = sprintf(Tools::displayError('Phone number is too long. (%s chars max).'), $rules['size']['phone']); } - if (Tools::getValue('phone_mobile') && !Validate::isPhoneNumber(Tools::getValue('phone_mobile'))) { - $this->errors[] = Tools::displayError('Invald mobile phone number.'); - } elseif (Tools::getValue('phone_mobile') && Tools::strlen(Tools::getValue('phone_mobile')) > $rules['size']['phone']) { - $this->errors[] = sprintf(Tools::displayError('mobile phone number is too long. (%s chars max).'), $rules['size']['phone']);; - } } if (!Tools::getValue('is_new_customer', 1)) { @@ -474,7 +464,6 @@ class AuthControllerCore extends FrontController if (!count($this->errors)) { if ($customer->add()) { - CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, Tools::getValue('phone')); if (!$customer->is_guest) { if (!$this->sendConfirmationMail($customer)) { $this->errors[] = Tools::displayError('The email cannot be sent.'); @@ -622,8 +611,9 @@ class AuthControllerCore extends FrontController $this->errors[] = Tools::displayError('An error occurred while creating your account.'); } else { // save customer phone number in cart_customer_guest_detail - $phone = Tools::getValue('phone_mobile'); + $phone = Tools::getValue('phone'); CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $phone); + $_POST['phone'] = $phoneAddress; foreach ($addresses_types as $addresses_type) { $$addresses_type->id_customer = (int)$customer->id; diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl index 775af902a..e94709781 100644 --- a/themes/hotel-reservation-theme/authentication.tpl +++ b/themes/hotel-reservation-theme/authentication.tpl @@ -462,8 +462,8 @@
- - + +
diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl index 48fd39d32..a267c8af3 100644 --- a/themes/hotel-reservation-theme/order-opc-new-account.tpl +++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl @@ -101,8 +101,8 @@
- - + +
{if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} From 23a1b5854e287b2ef7f35b27471886712468d34a Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 14 Aug 2024 13:36:10 +0530 Subject: [PATCH 15/16] Auto fill phone number in address form --- .../controllers/addresses/helpers/form/form.tpl | 1 + classes/Customer.php | 12 ++++++++++++ controllers/admin/AdminAddressesController.php | 3 ++- controllers/front/AddressController.php | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl index 9fd0f69e6..d0f8312d6 100644 --- a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -71,6 +71,7 @@ $('input[name=lastname]').val(infos[1]); $('input[name=company]').val(infos[2]); $('input[name=id_customer]').val(infos[3]); + $('input[name=phone]').val(infos[4]); } else { resetCustomerRelatedAddressFields(); } diff --git a/classes/Customer.php b/classes/Customer.php index 6ce1c4cc2..662373283 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -490,6 +490,18 @@ class CustomerCore extends ObjectModel return Cache::retrieve($cache_id); } + public static function getPhone($id_customer) + { + + return Db::getInstance()->getValue( + 'SELECT cgd.`phone` + FROM `'._DB_PREFIX_.'customer` c + INNER JOIN `'._DB_PREFIX_.'cart_customer_guest_detail` cgd + ON (cgd.`email` = c.`email`) + WHERE `id_cart` = 0 AND c.`id_customer` = '.(int)($id_customer) + ); + } + public static function getCustomerIdAddress($id_customer, $use_cache = true) { $cache_id = 'Customer::getCustomerIdAddress'.(int)$id_customer; diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 1d4b32e9e..2f579a095 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -544,7 +544,8 @@ class AdminAddressesControllerCore extends AdminController $customer = Customer::searchByName($email); if (!empty($customer)) { $customer = $customer['0']; - echo json_encode(array('infos' => pSQL($customer['firstname']).'_'.pSQL($customer['lastname']).'_'.pSQL($customer['company']).'_'.pSQL($customer['id_customer']))); + $phone = Customer::getPhone($customer['id_customer']); + echo json_encode(array('infos' => pSQL($customer['firstname']).'_'.pSQL($customer['lastname']).'_'.pSQL($customer['company']).'_'.pSQL($customer['id_customer']).'_'.pSQL($phone))); } } die; diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 29a2ba952..55b376693 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -76,6 +76,7 @@ class AddressControllerCore extends FrontController $_POST['firstname'] = $this->context->customer->firstname; $_POST['lastname'] = $this->context->customer->lastname; $_POST['company'] = $this->context->customer->company; + $_POST['phone'] = $this->context->customer->phone; } } From 1277b3bf4a757fa47c08fe749b5aa94b79ed3590 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 21 Aug 2024 11:47:11 +0530 Subject: [PATCH 16/16] fixed phone number not saving issue --- classes/Validate.php | 2 +- controllers/front/AuthController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/Validate.php b/classes/Validate.php index 65fa7f790..4b7de5435 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -534,7 +534,7 @@ class ValidateCore */ public static function isPhoneNumber($number) { - return preg_match('/^[+0-9. ()-]*$/', $number); + return preg_match('/^\+?[\s\d.()-]*\d+$/', $number); } /** diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index ad442f61f..6a5f17daf 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -464,6 +464,8 @@ class AuthControllerCore extends FrontController if (!count($this->errors)) { if ($customer->add()) { + $phone = Tools::getValue('phone'); + CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $phone); if (!$customer->is_guest) { if (!$this->sendConfirmationMail($customer)) { $this->errors[] = Tools::displayError('The email cannot be sent.');