diff --git a/classes/Page.php b/classes/Page.php
index d2c26df76..f63641032 100644
--- a/classes/Page.php
+++ b/classes/Page.php
@@ -75,7 +75,7 @@ class PageCore extends ObjectModel
FROM `'._DB_PREFIX_.'page`
WHERE `id_page_type` = '.(int)$page_type_id.$where;
$result = Db::getInstance()->getRow($sql);
- if ($result['id_page']) {
+ if (isset($result['id_page']) && $result['id_page']) {
return $result['id_page'];
}
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index c1427a39f..44d4a95f1 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -379,19 +379,23 @@ abstract class PaymentModuleCore extends Module
(float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, $order->product_list, $id_carrier),
_PS_PRICE_COMPUTE_PRECISION_
);
- $order->amount_paid = (float)Tools::ps_round(
- (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)),
- _PS_PRICE_COMPUTE_PRECISION_
- );
+ if ($totalOrder = $this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)) {
+ $order->amount_paid = (float)Tools::ps_round(
+ (($order->advance_paid_amount * $amount_paid) / $totalOrder),
+ _PS_PRICE_COMPUTE_PRECISION_
+ );
+ }
} else {
$order->advance_paid_amount = (float)Tools::ps_round(
(float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier),
_PS_PRICE_COMPUTE_PRECISION_
);
- $order->amount_paid = (float)Tools::ps_round(
- (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)),
- _PS_PRICE_COMPUTE_PRECISION_
- );
+ if ($orderTotal = $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)) {
+ $order->amount_paid = (float)Tools::ps_round(
+ (($order->advance_paid_amount * $amount_paid) / $orderTotal),
+ _PS_PRICE_COMPUTE_PRECISION_
+ );
+ }
}
// Creating order
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index 41623a56e..10c549b4e 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -219,13 +219,13 @@ class OrderReturnCore extends ObjectModel
0
);
$bookingRow['additional_services_tax_excl'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
- $id_order,
+ $bookingRow['id_order'],
0,
0,
- $type_value['product_id'],
- $data_v['date_from'],
- $data_v['date_to'],
- $data_v['id_room'],
+ $bookingRow['id_product'],
+ $bookingRow['date_from'],
+ $bookingRow['date_to'],
+ $bookingRow['id_room'],
1,
0
);
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index ae49e80d2..20725ae55 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -369,49 +369,49 @@ class AdminCategoriesControllerCore extends AdminController
}
}
- public function renderKpis()
- {
- $time = time();
- $kpis = array();
+ // public function renderKpis()
+ // {
+ // $time = time();
+ // $kpis = array();
- $helper = new HelperKpi();
- $helper->id = 'box-disabled-categories';
- $helper->icon = 'icon-off';
- $helper->color = 'color1';
- $helper->title = $this->l('Disabled Categories', null, null, false);
- $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_categories';
- $kpis[] = $helper->generate();
+ // $helper = new HelperKpi();
+ // $helper->id = 'box-disabled-categories';
+ // $helper->icon = 'icon-off';
+ // $helper->color = 'color1';
+ // $helper->title = $this->l('Disabled Categories', null, null, false);
+ // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_categories';
+ // $kpis[] = $helper->generate();
- // $helper = new HelperKpi();
- // $helper->id = 'box-empty-categories';
- // $helper->icon = 'icon-bookmark-empty';
- // $helper->color = 'color2';
- // $helper->href = $this->context->link->getAdminLink('AdminTracking');
- // $helper->title = $this->l('Empty Categories', null, null, false);
- // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=empty_categories';
- // $kpis[] = $helper->generate();
+ // // $helper = new HelperKpi();
+ // // $helper->id = 'box-empty-categories';
+ // // $helper->icon = 'icon-bookmark-empty';
+ // // $helper->color = 'color2';
+ // // $helper->href = $this->context->link->getAdminLink('AdminTracking');
+ // // $helper->title = $this->l('Empty Categories', null, null, false);
+ // // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=empty_categories';
+ // // $kpis[] = $helper->generate();
- $helper = new HelperKpi();
- $helper->id = 'box-top-category';
- $helper->icon = 'icon-money';
- $helper->color = 'color3';
- $helper->title = $this->l('Top Category', null, null, false);
- $helper->subtitle = $this->l('30 days', null, null, false);
- $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=top_category';
- $kpis[] = $helper->generate();
+ // $helper = new HelperKpi();
+ // $helper->id = 'box-top-category';
+ // $helper->icon = 'icon-money';
+ // $helper->color = 'color3';
+ // $helper->title = $this->l('Top Category', null, null, false);
+ // $helper->subtitle = $this->l('30 days', null, null, false);
+ // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=top_category';
+ // $kpis[] = $helper->generate();
- $helper = new HelperKpi();
- $helper->id = 'box-products-per-category';
- $helper->icon = 'icon-search';
- $helper->color = 'color4';
- $helper->title = $this->l('Average number of products per category', null, null, false);
- $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=products_per_category';
- $kpis[] = $helper->generate();
+ // $helper = new HelperKpi();
+ // $helper->id = 'box-products-per-category';
+ // $helper->icon = 'icon-search';
+ // $helper->color = 'color4';
+ // $helper->title = $this->l('Average number of products per category', null, null, false);
+ // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=products_per_category';
+ // $kpis[] = $helper->generate();
- $helper = new HelperKpiRow();
- $helper->kpis = $kpis;
- return $helper->generate();
- }
+ // $helper = new HelperKpiRow();
+ // $helper->kpis = $kpis;
+ // return $helper->generate();
+ // }
public function renderForm()
{
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index ab1a12d45..64308b5a7 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -175,8 +175,6 @@ class AdminEmployeesControllerCore extends AdminController
public function initPageHeaderToolbar()
{
- parent::initPageHeaderToolbar();
-
if (empty($this->display)) {
$this->page_header_toolbar_btn['new_employee'] = array(
'href' => self::$currentIndex.'&addemployee&token='.$this->token,
@@ -195,6 +193,8 @@ class AdminEmployeesControllerCore extends AdminController
$this->toolbar_title);
}
}
+
+ parent::initPageHeaderToolbar();
}
public function renderList()
diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php
index 0fbb808a1..4c960a331 100644
--- a/controllers/admin/AdminGeolocationController.php
+++ b/controllers/admin/AdminGeolocationController.php
@@ -139,9 +139,9 @@ class AdminGeolocationControllerCore extends AdminController
{
$this->display = 'options';
if (!$this->isGeoLiteCityAvailable()) {
- $this->displayWarning($this->l('In order to use Geolocation, please download').'
-
'.$this->l('this file').' '.
- $this->l('and extract it (using Winrar or Gzip) into the /tools/geoip/ directory.'));
+ $this->displayWarning($this->l('In order to use Geolocation, please download the file').'
+
GeoLiteCity.dat '.
+ $this->l('from GitHub and copy into the /tools/geoip/ directory.'));
Configuration::updateValue('PS_GEOLOCATION_ENABLED', 0);
}
diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php
index 5d75b728f..e1c53fd2d 100644
--- a/controllers/admin/AdminOrderPreferencesController.php
+++ b/controllers/admin/AdminOrderPreferencesController.php
@@ -72,7 +72,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
),
'GLOBAL_PREPARATION_TIME' => array(
'title' => $this->l('Preparation time'),
- 'hint' => $this->l('Number of days required to prepare a room for stay.'),
+ 'hint' => $this->l('Number of days required to prepare a room for a guest\'s stay. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book rooms for dates from and after 3 days, i.e, 5th of March.'),
'desc' => $this->l('Set to 0 to disable this feature.'),
'type' => 'text',
'class' => 'fixed-width-xl',
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index d6dc4524d..7ff79c153 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -2695,10 +2695,6 @@ class AdminOrdersControllerCore extends AdminController
$this->context->cart = $cart;
$this->context->customer = new Customer($order->id_customer);
- if ($order->with_occupancy) {
- $objRoomType = new HotelRoomType();
- $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product);
- }
/*By Webkul to make entries in HotelCartBookingData */
$hotel_room_info_arr = $hotel_room_data['rm_data'][$idProduct]['data']['available'];
$chkQty = 0;
@@ -2724,8 +2720,8 @@ class AdminOrdersControllerCore extends AdminController
$objCartBookingData->children = $room_occupancy['children'];
$objCartBookingData->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array());
} else {
- $objCartBookingData->adults = $roomTypeInfo['adults'];
- $objCartBookingData->children = $roomTypeInfo['children'];
+ $objCartBookingData->adults = $room_info_by_id_product['adults'];
+ $objCartBookingData->children = $room_info_by_id_product['children'];
$objCartBookingData->child_ages = json_encode(array());
}
$objCartBookingData->save();
@@ -3247,10 +3243,12 @@ class AdminOrdersControllerCore extends AdminController
$product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to);
$old_product_quantity = (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to);
$qty_diff = $product_quantity - $old_product_quantity;
- $occupancy = array_shift(Tools::getValue('occupancy'));
- $adults = $occupancy['adults'];
- $children = $occupancy['children'];
- $child_ages = $occupancy['child_ages'];
+ if ($order->with_occupancy) {
+ $occupancy = array_shift(Tools::getValue('occupancy'));
+ $adults = $occupancy['adults'];
+ $children = $occupancy['children'];
+ $child_ages = $occupancy['child_ages'];
+ }
/*By webkul to validate fields before deleting the cart and order data form the tables*/
if ($id_hotel == '') {
@@ -3308,30 +3306,36 @@ class AdminOrdersControllerCore extends AdminController
'result' => false,
'error' => Tools::displayError('Invalid quantity.'),
)));
- } elseif (!isset($adults) || !$adults || !Validate::isUnsignedInt($adults)) {
- die(json_encode(array(
- 'result' => false,
- 'error' => Tools::displayError('Invalid number of adults.'),
- )));
- } elseif (!Validate::isUnsignedInt($children)) {
- die(json_encode(array(
- 'result' => false,
- 'error' => Tools::displayError('Invalid number of children.'),
- )));
}
- if ($children > 0) {
- if (!isset($child_ages) || ($children != count($child_ages))) {
+
+ // validations if order is with occupancy
+ if ($order->with_occupancy) {
+ if (!isset($adults) || !$adults || !Validate::isUnsignedInt($adults)) {
die(json_encode(array(
'result' => false,
- 'error' => Tools::displayError('Please provide all children age.'),
+ 'error' => Tools::displayError('Invalid number of adults.'),
)));
- } else {
- foreach($child_ages as $childAge) {
- if (!Validate::isUnsignedInt($childAge)) {
- die(json_encode(array(
- 'result' => false,
- 'error' => Tools::displayError('Invalid children age.'),
- )));
+ } elseif (!Validate::isUnsignedInt($children)) {
+ die(json_encode(array(
+ 'result' => false,
+ 'error' => Tools::displayError('Invalid number of children.'),
+ )));
+ }
+
+ if ($children > 0) {
+ if (!isset($child_ages) || ($children != count($child_ages))) {
+ die(json_encode(array(
+ 'result' => false,
+ 'error' => Tools::displayError('Please provide all children age.'),
+ )));
+ } else {
+ foreach($child_ages as $childAge) {
+ if (!Validate::isUnsignedInt($childAge)) {
+ die(json_encode(array(
+ 'result' => false,
+ 'error' => Tools::displayError('Invalid children age.'),
+ )));
+ }
}
}
}
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index 8a75a6383..77bb9bcb5 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -284,7 +284,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
if (!$distinct_products) {
return '0%';
}
- return round(100 * $distinct_products / AdminStatsController::getTotalProducts()).'%';
+ return round(100 * $distinct_products / AdminStatsController::getTotalRoomTypes()).'%';
}
public static function getOrders($date_from, $date_to, $granularity = false, $id_hotel = false)
@@ -354,7 +354,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
public static function getCustomerMainGender()
{
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
- SELECT SUM(IF(g.id_gender IS NOT NULL, 1, 0)) as total, SUM(IF(type = 0, 1, 0)) as male, SUM(IF(type = 1, 1, 0)) as female, SUM(IF(type = 2, 1, 0)) as neutral
+ SELECT SUM(IF(c.id_gender IS NOT NULL, 1, 0)) as total, SUM(IF(type = 0, 1, 0)) as male, SUM(IF(type = 1, 1, 0)) as female, SUM(IF(type = 2, 1, 0)) as neutral
FROM `'._DB_PREFIX_.'customer` c
LEFT JOIN `'._DB_PREFIX_.'gender` g ON c.id_gender = g.id_gender
WHERE c.active = 1 '.Shop::addSqlRestriction());
@@ -1176,9 +1176,10 @@ class AdminStatsControllerCore extends AdminStatsTabController
public static function getArrivalsInfoByDate($date, $idHotel = null)
{
- $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
+ $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`)
WHERE hbd.`is_refunded` = 0 AND hbd.`date_from` = "'.pSQL($date).' 00:00:00"
AND hbd.`id_status` != '.(int) HotelBookingDetail::STATUS_CHECKED_IN.'
@@ -1191,9 +1192,10 @@ class AdminStatsControllerCore extends AdminStatsTabController
public static function getDeparturesInfoByDate($date, $idHotel = null)
{
- $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
+ $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`)
WHERE hbd.`is_refunded` = 0 AND hbd.`date_to` = "'.pSQL($date).' 00:00:00"
AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN.
@@ -1205,9 +1207,10 @@ class AdminStatsControllerCore extends AdminStatsTabController
public static function getInHousesInfo($idHotel = null)
{
- $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
+ $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`)
WHERE hbd.`is_refunded` = 0 AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN.
(!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '');
@@ -1220,7 +1223,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
{
$sql = 'SELECT hbd.`id_customer`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
COUNT(hbd.`id`) AS total_rooms, SUM(hbd.`adults` + hbd.`children`) AS total_guests,
- hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name`
+ hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`with_occupancy`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name`
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl
@@ -1237,8 +1240,8 @@ class AdminStatsControllerCore extends AdminStatsTabController
public static function getCancellationsInfoByDate($date, $idHotel = null)
{
$sql = 'SELECT orr.`id_order_return`, orr.`id_customer`, hbd.`room_num`, hbd.`id_product`, hbd.`room_type_name`,
- CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name,
- hbd.`id_hotel`, hbd.`hotel_name`, SUM(hbd.`adults` + hbd.`children`) AS total_guests,
+ o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, hbd.`id_hotel`,
+ hbd.`hotel_name`, SUM(hbd.`adults` + hbd.`children`) AS total_guests,
hbd.`date_from`, hbd.`date_to`, orr.`id_order`
FROM `'._DB_PREFIX_.'order_return` orr
LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (ord.`id_order_return` = orr.`id_order_return`)
@@ -1665,9 +1668,10 @@ class AdminStatsControllerCore extends AdminStatsTabController
$dateTo = date('Y-m-d', strtotime('+1 day', strtotime($dateTo)));
}
- $sql = 'SELECT SUM(total_paid_tax_excl)
+ $sql = 'SELECT SUM(total_paid_tax_excl - refunded_amount)
FROM (
SELECT o.`id_order`, o.`total_paid_tax_excl` / o.`conversion_rate` AS total_paid_tax_excl,
+ IFNULL(orr.`refunded_amount`, 0) AS refunded_amount,
(SELECT hbd.`id_hotel`
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
WHERE hbd.`id_order` = o.`id_order` LIMIT 1
@@ -1677,6 +1681,8 @@ class AdminStatsControllerCore extends AdminStatsTabController
ON (hbd.`id_order` = o.`id_order`)
INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi
ON (hbi.`id` = hbd.`id_hotel`)
+ LEFT JOIN `' ._DB_PREFIX_.'order_return` orr
+ ON (orr.`id_order` = o.`id_order`)
WHERE o.`valid` = 1 AND hbi.`active` = 1 AND hbd.`is_refunded` = 0
AND o.`invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"
AND o.`source` = "'.pSQL(Configuration::get('PS_SHOP_DOMAIN')).'"'.
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index eaf7f4c8a..53c8b11c1 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -716,8 +716,6 @@ class AdminThemesControllerCore extends AdminController
public function initPageHeaderToolbar()
{
- parent::initPageHeaderToolbar();
-
if (empty($this->display)) {
$this->page_header_toolbar_btn['import_theme'] = array(
'href' => self::$currentIndex.'&action=importtheme&token='.$this->token,
@@ -746,6 +744,8 @@ class AdminThemesControllerCore extends AdminController
$title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
$this->page_header_toolbar_title = $title;
+
+ parent::initPageHeaderToolbar();
}
private function checkParentClass($name)
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 33f7c885e..b205b7a97 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -170,6 +170,8 @@ class AuthControllerCore extends FrontController
'informations' => $this->informations,
'hasError' => !empty($this->errors),
'errors' => $this->errors,
+ 'hasAjaxExtraData' => !empty($this->ajaxExtraData),
+ 'ajaxExtraData' => $this->ajaxExtraData,
'page' => $this->context->smarty->fetch($this->template),
'token' => Tools::getToken(false)
);
@@ -416,309 +418,314 @@ class AuthControllerCore extends FrontController
if (Validate::isEmail($email = Tools::getValue('email')) && !empty($email)) {
if (Customer::customerExists($email)) {
$this->errors[] = Tools::displayError('An account using this email address has already been registered.', false);
+ } elseif (Customer::customerExists($email, false, false)) {
+ $this->errors[] = Tools::displayError('You are already registered as a guest with this email address.').'
'.Tools::displayError('Click here').' '.Tools::displayError('').' to generate a password for your account.';
}
}
- // Preparing customer
- $customer = new Customer();
- $lastnameAddress = Tools::getValue('lastname');
- $firstnameAddress = Tools::getValue('firstname');
- $_POST['lastname'] = Tools::getValue('customer_lastname', $lastnameAddress);
- $_POST['firstname'] = Tools::getValue('customer_firstname', $firstnameAddress);
- $addresses_types = array('address');
-
- if (!Configuration::get('PS_ORDER_PROCESS_TYPE') && Configuration::get('PS_GUEST_CHECKOUT_ENABLED') && Tools::getValue('invoice_address')) {
- $addresses_types[] = 'address_invoice';
- }
-
- $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'))) {
- $error_phone = true;
- }
- }
-
- if ($error_phone) {
- $this->errors[] = Tools::displayError('You must register at least one phone number.');
- }
-
- // if PS_CUSTOMER_ADDRESS_CREATION is disabled And customer has no addresses then create customer address
- // with the details of first hotel which rooms he has in cart
- if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')
- && isset($this->context->cart->id)
- && $this->context->cart->id
- ) {
- if (Module::isInstalled('hotelreservationsystem')) {
- include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php';
- $objHtlCart = new HotelCartBookingData();
- if ($htlCartInfo = $objHtlCart->getCartCurrentDataByCartId($this->context->cart->id)) {
- if (isset($htlCartInfo[0]['id_hotel']) && ($idHotel = $htlCartInfo[0]['id_hotel'])) {
- if ($address_info = HotelBranchInformation::getAddress($idHotel)) {
- $_POST['lastname'] = Tools::getValue('customer_lastname');
- $_POST['firstname'] = Tools::getValue('customer_firstname');
- $_POST['address1'] = $address_info['address1'];
- $_POST['city'] = $address_info['city'];
- $_POST['postcode'] = $address_info['postcode'];
- $_POST['alias'] = 'My address';
- $_POST['id_country'] = $address_info['id_country'];
- $_POST['id_state'] = $address_info['id_state'];
- $_POST['auto_generated'] = true;
- // if form is shorter then address name will be customer name
- $lastnameAddress = $_POST['lastname'];
- $firstnameAddress = $_POST['firstname'];
- }
- }
- }
- }
- }
- // End
- $this->errors = array_unique(array_merge($this->errors, $customer->validateController()));
-
- // Check the requires fields which are settings in the BO
- $this->errors = $this->errors + $customer->validateFieldsRequiredDatabase();
-
- if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) {
- if (!count($this->errors)) {
-
- $this->processCustomerNewsletter($customer);
-
- $customer->firstname = Tools::ucwords($customer->firstname);
- $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days'));
- if (!Validate::isBirthDate($customer->birthday)) {
- $this->errors[] = Tools::displayError('Invalid date of birth.');
- }
-
- // New Guest customer
- $customer->is_guest = (Tools::isSubmit('is_new_customer') ? !Tools::getValue('is_new_customer', 1) : 0);
- $customer->active = 1;
-
- if (!count($this->errors)) {
- if ($customer->add()) {
- if (!$customer->is_guest) {
- if (!$this->sendConfirmationMail($customer)) {
- $this->errors[] = Tools::displayError('The email cannot be sent.');
- }
- }
-
- $this->updateContext($customer);
-
- $this->context->cart->update();
- Hook::exec('actionCustomerAccountAdd', array(
- '_POST' => $_POST,
- 'newCustomer' => $customer
- ));
- if ($this->ajax) {
- $return = array(
- 'hasError' => !empty($this->errors),
- 'errors' => $this->errors,
- 'isSaved' => true,
- 'id_customer' => (int)$this->context->cookie->id_customer,
- 'id_address_delivery' => $this->context->cart->id_address_delivery,
- 'id_address_invoice' => $this->context->cart->id_address_invoice,
- 'token' => Tools::getToken(false)
- );
- $this->ajaxDie(json_encode($return));
- }
-
- if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) {
- Tools::redirect(html_entity_decode($back));
- }
-
- // redirection: if cart is not empty : redirection to the cart
- if (count($this->context->cart->getProducts(true)) > 0) {
- $multi = (int)Tools::getValue('multi-shipping');
- Tools::redirect('index.php?controller=order'.($multi ? '&multi-shipping='.$multi : ''));
- }
- // else : redirection to the account
- else {
- Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
- }
- } else {
- $this->errors[] = Tools::displayError('An error occurred while creating your account.');
- }
- }
- }
- } else {
- // if registration type is in one step, we save the address
-
- $_POST['lastname'] = $lastnameAddress;
- $_POST['firstname'] = $firstnameAddress;
- $post_back = $_POST;
- // Preparing addresses
- foreach ($addresses_types as $addresses_type) {
- $$addresses_type = new Address();
- $$addresses_type->id_customer = 1;
-
- if ($addresses_type == 'address_invoice') {
- foreach ($_POST as $key => &$post) {
- if ($tmp = Tools::getValue($key.'_invoice')) {
- $post = $tmp;
- }
- }
- }
-
- $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
- if ($addresses_type == 'address_invoice') {
- $_POST = $post_back;
- }
-
- if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country)) {
- $this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country');
- }
-
- if (!$country->active) {
- $this->errors[] = Tools::displayError('This country is not active.');
- }
-
- $postcode = $$addresses_type->postcode;
- /* Check zip code format */
- if ($country->zip_code_format && !$country->checkZipCode($postcode)) {
- $this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))));
- } elseif (empty($postcode) && $country->need_zip_code) {
- $this->errors[] = Tools::displayError('A Zip / Postal code is required.');
- } elseif ($postcode && !Validate::isPostCode($postcode)) {
- $this->errors[] = Tools::displayError('The Zip / Postal code is invalid.');
- }
-
- if ($country->need_identification_number) {
- if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')) {
- $$addresses_type->dni = null;
- } elseif (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))) {
- $this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.');
- }
- } elseif (!$country->need_identification_number) {
- $$addresses_type->dni = null;
- }
-
- if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) {
- if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) {
- $this->errors[] = Tools::displayError('Country is invalid');
- }
- }
- $contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
- $id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0;
- if ((Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) {
- $this->errors[] = Tools::displayError('This country requires you to choose a State.');
- }
- }
- }
-
- if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) {
- $this->errors[] = Tools::displayError('Invalid date of birth');
- }
if (!count($this->errors)) {
- if (Customer::customerExists(Tools::getValue('email'))) {
- $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false);
+ // Preparing customer
+ $customer = new Customer();
+ $lastnameAddress = Tools::getValue('lastname');
+ $firstnameAddress = Tools::getValue('firstname');
+ $_POST['lastname'] = Tools::getValue('customer_lastname', $lastnameAddress);
+ $_POST['firstname'] = Tools::getValue('customer_firstname', $firstnameAddress);
+ $addresses_types = array('address');
+
+ if (!Configuration::get('PS_ORDER_PROCESS_TYPE') && Configuration::get('PS_GUEST_CHECKOUT_ENABLED') && Tools::getValue('invoice_address')) {
+ $addresses_types[] = 'address_invoice';
}
- $this->processCustomerNewsletter($customer);
+ $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'))) {
+ $error_phone = true;
+ }
+ }
- $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days'));
- if (!Validate::isBirthDate($customer->birthday)) {
+ if ($error_phone) {
+ $this->errors[] = Tools::displayError('You must register at least one phone number.');
+ }
+
+ // if PS_CUSTOMER_ADDRESS_CREATION is disabled And customer has no addresses then create customer address
+ // with the details of first hotel which rooms he has in cart
+ if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')
+ && isset($this->context->cart->id)
+ && $this->context->cart->id
+ ) {
+ if (Module::isInstalled('hotelreservationsystem')) {
+ include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php';
+ $objHtlCart = new HotelCartBookingData();
+ if ($htlCartInfo = $objHtlCart->getCartCurrentDataByCartId($this->context->cart->id)) {
+ if (isset($htlCartInfo[0]['id_hotel']) && ($idHotel = $htlCartInfo[0]['id_hotel'])) {
+ if ($address_info = HotelBranchInformation::getAddress($idHotel)) {
+ $_POST['lastname'] = Tools::getValue('customer_lastname');
+ $_POST['firstname'] = Tools::getValue('customer_firstname');
+ $_POST['address1'] = $address_info['address1'];
+ $_POST['city'] = $address_info['city'];
+ $_POST['postcode'] = $address_info['postcode'];
+ $_POST['alias'] = 'My address';
+ $_POST['id_country'] = $address_info['id_country'];
+ $_POST['id_state'] = $address_info['id_state'];
+ $_POST['auto_generated'] = true;
+ // if form is shorter then address name will be customer name
+ $lastnameAddress = $_POST['lastname'];
+ $firstnameAddress = $_POST['firstname'];
+ }
+ }
+ }
+ }
+ }
+ // End
+ $this->errors = array_unique(array_merge($this->errors, $customer->validateController()));
+
+ // Check the requires fields which are settings in the BO
+ $this->errors = $this->errors + $customer->validateFieldsRequiredDatabase();
+
+ if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) {
+ if (!count($this->errors)) {
+
+ $this->processCustomerNewsletter($customer);
+
+ $customer->firstname = Tools::ucwords($customer->firstname);
+ $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days'));
+ if (!Validate::isBirthDate($customer->birthday)) {
+ $this->errors[] = Tools::displayError('Invalid date of birth.');
+ }
+
+ // New Guest customer
+ $customer->is_guest = (Tools::isSubmit('is_new_customer') ? !Tools::getValue('is_new_customer', 1) : 0);
+ $customer->active = 1;
+
+ if (!count($this->errors)) {
+ if ($customer->add()) {
+ if (!$customer->is_guest) {
+ if (!$this->sendConfirmationMail($customer)) {
+ $this->errors[] = Tools::displayError('The email cannot be sent.');
+ }
+ }
+
+ $this->updateContext($customer);
+
+ $this->context->cart->update();
+ Hook::exec('actionCustomerAccountAdd', array(
+ '_POST' => $_POST,
+ 'newCustomer' => $customer
+ ));
+ if ($this->ajax) {
+ $return = array(
+ 'hasError' => !empty($this->errors),
+ 'errors' => $this->errors,
+ 'isSaved' => true,
+ 'id_customer' => (int)$this->context->cookie->id_customer,
+ 'id_address_delivery' => $this->context->cart->id_address_delivery,
+ 'id_address_invoice' => $this->context->cart->id_address_invoice,
+ 'token' => Tools::getToken(false)
+ );
+ $this->ajaxDie(json_encode($return));
+ }
+
+ if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) {
+ Tools::redirect(html_entity_decode($back));
+ }
+
+ // redirection: if cart is not empty : redirection to the cart
+ if (count($this->context->cart->getProducts(true)) > 0) {
+ $multi = (int)Tools::getValue('multi-shipping');
+ Tools::redirect('index.php?controller=order'.($multi ? '&multi-shipping='.$multi : ''));
+ }
+ // else : redirection to the account
+ else {
+ Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
+ }
+ } else {
+ $this->errors[] = Tools::displayError('An error occurred while creating your account.');
+ }
+ }
+ }
+ } else {
+ // if registration type is in one step, we save the address
+
+ $_POST['lastname'] = $lastnameAddress;
+ $_POST['firstname'] = $firstnameAddress;
+ $post_back = $_POST;
+ // Preparing addresses
+ foreach ($addresses_types as $addresses_type) {
+ $$addresses_type = new Address();
+ $$addresses_type->id_customer = 1;
+
+ if ($addresses_type == 'address_invoice') {
+ foreach ($_POST as $key => &$post) {
+ if ($tmp = Tools::getValue($key.'_invoice')) {
+ $post = $tmp;
+ }
+ }
+ }
+
+ $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+ if ($addresses_type == 'address_invoice') {
+ $_POST = $post_back;
+ }
+
+ if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country)) {
+ $this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country');
+ }
+
+ if (!$country->active) {
+ $this->errors[] = Tools::displayError('This country is not active.');
+ }
+
+ $postcode = $$addresses_type->postcode;
+ /* Check zip code format */
+ if ($country->zip_code_format && !$country->checkZipCode($postcode)) {
+ $this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))));
+ } elseif (empty($postcode) && $country->need_zip_code) {
+ $this->errors[] = Tools::displayError('A Zip / Postal code is required.');
+ } elseif ($postcode && !Validate::isPostCode($postcode)) {
+ $this->errors[] = Tools::displayError('The Zip / Postal code is invalid.');
+ }
+
+ if ($country->need_identification_number) {
+ if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')) {
+ $$addresses_type->dni = null;
+ } elseif (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))) {
+ $this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.');
+ }
+ } elseif (!$country->need_identification_number) {
+ $$addresses_type->dni = null;
+ }
+
+ if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) {
+ if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) {
+ $this->errors[] = Tools::displayError('Country is invalid');
+ }
+ }
+ $contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
+ $id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0;
+ if ((Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) {
+ $this->errors[] = Tools::displayError('This country requires you to choose a State.');
+ }
+ }
+ }
+
+ if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) {
$this->errors[] = Tools::displayError('Invalid date of birth');
}
if (!count($this->errors)) {
- $customer->active = 1;
- // New Guest customer
- if (Tools::isSubmit('is_new_customer')) {
- $customer->is_guest = !Tools::getValue('is_new_customer', 1);
- } else {
- $customer->is_guest = 0;
+ if (Customer::customerExists(Tools::getValue('email'))) {
+ $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false);
}
- if (!$customer->add()) {
- $this->errors[] = Tools::displayError('An error occurred while creating your account.');
- } else {
- foreach ($addresses_types as $addresses_type) {
- $$addresses_type->id_customer = (int)$customer->id;
- if ($addresses_type == 'address_invoice') {
- foreach ($_POST as $key => &$post) {
- if ($tmp = Tools::getValue($key.'_invoice')) {
- $post = $tmp;
+
+ $this->processCustomerNewsletter($customer);
+
+ $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days'));
+ if (!Validate::isBirthDate($customer->birthday)) {
+ $this->errors[] = Tools::displayError('Invalid date of birth');
+ }
+
+ if (!count($this->errors)) {
+ $customer->active = 1;
+ // New Guest customer
+ if (Tools::isSubmit('is_new_customer')) {
+ $customer->is_guest = !Tools::getValue('is_new_customer', 1);
+ } else {
+ $customer->is_guest = 0;
+ }
+ if (!$customer->add()) {
+ $this->errors[] = Tools::displayError('An error occurred while creating your account.');
+ } else {
+ foreach ($addresses_types as $addresses_type) {
+ $$addresses_type->id_customer = (int)$customer->id;
+ if ($addresses_type == 'address_invoice') {
+ foreach ($_POST as $key => &$post) {
+ if ($tmp = Tools::getValue($key.'_invoice')) {
+ $post = $tmp;
+ }
}
}
- }
- $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
- if ($addresses_type == 'address_invoice') {
- $_POST = $post_back;
- }
- if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add()) {
- $this->errors[] = Tools::displayError('An error occurred while creating your address.');
- }
- }
- if (!count($this->errors)) {
- if (!$customer->is_guest) {
- $this->context->customer = $customer;
- $customer->cleanGroups();
- // we add the guest customer in the default customer group
- $customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
- if (!$this->sendConfirmationMail($customer)) {
- // webkul - we will not stop process on email delivery fails
- //$this->errors[] = Tools::displayError('The email cannot be sent.');
+ $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+ if ($addresses_type == 'address_invoice') {
+ $_POST = $post_back;
+ }
+ if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add()) {
+ $this->errors[] = Tools::displayError('An error occurred while creating your address.');
}
- } else {
- $customer->cleanGroups();
- // we add the guest customer in the guest customer group
- $customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP')));
- }
- $this->updateContext($customer);
- $this->context->cart->id_address_delivery = (int)Address::getFirstCustomerAddressId((int)$customer->id);
- $this->context->cart->id_address_invoice = (int)Address::getFirstCustomerAddressId((int)$customer->id);
- if (isset($address_invoice) && Validate::isLoadedObject($address_invoice)) {
- $this->context->cart->id_address_invoice = (int)$address_invoice->id;
}
+ if (!count($this->errors)) {
+ if (!$customer->is_guest) {
+ $this->context->customer = $customer;
+ $customer->cleanGroups();
+ // we add the guest customer in the default customer group
+ $customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
+ if (!$this->sendConfirmationMail($customer)) {
+ // webkul - we will not stop process on email delivery fails
+ //$this->errors[] = Tools::displayError('The email cannot be sent.');
+ }
+ } else {
+ $customer->cleanGroups();
+ // we add the guest customer in the guest customer group
+ $customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP')));
+ }
+ $this->updateContext($customer);
+ $this->context->cart->id_address_delivery = (int)Address::getFirstCustomerAddressId((int)$customer->id);
+ $this->context->cart->id_address_invoice = (int)Address::getFirstCustomerAddressId((int)$customer->id);
+ if (isset($address_invoice) && Validate::isLoadedObject($address_invoice)) {
+ $this->context->cart->id_address_invoice = (int)$address_invoice->id;
+ }
- if ($this->ajax && Configuration::get('PS_ORDER_PROCESS_TYPE')) {
- $delivery_option = array((int)$this->context->cart->id_address_delivery => (int)$this->context->cart->id_carrier.',');
- $this->context->cart->setDeliveryOption($delivery_option);
- }
+ if ($this->ajax && Configuration::get('PS_ORDER_PROCESS_TYPE')) {
+ $delivery_option = array((int)$this->context->cart->id_address_delivery => (int)$this->context->cart->id_carrier.',');
+ $this->context->cart->setDeliveryOption($delivery_option);
+ }
- // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
- $this->context->cart->update();
+ // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
+ $this->context->cart->update();
- // Avoid articles without delivery address on the cart
- $this->context->cart->autosetProductAddress();
+ // Avoid articles without delivery address on the cart
+ $this->context->cart->autosetProductAddress();
- Hook::exec('actionCustomerAccountAdd', array(
- '_POST' => $_POST,
- 'newCustomer' => $customer
- ));
- if ($this->ajax) {
- $return = array(
- 'hasError' => !empty($this->errors),
- 'errors' => $this->errors,
- 'isSaved' => true,
- 'id_customer' => (int)$this->context->cookie->id_customer,
- 'id_address_delivery' => $this->context->cart->id_address_delivery,
- 'id_address_invoice' => $this->context->cart->id_address_invoice,
- 'token' => Tools::getToken(false)
- );
- $this->ajaxDie(json_encode($return));
- }
- // if registration type is in two steps, we redirect to register address
- if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) {
- Tools::redirect('index.php?controller=address');
- }
+ Hook::exec('actionCustomerAccountAdd', array(
+ '_POST' => $_POST,
+ 'newCustomer' => $customer
+ ));
+ if ($this->ajax) {
+ $return = array(
+ 'hasError' => !empty($this->errors),
+ 'errors' => $this->errors,
+ 'isSaved' => true,
+ 'id_customer' => (int)$this->context->cookie->id_customer,
+ 'id_address_delivery' => $this->context->cart->id_address_delivery,
+ 'id_address_invoice' => $this->context->cart->id_address_invoice,
+ 'token' => Tools::getToken(false)
+ );
+ $this->ajaxDie(json_encode($return));
+ }
+ // if registration type is in two steps, we redirect to register address
+ if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) {
+ Tools::redirect('index.php?controller=address');
+ }
- if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) {
- Tools::redirect(html_entity_decode($back));
- }
+ if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) {
+ Tools::redirect(html_entity_decode($back));
+ }
- // redirection: if cart is not empty : redirection to the cart
- if (count($this->context->cart->getProducts(true)) > 0) {
- Tools::redirect('index.php?controller=order'.($multi = (int)Tools::getValue('multi-shipping') ? '&multi-shipping='.$multi : ''));
- }
- // else : redirection to the account
- else {
- Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
+ // redirection: if cart is not empty : redirection to the cart
+ if (count($this->context->cart->getProducts(true)) > 0) {
+ Tools::redirect('index.php?controller=order'.($multi = (int)Tools::getValue('multi-shipping') ? '&multi-shipping='.$multi : ''));
+ }
+ // else : redirection to the account
+ else {
+ Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
+ }
}
}
}
@@ -772,12 +779,21 @@ class AuthControllerCore extends FrontController
*/
protected function processTransformAccount()
{
- if (!Validate::isEmail($email = trim(Tools::getValue('email_create'))) || empty($email)) {
+ if (!Validate::isEmail($email = trim(Tools::getValue('email_create', Tools::getValue('email')))) || empty($email)) {
$this->errors[] = Tools::displayError('Invalid email address.');
} elseif ($id_customer = Customer::customerExists($email, true, false)) {
$customer = new Customer($id_customer);
if ($customer->transformToCustomer($this->context->language->id)) {
$this->confirmations[] = 'TRANSFORM_OK';
+
+ $back = '';
+ if ($back == Tools::secureReferrer(Tools::getValue('back'))) {
+ $back = html_entity_decode($back);
+ } else {
+ $back = Tools::safeOutput($back);
+ }
+ $this->ajaxExtraData['redirect_link'] = $this->context->link->getPageLink('authentication').
+ ($back ? '?back='.$back.'&' : '?').'guest_transform_success=1';
} else {
$this->errors[] = Tools::displayError('Your guest account could not be transformed to a customer account.');
}
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 2a898f8b6..ad57e8ae5 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -163,110 +163,117 @@ class OrderDetailControllerCore extends FrontController
$this->errors[] = Tools::displayError('Order ID required');
} else {
$order = new Order($id_order);
- // Here handle request from the ajax on order details page i.e refund, additional qty etc
- $method = Tools::getValue('method');
- // extra demands popup ajax
- if ($method == 'getRoomTypeBookingDemands') {
- $response = array('reload' => false);
- if (($idProduct = Tools::getValue('id_product'))
- && ($idOrder = Tools::getValue('id_order'))
- && ($dateFrom = Tools::getValue('date_from'))
- && ($dateTo = Tools::getValue('date_to'))
- ) {
- $objBookingDemand = new HotelBookingDemands();
- $useTax = 0;
- $customer = Context::getContext()->customer;
- if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) {
- $useTax = 1;
- }
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(
- array(
+ if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) {
+ // Here handle request from the ajax on order details page i.e refund, additional qty etc
+ $method = Tools::getValue('method');
+ // extra demands popup ajax
+ if ($method == 'getRoomTypeBookingDemands') {
+ $response = array('reload' => false);
+ if (($idProduct = Tools::getValue('id_product'))
+ && ($idOrder = Tools::getValue('id_order'))
+ && ($dateFrom = Tools::getValue('date_from'))
+ && ($dateTo = Tools::getValue('date_to'))
+ ) {
+ $objBookingDemand = new HotelBookingDemands();
+ $useTax = 0;
+ $customer = Context::getContext()->customer;
+ if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) {
+ $useTax = 1;
+ }
+ if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
+ $idOrder,
+ $idProduct,
+ 0,
+ $dateFrom,
+ $dateTo,
+ 1,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(
+ array(
+ 'useTax' => $useTax,
+ 'extraDemands' => $extraDemands,
+ )
+ );
+ }
+ $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
+ if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
+ $idOrder,
+ 0,
+ 0,
+ $idProduct,
+ $dateFrom,
+ $dateTo,
+ 0,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(array(
'useTax' => $useTax,
- 'extraDemands' => $extraDemands,
- )
- );
+ 'additionalServices' => $additionalServices,
+ ));
+ }
+ $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
}
- $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
- if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
- $idOrder,
- 0,
- 0,
- $idProduct,
- $dateFrom,
- $dateTo,
- 0,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(array(
- 'useTax' => $useTax,
- 'additionalServices' => $additionalServices,
- ));
- }
- $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
- }
- die(json_encode($response));
- } elseif ($method == 'submitRefundRequest') { // room cancellation ajax
- $hasError = 0;
- if (!$refundReason = Tools::getValue('cancellation_reason')) {
- $hasError = 1;
- } elseif (!Validate::isCleanHtml($refundReason)) {
- $hasError = 1;
- }
- if ($bookingRefunds = Tools::getValue('bookings_to_refund')) {
- if (!count($bookingRefunds = json_decode($bookingRefunds, true))) {
+ die(json_encode($response));
+ } elseif ($method == 'submitRefundRequest') { // room cancellation ajax
+ $hasError = 0;
+ if (!$refundReason = Tools::getValue('cancellation_reason')) {
$hasError = 1;
- } else {
- foreach ($bookingRefunds as $idHtlBooking) {
- if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) {
- $hasError = 1;
- break;
+ } elseif (!Validate::isCleanHtml($refundReason)) {
+ $hasError = 1;
+ }
+ if ($bookingRefunds = Tools::getValue('bookings_to_refund')) {
+ if (!count($bookingRefunds = json_decode($bookingRefunds, true))) {
+ $hasError = 1;
+ } else {
+ foreach ($bookingRefunds as $idHtlBooking) {
+ $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking);
+ if ($objHotelBookingDetail->id_customer == $order->id_customer
+ || OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)
+ ) {
+ $hasError = 1;
+ break;
+ }
}
}
+ } else {
+ $hasError = 1;
}
- } else {
- $hasError = 1;
- }
- if (!$hasError) {
- $objOrderReturn = new OrderReturn();
- $objOrderReturn->id_customer = $order->id_customer;
- $objOrderReturn->id_order = $order->id;
- $objOrderReturn->state = 0;
- $objOrderReturn->by_admin = 0;
- $objOrderReturn->question = $refundReason;
- $objOrderReturn->save();
- if ($objOrderReturn->id) {
- foreach ($bookingRefunds as $idHtlBooking) {
- $objHtlBooking = new HotelBookingDetail($idHtlBooking);
- $numDays = $objHtlBooking->getNumberOfDays(
- $objHtlBooking->date_from,
- $objHtlBooking->date_to
- );
+ if (!$hasError) {
+ $objOrderReturn = new OrderReturn();
+ $objOrderReturn->id_customer = $order->id_customer;
+ $objOrderReturn->id_order = $order->id;
+ $objOrderReturn->state = 0;
+ $objOrderReturn->by_admin = 0;
+ $objOrderReturn->question = $refundReason;
+ $objOrderReturn->save();
+ if ($objOrderReturn->id) {
+ foreach ($bookingRefunds as $idHtlBooking) {
+ $objHtlBooking = new HotelBookingDetail($idHtlBooking);
+ $numDays = $objHtlBooking->getNumberOfDays(
+ $objHtlBooking->date_from,
+ $objHtlBooking->date_to
+ );
- $objOrderReturnDetail = new OrderReturnDetail();
- $objOrderReturnDetail->id_order_return = $objOrderReturn->id;
- $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail;
- $objOrderReturnDetail->product_quantity = $numDays;
- $objOrderReturnDetail->id_htl_booking = $idHtlBooking;
- $objOrderReturnDetail->save();
+ $objOrderReturnDetail = new OrderReturnDetail();
+ $objOrderReturnDetail->id_order_return = $objOrderReturn->id;
+ $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail;
+ $objOrderReturnDetail->product_quantity = $numDays;
+ $objOrderReturnDetail->id_htl_booking = $idHtlBooking;
+ $objOrderReturnDetail->save();
+ }
}
- }
- // Emails to customer, admin on refund request state change
- $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING'));
+ // Emails to customer, admin on refund request state change
+ $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING'));
- die(json_encode(array('status' => 1)));
+ die(json_encode(array('status' => 1)));
+ }
+ die(json_encode(array('status' => 0)));
}
+ } else {
die(json_encode(array('status' => 0)));
}
// END ajax request handle
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index a97a90577..73808d9c9 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -114,6 +114,10 @@ class ProductControllerCore extends FrontController
$this->product = new Product($id_product, true, $this->context->language->id, $this->context->shop->id);
}
+ if (!$this->product->booking_product) {
+ Tools::redirect($this->context->link->getPageLink('pagenotfound'));
+ }
+
if (!Validate::isLoadedObject($this->product)) {
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
@@ -192,12 +196,6 @@ class ProductControllerCore extends FrontController
$this->context->cookie->last_visited_category = (int)$this->category->id_category;
}
}
-
- if (!$this->product->booking_product) {
- header('HTTP/1.1 403 Forbidden');
- header('Status: 403 Forbidden');
- $this->errors[] = Tools::displayError('You do not have access to this Product.');
- }
}
}
@@ -357,11 +355,12 @@ class ProductControllerCore extends FrontController
// booking preparation time
$preparationTime = (int) HotelOrderRestrictDate::getPreparationTime($hotel_id);
+ $objHotelImage = new HotelImage();
$hotelImageLink = null;
if ($coverImage = HotelImage::getCover($hotel_id)) {
$hotelImagesBaseDir = _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_img/';
$hotelImageLink = $this->context->link->getMediaLink(
- $hotelImagesBaseDir.$coverImage['hotel_image_id'].'.jpg'
+ $objHotelImage->getImageLink($coverImage['id'], ImageType::getFormatedName('large'))
);
}
@@ -603,6 +602,7 @@ class ProductControllerCore extends FrontController
$quantity = 1;
}
+ $totalAvailableRooms = 0;
if ($hotelRoomData = $objBookingDetail->DataForFrontSearch($bookingParams)) {
$totalAvailableRooms = $hotelRoomData['stats']['num_avail'];
$quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity;
@@ -1244,7 +1244,8 @@ class ProductControllerCore extends FrontController
$hotelImagesBaseDir = _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_img/';
foreach ($hotelImages as &$hotelImage) {
$hotelImage['link'] = $this->context->link->getMediaLink(
- $hotelImagesBaseDir.$hotelImage['hotel_image_id'].'.jpg'
+ $objHotelImage->getImageLink($hotelImage['id'],
+ ImageType::getFormatedName('large'))
);
}
@@ -1318,12 +1319,13 @@ class ProductControllerCore extends FrontController
public function displayAjaxCheckServiceProductWithRoomType()
{
$response = array(
- 'status' => false
+ 'success' => false
);
if ($this->isTokenValid()) {
$idProduct = Tools::getValue('id_product');
$idServiceProduct = Tools::getValue('service_product');
+ $addedServiceProduct = Tools::getValue('added_service_product');
if (Validate::isLoadedObject($objProduct = new Product($idProduct))) {
if (!Product::isBookingProduct($idProduct)) {
$response['error'] = Tools::displayError('Room Type info not Found');
@@ -1334,7 +1336,22 @@ class ProductControllerCore extends FrontController
if (!$objRoomTypeServiceProduct->isRoomTypeLinkedWithProduct($idProduct, $idServiceProduct)) {
$response['error'] = Tools::displayError('Selected product is not available with current room type');
} else {
- $response['status'] = true;
+ if (Validate::isLoadedObject($objServiceProduct = new Product($idServiceProduct))) {
+ $response['success'] = true;
+ if (!$objServiceProduct->allow_multiple_quantity && !empty($addedServiceProduct)) {
+ if (!in_array($idServiceProduct, array_column($addedServiceProduct, 'id_product'))) {
+ $response['add'] = true;
+ $response['msg'] = 'Service is added to cart.';
+ } else {
+ $response['msg'] = 'Service already added.';
+ }
+ } else {
+ $response['add'] = true;
+ $response['msg'] = 'Service is added to cart.';
+ }
+ } else {
+ $response['error'] = Tools::displayError('Service not Found');
+ }
}
} else {
$response['error'] = Tools::displayError('Room Type not Found');
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 6a465c94a..c9babed8d 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -686,6 +686,24 @@
3
+
+ 50
+
+
+ 150
+
+
+ 1
+
+
+ 2
+
+
+ 1
+
+
+ 2
+
diff --git a/js/daterangepicker/moment.min.js b/js/daterangepicker/moment.min.js
index 3427886d1..02f30abfd 100644
--- a/js/daterangepicker/moment.min.js
+++ b/js/daterangepicker/moment.min.js
@@ -1,2 +1,2 @@
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var H;function f(){return H.apply(null,arguments)}function a(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function F(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function c(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function L(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;for(var t in e)if(c(e,t))return;return 1}function o(e){return void 0===e}function u(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function V(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function G(e,t){for(var n=[],s=e.length,i=0;i
>>0,s=0;sAe(e)?(r=e+1,t-Ae(e)):(r=e,t);return{year:r,dayOfYear:n}}function qe(e,t,n){var s,i,r=ze(e.year(),t,n),r=Math.floor((e.dayOfYear()-r-1)/7)+1;return r<1?s=r+P(i=e.year()-1,t,n):r>P(e.year(),t,n)?(s=r-P(e.year(),t,n),i=e.year()+1):(i=e.year(),s=r),{week:s,year:i}}function P(e,t,n){var s=ze(e,t,n),t=ze(e+1,t,n);return(Ae(e)-s+t)/7}s("w",["ww",2],"wo","week"),s("W",["WW",2],"Wo","isoWeek"),t("week","w"),t("isoWeek","W"),n("week",5),n("isoWeek",5),v("w",p),v("ww",p,w),v("W",p),v("WW",p,w),Te(["w","ww","W","WW"],function(e,t,n,s){t[s.substr(0,1)]=g(e)});function Be(e,t){return e.slice(t,7).concat(e.slice(0,t))}s("d",0,"do","day"),s("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),s("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),s("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),s("e",0,0,"weekday"),s("E",0,0,"isoWeekday"),t("day","d"),t("weekday","e"),t("isoWeekday","E"),n("day",11),n("weekday",11),n("isoWeekday",11),v("d",p),v("e",p),v("E",p),v("dd",function(e,t){return t.weekdaysMinRegex(e)}),v("ddd",function(e,t){return t.weekdaysShortRegex(e)}),v("dddd",function(e,t){return t.weekdaysRegex(e)}),Te(["dd","ddd","dddd"],function(e,t,n,s){s=n._locale.weekdaysParse(e,s,n._strict);null!=s?t.d=s:m(n).invalidWeekday=e}),Te(["d","e","E"],function(e,t,n,s){t[s]=g(e)});var Je="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Qe="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Xe="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ke=k,et=k,tt=k;function nt(){function e(e,t){return t.length-e.length}for(var t,n,s,i=[],r=[],a=[],o=[],u=0;u<7;u++)s=l([2e3,1]).day(u),t=M(this.weekdaysMin(s,"")),n=M(this.weekdaysShort(s,"")),s=M(this.weekdays(s,"")),i.push(t),r.push(n),a.push(s),o.push(t),o.push(n),o.push(s);i.sort(e),r.sort(e),a.sort(e),o.sort(e),this._weekdaysRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+r.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+i.join("|")+")","i")}function st(){return this.hours()%12||12}function it(e,t){s(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function rt(e,t){return t._meridiemParse}s("H",["HH",2],0,"hour"),s("h",["hh",2],0,st),s("k",["kk",2],0,function(){return this.hours()||24}),s("hmm",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)}),s("hmmss",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)+r(this.seconds(),2)}),s("Hmm",0,0,function(){return""+this.hours()+r(this.minutes(),2)}),s("Hmmss",0,0,function(){return""+this.hours()+r(this.minutes(),2)+r(this.seconds(),2)}),it("a",!0),it("A",!1),t("hour","h"),n("hour",13),v("a",rt),v("A",rt),v("H",p),v("h",p),v("k",p),v("HH",p,w),v("hh",p,w),v("kk",p,w),v("hmm",ge),v("hmmss",we),v("Hmm",ge),v("Hmmss",we),D(["H","HH"],x),D(["k","kk"],function(e,t,n){e=g(e);t[x]=24===e?0:e}),D(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),D(["h","hh"],function(e,t,n){t[x]=g(e),m(n).bigHour=!0}),D("hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s)),m(n).bigHour=!0}),D("hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i)),m(n).bigHour=!0}),D("Hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s))}),D("Hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i))});k=de("Hours",!0);var at,ot={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Ce,monthsShort:Ue,week:{dow:0,doy:6},weekdays:Je,weekdaysMin:Xe,weekdaysShort:Qe,meridiemParse:/[ap]\.?m?\.?/i},R={},ut={};function lt(e){return e&&e.toLowerCase().replace("_","-")}function ht(e){for(var t,n,s,i,r=0;r=t&&function(e,t){for(var n=Math.min(e.length,t.length),s=0;s=t-1)break;t--}r++}return at}function dt(t){var e;if(void 0===R[t]&&"undefined"!=typeof module&&module&&module.exports&&null!=t.match("^[^/\\\\]*$"))try{e=at._abbr,require("./locale/"+t),ct(e)}catch(e){R[t]=null}return R[t]}function ct(e,t){return e&&((t=o(t)?mt(e):ft(e,t))?at=t:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),at._abbr}function ft(e,t){if(null===t)return delete R[e],null;var n,s=ot;if(t.abbr=e,null!=R[e])Q("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=R[e]._config;else if(null!=t.parentLocale)if(null!=R[t.parentLocale])s=R[t.parentLocale]._config;else{if(null==(n=dt(t.parentLocale)))return ut[t.parentLocale]||(ut[t.parentLocale]=[]),ut[t.parentLocale].push({name:e,config:t}),null;s=n._config}return R[e]=new K(X(s,t)),ut[e]&&ut[e].forEach(function(e){ft(e.name,e.config)}),ct(e),R[e]}function mt(e){var t;if(!(e=e&&e._locale&&e._locale._abbr?e._locale._abbr:e))return at;if(!a(e)){if(t=dt(e))return t;e=[e]}return ht(e)}function _t(e){var t=e._a;return t&&-2===m(e).overflow&&(t=t[O]<0||11We(t[Y],t[O])?b:t[x]<0||24P(r,u,l)?m(s)._overflowWeeks=!0:null!=h?m(s)._overflowWeekday=!0:(d=$e(r,a,o,u,l),s._a[Y]=d.year,s._dayOfYear=d.dayOfYear)),null!=e._dayOfYear&&(i=bt(e._a[Y],n[Y]),(e._dayOfYear>Ae(i)||0===e._dayOfYear)&&(m(e)._overflowDayOfYear=!0),h=Ze(i,0,e._dayOfYear),e._a[O]=h.getUTCMonth(),e._a[b]=h.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=c[t]=n[t];for(;t<7;t++)e._a[t]=c[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[x]&&0===e._a[T]&&0===e._a[N]&&0===e._a[Ne]&&(e._nextDay=!0,e._a[x]=0),e._d=(e._useUTC?Ze:je).apply(null,c),r=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[x]=24),e._w&&void 0!==e._w.d&&e._w.d!==r&&(m(e).weekdayMismatch=!0)}}function Tt(e){if(e._f===f.ISO_8601)St(e);else if(e._f===f.RFC_2822)Ot(e);else{e._a=[],m(e).empty=!0;for(var t,n,s,i,r,a=""+e._i,o=a.length,u=0,l=ae(e._f,e._locale).match(te)||[],h=l.length,d=0;de.valueOf():e.valueOf()"}),i.toJSON=function(){return this.isValid()?this.toISOString():null},i.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},i.unix=function(){return Math.floor(this.valueOf()/1e3)},i.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},i.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},i.eraName=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;nthis.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},i.isLocal=function(){return!!this.isValid()&&!this._isUTC},i.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},i.isUtc=At,i.isUTC=At,i.zoneAbbr=function(){return this._isUTC?"UTC":""},i.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},i.dates=e("dates accessor is deprecated. Use date instead.",ke),i.months=e("months accessor is deprecated. Use month instead",Ge),i.years=e("years accessor is deprecated. Use year instead",Ie),i.zone=e("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,t){return null!=e?(this.utcOffset(e="string"!=typeof e?-e:e,t),this):-this.utcOffset()}),i.isDSTShifted=e("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!o(this._isDSTShifted))return this._isDSTShifted;var e,t={};return $(t,this),(t=Nt(t))._a?(e=(t._isUTC?l:W)(t._a),this._isDSTShifted=this.isValid()&&0
- You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop.
+ You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop.
diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt
index ea3727f85..f0c1422ea 100644
--- a/mails/en/credit_slip.txt
+++ b/mails/en/credit_slip.txt
@@ -7,7 +7,7 @@ We have generated a credit slip in your name for order with the
reference {order_name}.
You can review this credit slip and download your invoice from the
-"My credit slips" [/{history_url}] section of your account by clicking
+"My credit slips" [/{credit_slip_url}] section of your account by clicking
"My account" [/{my_account_url}] on our shop.
{shop_name} [/{shop_url}] powered by Webkul(tm)
diff --git a/modules/dashavailability/views/js/dashavailability.js b/modules/dashavailability/views/js/dashavailability.js
index 73fdefb14..89b8137de 100644
--- a/modules/dashavailability/views/js/dashavailability.js
+++ b/modules/dashavailability/views/js/dashavailability.js
@@ -26,6 +26,7 @@ function line_chart_availability(widget_name, chart_details) {
.useInteractiveGuideline(true)
.x(function(d) { return (d !== undefined ? d[0] : 0); })
.y(function(d) { return (d !== undefined ? parseInt(d[1]) : 0); })
+ .forceY(0)
.margin({
left: 30,
right: 30,
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index a012b2b8b..783ac20e4 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -170,7 +170,7 @@ class DashGuestCycle extends Module
}
$tr[] = array(
- 'value' => $arrivalInfo['adult'] + $arrivalInfo['children'],
+ 'value' => $arrivalInfo['with_occupancy'] ? ($arrivalInfo['adults'] + $arrivalInfo['children']) : '--',
'class' => 'text-center',
);
$tr[] = array(
@@ -230,7 +230,7 @@ class DashGuestCycle extends Module
}
$tr[] = array(
- 'value' => $departureInfo['adult'] + $departureInfo['children'],
+ 'value' => $departureInfo['with_occupancy'] ? ($departureInfo['adults'] + $departureInfo['children']) : '--',
'class' => 'text-center',
);
$tr[] = array(
@@ -291,7 +291,7 @@ class DashGuestCycle extends Module
}
$tr[] = array(
- 'value' => $inHouseInfo['adult'] + $inHouseInfo['children'],
+ 'value' => $inHouseInfo['with_occupancy'] ? ($inHouseInfo['adults'] + $inHouseInfo['children']) : '--',
'class' => 'text-center',
);
$tr[] = array(
@@ -357,7 +357,7 @@ class DashGuestCycle extends Module
'class' => 'text-center',
);
$tr[] = array(
- 'value' => $newBookingInfo['total_guests'],
+ 'value' => $newBookingInfo['with_occupancy'] ? $newBookingInfo['total_guests'] : '--',
'class' => 'text-center',
);
$tr[] = array(
@@ -425,7 +425,7 @@ class DashGuestCycle extends Module
}
$tr[] = array(
- 'value' => $cancellationInfo['total_guests'],
+ 'value' => $cancellationInfo['with_occupancy'] ? $cancellationInfo['total_guests'] : '--',
'class' => 'text-center',
);
$tr[] = array(
diff --git a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
index 91842bd5b..4ea64cba4 100644
--- a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
+++ b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
@@ -50,7 +50,7 @@