diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index 3bb29c765..1ceb61c62 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -17,7 +17,9 @@ * @license https://store.webkul.com/license.html *} +{if !isset($ajax) || !$ajax}
+{/if}
{l s='Cart Details'} @@ -51,7 +53,7 @@

{$data.room_type|escape:'html':'UTF-8'}

- {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} + {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} {dateFormat date=$data.date_from full=$is_full_date} - {dateFormat date=$data.date_to full=$is_full_date} {if $occupancy_required_for_booking} @@ -187,6 +189,7 @@
+{if !isset($ajax) || !$ajax} {* Modal for extra demands *} @@ -229,3 +232,4 @@ #rooms_extra_demands .room_demand_detail { padding: 15px 15px 0px 15px;} +{/if} diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 2ce84593f..0954044c1 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -612,10 +612,24 @@ class AdminCartsControllerCore extends AdminController $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id); - $cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart); + + if ($cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart)) { + $objRoomType = new HotelRoomType(); + foreach ($cart_detail_data as $key => $cart_data) { + + $cart_detail_data[$key]['room_type_info'] = $objRoomType->getRoomTypeInfoByIdProduct($cart_data['id_product']); + } + } + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + $this->context->smarty->assign(array( 'cart_detail_data' => $cart_detail_data, 'currency' => new Currency((int)$this->context->cart->id_currency), + 'occupancy_required_for_booking' => $occupancyRequiredForBooking, + 'ajax' => true )); $tpl_path = 'default/template/controllers/orders/_current_cart_details_data.tpl';