{l s='Total (Tax incl.)'}
diff --git a/classes/Cart.php b/classes/Cart.php
index ed44f01b6..99ef59611 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -3786,6 +3786,15 @@ class CartCore extends ObjectModel
}
$objHotelAdvancedPayment = new HotelAdvancedPayment();
+ $total_rooms_with_services_without_discount_te = $total_rooms + $total_demands + $total_additional_services + $total_additional_services_auto_add;
+ $total_rooms_with_services_without_discount_ti = $total_rooms_wt + $total_demands_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt;
+
+ $cart_total_without_discount_te = $total_rooms_with_services_without_discount_te + $convenience_fee;
+ $cart_total_without_discount_ti = $total_rooms_with_services_without_discount_ti + $convenience_fee_wt;
+ $total_tax_without_discount = $cart_total_without_discount_ti - $cart_total_without_discount_te;
+ if ($total_tax_without_discount < 0) {
+ $total_tax_without_discount = 0;
+ }
$summary = array(
'delivery' => $delivery,
@@ -3828,6 +3837,11 @@ class CartCore extends ObjectModel
'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1),
'free_ship' =>!$total_shipping && !count($this->getDeliveryAddressesWithoutCarriers(true, $errors)),
'carrier' => new Carrier($this->id_carrier, $id_lang),
+ 'total_rooms_with_services_without_discount_te' => $total_rooms_with_services_without_discount_te,
+ 'total_rooms_with_services_without_discount_ti' => $total_rooms_with_services_without_discount_ti,
+ 'cart_total_without_discount_te' => $cart_total_without_discount_te,
+ 'cart_total_without_discount_ti' => $cart_total_without_discount_ti,
+ 'total_tax_without_discount' => $total_tax_without_discount
);
$hook = Hook::exec('actionCartSummary', $summary, null, true);
diff --git a/classes/CartCustomerGuestDetail.php b/classes/CartCustomerGuestDetail.php
index 8d17a36c4..2d4ae2fa6 100644
--- a/classes/CartCustomerGuestDetail.php
+++ b/classes/CartCustomerGuestDetail.php
@@ -63,37 +63,14 @@ class CartCustomerGuestDetailCore extends ObjectModel
);
}
- public static function getCustomerDefaultDetails($email)
+ public static function getIdCustomerGuest($email)
{
- return Db::getInstance()->getRow(
- 'SELECT * FROM `'._DB_PREFIX_.'cart_customer_guest_detail`
+ return Db::getInstance()->getValue(
+ 'SELECT `id_customer_guest_detail` 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(
diff --git a/classes/Customer.php b/classes/Customer.php
index f418f1634..2983aa607 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -141,10 +141,6 @@ class CustomerCore extends ObjectModel
const STATUS_DELETED = 2;
protected $webserviceParameters = array(
- 'objectMethods' => array(
- 'add' => 'addWs',
- 'update' => 'updateWs'
- ),
'fields' => array(
'id_default_group' => array('xlink_resource' => 'groups'),
'id_lang' => array('xlink_resource' => 'languages'),
@@ -268,6 +264,7 @@ class CustomerCore extends ObjectModel
}
$success = parent::add($autodate, $null_values);
$this->updateGroup($this->groupBox);
+ $this->updateCustomerAdditionalDetails(CartCustomerGuestDetail::getIdCustomerGuest($this->email));
return $success;
}
@@ -290,25 +287,22 @@ class CustomerCore extends ObjectModel
}
}
- return parent::update(true);
+ $objOldCustomer = new Customer($this->id);
+ $success = parent::update(true);
+ $this->updateCustomerAdditionalDetails(CartCustomerGuestDetail::getIdCustomerGuest($objOldCustomer->email));
+ return $success;
}
- public function addWs($autodate = true, $null_values = false)
+ public function updateCustomerAdditionalDetails($idCustomerGuest)
{
- if ($this->phone) {
- CartCustomerGuestDetail::updateCustomerPhoneNumber($this->email, $this->phone);
- }
-
- return $this->add($autodate, $null_values);
- }
-
- public function updateWs($autodate = true, $null_values = false)
- {
- if ($this->phone) {
- CartCustomerGuestDetail::updateCustomerPhoneNumber($this->email, $this->phone);
- }
-
- return $this->update($autodate, $null_values);
+ $objCartCustomerGuestDetail = new CartCustomerGuestDetail($idCustomerGuest);
+ $objCartCustomerGuestDetail->id_cart = 0;
+ $objCartCustomerGuestDetail->id_gender = $this->id_gender;
+ $objCartCustomerGuestDetail->firstname = $this->firstname;
+ $objCartCustomerGuestDetail->lastname = $this->lastname;
+ $objCartCustomerGuestDetail->email = $this->email;
+ $objCartCustomerGuestDetail->phone = $this->phone;
+ return $objCartCustomerGuestDetail->save();
}
public function delete()
@@ -348,6 +342,9 @@ class CustomerCore extends ObjectModel
}
CartRule::deleteByIdCustomer((int)$this->id);
+ // delete customer data from customerGuest table
+ $objCartCustomerGuestDetail = new CartCustomerGuestDetail(CartCustomerGuestDetail::getIdCustomerGuest($this->email));
+ $objCartCustomerGuestDetail->delete();
return parent::delete();
}
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 1e1326d96..0765c063e 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -1097,15 +1097,16 @@ abstract class PaymentModuleCore extends Module
$additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
$additional_service_tax = ($additional_service_price_tax_incl - $additional_service_price_tax_excl);
-
// convenience fee price
$total_convenience_fee_ti = $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
$total_convenience_fee_te = $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
+ $total_convenience_fee_tax = $total_convenience_fee_ti - $total_convenience_fee_te;
// service products
// $service_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE);
// $service_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE);
// $service_products_tax = ($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) - $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE));
+ $total_order_tax = $room_tax + $additional_service_tax + $total_convenience_fee_tax;
$idOrderHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id);
$objHotelBranchInfo = new HotelBranchInformation($idOrderHotel, $order->id_lang);
@@ -1160,11 +1161,12 @@ abstract class PaymentModuleCore extends Module
'{discounts_txt}' => $cart_rules_list_txt,
'{total_paid}' => Tools::displayPrice($order->total_paid, $this->context->currency, false),
'{total_products}' => Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? $order->total_products : $order->total_products_wt, $this->context->currency, false),
- '{total_discounts}' => Tools::displayPrice($order->total_discounts, $this->context->currency, false),
+ '{total_discounts}' => Tools::displayPrice(-$order->total_discounts, $this->context->currency, false),
'{total_shipping}' => Tools::displayPrice($order->total_shipping, $this->context->currency, false),
'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $this->context->currency, false),
// '{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $this->context->currency, false),
'{total_tax_paid}' => Tools::displayPrice(($order->total_paid_tax_incl - $order->total_paid_tax_excl), $this->context->currency, false),
+ '{total_order_tax}' => Tools::displayPrice(($total_order_tax), $this->context->currency, false),
// additional data
'{room_price_tax_excl}' => Tools::displayPrice($room_price_tax_excl, $this->context->currency, false),
'{room_price_tax_incl}' => Tools::displayPrice($room_price_tax_incl, $this->context->currency, false),
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index 89f340ded..f8a6a1c15 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -561,7 +561,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['total_convenience_fee_ti'] = 0;
if ($idsOrderDetail = array_column($order_details, 'id_order_detail')) {
$footer['room_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
- $footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
+ $footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
// $footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE);
// $footer['service_products_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE);
$footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE;
@@ -569,7 +569,14 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
$footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
}
+
$footer['total_paid_real'] = $this->order_invoice->getTotalPaid();
+ $footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'];
+ $footer['total_without_discount_ti'] = $footer['room_price_tax_incl'] + $footer['total_convenience_fee_ti'] + $footer['additional_service_price_tax_incl'];
+ $footer['total_tax_without_discount'] = $footer['total_without_discount_ti'] - $footer['total_without_discount_te'];
+ if ($footer['total_tax_without_discount'] < 0) {
+ $footer['total_tax_without_discount'] = 0;
+ }
$data = array(
'cart_htl_data' => $cart_htl_data,
@@ -591,6 +598,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'ps_price_compute_precision' => _PS_PRICE_COMPUTE_PRECISION_,
'round_type' => $round_type,
'legal_free_text' => $legal_free_text,
+ 'total_without_discount_te' => $total_without_discount_te,
+ 'total_without_discount_ti' => $total_without_discount_ti,
+ 'total_tax_without_discount' => $total_tax_without_discount
);
if (Tools::getValue('debug')) {
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index d83fabe91..cc4f720da 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -1331,6 +1331,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objCustomer->lastname = $customerDetails['lastname'];
$objCustomer->email = $customerDetails['email'];
$objCustomer->passwd = md5(time()._COOKIE_KEY_);
+ $objCustomer->phone = (isset($customerDetails['phone']) ? $customerDetails['phone'] : '');
$objCustomer->cleanGroups();
$objCustomer->add();
$this->bookingCustomer = $objCustomer;
@@ -1345,8 +1346,10 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
if (isset($customerDetails['email']) && Validate::isEmail($customerDetails['email'])) {
$this->bookingCustomer->email = $customerDetails['email'];
- } else {
- $customerDetails['email'] = $this->bookingCustomer->email;
+ }
+
+ if (isset($customerDetails['phone']) && Validate::isPhoneNumber($customerDetails['phone'])) {
+ $this->bookingCustomer->phone = $customerDetails['phone'];
}
$this->bookingCustomer->save();
@@ -1389,10 +1392,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objAddress->save();
}
- if (isset($customerDetails['phone']) && Validate::isPhoneNumber($customerDetails['phone'])) {
- CartCustomerGuestDetail::updateCustomerPhoneNumber($customerDetails['email'], $customerDetails['phone']);
- }
-
// to remove the older non ordered cart for this customer.
$this->context->cookie->id_cart = $this->context->cart->id;
$this->context->updateCustomer($this->bookingCustomer, 1);
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index c31aad99f..49e8ade9a 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -440,7 +440,7 @@ class AdminCustomersControllerCore extends AdminController
'label' => $this->l('Phone'),
'name' => 'phone',
'col' => '4',
- 'required' => true,
+ 'required' => Configuration::get('PS_ONE_PHONE_AT_LEAST') ? true : false,
'autocomplete' => false
),
array(
@@ -1003,8 +1003,8 @@ class AdminCustomersControllerCore extends AdminController
$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']);
+ if ($idCustomerGuest = CartCustomerGuestDetail::getIdCustomerGuest($customerEmail)) {
+ $objCartCustomerGuestDetail = new CartCustomerGuestDetail($idCustomerGuest);
$objCartCustomerGuestDetail->phone = preg_replace('/[0-9]/', '0', $objCustomer->phone);
$objCartCustomerGuestDetail->email = $objCustomer->email;
$objCartCustomerGuestDetail->save();
@@ -1102,7 +1102,6 @@ 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;
}
@@ -1142,10 +1141,7 @@ class AdminCustomersControllerCore extends AdminController
}
}
- if ($res = parent::processUpdate()) {
- CartCustomerGuestDetail::updateCustomerPhoneNumber($this->object->email, Tools::getValue('phone'));
- return $res;
- }
+ return parent::processUpdate();
} else {
$this->errors[] = Tools::displayError('An error occurred while loading the object.').'
'.$this->table.' '.Tools::displayError('(cannot load object)');
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index f7b347fc7..43ee57298 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -2846,9 +2846,6 @@ class AdminImportControllerCore extends AdminController
if ($res && isset($customer_groups)) {
$customer->updateGroup($customer_groups);
- if ($phoneRequired) {
- CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $customer->phone);
- }
}
}
}
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index a6e43a108..ff254b67a 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -465,9 +465,8 @@ class AuthControllerCore extends FrontController
$customer->active = 1;
if (!count($this->errors)) {
+ $customer->phone = Tools::getValue('phone');
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.');
@@ -610,12 +609,10 @@ class AuthControllerCore extends FrontController
} else {
$customer->is_guest = 0;
}
+ $customer->phone = Tools::getValue('phone');
if (!$customer->save()) {
$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');
- CartCustomerGuestDetail::updateCustomerPhoneNumber($customer->email, $phone);
$_POST['phone'] = $phoneAddress;
foreach ($addresses_types as $addresses_type) {
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index 2bfb8c6cb..10d9a0ae0 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -182,8 +182,7 @@ class CategoryControllerCore extends FrontController
$booking_data = $objBookingDetail->dataForFrontSearch($bookingParams);
- $obj_booking_detail = new HotelBookingDetail();
- $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to);
+ $num_days = $objBookingDetail->getNumberOfDays($date_from, $date_to);
$warning_num = Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER');
diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php
index 74dd6e667..65ce13b27 100644
--- a/controllers/front/IdentityController.php
+++ b/controllers/front/IdentityController.php
@@ -94,6 +94,8 @@ class IdentityControllerCore extends FrontController
$this->errors[] = Tools::displayError('Invaid phone number.');
} elseif ($phone && Tools::strlen($phone) > $rules['size']['phone']) {
$this->errors[] = sprintf(Tools::displayError('Phone number is too long. (%s chars max).'), $rules['size']['phone']);;
+ } else {
+ $this->customer->phone = $phone;
}
if (!count($this->errors)) {
@@ -123,7 +125,6 @@ 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);
@@ -164,6 +165,7 @@ class IdentityControllerCore extends FrontController
'sl_day' => $birthday[2],
'errors' => $this->errors,
'genders' => Gender::getGenders(),
+ 'one_phone_at_least' => (int)Configuration::get('PS_ONE_PHONE_AT_LEAST'),
));
// Call a hook to display more information
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index abc2a05b7..4747d5ee6 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -394,6 +394,10 @@ class OrderConfirmationControllerCore extends FrontController
$orderTotalInfo['total_paid'] += $objCartOrder->total_paid;
$orderTotalInfo['total_paid_real'] += $objCartOrder->total_paid_real;
}
+
+ $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti'];
+ $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te'];
+ $orderTotalInfo['total_tax_without_discount'] = $totalTaxIncl - $totalTaxExcl;
}
$this->context->smarty->assign('orderTotalInfo', $orderTotalInfo);
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index ff1248344..61b602ec3 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -125,6 +125,8 @@ class OrderOpcControllerCore extends ParentOrderController
$this->errors[] = Tools::displayError('Please enter a valid Mobile phone number.', false);
} elseif (Tools::strlen($phone) > $rules['size']['phone']) {
$this->errors[] = sprintf(Tools::displayError('Mobile phone number is too long. (%s chars max).'), $rules['size']['phone']);
+ } else {
+ $this->context->customer = $phone;
}
$_POST['lastname'] = $_POST['customer_lastname'];
@@ -157,7 +159,6 @@ 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;
diff --git a/install/data/xml/address_format.xml b/install/data/xml/address_format.xml
index e9549056e..53107b786 100644
--- a/install/data/xml/address_format.xml
+++ b/install/data/xml/address_format.xml
@@ -13,7 +13,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -23,7 +24,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -33,7 +35,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -42,7 +45,8 @@ address1
address2
city State:name postcode
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -52,7 +56,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -62,7 +67,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -72,7 +78,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -82,7 +89,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -92,7 +100,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -103,7 +112,8 @@ address2
postcode city
State:name
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -114,7 +124,8 @@ address2
postcode city
State:name
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -124,7 +135,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -134,7 +146,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -144,7 +157,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -154,7 +168,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -164,7 +179,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -175,7 +191,8 @@ address2
city
postcode
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -185,7 +202,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -195,7 +213,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -205,7 +224,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -213,7 +233,8 @@ company
address1 address2
city, State:name postcode
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -223,7 +244,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -233,7 +255,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -243,7 +266,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -253,7 +277,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -263,7 +288,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -273,7 +299,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -283,7 +310,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -293,7 +321,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -303,7 +332,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -313,7 +343,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -323,7 +354,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -333,7 +365,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -343,7 +376,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -353,7 +387,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -363,7 +398,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -373,7 +409,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -383,7 +420,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -393,7 +431,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -403,7 +442,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -413,7 +453,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -423,7 +464,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -433,7 +475,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -444,7 +487,8 @@ address2
postcode city
State:name
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -454,7 +498,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -464,7 +509,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -474,7 +520,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -484,7 +531,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -494,7 +542,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -504,7 +553,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -514,7 +564,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -524,7 +575,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -534,7 +586,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -544,7 +597,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -554,7 +608,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -564,7 +619,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -574,7 +630,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -584,7 +641,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -594,7 +652,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -604,7 +663,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -614,7 +674,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -624,7 +685,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -634,7 +696,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -644,7 +707,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -654,7 +718,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -664,7 +729,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -674,7 +740,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -684,7 +751,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -694,7 +762,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -704,7 +773,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -714,7 +784,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -724,7 +795,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -734,7 +806,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -744,7 +817,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -754,7 +828,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -764,7 +839,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -774,7 +850,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -784,7 +861,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -794,7 +872,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -804,7 +883,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -814,7 +894,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -824,7 +905,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -834,7 +916,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -844,7 +927,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -854,7 +938,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -864,7 +949,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -874,7 +960,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -884,7 +971,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -894,7 +982,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -904,7 +993,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -914,7 +1004,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -924,7 +1015,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -934,7 +1026,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -944,7 +1037,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -954,7 +1048,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -964,7 +1059,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -974,7 +1070,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -984,7 +1081,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -994,7 +1092,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1004,7 +1103,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1014,7 +1114,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1024,7 +1125,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1034,7 +1136,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1044,7 +1147,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1054,7 +1158,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1064,7 +1169,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1074,7 +1180,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1084,7 +1191,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1094,7 +1202,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1104,7 +1213,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1115,7 +1225,8 @@ address2
postcode city
State:name
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1125,7 +1236,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1135,7 +1247,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1145,7 +1258,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1155,7 +1269,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1165,7 +1280,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1175,7 +1291,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1185,7 +1302,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1195,7 +1313,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1205,7 +1324,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1215,7 +1335,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1225,7 +1346,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1235,7 +1357,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1245,7 +1368,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1255,7 +1379,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1265,7 +1390,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1275,7 +1401,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1285,7 +1412,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1295,7 +1423,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1305,7 +1434,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1315,7 +1445,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1325,7 +1456,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1335,7 +1467,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1345,7 +1478,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1355,7 +1489,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1365,7 +1500,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1375,7 +1511,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1385,7 +1522,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1395,7 +1533,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1405,7 +1544,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1415,7 +1555,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1425,7 +1566,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1435,7 +1577,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1445,7 +1588,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1456,7 +1600,8 @@ address2
postcode city
State:name
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1466,7 +1611,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1476,7 +1622,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1486,7 +1633,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1496,7 +1644,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1506,7 +1655,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1516,7 +1666,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1526,7 +1677,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1536,7 +1688,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1546,7 +1699,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1556,7 +1710,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1566,7 +1721,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1576,7 +1732,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1586,7 +1743,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1596,7 +1754,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1606,7 +1765,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1616,7 +1776,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1626,7 +1787,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1636,7 +1798,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1646,7 +1809,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1656,7 +1820,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1666,7 +1831,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1676,7 +1842,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1686,7 +1853,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1696,7 +1864,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1706,7 +1875,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1716,7 +1886,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1726,7 +1897,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1736,7 +1908,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1746,7 +1919,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1756,7 +1930,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1766,7 +1941,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1776,7 +1952,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1786,7 +1963,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1796,7 +1974,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1806,7 +1985,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1816,7 +1996,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1826,7 +2007,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1836,7 +2018,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1846,7 +2029,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1856,7 +2040,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1866,7 +2051,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1876,7 +2062,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1886,7 +2073,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1896,7 +2084,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1906,7 +2095,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1916,7 +2106,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1926,7 +2117,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1936,7 +2128,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1946,7 +2139,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1956,7 +2150,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1966,7 +2161,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1976,7 +2172,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1986,7 +2183,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -1996,7 +2194,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2006,7 +2205,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2016,7 +2216,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2026,7 +2227,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2036,7 +2238,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2046,7 +2249,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2056,7 +2260,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2066,7 +2271,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2076,7 +2282,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2086,7 +2293,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2096,7 +2304,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2106,7 +2315,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2116,7 +2326,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2126,7 +2337,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2136,7 +2348,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2146,7 +2359,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2156,7 +2370,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2166,7 +2381,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2176,7 +2392,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2186,7 +2403,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2196,7 +2414,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2206,7 +2425,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2216,7 +2436,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2226,7 +2447,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2236,7 +2458,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2246,7 +2469,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2256,7 +2480,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2266,7 +2491,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2276,7 +2502,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2286,7 +2513,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2296,7 +2524,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2306,7 +2535,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2316,7 +2546,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2326,7 +2557,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2336,7 +2568,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2346,7 +2579,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2356,7 +2590,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2366,7 +2601,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2376,7 +2612,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2386,7 +2623,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2396,7 +2634,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2406,7 +2645,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2416,7 +2656,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2426,7 +2667,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2436,7 +2678,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
firstname lastname
@@ -2446,7 +2689,8 @@ address1
address2
postcode city
Country:name
-Customer:phone
+phone
+phone_mobile
diff --git a/install/fixtures/fashion/data/cart_customer_guest_detail.xml b/install/fixtures/fashion/data/cart_customer_guest_detail.xml
deleted file mode 100644
index d8403ad87..000000000
--- a/install/fixtures/fashion/data/cart_customer_guest_detail.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/install/fixtures/fashion/data/customer.xml b/install/fixtures/fashion/data/customer.xml
index f067091b4..20e956d3e 100644
--- a/install/fixtures/fashion/data/customer.xml
+++ b/install/fixtures/fashion/data/customer.xml
@@ -17,9 +17,10 @@
+
-
+
pub@qloapps.com
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index a5d8bfafa..763525bea 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -135,11 +135,6 @@
-
-
- {discounts}
-
-
-
-
-
-
-
-
-
-
- Discounts
-
-
-
-
-
-
-
-
-
-
-
-
- {total_discounts}
-
-
-
-
-
-
-
@@ -274,7 +240,35 @@
- {total_tax_paid}
+ {total_order_tax}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Discounts
+
+
+
+
+
+
+
+
+
+
+
+
+ {total_discounts}
diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
index 7cbc6220f..eadc90767 100644
--- a/mails/en/order_conf.txt
+++ b/mails/en/order_conf.txt
@@ -25,15 +25,15 @@ Total Rooms Cost
Total Extra Services Cost
{total_extra_demands_te}
-Discounts
-{total_discounts}
-
Total Rooms Tax
{total_tax_paid}
Extra Services Tax
{extra_demands_tax}
+Discounts
+{total_discounts}
+
Final Booking Amount
{total_paid}
diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html
index fb2340f07..09bc78bdd 100755
--- a/mails/en/order_conf_admin.html
+++ b/mails/en/order_conf_admin.html
@@ -149,11 +149,6 @@
{extra_demands_details_html}
-
-
- {discounts}
-
-
-
-
-
-
-
-
-
- Discounts
-
-
-
-
-
-
-
-
-
-
-
-
- {total_discounts}
-
-
-
-
-
-
-
@@ -286,7 +253,35 @@
- {total_tax_paid}
+ {total_order_tax}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Discounts
+
+
+
+
+
+
+
+
+
+
+
+
+ {total_discounts}
diff --git a/mails/en/order_conf_admin.txt b/mails/en/order_conf_admin.txt
index 3ee04fb3a..4647a2889 100644
--- a/mails/en/order_conf_admin.txt
+++ b/mails/en/order_conf_admin.txt
@@ -32,8 +32,6 @@ Total Rooms Cost
Total Extra Services Cost
{total_extra_demands_te}
-Discounts
-{total_discounts}
Total Rooms Tax
{total_tax_paid}
@@ -41,6 +39,9 @@ Total Rooms Tax
Extra Services Tax
{extra_demands_tax}
+Discounts
+{total_discounts}
+
Final Booking Amount
{total_paid}
diff --git a/mails/en/order_conf_cart_rules.tpl b/mails/en/order_conf_cart_rules.tpl
index 742554d72..7a1a683b0 100644
--- a/mails/en/order_conf_cart_rules.tpl
+++ b/mails/en/order_conf_cart_rules.tpl
@@ -13,7 +13,7 @@
-
+
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html
index 9980442e1..d005296c1 100755
--- a/mails/en/overbooking.html
+++ b/mails/en/overbooking.html
@@ -137,11 +137,6 @@
-
-
- {discounts}
-
-
@@ -199,34 +194,6 @@
-
-
-
-
-
-
-
- Discounts
-
-
-
-
-
-
-
-
-
-
-
-
- {total_discounts}
-
-
-
-
-
-
-
@@ -275,7 +242,35 @@
- {total_tax_paid}
+ {total_order_tax}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Discounts
+
+
+
+
+
+
+
+
+
+
+
+
+ {total_discounts}
diff --git a/mails/en/overbooking.txt b/mails/en/overbooking.txt
index bc18d9515..f4ad32eb3 100644
--- a/mails/en/overbooking.txt
+++ b/mails/en/overbooking.txt
@@ -23,8 +23,6 @@ Total
{extra_demands_details_text}
-{discounts}
-
Total Rooms Cost
{total_products}
diff --git a/mails/en/overbooking_admin.html b/mails/en/overbooking_admin.html
index 4804802dd..d06ff9a18 100755
--- a/mails/en/overbooking_admin.html
+++ b/mails/en/overbooking_admin.html
@@ -152,13 +152,6 @@
{extra_demands_details_html}
-
-
-
-
-
-
-
-
-
-
-
-
- Discounts
-
-
-
-
-
-
-
-
-
-
-
-
- {total_discounts}
-
-
-
-
-
-
-
@@ -291,7 +256,35 @@
- {total_tax_paid}
+ {total_order_tax}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Discounts
+
+
+
+
+
+
+
+
+
+
+
+
+ {total_discounts}
diff --git a/mails/en/password.html b/mails/en/password.html
index b3721eef5..8df2f17ac 100644
--- a/mails/en/password.html
+++ b/mails/en/password.html
@@ -4,51 +4,51 @@
Message from {shop_name}
-
-
-
@@ -112,7 +112,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
diff --git a/mails/en/password.txt b/mails/en/password.txt
index 1a8b0677f..51c63ed50 100644
--- a/mails/en/password.txt
+++ b/mails/en/password.txt
@@ -1,20 +1,20 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
E-MAIL ADDRESS: {email}
-PASSWORD: {passwd}
+PASSWORD: {passwd}
You can review your order and download your invoice from the
"Order history" [/{history_url}] section of your customer account by
-clicking "My account" [/{my_account_url}] on our website.
+clicking "My account" [/{my_account_url}] on our website.
If you have a guest account, you can follow your order via the
-"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
-on our website.
+"Guest Tracking" [/{guest_tracking_url}] section
+on our website.
{shop_name} [/{shop_url}] powered by Webkul(tm)
-[https://webkul.com]
+[https://webkul.com]
diff --git a/pdf/invoice.total-tab.tpl b/pdf/invoice.total-tab.tpl
index 4de340a56..13d58257a 100644
--- a/pdf/invoice.total-tab.tpl
+++ b/pdf/invoice.total-tab.tpl
@@ -52,16 +52,6 @@
{/if}
- {if $footer.product_discounts_tax_excl > 0}
-
-
- {l s='Total Discounts' pdf='true'}
-
-
- - {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_excl}
-
-
- {/if}
{* {if isset($footer.product_taxes) && $footer.product_taxes}
@@ -108,21 +98,30 @@
{l s='Total (Tax excl.)' pdf='true'}
- {displayPrice currency=$order->id_currency price=$footer.total_paid_tax_excl}
+ {displayPrice currency=$order->id_currency price=$footer.total_without_discount_te}
- {if $footer.total_taxes > 0}
+ {if $footer.total_tax_without_discount > 0}
{l s='Total Tax' pdf='true'}
- {displayPrice currency=$order->id_currency price=$footer.total_taxes}
+ {displayPrice currency=$order->id_currency price=$footer.total_tax_without_discount}
{/if}
-
+ {if $footer.product_discounts_tax_incl > 0}
+
+
+ {l s='Total Discounts' pdf='true'}
+
+
+ - {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_incl}
+
+
+ {/if}
{l s='Final Booking Amount' pdf='true'}
diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl
index 10dee22dc..14baff140 100644
--- a/themes/hotel-reservation-theme/authentication.tpl
+++ b/themes/hotel-reservation-theme/authentication.tpl
@@ -489,7 +489,7 @@
- {l s='Phone'}
+ {l s='Phone'} {if isset($one_phone_at_least) && $one_phone_at_least}* {/if}
diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl
index b4b85116d..a8d12a50d 100644
--- a/themes/hotel-reservation-theme/identity.tpl
+++ b/themes/hotel-reservation-theme/identity.tpl
@@ -90,7 +90,7 @@
{/if}
- {if $order->total_discounts > 0}
-
-
-
- {l s='Total Vouchers'}
-
-
- {if $priceDisplay && $use_tax}
- {displayWtPriceWithCurrency price=($orderTotalInfo['total_discounts_te'] * -1) currency=$objOrderCurrency convert=1}
- {else}
- {displayWtPriceWithCurrency price=($orderTotalInfo['total_discounts'] * -1) currency=$objOrderCurrency convert=1}
- {/if}
-
-
- {/if}
{if $priceDisplay && $use_tax && $orderTotalInfo['total_convenience_fee_te']}
@@ -391,9 +376,24 @@
{l s='Total Tax'}
- {displayWtPriceWithCurrency price=$orderTotalInfo['total_tax'] currency=$objOrderCurrency convert=1}
+ {displayWtPriceWithCurrency price=$orderTotalInfo['total_tax_without_discount'] currency=$objOrderCurrency convert=1}
+ {if $order->total_discounts > 0}
+
+
+
+ {l s='Total Vouchers'}
+
+
+ {if $priceDisplay && $use_tax}
+ {displayWtPriceWithCurrency price=($orderTotalInfo['total_discounts_te'] * -1) currency=$objOrderCurrency convert=1}
+ {else}
+ {displayWtPriceWithCurrency price=($orderTotalInfo['total_discounts'] * -1) currency=$objOrderCurrency convert=1}
+ {/if}
+
+
+ {/if}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index 563f44879..b2f89be2e 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -262,6 +262,7 @@
{assign var=room_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)}
{assign var=additional_service_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_te)}
{assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_ti)}
+ {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($additional_service_price_tax_incl - $additional_service_price_tax_excl ))}
{if $priceDisplay && $use_tax && $room_price_tax_excl}
{l s='Total rooms cost (tax excl.)'}
@@ -278,14 +279,6 @@
{/if}
- {if $order->total_discounts > 0}
-
- {l s='Total Vouchers'}
-
- -{displayWtPriceWithCurrency price=$order->total_discounts currency=$currency convert=1}
-
-
- {/if}
{if $priceDisplay && $use_tax && $total_convenience_fee_te}
{l s='Total Convenience Fees (tax excl.)'}
@@ -305,9 +298,18 @@
{l s='Total Tax'}
- {displayWtPriceWithCurrency price=($order->total_paid - $order->total_paid_tax_excl) currency=$currency}
+ {displayWtPriceWithCurrency price=($total_tax_without_discount) currency=$currency}
+
+ {if $order->total_discounts > 0}
+
+ {l s='Total Vouchers'}
+
+ -{displayWtPriceWithCurrency price=$order->total_discounts currency=$currency convert=1}
+
+
+ {/if}
{l s='Final Booking Total'}
@@ -648,6 +650,7 @@
{assign var=room_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)}
{assign var=additional_service_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_te)}
{assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_ti)}
+ {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($additional_service_price_tax_incl - $additional_service_price_tax_excl ))}
{if $priceDisplay && $use_tax && $room_price_tax_excl}
{l s='Total rooms cost (tax excl.)'}
@@ -664,14 +667,6 @@
{/if}
- {if $order->total_discounts > 0}
-
- {l s='Total Vouchers'}
-
- -{displayWtPriceWithCurrency price=$order->total_discounts currency=$currency convert=1}
-
-
- {/if}
{if $priceDisplay && $use_tax && $total_convenience_fee_te}
{l s='Total Convenience Fees (tax excl.)'}
@@ -691,9 +686,17 @@
{l s='Total Tax'}
- {displayWtPriceWithCurrency price=($order->total_paid - $order->total_paid_tax_excl) currency=$currency}
+ {displayWtPriceWithCurrency price=($total_tax_without_discount) currency=$currency}
+ {if $order->total_discounts > 0}
+
+ {l s='Total Vouchers'}
+
+ -{displayWtPriceWithCurrency price=$order->total_discounts currency=$currency convert=1}
+
+
+ {/if}
{l s='Final Booking Total'}
diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl
index b34e73cab..3f342c077 100644
--- a/themes/hotel-reservation-theme/order-opc.tpl
+++ b/themes/hotel-reservation-theme/order-opc.tpl
@@ -301,7 +301,7 @@
{if $show_taxes}
{l s='Total tax'}
- {displayPrice price=($total_tax)}
+ {displayPrice price=($total_tax_without_discount)}
{/if}