diff --git a/admin/themes/default/template/controllers/cart_rules/actions.tpl b/admin/themes/default/template/controllers/cart_rules/actions.tpl index efe1a4d24..d7da999e3 100644 --- a/admin/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin/themes/default/template/controllers/cart_rules/actions.tpl @@ -46,7 +46,6 @@ % - {l s='Does not apply to the shipping costs'} diff --git a/admin/themes/default/template/controllers/cart_rules/conditions.tpl b/admin/themes/default/template/controllers/cart_rules/conditions.tpl index bfdea3f15..8f225fbbf 100644 --- a/admin/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin/themes/default/template/controllers/cart_rules/conditions.tpl @@ -47,7 +47,7 @@
@@ -125,7 +125,6 @@ {l s='Country selection'}

- {l s='This restriction applies to the country of delivery.'}

diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index e802993eb..630836734 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -35,15 +35,9 @@

{l s='Customer information'}

{if $customer->id} {$customer->email} -

- {if $customer->id_gender == 1} - - {elseif $customer->id_gender == 2} - - {else} - - {/if} - {$customer->firstname} {$customer->lastname}

+

+ {l s='Customer Name'}: + {$customer->firstname} {$customer->lastname}

diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 18ceebacc..1ed440c02 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -193,18 +193,22 @@
{/if} - {if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)} + {if (isset($refundReqBookings) && $refundReqBookings)}
- {if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)} + {if (isset($refundReqBookings) && $refundReqBookings)} {/if} diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 077a3bb15..8c026b68b 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -41,6 +41,7 @@ {block name="override_tpl"} {/if} + {block name="updatelist"} {if $new_list_header_design}
diff --git a/admin/themes/default/template/search_form.tpl b/admin/themes/default/template/search_form.tpl index ac11075f7..b7c2e195a 100644 --- a/admin/themes/default/template/search_form.tpl +++ b/admin/themes/default/template/search_form.tpl @@ -64,7 +64,7 @@
  • - {l s='Invoices'} + {l s='Invoices'}
  • diff --git a/classes/CartCustomerGuestDetail.php b/classes/CartCustomerGuestDetail.php index d21c56c68..0ab1592be 100644 --- a/classes/CartCustomerGuestDetail.php +++ b/classes/CartCustomerGuestDetail.php @@ -78,6 +78,31 @@ class CartCustomerGuestDetailCore extends ObjectModel if (!trim($this->phone) || !Validate::isPhoneNumber($this->phone)) { $isValid = false; } + + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); + + if (isset($rules['size']['firstname'])) { + if (Tools::strlen(trim($this->firstname)) > $rules['size']['firstname']) { + $isValid = false; + } + } + if (isset($rules['size']['lastname'])) { + if (Tools::strlen(trim($this->lastname)) > $rules['size']['lastname']) { + $isValid = false; + } + } + if (isset($rules['size']['email'])) { + if (Tools::strlen(trim($this->email)) > $rules['size']['email']) { + $isValid = false; + } + } + if (isset($rules['size']['phone'])) { + if (Tools::strlen(trim($this->phone)) > $rules['size']['phone']) { + $isValid = false; + } + } + return $isValid; } } \ No newline at end of file diff --git a/classes/Gender.php b/classes/Gender.php index f3da94ad1..35034c55d 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -44,7 +44,7 @@ class GenderCore extends ObjectModel 'type' => array('type' => self::TYPE_INT, 'required' => true), /* Lang fields */ - 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isString', 'required' => true, 'size' => 20), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 20), ), ); diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index c466fb02a..ea0c1ffa0 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -989,7 +989,7 @@ class AdminControllerCore extends Controller public function processListVisibility() { - $listFieldsVisibility = Tools::getValue('list_fields_visibility'); + $listFieldsVisibility = Tools::getValue('list_fields_visibility', array()); // To set optional list empty in case none is selected $controller = 'list_visibility_'.$this->context->controller->className; $this->context->cookie->$controller = json_encode($listFieldsVisibility); diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index df607f131..55219ea1e 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -337,7 +337,7 @@ class HelperListCore extends Helper } } - foreach ($this->fields_list as $key => $params) { + foreach ($this->fields_list as $key => $field) { if (isset($field['optional']) && $field['optional']) { $this->fields_optional[$key] = $field; } @@ -733,8 +733,8 @@ class HelperListCore extends Helper } if (isset($field['optional']) && $field['optional']) { $this->fields_optional[$key] = $field; - if ((empty($list_visibility) && isset($field['visible_default']) && $field['visible_default']) - || $list_visibility && in_array($key , $list_visibility) + if ((!is_array($list_visibility) && isset($field['visible_default']) && $field['visible_default']) + || ($list_visibility && in_array($key , $list_visibility)) ) { $this->fields_optional[$key]['selected'] = true; } diff --git a/classes/order/Order.php b/classes/order/Order.php index 74fc0a450..72e19deff 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -2631,9 +2631,12 @@ class OrderCore extends ObjectModel * Order::ORDER_COMPLETE_REFUND_FLAG for complete refunded and * Order::ORDER_COMPLETE_CANCELLATION_FLAG for completely cancelled and * Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG for all rooms are either cancelled or requested for refunded + * + * @param integer includeCheckIn = 1: If you want to get result for rooms that are refunded or cancelled Or Checkin/Checkout. Send $action = 0 + * * @return boolean: true if order has been completely refunded as per requested parameters or false */ - public function hasCompletelyRefunded($action = 0) + public function hasCompletelyRefunded($action = 0, $includeCheckIn = 0) { $objHotelBooking = new HotelBookingdetail(); if ($orderBookings = $objHotelBooking->getOrderCurrentDataByOrderId($this->id)) { @@ -2658,11 +2661,18 @@ class OrderCore extends ObjectModel } elseif ($action == Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG) { foreach ($orderBookings as $booking) { if (!$booking['is_refunded']) { - if (!OrderReturn::getOrdersReturnDetail($this->id, 0, $booking['id'])) { + // If booking refund request is created and request is completed but booking is not refunded then return false + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($this->id, 0, $booking['id'])) { + $bookingRefundDetail = reset($bookingRefundDetail); + if ($bookingRefundDetail['refunded']) { + return false; + } + } else { return false; } } } + return true; // Default process to check if order is fully refunded or cancelled or not } else { @@ -2670,6 +2680,16 @@ class OrderCore extends ObjectModel $uniqueRefundedBookings = array_unique(array_column($orderBookings, 'is_refunded')); if (count($uniqueRefundedBookings) == 1 && $uniqueRefundedBookings[0] == 1) { return true; + } elseif ($includeCheckIn) { + foreach ($orderBookings as $booking) { + if ($booking['is_refunded'] == 0 + && !OrderReturn::getOrdersReturnDetail($this->id, 0, $booking['id']) + && $booking['id_status'] == HotelBookingDetail::STATUS_ALLOTED + ) { + return false; + } + } + return true; } } } @@ -2727,7 +2747,12 @@ class OrderCore extends ObjectModel if ($orderBookings = $objHotelBooking->getOrderCurrentDataByOrderId($this->id)) { foreach ($orderBookings as $orderBooking) { // If booking is refunded then no need to check inventory - if ((OrderReturn::getOrdersReturnDetail($this->id, 0, $orderBooking['id']) && $orderBooking['is_refunded']) + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($this->id, 0, $orderBooking['id'])) { + $bookingRefundDetail = reset($bookingRefundDetail); + } + + // $bookingRefundDetail['id_customization'] is 1 for only refunded request completed and refunded bookings + if (($bookingRefundDetail && $bookingRefundDetail['refunded'] && $orderBooking['is_refunded'] && $bookingRefundDetail['id_customization']) || ($orderBooking['is_cancelled'] && $orderBooking['is_refunded']) ) { continue; diff --git a/classes/order/OrderCustomerGuestDetail.php b/classes/order/OrderCustomerGuestDetail.php index 9f7013bdd..863a695e6 100644 --- a/classes/order/OrderCustomerGuestDetail.php +++ b/classes/order/OrderCustomerGuestDetail.php @@ -34,12 +34,12 @@ class OrderCustomerGuestDetailCore extends ObjectModel 'table' => 'order_customer_guest_detail', 'primary' => 'id_order_customer_guest_detail', 'fields' => array( - 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_gender' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), - 'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), - 'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32), - 'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'size' => 128), - 'phone' => array('type' => self::TYPE_STRING, 'validate' => 'isPhoneNumber', 'size' => 32), + 'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32, 'required' => true), + 'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'size' => 32, 'required' => true), + 'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'size' => 128, 'required' => true), + 'phone' => array('type' => self::TYPE_STRING, 'validate' => 'isPhoneNumber', 'size' => 32, 'required' => true), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), @@ -53,22 +53,4 @@ class OrderCustomerGuestDetailCore extends ObjectModel WHERE `id_order` = '.(int)$id_order ); } - - public function validateGuestInfo() - { - $isValid = true; - if (!trim($this->firstname) || !Validate::isName($this->firstname)) { - $isValid = false; - } - if (!trim($this->lastname) || !Validate::isName($this->lastname)) { - $isValid = false; - } - if (!trim($this->email) || !Validate::isEmail($this->email)) { - $isValid = false; - } - if (!trim($this->phone) || !Validate::isPhoneNumber($this->phone)) { - $isValid = false; - } - return $isValid; - } } \ No newline at end of file diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php index cfda5704a..60898f126 100644 --- a/classes/order/OrderDetail.php +++ b/classes/order/OrderDetail.php @@ -857,4 +857,103 @@ class OrderDetailCore extends ObjectModel return $wholesale_price; } + + /** + * @param OrderDetail $order_detail + * @param int $qty_cancel_product + * @param bool $delete + */ + public function reinjectQuantity($order_detail, $qty_cancel_product, $delete = false) + { + $errors = array(); + $context = Context::getContext(); + // Reinject product + $reinjectable_quantity = (int)$order_detail->product_quantity - (int)$order_detail->product_quantity_reinjected; + $quantity_to_reinject = $qty_cancel_product > $reinjectable_quantity ? $reinjectable_quantity : $qty_cancel_product; + // @since 1.5.0 : Advanced Stock Management + $product_to_inject = new Product($order_detail->product_id, false, (int)$context->language->id, (int)$order_detail->id_shop); + + $product = new Product($order_detail->product_id, false, (int)$context->language->id, (int)$order_detail->id_shop); + + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && $order_detail->id_warehouse != 0) { + $manager = StockManagerFactory::getManager(); + $movements = StockMvt::getNegativeStockMvts( + $order_detail->id_order, + $order_detail->product_id, + $order_detail->product_attribute_id, + $quantity_to_reinject + ); + $left_to_reinject = $quantity_to_reinject; + foreach ($movements as $movement) { + if ($left_to_reinject > $movement['physical_quantity']) { + $quantity_to_reinject = $movement['physical_quantity']; + } + + $left_to_reinject -= $quantity_to_reinject; + if (Pack::isPack((int)$product->id)) { + // Gets items + if ($product->pack_stock_type == 1 || $product->pack_stock_type == 2 || ($product->pack_stock_type == 3 && Configuration::get('PS_PACK_STOCK_TYPE') > 0)) { + $products_pack = Pack::getItems((int)$product->id, (int)Configuration::get('PS_LANG_DEFAULT')); + // Foreach item + foreach ($products_pack as $product_pack) { + if ($product_pack->advanced_stock_management == 1) { + $manager->addProduct( + $product_pack->id, + $product_pack->id_pack_product_attribute, + new Warehouse($movement['id_warehouse']), + $product_pack->pack_quantity * $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } + } + if ($product->pack_stock_type == 0 || $product->pack_stock_type == 2 || + ($product->pack_stock_type == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 0 || Configuration::get('PS_PACK_STOCK_TYPE') == 2))) { + $manager->addProduct( + $order_detail->product_id, + $order_detail->product_attribute_id, + new Warehouse($movement['id_warehouse']), + $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } else { + $manager->addProduct( + $order_detail->product_id, + $order_detail->product_attribute_id, + new Warehouse($movement['id_warehouse']), + $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } + + $id_product = $order_detail->product_id; + if ($delete) { + $order_detail->delete(); + } + StockAvailable::synchronize($id_product); + } elseif ($order_detail->id_warehouse == 0) { + StockAvailable::updateQuantity( + $order_detail->product_id, + $order_detail->product_attribute_id, + $quantity_to_reinject, + $order_detail->id_shop + ); + + if ($delete) { + $order_detail->delete(); + } + } else { + $errors[] = Tools::displayError('This product cannot be re-stocked.'); + } + + return $errors; + } } diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index aaace5681..6af232e7f 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -177,9 +177,18 @@ class OrderReturnCore extends ObjectModel return (int)($data['total']); } - public function getOrderRefundRequestedBookings($idOrder, $idOrderReturn = 0, $onlyBookingIds = 0, $customerView = 0) + /** + * Get order refund requested bookings + * @param integer $idOrder + * @param integer $idOrderReturn + * @param integer $onlyBookingIds + * @param integer $customerView + * @param integer $skipReqCompletedNonRefunded: send 1 if you want to skip refund request completed but non-refunded booking + * @return array of refund requested bookings + */ + public function getOrderRefundRequestedBookings($idOrder, $idOrderReturn = 0, $onlyBookingIds = 0, $customerView = 0, $skipReqCompletedNonRefunded = 0) { - $sql = 'SELECT hbd.*, ord.* FROM `'._DB_PREFIX_.'order_return` orr'; + $sql = 'SELECT hbd.*, ord.*, orr.`state` as id_return_state FROM `'._DB_PREFIX_.'order_return` orr'; $sql .= ' LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (orr.`id_order_return` = ord.`id_order_return`)'; $sql .= ' LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id` = ord.`id_htl_booking`)'; $sql .= ' WHERE orr.`id_order` = '.(int)$idOrder; @@ -189,79 +198,92 @@ class OrderReturnCore extends ObjectModel } if ($returnDetails = Db::getInstance()->executeS($sql)) { + if ($customerView) { + $returnsCustView = array(); + } + + $objOrder = new Order($idOrder); + $objBookingDemands = new HotelBookingDemands(); + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + + foreach ($returnDetails as $key => &$bookingRow) { + if ($skipReqCompletedNonRefunded) { + $objReturnState = new OrderReturnState($bookingRow['id_return_state']); + if ($objReturnState->refunded && !$bookingRow['is_refunded']) { + unset($returnDetails[$key]); + continue; + } + } + + if (!$onlyBookingIds) { + $bookingRow['extra_service_total_paid_amount'] = 0; + $bookingRow['extra_service_total_price_tax_incl'] = 0; + $bookingRow['room_paid_amount'] = 0; + if ($bookingRow['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['room_paid_amount'] = ($objOrder->total_paid_real*$bookingRow['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + } + $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( + $idOrder, + $bookingRow['id_product'], + $bookingRow['id_room'], + $bookingRow['date_from'], + $bookingRow['date_to'], + 0 + ); + if (count($roomSelectedDemands)) { + foreach ($roomSelectedDemands as $demand) { + if ($demand['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; + } + } + } + + if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( + $bookingRow['id_htl_booking'] + )) { + if (count($roomSelectedServices['additional_services'])) { + foreach ($roomSelectedServices['additional_services'] as $service) { + if ($service['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$service['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; + } + } + } + } + if ($customerView) { + $dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']); + if (isset($returnsCustView[$dateJoin]['num_rooms'])) { + $returnsCustView[$dateJoin]['num_rooms'] += 1; + $returnsCustView[$dateJoin]['refunded_amount'] += $bookingRow['refunded_amount']; + $returnsCustView[$dateJoin]['total_price_tax_incl'] += $bookingRow['total_price_tax_incl']; + $returnsCustView[$dateJoin]['total_paid_amount'] += $bookingRow['total_paid_amount']; + } else { + unset($bookingRow['id_room']); + unset($bookingRow['room_num']); + unset($bookingRow['id_htl_booking']); + $returnsCustView[$dateJoin] = $bookingRow; + $returnsCustView[$dateJoin]['num_rooms'] = 1; + } + } + } + } + if ($onlyBookingIds) { return array_column($returnDetails, 'id_htl_booking'); } - if ($customerView) { - $returnsCustView = array(); - } - - $objBookingDemands = new HotelBookingDemands(); - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - $objOrder = new Order($idOrder); - foreach ($returnDetails as &$bookingRow) { - $bookingRow['extra_service_total_paid_amount'] = 0; - $bookingRow['extra_service_total_price_tax_incl'] = 0; - $bookingRow['room_paid_amount'] = 0; - if ($bookingRow['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['room_paid_amount'] = ($objOrder->total_paid_real*$bookingRow['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - } - $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( - $idOrder, - $bookingRow['id_product'], - $bookingRow['id_room'], - $bookingRow['date_from'], - $bookingRow['date_to'], - 0 - ); - if (count($roomSelectedDemands)) { - foreach ($roomSelectedDemands as $demand) { - if ($demand['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; - } - } - } - - if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( - $bookingRow['id_htl_booking'] - )) { - if (count($roomSelectedServices['additional_services'])) { - foreach ($roomSelectedServices['additional_services'] as $service) { - if ($service['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$service['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; - } - } - } - } - if ($customerView) { - $dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']); - if (isset($returnsCustView[$dateJoin]['num_rooms'])) { - $returnsCustView[$dateJoin]['num_rooms'] += 1; - $returnsCustView[$dateJoin]['refunded_amount'] += $bookingRow['refunded_amount']; - $returnsCustView[$dateJoin]['total_price_tax_incl'] += $bookingRow['total_price_tax_incl']; - $returnsCustView[$dateJoin]['total_paid_amount'] += $bookingRow['total_paid_amount']; - } else { - unset($bookingRow['id_room']); - unset($bookingRow['room_num']); - unset($bookingRow['id_htl_booking']); - $returnsCustView[$dateJoin] = $bookingRow; - $returnsCustView[$dateJoin]['num_rooms'] = 1; - } - } - } if ($customerView) { return $returnsCustView; } } + return $returnDetails; } @@ -297,8 +319,21 @@ class OrderReturnCore extends ObjectModel return $data; } - public static function getOrdersReturnDetail($idOrder, $idOrderReturn = 0, $idHtlBooking = 0, $idLang = 0) - { + /** + * @param $idOrder + * @param int $idOrderReturn + * @param int $idHtlBooking + * @param int $idLang + * @param int $orderByLatestRequest : If you want to return request with in the Desc order of refund requests + * @return array + */ + public static function getOrdersReturnDetail( + $idOrder, + $idOrderReturn = 0, + $idHtlBooking = 0, + $idLang = 0, + $orderByLatestRequest = 1 + ) { if (!$idLang) { $idLang = Context::getContext()->language->id; } @@ -316,6 +351,10 @@ class OrderReturnCore extends ObjectModel $sql .= ' AND ord.`id_htl_booking` = '.(int)$idHtlBooking; } + if ($orderByLatestRequest) { + $sql .= ' ORDER BY orr.`id_order_return` DESC'; + } + return Db::getInstance()->executeS($sql); } @@ -449,8 +488,8 @@ class OrderReturnCore extends ObjectModel '{order_reference}' => $objOrder->reference, '{order_date}' => date('Y-m-d h:i:s', strtotime($objOrder->date_add)), '{refunded_amount}' => Tools::displayPrice($this->refunded_amount, new Currency($objOrder->id_currency)), - '{payment_mode}' => $this->payment_mode, - '{id_transaction}' => $this->id_transaction, + '{payment_mode}' => $this->payment_mode ? $this->payment_mode : '--', + '{id_transaction}' => $this->id_transaction ? $this->id_transaction : '--', ); // if mail is true for the customer then send mail to customer with selected template @@ -480,7 +519,7 @@ class OrderReturnCore extends ObjectModel Mail::Send( (int)$idLang, $objOrderReturnState->customer_template, - $objOrderReturnState->name, + sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name), $data, $objCustomer->email, $objCustomer->firstname.' '.$objCustomer->lastname, @@ -523,7 +562,7 @@ class OrderReturnCore extends ObjectModel Mail::Send( (int)$idLang, $objOrderReturnState->admin_template, - $objOrderReturnState->name, + sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name), $data, $superAdminEmployee['email'], $superAdminEmployee['firstname'].' '.$superAdminEmployee['lastname'], @@ -553,7 +592,7 @@ class OrderReturnCore extends ObjectModel Mail::Send( (int)$idLang, $objOrderReturnState->admin_template, - $objOrderReturnState->name, + sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name), $data, $objHotel->email, null, @@ -585,7 +624,7 @@ class OrderReturnCore extends ObjectModel Mail::Send( (int)$idLang, $objOrderReturnState->admin_template, - $objOrderReturnState->name, + sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name), $data, $empl['email'], $empl['firstname'].' '.$empl['lastname'], diff --git a/classes/order/OrderReturnDetail.php b/classes/order/OrderReturnDetail.php index b956347c1..9975ee40a 100644 --- a/classes/order/OrderReturnDetail.php +++ b/classes/order/OrderReturnDetail.php @@ -30,9 +30,15 @@ class OrderReturnDetailCore extends ObjectModel public $refunded_amount; public $id_order_detail; + + // Used to manage refunded or refunde denied bookings in a refund request : 1 for only refunded request completed and refunded bookings public $id_customization; public $product_quantity; + const REFUND_REQUEST_STATUS_LATEST = 1; + const REFUND_REQUEST_STATUS_PENDING = 2; + const REFUND_REQUEST_STATUS_COMPLETED = 3; + /** * @see ObjectModel::$definition */ diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index f8917621e..6a8c86277 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -411,7 +411,7 @@ class AdminCartRulesControllerCore extends AdminController $ruleGroupId, $ruleId, Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type'), - Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) + Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId, array()) ); } } @@ -486,6 +486,7 @@ class AdminCartRulesControllerCore extends AdminController ON (p.`id_product` = hrt.`id_product`) LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl ON (hrt.`id_hotel` = hbl.`id` AND hbl.`id_lang` = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').') + WHERE p.`booking_product` = 1 ORDER BY name'); foreach ($results as $row) { if($row['hotel_name']) { diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 98a5db874..5f81339a4 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -50,9 +50,9 @@ class AdminCustomerPreferencesControllerCore extends AdminController $this->fields_options = array( 'general' => array( - 'title' => $this->l('General'), - 'icon' => 'icon-cogs', - 'fields' => array( + 'title' => $this->l('General'), + 'icon' => 'icon-cogs', + 'fields' => array( 'PS_REGISTRATION_PROCESS_TYPE' => array( 'title' => $this->l('Registration process type'), 'hint' => $this->l('The "Only account creation" registration option allows the customer to register faster, and create his/her address later.'), @@ -121,6 +121,15 @@ class AdminCustomerPreferencesControllerCore extends AdminController 'cast' => 'intval', 'type' => 'bool' ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + ), + ), + 'customer_kpi' => array( + 'title' => $this->l('Customer KPI configuration'), + 'icon' => 'icon-cogs', + 'fields' => array( 'PS_KPI_FREQUENT_CUSTOMER_NB_ORDERS' => array( 'title' => $this->l('Number of orders to use to calculate frequent customers'), 'hint' => $this->l('Set the number of orders to use to calculate frequent customers.'), @@ -157,8 +166,10 @@ class AdminCustomerPreferencesControllerCore extends AdminController 'class' => 'fixed-width-xl', ), ), - 'submit' => array('title' => $this->l('Save')), - ), + 'submit' => array( + 'title' => $this->l('Save'), + ), + ) ); } diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 6c763f10c..bd9ffd404 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -509,7 +509,7 @@ class AdminCustomersControllerCore extends AdminController ); // if we add a customer via fancybox (ajax), it's a customer and he doesn't need to be added to the visitor and guest groups - if (Tools::isSubmit('addcustomer') && Tools::isSubmit('submitFormAjax')) { + if (Tools::isSubmit('submitFormAjax')) { $visitor_group = Configuration::get('PS_UNIDENTIFIED_GROUP'); $guest_group = Configuration::get('PS_GUEST_GROUP'); foreach ($groups as $key => $g) { diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 57a9ef514..7331a9c4c 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -77,7 +77,7 @@ class AdminGendersControllerCore extends AdminController 'list' => array( 0 => $this->l('Male'), 1 => $this->l('Female'), - 2 => $this->l('Neutral') + 2 => $this->l('Other') ), 'filter_key' => 'a!type', 'callback' => 'displayGenderType', @@ -145,7 +145,7 @@ class AdminGendersControllerCore extends AdminController array( 'id' => 'type_neutral', 'value' => 2, - 'label' => $this->l('Neutral') + 'label' => $this->l('Other') ) ) ), diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index b57c8b4a3..6cb46c39b 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -278,7 +278,7 @@ class AdminNormalProductsControllerCore extends AdminController $idServiceCategory = Configuration::get('PS_SERVICE_CATEGORY'); $this->objLocationsCategory = new Category($idServiceCategory, $this->context->language->id); $nestedCategories = Category::getNestedCategories($idServiceCategory); - if ($nestedCategories) { + if (isset($nestedCategories[$idServiceCategory]['children']) && $nestedCategories[$idServiceCategory]['children']) { foreach ($nestedCategories[$idServiceCategory]['children'] as $childCategory) { $this->buildCategoryOptions($childCategory); } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index d56966e0c..db4a3f943 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -376,11 +376,11 @@ class AdminOrdersControllerCore extends AdminController $cart_order_exists = $cart->orderExists(); if (!$cart_order_exists) { $this->context->cart = $cart; + $this->context->currency = new Currency((int)$cart->id_currency); // validate cart for removing invalid data from cart before new order creation $this->errors = array_merge($this->errors, HotelCartBookingData::validateCartBookings()); - $this->context->currency = new Currency((int)$cart->id_currency); $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail(); @@ -494,11 +494,14 @@ class AdminOrdersControllerCore extends AdminController ); if (((int) $order->isReturnable()) && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)) { + $orderTotalPaid = $order->getTotalPaid(); + $orderDiscounts = $order->getCartRules(); + $hasOrderDiscountOrPayment = ((float)$orderTotalPaid > 0 || $orderDiscounts) ? true : false; $this->toolbar_btn['cancel'] = array( - 'short' => ((float) $order->getTotalPaid()) ? $this->l('Refund') : $this->l('Cancel'), + 'short' => ($hasOrderDiscountOrPayment) ? $this->l('Refund') : $this->l('Cancel'), 'href' => '#refundForm', 'id' => 'desc-order-standard_refund', - 'desc' => ((float) $order->getTotalPaid()) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), + 'desc' => ($hasOrderDiscountOrPayment) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), 'class' => 'icon-exchange', 'target' => true, ); @@ -772,7 +775,7 @@ class AdminOrdersControllerCore extends AdminController array( 'order' => $objOrder, 'currency' => new Currency($objOrder->id_currency), - 'current_index' => self::$currentIndex, + 'reallocate_form_action' => $this->context->link->getAdminLink('AdminOrders').'&vieworder&id_order='.$objOrder->id, ) ); $modal = array( @@ -938,7 +941,7 @@ class AdminOrdersControllerCore extends AdminController // get booking information by order $objBookingDetail = new HotelBookingDetail(); $objOrderReturn = new OrderReturn(); - $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); + $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1, 0, 1); if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) { foreach($bookingOrderInfo as $key => $booking) { if ((in_array($booking['id'], $refundReqBookings)) || $booking['is_refunded']) { @@ -946,6 +949,7 @@ class AdminOrdersControllerCore extends AdminController } } } + $this->context->smarty->assign( array( 'order' => $objOrder, @@ -958,15 +962,18 @@ class AdminOrdersControllerCore extends AdminController 'modal_class' => 'modal-md order_detail_modal', 'modal_title' => '  '.$this->l('Cancel Bookings'), 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_cancel_room_bookings.tpl'), - 'modal_actions' => array( + ); + + if ($bookingOrderInfo) { + $modal['modal_actions'] = array( array( 'type' => 'button', 'value' => 'submitCancelBooking', 'class' => 'submitCancelBooking btn-primary pull-right', 'label' => ' '.$this->l('Cancel Bookings'), - ), - ), - ); + ) + ); + } $this->context->smarty->assign($modal); $response['hasError'] = 0; @@ -985,6 +992,8 @@ class AdminOrdersControllerCore extends AdminController if ($this->tabAccess['edit'] == 1 && $this->display == 'view') { $this->addJS(_PS_JS_DIR_.'admin/orders.js'); + // add js for reallocation process + $this->addJS(_PS_JS_DIR_.'admin/reallocation.js'); // $this->addJS(_PS_JS_DIR_.'admin/orders-product-event.js'); // $this->addJS(_PS_JS_DIR_.'admin/orders-room-event.js'); $this->addJS(_PS_JS_DIR_.'tools.js'); @@ -1375,19 +1384,22 @@ class AdminOrdersControllerCore extends AdminController } } } else { - $this->errors[] = Tools::displayError('You do not have permission to delete this.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } /* booking refunds from order */ elseif (Tools::isSubmit('initiateRefund') && isset($order)) { - if ($this->tabAccess['delete'] === '1') { + if ($this->tabAccess['edit'] === '1') { $bookings = Tools::getValue('id_htl_booking'); if ($bookings && count($bookings)) { foreach ($bookings as $idHtlBooking) { - if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { - $this->errors[] = Tools::displayError('Wrong bookings found for booking cancelation.'); - break; + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { + $bookingRefundDetail = reset($bookingRefundDetail); + if (!$bookingRefundDetail['refunded']) { + $this->errors[] = Tools::displayError('Wrong bookings found for booking cancelation.'); + break; + } } } } else { @@ -1399,51 +1411,66 @@ class AdminOrdersControllerCore extends AdminController } if (!count($this->errors)) { - // if amount paid is > 0 then create refund request else cancel the booking directly - if ($order->getTotalPaid() > 0) { - $objOrderReturn = new OrderReturn(); - $objOrderReturn->id_customer = $order->id_customer; - $objOrderReturn->id_order = $order->id; - $objOrderReturn->state = Configuration::get('PS_ORS_PENDING'); - $objOrderReturn->by_admin = 1; - $objOrderReturn->question = $refundReason; - $objOrderReturn->save(); - if ($objOrderReturn->id) { - foreach ($bookings 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(); + // create refund request + $objOrderReturn = new OrderReturn(); + $objOrderReturn->id_customer = $order->id_customer; + $objOrderReturn->id_order = $order->id; + $objOrderReturn->state = 0; + $objOrderReturn->by_admin = 1; + $objOrderReturn->question = $refundReason; + $objOrderReturn->refunded_amount = 0; + $objOrderReturn->save(); + if ($objOrderReturn->id) { + foreach ($bookings 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->refunded_amount = 0; + if (!$order->getCartRules() && $order->getTotalPaid() <= 0) { + $objOrderReturnDetail->id_customization = 1; } + $objOrderReturnDetail->save(); } - } else { - // cancel the booking directly + } + + // Change order refund state + // Emails to customer, superadmin and employees on refund request state change + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); + + // process direct cancellations + if (!$order->getCartRules() && $order->getTotalPaid() <= 0) { + // Process refund in booking tables foreach ($bookings as $idHtlBooking) { $objHtlBooking = new HotelBookingDetail($idHtlBooking); if (!$objHtlBooking->processRefundInBookingTables()) { $this->errors[] = Tools::displayError('An error occurred while cancelling the booking.'); - } else { - // set the message for the cancellation - $message = $this->l('Room').': '.$objHtlBooking->room_num.', '.$objHtlBooking->room_type_name.' '.$this->l('has been cancelled by the hotel.'); - $message .= PHP_EOL.$this->l('Reasonn').': '.$refundReason; - $objHtlBooking->setBookingCancellationMessage($message, 1); } } - // if all bookings are getting cancelled then cancel the order also - if ($order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { + // As object order is already changed in processRefundInBookingTables + $order = new Order($order->id); + // complete the booking refund directly in the refund request + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_REFUNDED')); + + // if all bookings are getting cancelled/Refunded then Cancel/Refund the order also + $idOrderState = 0; + if ($order->hasCompletelyRefunded(Order::ORDER_COMPLETE_REFUND_FLAG)) { + $idOrderState = Configuration::get('PS_OS_REFUND'); + } elseif ($order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { + $idOrderState = Configuration::get('PS_OS_CANCELED'); + } + + if ($idOrderState) { $objOrderHistory = new OrderHistory(); $objOrderHistory->id_order = (int)$order->id; - $idOrderState = Configuration::get('PS_OS_CANCELED'); - $useExistingPayment = false; if (!$order->hasInvoice()) { $useExistingPayment = true; @@ -1460,7 +1487,7 @@ class AdminOrdersControllerCore extends AdminController Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=3&token='.$this->token); } } else { - $this->errors[] = Tools::displayError('You do not have permission to delete this.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } elseif (Tools::isSubmit('messageReaded')) { Message::markAsReaded(Tools::getValue('messageReaded'), $this->context->employee->id); @@ -1555,6 +1582,7 @@ class AdminOrdersControllerCore extends AdminController $objCart = new Cart($id_cart); if (Validate::isLoadedObject($objCart)) { $this->context->cart = $objCart; + $this->context->currency = new Currency((int)$objCart->id_currency); $this->errors = HotelCartBookingData::validateCartBookings(); $orderTotal = $objCart->getOrderTotal(true, Cart::BOTH); @@ -2225,24 +2253,56 @@ class AdminOrdersControllerCore extends AdminController $helper = new HelperKpi(); $helper->id = 'box-order-date'; $helper->icon = 'icon-calendar'; - $helper->color = 'color3'; + $helper->color = 'color1'; $helper->title = $this->l('Order Date'); + $helper->tooltip = $this->l('The date when the order was placed.'); $helper->value = Tools::displayDate($objOrder->date_add); $kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-order-total'; $helper->icon = 'icon-money'; - $helper->color = 'color4'; - $helper->title = $this->l('Total'); + $helper->color = 'color3'; + $helper->title = $this->l('Bookings Total'); + $helper->tooltip = $this->l('Total booking amount of this order.'); $helper->value = Tools::displayPrice($objOrder->total_paid_tax_incl, new Currency($objOrder->id_currency)); $kpis[] = $helper; + $helper = new HelperKpi(); + $helper->id = 'box-total-paid'; + $helper->icon = 'icon-money'; + $helper->color = 'color4'; + $helper->title = $this->l('Total Paid'); + $helper->tooltip = $this->l('Total paid is the amount which customer has already paid for this order.'); + $helper->value = Tools::displayPrice($objOrder->total_paid_real, new Currency($objOrder->id_currency)); + $kpis[] = $helper; + + $helper = new HelperKpi(); + $helper->id = 'box-total-due'; + $helper->icon = 'icon-money'; + $helper->color = 'color2'; + $helper->title = $this->l('Total Due'); + $helper->tooltip = $this->l('Total due is the amount which customer has to pay for this order.'); + $helper->value = Tools::displayPrice(($objOrder->total_paid_tax_incl - $objOrder->total_paid_real), new Currency($objOrder->id_currency)); + $kpis[] = $helper; + + $orderHistory = array_reverse($objOrder->getHistory($this->context->language->id)); + $helper = new HelperKpi(); + $helper->id = 'box-order-source'; + $helper->icon = 'icon-globe'; + $helper->color = 'color1'; + $helper->title = $this->l('Order Source'); + $helper->tooltip = $this->l('Order source shows from which source the order was placed.'); + $helper->subtitle = $orderHistory[0]['id_employee'] ? $this->l('Back office') : $this->l('Front office'); + $helper->value = $objOrder->source; + $kpis[] = $helper; + $helper = new HelperKpi(); $helper->id = 'box-messages'; $helper->icon = 'icon-comments'; $helper->color = 'color2'; $helper->title = $this->l('Messages'); + $helper->tooltip = $this->l('Messages is the number of customer messages for this order.'); $helper->href = $this->context->link->getAdminLink('AdminCustomerThreads').'&id_order='.$objOrder->id; $helper->value = count(CustomerThread::getCustomerMessages($objOrder->id_customer, null, $objOrder->id)); $kpis[] = $helper; @@ -2254,13 +2314,43 @@ class AdminOrdersControllerCore extends AdminController $helper->icon = 'icon-home'; $helper->color = 'color1'; $helper->title = $this->l('Total Rooms'); + $helper->tooltip = $this->l('Total rooms is the number of rooms booked in this order.'); $helper->href = '#start_products'; $helper->value = $numRooms; $kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); + $helper = new HelperKpi(); + $helper->id = 'box-payment-type'; + $helper->icon = 'icon-home'; + $helper->color = 'color3'; + $helper->title = $this->l('Payment Type'); + $helper->tooltip = $this->l('The payment type refers to the type of payment that customer selected while placing this order.'); + $helper->value = $objOrder->is_advance_payment ? $this->l('Partial Payment') : $this->l('Full Payment'); + $kpis[] = $helper; + + if ($objOrder->is_advance_payment) { + $helper = new HelperKpi(); + $helper->id = 'box-partial-payment-amount'; + $helper->icon = 'icon-money'; + $helper->color = 'color4'; + $helper->title = $this->l('Partial Payment Amount'); + $helper->tooltip = $this->l('Partial payment amount refers to the amount that customer has to pay as advance payment, if payment type selected as partial payment while placing this order.'); + $helper->value = Tools::displayPrice($objOrder->advance_paid_amount, new Currency($objOrder->id_currency)); + $kpis[] = $helper; + } + + $objOrderReturn = new OrderReturn(); + if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1)) { + $refundedAmount = $objOrderReturn->getRefundedAmount($objOrder->id); + $helper = new HelperKpi(); + $helper->id = 'box-payment-type'; + $helper->icon = 'icon-money'; + $helper->color = 'color3'; + $helper->title = $this->l('Refunded Amount'); + $helper->tooltip = $this->l('Refunded amount refers to the amount that has been refunded for this order.'); + $helper->value = Tools::displayPrice($refundedAmount, new Currency($objOrder->id_currency)); + $kpis[] = $helper; + } } else { $time = time(); $kpis = array(); @@ -2375,6 +2465,10 @@ class AdminOrdersControllerCore extends AdminController $kpis[] = $helper; } + Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( + 'kpis' => &$kpis, + )); + $helper = new HelperKpiRow(); $helper->kpis = $kpis; return $helper->generate(); @@ -2546,7 +2640,7 @@ class AdminOrdersControllerCore extends AdminController $totalConvenienceFeeTI = 0; $totalDemandsPriceTE = 0; $totalDemandsPriceTI = 0; - + $totalRefundedRooms = 0; if ($order_detail_data = $objBookingDetail->getOrderFormatedBookinInfoByIdOrder($order->id)) { $objBookingDemand = new HotelBookingDemands(); $objHotelRoomType = new HotelRoomType(); @@ -2707,6 +2801,15 @@ class AdminOrdersControllerCore extends AdminController $order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl']; $order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']); $order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te']; + + if (isset($value['refund_info']) + && $value['refund_info']['refunded'] + && $value['refund_info']['id_customization'] + && $value['is_refunded'] + && !$value['is_cancelled'] + ) { + $totalRefundedRooms += 1; + } } } else { $order_detail_data = array(); @@ -2714,19 +2817,25 @@ class AdminOrdersControllerCore extends AdminController $objOrderReturn = new OrderReturn(); $refundedAmount = 0; - if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1)) { + if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1, 0, 1)) { $refundedAmount = $objOrderReturn->getRefundedAmount($order->id); } // get booking information by order $bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($order->id); foreach ($bookingOrderInfo as &$bookingOrderRoomInfo) { + // Get last refund request for booking + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($bookingOrderRoomInfo['id_order'], 0, $bookingOrderRoomInfo['id'])) { + $bookingRefundDetail = reset($bookingRefundDetail); + if (!$bookingRefundDetail['id_customization']) { + $bookingOrderRoomInfo['is_refunded'] = 0; + } + } $bookingOrderRoomInfo['num_checkin_documents'] = HotelBookingDocument::getCountByIdHtlBooking($bookingOrderRoomInfo['id']); } $objHotelBookingDetail = new HotelBookingDetail(); $htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id); - $isCancelledRoom = in_array(1, array_column($htlBookingDetail, 'is_cancelled')); // hotel booking statuses $htlOrderStatus = HotelBookingDetail::getAllHotelOrderStatus(); @@ -2745,15 +2854,13 @@ class AdminOrdersControllerCore extends AdminController $orderOverBookings = $objHotelBookingDetail->getOverbookedRooms($order->id, 0, '', '', 0, 0, 1); $this->tpl_view_vars = array( - // refund info + 'totalRefundedRooms' => $totalRefundedRooms, 'orderOverBookings' => $orderOverBookings, 'refund_allowed' => (int) $order->isReturnable(), 'applicable_refund_policies' => $applicableRefundPolicies, 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), 'refundReqBookings' => $refundReqBookings, 'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG), - 'allBookingsRefunded' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_REFUND_FLAG), - 'allBookingsCancelled' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG), 'refundedAmount' => $refundedAmount, 'totalDemandsPriceTI' => $totalDemandsPriceTI, 'totalDemandsPriceTE' => $totalDemandsPriceTE, @@ -2840,7 +2947,6 @@ class AdminOrdersControllerCore extends AdminController 'products' => $products, 'customer' => $customer) ), - 'isCancelledRoom' => $isCancelledRoom, 'orderDocuments' => $order->getDocuments(), 'ROOM_STATUS_ALLOTED' => HotelBookingDetail::STATUS_ALLOTED, 'ROOM_STATUS_CHECKED_IN' => HotelBookingDetail::STATUS_CHECKED_IN, @@ -3027,44 +3133,52 @@ class AdminOrdersControllerCore extends AdminController public function ajaxProcessUpdateGuestDetails() { $response = array( - 'success' => false + 'hasError' => false, + 'errors' => array(), ); if (Validate::isLoadedObject($order = new Order(Tools::getValue('id_order')))) { - if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) { - if (Validate::isLoadedObject($objCustomerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail))) { - $id_gender = Tools::getValue('id_gender'); - $firstname = Tools::getValue('firstname'); - $lastname = Tools::getValue('lastname'); - $email = Tools::getValue('email'); - $phone = Tools::getValue('phone'); - $objCustomerGuestDetail->id_gender = $id_gender; - $objCustomerGuestDetail->firstname = $firstname; - $objCustomerGuestDetail->lastname = $lastname; - $objCustomerGuestDetail->email = $email; - $objCustomerGuestDetail->phone = $phone; - if ($objCustomerGuestDetail->validateGuestInfo()) { + $objCustomerGuestDetail = new OrderCustomerGuestDetail(); + $response['errors'] = $objCustomerGuestDetail->validateController(); + if (!$response['errors']) { + if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) { + if (Validate::isLoadedObject($objCustomerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail))) { + $id_gender = Tools::getValue('id_gender'); + $firstname = Tools::getValue('firstname'); + $lastname = Tools::getValue('lastname'); + $email = Tools::getValue('email'); + $phone = Tools::getValue('phone'); + $objCustomerGuestDetail->id_gender = $id_gender; + $objCustomerGuestDetail->firstname = $firstname; + $objCustomerGuestDetail->lastname = $lastname; + $objCustomerGuestDetail->email = $email; + $objCustomerGuestDetail->phone = $phone; if ($objCustomerGuestDetail->save()) { - $response['success'] = true; $gender = new Gender($objCustomerGuestDetail->id_gender, $this->context->language->id); $response['data']['gender_name'] = $gender->name; $response['data']['guest_name'] = $objCustomerGuestDetail->firstname.' '.$objCustomerGuestDetail->lastname ; $response['data']['guest_email'] = $objCustomerGuestDetail->email; $response['data']['guest_phone'] = $objCustomerGuestDetail->phone; + $response['msg'] = $this->l('Guest details are updated.'); } else { $response['errors'][] = $this->l('Unable to save guest details.'); } } else { - $response['errors'][] = $this->l('Invalid guest details, please check and try again.'); + $response['errors'][] = $this->l('Guest details not found.'); } } else { $response['errors'][] = $this->l('Guest details not found.'); } - } else { - $response['errors'][] = $this->l('Guest details not found.'); } } + if ($response['errors']) { + $response['hasError'] = true; + $this->context->smarty->assign('errors', $response['errors']); + + $response['errorsHtml'] = $this->context->smarty->fetch('alerts.tpl'); + } + $this->ajaxDie(json_encode($response)); } @@ -3953,7 +4067,7 @@ class AdminOrdersControllerCore extends AdminController if ($createFeaturePrice) { $featurePriceParams['id_room'] = $room_info['id_room']; $featurePriceParams = array_merge($featurePriceParams, array('date_from' => $date_from, 'date_to' => $date_to)); - $this->createFeaturePrice($featurePriceParams); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($featurePriceParams); } } else { break; @@ -4407,32 +4521,6 @@ class AdminOrdersControllerCore extends AdminController ))); } - protected function createFeaturePrice($params) - { - $feature_price_name = array(); - foreach (Language::getIDs(true) as $id_lang) { - $feature_price_name[$id_lang] = 'Auto-generated'; - } - - $hrt_feature_price = new HotelRoomTypeFeaturePricing(); - $hrt_feature_price->id_product = (int) $params['id_product']; - $hrt_feature_price->id_cart = (int) $params['id_cart']; - $hrt_feature_price->id_guest = (int) $params['id_guest']; - $hrt_feature_price->id_room = (int) $params['id_room']; - $hrt_feature_price->feature_price_name = $feature_price_name; - $hrt_feature_price->date_selection_type = HotelRoomTypeFeaturePricing::DATE_SELECTION_TYPE_RANGE; - $hrt_feature_price->date_from = date('Y-m-d', strtotime($params['date_from'])); - $hrt_feature_price->date_to = date('Y-m-d', strtotime($params['date_to'])); - $hrt_feature_price->is_special_days_exists = 0; - $hrt_feature_price->special_days = json_encode(false); - $hrt_feature_price->impact_way = HotelRoomTypeFeaturePricing::IMPACT_WAY_FIX_PRICE; - $hrt_feature_price->impact_type = HotelRoomTypeFeaturePricing::IMPACT_TYPE_FIXED_PRICE; - $hrt_feature_price->impact_value = $params['price']; - $hrt_feature_price->active = 1; - $hrt_feature_price->groupBox = array_column(Group::getGroups($this->context->language->id), 'id_group'); - $hrt_feature_price->add(); - } - public function ajaxProcessEditRoomOnOrder() { // Return value @@ -4494,7 +4582,7 @@ class AdminOrdersControllerCore extends AdminController if (Validate::isLoadedObject($objProduct = new Product($roomInfo['id_product']))) { // If room type is NOT DELETED then use current room type price calculation $params = array_merge($params, array('date_from' => $new_date_from, 'date_to' => $new_date_to)); - $this->createFeaturePrice($params); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($params); $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $roomInfo['id_product'], @@ -5247,7 +5335,7 @@ class AdminOrdersControllerCore extends AdminController $res &= $order->update(); // Reinject quantity in stock - $this->reinjectQuantity($order_detail, $order_detail->product_quantity, $delete); + $order_detail->reinjectQuantity($order_detail, $order_detail->product_quantity, $delete); // Update weight SUM $order_carrier = new OrderCarrier((int) $order->getIdOrderCarrier()); @@ -5337,7 +5425,7 @@ class AdminOrdersControllerCore extends AdminController $res &= $order->update(); // Reinject quantity in stock - $this->reinjectQuantity($order_detail, $order_detail->product_quantity, true); + $order_detail->reinjectQuantity($order_detail, $order_detail->product_quantity, true); // Update weight SUM $order_carrier = new OrderCarrier((int)$order->getIdOrderCarrier()); @@ -5737,101 +5825,6 @@ class AdminOrdersControllerCore extends AdminController ); } - /** - * @param OrderDetail $order_detail - * @param int $qty_cancel_product - * @param bool $delete - */ - protected function reinjectQuantity($order_detail, $qty_cancel_product, $delete = false) - { - // Reinject product - $reinjectable_quantity = (int)$order_detail->product_quantity - (int)$order_detail->product_quantity_reinjected; - $quantity_to_reinject = $qty_cancel_product > $reinjectable_quantity ? $reinjectable_quantity : $qty_cancel_product; - // @since 1.5.0 : Advanced Stock Management - $product_to_inject = new Product($order_detail->product_id, false, (int)$this->context->language->id, (int)$order_detail->id_shop); - - $product = new Product($order_detail->product_id, false, (int)$this->context->language->id, (int)$order_detail->id_shop); - - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && $order_detail->id_warehouse != 0) { - $manager = StockManagerFactory::getManager(); - $movements = StockMvt::getNegativeStockMvts( - $order_detail->id_order, - $order_detail->product_id, - $order_detail->product_attribute_id, - $quantity_to_reinject - ); - $left_to_reinject = $quantity_to_reinject; - foreach ($movements as $movement) { - if ($left_to_reinject > $movement['physical_quantity']) { - $quantity_to_reinject = $movement['physical_quantity']; - } - - $left_to_reinject -= $quantity_to_reinject; - if (Pack::isPack((int)$product->id)) { - // Gets items - if ($product->pack_stock_type == 1 || $product->pack_stock_type == 2 || ($product->pack_stock_type == 3 && Configuration::get('PS_PACK_STOCK_TYPE') > 0)) { - $products_pack = Pack::getItems((int)$product->id, (int)Configuration::get('PS_LANG_DEFAULT')); - // Foreach item - foreach ($products_pack as $product_pack) { - if ($product_pack->advanced_stock_management == 1) { - $manager->addProduct( - $product_pack->id, - $product_pack->id_pack_product_attribute, - new Warehouse($movement['id_warehouse']), - $product_pack->pack_quantity * $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } - } - if ($product->pack_stock_type == 0 || $product->pack_stock_type == 2 || - ($product->pack_stock_type == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 0 || Configuration::get('PS_PACK_STOCK_TYPE') == 2))) { - $manager->addProduct( - $order_detail->product_id, - $order_detail->product_attribute_id, - new Warehouse($movement['id_warehouse']), - $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } else { - $manager->addProduct( - $order_detail->product_id, - $order_detail->product_attribute_id, - new Warehouse($movement['id_warehouse']), - $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } - - $id_product = $order_detail->product_id; - if ($delete) { - $order_detail->delete(); - } - StockAvailable::synchronize($id_product); - } elseif ($order_detail->id_warehouse == 0) { - StockAvailable::updateQuantity( - $order_detail->product_id, - $order_detail->product_attribute_id, - $quantity_to_reinject, - $order_detail->id_shop - ); - - if ($delete) { - $order_detail->delete(); - } - } else { - $this->errors[] = Tools::displayError('This product cannot be re-stocked.'); - } - } - /** * @param OrderInvoice $order_invoice * @param float $value_tax_incl @@ -6899,14 +6892,23 @@ class AdminOrdersControllerCore extends AdminController // if room is changing in the reallocation if ($objHotelBooking->id_product != $idNewRoomType) { $result['has_room_type_change'] = 1; + // set context currency So that we can get prices in the order currency + $objOrder = new Order($objHotelBooking->id_order); + $this->context->currency = new Currency($objOrder->id_currency); $newRoomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $idNewRoomType, $objHotelBooking->date_from, - $objHotelBooking->date_to + $objHotelBooking->date_to, + 0, + 0, + 0, + 0, + 0, + 0 ); if ($objHotelBooking->total_price_tax_excl != $newRoomTotalPrice['total_price_tax_excl']) { $result['has_price_changes'] = 1; - $result['price_diff'] = $newRoomTotalPrice['total_price_tax_excl'] - $objHotelBooking->total_price_tax_excl; + $result['price_diff'] = Tools::ps_round(($newRoomTotalPrice['total_price_tax_excl'] - $objHotelBooking->total_price_tax_excl), 6); } } } else { diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 799be06a7..fd06fb947 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -245,9 +245,10 @@ class AdminProductsControllerCore extends AdminController ); } else { $hotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1); + $hotelsArray = array(); foreach ($hotels as $hotel) { $addressInfo = HotelBranchInformation::getAddress($hotel['id_hotel']); - $this->hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city']; + $hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city']; } $this->fields_list['hotel_name'] = array( @@ -256,7 +257,7 @@ class AdminProductsControllerCore extends AdminController 'multiple' => true, 'operator' => 'or', 'filter_key' => 'hrt!id_hotel', - 'list' => $this->hotelsArray, + 'list' => $hotelsArray, 'optional' => true, 'class' => 'chosen', 'visible_default' => true, @@ -399,7 +400,7 @@ class AdminProductsControllerCore extends AdminController $idLocationsCategory = Configuration::get('PS_LOCATIONS_CATEGORY'); $this->objLocationsCategory = new Category($idLocationsCategory, $this->context->language->id); $nestedCategories = Category::getNestedCategories($idLocationsCategory); - if ($nestedCategories) { + if (isset($nestedCategories[$idLocationsCategory]['children']) && $nestedCategories[$idLocationsCategory]['children']) { foreach ($nestedCategories[$idLocationsCategory]['children'] as $childCategory) { $this->buildCategoryOptions($childCategory); } @@ -3674,6 +3675,7 @@ class AdminProductsControllerCore extends AdminController public function processAdditionalFacilities() { if ($idProduct = Tools::getValue('id_product')) { + $errors = array(); $objRoomTypeDemand = new HotelRoomTypeDemand(); $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); // first delete all the previously saved prices and demands of this room type @@ -3701,7 +3703,7 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeDemandPrice->save(); } } else { - $this->errors[] = Tools::displayError('Invalid demand price of facility.'). + $errors[] = Tools::displayError('Invalid demand price of facility.'). ' : '.$objGlobalDemand->name[$this->context->language->id]; } if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) { @@ -3718,15 +3720,16 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeDemandPrice->save(); } } else { - $this->errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id]; + $errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id]; } } } } } } - if (count($this->errors)) { - $this->warnings[] = Tools::displayError('Invalid price values are not saved. Please correct them and save again.'); + if (count($errors)) { + $this->warnings[] = Tools::displayError('Invalid price values for additional facilities were not saved. Please correct them and try again.'); + $this->errors = array_merge($this->errors, $errors); } $objCartBookingData = new HotelCartBookingData(); diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index e7017e12f..6a097dbc2 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -249,6 +249,7 @@ class GuestTrackingControllerCore extends FrontController $total_demands_price_ti = 0; $total_convenience_fee_te = 0; $total_convenience_fee_ti = 0; + foreach ($orderProducts as $type_key => $type_value) { if (in_array($type_value['product_id'], $processedProducts)) { continue; @@ -306,13 +307,6 @@ class GuestTrackingControllerCore extends FrontController if ($data_v['is_back_order']) { $anyBackOrder = 1; } - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; - } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; - } } else { $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; @@ -332,15 +326,6 @@ class GuestTrackingControllerCore extends FrontController if ($data_v['is_back_order']) { $anyBackOrder = 1; } - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0; - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; - } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; - } } $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 93442f5ad..6bebed805 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -83,340 +83,349 @@ class OrderDetailControllerCore extends FrontController } - //by webkul to show order details properly on order history page - - // if (Module::isInstalled('hotelreservationsystem')) { - // include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - // $objHtlBranchInfo = new HotelBranchInformation(); - $objBookingDetail = new HotelBookingDetail(); - $objRoomType = new HotelRoomType(); - $objBookingDemand = new HotelBookingDemands(); - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - $anyBackOrder = 0; - $processedProducts = array(); - $cartHotelData = array(); - $cartServiceProducts = array(); - $total_demands_price_te = 0; - $total_demands_price_ti = 0; - $total_convenience_fee_te = 0; - $total_convenience_fee_ti = 0; - $roomTypes = array(); - if (!empty($products)) { - foreach ($products as $type_key => $type_value) { - if (in_array($type_value['product_id'], $processedProducts)) { - continue; - } - if ($type_value['is_booking_product']) { - $processedProducts[] = $type_value['product_id']; - - $product = new Product($type_value['product_id'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['product_id']); - - if (!empty($cover_image_arr)) { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'home_default'); - } else { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default'); - } - - if (isset($customer->id)) { - $obj_cart = new Cart($order->id_cart); - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); - } else { - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); - } - $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; - $cartHotelData[$type_key]['cover_img'] = $cover_img; - - - $objBookingDemand = new HotelBookingDemands(); - foreach ($order_bk_data as $data_k => $data_v) { - $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); - - $cartHotelData[$type_key]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['children'] = $data_v['children']; - /*Product price when order was created*/ - $order_details_obj = new OrderDetail($data_v['id_order_detail']); - $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; - $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; - $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; - - if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; - - $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; - $var_quant = (int) $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; - } - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; - } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; - } - } else { - $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; - $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0; - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; - } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; - } - } - - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_htl_booking'] = $data_v['id']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_room'] = $data_v['id_room']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['children'] = $data_v['children']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['child_ages'] = $data_v['child_ages']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_refunded'] = $data_v['is_refunded']; - $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_cancelled'] = $data_v['is_cancelled']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; - $cartHotelData[$type_key]['date_diff'][$date_join]['ids_rooms'][] = $data_v['id_room']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( - $id_order, - $type_value['product_id'], - 0, - $data_v['date_from'], - $data_v['date_to'] - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( - $id_order, - $type_value['product_id'], - $data_v['id_room'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 1 - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( - $id_order, - $type_value['product_id'], - $data_v['id_room'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 0 - ); - $total_demands_price_ti += $extraDemandPriceTI; - $total_demands_price_te += $extraDemandPriceTE; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; - - $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); - $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; - - $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; - // add additional services products in hotel detail. - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'] - ); - - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $additionalServicesPriceTI = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 1 - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $additionalServicesPriceTE = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 0 - ); - // get auto added price to be displayed with room price - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 1, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 0, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - } - // calculate averages now - foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { - $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); - $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); - - $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); - $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); - } - } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { - if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) { - $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - $type_value['product_id'], - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1 - ); - $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, - $type_value['product_id'], - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1 - ); - } - } else { - // get all products that are independent. - if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) { - $product = new Product($type_value['product_id'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['product_id']); - - if (!empty($cover_image_arr)) { - $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); - } else { - $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); - } - $cartServiceProducts[] = $type_value; - } - } - - $roomTypes[$type_value['id_product']] = $type_value; - } - - $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); - } - - $objHotelBookingDetail = new HotelBookingDetail(); - $htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id); - $idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id); - $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); - $hotelAddressInfo = HotelBranchInformation::getAddress($idHotel); - - $objHotelBranchRefundRules = new HotelBranchRefundRules(); - $hotelRefundRules = $objHotelBranchRefundRules->getHotelRefundRules($idHotel, 0, 1); - - $this->context->smarty->assign( - array( - 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), - 'THEME_DIR' => _THEME_DIR_, - 'total_convenience_fee_ti' => $total_convenience_fee_ti, - 'total_convenience_fee_te' => $total_convenience_fee_te, - 'total_demands_price_ti' => $total_demands_price_ti, - 'total_demands_price_te' => $total_demands_price_te, - 'any_back_order' => $anyBackOrder, - 'shw_bo_msg' => Configuration::get('WK_SHOW_MSG_ON_BO'), - 'back_ord_msg' => Configuration::get('WK_BO_MESSAGE'), - 'order_has_invoice' => $order->hasInvoice(), - 'cart_htl_data' => $cartHotelData, - 'cart_service_products' => $cartServiceProducts, - 'obj_hotel_branch_information' => $objHotelBranchInformation, - 'hotel_address_info' => $hotelAddressInfo, - 'hotel_refund_rules' => $hotelRefundRules, - ) - ); - // } - + //To show order details properly on order history page + $objBookingDetail = new HotelBookingDetail(); + $objRoomType = new HotelRoomType(); + $objBookingDemand = new HotelBookingDemands(); + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + $anyBackOrder = 0; + $processedProducts = array(); + $cartHotelData = array(); + $cartServiceProducts = array(); + $total_demands_price_te = 0; + $total_demands_price_ti = 0; + $total_convenience_fee_te = 0; + $total_convenience_fee_ti = 0; + $roomTypes = array(); $objOrderReturn = new OrderReturn(); $refundedAmount = 0; if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1)) { $refundedAmount = $objOrderReturn->getRefundedAmount($order->id); } + if (!empty($products)) { + foreach ($products as $type_key => $type_value) { + if (in_array($type_value['product_id'], $processedProducts)) { + continue; + } + if ($type_value['is_booking_product']) { + $processedProducts[] = $type_value['product_id']; + + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); + + if (!empty($cover_image_arr)) { + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'home_default'); + } else { + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default'); + } + + if (isset($customer->id)) { + $obj_cart = new Cart($order->id_cart); + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); + } else { + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); + } + $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; + $cartHotelData[$type_key]['cover_img'] = $cover_img; + + + $objBookingDemand = new HotelBookingDemands(); + foreach ($order_bk_data as $data_k => $data_v) { + $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); + + $cartHotelData[$type_key]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['children'] = $data_v['children']; + /*Product price when order was created*/ + $order_details_obj = new OrderDetail($data_v['id_order_detail']); + $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; + $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; + $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; + + // Get last refund request for booking + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($data_v['id_order'], 0, $data_v['id'])) { + $bookingRefundDetail = reset($bookingRefundDetail); + } + + if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; + + $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; + $var_quant = (int) $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } + + if ($refundReqBookings && in_array($data_v['id'], $refundReqBookings) && $data_v['is_refunded']) { + if ($data_v['is_cancelled']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; + } elseif ($bookingRefundDetail && $bookingRefundDetail['refunded'] && $bookingRefundDetail['id_customization']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; + } + } + } else { + $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; + $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } + + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0; + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0; + if ($refundReqBookings && in_array($data_v['id'], $refundReqBookings) && $data_v['is_refunded']) { + if ($data_v['is_cancelled']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; + } elseif ($bookingRefundDetail && $bookingRefundDetail['refunded'] && $bookingRefundDetail['id_customization']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; + } + } + } + + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_htl_booking'] = $data_v['id']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_room'] = $data_v['id_room']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['children'] = $data_v['children']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['child_ages'] = $data_v['child_ages']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_refunded'] = $data_v['is_refunded']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_cancelled'] = $data_v['is_cancelled']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_status'] = $data_v['id_status']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['refund_denied'] = 0; + if ($bookingRefundDetail && $bookingRefundDetail['refunded'] && !$bookingRefundDetail['id_customization']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['refund_denied'] = 1; + } + + $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; + $cartHotelData[$type_key]['date_diff'][$date_join]['ids_rooms'][] = $data_v['id_room']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + 0, + $data_v['date_from'], + $data_v['date_to'] + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 0 + ); + $total_demands_price_ti += $extraDemandPriceTI; + $total_demands_price_te += $extraDemandPriceTE; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; + + $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); + $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; + + $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; + // add additional services products in hotel detail. + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'] + ); + + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $additionalServicesPriceTI = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $additionalServicesPriceTE = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0 + ); + // get auto added price to be displayed with room price + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + } + + // calculate averages now + foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { + $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); + $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); + + $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); + $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); + } + } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { + if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) { + $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1 + ); + $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1 + ); + } + } else { + // get all products that are independent. + if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) { + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); + + if (!empty($cover_image_arr)) { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); + } else { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + } + $cartServiceProducts[] = $type_value; + } + } + + $roomTypes[$type_value['id_product']] = $type_value; + } + + $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); + } + + $objHotelBookingDetail = new HotelBookingDetail(); + $htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id); + $idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id); + $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); + $hotelAddressInfo = HotelBranchInformation::getAddress($idHotel); + + $objHotelBranchRefundRules = new HotelBranchRefundRules(); + $hotelRefundRules = $objHotelBranchRefundRules->getHotelRefundRules($idHotel, 0, 1); + + $this->context->smarty->assign( + array( + 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), + 'THEME_DIR' => _THEME_DIR_, + 'total_convenience_fee_ti' => $total_convenience_fee_ti, + 'total_convenience_fee_te' => $total_convenience_fee_te, + 'total_demands_price_ti' => $total_demands_price_ti, + 'total_demands_price_te' => $total_demands_price_te, + 'any_back_order' => $anyBackOrder, + 'shw_bo_msg' => Configuration::get('WK_SHOW_MSG_ON_BO'), + 'back_ord_msg' => Configuration::get('WK_BO_MESSAGE'), + 'order_has_invoice' => $order->hasInvoice(), + 'cart_htl_data' => $cartHotelData, + 'cart_service_products' => $cartServiceProducts, + 'obj_hotel_branch_information' => $objHotelBranchInformation, + 'hotel_address_info' => $hotelAddressInfo, + 'hotel_refund_rules' => $hotelRefundRules, + ) + ); + $this->context->smarty->assign( array( 'hasOrderPaid' => $order->hasBeenPaid(), @@ -424,7 +433,7 @@ class OrderDetailControllerCore extends FrontController 'refund_allowed' => (int) $order->isReturnable(), 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), 'refundReqBookings' => $refundReqBookings, - 'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG), + 'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(0, 1), 'refundedAmount' => $refundedAmount, 'shop_name' => strval(Configuration::get('PS_SHOP_NAME')), 'order' => $order, @@ -457,6 +466,9 @@ class OrderDetailControllerCore extends FrontController 'use_tax' => Configuration::get('PS_TAX'), 'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC), 'reorderingAllowed' => !(bool) Configuration::get('PS_DISALLOW_HISTORY_REORDERING'), + 'ROOM_STATUS_ALLOTED' => HotelBookingDetail::STATUS_ALLOTED, + 'ROOM_STATUS_CHECKED_IN' => HotelBookingDetail::STATUS_CHECKED_IN, + 'ROOM_STATUS_CHECKED_OUT' => HotelBookingDetail::STATUS_CHECKED_OUT, ) ); @@ -563,6 +575,12 @@ class OrderDetailControllerCore extends FrontController break; } + // the room has already been checked in/checked out, room will not be able to be cancelled by the customer + if ($objHotelBookingDetail->id_status != HotelBookingDetail::STATUS_ALLOTED) { + $this->errors[] = Tools::displayError('Some selected rooms have already been checked-in/checked-out.'); + break; + } + if (OrderReturn::getOrdersReturnDetail($objOrder->id, 0, $idHtlBooking)) { $this->errors[] = Tools::displayError('Some selected rooms have already been requested for cancellation.'); break; @@ -571,66 +589,61 @@ class OrderDetailControllerCore extends FrontController } if (!count($this->errors)) { - if ((int) $objOrder->total_paid_real == 0) { + // create refund request + $objOrderReturn = new OrderReturn(); + $objOrderReturn->id_customer = $objOrder->id_customer; + $objOrderReturn->id_order = $objOrder->id; + $objOrderReturn->state = 0; + $objOrderReturn->by_admin = 0; + $objOrderReturn->question = $cancellationReason; + $objOrderReturn->refunded_amount = 0; + $objOrderReturn->save(); + if ($objOrderReturn->id) { foreach ($idsHtlBooking as $idHtlBooking) { $objHtlBooking = new HotelBookingDetail($idHtlBooking); - $objHtlBooking->save(); + $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->refunded_amount = 0; + if (!$objOrder->getCartRules() && $objOrder->getTotalPaid() <= 0) { + $objOrderReturnDetail->id_customization = 1; + } + $objOrderReturnDetail->save(); } } - // if amount paid is > 0 then create refund request else cancel the booking directly - if ($objOrder->getTotalPaid() > 0) { - $objOrderReturn = new OrderReturn(); - $objOrderReturn->id_customer = $objOrder->id_customer; - $objOrderReturn->id_order = $objOrder->id; - $objOrderReturn->state = 0; - $objOrderReturn->by_admin = 0; - $objOrderReturn->question = $cancellationReason; - $objOrderReturn->save(); - if ($objOrderReturn->id) { - foreach ($idsHtlBooking as $idHtlBooking) { - $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); - $numDays = $objHotelBookingDetail->getNumberOfDays( - $objHotelBookingDetail->date_from, - $objHotelBookingDetail->date_to - ); + // Emails to customer, superadmin and employees on refund request state change + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); - $objOrderReturnDetail = new OrderReturnDetail(); - $objOrderReturnDetail->id_order_return = $objOrderReturn->id; - $objOrderReturnDetail->id_order_detail = $objHotelBookingDetail->id_order_detail; - $objOrderReturnDetail->product_quantity = $numDays; - $objOrderReturnDetail->id_htl_booking = $idHtlBooking; - $objOrderReturnDetail->save(); - } - } - - // Emails to customer, superadmin and employees on refund request state change - $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); - } else { - // cancel the booking directly + if (!$objOrder->getCartRules() && $objOrder->getTotalPaid() <= 0) { + // Process refund in booking tables foreach ($idsHtlBooking as $idHtlBooking) { - $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); - if (!$objHotelBookingDetail->processRefundInBookingTables()) { - $this->errors[] = Tools::displayError('Something went wrong. Please try later.'); - } else { - // set the message for the cancellation - $message = Tools::displayError(sprintf( - "1 room from %s has been cancelled by hotel.\nReason: %s", - $objHotelBookingDetail->room_type_name, - $cancellationReason - )); - - $objHotelBookingDetail->setBookingCancellationMessage($message); + $objHtlBooking = new HotelBookingDetail($idHtlBooking); + if (!$objHtlBooking->processRefundInBookingTables()) { + $this->errors[] = Tools::displayError('An error occurred while cancelling the booking.'); } } + // complete the booking refund directly in the refund request + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_REFUNDED')); - // if all bookings are getting cancelled then cancel the order also - if ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { + // if all bookings are getting cancelled/Refunded then Cancel/Refund the order also + $idOrderState = 0; + if ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_REFUND_FLAG)) { + $idOrderState = Configuration::get('PS_OS_REFUND'); + } elseif ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { + $idOrderState = Configuration::get('PS_OS_CANCELED'); + } + + if ($idOrderState) { $objOrderHistory = new OrderHistory(); $objOrderHistory->id_order = (int)$objOrder->id; - $idOrderState = Configuration::get('PS_OS_CANCELED'); - $useExistingPayment = false; if (!$objOrder->hasInvoice()) { $useExistingPayment = true; @@ -807,4 +820,4 @@ class OrderDetailControllerCore extends FrontController } } } -} +} \ No newline at end of file diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 95a0adceb..feed31828 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -591,7 +591,6 @@ class OrderOpcControllerCore extends ParentOrderController if (!empty($cartProducts)) { if ($cartBookingInfo = HotelCartBookingData::getHotelCartBookingData()) { - // ddd($cartBookingInfo); $this->context->smarty->assign('cart_htl_data', $cartBookingInfo); } $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail(); @@ -1078,21 +1077,52 @@ class OrderOpcControllerCore extends ParentOrderController $customerGuestDetailLastname = Tools::getValue('customer_guest_detail_lastname'); $customerGuestDetailEmail = Tools::getValue('customer_guest_detail_email'); $customerGuestDetailPhone = Tools::getValue('customer_guest_detail_phone'); + + $className = 'CartCustomerGuestDetail'; + $rules = call_user_func(array($className, 'getValidationRules'), $className); + if (trim($customerGuestDetailGender) && Validate::isUnsignedInt($customerGuestDetailGender)) { $objCustomerGuestDetail->id_gender = $customerGuestDetailGender; + } else { + $result['errors']['customer_guest_detail_gender'] = Tools::displayError('Invalid gender'); } - if (trim($customerGuestDetailFirstname) && Validate::isName($customerGuestDetailFirstname)) { + + if (trim($customerGuestDetailFirstname) + && Validate::isName($customerGuestDetailFirstname) + && (!isset($rules['size']['firstname']) + || (isset($rules['size']['firstname']) && (Tools::strlen(trim($customerGuestDetailFirstname)) <= $rules['size']['firstname'])) + ) + ) { $objCustomerGuestDetail->firstname = $customerGuestDetailFirstname; } - if (trim($customerGuestDetailLastname) && Validate::isName($customerGuestDetailLastname)) { + + if (trim($customerGuestDetailLastname) + && Validate::isName($customerGuestDetailLastname) + && (!isset($rules['size']['lastname']) + || (isset($rules['size']['lastname']) && (Tools::strlen(trim($customerGuestDetailLastname)) <= $rules['size']['lastname'])) + ) + ) { $objCustomerGuestDetail->lastname = $customerGuestDetailLastname; } - if (trim($customerGuestDetailEmail) && Validate::isEmail($customerGuestDetailEmail)) { + + if (trim($customerGuestDetailEmail) + && Validate::isEmail($customerGuestDetailEmail) + && (!isset($rules['size']['email']) + || (isset($rules['size']['email']) && (Tools::strlen(trim($customerGuestDetailEmail)) <= $rules['size']['email'])) + ) + ) { $objCustomerGuestDetail->email = $customerGuestDetailEmail; } - if (trim($customerGuestDetailPhone) && Validate::isPhoneNumber($customerGuestDetailPhone)) { + + if (trim($customerGuestDetailPhone) + && Validate::isPhoneNumber($customerGuestDetailPhone) + && (!isset($rules['size']['phone']) + || (isset($rules['size']['phone']) && (Tools::strlen(trim($customerGuestDetailPhone)) <= $rules['size']['phone'])) + ) + ) { $objCustomerGuestDetail->phone = $customerGuestDetailPhone; } + $objCustomerGuestDetail->id_cart = $this->context->cart->id; $objCustomerGuestDetail->save(); } else { @@ -1102,6 +1132,7 @@ class OrderOpcControllerCore extends ParentOrderController } } } + $this->context->cart->save(); } } diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index 7a57ef229..4fe62ec09 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -50,22 +50,23 @@ class OrderReturnControllerCore extends FrontController $objOrder = new Order($objOrderReturn->id_order); $orderCurrency = new Currency($objOrder->id_currency); - $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrderReturn->id_order, $objOrderReturn->id, 0, 1); - $isCanceled = false; + $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrderReturn->id_order, $objOrderReturn->id); + $isCanceledBookings = false; if (count(array_unique(array_column($refundReqBookings, 'is_cancelled'))) === 1 && array_unique(array_column($refundReqBookings, 'is_cancelled'))[0] != 0 ) { - $isCanceled = true; + $isCanceledBookings = true; } $voucher = ''; if (Validate::isLoadedObject($objCartRule = new CartRule($objOrderReturn->id_return_type))) { $voucher = $objCartRule->name[$this->context->language->id]; } + $this->context->smarty->assign( array ( 'orderReturnInfo' => (array)$objOrderReturn, 'refundReqBookings' => $refundReqBookings, - 'isCanceled' => $isCanceled, + 'isCanceledBookings' => $isCanceledBookings, 'orderInfo' => (array) $objOrder, 'orderCurrency' => (array) $orderCurrency, 'currentStateInfo' => (array) new OrderReturnState($objOrderReturn->state, diff --git a/install/langs/bg/data/order_return_state.xml b/install/langs/bg/data/order_return_state.xml index c7b945970..161883976 100644 --- a/install/langs/bg/data/order_return_state.xml +++ b/install/langs/bg/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + В очакване order_refund_pending_customer order_refund_pending_admin - Refund denied + Отказано order_refund_denied_customer order_refund_denied_admin - Refund completed + Завършено order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/bn/data/order_return_state.xml b/install/langs/bn/data/order_return_state.xml index c7b945970..f42008ccf 100644 --- a/install/langs/bn/data/order_return_state.xml +++ b/install/langs/bn/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + বিচারাধীন order_refund_pending_customer order_refund_pending_admin - Refund denied + অস্বীকৃত order_refund_denied_customer order_refund_denied_admin - Refund completed + সম্পন্ন order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/br/data/order_return_state.xml b/install/langs/br/data/order_return_state.xml index c7b945970..cadeba0af 100644 --- a/install/langs/br/data/order_return_state.xml +++ b/install/langs/br/data/order_return_state.xml @@ -6,12 +6,12 @@ order_refund_pending_admin - Refund denied + Denied order_refund_denied_customer order_refund_denied_admin - Refund completed + Completed order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/cs/data/order_return_state.xml b/install/langs/cs/data/order_return_state.xml index c7b945970..0af59ebda 100644 --- a/install/langs/cs/data/order_return_state.xml +++ b/install/langs/cs/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + čekající order_refund_pending_customer order_refund_pending_admin - Refund denied + zamítnuto order_refund_denied_customer order_refund_denied_admin - Refund completed + Dokončeno order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/de/data/order_return_state.xml b/install/langs/de/data/order_return_state.xml index c7b945970..2dea2e390 100644 --- a/install/langs/de/data/order_return_state.xml +++ b/install/langs/de/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Ausstehend order_refund_pending_customer order_refund_pending_admin - Refund denied + Bestritten order_refund_denied_customer order_refund_denied_admin - Refund completed + Vollendet order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/en/data/order_return_state.xml b/install/langs/en/data/order_return_state.xml index c7b945970..cadeba0af 100644 --- a/install/langs/en/data/order_return_state.xml +++ b/install/langs/en/data/order_return_state.xml @@ -6,12 +6,12 @@ order_refund_pending_admin - Refund denied + Denied order_refund_denied_customer order_refund_denied_admin - Refund completed + Completed order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/es/data/order_return_state.xml b/install/langs/es/data/order_return_state.xml index c7b945970..ae45d3093 100644 --- a/install/langs/es/data/order_return_state.xml +++ b/install/langs/es/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Pendiente order_refund_pending_customer order_refund_pending_admin - Refund denied + Denegada order_refund_denied_customer order_refund_denied_admin - Refund completed + Terminada order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/fa/data/order_return_state.xml b/install/langs/fa/data/order_return_state.xml index c7b945970..496f0adda 100644 --- a/install/langs/fa/data/order_return_state.xml +++ b/install/langs/fa/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + انتظار order_refund_pending_customer order_refund_pending_admin - Refund denied + تکذیب کرد order_refund_denied_customer order_refund_denied_admin - Refund completed + تکمیل شد order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/fr/data/order_return_state.xml b/install/langs/fr/data/order_return_state.xml index c7b945970..08d80feaa 100644 --- a/install/langs/fr/data/order_return_state.xml +++ b/install/langs/fr/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + En attente order_refund_pending_customer order_refund_pending_admin - Refund denied + Refusée order_refund_denied_customer order_refund_denied_admin - Refund completed + Complété order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/he/data/order_return_state.xml b/install/langs/he/data/order_return_state.xml index c7b945970..80bf1e68e 100644 --- a/install/langs/he/data/order_return_state.xml +++ b/install/langs/he/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + ממתין ל order_refund_pending_customer order_refund_pending_admin - Refund denied + נדחתה order_refund_denied_customer order_refund_denied_admin - Refund completed + הושלם order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/hr/data/order_return_state.xml b/install/langs/hr/data/order_return_state.xml index c7b945970..9c8fdbe11 100644 --- a/install/langs/hr/data/order_return_state.xml +++ b/install/langs/hr/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + U tijeku order_refund_pending_customer order_refund_pending_admin - Refund denied + odbijeno order_refund_denied_customer order_refund_denied_admin - Refund completed + Završeno order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/hu/data/order_return_state.xml b/install/langs/hu/data/order_return_state.xml index c7b945970..8ca647020 100644 --- a/install/langs/hu/data/order_return_state.xml +++ b/install/langs/hu/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Függőben levő order_refund_pending_customer order_refund_pending_admin - Refund denied + Megtagadva order_refund_denied_customer order_refund_denied_admin - Refund completed + Befejezve order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/id/data/order_return_state.xml b/install/langs/id/data/order_return_state.xml index c7b945970..2c6048e81 100644 --- a/install/langs/id/data/order_return_state.xml +++ b/install/langs/id/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Tertunda order_refund_pending_customer order_refund_pending_admin - Refund denied + Ditolak order_refund_denied_customer order_refund_denied_admin - Refund completed + Lengkap order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/it/data/order_return_state.xml b/install/langs/it/data/order_return_state.xml index c7b945970..9a60facd0 100644 --- a/install/langs/it/data/order_return_state.xml +++ b/install/langs/it/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + In attesa di order_refund_pending_customer order_refund_pending_admin - Refund denied + Negato order_refund_denied_customer order_refund_denied_admin - Refund completed + Completato order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/lt/data/order_return_state.xml b/install/langs/lt/data/order_return_state.xml index c7b945970..a76d8e739 100644 --- a/install/langs/lt/data/order_return_state.xml +++ b/install/langs/lt/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Kol order_refund_pending_customer order_refund_pending_admin - Refund denied + Neigė order_refund_denied_customer order_refund_denied_admin - Refund completed + Užbaigta order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/mk/data/order_return_state.xml b/install/langs/mk/data/order_return_state.xml index c7b945970..664a6ef22 100644 --- a/install/langs/mk/data/order_return_state.xml +++ b/install/langs/mk/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Во очекување order_refund_pending_customer order_refund_pending_admin - Refund denied + Демантирано order_refund_denied_customer order_refund_denied_admin - Refund completed + Завршено order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/nl/data/order_return_state.xml b/install/langs/nl/data/order_return_state.xml index c7b945970..35038b331 100644 --- a/install/langs/nl/data/order_return_state.xml +++ b/install/langs/nl/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + In behandeling order_refund_pending_customer order_refund_pending_admin - Refund denied + Geweigerd order_refund_denied_customer order_refund_denied_admin - Refund completed + Voltooid order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/no/data/order_return_state.xml b/install/langs/no/data/order_return_state.xml index c7b945970..0f55fc3f5 100644 --- a/install/langs/no/data/order_return_state.xml +++ b/install/langs/no/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Avventer order_refund_pending_customer order_refund_pending_admin - Refund denied + Nektet order_refund_denied_customer order_refund_denied_admin - Refund completed + Fullført order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/pl/data/order_return_state.xml b/install/langs/pl/data/order_return_state.xml index c7b945970..91829252e 100644 --- a/install/langs/pl/data/order_return_state.xml +++ b/install/langs/pl/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Aż do order_refund_pending_customer order_refund_pending_admin - Refund denied + Zaprzeczony order_refund_denied_customer order_refund_denied_admin - Refund completed + Zakończony order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/pt/data/order_return_state.xml b/install/langs/pt/data/order_return_state.xml index c7b945970..e7b192490 100644 --- a/install/langs/pt/data/order_return_state.xml +++ b/install/langs/pt/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Pendente order_refund_pending_customer order_refund_pending_admin - Refund denied + Negada order_refund_denied_customer order_refund_denied_admin - Refund completed + Concluída order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/qc/data/order_return_state.xml b/install/langs/qc/data/order_return_state.xml index c7b945970..cadeba0af 100644 --- a/install/langs/qc/data/order_return_state.xml +++ b/install/langs/qc/data/order_return_state.xml @@ -6,12 +6,12 @@ order_refund_pending_admin - Refund denied + Denied order_refund_denied_customer order_refund_denied_admin - Refund completed + Completed order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/ro/data/order_return_state.xml b/install/langs/ro/data/order_return_state.xml index c7b945970..bc1805a24 100644 --- a/install/langs/ro/data/order_return_state.xml +++ b/install/langs/ro/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + In asteptarea order_refund_pending_customer order_refund_pending_admin - Refund denied + Negat order_refund_denied_customer order_refund_denied_admin - Refund completed + Efectuat order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/ru/data/order_return_state.xml b/install/langs/ru/data/order_return_state.xml index c7b945970..f0bef0997 100644 --- a/install/langs/ru/data/order_return_state.xml +++ b/install/langs/ru/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + В ожидании order_refund_pending_customer order_refund_pending_admin - Refund denied + Отклонен order_refund_denied_customer order_refund_denied_admin - Refund completed + Завершенный order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/si/data/order_return_state.xml b/install/langs/si/data/order_return_state.xml index c7b945970..4b9f95151 100644 --- a/install/langs/si/data/order_return_state.xml +++ b/install/langs/si/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + පොරොත්තුවෙන් order_refund_pending_customer order_refund_pending_admin - Refund denied + ප්‍රතික්ෂේප කළා order_refund_denied_customer order_refund_denied_admin - Refund completed + සම්පූර්ණ කළා order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/sr/data/order_return_state.xml b/install/langs/sr/data/order_return_state.xml index c7b945970..3aaa6b39b 100644 --- a/install/langs/sr/data/order_return_state.xml +++ b/install/langs/sr/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + нерешен order_refund_pending_customer order_refund_pending_admin - Refund denied + Одбијено order_refund_denied_customer order_refund_denied_admin - Refund completed + Завршено order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/sv/data/order_return_state.xml b/install/langs/sv/data/order_return_state.xml index c7b945970..f0de862df 100644 --- a/install/langs/sv/data/order_return_state.xml +++ b/install/langs/sv/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + I väntan på order_refund_pending_customer order_refund_pending_admin - Refund denied + Nekad order_refund_denied_customer order_refund_denied_admin - Refund completed + Avslutad order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/tw/data/order_return_state.xml b/install/langs/tw/data/order_return_state.xml index c7b945970..cadeba0af 100644 --- a/install/langs/tw/data/order_return_state.xml +++ b/install/langs/tw/data/order_return_state.xml @@ -6,12 +6,12 @@ order_refund_pending_admin - Refund denied + Denied order_refund_denied_customer order_refund_denied_admin - Refund completed + Completed order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/vn/data/order_return_state.xml b/install/langs/vn/data/order_return_state.xml index c7b945970..edc4c9bf0 100644 --- a/install/langs/vn/data/order_return_state.xml +++ b/install/langs/vn/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + Chưa giải quyết order_refund_pending_customer order_refund_pending_admin - Refund denied + Từ chối order_refund_denied_customer order_refund_denied_admin - Refund completed + Hoàn thành order_refund_completed_customer order_refund_completed_admin diff --git a/install/langs/zh/data/order_return_state.xml b/install/langs/zh/data/order_return_state.xml index c7b945970..0ea01fbc7 100644 --- a/install/langs/zh/data/order_return_state.xml +++ b/install/langs/zh/data/order_return_state.xml @@ -1,17 +1,17 @@ - Pending + 待办的 order_refund_pending_customer order_refund_pending_admin - Refund denied + 被拒绝 order_refund_denied_customer order_refund_denied_admin - Refund completed + 完全的 order_refund_completed_customer order_refund_completed_admin diff --git a/install/upgrade/sql/1.5.0.sql b/install/upgrade/sql/1.5.0.sql index 5a8ba5514..9b050115a 100644 --- a/install/upgrade/sql/1.5.0.sql +++ b/install/upgrade/sql/1.5.0.sql @@ -56,9 +56,9 @@ SELECT '1', `id_lang`, 'Waiting for confirmation', 'order_refund_waiting_custome INSERT INTO `PREFIX_order_return_state_lang` (`id_order_return_state`, `id_lang`, `name`, `customer_template`, `admin_template`) SELECT '2', `id_lang`, 'Request received', 'order_refund_received_customer', 'order_refund_received_admin' FROM `PREFIX_lang`; INSERT INTO `PREFIX_order_return_state_lang` (`id_order_return_state`, `id_lang`, `name`, `customer_template`, `admin_template`) -SELECT '3', `id_lang`, 'Refund denied', 'order_refund_denied_customer', 'order_refund_denied_admin' FROM `PREFIX_lang`; +SELECT '3', `id_lang`, 'Denied', 'order_refund_denied_customer', 'order_refund_denied_admin' FROM `PREFIX_lang`; INSERT INTO `PREFIX_order_return_state_lang` (`id_order_return_state`, `id_lang`, `name`, `customer_template`, `admin_template`) -SELECT '4', `id_lang`, 'Refund completed', 'order_refund_completed_customer', 'order_refund_completed_admin' FROM `PREFIX_lang`; +SELECT '4', `id_lang`, 'Completed', 'order_refund_completed_customer', 'order_refund_completed_admin' FROM `PREFIX_lang`; ALTER TABLE `PREFIX_order_slip_detail` diff --git a/js/admin/orders.js b/js/admin/orders.js index 097961a27..ae5dd844a 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1099,7 +1099,7 @@ function initRoomEvents() { if (data.refresh) { - location.reload(); + window.location.href = admin_order_tab_link + '&conf=3&vieworder&id_order=' + id_order; return; } go = false; @@ -1111,8 +1111,7 @@ function initRoomEvents() // Initialize all events init(); - //Added by webkul - location.reload(); + window.location.href = admin_order_tab_link + '&conf=3&vieworder&id_order=' + id_order; //End // $('.partial_refund_fields').hide(); } @@ -1162,7 +1161,8 @@ function initRoomEvents() updateAmounts(data.order); updateInvoice(data.invoices); updateDocuments(data.documents_html); - location.reload(); + + window.location.href = admin_order_tab_link + '&conf=1&vieworder&id_order=' + data.order.id; } else jAlert(data.error); @@ -1233,6 +1233,14 @@ function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) var flagRefund = ''; $(document).ready(function() { + // when change order state to cancel or refund then show modal of bookings cancellation + $(document).on('change', '#id_order_state', function(e) { + if ($(this).val() == PS_OS_CANCELED || $(this).val() == PS_OS_REFUND) { + e.preventDefault(); + CancelRoomBookingModal.show(); + } + }); + $('#desc-order-partial_refund').click(function() { $('.cancel_product_change_link:visible').trigger('click'); if (flagRefund == 'partial') { @@ -1708,38 +1716,6 @@ $(document).ready(function() { // End: RoomStatusModal: Processes // ====================================== - // Start: RoomReallocationModal: Processes - // For processing room reallocation and swapping - $(document).on('click', '.room_reallocate_swap', function(e) { - e.preventDefault(); - RoomReallocationModal.show($(this)); - }); - - $(document).on('hidden.bs.modal', '#room-reallocation-modal', function(){ - location.reload(); - }); - - /*For reallocating rooms in the modal*/ - $(document).on('click', '#realloc_allocated_rooms', function(e){ - if (RoomReallocationModal.reallocate() == false) { - return false; - } - }); - /*For swaping rooms in the modal*/ - $(document).on('click', '#swap_allocated_rooms', function(){ - if (RoomReallocationModal.swap() == false) { - return false; - } - }); - - // change room type for reallocation - $(document).on("change", "#realloc_avail_room_type", function(e) { - e.preventDefault(); - RoomReallocationModal.changeRoomType($(this)); - }); - // End: RoomReallocationModal: Processes - // ====================================== - // Start: AddRoomBookingModal: Processes /*For adding rooms to the order*/ $(document).on('click', '#add_room', function(e){ @@ -1787,7 +1763,7 @@ $(document).ready(function() { success : function(data) { if (data.result) { init(); - location.reload(); + window.location.href = admin_order_tab_link + '&conf=4&vieworder&id_order=' + data.order.id; } else { jAlert(data.error); } @@ -2191,6 +2167,7 @@ const TravellerModal = { }, submit: function() { $(".loading_overlay").show(); + TravellerModal.hideErrors(); $.ajax({ type: 'POST', headers: { @@ -2201,7 +2178,9 @@ const TravellerModal = { cache: false, data: $('#customer-guest-details-form').serialize()+'&ajax=true&id_order='+id_order+'&action=updateGuestDetails', success: function(result) { - if (result.success) { + if (result.hasError == true) { + TravellerModal.showErrors(result.errorsHtml); + } else { if (result.msg) { showSuccessMessage(result.msg); } @@ -2218,14 +2197,20 @@ const TravellerModal = { if (result.data.guest_phone) { $('#customer-guest-details .guest_phone a').attr('href', 'tel'+result.data.guest_phone).html(' ' + result.data.guest_phone); } - } else if (result.errors) { - showErrorMessage(result.errors); } }, complete: function() { $(".loading_overlay").hide(); } }); + }, + showErrors: function(errorsHtml) { + $('#traveller-modal .errors-wrap').html(errorsHtml); + $('#traveller-modal .errors-wrap').show(200); + }, + hideErrors: function(cb) { + $('#traveller-modal .errors-wrap').hide(200); + $('#traveller-modal .errors-wrap').html(''); } }; @@ -2279,177 +2264,6 @@ const RoomStatusModal = { } }; -// Modal object to handle room reallocation processes -const RoomReallocationModal = { - show: function(roomObj) { - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: 'ajax=true&id_order='+id_order+'&action=InitRoomReallocationModal', - success: function(result) { - if (result.hasError == 0 && result.modalHtml) { - $('#footer').next('.bootstrap').append(result.modalHtml); - - $(".modal_id_htl_booking").val(roomObj.data('id_htl_booking')); - $("input.modal_curr_room_num").val(roomObj.data('room_num')); - $("span.modal_curr_room_num").text(roomObj.data('room_num') + ', ' + roomObj.data('room_type_name')); - $(".cust_name").text(roomObj.data('cust_name')); - $(".cust_email").text(roomObj.data('cust_email')); - - // reset price difference fields - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - $(".realloc_roomtype_change_message").hide(); - - // For Rooms Swapping - var json_arr_rm_swp = roomObj.data('avail_rm_swap'); - if (roomObj.data('avail_rm_swap') != 'false' && json_arr_rm_swp.length != 0) { - html = ''; - $(".swap_avail_rooms_container").empty().append(html); - } else { - $(".swap_avail_rooms_container").empty().text(no_swap_rm_avail_txt).addClass('text-danger'); - $("#swap_room_tab .modal-footer").hide(); - } - - // For Rooms Reallocation - var json_arr_realloc_room_types = roomObj.data('avail_realloc_room_types'); - if (roomObj.data('avail_realloc_room_types') != 'false' && json_arr_realloc_room_types.length != 0) { - var idCurrentRoomType = roomObj.data('id_room_type'); - var roomsTypesHtml = ''; - - setRoomsForReallocation(json_arr_realloc_room_types[idCurrentRoomType]['rooms']); - - $(".realloc_avail_room_type_container").empty().append(roomsTypesHtml); - } else { - $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt).addClass('text-danger'); - $(".realloc_avail_room_type_container").empty().text(no_realloc_rm_type_avail_txt).addClass('text-danger'); - $("#reallocate_room_tab .modal-footer").hide(); - } - - $('#room-reallocation-modal').modal('show'); - } else { - showErrorMessage(txtSomeErr); - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - }, - swap: function() { - $(".error_text").text(''); - var room_to_swap = $('#swap_avail_rooms').val(); - if (typeof room_to_swap == 'undefined' || room_to_swap == 0) { - $("#swap_sel_rm_err_p").text(slct_rm_err); - return false; - } - - return true; - }, - reallocate: function(reallocateBtnObj) { - $(".error_text").text(''); - var room_to_reallocate = $('#realloc_avail_rooms').val(); - var room_type_to_reallocate = $('#realloc_avail_room_type').val(); - - if (typeof room_type_to_reallocate == 'undefined' || room_type_to_reallocate == 0) { - $("#realloc_sel_rm_type_err_p").text(slct_rm_type_err); - return false; - } - - if (typeof room_to_reallocate == 'undefined' || room_to_reallocate == 0) { - $("#realloc_sel_rm_err_p").text(slct_rm_err); - return false; - } - - return true; - }, - changeRoomType: function(roomTypeObj) { - $(".loading_overlay").show(); - var idHotelBooking = roomTypeObj.data('id_htl_booking'); - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - if (parseInt(idHotelBooking) > 0) { - var optionSelected = roomTypeObj.find('option:selected'); - var roomsAvailable = JSON.parse(optionSelected.attr('rooms_available')); - - // set the rooms of the selceted room type - setRoomsForReallocation(roomsAvailable); - - // send an ajax for fetching if price has changes in the new room type seleceted - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_htl_booking: idHotelBooking, - id_new_room_type: roomTypeObj.val(), - action: 'changeRoomTypeToReallocate', - ajax: true - }, - success: function(result) { - if (result.success == 1) { - // has room type changed for reallocation - if (result.has_room_type_change == 1) { - $(".realloc_roomtype_change_message").show(); - // has room type price changed for reallocation - if (result.has_price_changes == 1) { - $("#reallocation_price_diff").val(result.price_diff); - $("#reallocation_price_diff_block").show(); - } - } else { - $(".realloc_roomtype_change_message").hide(); - } - $('#room_type_change_info').empty(); - if (result.is_changes_present == 1) { - } - } else if (typeof(result.error) != 'undefinded' && result.error) { - showErrorMessage(result.error); - } else { - showErrorMessage(txtSomeErr); - } - }, - error: function(XMLHttpRequest, textStatus, errorThrown) { - showErrorMessage(txtSomeErr); - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - } else { - $(".loading_overlay").hide(); - showErrorMessage(txtSomeErr); - return false; - } - }, - close: function() { - $('#room-reallocation-modal').modal('hide'); - }, - submit: function() { - } -}; - // Modal object to handle adding rooms to order processes const AddRoomBookingModal = { show: function() { @@ -2800,22 +2614,6 @@ function updateRoomDemand(element) }); } -function setRoomsForReallocation(roomsAvailable) -{ - if (typeof(roomsAvailable) != 'undefined' && roomsAvailable.length) { - var roomsHtml = ''; - - $(".realloc_avail_rooms_container").empty().append(roomsHtml); - } else { - $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt); - } -} - function checkPartialRefundProductQuantity(it) { if (parseInt($(it).val()) > parseInt($(it).closest('td').find('.partialRefundProductQuantity').val())) diff --git a/js/admin/reallocation.js b/js/admin/reallocation.js new file mode 100644 index 000000000..8306a3b3d --- /dev/null +++ b/js/admin/reallocation.js @@ -0,0 +1,248 @@ +/** +* Since 2010 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to newer +* versions in the future. If you wish to customize this module for your +* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul IN +* @license https://store.webkul.com/license.html +*/ + + +$(document).ready(function() { + // For processing room reallocation and swapping + $(document).on('click', '.room_reallocate_swap', function(e) { + e.preventDefault(); + RoomReallocationModal.show($(this)); + }); + + $(document).on('hidden.bs.modal', '#room-reallocation-modal', function(){ + location.reload(); + }); + + /*For reallocating rooms in the modal*/ + $(document).on('click', '#realloc_allocated_rooms', function(e){ + if (RoomReallocationModal.reallocate() == false) { + return false; + } + }); + /*For swaping rooms in the modal*/ + $(document).on('click', '#swap_allocated_rooms', function(){ + if (RoomReallocationModal.swap() == false) { + return false; + } + }); + + // change room type for reallocation + $(document).on("change", "#realloc_avail_room_type", function(e) { + e.preventDefault(); + RoomReallocationModal.changeRoomType($(this)); + }); +}); + +// Modal object to handle room reallocation processes +const RoomReallocationModal = { + show: function(roomObj) { + var id_order = roomObj.data('id_order'); + $(".loading_overlay").show(); + $.ajax({ + type: 'POST', + headers: { + "cache-control": "no-cache" + }, + url: rooms_reallocation_url, + dataType: 'JSON', + cache: false, + data: 'ajax=true&id_order='+id_order+'&action=InitRoomReallocationModal', + success: function(result) { + if (result.hasError == 0 && result.modalHtml) { + $('.bootstrap').append(result.modalHtml); + + $(".modal_id_htl_booking").val(roomObj.data('id_htl_booking')); + $("input.modal_curr_room_num").val(roomObj.data('room_num')); + $("span.modal_curr_room_num").text(roomObj.data('room_num') + ', ' + roomObj.data('room_type_name')); + $(".cust_name").text(roomObj.data('cust_name')); + $(".cust_email").text(roomObj.data('cust_email')); + + // reset price difference fields + $("#reallocation_price_diff").val(0); + $("#reallocation_price_diff_block").hide(); + $(".realloc_roomtype_change_message").hide(); + + // For Rooms Swapping + var json_arr_rm_swp = roomObj.data('avail_rm_swap'); + if (roomObj.data('avail_rm_swap') != 'false' && json_arr_rm_swp.length != 0) { + html = ''; + $(".swap_avail_rooms_container").empty().append(html); + } else { + $(".swap_avail_rooms_container").empty().text(no_swap_rm_avail_txt).addClass('text-danger'); + $("#swap_room_tab .modal-footer").hide(); + } + + // For Rooms Reallocation + var json_arr_realloc_room_types = roomObj.data('avail_realloc_room_types'); + if (roomObj.data('avail_realloc_room_types') != 'false' && json_arr_realloc_room_types.length != 0) { + var idCurrentRoomType = roomObj.data('id_room_type'); + var roomsTypesHtml = ''; + + $(".realloc_avail_room_type_container").empty().append(roomsTypesHtml); + + // if rooms are available for reallocation for the current room type then only select that room type + if (typeof json_arr_realloc_room_types[idCurrentRoomType] !== 'undefined') { + $('#realloc_avail_room_type option[value='+idCurrentRoomType+']').prop('selected', true); + setRoomsForReallocation(json_arr_realloc_room_types[idCurrentRoomType]['rooms']); + + // if rooms are not available for reallocation for the current room type + // then select first room type in available room types and also price difference data + } else if (idFirstRoomType = Object.keys(json_arr_realloc_room_types)[0]) { + $('#realloc_avail_room_type option[value='+idFirstRoomType+']').prop('selected', true); + RoomReallocationModal.changeRoomType($("#realloc_avail_room_type")); + } + } else { + $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt).addClass('text-danger'); + $(".realloc_avail_room_type_container").empty().text(no_realloc_rm_type_avail_txt).addClass('text-danger'); + $("#reallocate_room_tab .modal-footer").hide(); + } + + $('#room-reallocation-modal').modal('show'); + } else { + showErrorMessage(txtSomeErr); + } + }, + complete: function() { + $(".loading_overlay").hide(); + } + }); + }, + swap: function() { + $(".error_text").text(''); + var room_to_swap = $('#swap_avail_rooms').val(); + if (typeof room_to_swap == 'undefined' || room_to_swap == 0) { + $("#swap_sel_rm_err_p").text(slct_rm_err); + return false; + } + + return true; + }, + reallocate: function(reallocateBtnObj) { + $(".error_text").text(''); + var room_to_reallocate = $('#realloc_avail_rooms').val(); + var room_type_to_reallocate = $('#realloc_avail_room_type').val(); + + if (typeof room_type_to_reallocate == 'undefined' || room_type_to_reallocate == 0) { + $("#realloc_sel_rm_type_err_p").text(slct_rm_type_err); + return false; + } + + if (typeof room_to_reallocate == 'undefined' || room_to_reallocate == 0) { + $("#realloc_sel_rm_err_p").text(slct_rm_err); + return false; + } + + return true; + }, + changeRoomType: function(roomTypeObj) { + $(".loading_overlay").show(); + var idHotelBooking = roomTypeObj.data('id_htl_booking'); + $("#reallocation_price_diff").val(0); + $("#reallocation_price_diff_block").hide(); + if (parseInt(idHotelBooking) > 0) { + var optionSelected = roomTypeObj.find('option:selected'); + var roomsAvailable = JSON.parse(optionSelected.attr('rooms_available')); + + // set the rooms of the selceted room type + setRoomsForReallocation(roomsAvailable); + + // send an ajax for fetching if price has changes in the new room type seleceted + $.ajax({ + type: 'POST', + headers: { + "cache-control": "no-cache" + }, + url: rooms_reallocation_url, + dataType: 'JSON', + cache: false, + data: { + id_htl_booking: idHotelBooking, + id_new_room_type: roomTypeObj.val(), + action: 'changeRoomTypeToReallocate', + ajax: true + }, + success: function(result) { + if (result.success == 1) { + // has room type changed for reallocation + if (result.has_room_type_change == 1) { + $(".realloc_roomtype_change_message").show(); + // has room type price changed for reallocation + if (result.has_price_changes == 1) { + $("#reallocation_price_diff").val(result.price_diff); + $("#reallocation_price_diff_block").show(); + } + } else { + $(".realloc_roomtype_change_message").hide(); + } + $('#room_type_change_info').empty(); + if (result.is_changes_present == 1) { + } + } else if (typeof(result.error) != 'undefinded' && result.error) { + showErrorMessage(result.error); + } else { + showErrorMessage(txtSomeErr); + } + }, + error: function(XMLHttpRequest, textStatus, errorThrown) { + showErrorMessage(txtSomeErr); + }, + complete: function() { + $(".loading_overlay").hide(); + } + }); + } else { + $(".loading_overlay").hide(); + showErrorMessage(txtSomeErr); + return false; + } + }, + close: function() { + $('#room-reallocation-modal').modal('hide'); + }, + submit: function() { + } +}; + +function setRoomsForReallocation(roomsAvailable) +{ + if (typeof(roomsAvailable) != 'undefined' && roomsAvailable.length) { + var roomsHtml = ''; + + $(".realloc_avail_rooms_container").empty().append(roomsHtml); + } else { + $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt); + } +} \ No newline at end of file diff --git a/js/validate.js b/js/validate.js index 79d7af124..bf07c53dc 100644 --- a/js/validate.js +++ b/js/validate.js @@ -175,6 +175,11 @@ function validate_isPasswd(s) return (s.length >= 5 && s.length < 255); } +function validate_maxSize(s, maxSize) +{ + return (s.length <= maxSize); +} + function validate_field(that) { if ($(that).hasClass('is_required') || $(that).val().length) @@ -191,6 +196,15 @@ function validate_field(that) else if($(that).attr('data-validate')) var result = window['validate_' + $(that).attr('data-validate')]($(that).val()); if (result) { + if ($(that).attr('data-maxSize')) { + var maxSize = $(that).attr('data-maxSize'); + var resultmaxSize = validate_maxSize($(that).val(), maxSize); + if (!resultmaxSize) { + $(that).parent().addClass('form-error').removeClass('form-ok'); + return false; + } + } + $(that).parent().removeClass('form-error').addClass('form-ok'); return true; } else { diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index e7abb8d20..8474537c9 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1761,81 +1761,359 @@ class HotelBookingDetail extends ObjectModel { $result = true; // get the cart booking data for the given booking - if (Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHotelBooking))) { - $objHotelCartBooking = new HotelCartBookingData(); - if ($cartBookingInfo = $objHotelCartBooking->getRoomRowByIdProductIdRoomInDateRange( - $objHotelBooking->id_cart, - $objHotelBooking->id_product, - $objHotelBooking->date_from, - $objHotelBooking->date_to, - $objHotelBooking->id_room - )) { - // Reallocate the rooms in the room cart booking table - if (Validate::isLoadedObject($objHotelCartBooking = new HotelCartBookingData($cartBookingInfo['id']))) { - $objHotelCartBooking->id_room = $idRoom; - $result &= $objHotelCartBooking->save(); - } - } - - // Reallocate the rooms in the room booking table + if (Validate::isLoadedObject($objOldHotelBooking = new HotelBookingDetail($idHotelBooking))) { $objHotelRoomInfo = new HotelRoomInformation($idRoom); $idNewRoomType = $objHotelRoomInfo->id_product; - if ($objHotelBooking->id_product != $idNewRoomType) { - $objHotelBooking->id_product = $idNewRoomType; - $objProduct = new Product($idNewRoomType, false, Configuration::get('PS_LANG_DEFAULT')); - $objHotelBooking->room_type_name = $objProduct->name; + if ($objOldHotelBooking->id_product != $idNewRoomType) { + $objOrder = new Order($objOldHotelBooking->id_order); + $objOldOrderDetail = new OrderDetail($objOldHotelBooking->id_order_detail); - // change product name in order detail table - $objOrderDetail = new OrderDetail((int) $objHotelBooking->id_order_detail); - $objOrderDetail->product_name = $objProduct->name; + $productQty = (int)$objOldHotelBooking->getNumberOfDays($objOldHotelBooking->date_from, $objOldHotelBooking->date_to); + $oldRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl / $productQty; + $newRoomPriceTaxExcl = $oldRoomPriceTaxExcl + $priceDiffTaxExcl; - // manage the prices in the order tables for the price diffrence - if ($priceDiffTaxExcl != 0) { - $taxCalculator = $objOrderDetail->getTaxCalculator(); - $priceDiffTaxIncl = Tools::ps_round($taxCalculator->addTaxes($priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_); + $totalRoomPriceTaxIncl = $objOldHotelBooking->total_price_tax_incl; + $totalRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl; - // set price changes in htl_booking_detail table - $objHotelBooking->total_price_tax_excl += (float)$priceDiffTaxExcl; - $objHotelBooking->total_price_tax_incl += (float)$priceDiffTaxIncl; + // =============================================================== + // Start: Add Process of the old booking + // =============================================================== + // Total method + $totalMethod = Cart::BOTH_WITHOUT_SHIPPING; + // Create new cart + $cart = new Cart(); + $cart->id_shop_group = $objOrder->id_shop_group; + $cart->id_shop = $objOrder->id_shop; + $cart->id_customer = $objOrder->id_customer; + $cart->id_carrier = $objOrder->id_carrier; + $cart->id_address_delivery = $objOrder->id_address_delivery; + $cart->id_address_invoice = $objOrder->id_address_invoice; + $cart->id_currency = $objOrder->id_currency; + $cart->id_lang = $objOrder->id_lang; + $cart->secure_key = $objOrder->secure_key; + $cart->add(); - // set price changes in order_detail table - $roomTypeTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $idNewRoomType, - $objHotelBooking->date_from, - $objHotelBooking->date_to + // Save context (in order to apply cart rule) + $this->context->cart = $cart; + $this->context->customer = new Customer($objOrder->id_customer); + $this->context->currency = new Currency($objOrder->id_currency); + + // always add taxes even if not displayed to the customer + $useTaxes = true; + + $initialProductPriceTE = Product::getPriceStatic( + $idNewRoomType, + $useTaxes, + null, + 2, + null, + false, + true, + 1, + false, + $objOrder->id_customer, + $cart->id, + $objOrder->id_address_tax + ); + + // create feature price if needed + $createFeaturePrice = $newRoomPriceTaxExcl != $initialProductPriceTE; + if ($createFeaturePrice) { + $featurePriceParams = array(); + $featurePriceParams = array( + 'id_cart' => $this->context->cart->id, + 'id_guest' => $this->context->cookie->id_guest, + 'price' => $newRoomPriceTaxExcl, + 'id_product' => $idNewRoomType, ); - - $objOrderDetail->unit_price_tax_excl = Product::getPriceStatic($idNewRoomType, false, null, _PS_PRICE_COMPUTE_PRECISION_); - $objOrderDetail->unit_price_tax_incl = Tools::ps_round( - $taxCalculator->addTaxes($objOrderDetail->unit_price_tax_excl), - _PS_PRICE_COMPUTE_PRECISION_ - ); - - $objOrderDetail->total_price_tax_excl += (float)$priceDiffTaxExcl; - $objOrderDetail->total_price_tax_incl += (float)$priceDiffTaxIncl; - - // set price changes in orders table - $objOrder = new Order($objOrderDetail->id_order); - $objOrder->total_products += (float)$priceDiffTaxExcl; - $objOrder->total_products_wt += (float)$priceDiffTaxIncl; - $objOrder->total_paid += (float)$priceDiffTaxIncl; - $objOrder->total_paid_tax_excl += (float)$priceDiffTaxExcl; - $objOrder->total_paid_tax_incl += (float)$priceDiffTaxIncl; - - $result &= $objOrder->update(); - - // update taxes in order detail - $result &= $objOrderDetail->updateTaxAmount($objOrder); } - $result &= $objOrderDetail->update(); - } + $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail(); - $objHotelBooking->id_room = $idRoom; - $objHotelBooking->room_num = $objHotelRoomInfo->room_num; - // set backorder to 0 as available reallocate rooms will always be free - $objHotelBooking->is_back_order = 0; - $result &= $objHotelBooking->save(); + $bookingParams = array( + 'date_from' => $objOldHotelBooking->date_from, + 'date_to' => $objOldHotelBooking->date_to, + 'hotel_id' => $objOldHotelBooking->id_hotel, + 'id_room_type' => $idNewRoomType, + 'only_search_data' => 1, + ); + + if ($roomAvailabilityInfo = $objOldHotelBooking->dataForFrontSearch($bookingParams)) { + if ($availableRooms = $roomAvailabilityInfo['rm_data'][$idNewRoomType]['data']['available']) { + $roomInfo = reset($availableRooms); + $objCartBookingData = new HotelCartBookingData(); + $objCartBookingData->id_cart = $this->context->cart->id; + $objCartBookingData->id_guest = $this->context->cookie->id_guest; + $objCartBookingData->id_customer = $objOrder->id_customer; + $objCartBookingData->id_currency = $objOrder->id_currency; + $objCartBookingData->id_product = $roomInfo['id_product']; + $objCartBookingData->id_room = $roomInfo['id_room']; + $objCartBookingData->id_hotel = $roomInfo['id_hotel']; + $objCartBookingData->booking_type = 1; + $objCartBookingData->quantity = $productQty; + $objCartBookingData->date_from = $objOldHotelBooking->date_from; + $objCartBookingData->date_to = $objOldHotelBooking->date_to; + $objCartBookingData->adults = $objOldHotelBooking->adults; + $objCartBookingData->children = $objOldHotelBooking->children; + $objCartBookingData->child_ages = $objOldHotelBooking->child_ages; + $objCartBookingData->save(); + + // create feature price if needed + if ($createFeaturePrice) { + $featurePriceParams['id_room'] = $roomInfo['id_room']; + $featurePriceParams = array_merge( + $featurePriceParams, + array('date_from' => $objOldHotelBooking->date_from, 'date_to' => $objOldHotelBooking->date_to) + ); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($featurePriceParams); + } + } else { + return false; + } + } else { + return false; + } + + $totalRoomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $idNewRoomType, + $objCartBookingData->date_from, + $objCartBookingData->date_to, + 0, + Group::getCurrent()->id, + $this->context->cart->id, + $this->context->cookie->id_guest, + $objCartBookingData->id_room, + 0 + ); + + // Add product to cart + $updateQuantity = $cart->updateQty( + $productQty, + $idNewRoomType, + null, + null, + 'up', + 0, + new Shop($cart->id_shop) + ); + + // If order is valid, we can create a new invoice or edit an existing invoice + if ($objOrder->hasInvoice()) { + $objOrderInvoice = new OrderInvoice($objOldOrderDetail->id_order_invoice); + $objOrderInvoice->total_paid_tax_excl += (float)($cart->getOrderTotal(false, $totalMethod)); + $objOrderInvoice->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod)); + $objOrderInvoice->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); + $objOrderInvoice->total_products_wt += (float)$cart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS); + $objOrderInvoice->update(); + } + + // Create Order detail information + $objOrderDetail = new OrderDetail(); + $objOrderDetail->createList($objOrder, $cart, $objOrder->getCurrentOrderState(), $cart->getProducts(), (isset($objOrderInvoice->id) ? $objOrderInvoice->id : 0), $useTaxes, (int)Tools::getValue('add_product_warehouse')); + + // update totals amount of order + $objOrder->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); + $objOrder->total_products_wt += (float)$cart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS); + + $objOrder->total_paid += (float)($cart->getOrderTotal(true, $totalMethod)); + $objOrder->total_paid_tax_excl += (float)($cart->getOrderTotal(false, $totalMethod)); + $objOrder->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod)); + + // Save changes of order + $objOrder->update(); + + // Update Tax lines + $objOrderDetail->updateTaxAmount($objOrder); + + $objRoomType = new HotelRoomType(); + $objBookingDetail = new HotelBookingDetail(); + $idNewOrderDetail = $objBookingDetail->getLastInsertedRoomIdOrderDetail($objOrder->id); + $objCartBookingData = new HotelCartBookingData(); + if ($cartBookingsData = $objCartBookingData->getOnlyCartBookingData( + $this->context->cart->id, + $this->context->cart->id_guest, + $idNewRoomType + )) { + foreach ($cartBookingsData as $cartBookingInfo) { + $objCartBookingData = new HotelCartBookingData($cartBookingInfo['id']); + $objCartBookingData->id_order = $objOrder->id; + $objCartBookingData->save(); + + $objBookingDetail = new HotelBookingDetail(); + $objBookingDetail->id_product = $idNewRoomType; + $objBookingDetail->id_order = $objOrder->id; + $objBookingDetail->id_order_detail = $idNewOrderDetail; + $objBookingDetail->id_cart = $this->context->cart->id; + $objBookingDetail->id_room = $objCartBookingData->id_room; + $objBookingDetail->id_hotel = $objCartBookingData->id_hotel; + $objBookingDetail->id_customer = $objOrder->id_customer; + $objBookingDetail->booking_type = $objCartBookingData->booking_type; + $objBookingDetail->id_status = 1; + $objBookingDetail->comment = $objCartBookingData->comment; + $objBookingDetail->room_type_name = Product::getProductName($idNewRoomType, null, $objOrder->id_lang); + + $objBookingDetail->date_from = $objCartBookingData->date_from; + $objBookingDetail->date_to = $objCartBookingData->date_to; + $objBookingDetail->adults = $objCartBookingData->adults; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; + + $totalRoomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $idNewRoomType, + $objCartBookingData->date_from, + $objCartBookingData->date_to, + 0, + Group::getCurrent()->id, + $this->context->cart->id, + $this->context->cookie->id_guest, + $objCartBookingData->id_room, + 0 + ); + $objBookingDetail->total_price_tax_excl = $totalRoomTypePrice['total_price_tax_excl']; + $objBookingDetail->total_price_tax_incl = $totalRoomTypePrice['total_price_tax_incl']; + $objBookingDetail->total_paid_amount = $totalRoomTypePrice['total_price_tax_incl']; + + // Save hotel information/location/contact + if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { + $objBookingDetail->room_num = $objRoom->room_num; + } + if (Validate::isLoadedObject($objHotelBranch = new HotelBranchInformation( + $objCartBookingData->id_hotel, + $this->context->cart->id_lang + ))) { + $addressInfo = $objHotelBranch->getAddress($objCartBookingData->id_hotel); + $objBookingDetail->hotel_name = $objHotelBranch->hotel_name; + $objBookingDetail->city = $addressInfo['city']; + $objBookingDetail->state = State::getNameById($addressInfo['id_state']); + $objBookingDetail->country = Country::getNameById($this->context->cart->id_lang, $addressInfo['id_country']); + $objBookingDetail->zipcode = $addressInfo['postcode'];; + $objBookingDetail->phone = $addressInfo['phone']; + $objBookingDetail->email = $objHotelBranch->email; + $objBookingDetail->check_in_time = $objHotelBranch->check_in; + $objBookingDetail->check_out_time = $objHotelBranch->check_out; + } + + if ($objBookingDetail->save()) { + // Get Booking Demands of the old booking to add in the new booking creation + $objBookingDemand = new HotelBookingDemands(); + if ($oldBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + $objOldHotelBooking->id_order, + $objOldHotelBooking->id_product, + $objOldHotelBooking->id_room, + $objOldHotelBooking->date_from, + $objOldHotelBooking->date_to + )) { + if (isset($oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands']) && $oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands']) { + foreach ($oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands'] as $bookingDemand) { + $objBookingDemand = new HotelBookingDemands($bookingDemand['id_booking_demand']); + $objBookingDemand->id_htl_booking = $objBookingDetail->id; + $objBookingDemand->save(); + } + } + } + + // Get Booking services of the old booking to add in the new booking creation + $objServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($oldAdditonalServices = $objServiceProductOrderDetail->getSelectedServicesForRoom($idHotelBooking)) { + if (isset($oldAdditonalServices['additional_services']) && $oldAdditonalServices['additional_services']) { + foreach ($oldAdditonalServices['additional_services'] as $service) { + $objServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail($service['id_room_type_service_product_order_detail']); + $objServiceProductOrderDetail->id_htl_booking_detail = $objBookingDetail->id; + $objServiceProductOrderDetail->save(); + } + } + } + } + } + } + + // delete cart feature prices after room addition success + HotelRoomTypeFeaturePricing::deleteByIdCart($this->context->cart->id); + + // =============================================================== + // END: Add Process of the old booking + // =============================================================== + + // =============================================================== + // Start: Delete Process of the old booking + // =============================================================== + $deleteQty = false; + if ($productQty >= $objOldOrderDetail->product_quantity) { + $deleteQty = true; + } else { + // Calculate differences of price (Before / After) + + $objOldOrderDetail->total_price_tax_incl -= $totalRoomPriceTaxIncl; + $objOldOrderDetail->total_price_tax_excl -= $totalRoomPriceTaxExcl; + + $old_quantity = $objOldOrderDetail->product_quantity; + + $objOldOrderDetail->product_quantity = $old_quantity - $product_quantity; + $objOldOrderDetail->reduction_percent = 0; + + // update taxes + $res &= $objOldOrderDetail->updateTaxAmount($objOrder); + + // Save order detail + $res &= $objOldOrderDetail->update(); + } + + // Update OrderInvoice of this OrderDetail + if ($objOldOrderDetail->id_order_invoice != 0) { + // values changes as values are calculated accoding to the quantity of the product by webkul + $objOrderInvoice = new OrderInvoice($objOldOrderDetail->id_order_invoice); + $objOrderInvoice->total_paid_tax_excl -= $totalRoomPriceTaxExcl; + $objOrderInvoice->total_paid_tax_excl = $objOrderInvoice->total_paid_tax_excl > 0 ? $objOrderInvoice->total_paid_tax_excl : 0; + + $objOrderInvoice->total_paid_tax_incl -= $totalRoomPriceTaxIncl; + $objOrderInvoice->total_paid_tax_incl = $objOrderInvoice->total_paid_tax_incl > 0 ? $objOrderInvoice->total_paid_tax_incl : 0; + + $objOrderInvoice->total_products -= $totalRoomPriceTaxExcl; + $objOrderInvoice->total_products = $objOrderInvoice->total_products > 0 ? $objOrderInvoice->total_products : 0; + + $objOrderInvoice->total_products_wt -= $totalRoomPriceTaxIncl; + $objOrderInvoice->total_products_wt = $objOrderInvoice->total_products_wt > 0 ? $objOrderInvoice->total_products_wt : 0; + + $res &= $objOrderInvoice->update(); + } + + // values changes as values are calculated accoding to the quantity of the product by webkul + $objOrder->total_paid -= $totalRoomPriceTaxIncl; + $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0; + + $objOrder->total_paid_tax_incl -= $totalRoomPriceTaxIncl; + $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0; + + $objOrder->total_paid_tax_excl -= $totalRoomPriceTaxExcl; + $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0; + + $objOrder->total_products -= $totalRoomPriceTaxExcl; + $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0; + + $objOrder->total_products_wt -= $totalRoomPriceTaxIncl; + $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0; + + $objOrder->update(); + + // Reinject quantity in stock + $objOldOrderDetail->reinjectQuantity($objOldOrderDetail, $objOldOrderDetail->product_quantity, $deleteQty); + + // delete the booking detail + $objOldHotelBooking = new HotelBookingDetail($idHotelBooking); + $objOldHotelBooking->delete(); + + // =============================================================== + // END Delete Process of the old booking + // =============================================================== + } else { + // If we are reallocating to the same room type then we need to update only the room details + $objOldHotelBooking->id_room = $idRoom; + $objOldHotelBooking->room_num = $objHotelRoomInfo->room_num; + // set backorder to 0 as available reallocate rooms will always be free + $objOldHotelBooking->is_back_order = 0; + + $result &= $objOldHotelBooking->save(); + } if ($result) { Hook::exec( @@ -2196,7 +2474,7 @@ class HotelBookingDetail extends ObjectModel $order_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); // Check if this booking as any refund history then enter refund data - if ($refundInfo = OrderReturnCore::getOrdersReturnDetail($id_order, 0, $value['id'])) { + if ($refundInfo = OrderReturn::getOrdersReturnDetail($id_order, 0, $value['id'])) { $order_detail_data[$key]['refund_info'] = reset($refundInfo); } } @@ -2870,9 +3148,12 @@ class HotelBookingDetail extends ObjectModel ); $objOrder = new Order($this->id_order); $orderTotalPaid = $objOrder->getTotalPaid(); + $orderDiscounts = $objOrder->getCartRules(); + + $hasOrderDiscountOrPayment = ((float)$orderTotalPaid > 0 || $orderDiscounts) ? true : false; // things to do if order is not paid - if ((float) $orderTotalPaid <= 0) { + if (!$hasOrderDiscountOrPayment) { $objHotelBookingDemands = new HotelBookingDemands(); $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); @@ -2919,8 +3200,14 @@ class HotelBookingDetail extends ObjectModel $objOrderDetail->product_quantity_refunded = $objOrderDetail->product_quantity; } - $objOrderDetail->total_price_tax_excl -= Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_excl, 6); - $objOrderDetail->total_price_tax_incl -= Tools::ps_round((float) $objRoomTypeServiceProductOrderDetail->total_price_tax_incl, 6); + $objOrderDetail->total_price_tax_excl = Tools::ps_round( + ($objOrderDetail->total_price_tax_excl - $objRoomTypeServiceProductOrderDetail->total_price_tax_excl), + 6 + ); + $objOrderDetail->total_price_tax_incl = Tools::ps_round( + ($objOrderDetail->total_price_tax_incl - $objRoomTypeServiceProductOrderDetail->total_price_tax_incl), + 6 + ); $objOrderDetail->save(); } @@ -2945,16 +3232,47 @@ class HotelBookingDetail extends ObjectModel $objOrderDetail->product_quantity_refunded = $objOrderDetail->product_quantity; } - if ((float) $orderTotalPaid <= 0) { + if (!$hasOrderDiscountOrPayment) { // reduce room amount from order and order detail - $objOrderDetail->total_price_tax_incl -= Tools::ps_round((float) $this->total_price_tax_incl, 6); - $objOrderDetail->total_price_tax_excl -= Tools::ps_round((float) $this->total_price_tax_excl, 6); + $objOrderDetail->total_price_tax_incl = Tools::ps_round( + ($objOrderDetail->total_price_tax_incl - $this->total_price_tax_incl), + 6 + ); + $objOrderDetail->total_price_tax_excl = Tools::ps_round( + ($objOrderDetail->total_price_tax_excl - $this->total_price_tax_excl), + 6 + ); if (Validate::isLoadedObject($objOrder = new Order($this->id_order))) { - $objOrder->total_paid -= $reduction_amount['total_price_tax_incl']; - $objOrder->total_paid_tax_excl -= Tools::ps_round((float) $reduction_amount['total_price_tax_excl'], 6); - $objOrder->total_paid_tax_incl -= Tools::ps_round((float) $reduction_amount['total_price_tax_incl'], 6); - $objOrder->total_products -= Tools::ps_round((float) $reduction_amount['total_products_tax_excl'], 6); - $objOrder->total_products_wt -= Tools::ps_round((float) $reduction_amount['total_products_tax_incl'], 6); + $objOrder->total_paid = Tools::ps_round( + ($objOrder->total_paid - $reduction_amount['total_price_tax_incl']), + 6 + ); + $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0; + + $objOrder->total_paid_tax_excl = Tools::ps_round( + ($objOrder->total_paid_tax_excl - $reduction_amount['total_price_tax_excl']), + 6 + ); + $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0; + + $objOrder->total_paid_tax_incl = Tools::ps_round( + ($objOrder->total_paid_tax_incl - $reduction_amount['total_price_tax_incl']), + 6 + ); + $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0; + + $objOrder->total_products = Tools::ps_round( + ($objOrder->total_products - $reduction_amount['total_products_tax_excl']), + 6 + ); + $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0; + + $objOrder->total_products_wt = Tools::ps_round( + ($objOrder->total_products_wt - $reduction_amount['total_products_tax_incl']), + 6 + ); + $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0; + $objOrder->save(); } } @@ -2964,7 +3282,7 @@ class HotelBookingDetail extends ObjectModel // as refund is completed then set the booking as refunded $this->is_refunded = 1; - if ((float) $orderTotalPaid <= 0) { + if (!$hasOrderDiscountOrPayment) { // Reduce room amount from htl_booking_detail $this->is_cancelled = 1; $this->total_price_tax_excl = 0; @@ -2979,66 +3297,6 @@ class HotelBookingDetail extends ObjectModel return false; } - public function setBookingCancellationMessage($message, $byAdmin = 0) - { - if (Validate::isLoadedObject($this)) { - // First save the message for the admin for the refund - $objectMessage = new Message(); - $objectMessage->message = $message; - $objectMessage->id_cart = (int)$this->id_cart; - $objectMessage->id_customer = (int)($this->id_customer); - $objectMessage->id_order = (int)$this->id_order; - $objectMessage->private = 1; - - // If cancelled by admin then set the employee id who is doing this cancellation else put 0 - $context = Context::getContext(); - if ($byAdmin) { - $objectMessage->id_employee = (int)$context->employee->id; - } else { - $objectMessage->id_employee = 0; - } - - $objectMessage->add(); - - // save this message for the customer - $objCustomer = new Customer($this->id_customer); - $idCustomerThread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($objCustomer->email, $this->id_order); - if (!$idCustomerThread) { - $objCustomerThread = new CustomerThread(); - $objCustomerThread->id_contact = 0; - $objCustomerThread->id_customer = (int)$this->id_customer; - $objCustomerThread->id_shop = (int)$context->shop->id; - $objCustomerThread->id_order = (int)$this->id_order; - $objCustomerThread->id_lang = (int)$context->language->id; - $objCustomerThread->email = $objCustomer->email; - $objCustomerThread->status = 'open'; - $objCustomerThread->token = Tools::passwdGen(12); - $objCustomerThread->add(); - } else { - $objCustomerThread = new CustomerThread((int)$idCustomerThread); - } - - $objCustomerMessage = new CustomerMessage(); - $objCustomerMessage->id_customer_thread = $objCustomerThread->id; - - // If cancelled by admin then set the employee id who is doing this cancellation else put 0 - if ($byAdmin) { - $objCustomerMessage->id_employee = (int)$context->employee->id; - } else { - $objCustomerMessage->id_employee = 0; - } - - $objCustomerMessage->message = $message; - $objCustomerMessage->private = 0; - - $objCustomerMessage->add(); - - return true; - } - - return false; - } - /** * Get overbooked rooms in the order|hotel * @param [int] $idOrder : id of the order diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index 5dbfbd1db..d15d10641 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -972,4 +972,31 @@ class HotelRoomTypeFeaturePricing extends ObjectModel return $this->update($null_values); } + + public static function createAutoFeaturePrice($params) + { + $context = Context::getContext(); + $featurePriceName = array(); + foreach (Language::getIDs(true) as $idLang) { + $featurePriceName[$idLang] = 'Auto-generated'; + } + + $objFeaturePricing = new HotelRoomTypeFeaturePricing(); + $objFeaturePricing->id_product = (int) $params['id_product']; + $objFeaturePricing->id_cart = (int) $params['id_cart']; + $objFeaturePricing->id_guest = (int) $params['id_guest']; + $objFeaturePricing->id_room = (int) $params['id_room']; + $objFeaturePricing->feature_price_name = $featurePriceName; + $objFeaturePricing->date_selection_type = HotelRoomTypeFeaturePricing::DATE_SELECTION_TYPE_RANGE; + $objFeaturePricing->date_from = date('Y-m-d', strtotime($params['date_from'])); + $objFeaturePricing->date_to = date('Y-m-d', strtotime($params['date_to'])); + $objFeaturePricing->is_special_days_exists = 0; + $objFeaturePricing->special_days = json_encode(false); + $objFeaturePricing->impact_way = HotelRoomTypeFeaturePricing::IMPACT_WAY_FIX_PRICE; + $objFeaturePricing->impact_type = HotelRoomTypeFeaturePricing::IMPACT_TYPE_FIXED_PRICE; + $objFeaturePricing->impact_value = $params['price']; + $objFeaturePricing->active = 1; + $objFeaturePricing->groupBox = array_column(Group::getGroups($context->language->id), 'id_group'); + $objFeaturePricing->add(); + } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 04b02fe59..c8a575056 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -177,86 +177,95 @@ class AdminHotelRoomsBookingController extends ModuleAdminController Tools::redirectAdmin($this->context->link->getAdminLink('AdminHotelRoomsBooking').'&'.http_build_query($urlData)); } + // Process reallocation of rooms // Process reallocation of rooms if (Tools::isSubmit('realloc_allocated_rooms')) { - $idOrder = Tools::getValue('id_order'); - $idHtlBookingFrom = Tools::getValue('id_htl_booking'); - $idNewRoomType = Tools::getValue('realloc_avail_room_type'); - $idRoomToReallocate = Tools::getValue('realloc_avail_rooms'); - $priceDiff = Tools::getValue('reallocation_price_diff'); + if ($this->tabAccess['edit'] === '1') { + $idOrder = Tools::getValue('id_order'); + $idHtlBookingFrom = Tools::getValue('id_htl_booking'); + $idNewRoomType = Tools::getValue('realloc_avail_room_type'); + $idRoomToReallocate = Tools::getValue('realloc_avail_rooms'); + $priceDiff = Tools::getValue('reallocation_price_diff'); - $objBookingDetail = new HotelBookingDetail(); - if ($idRoomToReallocate) { - // check if room is from selected room type - if (Validate::isLoadedObject($objRoomInfo = new HotelRoomInformation($idRoomToReallocate))) { - if ($objRoomInfo->id_product != $idNewRoomType) { - $this->errors[] = $this->l('Invalid room selected for reallocation.'); - } elseif (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) { - $this->errors[] = $this->l('Invalid booking found for reallocation.'); - } elseif (!$availableRooms = $objBookingDetail->getAvailableRoomsForReallocation( - $objHotelBooking->date_from, - $objHotelBooking->date_to, - $idNewRoomType, - $objHotelBooking->id_hotel - )) { + $objBookingDetail = new HotelBookingDetail(); + if ($idRoomToReallocate) { + // check if room is from selected room type + if (Validate::isLoadedObject($objRoomInfo = new HotelRoomInformation($idRoomToReallocate))) { + if ($objRoomInfo->id_product != $idNewRoomType) { + $this->errors[] = $this->l('Invalid room selected for reallocation.'); + } elseif (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) { + $this->errors[] = $this->l('Invalid booking found for reallocation.'); + } elseif (!$availableRooms = $objBookingDetail->getAvailableRoomsForReallocation( + $objHotelBooking->date_from, + $objHotelBooking->date_to, + $idNewRoomType, + $objHotelBooking->id_hotel + )) { + $this->errors[] = $this->l('Selected room is not available for reallocation.'); + } elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) { + $this->errors[] = $this->l('Selected room is not available for reallocation.'); + } elseif (!Validate::isFloat($priceDiff)) { + $this->errors[] = $this->l('Invalid price difference of the room types.'); + } + } else { $this->errors[] = $this->l('Selected room is not available for reallocation.'); - } elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) { - $this->errors[] = $this->l('Selected room is not available for reallocation.'); - } elseif (!Validate::isFloat($priceDiff)) { - $this->errors[] = $this->l('Invalid price difference of the room types.'); } } else { - $this->errors[] = $this->l('Selected room is not available for reallocation.'); + $this->errors[] = $this->l('Please select a room to reallocate with this room.'); + } + + if (!count($this->errors)) { + // Finally, reallocate the room + if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) { + Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token); + } else { + $this->errors[] = $this->l('Some error occured. Please try again.'); + } } } else { - $this->errors[] = $this->l('Please select a room to reallocate with this room.'); - } - - if (!count($this->errors)) { - // Finally, reallocate the room - if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) { - Tools::redirectAdmin(self::$currentIndex.'&conf=52&token='.$this->token); - } else { - $this->errors[] = $this->l('Some error occured. Please try again.'); - } + $this->errors[] = $this->l('You do not have permission to edit this.'); } } // Process swap of rooms if (Tools::isSubmit('swap_allocated_rooms')) { - $idOrder = Tools::getValue('id_order'); - $idHtlBookingFrom = Tools::getValue('id_htl_booking'); - $idHtlBookingToSwap = Tools::getValue('swap_avail_rooms'); + if ($this->tabAccess['edit'] === '1') { + $idOrder = Tools::getValue('id_order'); + $idHtlBookingFrom = Tools::getValue('id_htl_booking'); + $idHtlBookingToSwap = Tools::getValue('swap_avail_rooms'); - if (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) { - $this->errors[] = $this->l('Selected room is not available to swap.'); - } else { - if (!Validate::isLoadedObject($objHotelBookingTo = new HotelBookingDetail($idHtlBookingToSwap))) { - $this->errors[] = $this->l('Please select a room to swap with this room booking.'); + if (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) { + $this->errors[] = $this->l('Selected room is not available to swap.'); } else { - if ($availableRooms = $objHotelBooking->getAvailableRoomsForSwapping( - $objHotelBooking->date_from, - $objHotelBooking->date_to, - $objHotelBooking->id_product, - $objHotelBooking->id_hotel, - $objHotelBooking->id_room - )) { - if (!in_array($idHtlBookingToSwap, array_column($availableRooms, 'id_hotel_booking'))) { + if (!Validate::isLoadedObject($objHotelBookingTo = new HotelBookingDetail($idHtlBookingToSwap))) { + $this->errors[] = $this->l('Please select a room to swap with this room booking.'); + } else { + if ($availableRooms = $objHotelBooking->getAvailableRoomsForSwapping( + $objHotelBooking->date_from, + $objHotelBooking->date_to, + $objHotelBooking->id_product, + $objHotelBooking->id_hotel, + $objHotelBooking->id_room + )) { + if (!in_array($idHtlBookingToSwap, array_column($availableRooms, 'id_hotel_booking'))) { + $this->errors[] = $this->l('Selected room is not available to swap.'); + } + } else { $this->errors[] = $this->l('Selected room is not available to swap.'); } - } else { - $this->errors[] = $this->l('Selected room is not available to swap.'); } } - } - if (!count($this->errors)) { - $objBookingDetail = new HotelBookingDetail(); - if ($objBookingDetail->swapBooking($idHtlBookingFrom, $idHtlBookingToSwap)) { - Tools::redirectAdmin(self::$currentIndex.'&conf=53&token='.$this->token); - } else { - $this->errors[] = $this->l('Some error occured. Please try again.'); + if (!count($this->errors)) { + $objBookingDetail = new HotelBookingDetail(); + if ($objBookingDetail->swapBooking($idHtlBookingFrom, $idHtlBookingToSwap)) { + Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$idOrder.'&vieworder&conf=53&token='.$this->token); + } else { + $this->errors[] = $this->l('Some error occured. Please try again.'); + } } + } else { + $this->errors[] = $this->l('You do not have permission to edit this.'); } } @@ -870,8 +879,15 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $newRoomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $idNewRoomType, $objHotelBooking->date_from, - $objHotelBooking->date_to + $objHotelBooking->date_to, + 0, + 0, + 0, + 0, + 0, + 0 ); + if ($objHotelBooking->total_price_tax_excl != $newRoomTotalPrice['total_price_tax_excl']) { $result['has_price_changes'] = 1; $result['price_diff'] = $newRoomTotalPrice['total_price_tax_excl'] - $objHotelBooking->total_price_tax_excl; @@ -887,6 +903,35 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->ajaxDie(json_encode($result)); } + public function ajaxProcessInitRoomReallocationModal() + { + // set modal details + $response['hasError'] = 1; + if (Validate::isLoadedObject($objOrder = new Order(Tools::getValue('id_order')))) { + $htlOrderStatus = HotelBookingDetail::getAllHotelOrderStatus(); + $this->context->smarty->assign( + array( + 'order' => $objOrder, + 'currency' => new Currency($objOrder->id_currency), + 'reallocate_form_action' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), + ) + ); + $modal = array( + 'modal_id' => 'room-reallocation-modal', + 'modal_class' => 'modal-md order_detail_modal', + 'modal_title' => '  '.$this->l('Room Reallocation / Swap'), + 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_reallocation.tpl'), + 'modal_actions' => null, + ); + + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); + } + + die(Tools::jsonEncode($response)); + } + public function setMedia() { parent::setMedia(); @@ -915,6 +960,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), 'occupancy_required_for_booking' => $occupancyRequiredForBooking, + 'rooms_reallocation_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'rooms_booking_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'opt_select_all' => $this->l('All Types', null, true), 'slt_another_htl' => $this->l('Select Another Hotel', null, true), @@ -927,6 +973,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'remove' => $this->l('Remove', null, true), 'noRoomTypeAvlTxt' => $this->l('No room type available.', null, true), 'slct_rm_err' => $this->l('Please select a room first.', null, true), + 'slct_rm_type_err' => $this->l('Please select a room type first.', null, true), 'product_added_cart_txt' => $this->l('Product added in cart', null, true), 'info_icon_path' => _MODULE_DIR_.$this->module->name.'/views/img/Slices/info-icon.svg', 'select_age_txt' => $this->l('Select age', null, true), @@ -971,5 +1018,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->addCSS(array(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css')); $this->addJs(_MODULE_DIR_.$this->module->name.'/views/js/admin/hotel_rooms_booking.js'); + + // add js for reallocation process + $this->addJS(_PS_JS_DIR_.'admin/reallocation.js'); } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index e39b3b30b..02798b4af 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -223,9 +223,13 @@ class AdminOrderRefundRequestsController extends ModuleAdminController } } + $orderTotalPaid = $objOrder->getTotalPaid(); + $orderDiscounts = $objOrder->getCartRules(); + $hasOrderDiscountOrPayment = ((float)$orderTotalPaid > 0 || $orderDiscounts) ? true : false; $this->context->smarty->assign( array ( - 'orderTotalPaid' => $objOrder->getTotalPaid(), + 'hasOrderDiscountOrPayment' => $hasOrderDiscountOrPayment, + 'orderTotalPaid' => $orderTotalPaid, 'customer_name' => $objCustomer->firstname.' '.$objCustomer->lastname, 'customer_email' => $objCustomer->email, 'orderReturnInfo' => (array)$objOrderReturn, @@ -257,11 +261,14 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if (Validate::isLoadedObject($objOrderReturn = new OrderReturn($idOrderReturn))) { $objOrder = new Order($objOrderReturn->id_order); $orderTotalPaid = $objOrder->getTotalPaid(); + $orderDiscounts = $objOrder->getCartRules(); + $hasOrderDiscountOrPayment = ((float)$orderTotalPaid > 0 || $orderDiscounts) ? true : false; + $idRefundState = Tools::getValue('id_refund_state'); if (Validate::isLoadedObject($objRefundState = new OrderReturnState($idRefundState))) { if ($objRefundState->refunded) { $refundedAmounts = Tools::getValue('refund_amounts'); - if ((float) $orderTotalPaid > 0) { + if ($hasOrderDiscountOrPayment) { if ($idsReturnDetail && count($idsReturnDetail)) { if ($refundedAmounts) { foreach ($idsReturnDetail as $idRetDetail) { @@ -346,6 +353,8 @@ class AdminOrderRefundRequestsController extends ModuleAdminController // save individual booking amount for every booking refund $refundedAmount = $refundedAmounts[$idRetDetail]; $objOrderReturnDetail->refunded_amount = $refundedAmount; + // set the id_customization to check if in this request which bookings are refunded or not for future + $objOrderReturnDetail->id_customization = 1; $objOrderReturnDetail->save(); // sum the refund amount for total order refund amount @@ -372,7 +381,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController } // if bookings are refunded then set the payment information - if ((float) $orderTotalPaid > 0) { + if ($hasOrderDiscountOrPayment) { if (Tools::isSubmit('refundTransactionAmount')) { $objOrderReturn->payment_mode = $paymentMode; $objOrderReturn->id_transaction = $idTransaction; @@ -395,7 +404,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $idOrderState = 0; if ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_REFUND_FLAG)) { $idOrderState = Configuration::get('PS_OS_REFUND'); - } elseif ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_REFUND_FLAG)) { + } elseif ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { $idOrderState = Configuration::get('PS_OS_CANCELED'); } diff --git a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css index ce44c95c6..4a18f60be 100644 --- a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css +++ b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css @@ -595,4 +595,12 @@ body.adminhotelroomsbooking .ui-tooltip { border: unset; padding: 10px; box-shadow: 0px 0px 15px 0px #00000026; +} + +#room-reallocation-modal .modal-footer { + padding: 15px 0px 0px 0px +} +#room-reallocation-modal .modal-body, #room-reallocation-modal .tab-content { + padding: 15px; + border: 1px solid #ddd } \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js index 4e6390085..e7a4d00cd 100644 --- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js +++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js @@ -1000,180 +1000,4 @@ $(document).ready(function() { return [true, ""]; } } - - $('#mySwappigModal').on('hidden.bs.modal', function (e) { - $(".modal_curr_room_num").val(''); - $(".modal_id_htl_booking").val(''); - $("#reallocation_price_diff_block .order_currency_sign").html(''); - $(".cust_name").text(''); - $(".cust_email").text(''); - $(".swp_rm_opts").remove(); - $(".realloc_rm_type_opts").remove(); - $(".realloc_rm_opts").remove(); - }); - - $('#mySwappigModal').on('shown.bs.modal', function (e) - { - $(".loading_overlay").show(); - - $(".modal_id_htl_booking").val(e.relatedTarget.dataset.id_htl_booking); - $("#reallocation_price_diff_block .order_currency_sign").html(e.relatedTarget.dataset.currency_sign); - $(".modal_curr_room_num").val(e.relatedTarget.dataset.room_num + ', ' + e.relatedTarget.dataset.room_type_name); - $(".cust_name").text(e.relatedTarget.dataset.cust_name); - $(".cust_email").text(e.relatedTarget.dataset.cust_email); - - // reset price difference fields - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - $(".realloc_roomtype_change_message").hide(); - - // For Rooms Swapping - var json_arr_rm_swp = JSON.parse(e.relatedTarget.dataset.avail_rm_swap); - if (e.relatedTarget.dataset.avail_rm_swap != 'false' && json_arr_rm_swp.length != 0) { - html = ''; - - $("#swap_allocated_rooms").removeAttr('disabled'); - $(".swap_avail_rooms_container").empty().append(html); - } else { - $(".swap_avail_rooms_container").empty().text(no_swap_rm_avail_txt).addClass('text-danger'); - $("#swap_allocated_rooms").attr('disabled', 'disabled'); - } - - // For Rooms Reallocation - var json_arr_realloc_room_types = JSON.parse(e.relatedTarget.dataset.avail_realloc_room_types); - if (e.relatedTarget.dataset.avail_realloc_room_types != 'false' && json_arr_realloc_room_types.length != 0) { - var idCurrentRoomType = e.relatedTarget.dataset.id_room_type; - var roomsTypesHtml = ''; - - setRoomsForReallocation(json_arr_realloc_room_types[idCurrentRoomType]['rooms']); - - $("#realloc_allocated_rooms").removeAttr('disabled'); - $(".realloc_avail_room_type_container").empty().append(roomsTypesHtml); - } else { - $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt).addClass('text-danger'); - $(".realloc_avail_room_type_container").empty().text(no_realloc_rm_type_avail_txt).addClass('text-danger'); - $("#realloc_allocated_rooms").attr('disabled', 'disabled'); - } - - $(".loading_overlay").hide(); - }); - - // change room type for reallocation - $(document).on("change", "#realloc_avail_room_type", function(e) { - $(".loading_overlay").show(); - - var idHotelBooking = $(this).data('id_htl_booking'); - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - if (parseInt(idHotelBooking) > 0) { - var optionSelected = $(this).find('option:selected'); - var roomsAvailable = JSON.parse(optionSelected.attr('rooms_available')); - - // set the rooms of the selceted room type - setRoomsForReallocation(roomsAvailable); - - // send an ajax for fetching if price has changes in the new room type seleceted - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: rooms_booking_url, - dataType: 'JSON', - cache: false, - data: { - id_htl_booking: idHotelBooking, - id_new_room_type: $(this).val(), - action: 'changeRoomTypeToReallocate', - ajax: true - }, - success: function(result) { - if (result.success == 1) { - // has room type changed for reallocation - if (result.has_room_type_change == 1) { - $(".realloc_roomtype_change_message").show(); - // has room type price changed for reallocation - if (result.has_price_changes == 1) { - $("#reallocation_price_diff").val(result.price_diff); - $("#reallocation_price_diff_block").show(); - } - } else { - $(".realloc_roomtype_change_message").hide(); - } - $('#room_type_change_info').empty(); - if (result.is_changes_present == 1) { - } - } else if (typeof(result.error) != 'undefinded' && result.error) { - showErrorMessage(result.error); - } else { - showErrorMessage(txtSomeErr); - } - - $(".loading_overlay").hide(); - }, - error: function(XMLHttpRequest, textStatus, errorThrown) { - $(".loading_overlay").hide(); - showErrorMessage(txtSomeErr); - } - }); - } else { - $(".loading_overlay").hide(); - showErrorMessage(txtSomeErr); - return false; - } - }); - - /*For reallocating rooms in the modal*/ - $("#realloc_allocated_rooms").on('click', function(e){ - $(".error_text").text(''); - var room_to_reallocate = $('#realloc_avail_rooms').val(); - var room_type_to_reallocate = $('#realloc_avail_room_type').val(); - - if (typeof room_type_to_reallocate == 'undefined' || room_type_to_reallocate == 0) { - $("#realloc_sel_rm_type_err_p").text(slct_rm_type_err); - return false; - } - if (typeof room_to_reallocate == 'undefined' || room_to_reallocate == 0) { - $("#realloc_sel_rm_err_p").text(slct_rm_err); - return false; - } - }); - - /*For swaping rooms in the modal*/ - $("#swap_allocated_rooms").on('click', function(e){ - $(".error_text").text(''); - var room_to_swap = $('#swap_avail_rooms').val(); - if (typeof room_to_swap == 'undefined' || room_to_swap == 0) { - $("#swap_sel_rm_err_p").text(slct_rm_err); - return false; - } - }); }); - -function setRoomsForReallocation(roomsAvailable) -{ - if (typeof(roomsAvailable) != 'undefined' && roomsAvailable.length) { - var roomsHtml = ''; - - $(".realloc_avail_rooms_container").empty().append(roomsHtml); - } else { - $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt); - } -} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl index 70bcd1cd3..7559ca121 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl @@ -222,7 +222,7 @@
  • {/if} - {if $orderTotalPaid|floatval} + {if $hasOrderDiscountOrPayment || $isRefundCompleted} + + {if $isRefundCompleted} + + {/if} {/if} {foreach $refundReqBookings as $booking} @@ -184,11 +188,11 @@ {/if} {/if} - {if $orderTotalPaid|floatval} + {if $hasOrderDiscountOrPayment || $isRefundCompleted} + {if $isRefundCompleted} + + {/if} {/if} {/foreach} @@ -279,7 +295,7 @@ {* Fields to submit refund information *} - {if $orderTotalPaid|floatval} + {if $hasOrderDiscountOrPayment} diff --git a/themes/hotel-reservation-theme/css/order-detail.css b/themes/hotel-reservation-theme/css/order-detail.css index c84de4477..b6119076e 100644 --- a/themes/hotel-reservation-theme/css/order-detail.css +++ b/themes/hotel-reservation-theme/css/order-detail.css @@ -277,6 +277,13 @@ border-bottom: 1px solid #E5E5E5; } +@media (min-width: 576px) { + .booking-room-detail .num-refunded-rooms { + float: right; + display: inline-block; + } +} + @media (max-width: 576px) { .room-details .card-header { flex-direction: column; @@ -287,6 +294,11 @@ margin-top: 10px; margin-left: -10px; } + + .booking-room-detail .num-refunded-rooms { + display: block; + float: none; + } } @media (min-width: 768px) and (max-width: 1200px) { @@ -321,17 +333,12 @@ top: -1px; } -.booking-room-detail .num-refunded-rooms { - position: absolute; - top: 20px; - right: 20px; -} - .booking-room-detail .num-refunded-rooms .badge { padding: 5px; font-weight: normal; font-size: 12px; border-radius: 2px; + margin-top: 5px; } .booking-room-detail .btn-view-extra-services { @@ -891,8 +898,6 @@ background-color: #F5F5F5; } #create-new-refund-popup .tab-content .room-details.cancelled .badge-cancelled { - position: absolute; - top: -4px; margin-left: 6px; padding: 5px 10px; border-radius: 31px; diff --git a/themes/hotel-reservation-theme/js/order-detail.js b/themes/hotel-reservation-theme/js/order-detail.js index 6a54f74b0..a56a5e68f 100644 --- a/themes/hotel-reservation-theme/js/order-detail.js +++ b/themes/hotel-reservation-theme/js/order-detail.js @@ -97,6 +97,42 @@ function initPriceTooltip() { } } +// initialize tooltip for +function initRefundDeniedTooltip() { + if ($('.refund-denied-info').length) { + $('.refund-denied-info').each(function () { + $(this).tooltip({ + content: $(this).data('refund_denied_info'), + items: 'i', + trigger: 'hover', + tooltipClass: 'refund-denied-tootip', + open: function (event, ui) { + if (typeof (event.originalEvent) === 'undefined') { + return false; + } + + var $id = $(ui.tooltip).attr('id'); + + // close any lingering tooltips + if ($('div.ui-tooltip').not('#' + $id).length) { + return false; + } + }, + close: function (event, ui) { + ui.tooltip.hover(function () { + $(this).stop(true).fadeTo(400, 1); + }, + function () { + $(this).fadeOut('400', function () { + $(this).remove(); + }); + }); + } + }); + }); + } +} + function initMap() { const hotelLocation = { lat: Number(hotel_location.latitude), @@ -232,6 +268,9 @@ const BookingRefundManager = { href: '#popup-cancellation-submit-success', wrapCSS: 'fancybox-order-detail feedback', padding: 0, + afterClose: function() { + location.reload(); + }, }); }, showOrderCancelSuccessMessage: function() { @@ -341,4 +380,6 @@ $(document).ready(function () { ) { initMap(); } + + initRefundDeniedTooltip(); }); diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index ad1ca8629..75654732f 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -774,15 +774,16 @@
    {foreach from=$rm_v['hotel_booking_details'] item=$hotel_booking_detail name=foreachRefundRooms} {assign var=is_room_cancelled value=(isset($refundReqBookings) && in_array($hotel_booking_detail.id_htl_booking, $refundReqBookings))} -
    +
    + ({$hotel_booking_detail.adults|string_format:'%02d'} {if $hotel_booking_detail.adults > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $hotel_booking_detail.children > 0}{l s=', '}{$hotel_booking_detail.children|string_format:'%02d'} {if $hotel_booking_detail.children > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}) - {if $hotel_booking_detail.is_refunded || $hotel_booking_detail.is_cancelled}{l s='Cancelled'}{/if} + {if $hotel_booking_detail.is_cancelled}{l s='Cancelled'}{else if $hotel_booking_detail.is_refunded}{l s='Refunded'}{else if $hotel_booking_detail.refund_denied}{l s='Refund denied'} {else if $hotel_booking_detail.id_status != $ROOM_STATUS_ALLOTED}{if $hotel_booking_detail.id_status == $ROOM_STATUS_CHECKED_OUT}{l s='Checked-Out'}{else}{l s='Checked-In'}{/if}{/if}
    diff --git a/themes/hotel-reservation-theme/order-follow.tpl b/themes/hotel-reservation-theme/order-follow.tpl index 4b0871ab0..25b7831f3 100644 --- a/themes/hotel-reservation-theme/order-follow.tpl +++ b/themes/hotel-reservation-theme/order-follow.tpl @@ -61,13 +61,7 @@ {$return.total_rooms|escape:'html':'UTF-8'}
    - {if $data.is_cancelled} - {l s='Cancelled'} - {elseif isset($data.refund_info) && $data.refund_info} - {$data.refund_info.name|escape:'html':'UTF-8'} + {if $data.id|in_array:$refundReqBookings} + {if $data.is_cancelled} + {l s='Cancelled'} + {elseif isset($data.refund_info) && (!$data.refund_info.refunded || $data.refund_info.id_customization)} + {$data.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} {else} - -- - {/if} + -- + {/if} - {if isset($data.refund_info) && $data.refund_info} + {if $data.is_refunded && isset($data.refund_info) && $data.refund_info} {convertPriceWithCurrency price=$data.refund_info.refunded_amount currency=$currency->id} {else} -- @@ -242,7 +246,7 @@ {l s='Extra Services/Fee (Tax excl.)'} {l s='Total Tax'} {l s='Total Price (Tax incl.)'}{l s='Refund/Cancel Status'} {l s='Refunded amount'} {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO} - {else} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl index 88b9e0da9..6fc9f910a 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl @@ -221,137 +221,7 @@ - - {l s='Rooms cancelation charges' mod='hotelreservationsystem'}{l s='Refund amount' mod='hotelreservationsystem'}{l s='Refund status' mod='hotelreservationsystem'}
    {if $isRefundCompleted} - {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']} + {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']} {else} {$orderCurrency['sign']|escape:'html':'UTF-8'} @@ -196,6 +200,18 @@ {/if}
    + {if $booking['is_cancelled']} + {l s='Cancelled' mod='hotelreservationsystem'} + {* used id_customization to check if in this request which bookings are refunded or not*} + {else if $booking['id_customization']} + {l s='Refunded' mod='hotelreservationsystem'} + {else} + {l s='Denied' mod='hotelreservationsystem'} + {/if} +
    - - {if $return.is_cancelled} - {l s='Cancelled'} - {else} - {$return.state_name|escape:'html':'UTF-8'} - {/if} - + {$return.state_name|escape:'html':'UTF-8'} {dateFormat date=$return.date_add full=0} diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl index 00553eabf..a288e606a 100644 --- a/themes/hotel-reservation-theme/order-opc.tpl +++ b/themes/hotel-reservation-theme/order-opc.tpl @@ -98,23 +98,23 @@
    - +
    - +
    - +
    - +
    @@ -515,4 +515,4 @@ - \ No newline at end of file + diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl index dd45651ea..fa00f6878 100644 --- a/themes/hotel-reservation-theme/order-return.tpl +++ b/themes/hotel-reservation-theme/order-return.tpl @@ -49,29 +49,40 @@
    + - {if $isRefundCompleted} + {/if} - {foreach $refundReqBookings as $booking} + {foreach from=$refundReqBookings item=$booking name=refundRequest} + - {if $isRefundCompleted} + {/if} {/foreach} @@ -83,12 +94,7 @@ {l s='Current refund state'}
    - - {if $isCanceled} - {l s='Cancelled'} - {else} - {$currentStateInfo['name']|escape:'html':'UTF-8'} - {/if} + {$currentStateInfo['name']|escape:'html':'UTF-8'}
    {l s='Rooms'} {l s='Room type'} {l s='Hotel'} {l s='Duration'}{l s='Num rooms'} {l s='Total rooms price (tax incl.)'} {l s='Extra services price (tax incl.)'}{l s='Refund amount'}{l s='Refund Status'}
    {l s='Room'} - {$smarty.foreach.refundRequest.iteration|string_format:'%02d'} {$booking['room_type_name']|escape:'htmlall':'UTF-8'} {$booking['hotel_name']|escape:'htmlall':'UTF-8'} {$booking['date_from']|date_format:"%d-%m-%Y"} {l s='To'} {$booking['date_to']|date_format:"%d-%m-%Y"}{$booking['num_rooms']|escape:'htmlall':'UTF-8'} {displayPrice price=$booking['total_price_tax_incl'] currency=$orderCurrency['id']} {displayPrice price=$booking['extra_service_total_price_tax_incl'] currency=$orderCurrency['id']} {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']} + {if $booking['is_cancelled']} + {l s='Cancelled' mod='hotelreservationsystem'} + {* used id_customization to check if in this request which bookings are refunded or not*} + {else if $booking['id_customization']} + {l s='Refunded' mod='hotelreservationsystem'} + {else} + {l s='Denied' mod='hotelreservationsystem'} + {/if} +