diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index 258645f4e..94354f93b 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -1696,7 +1696,7 @@ headers: { "cache-control": "no-cache" }, - url: "{$link->getAdminLink('AdminOrders')|addslashes}", + url: "{$link->getAdminLink('AdminCarts')|addslashes}", dataType: 'JSON', cache: false, data: { diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 0954044c1..99299e9ce 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/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 87b45d116..e833b711d 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; @@ -2592,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(); @@ -7102,63 +7102,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/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/cheque/controllers/front/payment.php b/modules/cheque/controllers/front/payment.php index 1d5e0f76b..1eee0a140 100644 --- a/modules/cheque/controllers/front/payment.php +++ b/modules/cheque/controllers/front/payment.php @@ -83,4 +83,10 @@ class ChequePaymentModuleFrontController 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/cheque/views/js/front/index.php b/modules/cheque/views/js/front/index.php new file mode 100644 index 000000000..150f23072 --- /dev/null +++ b/modules/cheque/views/js/front/index.php @@ -0,0 +1,32 @@ +{l s='Other payment methods' mod='cheque'} {*By webkul To Check Order restrict condition before Payment by the customer*} - {if !$restrict_order} - - {/if} + {if !$restrict_order} + + {/if}

{/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 @@
-
+
-

{l s="Stay Overs" mod='dashguestcycle'}

+

{l s='Occupied Rooms' mod='dashguestcycle'}

- +

diff --git a/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl b/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl index b7e6fa42c..835542afe 100644 --- a/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl +++ b/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl @@ -90,7 +90,7 @@ {*By webkul To Check Order restrict condition before Payment by the customer*} {if !$restrict_order} - {/if} diff --git a/themes/hotel-reservation-theme/modules/cheque/views/templates/front/payment_execution.tpl b/themes/hotel-reservation-theme/modules/cheque/views/templates/front/payment_execution.tpl index efeaa971b..8fff68f8e 100644 --- a/themes/hotel-reservation-theme/modules/cheque/views/templates/front/payment_execution.tpl +++ b/themes/hotel-reservation-theme/modules/cheque/views/templates/front/payment_execution.tpl @@ -82,7 +82,7 @@ {*By webkul To Check Order restrict condition before Payment by the customer*} {if !$restrict_order} - {/if}