diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index 806e2dfa5..3be4444d5 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -105,6 +105,58 @@ class GuestTrackingControllerCore extends FrontController
}
}
+ public function displayAjaxGetRoomTypeBookingDemands()
+ {
+ $response = array('extra_demands' => false);
+
+ if (($idProduct = Tools::getValue('id_product'))
+ && ($idOrder = Tools::getValue('id_order'))
+ && ($dateFrom = Tools::getValue('date_from'))
+ && ($dateTo = Tools::getValue('date_to'))
+ ) {
+ $objHotelBookingDemands = new HotelBookingDemands();
+ $useTax = 0;
+ if (Group::getPriceDisplayMethod($this->context->customer->id_default_group) == PS_TAX_INC) {
+ $useTax = 1;
+ }
+ if ($extraDemands = $objHotelBookingDemands->getRoomTypeBookingExtraDemands(
+ $idOrder,
+ $idProduct,
+ 0,
+ $dateFrom,
+ $dateTo,
+ 1,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(array(
+ 'useTax' => $useTax,
+ 'extraDemands' => $extraDemands,
+ ));
+ }
+ $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
+ if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
+ $idOrder,
+ 0,
+ 0,
+ $idProduct,
+ $dateFrom,
+ $dateTo,
+ 0,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(array(
+ 'useTax' => $useTax,
+ 'additionalServices' => $additionalServices,
+ ));
+ }
+ $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
+ }
+
+ $this->ajaxDie(json_encode($response));
+ }
+
/**
* Assign template vars related to page content
* @see FrontController::initContent()
@@ -113,60 +165,6 @@ class GuestTrackingControllerCore extends FrontController
{
parent::initContent();
- $method = Tools::getValue('method');
- if ($method == 'getRoomTypeBookingDemands') {
- $response = array('reload' => false);
- $extraDemandsTpl = '';
- if (($idProduct = Tools::getValue('id_product'))
- && ($idOrder = Tools::getValue('id_order'))
- && ($dateFrom = Tools::getValue('date_from'))
- && ($dateTo = Tools::getValue('date_to'))
- ) {
- $objBookingDemand = new HotelBookingDemands();
- $customer = new Customer((int)$order->id_customer);
- $useTax = 0;
- if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) {
- $useTax = 1;
- }
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(
- array(
- 'useTax' => $useTax,
- 'extraDemands' => $extraDemands,
- )
- );
- }
- $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
- if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
- $idOrder,
- 0,
- 0,
- $idProduct,
- $dateFrom,
- $dateTo,
- 0,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(array(
- 'useTax' => $useTax,
- 'additionalServices' => $additionalServices,
- ));
- }
- $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
- }
- $this->ajaxDie(json_encode($response));
- }
-
/* Handle brute force attacks */
if (count($this->errors)) {
sleep(1);
@@ -207,224 +205,258 @@ class GuestTrackingControllerCore extends FrontController
$nonRequestedRooms = 0;
$anyBackOrder = 0;
- $processedProducts = array();
- $cartHotelData = array();
- }
- foreach ($order_list as &$order) {
- $idOrder = $order->id;
- /** @var Order $order */
- $order->id_order_state = (int)$order->getCurrentState();
- $order->invoice = (OrderState::invoiceAvailable((int)$order->id_order_state) && $order->invoice_number);
- $order->order_history = $order->getHistory((int)$this->context->language->id, false, true);
- $order->carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang);
- $order->address_invoice = new Address((int)$order->id_address_invoice);
- $order->address_delivery = new Address((int)$order->id_address_delivery);
- $order->inv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_invoice->id_country);
- $order->dlv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_delivery->id_country);
- $order->invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_invoice, $order->inv_adr_fields);
- $order->deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_delivery, $order->dlv_adr_fields);
- $order->currency = new Currency($order->id_currency);
- $order->discounts = $order->getCartRules();
- $order->invoiceState = (Validate::isLoadedObject($order->address_invoice) && $order->address_invoice->id_state) ? new State((int)$order->address_invoice->id_state) : false;
- $order->deliveryState = (Validate::isLoadedObject($order->address_delivery) && $order->address_delivery->id_state) ? new State((int)$order->address_delivery->id_state) : false;
- $order->products = $order->getProducts();
- $order->customizedDatas = Product::getAllCustomizedDatas((int)$order->id_cart);
- Product::addCustomizationPrice($order->products, $order->customizedDatas);
- $order->total_old = $order->total_discounts > 0 ? (float)$order->total_paid - (float)$order->total_discounts : false;
+ foreach ($order_list as &$order) {
+ $idOrder = $order->id;
- if ($order->carrier->url && $order->shipping_number) {
- $order->followup = str_replace('@', $order->shipping_number, $order->carrier->url);
- }
- $order->hook_orderdetaildisplayed = Hook::exec('displayOrderDetail', array('order' => $order));
+ $processedProducts = array();
+ $cartHotelData = array();
- // enter the details of the booking the order
- if ($hotelresInstalled) {
- if ($orderProducts = $order->getProducts()) {
- $total_demands_price_te = 0;
- $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;
- }
- if ($type_value['is_booking_product']) {
- $processedProducts[] = $type_value['product_id'];
+ $order->id_order_state = (int)$order->getCurrentState();
+ $order->invoice = (OrderState::invoiceAvailable((int)$order->id_order_state) && $order->invoice_number);
+ $order->order_history = $order->getHistory((int)$this->context->language->id, false, true);
+ $order->carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang);
+ $order->address_invoice = new Address((int)$order->id_address_invoice);
+ $order->address_delivery = new Address((int)$order->id_address_delivery);
+ $order->inv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_invoice->id_country);
+ $order->dlv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_delivery->id_country);
+ $order->invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_invoice, $order->inv_adr_fields);
+ $order->deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_delivery, $order->dlv_adr_fields);
+ $order->currency = new Currency($order->id_currency);
+ $order->discounts = $order->getCartRules();
+ $order->invoiceState = (Validate::isLoadedObject($order->address_invoice) && $order->address_invoice->id_state) ? new State((int)$order->address_invoice->id_state) : false;
+ $order->deliveryState = (Validate::isLoadedObject($order->address_delivery) && $order->address_delivery->id_state) ? new State((int)$order->address_delivery->id_state) : false;
+ $order->products = $order->getProducts();
+ $order->customizedDatas = Product::getAllCustomizedDatas((int)$order->id_cart);
+ Product::addCustomizationPrice($order->products, $order->customizedDatas);
+ $order->total_old = $order->total_discounts > 0 ? (float)$order->total_paid - (float)$order->total_discounts : false;
- $product = new Product($type_value['product_id'], false, $this->context->language->id);
- $cover_image_arr = $product->getCover($type_value['product_id']);
+ if ($order->carrier->url && $order->shipping_number) {
+ $order->followup = str_replace('@', $order->shipping_number, $order->carrier->url);
+ }
+ $order->hook_orderdetaildisplayed = Hook::exec('displayOrderDetail', array('order' => $order));
- if (!empty($cover_image_arr)) {
- $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default');
- } else {
- $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default');
+ // enter the details of the booking the order
+ if ($hotelresInstalled) {
+ if ($orderProducts = $order->getProducts()) {
+ $total_demands_price_te = 0;
+ $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;
}
+ if ($type_value['is_booking_product']) {
+ $processedProducts[] = $type_value['product_id'];
- 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;
+ $product = new Product($type_value['product_id'], false, $this->context->language->id);
+ $cover_image_arr = $product->getCover($type_value['product_id']);
-
- $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;
- }
+ if (!empty($cover_image_arr)) {
+ $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default');
} 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'];
+ $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default');
+ }
- $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 (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]['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;
+
+ $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]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
+ $idOrder,
+ $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;
}
- 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]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
+ $idOrder,
+ $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(
+ $idOrder,
+ $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(
+ $idOrder,
+ 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(
+ $idOrder,
+ 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(
+ $idOrder,
+ 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(
+ $idOrder,
+ 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(
+ $idOrder,
+ 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
+ );
}
-
- $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]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $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(
- $idOrder,
- $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(
- $idOrder,
- $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(
- $idOrder,
- 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(
- $idOrder,
- 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(
- $idOrder,
- 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;
@@ -458,121 +490,92 @@ class GuestTrackingControllerCore extends FrontController
1,
Product::PRICE_ADDITION_TYPE_WITH_ROOM
);
- }
- // 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(
- $idOrder,
- 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(
- $idOrder,
- 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);
+ // 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(
- $idOrder,
- $type_value['product_id'],
- 0,
- 0,
- 0,
- 0,
- 0,
- 1,
- 1,
- 1
- );
- $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
- $idOrder,
- $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');
+ $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(
+ $idOrder,
+ $type_value['product_id'],
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1
+ );
+ $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
+ $idOrder,
+ $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;
}
- $cartServiceProducts[] = $type_value;
}
}
}
}
+ // end booking details entries
+ $redirectTermsLink = $this->context->link->getCMSLink(
+ new CMS(3, $this->context->language->id),
+ null, $this->context->language->id
+ );
+
+ $customerGuestDetail = false;
+ if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) {
+ $customerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail);
+ }
+
+ $idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id);
+ $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id);
+ $hotelAddressInfo = HotelBranchInformation::getAddress($idHotel);
+
+ // set order specific values
+ $order->total_convenience_fee_ti = $total_convenience_fee_ti;
+ $order->total_convenience_fee_te = $total_convenience_fee_te;
+ $order->total_demands_price_ti = $total_demands_price_ti;
+ $order->total_demands_price_te = $total_demands_price_te;
+ $order->any_back_order = $anyBackOrder;
+ $order->shw_bo_msg = Configuration::get('WK_SHOW_MSG_ON_BO');
+ $order->back_ord_msg = Configuration::get('WK_BO_MESSAGE');
+ $order->order_has_invoice = $order->hasInvoice();
+ $order->cart_htl_data = $cartHotelData;
+ $order->non_requested_rooms = $nonRequestedRooms;
+ $order->customerGuestDetail = $customerGuestDetail;
+ $order->obj_hotel_branch_information = $objHotelBranchInformation;
+ $order->hotel_address_info = $hotelAddressInfo;
+ //end
+
+ Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order));
+
}
- // end booking details entries
- $redirectTermsLink = $this->context->link->getCMSLink(
- new CMS(3, $this->context->language->id),
- null, $this->context->language->id
- );
-
- $customerGuestDetail = false;
- if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) {
- $customerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail);
- }
-
- $this->context->smarty->assign(
- array(
- '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,
- 'non_requested_rooms' => $nonRequestedRooms,
- 'customerGuestDetail' => $customerGuestDetail,
- )
- );
- //end
-
- Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order));
}
$this->context->smarty->assign(array(
@@ -599,9 +602,48 @@ class GuestTrackingControllerCore extends FrontController
)
);
- $this->addJS(_THEME_JS_DIR_.'history.js');
- $this->addCSS(_THEME_CSS_DIR_.'history.css');
- $this->addCSS(_THEME_CSS_DIR_.'addresses.css');
+ if (Tools::getValue('ajax') != 'true') {
+ $this->addCSS(_THEME_CSS_DIR_.'order-detail.css');
+
+ $this->addJS(array(
+ _THEME_JS_DIR_.'order-detail.js',
+ _THEME_JS_DIR_.'tools.js',
+ ));
+
+ $this->addJqueryPlugin(array('fancybox', 'scrollTo', 'footable', 'footable-sort'));
+ $this->addJqueryUI(array('ui.tooltip'), 'base', true);
+
+ // load Google Maps library if configured
+ if (!count($this->errors)) {
+ $ordersCollection = Order::getByReference(Tools::getValue('order_reference'));
+ if ($objOrder = $ordersCollection->getFirst()) {
+ if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($objOrder->id)) {
+ $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id);
+ if (Validate::isLoadedObject($objHotelBranchInformation)) {
+ if ($apiKey = Configuration::get('PS_API_KEY')) {
+ if (floatval($objHotelBranchInformation->latitude) != 0
+ && floatval($objHotelBranchInformation->longitude) != 0
+ ) {
+ Media::addJsDef(array(
+ 'hotel_location' => array(
+ 'latitude' => $objHotelBranchInformation->latitude,
+ 'longitude' => $objHotelBranchInformation->longitude,
+ 'map_input_text' => $objHotelBranchInformation->map_input_text,
+ ),
+ 'hotel_name' => $objHotelBranchInformation->hotel_name,
+ ));
+
+ $this->addJS(
+ 'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places&language='.
+ $this->context->language->iso_code.'®ion='.$this->context->country->iso_code
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
protected function processAddressFormat(Address $delivery, Address $invoice)
diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php
index e3a8210e4..25b33a378 100644
--- a/controllers/front/HistoryController.php
+++ b/controllers/front/HistoryController.php
@@ -36,15 +36,9 @@ class HistoryControllerCore extends FrontController
parent::setMedia();
$this->addCSS(array(
_THEME_CSS_DIR_.'history.css',
- _THEME_CSS_DIR_.'addresses.css'
));
- $this->addJS(array(
- _THEME_JS_DIR_.'history.js',
- _THEME_JS_DIR_.'tools.js' // retro compat themes 1.5
- ));
- $this->addJqueryPlugin(array('fancybox')); //fancybox not found for some client theme
- $this->addJqueryPlugin(array('scrollTo', 'footable', 'footable-sort'));
- $this->addJqueryUI('ui.tooltip', 'base', true);
+
+ $this->addJqueryPlugin(array('footable', 'footable-sort'));
}
/**
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 196091216..ae9e501bb 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -43,249 +43,19 @@ class OrderDetailControllerCore extends FrontController
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
}
- /**
- * Start forms process
- * @see FrontController::postProcess()
- */
- public function postProcess()
- {
- if (Tools::isSubmit('submitMessage')) {
- $idOrder = (int)Tools::getValue('id_order');
- $msgText = Tools::getValue('msgText');
-
- if (!$idOrder || !Validate::isUnsignedId($idOrder)) {
- $this->errors[] = Tools::displayError('The order is no longer valid.');
- } elseif (empty($msgText)) {
- $this->errors[] = Tools::displayError('The message cannot be blank.');
- } elseif (!Validate::isMessage($msgText)) {
- $this->errors[] = Tools::displayError('This message is invalid (HTML is not allowed).');
- }
- if (!count($this->errors)) {
- $order = new Order($idOrder);
- if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) {
- //check if a thread already exist
- $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($this->context->customer->email, $order->id);
- $id_product = (int)Tools::getValue('id_product');
- $cm = new CustomerMessage();
- if (!$id_customer_thread) {
- $ct = new CustomerThread();
- $ct->id_contact = 0;
- $ct->id_customer = (int)$order->id_customer;
- $ct->id_shop = (int)$this->context->shop->id;
- if ($id_product && $order->orderContainProduct($id_product)) {
- $ct->id_product = $id_product;
- }
- $ct->id_order = (int)$order->id;
- $ct->id_lang = (int)$this->context->language->id;
- $ct->email = $this->context->customer->email;
- $ct->status = 'open';
- $ct->token = Tools::passwdGen(12);
- $ct->add();
- } else {
- $ct = new CustomerThread((int)$id_customer_thread);
- $ct->status = 'open';
- $ct->update();
- }
-
- $cm->id_customer_thread = $ct->id;
- $cm->message = $msgText;
- $cm->ip_address = (int)ip2long($_SERVER['REMOTE_ADDR']);
- $cm->add();
-
- if (!Configuration::get('PS_MAIL_EMAIL_MESSAGE')) {
- $to = strval(Configuration::get('PS_SHOP_EMAIL'));
- } else {
- $to = new Contact((int)Configuration::get('PS_MAIL_EMAIL_MESSAGE'));
- $to = strval($to->email);
- }
- $toName = strval(Configuration::get('PS_SHOP_NAME'));
- $customer = $this->context->customer;
-
- $product = new Product($id_product);
- $product_name = '';
- if (Validate::isLoadedObject($product) && isset($product->name[(int)$this->context->language->id])) {
- $product_name = $product->name[(int)$this->context->language->id];
- }
-
- if (Validate::isLoadedObject($customer)) {
- Mail::Send(
- $this->context->language->id,
- 'order_customer_comment',
- Mail::l('Message from a customer'),
- array(
- '{lastname}' => $customer->lastname,
- '{firstname}' => $customer->firstname,
- '{email}' => $customer->email,
- '{id_order}' => (int)$order->id,
- '{order_name}' => $order->getUniqReference(),
- '{message}' => Tools::nl2br($msgText),
- '{product_name}' => $product_name
- ),
- $to,
- $toName,
- strval(Configuration::get('PS_SHOP_EMAIL')),
- $customer->firstname.' '.$customer->lastname,
- null,
- null,
- _PS_MAIL_DIR_,
- false,
- null,
- null,
- $customer->email
- );
- }
-
- if (Tools::getValue('ajax') != 'true') {
- Tools::redirect('index.php?controller=order-detail&id_order='.(int)$idOrder);
- }
-
- $this->context->smarty->assign('message_confirmation', true);
- } else {
- $this->errors[] = Tools::displayError('Order not found');
- }
- }
- }
- }
-
- public function displayAjax()
- {
- $this->display();
- }
-
/**
* Assign template vars related to page content
* @see FrontController::initContent()
*/
public function initContent()
{
+ $this->show_breadcrump = true;
+
parent::initContent();
if (!($id_order = (int) Tools::getValue('id_order')) || !Validate::isUnsignedId($id_order)) {
- $this->errors[] = Tools::displayError('Order ID required');
+ Tools::redirect($this->context->link->getPageLink('history'));
} else {
$order = new Order($id_order);
- if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) {
- // Here handle request from the ajax on order details page i.e refund, additional qty etc
- $method = Tools::getValue('method');
- // extra demands popup ajax
- if ($method == 'getRoomTypeBookingDemands') {
- $response = array('reload' => false);
- if (($idProduct = Tools::getValue('id_product'))
- && ($idOrder = Tools::getValue('id_order'))
- && ($dateFrom = Tools::getValue('date_from'))
- && ($dateTo = Tools::getValue('date_to'))
- ) {
- $objBookingDemand = new HotelBookingDemands();
- $useTax = 0;
- $customer = Context::getContext()->customer;
- if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) {
- $useTax = 1;
- }
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(
- array(
- 'useTax' => $useTax,
- 'extraDemands' => $extraDemands,
- )
- );
- }
- $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
- if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
- $idOrder,
- 0,
- 0,
- $idProduct,
- $dateFrom,
- $dateTo,
- 0,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(array(
- 'useTax' => $useTax,
- 'additionalServices' => $additionalServices,
- ));
- }
- $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
- }
-
- die(json_encode($response));
- } elseif ($method == 'submitRefundRequest') { // room cancellation ajax
- $hasError = 0;
- if (!$refundReason = Tools::getValue('cancellation_reason')) {
- $hasError = 1;
- } elseif (!Validate::isCleanHtml($refundReason)) {
- $hasError = 1;
- }
- if ($bookingRefunds = Tools::getValue('bookings_to_refund')) {
- if (!count($bookingRefunds = json_decode($bookingRefunds, true))) {
- $hasError = 1;
- } else {
- foreach ($bookingRefunds as $idHtlBooking) {
- $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking);
- if ($objHotelBookingDetail->id_customer != $order->id_customer
- || OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)
- ) {
- $hasError = 1;
- break;
- }
- }
- }
- } else {
- $hasError = 1;
- }
- $res = true;
- if (!$hasError) {
- if ((int)$order->total_paid_real == 0){
- foreach ($bookingRefunds as $idHtlBooking) {
- $objHtlBooking = new HotelBookingDetail($idHtlBooking);
- $objHtlBooking->save();
- }
- }
-
- $objOrderReturn = new OrderReturn();
- $objOrderReturn->id_customer = $order->id_customer;
- $objOrderReturn->id_order = $order->id;
- $objOrderReturn->state = 0;
- $objOrderReturn->by_admin = 0;
- $objOrderReturn->question = $refundReason;
- $objOrderReturn->save();
- if ($objOrderReturn->id) {
- foreach ($bookingRefunds as $idHtlBooking) {
- $objHtlBooking = new HotelBookingDetail($idHtlBooking);
- $numDays = $objHtlBooking->getNumberOfDays(
- $objHtlBooking->date_from,
- $objHtlBooking->date_to
- );
-
- $objOrderReturnDetail = new OrderReturnDetail();
- $objOrderReturnDetail->id_order_return = $objOrderReturn->id;
- $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail;
- $objOrderReturnDetail->product_quantity = $numDays;
- $objOrderReturnDetail->id_htl_booking = $idHtlBooking;
- $objOrderReturnDetail->save();
- }
- }
- // Emails to customer, admin on refund request state change
- $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING'));
-
- die(json_encode(array('status' => 1)));
- }
- die(json_encode(array('status' => 0)));
- }
- } else {
- die(json_encode(array('status' => 0)));
- }
- // END ajax request handle
-
if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) {
$id_order_state = (int)$order->getCurrentState();
$carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang);
@@ -343,9 +113,9 @@ class OrderDetailControllerCore extends FrontController
$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'], 'small_default');
+ $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', 'small_default');
+ $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default');
}
if (isset($customer->id)) {
@@ -426,9 +196,18 @@ class OrderDetailControllerCore extends FrontController
}
}
+ $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,
@@ -604,6 +383,9 @@ class OrderDetailControllerCore extends FrontController
$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);
$this->context->smarty->assign(
array(
'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'),
@@ -619,6 +401,8 @@ class OrderDetailControllerCore extends FrontController
'cart_htl_data' => $cartHotelData,
'cart_service_products' => $cartServiceProducts,
'non_requested_rooms' => $nonRequestedRooms,
+ 'obj_hotel_branch_information' => $objHotelBranchInformation,
+ 'hotel_address_info' => $hotelAddressInfo,
)
);
// }
@@ -628,6 +412,7 @@ class OrderDetailControllerCore extends FrontController
if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1)) {
$refundedAmount = $objOrderReturn->getRefundedAmount($order->id);
}
+
$this->context->smarty->assign(
array(
'hasOrderPaid' => $order->hasBeenPaid(),
@@ -685,12 +470,292 @@ class OrderDetailControllerCore extends FrontController
$this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl');
}
+ public function displayAjaxGetRoomTypeBookingDemands()
+ {
+ $response = array('extra_demands' => false);
+
+ if (($idProduct = Tools::getValue('id_product'))
+ && ($idOrder = Tools::getValue('id_order'))
+ && ($dateFrom = Tools::getValue('date_from'))
+ && ($dateTo = Tools::getValue('date_to'))
+ ) {
+ $objHotelBookingDemands = new HotelBookingDemands();
+ $useTax = 0;
+ if (Group::getPriceDisplayMethod($this->context->customer->id_default_group) == PS_TAX_INC) {
+ $useTax = 1;
+ }
+ if ($extraDemands = $objHotelBookingDemands->getRoomTypeBookingExtraDemands(
+ $idOrder,
+ $idProduct,
+ 0,
+ $dateFrom,
+ $dateTo,
+ 1,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(array(
+ 'useTax' => $useTax,
+ 'extraDemands' => $extraDemands,
+ ));
+ }
+ $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
+ if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
+ $idOrder,
+ 0,
+ 0,
+ $idProduct,
+ $dateFrom,
+ $dateTo,
+ 0,
+ 0,
+ $useTax
+ )) {
+ $this->context->smarty->assign(array(
+ 'useTax' => $useTax,
+ 'additionalServices' => $additionalServices,
+ ));
+ }
+ $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl');
+ }
+
+ $this->ajaxDie(json_encode($response));
+ }
+
+ public function displayAjaxSubmitRefundRequest()
+ {
+ $response = array('has_errors' => false);
+
+ $idOrder = Tools::getValue('id_order');
+ $idsHtlBooking = Tools::getValue('bookings_to_refund');
+ $cancellationReason = trim(Tools::getValue('cancellation_reason'));
+
+ if (!$idsHtlBooking) {
+ $this->errors[] = Tools::displayError('Please select at least on room for cancellation.');
+ }
+
+ if (!$cancellationReason) {
+ $this->errors[] = Tools::displayError('Please mention a reason for cancellation.');
+ } elseif ($cancellationReason && !Validate::isCleanHtml($cancellationReason)) {
+ $this->errors[] = Tools::displayError('Reason of cancellation is invalid. Please enter valid data.');
+ }
+
+ if (!count($this->errors)) {
+ $objOrder = new Order($idOrder);
+ if (!(Validate::isLoadedObject($objOrder) && $objOrder->id_customer == $this->context->customer->id)) {
+ $this->errors[] = Tools::displayError('Something went wrong. Please try later.');
+ } elseif ($idsHtlBooking) {
+ foreach ($idsHtlBooking as $idHtlBooking) {
+ $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking);
+ if ($objHotelBookingDetail->id_customer != $objOrder->id_customer) {
+ $this->errors[] = Tools::displayError('Something went wrong. Please try later.');
+ break;
+ }
+
+ if (OrderReturn::getOrdersReturnDetail($objOrder->id, 0, $idHtlBooking)) {
+ $this->errors[] = Tools::displayError('Some selected rooms have already been requested for cancellation.');
+ break;
+ }
+ }
+ }
+
+ if (!count($this->errors)) {
+ if ((int) $objOrder->total_paid_real == 0) {
+ foreach ($idsHtlBooking as $idHtlBooking) {
+ $objHtlBooking = new HotelBookingDetail($idHtlBooking);
+ $objHtlBooking->save();
+ }
+ }
+
+ $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
+ );
+
+ $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'));
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->context->smarty->assign(array('errors' => $this->errors));
+ $response['errors_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'errors.tpl');
+ }
+
+ $response['has_errors'] = (bool) count($this->errors);
+
+ $this->ajaxDie(json_encode($response));
+ }
+
+ public function displayAjaxSubmitMessage()
+ {
+ $response = array('status' => false);
+
+ $idOrder = (int) Tools::getValue('id_order');
+ $msgText = Tools::getValue('msgText');
+
+ if (!$idOrder || !Validate::isUnsignedId($idOrder)) {
+ $this->errors[] = Tools::displayError('The order is no longer valid.');
+ } elseif (empty($msgText)) {
+ $this->errors[] = Tools::displayError('The message cannot be blank.');
+ } elseif (!Validate::isMessage($msgText)) {
+ $this->errors[] = Tools::displayError('This message is invalid (HTML is not allowed).');
+ }
+ if (!count($this->errors)) {
+ $order = new Order($idOrder);
+ if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) {
+ //check if a thread already exist
+ $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($this->context->customer->email, $order->id);
+ $id_product = (int)Tools::getValue('id_product');
+ $cm = new CustomerMessage();
+ if (!$id_customer_thread) {
+ $ct = new CustomerThread();
+ $ct->id_contact = 0;
+ $ct->id_customer = (int)$order->id_customer;
+ $ct->id_shop = (int)$this->context->shop->id;
+ if ($id_product && $order->orderContainProduct($id_product)) {
+ $ct->id_product = $id_product;
+ }
+ $ct->id_order = (int)$order->id;
+ $ct->id_lang = (int)$this->context->language->id;
+ $ct->email = $this->context->customer->email;
+ $ct->status = 'open';
+ $ct->token = Tools::passwdGen(12);
+ $ct->add();
+ } else {
+ $ct = new CustomerThread((int)$id_customer_thread);
+ $ct->status = 'open';
+ $ct->update();
+ }
+
+ $cm->id_customer_thread = $ct->id;
+ $cm->message = $msgText;
+ $cm->ip_address = (int)ip2long($_SERVER['REMOTE_ADDR']);
+ $cm->add();
+
+ if (!Configuration::get('PS_MAIL_EMAIL_MESSAGE')) {
+ $to = strval(Configuration::get('PS_SHOP_EMAIL'));
+ } else {
+ $to = new Contact((int)Configuration::get('PS_MAIL_EMAIL_MESSAGE'));
+ $to = strval($to->email);
+ }
+ $toName = strval(Configuration::get('PS_SHOP_NAME'));
+ $customer = $this->context->customer;
+
+ $product = new Product($id_product);
+ $product_name = '';
+ if (Validate::isLoadedObject($product) && isset($product->name[(int)$this->context->language->id])) {
+ $product_name = $product->name[(int)$this->context->language->id];
+ }
+
+ if (Validate::isLoadedObject($customer)) {
+ Mail::Send(
+ $this->context->language->id,
+ 'order_customer_comment',
+ Mail::l('Message from a customer'),
+ array(
+ '{lastname}' => $customer->lastname,
+ '{firstname}' => $customer->firstname,
+ '{email}' => $customer->email,
+ '{id_order}' => (int)$order->id,
+ '{order_name}' => $order->getUniqReference(),
+ '{message}' => Tools::nl2br($msgText),
+ '{product_name}' => $product_name
+ ),
+ $to,
+ $toName,
+ strval(Configuration::get('PS_SHOP_EMAIL')),
+ $customer->firstname.' '.$customer->lastname,
+ null,
+ null,
+ _PS_MAIL_DIR_,
+ false,
+ null,
+ null,
+ $customer->email
+ );
+ }
+
+ // send message html in json
+ $response['status'] = true;
+
+ $message = CustomerMessage::getMessagesByOrderId($order->id, false)[0];
+ $this->context->smarty->assign(array('message' => $message));
+ $response['message_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/booking-message.tpl');
+ } else {
+ $this->errors[] = Tools::displayError('Order not found');
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->context->smarty->assign(array('errors' => $this->errors));
+ $response['errors_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'errors.tpl');
+ }
+
+ $response['has_errors'] = (bool) count($this->errors);
+
+ $this->ajaxDie(json_encode($response));
+ }
+
public function setMedia()
{
if (Tools::getValue('ajax') != 'true') {
parent::setMedia();
- $this->addCSS(_THEME_CSS_DIR_.'history.css');
- $this->addCSS(_THEME_CSS_DIR_.'addresses.css');
+
+ $this->addCSS(_THEME_CSS_DIR_.'order-detail.css');
+
+ $this->addJS(array(
+ _THEME_JS_DIR_.'order-detail.js',
+ _THEME_JS_DIR_.'tools.js',
+ ));
+
+ $this->addJqueryPlugin(array('fancybox', 'scrollTo', 'footable', 'footable-sort'));
+ $this->addJqueryUI(array('ui.tooltip'), 'base', true);
+
+ // load Google Maps library if configured
+ if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder(Tools::getValue('id_order'))) {
+ $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id);
+ if (Validate::isLoadedObject($objHotelBranchInformation)) {
+ if ($apiKey = Configuration::get('PS_API_KEY')) {
+ if (floatval($objHotelBranchInformation->latitude) != 0
+ && floatval($objHotelBranchInformation->longitude) != 0
+ ) {
+ Media::addJsDef(array(
+ 'hotel_location' => array(
+ 'latitude' => $objHotelBranchInformation->latitude,
+ 'longitude' => $objHotelBranchInformation->longitude,
+ 'map_input_text' => $objHotelBranchInformation->map_input_text,
+ ),
+ 'hotel_name' => $objHotelBranchInformation->hotel_name,
+ ));
+
+ $this->addJS(
+ 'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places&language='.
+ $this->context->language->iso_code.'®ion='.$this->context->country->iso_code
+ );
+ }
+ }
+ }
+ }
}
}
-}
\ No newline at end of file
+}
diff --git a/install/data/xml/meta.xml b/install/data/xml/meta.xml
index 21ea7b2b4..31a7f1df6 100644
--- a/install/data/xml/meta.xml
+++ b/install/data/xml/meta.xml
@@ -68,6 +68,10 @@
');
+ $('.previews-wrap').append('
×');
};
reader.readAsDataURL(file);
},
@@ -249,10 +249,6 @@ $(document).on('change', 'input.input-images', function(e) {
});
$(document).ready(function () {
- if (typeof qlo_hotel_review_js_vars === 'object' && qlo_hotel_review_js_vars.id_order) {
- showOrder(1, qlo_hotel_review_js_vars.id_order, qlo_hotel_review_js_vars.link);
- }
-
// init raty
if (typeof qlo_hotel_review_js_vars === 'object' && qlo_hotel_review_js_vars.raty_img_path) {
initRaty(qlo_hotel_review_js_vars.raty_img_path);
diff --git a/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl b/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl
index 4ebab583d..f916172a5 100644
--- a/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl
+++ b/modules/qlohotelreview/views/templates/hook/add-review-popup.tpl
@@ -18,98 +18,103 @@
*}