@@ -2198,6 +2198,19 @@
{else}
{assign var=is_full_payment value=true}
{/if}
+
diff --git a/admin/themes/default/template/controllers/products/serviceproduct.tpl b/admin/themes/default/template/controllers/products/serviceproduct.tpl
index ac93c1ed9..15b7d51d0 100644
--- a/admin/themes/default/template/controllers/products/serviceproduct.tpl
+++ b/admin/themes/default/template/controllers/products/serviceproduct.tpl
@@ -124,17 +124,21 @@
-
-
-
- {l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}
+ {if $service_product.auto_add_to_cart&& $service_product.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
+ {l s='-'}
+ {else}
+
+
+
+ {l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}
+ {/if}
|
{/foreach}
diff --git a/classes/Mail.php b/classes/Mail.php
index 2e321aa6a..6483afabd 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -296,7 +296,10 @@ class MailCore extends ObjectModel
}
/* Create mail and attach differents parts */
- $subject = '['.Configuration::get('PS_SHOP_NAME', null, null, $id_shop).'] '.$subject;
+ if (Configuration::get('PS_MAIL_SUBJECT_PREFIX')) {
+ $subject = '[' . strip_tags($configuration['PS_SHOP_NAME']) . '] ' . $subject;
+ }
+
$message->setSubject($subject);
$message->setCharset('utf-8');
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index f25115eb2..80e71feba 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1155,6 +1155,7 @@ class AdminControllerCore extends Controller
header('Cache-Control: no-store, no-cache');
header('Content-disposition: attachment; filename="'.$this->table.'_'.date('Y-m-d_His').'.csv"');
+ $fd = fopen('php://output', 'wb');
$headers = array();
foreach ($this->fields_list as $key => $datas) {
if ('PDF' === $datas['title']) {
@@ -1167,9 +1168,10 @@ class AdminControllerCore extends Controller
}
}
}
- $content = array();
+
+ fputcsv($fd, $headers, ';', $text_delimiter);
foreach ($this->_list as $i => $row) {
- $content[$i] = array();
+ $content = array();
$path_to_image = false;
foreach ($this->fields_list as $key => $params) {
$field_value = isset($row[$key]) ? Tools::htmlentitiesDecodeUTF8(Tools::nl2br($row[$key])) : '';
@@ -1189,21 +1191,16 @@ class AdminControllerCore extends Controller
$field_value = call_user_func_array(array($callback_obj, $params['callback']), array($field_value, $row));
}
}
- $content[$i][] = $field_value;
+ $content[] = $field_value;
}
+ fputcsv($fd, $content, ';', $text_delimiter);
}
- $this->context->smarty->assign(array(
- 'export_precontent' => "",
- 'export_headers' => $headers,
- 'export_content' => $content,
- 'text_delimiter' => $text_delimiter
- )
- );
-
- $this->layout = 'layout-export.tpl';
+ @fclose($fd);
+ die;
}
+
/**
* Object Delete
*
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index e1c58944e..8d3580781 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -3146,14 +3146,14 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$totalPriceTaxExcl = $unitPriceTaxExcl * $quantity;
$totalPriceTaxIncl = $unitPriceTaxIncl * $quantity;
- if (isset($service['unit_price_without_tax'])) {
- $unitPriceTaxExcl = $service['unit_price_without_tax'];
+ if (isset($services[$product['id_product']]['unit_price_without_tax'])) {
+ $unitPriceTaxExcl = $services[$product['id_product']]['unit_price_without_tax'];
$unitPriceTaxIncl = $unitPriceTaxExcl * $oldTaxMultiplier;
$totalPriceTaxExcl = $unitPriceTaxExcl * $quantity;
$totalPriceTaxIncl = $unitPriceTaxIncl * $quantity;
- } else if (isset($service['total_price_without_tax'])) {
- $totalPriceTaxExcl = $service['total_price_without_tax'];
+ } else if (isset($services[$product['id_product']]['total_price_without_tax'])) {
+ $totalPriceTaxExcl = $services[$product['id_product']]['total_price_without_tax'];
$totalPriceTaxIncl = $totalPriceTaxExcl * $oldTaxMultiplier;
$unitPriceTaxExcl = $totalPriceTaxExcl / $quantity;
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 51f4568ad..c457bf367 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1158,19 +1158,80 @@ class AdminCartsControllerCore extends AdminController
// Process when admin changes extra demands of any room while order creation process form.tpl
public function ajaxProcessChangeRoomDemands()
{
- $response = array('status' => false);
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- $response['status'] = true;
+ if ($this->tabAccess['edit'] === '1') {
+ $response = array('status' => false);
+ if ($idCartBooking = Tools::getValue('id_cart_booking')) {
+ if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
+ $roomDemands = Tools::getValue('room_demands');
+ $roomDemands = json_decode($roomDemands, true);
+ $roomDemands = json_encode($roomDemands);
+ $objCartbookingCata->extra_demands = $roomDemands;
+ if ($objCartbookingCata->save()) {
+ $response['status'] = true;
+ }
}
}
+ $this->ajaxDie(json_encode($response));
+ }
+ }
+
+ public function ajaxProcessUpdateServiceProduct()
+ {
+ if ($this->tabAccess['edit'] === '1') {
+ $operator = Tools::getValue('operator', 'up');
+ $idServiceProduct = Tools::getValue('id_product');
+ $idCartBooking = Tools::getValue('id_cart_booking');
+ $qty = Tools::getValue('qty');
+
+ if (Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData($idCartBooking))) {
+ $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
+
+ if ($operator == 'up') {
+ $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
+ if ($objRoomTypeServiceProduct->isRoomTypeLinkedWithProduct($objHotelCartBookingData->id_product, $idServiceProduct)) {
+ // validate quanitity
+ if (Validate::isLoadedObject($objProduct = new Product($idServiceProduct))) {
+ if ($objProduct->allow_multiple_quantity) {
+ if (!Validate::isUnsignedInt($qty)) {
+ $this->errors[] = Tools::displayError('The quantity code you\'ve entered is invalid.');
+ // } elseif ($objProduct->max_quantity && $qty > $objProduct->max_quantity) {
+ // $this->errors[] = Tools::displayError(sprintf('cannot add more than %d quantity.', $objProduct->max_quantity));
+ }
+ } else {
+ $qty = 1;
+ }
+ } else {
+ $this->errors[] = Tools::displayError('This Service is not available.');
+ }
+ } else {
+ $this->errors[] = Tools::displayError('This Service is not available with selected room.');
+ }
+ }
+
+ if (empty($this->errors)) {
+ if ($objRoomTypeServiceProductCartDetail->updateCartServiceProduct(
+ $idCartBooking,
+ $idServiceProduct,
+ $qty,
+ $objHotelCartBookingData->id_cart,
+ $operator
+ )) {
+ $this->ajaxDie(json_encode(array(
+ 'hasError' => false
+ )));
+ } else {
+ $this->errors[] = Tools::displayError('Unable to update services. Please try reloading the page.');
+ }
+
+ }
+ } else {
+ $this->errors[] = Tools::displayError('Room not found. Please try reloading the page.');
+ }
+ $this->ajaxDie(json_encode(array(
+ 'hasError' => true,
+ 'errors' => $this->errors
+ )));
}
- $this->ajaxDie(json_encode($response));
}
public static function getOrderTotalUsingTaxCalculationMethod($id_cart)
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index e76f5053b..3131c50fa 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -95,6 +95,12 @@ class AdminEmailsControllerCore extends AdminController
2 => $this->l('Set my own SMTP parameters (for advanced users ONLY)')
)
),
+ 'PS_MAIL_SUBJECT_PREFIX' => array(
+ 'title' => $this->l('Enable the website name as a prefix in the email\'s subject'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool',
+ ),
'PS_MAIL_TYPE' => array(
'title' => '',
'validation' => 'isGenericName',
@@ -111,7 +117,7 @@ class AdminEmailsControllerCore extends AdminController
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
- ),
+ )
),
'submit' => array('title' => $this->l('Save'))
),
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index a6b3551ee..e3d7a9050 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1674,7 +1674,7 @@ class AdminOrdersControllerCore extends AdminController
$this->errors[] = Tools::displayError('The invoice for edit note was unable to load. ');
}
} elseif (Tools::isSubmit('submitAddOrder') && ($id_cart = Tools::getValue('id_cart'))) {
- if ($this->tabAccess['edit'] === '1') {
+ if ($this->tabAccess['add'] === '1') {
$objCart = new Cart($id_cart);
if (Validate::isLoadedObject($objCart)) {
$this->context->cart = $objCart;
@@ -1776,6 +1776,7 @@ class AdminOrdersControllerCore extends AdminController
$amountPaid = Tools::ps_round($amountPaid, 6);
$objEmployee = new Employee($this->context->cookie->id_employee);
+ $sendMails = Tools::getValue('send_mails', true);
$objPaymentModule->validateOrder(
$objCart->id,
@@ -1786,7 +1787,9 @@ class AdminOrdersControllerCore extends AdminController
$extraVars,
null,
false,
- $objCart->secure_key
+ $objCart->secure_key,
+ null,
+ $sendMails
);
if (isset($this->context->cookie->id_cart)) {
@@ -2589,11 +2592,11 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-today-stay-over';
$helper->icon = 'icon-user';
$helper->color = 'color4';
- $helper->title = $this->l('Stay Overs', null, null, false);
+ $helper->title = $this->l('Occupied Rooms', null, null, false);
$helper->subtitle = $this->l('Today', null, null, false);
$helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitResetorder&submitFilterorder=1&orderFilter_hbd!is_refunded=0&orderFilter_hbd!id_status='.HotelBookingDetail::STATUS_CHECKED_IN.'&orderFilter_hbd!date_to[]='.pSQL(date('Y-m-d', strtotime('+ 1 days'))).'&orderFilter_hbd!date_to[]=';
- $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_stay_over';
- $helper->tooltip = $this->l('Total number of stay overs for today.', null, null, false);
+ $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=occupied_rooms';
+ $helper->tooltip = $this->l('The count of rooms that are currently occupied by guests.', null, null, false);
$this->kpis[] = $helper;
$helper = new HelperKpi();
@@ -7118,63 +7121,6 @@ class AdminOrdersControllerCore extends AdminController
die(json_encode($response));
}
- public function ajaxProcessUpdateServiceProduct()
- {
- $operator = Tools::getValue('operator', 'up');
- $idServiceProduct = Tools::getValue('id_product');
- $idCartBooking = Tools::getValue('id_cart_booking');
- $qty = Tools::getValue('qty');
-
- if (Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData($idCartBooking))) {
- $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-
- if ($operator == 'up') {
- $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
- if ($objRoomTypeServiceProduct->isRoomTypeLinkedWithProduct($objHotelCartBookingData->id_product, $idServiceProduct)) {
- // validate quanitity
- if (Validate::isLoadedObject($objProduct = new Product($idServiceProduct))) {
- if ($objProduct->allow_multiple_quantity) {
- if (!Validate::isUnsignedInt($qty)) {
- $this->errors[] = Tools::displayError('The quantity code you\'ve entered is invalid.');
- // } elseif ($objProduct->max_quantity && $qty > $objProduct->max_quantity) {
- // $this->errors[] = Tools::displayError(sprintf('cannot add more than %d quantity.', $objProduct->max_quantity));
- }
- } else {
- $qty = 1;
- }
- } else {
- $this->errors[] = Tools::displayError('This Service is not available.');
- }
- } else {
- $this->errors[] = Tools::displayError('This Service is not available with selected room.');
- }
- }
-
- if (empty($this->errors)) {
- if ($objRoomTypeServiceProductCartDetail->updateCartServiceProduct(
- $idCartBooking,
- $idServiceProduct,
- $qty,
- $objHotelCartBookingData->id_cart,
- $operator
- )) {
- $this->ajaxDie(json_encode(array(
- 'hasError' => false
- )));
- } else {
- $this->errors[] = Tools::displayError('Unable to update services. Please try reloading the page.');
- }
-
- }
- } else {
- $this->errors[] = Tools::displayError('Room not found. Please try reloading the page.');
- }
- $this->ajaxDie(json_encode(array(
- 'hasError' => true,
- 'errors' => $this->errors
- )));
- }
-
// To change the status of the room
public function changeRoomStatus()
{
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 1b6169fc9..e111894ed 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -785,6 +785,9 @@
1
+
+ 1
+
Animaux
diff --git a/js/daterangepicker/qlodaterangepicker.js b/js/daterangepicker/qlodaterangepicker.js
index 83381ec19..323885a7b 100644
--- a/js/daterangepicker/qlodaterangepicker.js
+++ b/js/daterangepicker/qlodaterangepicker.js
@@ -20,6 +20,10 @@
(function($) {
var dateRangePickerOrg = $.fn.dateRangePicker;
+ Object.assign($.dateRangePickerLanguages, {
+ zh: $.dateRangePickerLanguages.cn,
+ tw: $.dateRangePickerLanguages.tc
+ });
$.fn.dateRangePicker = function(opt) {
if(typeof opt === "object") {
let container = $(this).parent();
diff --git a/modules/bankwire/controllers/front/payment.php b/modules/bankwire/controllers/front/payment.php
index 59dc5ab17..63c76795f 100644
--- a/modules/bankwire/controllers/front/payment.php
+++ b/modules/bankwire/controllers/front/payment.php
@@ -80,4 +80,10 @@ class BankwirePaymentModuleFrontController extends ModuleFrontController
$this->setTemplate('payment_execution.tpl');
}
+
+ public function setMedia()
+ {
+ parent::setMedia();
+ $this->addJS($this->module->getLocalPath().'views/js/front/payment.js');
+ }
}
diff --git a/modules/bankwire/views/js/front/index.php b/modules/bankwire/views/js/front/index.php
new file mode 100644
index 000000000..e5f2df63f
--- /dev/null
+++ b/modules/bankwire/views/js/front/index.php
@@ -0,0 +1,33 @@
+
-
- {l s='Other payment methods' mod='bankwire'}
-
+
+ {l s='Other payment methods' mod='bankwire'}
+
{*By webkul To Check Order restrict condition before Payment by the customer*}
{if !$restrict_order}
-
{/if}
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index 601e11704..ade5cd28e 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -79,7 +79,7 @@ class DashGuestCycle extends Module
$dataValue['dgc_total_departures'] = sprintf('%02d', rand(100, 1000));
$dataValue['dgc_departed'] = sprintf('%02d', rand(0, $dataValue['dgc_total_departures']));
$dataValue['dgc_new_bookings'] = sprintf('%02d', rand(10, 500));
- $dataValue['dgc_stay_overs'] = sprintf('%02d', rand(10, 500));
+ $dataValue['dgc_occupied'] = sprintf('%02d', rand(10, 500));
$dataValue['dgc_new_messages'] = sprintf('%02d', rand(0, 20));
$dataValue['dgc_cancelled_bookings'] = sprintf('%02d', rand(0, 20));
$dataValue['dgc_guests_adults'] = sprintf('%02d', rand(100, 1000));
@@ -94,7 +94,12 @@ class DashGuestCycle extends Module
$dataValue['dgc_departed'] = sprintf('%02d', $departuresData['departed']);
$dataValue['dgc_total_departures'] = sprintf('%02d', $departuresData['total_departures']);
$dataValue['dgc_new_bookings'] = sprintf('%02d', count(AdminStatsController::getNewBookingsInfoByDate($dateToday, $params['id_hotel'])));
- $dataValue['dgc_stay_overs'] = sprintf('%02d', AdminStatsController::getStayOversByDate($dateToday, $params['id_hotel']));
+ $dataValue['dgc_occupied'] = sprintf('%02d', AdminStatsController::getDistinctRoomBookingsCount(
+ date('Y-m-d', strtotime('-1 day')),
+ $dateToday,
+ $params['id_hotel'],
+ HotelBookingDetail::STATUS_CHECKED_IN
+ ));
$dataValue['dgc_new_messages'] = sprintf('%02d', CustomerMessage::getMessagesByDate($dateToday));
$dataValue['dgc_cancelled_bookings'] = sprintf('%02d', AdminStatsController::getCancelledBookingsByDate($dateToday, $params['id_hotel']));
$dataValue['dgc_guests_adults'] = sprintf('%02d', $guestsData['adults']);
diff --git a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl b/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl
index be28fd58c..8df983b06 100644
--- a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl
+++ b/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl
@@ -68,15 +68,15 @@