diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss index 271ae468f..75c8d0700 100644 --- a/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss +++ b/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss @@ -50,6 +50,14 @@ } } +// buttons text align +.btn-left { + text-align: left; +} +.btn-right { + text-align: right; +} + // Alternate buttons // -------------------------------------------------- @@ -140,8 +148,6 @@ .btn-block { display: block; width: 100%; - padding-left: 0; - padding-right: 0; } // Vertically space out multiple block buttons 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 b4159912d..35a13e9ac 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 @@ -23,7 +23,7 @@ {l s='Cart Details'}
-
+
@@ -31,6 +31,9 @@ + {if $occupancy_required_for_booking} + + {/if} @@ -42,7 +45,7 @@ {if isset($cart_detail_data) && $cart_detail_data} {assign var=curr_id value=$cart->id_currency|intval} {foreach from=$cart_detail_data item=data} - + + {if $occupancy_required_for_booking} + + {/if} - - {*{if ($order->hasBeenPaid())}{/if} {if $display_warehouse}{/if} {if ($order->hasBeenDelivered())}{/if} *} - + + {if isset($refundReqBookings) && $refundReqBookings} @@ -1149,9 +1208,14 @@ {if $refund_allowed && !$hasCompletelyRefunded} - +
+ + +
{/if} {/if} @@ -1521,6 +1585,21 @@ {addJsDefL name=txtSomeErr}{l s='Some error occurred. Please try again.' js=1}{/addJsDefL} {addJsDefL name=txtDeleteSucc}{l s='Deleted successfully' js=1}{/addJsDefL} {addJsDefL name=txtInvalidDemandVal}{l s='Invalid demand value found' js=1}{/addJsDefL} + {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL} + {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL} + {addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL} + {addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL} + {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL} + {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL} + {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL} + {addJsDefL name='child_txt'}{l s='Child' js=1}{/addJsDefL} + {addJsDefL name='children_txt'}{l s='Children' js=1}{/addJsDefL} + {addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL} + {addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='all_children_txt'}{l s='All Children' js=1}{/addJsDefL} + {addJsDefL name='invalid_occupancy_txt'}{l s='Invalid occupancy(adults/children) found.' js=1}{/addJsDefL} + {addJsDef max_child_age=$max_child_age|escape:'quotes':'UTF-8'} + {addJsDef max_child_in_room=$max_child_in_room|escape:'quotes':'UTF-8'} {/strip} {* Apply javascript for the page *} diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl new file mode 100644 index 000000000..184db5f77 --- /dev/null +++ b/admin/themes/default/template/controllers/products/additionalfacilities.tpl @@ -0,0 +1,115 @@ +{** + * 2010-2022 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + + {if isset($product->id) && $product->id} + +
+
+ {l s='Room Type Additional Facilities'} +
+
+ {l s='To create new Additiona facilities '} {l s='click here.'} +
+ {if isset($allDemands) && $allDemands} +
+ {foreach $allDemands as $key => $demand} +
+ + + {$demand['name']|escape:'html':'UTF-8'} + +
+ {if isset($demand['adv_option']) && count($demand['adv_option'])} + + {else} +
+ +
+
+ {$defaultcurrencySign|escape:'html':'UTF-8'} + +
+
+
+ {/if} + {if isset($demand['adv_option']) && $demand['adv_option']} +
+ +
+
+
{l s='Room Image'} {l s='Room Type'} {l s='Duration'}{l s='Occupancy'}{l s='Unit Price (tax excl)'} {l s='Additinal Facilities (tax excl)'} {l s='Total Rooms Price (tax excl)'}
{$data.room_num|escape:'html':'UTF-8'} @@ -58,13 +61,71 @@ {/if} {dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} +
+ +
+
+ + + +
+
{l s='Room - 1'}
+
+
+
+ + +
+
+
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+
+
+
+ +
+
+ {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

+ +

+ {/foreach} + {/if} +
+
+
+
+
+
+
+
+ 		{if $data.feature_price_diff != 0} {assign var=shown_room_type_price value=$data.feature_price_tax_excl} {else} {assign var=shown_room_type_price value=$data.product_price_tax_excl} {/if} - + {if isset($data.extra_demands) && $data.extra_demands} diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl index e67cc63ff..141e9e68b 100644 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin/themes/default/template/controllers/orders/_new_product.tpl @@ -64,7 +64,7 @@ + {if $order->with_occupancy && $data['children']} +
+ +
+ + {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

+ {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} +

+ {/foreach} + {/if} +
+
+ {else} + {if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} + {/if} + {if $order->with_occupancy} + + {else} + + {/if} 		diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index 28280d9ba..48cd3737c 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -241,12 +241,13 @@ e.preventDefault(); var cart_row = $(this).closest('tr'); var params = { - id_booking_data: parseInt($(this).attr('data-id-booking-data')), - id_product: parseInt($(this).attr('data-id-product')), - id_room: parseInt($(this).attr('data-id-room')), - date_from: $(this).attr('data-date-from'), - date_to: $(this).attr('data-date-to'), - price: $(this).val(), + id_booking_data: parseInt($(cart_row).attr('data-id-booking-data')), + id_product: parseInt($(cart_row).attr('data-id-product')), + id_room: parseInt($(cart_row).attr('data-id-room')), + date_from: $(cart_row).attr('data-date-from'), + date_to: $(cart_row).attr('data-date-to'), + price: new Number($(this).val().replace(",",".")).toFixed(4).toString(), + id_cart: id_cart }; updateProductPrice(params, cart_row); }) @@ -272,6 +273,7 @@ } }); }); + resetBind(); $('#customer').focus(); @@ -332,6 +334,205 @@ $('#search-customer-form-group').show(); $(this).blur(); }); + + {literal} + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + if ($(this).hasClass('num_children')) { + var totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + if (totalChilds < max_child_in_room) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + + + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + + var childAgeSelect = '

'; + childAgeSelect += ''; + childAgeSelect += '

'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + + $(document).on('click', '.booking_guest_occupancy', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + let hasErrors = 0; + + let adults = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adults.length || (adults.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adults and children + adults.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } + } + } + }); + + $(document).on('QloApps:updateRoomOccupancy', function (e, occupancy_wrapper) { + e.preventDefault(); + let cart_row = $(occupancy_wrapper).closest('tr'); + let occupancy = getBookingOccupancyDetails(cart_row); + let params = { + id_cart: id_cart, + id_booking_data: parseInt($(cart_row).attr('data-id-booking-data')), + occupancy : occupancy.shift(), + }; + updateRoomOccupancy(params, cart_row); + }); + + function getBookingOccupancyDetails(bookingform) + { + let occupancy = []; + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + } + } + occupancy.push({ + 'adults': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + } + + return occupancy; + } + + function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) + { + var adults = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adults += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adults) + ' '; + if (parseInt(adults) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + // if (parseInt(rooms) > 1) { + // guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + // } else { + // guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; + // } + // console.log($(booking_occupancy_wrapper).siblings('.booking_guest_occupancy > span')); + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); + } + {/literal} }); function resetBind() @@ -389,12 +590,8 @@ }); } - function updateProductPrice(params, cart_row) { - $.extend(params, { - id_cart: id_cart, - price: new Number(params.price.replace(",",".")).toFixed(4).toString(), - }); - + function updateProductPrice(params, cart_row) + { $.ajax({ type:"POST", url: "{$link->getAdminLink('AdminCarts')|addslashes}", @@ -414,6 +611,29 @@ }); } + function updateRoomOccupancy(params, cart_row) + { + debugger; + $.ajax({ + type:"POST", + url: "{$link->getAdminLink('AdminCarts')|addslashes}", + async: true, + dataType: "JSON", + data: { + ajax: "1", + token: "{getAdminToken tab='AdminCarts'}", + tab: "AdminCarts", + action: "updateRoomOccupancy", + params: params, + }, + success : function(response) { + updateCartLine(response.curr_booking_info, cart_row); + updateCartSummaryData(response.cart_info); + } + }); + } + + function updateCartLine(data, cart_row) { $(cart_row).find('.cart_line_total_rooms_price').html(data.amt_with_qty); $(cart_row).find('.cart_line_total_price').html(data.total_price); @@ -1807,6 +2027,23 @@ +{strip} + {addJsDef max_child_age=$max_child_age} + {addJsDef max_child_in_room=$max_child_in_room} + {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL} + {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL} + {addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL} + {addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL} + {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL} + {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL} + {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL} + {addJsDefL name='child_txt'}{l s='Child' js=1}{/addJsDefL} + {addJsDefL name='children_txt'}{l s='Children' js=1}{/addJsDefL} + {addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL} + {addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='all_children_txt'}{l s='All Children' js=1}{/addJsDefL} + {addJsDefL name='invalid_occupancy_txt'}{l s='Invalid occupancy(adults/children) found.' js=1}{/addJsDefL} +{/strip}
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 099c48a30..b84467ddd 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1058,6 +1058,64 @@
+ {if is_array($returns) && count($returns)} +
+
+ {l s='Refunds'} +
+ + + + + + + + + {foreach from=$returns item=return_info} + + + + + {/foreach} + +
{l s='Refund ID'}{l s='Status'}
+ #{$return_info.id_order_return} + + {capture name=refund_status} + {if isset($return_info.payment_mode) && $return_info.payment_mode != ''}{l s='Payment Mode: '}{$return_info.payment_mode}
{/if} + {if isset($return_info.id_transaction) && $return_info.id_transaction != ''}{l s='Transaction ID: '}{$return_info.id_transaction}
{/if} + {if isset($return_info.id_return_type) && isset($return_info.return_type) && $return_info.id_return_type && $return_info.return_type} + {if $return_info.return_type == OrderReturn::RETURN_TYPE_CART_RULE} + {l s='Voucher ID: '} + + #{$return_info.id_return_type} + + {elseif $return_info.return_type == OrderReturn::RETURN_TYPE_ORDER_SLIP} + {l s='Credit Slip ID: '} + #{$return_info.id_return_type} + + {l s='Download' mod='hotelreservationsystem'} + + {/if} +
+ {/if} + {if isset($return_info.id_cart_rule) && $return_info.id_cart_rule} + {l s='Voucher ID: '} + + #{$return_info.id_cart_rule} + +
+ {/if} + {/capture} + + {if $smarty.capture.refund_status|trim != ''} + {$smarty.capture.refund_status} + {else} + {$return_info.state_name} + {/if} +
+
+ {/if} {hook h="displayAdminOrderRight" id_order=$order->id} @@ -1070,7 +1128,7 @@ -
+
{l s='Rooms In This Order'} {$order_detail_data|@count} @@ -1090,6 +1148,7 @@
{l s='Room Type'} {l s='Hotel Name'} {l s='Duration'}{l s='Occupancy'} {l s='Unit Price (Tax excl.)'} {l s='Total Price (Tax incl.)'}
+ + + + + + + {foreach from=$demand['adv_option'] key=key item=info} + + + + + {/foreach} +
+ {l s='Option Name'} + + {l s='Price'} +
+ {$info['name']|escape:'html':'UTF-8'} + +
+ {$defaultcurrencySign|escape:'html':'UTF-8'} + +
+
+
+
+
+ {/if} + + + {/foreach} + +
+ + + {l s='Cancel'} + + + +
+ {else} +
+ {l s='No additional facilities created yet. To create please visit'} {l s='Additional facilities'} {l s='page'}. +
+ {/if} + +{/if} diff --git a/admin/themes/default/template/controllers/products/occupancy.tpl b/admin/themes/default/template/controllers/products/occupancy.tpl index c38cd0b92..1605e2818 100644 --- a/admin/themes/default/template/controllers/products/occupancy.tpl +++ b/admin/themes/default/template/controllers/products/occupancy.tpl @@ -24,27 +24,25 @@

{l s='Occupancy'}

- {l s='Set the occupancy of this room type. Enter how much adults and children this room type can accomodate.'} -

- {l s='Note'} : {l s='These occupancy settings will not affect "ROOM TYPE ADDITIONAL FACILITIES" any way. It will work separately.'} + {l s='Below, enter the base occupancy of this room type.'}
- +
@@ -53,6 +51,46 @@
+
+ +
+ {l s='Below, enter the maximum of adults or children which can be accommodated in a room of this room type. Also, enter maximum number of guests for this room type.'} +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl new file mode 100644 index 000000000..9c65ed59a --- /dev/null +++ b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl @@ -0,0 +1,22 @@ +{** + * 2010-2023 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + + + #{$id_cart_rule} + diff --git a/admin/themes/default/template/controllers/slip/_redeem_status.tpl b/admin/themes/default/template/controllers/slip/_redeem_status.tpl new file mode 100644 index 000000000..4d4b54d0a --- /dev/null +++ b/admin/themes/default/template/controllers/slip/_redeem_status.tpl @@ -0,0 +1,24 @@ +{** + * 2010-2022 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + +{if $redeem_status == OrderSlip::REDEEM_STATUS_REDEEMED} + {l s='Redeemed'} +{else} + {l s='Active'} +{/if} diff --git a/admin/themes/default/template/controllers/slip/_status_change_link.tpl b/admin/themes/default/template/controllers/slip/_status_change_link.tpl new file mode 100644 index 000000000..958a76581 --- /dev/null +++ b/admin/themes/default/template/controllers/slip/_status_change_link.tpl @@ -0,0 +1,23 @@ +{** + * 2010-2023 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + + + + {l s='Change Status'} + diff --git a/admin/themes/default/template/helpers/kpi/row.tpl b/admin/themes/default/template/helpers/kpi/row.tpl index 2f634809a..fc481cbd3 100644 --- a/admin/themes/default/template/helpers/kpi/row.tpl +++ b/admin/themes/default/template/helpers/kpi/row.tpl @@ -26,6 +26,7 @@ {if $refresh}
{/if} + {if ($kpis|count) > 0}
{assign var='col' value=(int)(12 / $kpis|count)} {foreach from=$kpis item=i name=kpi} @@ -36,4 +37,5 @@
{$i}
{/foreach}
+ {/if}
diff --git a/classes/Cart.php b/classes/Cart.php index 18b2c15cf..e6061841f 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1731,6 +1731,7 @@ class CartCore extends ObjectModel $order_total_discount = 0; $order_shipping_discount = 0; + $advance_payment_products_discount = 0; if (!in_array($type, array(Cart::ONLY_SHIPPING, Cart::ONLY_PRODUCTS, Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS)) && CartRule::isFeatureActive()) { // First, retrieve the cart rules associated to this "getOrderTotal" if ($with_shipping || $type == Cart::ONLY_DISCOUNTS) { @@ -1787,10 +1788,28 @@ class CartCore extends ObjectModel // If the cart rule offers a reduction, the amount is prorated (with the products in the package) if ($cart_rule['obj']->reduction_percent > 0 || $cart_rule['obj']->reduction_amount > 0) { $order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_REDUCTION, $package, $use_cache), $compute_precision); + + if ($type == Cart::ADVANCE_PAYMENT) { + $advance_payment_products_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_REDUCTION, $package, $use_cache, true), $compute_precision); + } } } $order_total_discount = min(Tools::ps_round($order_total_discount, 2), (float)$order_total_products) + (float)$order_shipping_discount; - $order_total -= $order_total_discount; + if ($type == Cart::ADVANCE_PAYMENT) { + // get order total without discount + $total_without_discount = $this->getOrderTotal() + $order_total_discount; + // to find due amount substract advance payment without discuount from order total without discount + // Due Amount = order total - advance payment (without discount) + $due_amount = $total_without_discount - $order_total; + // if discount for advance payment products is greater than due amount then only decrease the price of advance payment amount + // otherwise discount will be applied on due amount not advance payment amount + if ($advance_payment_products_discount > $due_amount) { + $order_total -= ($advance_payment_products_discount - $due_amount); + } + $order_total -= $order_total_discount - $advance_payment_products_discount; + } else { + $order_total -= $order_total_discount; + } } if ($type == Cart::BOTH || $type == Cart::ADVANCE_PAYMENT) { @@ -4370,7 +4389,7 @@ class CartCore extends ObjectModel // lets validate the cart booking data first if (isset($bookingRows) && count($bookingRows)) { $objRoomType = new HotelRoomType(); - $objBookingDtl = new HotelBookingDetail(); + $objBookingDetail = new HotelBookingDetail(); $errors = array(); $idCustomer = $objCart->id_customer; $idCurrency = $objCart->id_currency; @@ -4412,24 +4431,20 @@ class CartCore extends ObjectModel } if (!count($errors)) { - $numDays = $objBookingDtl->getNumberOfDays($dateFrom, $dateTo); + $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo); $prodQty = $prodQty * (int) $numDays; $reqRooms = 1; - if ($hotelRoomData = $objBookingDtl->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest - )) { + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'only_search_data' => 1, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { if (isset($hotelRoomData['stats']['num_avail'])) { $totalAvailRooms = $hotelRoomData['stats']['num_avail']; if ($totalAvailRooms < $reqRooms) { @@ -4470,7 +4485,7 @@ class CartCore extends ObjectModel if (!$hasErrors) { $update_quantity = $objCart->updateQty($prodQty, $idProduct, 0, 0, Tools::getValue('op', 'up'), $this->id_address_delivery); $chkQty = 0; - if ($hotelAvailRomms = $hotelRoomData['rm_data'][0]['data']['available']) { + if ($hotelAvailRomms = $hotelRoomData['rm_data'][$idProduct]['data']['available']) { foreach ($hotelAvailRomms as $key_hotel_room_info => $val_hotel_room_info) { if ($chkQty < $reqRooms) { $objCartBooking = new HotelCartBookingData(); diff --git a/classes/CartRule.php b/classes/CartRule.php index 88670b0de..9086135ad 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -875,9 +875,10 @@ class CartRuleCore extends ObjectModel * @param bool $use_tax * @param Context $context * @param bool $use_cache Allow using cache to avoid multiple free gift using multishipping + * @param bool $only_advance_payment_products to calculate discount applied only on products that have advance payment * @return float|int|string */ - public function getContextualValue($use_tax, Context $context = null, $filter = null, $package = null, $use_cache = true) + public function getContextualValue($use_tax, Context $context = null, $filter = null, $package = null, $use_cache = true, $only_advance_payment_products = false) { if (!CartRule::isFeatureActive()) { return 0; @@ -890,15 +891,34 @@ class CartRuleCore extends ObjectModel } $all_products = $context->cart->getProducts(); - $package_products = (is_null($package) ? $all_products : $package['products']); + if (is_null($package)) { + $package = array( + 'products' => $all_products, + 'id_carrier' => null, + 'id_address' => 0 + ); + } $reduction_value = 0; - - $cache_id = 'getContextualValue_'.(int)$this->id.'_'.(int)$use_tax.'_'.(int)$context->cart->id.'_'.(int)$filter; - foreach ($package_products as $product) { + $objHotelAdvancePayment = new HotelAdvancedPayment(); + $cache_id = 'getContextualValue_'.(int)$this->id.'_'.(int)$use_tax.'_'.(int)$context->cart->id.'_'.(int)$filter.'_'.(int)$only_advance_payment_products; + foreach ($package['products'] as $key => $product) { + if ($only_advance_payment_products) { + if ($advancePaymentInfo = $objHotelAdvancePayment->getIdAdvPaymentByIdProduct($product['id_product'])) { + if (!$advancePaymentInfo['active']) { + unset($package['products'][$key]); + continue; + } + } else { + unset($package['products'][$key]); + continue; + } + } $cache_id .= '_'.(int)$product['id_product'].'_'.(int)$product['id_product_attribute'].(isset($product['in_stock']) ? '_'.(int)$product['in_stock'] : ''); } + $package_products = $package['products']; + if (Cache::isStored($cache_id)) { return Cache::retrieve($cache_id); } @@ -1001,7 +1021,7 @@ class CartRuleCore extends ObjectModel $reduction_value += $selected_products_reduction * $this->reduction_percent / 100; } - // Discount (¤) + // Discount (by amount) if ((float)$this->reduction_amount > 0) { $prorata = 1; if (!is_null($package) && count($all_products)) { @@ -1011,7 +1031,31 @@ class CartRuleCore extends ObjectModel } } + $restricted_product = null; $reduction_amount = $this->reduction_amount; + // If the cart rule is restricted to one room type it can't exceed this room type price + if ($this->reduction_product > 0) { + foreach ($package_products as $product) { + if ($product['id_product'] == $this->reduction_product) { + $restricted_product = $product; + + $prorata = 1; // do not split this cart rule + if ($this->reduction_tax) { + $max_reduction_amount = (int) $restricted_product['cart_quantity'] * (float) $restricted_product['price_wt']; + } else { + $max_reduction_amount = (int) $restricted_product['cart_quantity'] * (float) $restricted_product['price']; + } + $reduction_amount = min($reduction_amount, $max_reduction_amount); + + break; + } + } + } + + if (($this->reduction_product > 0) && !$restricted_product) { + $reduction_amount = 0; + } + // If we need to convert the voucher value to the cart currency if (isset($context->currency) && $this->reduction_currency != $context->currency->id) { $voucherCurrency = new Currency($this->reduction_currency); @@ -1058,7 +1102,7 @@ class CartRuleCore extends ObjectModel } } } - // Discount (¤) on the whole order + // Discount (by amount) on the whole order elseif ($this->reduction_product == 0) { $cart_amount_te = null; $cart_amount_ti = null; diff --git a/classes/Cookie.php b/classes/Cookie.php index 920415da6..29b89b697 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -26,6 +26,25 @@ class CookieCore { + const SAMESITE_NONE = 'None'; + const SAMESITE_LAX = 'Lax'; + const SAMESITE_STRICT = 'Strict'; + + const SAMESITE_AVAILABLE_VALUES = array( + array( + "type" => self::SAMESITE_NONE, + "name" => self::SAMESITE_NONE + ), + array( + "type" => self::SAMESITE_LAX, + "name" => self::SAMESITE_LAX + ), + array( + "type" => self::SAMESITE_STRICT, + "name" => self::SAMESITE_STRICT + ), + ); + /** @var array Contain cookie content in a key => value format */ protected $_content; @@ -73,6 +92,7 @@ class CookieCore $this->_path = str_replace('%2F', '/', $this->_path); $this->_path = str_replace('%7E', '~', $this->_path); $this->_domain = $this->getDomain($shared_urls); + $this->_sameSite = Configuration::get('PS_COOKIE_SAMESITE'); $this->_name = 'PrestaShop-'.md5(($this->_standalone ? '' : _PS_VERSION_).$name.$this->_domain); $this->_allow_writing = true; $this->_salt = $this->_standalone ? str_pad('', 8, md5('ps'.__FILE__)) : _COOKIE_IV_; @@ -82,7 +102,7 @@ class CookieCore } else { $this->_cipherTool = new PhpEncryption(_NEW_COOKIE_KEY_); } - + $this->_secure = (bool)$secure; $this->update(); @@ -342,11 +362,35 @@ class CookieCore $content = 0; $time = 1; } - if (PHP_VERSION_ID <= 50200) { /* PHP version > 5.2.0 */ - return setcookie($this->_name, $content, $time, $this->_path, $this->_domain, $this->_secure); - } else { - return setcookie($this->_name, $content, $time, $this->_path, $this->_domain, $this->_secure, true); + + /* + * The alternative signature supporting an options array is only available since + * PHP 7.3.0, before there is no support for SameSite attribute. + */ + if (PHP_VERSION_ID < 70300) { + return setcookie( + $this->_name, + $content, + $time, + $this->_path, + $this->_domain . '; SameSite=' . $this->_sameSite, + $this->_secure, + true + ); } + + return setcookie( + $this->_name, + $content, + [ + 'expires' => $time, + 'path' => $this->_path, + 'domain' => $this->_domain, + 'secure' => $this->_secure, + 'httponly' => true, + 'samesite' => $this->_sameSite, + ] + ); } public function __destruct() diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 4ce1ab259..0649ab4a7 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -356,6 +356,20 @@ abstract class PaymentModuleCore extends Module PrestaShopLogger::addLog('PaymentModule::validateOrder - Order is about to be added', 1, null, 'Cart', (int)$id_cart, true); } + if ($this->name == 'wsorder') { + $order->with_occupancy = 0; + } else { + if (defined('_PS_ADMIN_DIR_')) { + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $order->with_occupancy = 1; + } + } else { + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $order->with_occupancy = 1; + } + } + } + // advance payment information $order->is_advance_payment = $this->context->cart->is_advance_payment; if ($order->is_advance_payment) { @@ -585,9 +599,11 @@ abstract class PaymentModuleCore extends Module } $cart_rules_list = array(); - $total_reduction_value_ti = 0; - $total_reduction_value_tex = 0; foreach ($cart_rules as $cart_rule) { + if ($cart_rule['obj']->reduction_product > 0 && !$order->orderContainProduct($cart_rule['obj']->reduction_product)) { + continue; + } + $package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list); $values = array( 'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL_NOCAP, $package), @@ -600,13 +616,25 @@ abstract class PaymentModuleCore extends Module } // IF - // This is not multi-shipping // The value of the voucher is greater than the total of the order // Partial use is allowed // This is an "amount" reduction, not a reduction in % or a gift // THEN // The voucher is cloned with a new value corresponding to the remainder - if (count($order_list) == 1 && $values['tax_incl'] > ($order->total_products_wt - $total_reduction_value_ti) && $cart_rule['obj']->partial_use == 1 && $cart_rule['obj']->reduction_amount > 0) { + $reduction_amount_converted = $cart_rule['obj']->reduction_amount; + if ((int) $cart_rule['obj']->reduction_currency !== (int) $cart->id_currency) { + $reduction_amount_converted = Tools::convertPriceFull( + $cart_rule['obj']->reduction_amount, + new Currency($cart_rule['obj']->reduction_currency), + new Currency($cart->id_currency) + ); + } + if ($cart_rule['obj']->reduction_tax) { + $remaining_amount = $reduction_amount_converted - $values['tax_incl']; + } else { + $remaining_amount = $reduction_amount_converted - $values['tax_excl']; + } + if ($remaining_amount > 0 && $cart_rule['obj']->partial_use == 1 && $reduction_amount_converted > 0) { // Create a new voucher from the original $voucher = new CartRule((int)$cart_rule['obj']->id); // We need to instantiate the CartRule without lang parameter to allow saving it unset($voucher->id); @@ -618,16 +646,13 @@ abstract class PaymentModuleCore extends Module } // Set the new voucher value + $voucher->reduction_amount = $remaining_amount; if ($voucher->reduction_tax) { - $voucher->reduction_amount = ($total_reduction_value_ti + $values['tax_incl']) - $order->total_products_wt; - // Add total shipping amout only if reduction amount > total shipping if ($voucher->free_shipping == 1 && $voucher->reduction_amount >= $order->total_shipping_tax_incl) { $voucher->reduction_amount -= $order->total_shipping_tax_incl; } } else { - $voucher->reduction_amount = ($total_reduction_value_tex + $values['tax_excl']) - $order->total_products; - // Add total shipping amout only if reduction amount > total shipping if ($voucher->free_shipping == 1 && $voucher->reduction_amount >= $order->total_shipping_tax_excl) { $voucher->reduction_amount -= $order->total_shipping_tax_excl; @@ -669,12 +694,7 @@ abstract class PaymentModuleCore extends Module null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop ); } - - $values['tax_incl'] = $order->total_products_wt - $total_reduction_value_ti; - $values['tax_excl'] = $order->total_products - $total_reduction_value_tex; } - $total_reduction_value_ti += $values['tax_incl']; - $total_reduction_value_tex += $values['tax_excl']; $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping); @@ -781,6 +801,9 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->date_to = $objCartBookingData->date_to; $objBookingDetail->total_price_tax_excl = Tools::ps_round($total_price['total_price_tax_excl'], 6); $objBookingDetail->total_price_tax_incl = Tools::ps_round($total_price['total_price_tax_incl'], 6); + $objBookingDetail->adults = $objCartBookingData->adults; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; // Save hotel information/location/contact if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { @@ -803,10 +826,6 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->phone = $hotelAddress['phone']; } } - if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { - $objBookingDetail->adult = $roomTypeInfo['adult']; - $objBookingDetail->children = $roomTypeInfo['children']; - } /*for saving details of the advance payment product wise*/ $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); @@ -890,14 +909,6 @@ abstract class PaymentModuleCore extends Module // delete cart feature prices after booking creation success HotelRoomTypeFeaturePricing::deleteByIdCart($id_cart); - if (isset($_COOKIE['wk_id_cart'])) { - setcookie('wk_id_cart', ' ', time() - 86400, '/'); - setcookie('wk_id_guest', ' ', time() - 86400, '/'); - - unset($_COOKIE['wk_id_cart']); - unset($_COOKIE['wk_id_guest']); - } - if (self::DEBUG_MODE) { PrestaShopLogger::addLog('PaymentModule::validateOrder - Hook validateOrder is about to be called', 1, null, 'Cart', (int)$id_cart, true); } @@ -1431,8 +1442,6 @@ abstract class PaymentModuleCore extends Module $cart_htl_data[$type_key]['cover_img'] = $cover_img; $cart_htl_data[$type_key]['name'] = $product->name; $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; - $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; foreach ($cart_bk_data as $data_k => $data_v) { $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); @@ -1442,6 +1451,9 @@ abstract class PaymentModuleCore extends Module $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; @@ -1481,6 +1493,8 @@ abstract class PaymentModuleCore extends Module $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; diff --git a/classes/PrestaShopBackup.php b/classes/PrestaShopBackup.php index adb0f4edd..6bc12601e 100644 --- a/classes/PrestaShopBackup.php +++ b/classes/PrestaShopBackup.php @@ -218,7 +218,8 @@ class PrestaShopBackupCore $this->id = realpath($backupfile); fwrite($fp, '/* Backup for '.Tools::getHttpHost(false, false).__PS_BASE_URI__."\n * at ".date($date)."\n */\n"); - fwrite($fp, "\n".'SET NAMES \'utf8\';'."\n\n"); + fwrite($fp, "\n".'SET NAMES \'utf8\';'); + fwrite($fp, "\n".'SET SQL_MODE=\'ALLOW_INVALID_DATES\';'."\n\n"); // Find all tables $tables = Db::getInstance()->executeS('SHOW TABLES'); diff --git a/classes/Product.php b/classes/Product.php index 52f318af5..cf6dfb3c3 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -5623,7 +5623,7 @@ class ProductCore extends ObjectModel WHERE `id_product` = '.(int)$this->id ); - // save room type info adult, child, hotel info + // save room type info adults, child, hotel info $postData = trim(file_get_contents('php://input')); libxml_use_internal_errors(true); $xml = simplexml_load_string(utf8_decode($postData)); @@ -5631,7 +5631,7 @@ class ProductCore extends ObjectModel $roomtypeData = json_decode(json_encode($xml), true); // set room map info for the hotel from request - return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'htl_room_type` (`id_product`, `id_hotel`, `adult`, `children`, `date_add`, `date_upd`) VALUES ('.(int)$this->id.', '.(int) $roomtypeData['room_type']['id_hotel'].', '.(int) $roomtypeData['room_type']['adults'].', '.(int) $roomtypeData['room_type']['children'].', \''.date('Y-m-d h:i:s').'\', \''.date('Y-m-d h:i:s').'\')'); + return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'htl_room_type` (`id_product`, `id_hotel`, `adults`, `children`, `date_add`, `date_upd`) VALUES ('.(int)$this->id.', '.(int) $roomtypeData['room_type']['id_hotel'].', '.(int) $roomtypeData['room_type']['adults'].', '.(int) $roomtypeData['room_type']['children'].', \''.date('Y-m-d h:i:s').'\', \''.date('Y-m-d h:i:s').'\')'); } return true; @@ -6060,7 +6060,7 @@ class ProductCore extends ObjectModel public function getWsAdults() { return Db::getInstance()->getValue( - 'SELECT `adult` FROM `'._DB_PREFIX_.'htl_room_type` WHERE `id_product` = '.(int)$this->id.' ORDER BY `id` ASC' + 'SELECT `adults` FROM `'._DB_PREFIX_.'htl_room_type` WHERE `id_product` = '.(int)$this->id.' ORDER BY `id` ASC' ); } diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 45479e0fa..69d5d01f9 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2147,7 +2147,7 @@ class AdminControllerCore extends Controller $tab_modules_list = $this->filterTabModuleList($tab_modules_list); - if ((is_array($tab_modules_list['slider_list']) && count($tab_modules_list['slider_list'])) + if (!empty($tab_modules_list) && (is_array($tab_modules_list['slider_list']) && count($tab_modules_list['slider_list'])) || !Tab::isTabModuleListAvailable() ) { $this->page_header_toolbar_btn['modules-list'] = array( diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 9663e7e4d..cdd22e7a8 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -435,6 +435,15 @@ class FrontControllerCore extends Controller $compared_products = CompareProduct::getCompareProducts($this->context->cookie->id_compare); } + $isOccupancyWiseSearch = false; + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $isOccupancyWiseSearch = true; + } + + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } $this->context->smarty->assign(array( // Useful for layout.tpl 'mobile_device' => $this->context->getMobileDevice(), @@ -482,6 +491,10 @@ class FrontControllerCore extends Controller 'currencySign' => $currency->sign, // backward compat, see global.tpl 'currencyFormat' => $currency->format, // backward compat 'currencyBlank' => $currency->blank, // backward compat + 'is_occupancy_wise_search' => $isOccupancyWiseSearch, + 'occupancy_required_for_booking' => $occupancyRequiredForBooking, + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), )); // Add the tpl files directory for mobile @@ -1059,6 +1072,12 @@ class FrontControllerCore extends Controller } } + $this->addJS(_PS_JS_DIR_.'daterangepicker/moment.min.js'); + $this->addjqueryPlugin('daterangepicker.min', _PS_JS_DIR_.'daterangepicker/'); + $this->addJS(_PS_JS_DIR_.'daterangepicker/qlodaterangepicker.js'); + + $this->addCSS(_THEME_CSS_DIR_.'daterangepicker.css'); + if (Tools::isSubmit('live_edit') && Tools::getValue('ad') && Tools::getAdminToken('AdminModulesPositions'.(int)Tab::getIdFromClassName('AdminModulesPositions').(int)Tools::getValue('id_employee'))) { $this->addJqueryUI('ui.sortable'); $this->addjqueryPlugin('fancybox'); diff --git a/classes/order/Order.php b/classes/order/Order.php index 10aea87d1..5ad465fcd 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -193,6 +193,11 @@ class OrderCore extends ObjectModel */ public $advance_paid_amount; + /** + * @var int is occupancy provided in this order + */ + public $with_occupancy; + /** * @see ObjectModel::$definition */ @@ -246,8 +251,9 @@ class OrderCore extends ObjectModel 'source' => array('type' => self::TYPE_STRING), 'valid' => array('type' => self::TYPE_BOOL), 'reference' => array('type' => self::TYPE_STRING), - 'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), - 'advance_paid_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'), + 'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), + 'advance_paid_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'), + 'with_occupancy' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 89b94ea76..bd06ec1c4 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -26,6 +26,9 @@ class OrderReturnCore extends ObjectModel { + /** @var int */ + public $id_order_return; + /** @var int */ public $id_customer; @@ -48,12 +51,22 @@ class OrderReturnCore extends ObjectModel /** @var int if request raised by the admin */ public $by_admin; + /** @var int id_cart_rule or id_order_slip */ + public $id_return_type; + + /** @var int whether $id_return_type is cart_rule or order_slip */ + public $return_type; + /** @var string Object creation date */ public $date_add; /** @var string Object last modification date */ public $date_upd; + /** possible values for $return_type */ + const RETURN_TYPE_CART_RULE = 1; + const RETURN_TYPE_ORDER_SLIP = 2; + /** * @see ObjectModel::$definition */ @@ -69,6 +82,8 @@ class OrderReturnCore extends ObjectModel 'refunded_amount' => array('type' => self::TYPE_FLOAT), 'state' => array('type' => self::TYPE_INT), 'by_admin' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), + 'id_return_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'return_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), @@ -232,14 +247,16 @@ class OrderReturnCore extends ObjectModel if (!$context) { $context = Context::getContext(); } - $data = Db::getInstance()->executeS(' - SELECT * - FROM `'._DB_PREFIX_.'order_return` - WHERE `id_customer` = '.(int)$customer_id. - ($only_customer ? ' AND `by_admin` = 0' : ''). - ($order_id ? ' AND `id_order` = '.(int)$order_id : ''). - ($no_denied ? ' AND `state` != 4' : '').' - ORDER BY `date_add` DESC'); + $sql = 'SELECT * + FROM `'._DB_PREFIX_.'order_return` orr + LEFT JOIN `'._DB_PREFIX_.'order_slip` ors + ON (ors.`id_order_slip` = orr.`id_return_type` AND orr.`return_type` = '.(int) self::RETURN_TYPE_ORDER_SLIP.') + WHERE orr.`id_customer` = '.(int)$customer_id. + ($only_customer ? ' AND orr.`by_admin` = 0' : ''). + ($order_id ? ' AND orr.`id_order` = '.(int)$order_id : ''). + ($no_denied ? ' AND orr.`state` != 4' : '').' + ORDER BY orr.`date_add` DESC'; + $data = Db::getInstance()->executeS($sql); foreach ($data as $k => $or) { $state = new OrderReturnState($or['state']); $data[$k]['state_name'] = $state->name[$context->language->id]; @@ -373,144 +390,112 @@ class OrderReturnCore extends ObjectModel /** * Sets the new order return state * @param int $newOrderReturnState - * @param int/object $idOrderReturn */ - public function changeIdOrderReturnState($newOrderReturnState, $idOrderReturn, $idLang = 0) + public function changeIdOrderReturnState($newOrderReturnState, $idLang = 0) { - if (Validate::isLoadedObject($objOrderReturn = new OrderReturn((int)$idOrderReturn))) { - $objOrder = new Order($objOrderReturn->id_order); + $objOrder = new Order($this->id_order); + if (!$idLang) { + $idLang = $objOrder->id_lang; + } + if (Validate::isLoadedObject( + $objOrderReturnState = new OrderReturnState((int)$newOrderReturnState, $idLang) + )) { + if ($this->state != $newOrderReturnState) { + $this->state = $newOrderReturnState; + $this->save(); - if (!$idLang) { - $idLang = $objOrder->id_lang; - } - if (Validate::isLoadedObject( - $objOrderReturnState = new OrderReturnState((int)$newOrderReturnState, $idLang) - )) { - if ($objOrderReturn->state != $newOrderReturnState) { - $objOrderReturn->state = $newOrderReturnState; - $objOrderReturn->save(); + if ($objOrderReturnState->send_email_to_customer + || $objOrderReturnState->send_email_to_superadmin + || $objOrderReturnState->send_email_to_employee + || $objOrderReturnState->send_email_to_hotelier + ) { + // Lets create data for the email templates + $objMail = new Mail(); + $idHotel = 0; - if ($objOrderReturnState->send_email_to_customer - || $objOrderReturnState->send_email_to_superadmin - || $objOrderReturnState->send_email_to_employee - || $objOrderReturnState->send_email_to_hotelier - ) { - // Lets create data for the email templates - $objMail = new Mail(); - $idHotel = 0; + $data = array ( + '{status_name}' => $objOrderReturnState->name, + '{status_color}' => $objOrderReturnState->color, + '{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, + ); - $data = array ( - '{status_name}' => $objOrderReturnState->name, - '{status_color}' => $objOrderReturnState->color, - '{order_reference}' => $objOrder->reference, - '{order_date}' => date('Y-m-d h:i:s', strtotime($objOrder->date_add)), - '{refunded_amount}' => Tools::displayPrice($objOrderReturn->refunded_amount, new Currency($objOrder->id_currency)), - '{payment_mode}' => $objOrderReturn->payment_mode, - '{id_transaction}' => $objOrderReturn->id_transaction, - ); - - // if mail is true for the customer then send mail to customer with selected template - $objCustomer = new Customer($objOrderReturn->id_customer); - if ($objOrderReturnState->send_email_to_customer && $objOrderReturnState->customer_template) { - if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings( - $objOrderReturn->id_order, - $objOrderReturn->id, - 0, - 1 - )) { - $idHotel = reset($refundReqBookings)['id_hotel']; - } - - $refBookHtml = $objMail->getEmailTemplateContent('refund_request_detail_customer', Mail::TYPE_HTML, $refundReqBookings); - $refBookTxt = $objMail->getEmailTemplateContent('refund_request_detail_customer', Mail::TYPE_TEXT, $refundReqBookings); - - $data['{refundBookingHtml}'] = $refBookHtml; - $data['{refundBookingTxt}'] = $refBookTxt; - - // send customer information - $link = new Link(); - $data['{refund_reqests_url}'] = $link->getPageLink('order-follow'); - $data['{firstname}'] = $objCustomer->firstname; - $data['{lastname}'] = $objCustomer->lastname; - - Mail::Send( - (int)$idLang, - $objOrderReturnState->customer_template, - $objOrderReturnState->name, - $data, - $objCustomer->email, - $objCustomer->firstname.' '.$objCustomer->lastname, - null, - null, - null, - null, - _PS_MAIL_DIR_, - false, - (int)$objOrder->id_shop - ); + // if mail is true for the customer then send mail to customer with selected template + $objCustomer = new Customer($this->id_customer); + if ($objOrderReturnState->send_email_to_customer && $objOrderReturnState->customer_template) { + if ($refundReqBookings = $this->getOrderRefundRequestedBookings( + $this->id_order, + $this->id, + 0, + 1 + )) { + $idHotel = reset($refundReqBookings)['id_hotel']; } - if ($objOrderReturnState->admin_template) { - if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings( - $objOrderReturn->id_order, - $objOrderReturn->id - )) { - $idHotel = $refundReqBookings[0]['id_hotel']; - } + $refBookHtml = $objMail->getEmailTemplateContent('refund_request_detail_customer', Mail::TYPE_HTML, $refundReqBookings); + $refBookTxt = $objMail->getEmailTemplateContent('refund_request_detail_customer', Mail::TYPE_TEXT, $refundReqBookings); - $refBookHtml = $objMail->getEmailTemplateContent('refund_request_detail_admin', Mail::TYPE_HTML, $refundReqBookings); - $refBookTxt = $objMail->getEmailTemplateContent('refund_request_detail_admin', Mail::TYPE_TEXT, $refundReqBookings); + $data['{refundBookingHtml}'] = $refBookHtml; + $data['{refundBookingTxt}'] = $refBookTxt; - $data['{cancelation_reason}'] = $objOrderReturn->question; - $data['{refundBookingHtml}'] = $refBookHtml; - $data['{refundBookingTxt}'] = $refBookTxt; + // send customer information + $link = new Link(); + $data['{refund_reqests_url}'] = $link->getPageLink('order-follow'); + $data['{firstname}'] = $objCustomer->firstname; + $data['{lastname}'] = $objCustomer->lastname; - // send mail to the super admin - if ($objOrderReturnState->send_email_to_superadmin) { - // send superadmin information - if (Validate::isLoadedObject($superAdmin = new Employee(_PS_ADMIN_PROFILE_))) { - if (Validate::isEmail($superAdmin->email)) { - $data['{customer_name}'] = $objCustomer->firstname.' '.$objCustomer->lastname; - $data['{customer_email}'] = $objCustomer->email; - $data['{firstname}'] = $superAdmin->firstname; - $data['{lastname}'] = $superAdmin->lastname; + Mail::Send( + (int)$idLang, + $objOrderReturnState->customer_template, + $objOrderReturnState->name, + $data, + $objCustomer->email, + $objCustomer->firstname.' '.$objCustomer->lastname, + null, + null, + null, + null, + _PS_MAIL_DIR_, + false, + (int)$objOrder->id_shop + ); + } - Mail::Send( - (int)$idLang, - $objOrderReturnState->admin_template, - $objOrderReturnState->name, - $data, - $superAdmin->email, - $superAdmin->firstname.' '.$superAdmin->lastname, - null, - null, - null, - null, - _PS_MAIL_DIR_, - false, - (int)$objOrder->id_shop - ); - } - } - } - if ($idHotel - && Validate::isLoadedObject($objHotel = new HotelBranchInformation($idHotel)) - ) { - // send mail to the hotelier - if ($objOrderReturnState->send_email_to_hotelier) { + if ($objOrderReturnState->admin_template) { + if ($refundReqBookings = $this->getOrderRefundRequestedBookings( + $this->id_order, + $this->id + )) { + $idHotel = $refundReqBookings[0]['id_hotel']; + } + + $refBookHtml = $objMail->getEmailTemplateContent('refund_request_detail_admin', Mail::TYPE_HTML, $refundReqBookings); + $refBookTxt = $objMail->getEmailTemplateContent('refund_request_detail_admin', Mail::TYPE_TEXT, $refundReqBookings); + + $data['{cancelation_reason}'] = $this->question; + $data['{refundBookingHtml}'] = $refBookHtml; + $data['{refundBookingTxt}'] = $refBookTxt; + + // send mail to the super admin + if ($objOrderReturnState->send_email_to_superadmin) { + // send superadmin information + if (Validate::isLoadedObject($superAdmin = new Employee(_PS_ADMIN_PROFILE_))) { + if (Validate::isEmail($superAdmin->email)) { $data['{customer_name}'] = $objCustomer->firstname.' '.$objCustomer->lastname; $data['{customer_email}'] = $objCustomer->email; - $data['{firstname}'] = ''; - $data['{lastname}'] = ''; - $data['{email}'] = $objHotel->email; + $data['{firstname}'] = $superAdmin->firstname; + $data['{lastname}'] = $superAdmin->lastname; Mail::Send( (int)$idLang, $objOrderReturnState->admin_template, $objOrderReturnState->name, $data, - $objHotel->email, - null, + $superAdmin->email, + $superAdmin->firstname.' '.$superAdmin->lastname, null, null, null, @@ -520,38 +505,66 @@ class OrderReturnCore extends ObjectModel (int)$objOrder->id_shop ); } + } + } + if ($idHotel + && Validate::isLoadedObject($objHotel = new HotelBranchInformation($idHotel)) + ) { + // send mail to the hotelier + if ($objOrderReturnState->send_email_to_hotelier) { + $data['{customer_name}'] = $objCustomer->firstname.' '.$objCustomer->lastname; + $data['{customer_email}'] = $objCustomer->email; + $data['{firstname}'] = ''; + $data['{lastname}'] = ''; + $data['{email}'] = $objHotel->email; - // send mail to the employee - if ($objOrderReturnState->send_email_to_employee) { - if ($htlAccesses = $objHotel->getHotelAccess($idHotel)) { - $data['{customer_name}'] = $objCustomer->firstname.' '.$objCustomer->lastname; - $data['{customer_email}'] = $objCustomer->email; - foreach ($htlAccesses as $access) { - if ($access['id_profile'] != _PS_ADMIN_PROFILE_) { - if ($htlEmployees = Employee::getEmployeesByProfile($access['id_profile'])) { - foreach ($htlEmployees as $empl) { - if (Validate::isEmail($empl['email'])) { - // send hotel manager (employee) have permission for this hotel - $data['{firstname}'] = $empl['firstname']; - $data['{lastname}'] = $empl['lastname']; - $data['{email}'] = $empl['email']; + Mail::Send( + (int)$idLang, + $objOrderReturnState->admin_template, + $objOrderReturnState->name, + $data, + $objHotel->email, + null, + null, + null, + null, + null, + _PS_MAIL_DIR_, + false, + (int)$objOrder->id_shop + ); + } - Mail::Send( - (int)$idLang, - $objOrderReturnState->admin_template, - $objOrderReturnState->name, - $data, - $empl['email'], - $empl['firstname'].' '.$empl['lastname'], - null, - null, - null, - null, - _PS_MAIL_DIR_, - false, - (int)$objOrder->id_shop - ); - } + // send mail to the employee + if ($objOrderReturnState->send_email_to_employee) { + if ($htlAccesses = $objHotel->getHotelAccess($idHotel)) { + $data['{customer_name}'] = $objCustomer->firstname.' '.$objCustomer->lastname; + $data['{customer_email}'] = $objCustomer->email; + foreach ($htlAccesses as $access) { + if ($access['id_profile'] != _PS_ADMIN_PROFILE_) { + if ($htlEmployees = Employee::getEmployeesByProfile($access['id_profile'])) { + foreach ($htlEmployees as $empl) { + if (Validate::isEmail($empl['email'])) { + // send hotel manager (employee) have permission for this hotel + $data['{firstname}'] = $empl['firstname']; + $data['{lastname}'] = $empl['lastname']; + $data['{email}'] = $empl['email']; + + Mail::Send( + (int)$idLang, + $objOrderReturnState->admin_template, + $objOrderReturnState->name, + $data, + $empl['email'], + $empl['firstname'].' '.$empl['lastname'], + null, + null, + null, + null, + _PS_MAIL_DIR_, + false, + (int)$objOrder->id_shop + ); } } } @@ -561,18 +574,21 @@ class OrderReturnCore extends ObjectModel } } } - - // executes hook - Hook::exec( - 'actionOrderReFundStatusPostUpdate', - array( - 'new_order_return_status' => $newOrderReturnState, - 'id_order_return' => (int)$idOrderReturn - ) - ); } + + // executes hook + Hook::exec( + 'actionOrderReFundStatusPostUpdate', + array( + 'new_order_return_status' => $newOrderReturnState, + 'id_order_return' => (int) $this->id_order_return, + ) + ); + + return true; } } + return false; } diff --git a/classes/order/OrderSlip.php b/classes/order/OrderSlip.php index f64269d75..b7b89bc49 100644 --- a/classes/order/OrderSlip.php +++ b/classes/order/OrderSlip.php @@ -27,7 +27,7 @@ class OrderSlipCore extends ObjectModel { /** @var int */ - public $id; + public $id_order_slip; /** @var int */ public $id_customer; @@ -62,6 +62,12 @@ class OrderSlipCore extends ObjectModel /** @var int */ public $partial; + /** @var int */ + public $redeem_status = self::REDEEM_STATUS_ACTIVE; + + /** @var int */ + public $id_cart_rule; + /** @var string Object creation date */ public $date_add; @@ -71,6 +77,9 @@ class OrderSlipCore extends ObjectModel /** @var int */ public $order_slip_type = 0; + const REDEEM_STATUS_ACTIVE = 1; + const REDEEM_STATUS_REDEEMED = 2; + /** * @see ObjectModel::$definition */ @@ -90,6 +99,8 @@ class OrderSlipCore extends ObjectModel 'shipping_cost_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'partial' => array('type' => self::TYPE_INT), + 'redeem_status' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'id_cart_rule' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'order_slip_type' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), @@ -336,6 +347,7 @@ class OrderSlipCore extends ObjectModel $order_slip->{'total_products_tax_'.$inc_or_ex_1} = 0; $order_slip->{'total_products_tax_'.$inc_or_ex_2} = 0; + $total_products = array(); foreach ($booking_list as &$booking) { $objHtlBooking = new HotelBookingDetail($booking['id_htl_booking']); $order_detail = new OrderDetail((int)$objHtlBooking->id_order_detail); @@ -543,6 +555,95 @@ class OrderSlipCore extends ObjectModel return $ecotax_detail; } + /** + * generate voucher and return id of the created rule if successful, false otherwise + */ + public function generateVoucher($sendMail = true) + { + if (!Validate::isLoadedObject($this)) { + return false; + } + + if ($this->redeem_status != self::REDEEM_STATUS_ACTIVE) { + return false; + } + + $objOrder = new Order($this->id_order); + if (!Validate::isLoadedObject($objOrder)) { + return false; + } + + $objCustomer = new Customer($this->id_customer); + if (!Validate::isLoadedObject($objCustomer)) { + return false; + } + + $context = Context::getContext(); + $objCartRule = new CartRule(); + $languages = Language::getLanguages(); + + $creditSlipPrefix = Configuration::get('PS_CREDIT_SLIP_PREFIX', $context->language->id); + $creditSlipID = sprintf(('%1$s%2$06d'), $creditSlipPrefix, (int) $this->id_order_slip); + + $dateFrom = $this->date_add; + $dateTo = date('Y-m-d H:i:s', strtotime($dateFrom) + (3600 * 24 * 365.25)); /* 1 year */ + + foreach ($languages as $language) { + $objCartRule->name[$language['id_lang']] = sprintf('Voucher for credit slip #%s', $creditSlipID); + } + + $objCartRule->description = sprintf('Order: #%s', $objOrder->id); + $objCartRule->code = 'CS'.(int) ($this->id_order_slip).'C'.(int) ($objCustomer->id).'O'.(int) ($objOrder->id); + $objCartRule->quantity = 1; + $objCartRule->quantity_per_user = 1; + $objCartRule->id_customer = $objCustomer->id; + $objCartRule->date_from = $dateFrom; + $objCartRule->date_to = $dateTo; + $objCartRule->highlight = 1; + $objCartRule->active = 1; + $objCartRule->reduction_amount = $this->amount; + $objCartRule->reduction_tax = true; + $objCartRule->minimum_amount_currency = $objOrder->id_currency; + $objCartRule->reduction_currency = $objOrder->id_currency; + + if (!$objCartRule->save()) { + return false; + } + + $this->redeem_status = self::REDEEM_STATUS_REDEEMED; + $this->id_cart_rule = (int) $objCartRule->id; + $this->save(); + + if ($sendMail) { + $objCartRule = new CartRule($this->id_cart_rule); + $objCustomer = new Customer($objCartRule->id_customer); + + $objCurrency = new Currency($objCartRule->reduction_currency, $context->language->id); + $mailVars['{firstname}'] = $objCustomer->firstname; + $mailVars['{lastname}'] = $objCustomer->lastname; + $mailVars['{credit_slip_id}'] = $creditSlipID; + $mailVars['{voucher_code}'] = $objCartRule->code; + $mailVars['{voucher_amount}'] = Tools::displayPrice($objCartRule->reduction_amount, $objCurrency, false); + + Mail::Send( + $context->language->id, + 'credit_slip_voucher', + sprintf(Mail::l('New voucher for your credit slip #%s', $context->language->id), $creditSlipID), + $mailVars, + $objCustomer->email, + $objCustomer->firstname.' '.$objCustomer->lastname, + null, + null, + null, + null, + _PS_MAIL_DIR_, + true + ); + } + + return $this->id_cart_rule; + } + public function getWsOrderSlipDetails() { $query = 'SELECT id_order_slip as id, id_order_detail, product_quantity, amount_tax_excl, amount_tax_incl diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 0e24e7f91..8d13c291e 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -352,8 +352,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['id_product'] = $type_value['product_id']; $cart_htl_data[$type_key]['cover_img'] = $cover_img; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; - $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; $objBookingDemand = new HotelBookingDemands(); foreach ($order_bk_data as $data_k => $data_v) { @@ -400,6 +398,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate ); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] += 1; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; @@ -446,6 +446,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($data_v['date_from']); $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($data_v['date_to']); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; diff --git a/classes/webservice/WebserviceOutputJSON.php b/classes/webservice/WebserviceOutputJSON.php index f1e8cf7c5..0e2da03c4 100644 --- a/classes/webservice/WebserviceOutputJSON.php +++ b/classes/webservice/WebserviceOutputJSON.php @@ -40,7 +40,7 @@ class WebserviceOutputJSON implements WebserviceOutputInterface /** * Current association */ - protected $currentAssociatedEntity; + protected $currentAssociatedEntity = array(); /** * Json content diff --git a/config/config.inc.php b/config/config.inc.php index defb8d3a1..b8ef2014b 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -161,10 +161,10 @@ if ($cookie_lifetime > 0) { $cookie_lifetime = time() + (max($cookie_lifetime, 1) * 3600); } +$force_ssl = Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE'); if (defined('_PS_ADMIN_DIR_')) { - $cookie = new Cookie('psAdmin', '', $cookie_lifetime); + $cookie = new Cookie('psAdmin', '', $cookie_lifetime, null, false, $force_ssl); } else { - $force_ssl = Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE'); if ($context->shop->getGroup()->share_order) { $cookie = new Cookie('ps-sg'.$context->shop->getGroup()->id, '', $cookie_lifetime, $context->shop->getUrlsSharedCart(), false, $force_ssl); } else { diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index 98ef61c2d..72ce2aae3 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -65,7 +65,6 @@ - @@ -77,8 +76,6 @@ - - @@ -154,14 +151,15 @@ - + + - + - + diff --git a/controllers/admin/AdminAdminPreferencesController.php b/controllers/admin/AdminAdminPreferencesController.php index 9e3124ecb..8179c1f26 100644 --- a/controllers/admin/AdminAdminPreferencesController.php +++ b/controllers/admin/AdminAdminPreferencesController.php @@ -85,6 +85,16 @@ class AdminAdminPreferencesControllerCore extends AdminController 'default' => '480', 'visibility' => Shop::CONTEXT_ALL ), + 'PS_COOKIE_SAMESITE' => array( + 'title' => $this->l('Same site cookie'), + 'hint' => $this->l('Allows you to declare if your cookie should be restricted to a first-party or same-site context.'), + 'validation' => 'isGenericName', + 'type' => 'select', + 'cast' => 'strval', + 'identifier' => 'type', + 'list' => CookieCore::SAMESITE_AVAILABLE_VALUES, + 'visibility' => Shop::CONTEXT_ALL + ), ), 'submit' => array('title' => $this->l('Save')) ), @@ -159,6 +169,12 @@ class AdminAdminPreferencesControllerCore extends AdminController $upload_max_size = (int)str_replace('M', '', ini_get('upload_max_filesize')); $post_max_size = (int)str_replace('M', '', ini_get('post_max_size')); $max_size = $upload_max_size < $post_max_size ? $upload_max_size : $post_max_size; + $forceSsl = Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE'); + + if (!$forceSsl && Tools::getValue('PS_COOKIE_SAMESITE') === Cookie::SAMESITE_NONE) { + $this->errors[] = Tools::displayError('The SameSite=None is only available in secure mode.'); + return; + } if (Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE') > $max_size || Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE') > $max_size) { $this->errors[] = Tools::displayError('The limit chosen is larger than the server\'s maximum upload limit. Please increase the limits of your server.'); diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 5f5b3b82c..31e471fc8 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -592,7 +592,7 @@ class AdminCartsControllerCore extends AdminController $id_cart = Tools::getValue('id_cart');//get cart id from url $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); - $update_htl_cart_currency = $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id); + $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id); $cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart); $this->context->smarty->assign(array( 'cart_detail_data' => $cart_detail_data, @@ -951,6 +951,79 @@ class AdminCartsControllerCore extends AdminController } } + public function ajaxProcessupdateRoomOccupancy() + { + $params = Tools::getValue('params'); + $idBookingData = (int) $params['id_booking_data']; + $idCart = (int) $params['id_cart']; + $occupancy = $params['occupancy']; + + $this->context->cart = new Cart($idCart); + + if ($this->tabAccess['edit'] === '1') { + // validate occupancy is correct + $hasError = false; + if (is_array($occupancy)) { + if (!$occupancy['adults'] || !Validate::isUnsignedInt($occupancy['adults'])) { + $hasError = true; + } + if (!Validate::isUnsignedInt($occupancy['children'])) { + $hasError = true; + } + if ($occupancy['children']) { + if (!isset($occupancy['child_ages']) || $occupancy['children'] != count($occupancy['child_ages'])) { + $hasError = true; + } else { + foreach($occupancy['child_ages'] as $age) { + if (!Validate::isUnsignedInt($occupancy['adults'])) { + $hasError = true; + } + } + } + } + } else { + $hasError = true; + } + + if (!$hasError) { + $objHotelCartBookingData = new HotelCartBookingData($idBookingData); + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($objHotelCartBookingData->id_product)) { + if ($occupancy['adults'] > $roomTypeInfo['max_adults']) { + $hasError = true; + } + if ($occupancy['children'] > $roomTypeInfo['max_children']) { + $hasError = true; + } + if ($occupancy['adults'] + $occupancy['children'] > $roomTypeInfo['max_guests']) { + $hasError = true; + } + if (!$hasError) { + $objHotelCartBookingData->adults = $occupancy['adults']; + $objHotelCartBookingData->children = $occupancy['children']; + $objHotelCartBookingData->child_ages = json_encode($occupancy['child_ages']); + $objHotelCartBookingData->save(); + } + } + } + $objHotelCartBookingData = new HotelCartBookingData(); + $bookingsInfo = $objHotelCartBookingData->getCartFormatedBookinInfoByIdCart($idCart); + foreach ($bookingsInfo as &$bookingInfo) { + if ($bookingInfo['id'] == $idBookingData) { + $amtWithQty = $bookingInfo['amt_with_qty']; + $bookingInfo['amt_with_qty'] = Tools::displayPrice($amtWithQty); + $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['demand_price']); + $response = array( + 'curr_booking_info' => $bookingInfo, + 'cart_info' => $this->ajaxReturnVars(), + ); + + die(json_encode($response)); + } + } + } + } + // Process to get extra demands of any room while order creation process form.tpl public function ajaxProcessGetRoomTypeCartDemands() { diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index b957fe98a..e261e9ae3 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -219,6 +219,11 @@ class AdminOrdersControllerCore extends AdminController $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); 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']); + } $this->context->smarty->assign('cart_detail_data', $cart_detail_data); } else { // if no rooms added in the cart and user visits add order page then redirect to BOOK NOW page @@ -240,6 +245,11 @@ class AdminOrdersControllerCore extends AdminController $payment_modules[] = Module::getInstanceById((int)$p_module['id_module']); } + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + $this->context->smarty->assign(array( 'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'), 'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'), @@ -253,8 +263,10 @@ class AdminOrdersControllerCore extends AdminController 'toolbar_btn' => $this->toolbar_btn, 'toolbar_scroll' => $this->toolbar_scroll, 'PS_CATALOG_MODE' => Configuration::get('PS_CATALOG_MODE'), - 'title' => array($this->l('Orders'), $this->l('Create order')) - + 'title' => array($this->l('Orders'), $this->l('Create order')), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'occupancy_required_for_booking' => $occupancyRequiredForBooking, )); $this->content .= $this->createTemplate('form.tpl')->fetch(); } @@ -454,8 +466,8 @@ class AdminOrdersControllerCore extends AdminController } if (!count($this->errors)) { - $obj_booking_dtl = new HotelBookingDetail(); - $room_swapped = $obj_booking_dtl->reallocateRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $realloc_room_id); + $objBookingDetail = new HotelBookingDetail(); + $room_swapped = $objBookingDetail->reallocateRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $realloc_room_id); if (!$room_swapped) { $this->errors[] = Tools::displayError('Some error occured. Please try again.'); } else { @@ -489,8 +501,8 @@ class AdminOrdersControllerCore extends AdminController } if (!count($this->errors)) { - $obj_booking_dtl = new HotelBookingDetail(); - $room_swapped = $obj_booking_dtl->swapRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id); + $objBookingDetail = new HotelBookingDetail(); + $room_swapped = $objBookingDetail->swapRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id); if (!$room_swapped) { $this->errors[] = Tools::displayError('Some error occured. Please try again.'); } else { @@ -746,7 +758,7 @@ class AdminOrdersControllerCore extends AdminController $objOrderReturn = new OrderReturn(); $objOrderReturn->id_customer = $order->id_customer; $objOrderReturn->id_order = $order->id; - $objOrderReturn->state = 1; + $objOrderReturn->state = Configuration::get('PS_ORS_PENDING'); $objOrderReturn->by_admin = 1; $objOrderReturn->question = $refundReason; $objOrderReturn->save(); @@ -879,13 +891,14 @@ class AdminOrdersControllerCore extends AdminController false, $cart->secure_key ); - /* - setcookie('wk_id_cart', ' ', time() - 86400, '/'); - setcookie('wk_id_guest', ' ', time() - 86400, '/'); - unset($_COOKIE['wk_id_cart']); - unset($_COOKIE['wk_id_guest']); - */ + if (isset($this->context->cookie->id_cart)) { + unset($this->context->cookie->id_cart); + } + if (isset($this->context->cookie->id_guest)) { + unset($this->context->cookie->id_guest); + } + if ($payment_module->currentOrder) { Tools::redirectAdmin(self::$currentIndex.'&id_order='.$payment_module->currentOrder.'&vieworder'.'&token='.$this->token.'&conf=3'); } @@ -1459,6 +1472,7 @@ class AdminOrdersControllerCore extends AdminController $totalDemandsPriceTI = 0; if ($order_detail_data = $objBookingDetail->getOrderFormatedBookinInfoByIdOrder($order->id)) { $objBookingDemand = new HotelBookingDemands(); + $objHotelRoomType = new HotelRoomType(); foreach ($order_detail_data as $key => $value) { $order_detail_data[$key]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( $order->id, @@ -1512,6 +1526,8 @@ class AdminOrdersControllerCore extends AdminController $order_detail_data[$key]['unit_amt_tax_incl'] = $value['total_price_tax_incl']/$num_days; $order_detail_data[$key]['amt_with_qty_tax_excl'] = $value['total_price_tax_excl']; $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']); + } } @@ -1527,7 +1543,6 @@ class AdminOrdersControllerCore extends AdminController // hotel booking statuses $htlOrderStatus = HotelBookingDetail::getAllHotelOrderStatus(); - $this->tpl_view_vars = array( // refund info 'refund_allowed' => (int) $order->isReturnable(), @@ -1543,6 +1558,8 @@ class AdminOrdersControllerCore extends AdminController 'htl_booking_order_data' => $bookingOrderInfo, 'hotel_order_status' => $htlOrderStatus, 'order_detail_data' => $order_detail_data, + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), /*END*/ 'order' => $order, 'cart' => new Cart($order->id_cart), @@ -1678,7 +1695,13 @@ class AdminOrdersControllerCore extends AdminController } if ($products = Product::searchByName((int)$this->context->language->id, pSQL(Tools::getValue('product_search')), null, $idHotel)) { + $objRoomType = new HotelRoomType(); foreach ($products as &$product) { + // get product room type informatin + if ($roomTypeDetail = $objRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { + $product['room_type_info'] = $roomTypeDetail; + } + // Formatted price $product['formatted_price'] = Tools::displayPrice(Tools::convertPrice($product['price_tax_incl'], $currency), $currency); // Concret price @@ -1811,6 +1834,7 @@ class AdminOrdersControllerCore extends AdminController $date_from = date('Y-m-d', strtotime($product_informations['date_from'])); $date_to = date('Y-m-d', strtotime($product_informations['date_to'])); $curr_date = date('Y-m-d'); + $occupancy = Tools::getValue('occupancy'); /*Validations*/ if ($date_from == '') { die(json_encode(array( @@ -1842,6 +1866,45 @@ class AdminOrdersControllerCore extends AdminController 'result' => false, 'error' => Tools::displayError('Check out Date Should be after Check In date.'), ))); + } + if ($order->with_occupancy) { + if ($occupancy) { + foreach($occupancy as $key =>$roomOccupancy) { + if (!$roomOccupancy['adults'] || !Validate::isUnsignedInt($roomOccupancy['adults'])) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid number of adults for Room %s.'), ($key + 1)), + ))); + } elseif (!Validate::isUnsignedInt($roomOccupancy['children'])) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid number of children for Room %s.'), ($key + 1)), + ))); + } + if ($roomOccupancy['children'] > 0) { + if (!isset($roomOccupancy['child_ages']) || ($roomOccupancy['children'] != count($roomOccupancy['child_ages']))) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Please provide all children age for Room %s.'), ($key + 1)), + ))); + } else { + foreach($roomOccupancy['child_ages'] as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid children age for Room %s.'), ($key + 1)), + ))); + } + } + } + } + } + } else { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid occupancy.'), + ))); + } } elseif (!Validate::isUnsignedInt($product_informations['product_quantity'])) { die(json_encode(array( 'result' => false, @@ -1849,8 +1912,13 @@ class AdminOrdersControllerCore extends AdminController ))); } + + if ($order->with_occupancy) { + $req_rm = count($occupancy); + } else { + $req_rm = $product_informations['product_quantity']; + } $obj_booking_detail = new HotelBookingDetail(); - $req_rm = $product_informations['product_quantity']; $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to); $product_informations['product_quantity'] = $product_informations['product_quantity'] * (int) $num_days; @@ -1861,9 +1929,17 @@ class AdminOrdersControllerCore extends AdminController $id_hotel = $room_info_by_id_product['id_hotel']; if ($id_hotel) { - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, $product_informations['product_id'], 1, 0, 0, -1, 0, 0, $id_cart, $id_guest); - + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $product_informations['product_id'], + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams); $total_available_rooms = $hotel_room_data['stats']['num_avail']; if ($total_available_rooms < $req_rm) { @@ -1934,54 +2010,40 @@ class AdminOrdersControllerCore extends AdminController $this->context->cart = $cart; $this->context->customer = new Customer($order->id_customer); - // always add taxes even if there are not displayed to the customer - $use_taxes = true; - $initial_product_price_tax_incl = Product::getPriceStatic( - $product->id, - $use_taxes, - isset($combination) ? $combination->id : null, - 2, - null, - false, - true, - 1, - false, - $order->id_customer, - $cart->id, - $order->{Configuration::get('PS_TAX_ADDRESS_TYPE', null, null, $order->id_shop)} - ); - - // create feature price if needed - $createFeaturePrice = $product_informations['product_price_tax_incl'] != $initial_product_price_tax_incl; - $featurePriceParams = array(); - if ($createFeaturePrice) { - $featurePriceParams = array( - 'id_cart' => $this->context->cart->id, - 'id_guest' => $this->context->cookie->id_guest, - 'price' => $product_informations['product_price_tax_excl'], - 'id_product' => $product->id, - ); + if ($order->with_occupancy) { + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); } - /*By Webkul to make entries in HotelCartBookingData */ - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; + $hotel_room_info_arr = $hotel_room_data['rm_data'][$idProduct]['data']['available']; $chkQty = 0; if ($hotel_room_info_arr) { - foreach ($hotel_room_info_arr as $room_info) { + foreach ($hotel_room_info_arr as $key => $room_info) { if ($chkQty < $req_rm) { - $obj_htl_cart_booking_data = new HotelCartBookingData(); - $obj_htl_cart_booking_data->id_cart = $this->context->cart->id; - $obj_htl_cart_booking_data->id_guest = $this->context->cookie->id_guest; - $obj_htl_cart_booking_data->id_customer = $this->context->customer->id; - $obj_htl_cart_booking_data->id_currency = $order->id_currency; - $obj_htl_cart_booking_data->id_product = $room_info['id_product']; - $obj_htl_cart_booking_data->id_room = $room_info['id_room']; - $obj_htl_cart_booking_data->id_hotel = $room_info['id_hotel']; - $obj_htl_cart_booking_data->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; - $obj_htl_cart_booking_data->quantity = $num_days; - $obj_htl_cart_booking_data->date_from = $date_from; - $obj_htl_cart_booking_data->date_to = $date_to; - $obj_htl_cart_booking_data->save(); + $objCartBookingData = new HotelCartBookingData(); + $objCartBookingData->id_cart = $this->context->cart->id; + $objCartBookingData->id_guest = $this->context->cookie->id_guest; + $objCartBookingData->id_customer = $this->context->customer->id; + $objCartBookingData->id_currency = $order->id_currency; + $objCartBookingData->id_product = $room_info['id_product']; + $objCartBookingData->id_room = $room_info['id_room']; + $objCartBookingData->id_hotel = $room_info['id_hotel']; + $objCartBookingData->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; + $objCartBookingData->quantity = $num_days; + $objCartBookingData->date_from = $date_from; + $objCartBookingData->date_to = $date_to; + + if ($order->with_occupancy) { + $room_occupancy = array_shift($occupancy); + $objCartBookingData->adults = $room_occupancy['adults']; + $objCartBookingData->children = $room_occupancy['children']; + $objCartBookingData->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $objCartBookingData->adults = $roomTypeInfo['adults']; + $objCartBookingData->children = $roomTypeInfo['children']; + $objCartBookingData->child_ages = json_encode(array()); + } + $objCartBookingData->save(); ++$chkQty; // create feature price if needed @@ -1996,10 +2058,52 @@ class AdminOrdersControllerCore extends AdminController } } /*END*/ + // always add taxes even if there are not displayed to the customer + $use_taxes = true; + + $initial_product_price_tax_incl = Product::getPriceStatic( + $product->id, + $use_taxes, + isset($combination) ? $combination->id : null, + 2, + null, + false, + true, + 1, + false, + $order->id_customer, + $cart->id, + $order->id_address_tax + ); + + // Creating specific price if needed + if ($product_informations['product_price_tax_incl'] != $initial_product_price_tax_incl) { + $specific_price = new SpecificPrice(); + $specific_price->id_shop = 0; + $specific_price->id_shop_group = 0; + $specific_price->id_currency = 0; + $specific_price->id_country = 0; + $specific_price->id_group = 0; + $specific_price->id_customer = $order->id_customer; + $specific_price->id_product = $product->id; + if (isset($combination)) { + $specific_price->id_product_attribute = $combination->id; + } else { + $specific_price->id_product_attribute = 0; + } + $specific_price->price = $product_informations['product_price_tax_excl']; + $specific_price->from_quantity = 1; + $specific_price->reduction = 0; + $specific_price->reduction_type = 'amount'; + $specific_price->reduction_tax = 0; + $specific_price->from = '0000-00-00 00:00:00'; + $specific_price->to = '0000-00-00 00:00:00'; + $specific_price->add(); + } // Add product to cart $update_quantity = $cart->updateQty( - $product_informations['product_quantity'], + ($req_rm * $num_days), $product->id, isset($product_informations['product_attribute_id']) ? $product_informations['product_attribute_id'] : null, isset($combination) ? $combination->id : null, @@ -2226,76 +2330,79 @@ class AdminOrdersControllerCore extends AdminController /*By Webkul Entry into table HotelbookingDetail*/ $objRoomType = new HotelRoomType(); - $objHtlBkDtl = new HotelBookingDetail(); - $inserted_id_order_detail = $objHtlBkDtl->getLastInsertedIdOrderDetail($order->id); + $objBookingDetail = new HotelBookingDetail(); + $inserted_id_order_detail = $objBookingDetail->getLastInsertedIdOrderDetail($order->id); $idLang = (int)$this->context->cart->id_lang; - $obj_cart_bk_data = new HotelCartBookingData(); - if ($cart_bk_data = $obj_cart_bk_data->getOnlyCartBookingData( + $objCartBookingData = new HotelCartBookingData(); + if ($cartBookingData = $objCartBookingData->getOnlyCartBookingData( $this->context->cart->id, $this->context->cart->id_guest, $idProduct )) { - foreach ($cart_bk_data as $cb_k => $cb_v) { - $obj_cart_bk_data = new HotelCartBookingData($cb_v['id']); - $obj_cart_bk_data->id_order = $order->id; - $obj_cart_bk_data->save(); + foreach ($cartBookingData as $cb_k => $cb_v) { + $objCartBookingData = new HotelCartBookingData($cb_v['id']); + $objCartBookingData->id_order = $order->id; + $objCartBookingData->save(); - $objHtlBkDtl = new HotelBookingDetail(); - $objHtlBkDtl->id_product = $idProduct; - $objHtlBkDtl->id_order = $order->id; - $objHtlBkDtl->id_order_detail = $inserted_id_order_detail; - $objHtlBkDtl->id_cart = $this->context->cart->id; - $objHtlBkDtl->id_room = $obj_cart_bk_data->id_room; - $objHtlBkDtl->id_hotel = $obj_cart_bk_data->id_hotel; - $objHtlBkDtl->id_customer = $this->context->customer->id; - $objHtlBkDtl->booking_type = $obj_cart_bk_data->booking_type; - $objHtlBkDtl->id_status = 1; - $objHtlBkDtl->comment = $obj_cart_bk_data->comment; - $objHtlBkDtl->room_type_name = Product::getProductName($idProduct, null, $order->id_lang); + $objBookingDetail = new HotelBookingDetail(); + $objBookingDetail->id_product = $idProduct; + $objBookingDetail->id_order = $order->id; + $objBookingDetail->id_order_detail = $inserted_id_order_detail; + $objBookingDetail->id_cart = $this->context->cart->id; + $objBookingDetail->id_room = $objCartBookingData->id_room; + $objBookingDetail->id_hotel = $objCartBookingData->id_hotel; + $objBookingDetail->id_customer = $this->context->customer->id; + $objBookingDetail->booking_type = $objCartBookingData->booking_type; + $objBookingDetail->id_status = 1; + $objBookingDetail->comment = $objCartBookingData->comment; + $objBookingDetail->room_type_name = Product::getProductName($idProduct, null, $order->id_lang); - $objHtlBkDtl->date_from = $obj_cart_bk_data->date_from; - $objHtlBkDtl->date_to = $obj_cart_bk_data->date_to; + $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; $total_price = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $idProduct, - $obj_cart_bk_data->date_from, - $obj_cart_bk_data->date_to, + $objCartBookingData->date_from, + $objCartBookingData->date_to, 0, Group::getCurrent()->id, $this->context->cart->id, $this->context->cookie->id_guest, - $obj_cart_bk_data->id_room + $objCartBookingData->id_room ); - - $objHtlBkDtl->total_price_tax_excl = $total_price['total_price_tax_excl']; - $objHtlBkDtl->total_price_tax_incl = $total_price['total_price_tax_incl']; - $objHtlBkDtl->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); + $objBookingDetail->total_price_tax_excl = $total_price['total_price_tax_excl']; + $objBookingDetail->total_price_tax_incl = $total_price['total_price_tax_incl']; + $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); // Save hotel information/location/contact - if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($obj_cart_bk_data->id_room))) { - $objHtlBkDtl->room_num = $objRoom->room_num; + if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { + $objBookingDetail->room_num = $objRoom->room_num; } if (Validate::isLoadedObject($objHotelBranch = new HotelBranchInformation( - $obj_cart_bk_data->id_hotel, + $objCartBookingData->id_hotel, $idLang ))) { - $addressInfo = $objHotelBranch->getAddress($obj_cart_bk_data->id_hotel); - $objHtlBkDtl->hotel_name = $objHotelBranch->hotel_name; - $objHtlBkDtl->city = $addressInfo['city']; - $objHtlBkDtl->state = State::getNameById($addressInfo['id_state']); - $objHtlBkDtl->country = Country::getNameById($idLang, $addressInfo['id_country']); - $objHtlBkDtl->zipcode = $addressInfo['postcode'];; - $objHtlBkDtl->phone = $addressInfo['phone']; - $objHtlBkDtl->email = $objHotelBranch->email; - $objHtlBkDtl->check_in_time = $objHotelBranch->check_in; - $objHtlBkDtl->check_out_time = $objHotelBranch->check_out; + $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($idLang, $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 ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { - $objHtlBkDtl->adult = $roomTypeInfo['adult']; - $objHtlBkDtl->children = $roomTypeInfo['children']; + $objBookingDetail->adults = $objCartBookingData->adults; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; } - $objHtlBkDtl->save(); + $objBookingDetail->save(); } } @@ -2406,7 +2513,7 @@ class AdminOrdersControllerCore extends AdminController } /*By webkul To edit Order and cart entries when edit rooms from the orderLine when editing the order*/ - $product_informations = $_POST['add_product']; + $product_informations = $_POST['edit_product']; $new_date_from = trim(date('Y-m-d', strtotime($product_informations['date_from']))); $new_date_to = trim(date('Y-m-d', strtotime($product_informations['date_to']))); $old_date_from = trim(Tools::getValue('date_from')); @@ -2419,6 +2526,10 @@ class AdminOrdersControllerCore extends AdminController $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to); $old_product_quantity = (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to); $qty_diff = $product_quantity - $old_product_quantity; + $occupancy = array_shift(Tools::getValue('occupancy')); + $adults = $occupancy['adults']; + $children = $occupancy['children']; + $child_ages = $occupancy['child_ages']; /*By webkul to validate fields before deleting the cart and order data form the tables*/ if ($id_hotel == '') { @@ -2476,6 +2587,33 @@ class AdminOrdersControllerCore extends AdminController 'result' => false, 'error' => Tools::displayError('Invalid quantity.'), ))); + } elseif (!isset($adults) || !$adults || !Validate::isUnsignedInt($adults)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid number of adults.'), + ))); + } elseif (!Validate::isUnsignedInt($children)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid number of children.'), + ))); + } + if ($children > 0) { + if (!isset($child_ages) || ($children != count($child_ages))) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Please provide all children age.'), + ))); + } else { + foreach($child_ages as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid children age.'), + ))); + } + } + } } $rooms_booked = $obj_booking_detail->getRoomBookinInformationForDateRangeByOrder($id_room, $old_date_from, $old_date_to, $new_date_from, $new_date_to); @@ -2704,6 +2842,13 @@ class AdminOrdersControllerCore extends AdminController $old_date_to ); + // set occupancy details + $occupancy = array( + 'adults' => $adults, + 'children' => $children, + 'child_ages' => $child_ages + ); + /*By webkul to edit the Hotel Cart and Hotel Order tables when editing the room for the order detail page*/ $new_total_price = array( 'tax_excl' => $totalRoomPriceAfterTE, @@ -2716,6 +2861,7 @@ class AdminOrdersControllerCore extends AdminController $old_date_to, $new_date_from, $new_date_to, + $occupancy, $new_total_price )) { // update extra demands total prices if dates are changes (price calc method for each day) diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index a2da76a85..d57aa0d2e 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -109,15 +109,91 @@ class AdminPPreferencesControllerCore extends AdminController 'cast' => 'intval', 'required' => false, 'type' => 'bool' + ) + ), + 'submit' => array('title' => $this->l('Save')) + ), + 'search' => array( + 'title' => $this->l('Search'), + 'fields' => array( + 'PS_FRONT_SEARCH_TYPE' => array( + 'title' => $this->l('Front end search type'), + 'hint' => $this->l('Select search type for frontend. In "Occupancy wise search", occupancy field will be shown in the search panel and search will be based on required occupancy by the guest. In "Search without occupancy", All available room types will be shown for the search dates without any occupancy filter.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_TYPE_OWS, 'name' => $this->l('Occupancy wise search')), + array('id' => HotelBookingDetail::SEARCH_TYPE_NORMAL, 'name' => $this->l('Search without occupancy')) + ), + 'identifier' => 'id', + 'desc' => $this->l('Choose "Occupancy wise search" or "Search without occupancy". Occupancy search restriction will depend on this option selection at front end.'), + ), + 'PS_FRONT_OWS_SEARCH_ALGO_TYPE' => array( + 'title' => $this->l('Front end occupancy wise search algorithm'), + 'hint' => $this->l('In occupancy wise search at front end, you want to display only room types which are fully satisfying searched occupancy or you want to display all the available room types for the dates searched'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, 'name' => $this->l('Show room types satisfying required occupancy')), + array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types')) + ), + 'identifier' => 'id', + 'desc' => $this->l('This option is only for fully available rooms. For partially available rooms, always all possible rooms will be displayed.'), + ), + 'PS_FRONT_ROOM_UNIT_SELECTION_TYPE' => array( + 'title' => $this->l('In front-end, add rooms to cart with'), + 'hint' => $this->l('In Room occupancy, while adding rooms in cart customer has to select per room occupancy and in room quantity customer only has to select number of rooms.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Room Occupancy')), + array('id' => HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Rooms Quantity (No. of rooms)')) + ), + 'identifier' => 'id', + ), + 'PS_BACKOFFICE_SEARCH_TYPE' => array( + 'title' => $this->l('Back-office search type'), + 'hint' => $this->l('Select search type for Back-office. In "Occupancy wise search", occupancy field will be shown in the search panel and search will be based on required occupancy by the employee. In "Search without occupancy", All available room types will be shown for the search dates without any occupancy filter.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_TYPE_OWS, 'name' => $this->l('Occupancy wise search')), + array('id' => HotelBookingDetail::SEARCH_TYPE_NORMAL, 'name' => $this->l('Search without occupancy')) + ), + 'identifier' => 'id', + 'desc' => $this->l('Choose "Occupancy wise search" or "Search without occupancy". Occupancy search restriction will depend on this option selection at back-office.'), + ), + 'PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE' => array( + 'title' => $this->l('Back-office occupancy wise search algorithm'), + 'hint' => $this->l('In occupancy wise search at back-office, you want to display only room types which are fully satisfying searched occupancy or you want to display all the available room types for the dates searched.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, 'name' => $this->l('Show room types satisfying required occupancy')), + array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types')) + ), + 'identifier' => 'id', + 'desc' => $this->l('This option is only for fully available rooms. For partially available rooms, always all possible rooms will be displayed.'), + ), + 'PS_BACKOFFICE_ROOM_BOOKING_TYPE' => array( + 'title' => $this->l('In back-office, add rooms to cart with'), + 'hint' => $this->l('In Room occupancy, while adding rooms in cart customer has to select per room occupancy and in room quantity customer only has to select number of rooms.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Room Occupancy')), + array('id' => HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Rooms Quantity (No. of rooms)')) + ), + 'identifier' => 'id', ), 'PS_LOS_RESTRICTION_BO' => array( - 'title' => $this->l('Apply Min and Max lenght of stay restrictions for back-office bookings'), - 'hint' => $this->l('While creating bookings from back-office, apply minimum and maximum lenght of stay restrictions'), + 'title' => $this->l('Apply Min and Max lenght of stay restrictions for back-office search'), + 'hint' => $this->l('While searching for available rooms from back-office, apply minimum and maximum lenght of stay restrictions'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => false, 'type' => 'bool' - ) + ), ), 'submit' => array('title' => $this->l('Save')) ), @@ -306,6 +382,29 @@ class AdminPPreferencesControllerCore extends AdminController // 'bottom' => '', // 'submit' => array('title' => $this->l('Save')) // ), + 'fo_search_filters' => array( + 'title' => $this->l('Search Results Page Filters'), + 'icon' => 'icon-search', + 'fields' => array( + 'SHOW_AMENITIES_FILTER' => array( + 'title' => $this->l('Show Amenities filter'), + 'hint' => $this->l('Enable to display Amenities filter.'), + 'validation' => 'isBool', + 'cast' => 'intval', + 'required' => false, + 'type' => 'bool', + ), + 'SHOW_PRICE_FILTER' => array( + 'title' => $this->l('Show Price filter'), + 'hint' => $this->l('Enable to display Price filter.'), + 'validation' => 'isBool', + 'cast' => 'intval', + 'required' => false, + 'type' => 'bool', + ), + ), + 'submit' => array('title' => $this->l('Save')) + ), ); } @@ -333,9 +432,28 @@ class AdminPPreferencesControllerCore extends AdminController Db::getInstance()->execute($sql); } + if (Tools::getValue('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $_POST['PS_FRONT_ROOM_UNIT_SELECTION_TYPE'] = HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY; + } + + if (Tools::getValue('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $_POST['PS_BACKOFFICE_ROOM_BOOKING_TYPE'] = HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY; + } + if (Tools::getIsset('PS_CATALOG_MODE')) { Tools::clearSmartyCache(); Media::clearCache(); } } + + public function setMedia() + { + parent::setMedia(); + + Media::addJsDef(array( + 'SEARCH_TYPE_OWS' => HotelBookingDetail::SEARCH_TYPE_OWS + )); + + $this->addJS(_PS_JS_DIR_.'admin/ppreferences.js'); + } } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 7fcb98d1f..1d4b293c3 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -113,6 +113,7 @@ class AdminProductsControllerCore extends AdminController 'Configuration' => $this->l('Configuration'), 'Occupancy' => $this->l('Occupancy'), 'LengthOfStay' => $this->l('Length of Stay'), + 'AdditionalFacilities' => $this->l('Additional Facilities'), ); $this->available_tabs = array('Warehouses' => 14); @@ -134,6 +135,7 @@ class AdminProductsControllerCore extends AdminController 'Configuration' => 14, 'Occupancy' => 15, 'LengthOfStay' => 16, + 'AdditionalFacilities' => 17, )); } @@ -211,7 +213,7 @@ class AdminProductsControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)'; $this->_select .= ' (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, '; - $this->_select .= 'hrt.`adult`, hrt.`children`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, '; + $this->_select .= 'hrt.`adults`, hrt.`children`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, '; $this->_select .= 'shop.`name` AS `shopname`, a.`id_shop_default`, '; $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`'; @@ -253,9 +255,9 @@ class AdminProductsControllerCore extends AdminController 'callback' => 'getHotelName', ); } - $this->fields_list['adult'] = array( + $this->fields_list['adults'] = array( 'title' => $this->l('Adults'), - 'filter_key' => 'hrt!adult', + 'filter_key' => 'hrt!adults', 'align' => 'center', ); $this->fields_list['child'] = array( @@ -2228,6 +2230,9 @@ class AdminProductsControllerCore extends AdminController if ($this->isTabSubmitted('Configuration')) { $this->processConfiguration(); } + if ($this->isTabSubmitted('AdditionalFacilities')) { + $this->processAdditionalFacilities(); + } $this->updatePackItems($object); // Disallow avanced stock management if the product become a pack @@ -3433,6 +3438,7 @@ class AdminProductsControllerCore extends AdminController } else { $this->displayWarning($this->l('You must save this room type before managing occupancy.')); } + $smartyVars['currency'] = $this->context->currency; $data->assign($smartyVars); $this->tpl_form_vars['custom_form'] = $data->fetch(); } @@ -3449,16 +3455,48 @@ class AdminProductsControllerCore extends AdminController if (Validate::isLoadedObject($objRoomType = new HotelRoomType($idHtlRoomType))) { $baseAdults = Tools::getValue('base_adults'); $baseChildren = Tools::getValue('base_children'); + $maxAdults = Tools::getValue('max_adults'); + $maxChildren = Tools::getValue('max_children'); + $maxGuests = Tools::getValue('max_guests'); if (!$baseAdults || !Validate::isUnsignedInt($baseAdults)) { $this->errors[] = Tools::displayError('Invalid base adults'); } - if (!Validate::isUnsignedInt($baseChildren)) { + if ($baseChildren == '' || !Validate::isUnsignedInt($baseChildren)) { $this->errors[] = Tools::displayError('Invalid base children'); + } else if (Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + if ($baseChildren > Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + $this->errors[] = sprintf(Tools::displayError('Base children cannot be greater than max childern allowed on your website (Max: %s)'), Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')); + } } + if (!$maxAdults || !Validate::isUnsignedInt($maxAdults)) { + $this->errors[] = Tools::displayError('Invalid maximum number of adults'); + } elseif ($maxAdults < $baseAdults) { + $this->errors[] = Tools::displayError('Maximum number of adults cannot be less than base adults'); + } + if ($maxChildren == '' || !Validate::isUnsignedInt($maxChildren)) { + $this->errors[] = Tools::displayError('Invalid maximum number of children'); + } else if (Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + if ($maxChildren > Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + $this->errors[] = sprintf(Tools::displayError('Maximum number of children cannot be greater than max childern allowed on your website (Max: %s)'), Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')); + } + } elseif ($maxChildren < $baseChildren) { + $this->errors[] = Tools::displayError('Maximum number of children cannot be less than base children'); + } + if (!$maxGuests || !Validate::isUnsignedInt($maxGuests)) { + $this->errors[] = Tools::displayError('Invalid maximum number of guests'); + } elseif ($maxGuests < ($baseAdults + $baseChildren)) { + $this->errors[] = Tools::displayError('Maximum number of guests cannot be less than base occupancy of adults and children'); + } elseif ($maxGuests > ($maxChildren + $maxAdults)) { + $this->errors[] = Tools::displayError('Maximum number of guests cannot be more than max occupancy of adults and children'); + } + if (!count($this->errors)) { - $objRoomType->adult = $baseAdults; + $objRoomType->adults = $baseAdults; $objRoomType->children = $baseChildren; + $objRoomType->max_adults = $maxAdults; + $objRoomType->max_children = $maxChildren; + $objRoomType->max_guests = $maxGuests; $objRoomType->save(); } } else { @@ -3469,7 +3507,7 @@ class AdminProductsControllerCore extends AdminController } } } - + // send information for the length of stay tab public function initFormLengthOfStay($product) { @@ -3751,6 +3789,122 @@ class AdminProductsControllerCore extends AdminController die('0'); } + public function initFormAdditionalFacilities($obj) + { + $data = $this->createTemplate($this->tpl_form); + + if ($obj->id) { + $objGlobalDemand = new HotelRoomTypeGlobalDemand(); + $allDemands = $objGlobalDemand->getAllDemands(); + $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); + + // get room type additional facilities + $objRoomDemand = new HotelRoomTypeDemand(); + $roomDemandPrices = $objRoomDemand->getRoomTypeDemands($obj->id, 0, 0); + + $data->assign(array( + 'product' => $obj, + 'roomDemandPrices' => $roomDemandPrices, + 'allDemands' => $allDemands, + 'defaultcurrencySign' => $objCurrency->sign, + )); + } else { + $this->displayWarning($this->l('You must save this room type before managing additional facilities.')); + } + + $this->tpl_form_vars['custom_form'] = $data->fetch(); + } + + public function processAdditionalFacilities() + { + if ($idProduct = Tools::getValue('id_product')) { + $objRoomTypeDemand = new HotelRoomTypeDemand(); + $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); + // first delete all the previously saved prices and demands of this room type + $objRoomTypeDemand->deleteRoomTypeDemands($idProduct); + $objRoomTypeDemandPrice->deleteRoomTypeDemandPrices($idProduct); + if ($selectedDemands = Tools::getValue('selected_demand')) { + $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption(); + foreach ($selectedDemands as $idGlobalDemand) { + if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand))) { + // save selected demands for this room type + $objRoomTypeDemand = new HotelRoomTypeDemand(); + $objRoomTypeDemand->id_product = $idProduct; + $objRoomTypeDemand->id_global_demand = $idGlobalDemand; + $objRoomTypeDemand->save(); + + // save selected demands prices for this room type + $demandPrice = Tools::getValue('demand_price_'.$idGlobalDemand); + if (Validate::isPrice($demandPrice)) { + if ($objGlobalDemand->price != $demandPrice) { + $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); + $objRoomTypeDemandPrice->id_product = $idProduct; + $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand; + $objRoomTypeDemandPrice->id_option = 0; + $objRoomTypeDemandPrice->price = $demandPrice; + $objRoomTypeDemandPrice->save(); + } + } else { + $this->errors[] = Tools::displayError('Invalid demand price of facility.'). + ' : '.$objGlobalDemand->name[$this->context->language->id]; + } + if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) { + foreach ($advOptions as $option) { + if (Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($option['id']))) { + $optionPrice = Tools::getValue('option_price_'.$option['id']); + if (Validate::isPrice($optionPrice)) { + if ($optionPrice != $objAdvOption->price) { + $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); + $objRoomTypeDemandPrice->id_product = $idProduct; + $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand; + $objRoomTypeDemandPrice->id_option = $option['id']; + $objRoomTypeDemandPrice->price = $optionPrice; + $objRoomTypeDemandPrice->save(); + } + } else { + $this->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.'); + } + + $objCartBookingData = new HotelCartBookingData(); + if ($cartExtraDemands = $objCartBookingData->getCartExtraDemands(0, $idProduct)) { + // delete the demands from cart if not available in cart + $objRoomDemand = new HotelRoomTypeDemand(); + $roomTypeDemandIds = array(); + if ($roomTypeDemands = $objRoomDemand->getRoomTypeDemands($idProduct)) { + $roomTypeDemandIds = array_keys($roomTypeDemands); + } + foreach ($cartExtraDemands as &$demandInfo) { + if (isset($demandInfo['extra_demands']) && $demandInfo['extra_demands']) { + $cartChanged = 0; + foreach ($demandInfo['extra_demands'] as $key => $demand) { + if (!in_array($demand['id_global_demand'], $roomTypeDemandIds)) { + $cartChanged = 1; + unset($demandInfo['extra_demands'][$key]); + } + } + if ($cartChanged) { + if (Validate::isLoadedObject( + $objCartBooking = new HotelCartBookingData($demandInfo['id']) + )) { + $objCartBooking->extra_demands = json_encode($demandInfo['extra_demands']); + $objCartBooking->save(); + } + } + } + } + } + } + } + } + /** * @param Product $obj * diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index d17cd3252..a64d044c2 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -34,11 +34,14 @@ class AdminSlipControllerCore extends AdminController $this->bootstrap = true; $this->table = 'order_slip'; $this->className = 'OrderSlip'; + $this->list_no_link = true; $this->_select = ' o.`id_shop`'; $this->_join .= ' LEFT JOIN '._DB_PREFIX_.'orders o ON (o.`id_order` = a.`id_order`)'; $this->_group = ' GROUP BY a.`id_order_slip`'; + $this->addRowAction('statusChange'); + $this->fields_list = array( 'id_order_slip' => array( 'title' => $this->l('ID'), @@ -63,7 +66,26 @@ class AdminSlipControllerCore extends AdminController 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, - 'remove_onclick' => true) + 'remove_onclick' => true + ), + 'redeem_status' => array( + 'title' => $this->l('Status'), + 'type' => 'select', + 'list' => array( + OrderSlip::REDEEM_STATUS_ACTIVE => $this->l('Active'), + OrderSlip::REDEEM_STATUS_REDEEMED => $this->l('Redeemed'), + ), + 'align' => 'center', + 'filter_key' => 'a!redeem_status', + 'callback' => 'displayRedeemStatus', + 'class' => 'fixed-width-md', + ), + 'id_cart_rule' => array( + 'title' => $this->l('Voucher'), + 'align' => 'center', + 'callback' => 'displayVoucherLink', + 'class' => 'fixed-width-lg', + ), ); $this->_select = 'a.id_order_slip AS id_pdf'; @@ -162,6 +184,38 @@ class AdminSlipControllerCore extends AdminController } } + public function processStatusChange() + { + $idOrderSlip = Tools::getValue('id_order_slip'); + $objOrderSlip = new OrderSlip($idOrderSlip); + + if (!Validate::isLoadedObject($objOrderSlip)) { + $this->errors[] = $this->l('The credit slip can not be loaded.'); + } elseif ($objOrderSlip->redeem_status != OrderSlip::REDEEM_STATUS_ACTIVE) { + $this->errors[] = $this->l('The status for this credit slip can not be changed.'); + } else { + $objOrder = new Order($objOrderSlip->id_order); + $objCustomer = new Customer($objOrderSlip->id_customer); + + if (!Validate::isLoadedObject($objOrder)) { + $this->errors[] = $this->l('The related order for this credit slip can not be loaded.'); + } + + if (!Validate::isLoadedObject($objCustomer)) { + $this->errors[] = $this->l('The related customer for this credit slip can not be loaded.'); + } + } + + if (!count($this->errors)) { + $objOrderSlip->redeem_status = OrderSlip::REDEEM_STATUS_REDEEMED; + if ($objOrderSlip->save()) { + Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&conf=4'); + } + + $this->errors[] = $this->l('Something went wrong while changing status.'); + } + } + public function initContent() { $this->initTabModuleList(); @@ -202,4 +256,43 @@ class AdminSlipControllerCore extends AdminController return $this->createTemplate('_print_pdf_icon.tpl')->fetch(); } + + public function displayRedeemStatus($redeemStatus, $row) + { + $this->context->smarty->assign(array( + 'redeem_status' => $redeemStatus, + )); + + return $this->createTemplate('_redeem_status.tpl')->fetch(); + } + + public function displayVoucherLink($idCartRule, $row) + { + if ($row['redeem_status'] == OrderSlip::REDEEM_STATUS_REDEEMED && $idCartRule) { + $this->context->smarty->assign(array( + 'id_cart_rule' => (int) $idCartRule, + )); + + return $this->createTemplate('_display_voucher_link.tpl')->fetch(); + } + + return '--'; + } + + public function displayStatusChangeLink($token = null, $id) + { + $objOrderSlip = new OrderSlip($id); + if ($objOrderSlip->redeem_status != OrderSlip::REDEEM_STATUS_REDEEMED) { + $statusChangeLink = self::$currentIndex.'&'.$this->identifier.'='.$id.'&action=statusChange'. + '&token='.($token != null ? $token : $this->token); + + $this->context->smarty->assign(array( + 'status_change_link' => $statusChangeLink, + )); + + return $this->createTemplate('_status_change_link.tpl')->fetch(); + } + + return '--'; + } } diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 30fe17e2d..693b8ce0f 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -842,7 +842,9 @@ class AdminStatsControllerCore extends AdminStatsTabController $totalDepartures = Db::getInstance()->getValue( 'SELECT COUNT(hbd.`id_room`) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd - WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0 + WHERE hbd.`is_refunded` = 0 + AND ((hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN.') OR + (hbd.`check_in` != "0000:00:00 00:00:00" AND hbd.`check_out` != "0000:00:00 00:00:00")) AND hbd.`date_to` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'. HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') ); @@ -850,9 +852,10 @@ class AdminStatsControllerCore extends AdminStatsTabController $departed = Db::getInstance()->getValue( 'SELECT COUNT(hbd.`id_room`) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd - WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0 + WHERE hbd.`is_refunded` = 0 AND hbd.`date_to` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59" - AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_OUT. + AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_OUT.' + AND hbd.`check_in` != "0000:00:00 00:00:00"'. HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') ); @@ -900,7 +903,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getGuestsByDate($date, $idHotel = false) { return Db::getInstance()->getRow( - 'SELECT SUM(hbd.`adult`) AS `adults`, SUM(hbd.`children`) AS `children` + 'SELECT SUM(hbd.`adults`) AS `adults`, SUM(hbd.`children`) AS `children` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0 AND hbd.`date_from` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'. @@ -1136,6 +1139,87 @@ class AdminStatsControllerCore extends AdminStatsTabController ); } + public static function getArrivalsInfoByDate($date, $idHotel = null) + { + $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los + FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) + WHERE hbd.`is_refunded` = 0 AND hbd.`date_from` = "'.pSQL($date).' 00:00:00" + AND hbd.`id_status` != '.(int) HotelBookingDetail::STATUS_CHECKED_IN.' + AND hbd.`id_status` != '.(int) HotelBookingDetail::STATUS_CHECKED_OUT. + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : ''); + $result = Db::getInstance()->executeS($sql); + + return $result; + } + + public static function getDeparturesInfoByDate($date, $idHotel = null) + { + $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los + FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) + WHERE hbd.`is_refunded` = 0 AND hbd.`date_to` = "'.pSQL($date).' 00:00:00" + AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN. + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : ''); + $result = Db::getInstance()->executeS($sql); + + return $result; + } + + public static function getInHousesInfo($idHotel = null) + { + $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los + FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) + WHERE hbd.`is_refunded` = 0 AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN. + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : ''); + $result = Db::getInstance()->executeS($sql); + + return $result; + } + + public static function getNewBookingsInfoByDate($date, $idHotel = null) + { + $sql = 'SELECT hbd.`id_customer`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + COUNT(hbd.`id`) AS total_rooms, SUM(hbd.`adult` + hbd.`children`) AS total_guests, + hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name` + FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) + LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl + ON (osl.`id_order_state` = o.`current_state` AND osl.`id_lang` = '.(int) Context::getContext()->language->id.') + LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) + WHERE hbd.`date_add` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'. + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '').' + GROUP BY hbd.`id_order`'; + $result = Db::getInstance()->executeS($sql); + + return $result; + } + + public static function getCancellationsInfoByDate($date, $idHotel = null) + { + $sql = 'SELECT orr.`id_order_return`, orr.`id_customer`, hbd.`room_num`, hbd.`id_product`, hbd.`room_type_name`, + CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + hbd.`id_hotel`, hbd.`hotel_name`, SUM(hbd.`adult` + hbd.`children`) AS total_guests, + hbd.`date_from`, hbd.`date_to`, orr.`id_order` + FROM `'._DB_PREFIX_.'order_return` orr + LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (ord.`id_order_return` = orr.`id_order_return`) + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = orr.`id_order`) + LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id` = ord.`id_htl_booking`) + LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = orr.`id_customer`) + WHERE orr.`date_add` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59" + AND orr.`state` = '.(int) OrderReturnState::ORDER_RETRUN_FIRST_STATUS. + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '').' + GROUP BY ord.`id_htl_booking` + ORDER BY orr.`date_add` DESC'; + $result = Db::getInstance()->executeS($sql); + + return $result; + } + public static function getOccupiedRoomsForDiscreteDates($dateFrom, $dateTo = null, $idHotel = null, $useCache = true) { $dateTo = !$dateTo ? date('Y-m-d', strtotime('+1 day', strtotime($dateFrom))) : $dateTo; diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index a44865537..76b647759 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -176,15 +176,16 @@ class CartControllerCore extends FrontController $result = $objCartBooking->deleteCartBookingData($id_cart, $id_product, 0, 0, 0, 0); if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product)) { if ($id_hotel = $roomTypeInfo['id_hotel']) { - $obj_booking_dtl = new HotelBookingDetail(); - if ($hotel_room_data = $obj_booking_dtl->DataForFrontSearch( - $date_from, - $date_to, - $id_hotel, - $id_product, - 1 - )) { - $total_available_rooms = $hotel_room_data['stats']['num_avail']; + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { + $total_available_rooms = $hotelRoomData['stats']['num_avail']; } } } @@ -267,11 +268,27 @@ class CartControllerCore extends FrontController $date_to = Tools::getValue('dateTo'); $date_from = date("Y-m-d", strtotime($date_from)); $date_to = date("Y-m-d", strtotime($date_to)); + $operator = Tools::getValue('op', 'up'); + + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + + if ($occupancyRequiredForBooking) { + if ($occupancy = json_decode(Tools::getValue('occupancy'), true)) { + $this->qty = count($occupancy); + } else { + $this->errors[] = Tools::displayError('Invalid occupnacy.'); + } + } else { + $occupancy = Tools::getValue('qty'); + $this->qty = $occupancy; + } + $id_cart = $this->context->cart->id; $id_guest = $this->context->cart->id_guest; - - if ($this->qty == 0) { $this->errors[] = Tools::displayError('Null quantity.', !Tools::getValue('ajax')); } elseif (!$this->id_product) { @@ -284,71 +301,106 @@ class CartControllerCore extends FrontController return; } - $qty_to_check = $this->qty; - $cart_products = $this->context->cart->getProducts(); - - // By Webkul : This code is to check available quantity of Room before adding it to cart. - // only check availability if qty is increasing - if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { - require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - $objRoomType = new HotelRoomType(); - if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) { - if ($id_hotel = $roomTypeInfo['id_hotel']) { - if (strtotime($date_from) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('You can\'t book room before current date'); - } elseif (strtotime($date_from) >= strtotime($date_to)) { - $this->errors[] = Tools::displayError('Check-out date must be after check-in date'); - } elseif ($maxOrdDate = HotelOrderRestrictDate::getMaxOrderDate($id_hotel)) { - // Check Order restrict condition before adding in to cart - if (strtotime('-1 day', strtotime($maxOrdDate)) < strtotime($date_from) - || strtotime($maxOrdDate) < strtotime($date_to) - ) { - $maxOrdDate = date('d-m-Y', strtotime($maxOrdDate)); - $this->errors[] = Tools::displayError('You can\'t book room after date '.$maxOrdDate); - } + // valdiate occupancy if providede + if ($operator == 'up') { + if ($occupancyRequiredForBooking) { + foreach($occupancy as $key => $roomOccupancy) { + if (!isset($roomOccupancy['adults']) || !$roomOccupancy['adults'] || !Validate::isUnsignedInt($roomOccupancy['adults'])) { + $this->errors[] = sprintf(Tools::displayError('Invalid number of adults for Room %s.'), ($key + 1)); + } + if (isset($roomOccupancy['children'])) { + if (!Validate::isUnsignedInt($roomOccupancy['children'])) { + $this->errors[] = sprintf(Tools::displayError('Invalid number of children for Room %s.'), ($key + 1)); } - if (!$this->errors) { - $objBookingDtl = new HotelBookingDetail(); - $num_days = $objBookingDtl->getNumberOfDays($date_from, $date_to); - $req_rm = $this->qty; - $this->qty = $this->qty * (int) $num_days; - $obj_booking_dtl = new HotelBookingDetail(); - if ($hotel_room_data = $obj_booking_dtl->DataForFrontSearch( - $date_from, - $date_to, - $id_hotel, - $this->id_product, - 1, - 0, - 0, - -1, - 0, - 0, - $id_cart, - $id_guest - )) { - if (isset($hotel_room_data['stats']['num_avail'])) { - $total_available_rooms = $hotel_room_data['stats']['num_avail']; - if (Tools::getValue('op', 'up') == 'up') { - if ($total_available_rooms < $req_rm) { - die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); + if ($roomOccupancy['children'] > 0) { + if (!isset($roomOccupancy['child_ages']) || ($roomOccupancy['children'] != count($roomOccupancy['child_ages'])) || !is_array($roomOccupancy['child_ages'])) { + $this->errors[] = sprintf(Tools::displayError('Please provide all children age for Room %s.'), ($key + 1)); + } else { + if (is_array($roomOccupancy['child_ages'])) { + foreach($roomOccupancy['child_ages'] as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + $this->errors[] = sprintf(Tools::displayError('Invalid children age for Room %s.'), ($key + 1)); } } - } else { - $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); + } + } + } + } + } + } + } + // By Webkul : This code is to check available quantity of Room before adding it to cart. + // only check availability if qty is increasing + if (!$this->errors) { + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) { + if ($id_hotel = $roomTypeInfo['id_hotel']) { + if (strtotime($date_from) < strtotime(date('Y-m-d'))) { + $this->errors[] = Tools::displayError('You can\'t book room before current date'); + } elseif (strtotime($date_from) >= strtotime($date_to)) { + $this->errors[] = Tools::displayError('Check-out date must be after check-in date'); + } elseif ($maxOrdDate = HotelOrderRestrictDate::getMaxOrderDate($id_hotel)) { + // Check Order restrict condition before adding in to cart + if (strtotime('-1 day', strtotime($maxOrdDate)) < strtotime($date_from) + || strtotime($maxOrdDate) < strtotime($date_to) + ) { + $maxOrdDate = date('d-m-Y', strtotime($maxOrdDate)); + $this->errors[] = Tools::displayError('You can\'t book room after date '.$maxOrdDate); + } + } + if ($occupancyRequiredForBooking) { + foreach($occupancy as $key => $roomOccupancy) { + if ($roomOccupancy['adults'] > $roomTypeInfo['max_adults']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have adults more than %s'), $key + 1, $roomTypeInfo['max_adults']); + } + if ($roomOccupancy['children'] > $roomTypeInfo['max_children']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have children more than %s'), $key + 1, $roomTypeInfo['max_children']); + } + if ($roomOccupancy['adults'] + $roomOccupancy['children'] > $roomTypeInfo['max_guests']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have total guests more than %s'), $key + 1, $roomTypeInfo['max_guests']); + } + } + } + if (!$this->errors) { + $objBookingDetail = new HotelBookingDetail(); + $num_days = $objBookingDetail->getNumberOfDays($date_from, $date_to); + $req_rm = $this->qty; + $this->qty = $this->qty * (int) $num_days; + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $this->id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { + if (isset($hotelRoomData['stats']['num_avail'])) { + $total_available_rooms = $hotelRoomData['stats']['num_avail']; + if (Tools::getValue('op', 'up') == 'up') { + if ($total_available_rooms < $req_rm) { + die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); + } } } else { $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); } + } else { + $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); } - } else { - die(json_encode(array('status' => 'failed3'))); } } else { - die(json_encode(array('status' => 'failed4'))); + die(json_encode(array('status' => 'failed3'))); } + } else { + die(json_encode(array('status' => 'failed4'))); + } } + $cart_products = $this->context->cart->getProducts(); + $qty_to_check = $this->qty; if (is_array($cart_products)) { foreach ($cart_products as $cart_product) { if ((!isset($this->id_product_attribute) || $cart_product['id_product_attribute'] == $this->id_product_attribute) && @@ -411,54 +463,37 @@ class CartControllerCore extends FrontController /* * To add Rooms in hotel cart */ - if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { - if (Tools::getValue('op', 'up') == 'up') { - $update_quantity = $this->context->cart->updateQty($this->qty, $this->id_product, $this->id_product_attribute, $this->customization_id, Tools::getValue('op', 'up'), $this->id_address_delivery); - $this->availQty = false; - $id_customer = $this->context->cart->id_customer; - $id_currency = $this->context->cart->id_currency; - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; - $chkQty = 0; - foreach ($hotel_room_info_arr as $key_hotel_room_info => $val_hotel_room_info) { - if ($chkQty < $req_rm) { - $roomDemand = Tools::getValue('roomDemands'); - $roomDemand = json_decode($roomDemand, true); - $roomDemand = json_encode($roomDemand); - $obj_htl_cart_booking_data = new HotelCartBookingData(); - $obj_htl_cart_booking_data->id_cart = $this->context->cart->id; - $obj_htl_cart_booking_data->id_guest = $this->context->cart->id_guest; - $obj_htl_cart_booking_data->id_customer = $id_customer; - $obj_htl_cart_booking_data->id_currency = $id_currency; - $obj_htl_cart_booking_data->id_product = $val_hotel_room_info['id_product']; - $obj_htl_cart_booking_data->id_room = $val_hotel_room_info['id_room']; - $obj_htl_cart_booking_data->id_hotel = $val_hotel_room_info['id_hotel']; - $obj_htl_cart_booking_data->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; - $obj_htl_cart_booking_data->quantity = $num_days; - $obj_htl_cart_booking_data->extra_demands = $roomDemand; - $obj_htl_cart_booking_data->date_from = $date_from; - $obj_htl_cart_booking_data->date_to = $date_to; - $obj_htl_cart_booking_data->save(); - ++$chkQty; - } else { - break; - } - } - $this->availQty = $total_available_rooms - $req_rm; - } else { - $objCartBooking = new HotelCartBookingData(); - $update_quantity = $objCartBooking->deleteCartBookingData( - $id_cart, - $this->id_product, - 0, - $date_from, - $date_to - ); - $this->availQty = $total_available_rooms + $req_rm; - - } - $this->context->cookie->avail_rooms = $this->availQty; + $objHotelCartBookingData = new HotelCartBookingData(); + $roomDemand = json_decode(Tools::getValue('roomDemands'), true); + $roomDemand = json_encode($roomDemand); + $this->availQty = $total_available_rooms; + $update_quantity = $objHotelCartBookingData->updateRoomCartBookingData( + $this->id_product, + $occupancy, + $operator, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $id_cart, + $id_guest + ); + if ($operator == 'up') { + $this->availQty = $total_available_rooms - $req_rm; + $this->context->cookie->currentAddedProduct = json_encode(array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'id_product' => $this->id_product, + 'occupancy' => $occupancy, + 'room_demand' => $roomDemand, + 'req_rm' => $req_rm + )); + } else { + $this->availQty = $total_available_rooms + $req_rm; } + $this->context->cookie->avail_rooms = $this->availQty; + /*------ BY Webkul ------*/ if ($update_quantity < 0) { diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 607257ac1..56512a942 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -57,6 +57,9 @@ class CategoryControllerCore extends FrontController )); } + $this->addCSS(_THEME_CSS_DIR_.'occupancy.css'); + $this->addJS(_THEME_JS_DIR_.'occupancy.js'); + $scenes = Scene::getScenes($this->category->id, $this->context->language->id, true, false); if ($scenes && count($scenes)) { $this->addJS(_THEME_JS_DIR_.'scenes.js'); @@ -99,11 +102,15 @@ class CategoryControllerCore extends FrontController $dateFrom = Tools::getValue('date_from'); $dateTo = Tools::getValue('date_to'); - if ($dateFrom != '' && !Validate::isDate($dateFrom)) { + $currentTimestamp = strtotime(date('Y-m-d')); + $dateFromTimestamp = strtotime($dateFrom); + $dateToTimestamp = strtotime($dateTo); + + if ($dateFrom != '' && ($dateFromTimestamp === false || ($dateFromTimestamp < $currentTimestamp))) { Tools::redirect($this->context->link->getPageLink('pagenotfound')); } - if ($dateTo != '' && !Validate::isDate($dateTo)) { + if ($dateTo != '' && ($dateToTimestamp === false || ($dateToTimestamp < $currentTimestamp))) { Tools::redirect($this->context->link->getPageLink('pagenotfound')); } @@ -150,6 +157,9 @@ class CategoryControllerCore extends FrontController $date_to = date('Y-m-d', strtotime($date_from) + 86400); } + // get occupancy of the search + $occupancy = Tools::getValue('occupancy'); + $currency = new Currency($this->context->currency->id); if (Module::isInstalled('hotelreservationsystem')) { @@ -160,8 +170,18 @@ class CategoryControllerCore extends FrontController $id_cart = $this->context->cart->id; $id_guest = $this->context->cookie->id_guest; - $obj_booking_dtl = new HotelBookingDetail(); - $booking_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, 0, 0, 0, 0, -1, 0, 0, $id_cart, $id_guest); + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'occupancy' => $occupancy, + 'hotel_id' => $id_hotel, + 'get_total_rooms' => 0, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + + $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); $feat_img_dir = _PS_IMG_.'rf/'; $ratting_img = _MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icons-sprite.png'; @@ -239,21 +259,24 @@ class CategoryControllerCore extends FrontController $date_to = Tools::getValue('date_to'); $htl_id_category = Tools::getValue('id_category'); + // occupancy of the search + $occupancy = Tools::getValue('occupancy'); + $sort_by = Tools::getValue('sort_by'); $sort_value = Tools::getValue('sort_value'); $filter_data = Tools::getValue('filter_data'); - $adult = 0; - $child = 0; + $adults = 0; + $children = 0; $amenities = 0; $price = 0; if (!empty($filter_data)) { foreach ($filter_data as $key => $value) { - if ($key == 'adult') { - $adult = min($value); + if ($key == 'adults') { + $adults = min($value); } elseif ($key == 'children') { - $child = min($value); + $children = min($value); } elseif ($key == 'amenities') { $amenities = array(); foreach ($value as $a_k => $a_v) { @@ -272,11 +295,21 @@ class CategoryControllerCore extends FrontController $id_hotel = HotelBranchInformation::getHotelIdByIdCategory($htl_id_category); - $id_cart = $this->context->cart->id; - $id_guest = $this->context->cookie->id_guest; + $objBookingDetail = new HotelBookingDetail(); - $obj_booking_dtl = new HotelBookingDetail(); - $booking_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, 0, 0, $adult, $child, -1, $amenities, $price, $id_cart, $id_guest); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'occupancy' => $occupancy, + 'amenities' => $amenities, + 'price' => $price, + 'get_total_rooms' => 0, + 'id_cart' => $this->context->cart->id, + 'id_guest' => $this->context->cookie->id_guest, + ); + + $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); // reset array keys from 0 $booking_data['rm_data'] = array_values($booking_data['rm_data']); if ($sort_by && $sort_value) { diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index e497e0a1e..e227fe592 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -250,7 +250,7 @@ class GuestTrackingControllerCore extends FrontController $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; $cartHotelData[$type_key]['cover_img'] = $cover_img; - $cartHotelData[$type_key]['adult'] = $rm_dtl['adult']; + $cartHotelData[$type_key]['adults'] = $rm_dtl['adults']; $cartHotelData[$type_key]['children'] = $rm_dtl['children']; $objBookingDemand = new HotelBookingDemands(); diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 868eb6fee..228dde274 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -155,8 +155,9 @@ class OrderConfirmationControllerCore extends FrontController $cart_htl_data[$type_key]['id_product'] = $type_value['product_id']; $cart_htl_data[$type_key]['cover_img'] = $cover_img; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; + $cart_htl_data[$type_key]['adults'] = $rm_dtl['adults']; $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; + foreach ($order_bk_data as $data_k => $data_v) { $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); /*Product price when order was created*/ @@ -176,6 +177,9 @@ class OrderConfirmationControllerCore extends FrontController $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; $var_quant = (int) $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + //// By webkul New way to calculate product prices with feature Prices $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; @@ -195,6 +199,10 @@ class OrderConfirmationControllerCore extends FrontController $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + + // By webkul New way to calculate product prices with feature Prices $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 07d84ff97..fdb54ae3a 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -246,7 +246,7 @@ class OrderDetailControllerCore extends FrontController } } // Emails to customer, admin on refund request state change - $objOrderReturn->changeIdOrderReturnState(OrderReturnState::ORDER_RETRUN_FIRST_STATUS, $objOrderReturn->id); + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); die(json_encode(array('status' => 1))); } @@ -321,8 +321,6 @@ class OrderDetailControllerCore extends FrontController $rm_dtl = $objRoomType->getRoomTypeInfoByIdProduct($type_value['product_id']); $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; $cartHotelData[$type_key]['cover_img'] = $cover_img; - $cartHotelData[$type_key]['adult'] = $rm_dtl['adult']; - $cartHotelData[$type_key]['children'] = $rm_dtl['children']; $objBookingDemand = new HotelBookingDemands(); foreach ($order_bk_data as $data_k => $data_v) { @@ -339,6 +337,9 @@ class OrderDetailControllerCore extends FrontController $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['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']; @@ -355,6 +356,8 @@ class OrderDetailControllerCore extends FrontController $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; @@ -428,7 +431,6 @@ class OrderDetailControllerCore extends FrontController $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); } - $this->context->smarty->assign( array( 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index 26a5372c8..2b33b6cad 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -53,4 +53,34 @@ class OrderSlipControllerCore extends FrontController $this->context->smarty->assign('ordersSlip', OrderSlip::getOrdersSlip((int)$this->context->cookie->id_customer)); $this->setTemplate(_PS_THEME_DIR_.'order-slip.tpl'); } + + public function postProcess() + { + if (Tools::isSubmit('generateVoucher')) { + $idOrderSlip = Tools::getValue('id_order_slip'); + $objOrderSlip = new OrderSlip($idOrderSlip); + if (!Validate::isLoadedObject($objOrderSlip)) { + $this->errors[] = Tools::displayError('The credit slip is invalid.'); + } elseif ($objOrderSlip->redeem_status == OrderSlip::REDEEM_STATUS_REDEEMED) { + $this->errors[] = Tools::displayError('The credit slip has already been redeemed.'); + } elseif ($objOrderSlip->id_customer != $this->context->customer->id) { + $this->errors[] = Tools::displayError('Invalid request.'); + } + + if (!count($this->errors)) { + if ($objOrderSlip->generateVoucher()) { + Tools::redirect($this->context->link->getPageLink( + $this->php_self, + $this->ssl, + $this->context->language->id, + 'confirmation=1' + )); + } + + $this->errors[] = Tools::displayError('The voucher code for this credit slip could not be generated.'); + } + } + + parent::postProcess(); + } } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 997053ca9..0b7c74664 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -46,10 +46,10 @@ class ProductControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'product.css'); $this->addCSS(_THEME_CSS_DIR_.'print.css', 'print'); $this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll', 'bxslider')); - $this->addCSS(_THEME_CSS_DIR_.'datepicker.css'); + $this->addJS(array( _THEME_JS_DIR_.'tools.js', // retro compat themes 1.5 - _THEME_JS_DIR_.'product.js' + _THEME_JS_DIR_.'product.js', )); } else { $this->addJqueryPlugin(array('scrollTo', 'serialScroll')); @@ -60,6 +60,9 @@ class ProductControllerCore extends FrontController )); } + $this->addCSS(_THEME_CSS_DIR_.'occupancy.css'); + $this->addJS(_THEME_JS_DIR_.'occupancy.js'); + if (Configuration::get('PS_DISPLAY_JQZOOM') == 1) { $this->addJqueryPlugin('jqzoom'); } @@ -92,11 +95,15 @@ class ProductControllerCore extends FrontController $dateFrom = Tools::getValue('date_from'); $dateTo = Tools::getValue('date_to'); - if ($dateFrom != '' && !Validate::isDate($dateFrom)) { + $currentTimestamp = strtotime(date('Y-m-d')); + $dateFromTimestamp = strtotime($dateFrom); + $dateToTimestamp = strtotime($dateTo); + + if ($dateFrom != '' && ($dateFromTimestamp === false || ($dateFromTimestamp < $currentTimestamp))) { Tools::redirect($this->context->link->getPageLink('pagenotfound')); } - if ($dateTo != '' && !Validate::isDate($dateTo)) { + if ($dateTo != '' && ($dateToTimestamp === false || ($dateToTimestamp < $currentTimestamp))) { Tools::redirect($this->context->link->getPageLink('pagenotfound')); } @@ -287,7 +294,7 @@ class ProductControllerCore extends FrontController $obj_hotel_room_type = new HotelRoomType(); $room_info_by_product_id = $obj_hotel_room_type->getRoomTypeInfoByIdProduct($this->product->id); $productCapacity = array(); - $productCapacity['adult'] = $room_info_by_product_id['adult']; + $productCapacity['adults'] = $room_info_by_product_id['adults']; $productCapacity['children'] = $room_info_by_product_id['children']; $this->product->capacity = $productCapacity; $hotel_id = $room_info_by_product_id['id_hotel']; @@ -359,6 +366,7 @@ class ProductControllerCore extends FrontController $this->context->smarty->assign( array( + 'room_type_info' => $room_info_by_product_id, 'isHotelRefundable' => $hotel_branch_obj->isRefundable(), 'max_order_date' => $max_order_date, 'preparation_time' => $preparationTime, @@ -471,7 +479,7 @@ class ProductControllerCore extends FrontController $idProduct, $dateFrom, $dateTo, - $quantity = 1, + $occupancy = array(), $jsonDemands = '' ) { $objProduct = new Product($idProduct, true, $this->context->language->id, $this->context->shop->id); @@ -509,23 +517,22 @@ class ProductControllerCore extends FrontController } $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo); - - $hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, ); + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $bookingParams['occupancy'] = $occupancy; + $quantity = count($occupancy); + } else { + $quantity = $occupancy; + } - if ($hotelRoomData) { + if ($hotelRoomData = $objBookingDetail->DataForFrontSearch($bookingParams)) { $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; $quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity; } @@ -580,6 +587,13 @@ class ProductControllerCore extends FrontController // calculate total price $totalPrice = $totalRoomPrice + $demandsPrice; + // send occupancy information searched by the user + if ($this->ajax && $occupancy && is_array($occupancy)) { + $smartyVars['occupancies'] = $occupancy; + $smartyVars['occupancy_adults'] = array_sum(array_column($occupancy, 'adults')); + $smartyVars['occupancy_children'] = array_sum(array_column($occupancy, 'children')); + $smartyVars['occupancy_child_ages'] = array_sum(array_column($occupancy, 'child_ages')); + } $smartyVars['hotel_location'] = $hotelLocation; $smartyVars['order_date_restrict'] = $orderDateRestrict; @@ -1070,7 +1084,7 @@ class ProductControllerCore extends FrontController $idProduct = (int) Tools::getValue('id_product'); $dateFrom = Tools::getValue('date_from'); $dateTo = Tools::getValue('date_to'); - $quantity = (int) Tools::getValue('quantity'); + $occupancy = Tools::getValue('occupancy'); $roomTypeDemands = Tools::getValue('room_type_demands'); $dateFrom = date('Y-m-d', strtotime($dateFrom)); @@ -1080,7 +1094,7 @@ class ProductControllerCore extends FrontController $idProduct, $dateFrom, $dateTo, - $quantity, + $occupancy, $roomTypeDemands )) { $html = $this->context->smarty->fetch('_partials/booking-form.tpl'); @@ -1091,102 +1105,6 @@ class ProductControllerCore extends FrontController $this->ajaxDie(json_encode($response)); } - public function displayAjaxCheckRoomAvailabilityAndRate() - { - $result = array(); - if ($idProduct = Tools::getValue('id_product')) { - $objHotelRoomType = new HotelRoomType(); - if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($idProduct)) { - $dateFrom = Tools::getValue('date_from'); - $dateTo = Tools::getValue('date_to'); - $quantity = Tools::getValue('qty'); - if ($idHotel = $roomTypeInfo['id_hotel']) { - $objBookingDetail = new HotelBookingDetail(); - if ($hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $this->context->cart->id, - $this->context->cart->id_guest - )) { - $totalAvailRooms = $hotelRoomData['stats']['num_avail']; - if ($totalAvailRooms >= $quantity) { - $totalPrice = 0; - $useTax = HotelBookingDetail::useTax(); - $product = new Product($idProduct); - $productPriceWithoutReduction = $product->getPriceWithoutReduct(!$useTax); - $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo); - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $idProduct, - $dateFrom, - $dateTo - ); - if ($useTax) { - $priceProduct = Product::getPriceStatic($idProduct, true); - $featurePrice = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($idProduct, $dateFrom, $dateTo, true); - $roomTypeDateRangePrice = $roomTypeDateRangePrice['total_price_tax_incl']; - } else { - $priceProduct = Product::getPriceStatic($idProduct, false); - $featurePrice = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($idProduct, $dateFrom, $dateTo, false); - $roomTypeDateRangePrice = $roomTypeDateRangePrice['total_price_tax_excl']; - } - $featurePriceDiff = (float)($productPriceWithoutReduction - $featurePrice); - - //$price_tax_incl = Product::getPriceStatic($idProduct, $price_tax); - $totalRoomPrice = $roomTypeDateRangePrice * $quantity; - $totalPrice += $totalRoomPrice; - $demandsPrice = 0; - if ($roomDemand = Tools::getValue('room_demands')) { - if ($roomDemand = json_decode($roomDemand, true)) { - $objRoomDemandPrice = new HotelRoomTypeDemandPrice(); - $demandsPrice = $objRoomDemandPrice->getRoomTypeDemandsTotalPrice( - $idProduct, - $roomDemand, - $useTax, - $dateFrom, - $dateTo - ); - $demandsPrice *= $quantity; - $totalPrice += $demandsPrice; - } - } - $result['msg'] = 'success'; - $result['quantity'] = (int)$quantity; - $result['total_price'] = $totalPrice; - $result['total_room_price'] = $totalRoomPrice; - $result['extra_demand_price'] = $demandsPrice; - $result['num_days'] = $numDays; - $result['avail_rooms'] = $totalAvailRooms; - $result['original_product_price'] = $priceProduct; - $result['feature_price'] = $featurePrice; - $result['feature_price_diff'] = $featurePriceDiff; - } else { - $result['msg'] = 'unavailable_quantity'; - $result['avail_rooms'] = $totalAvailRooms; - } - } else { - $result['msg'] = 'failed1'; - $result['avail_rooms'] = $totalAvailRooms; - } - } else { - $result['msg'] = 'failed2'; - $result['avail_rooms'] = $totalAvailRooms; - } - } - } else { - $result['msg'] = 'failed3'; - $result['avail_rooms'] = 0; - } - die(json_encode($result)); - } - public function displayAjaxGetHotelImages() { $response = array('status' => false); diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql index 0955d4198..68057f487 100644 --- a/install/data/db_structure.sql +++ b/install/data/db_structure.sql @@ -1166,6 +1166,7 @@ CREATE TABLE `PREFIX_orders` ( `valid` int(1) unsigned NOT NULL DEFAULT '0', `is_advance_payment` tinyint(1) NOT NULL DEFAULT '0', `advance_paid_amount` decimal(20,6) NOT NULL DEFAULT '0.00', + `with_occupancy` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order`), @@ -1330,6 +1331,8 @@ CREATE TABLE `PREFIX_order_return` ( `refunded_amount` decimal(20,6) NOT NULL DEFAULT '0.000000', `question` text NOT NULL, `by_admin` tinyint(1) unsigned NOT NULL DEFAULT '0', + `id_return_type` tinyint(1) unsigned NOT NULL DEFAULT '0', + `return_type` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order_return`), @@ -1384,6 +1387,8 @@ CREATE TABLE `PREFIX_order_slip` ( `amount` DECIMAL(10,2) NOT NULL, `shipping_cost_amount` DECIMAL(10,2) NOT NULL, `partial` TINYINT(1) NOT NULL, + `redeem_status` TINYINT(1) NOT NULL DEFAULT '0', + `id_cart_rule` int(10) unsigned NOT NULL DEFAULT '0', `order_slip_type` TINYINT(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, diff --git a/install/data/theme.sql b/install/data/theme.sql index 9ce4b813b..ec71efd71 100644 --- a/install/data/theme.sql +++ b/install/data/theme.sql @@ -3,6 +3,8 @@ SET NAMES 'utf8'; UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_CONDITIONS'; UPDATE `PREFIX_configuration` SET value = '12' WHERE name = 'PS_PRODUCTS_PER_PAGE'; UPDATE `PREFIX_configuration` SET value = '9' WHERE name = 'PS_HOTEL_IMAGES_PER_PAGE'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SHOW_AMENITIES_FILTER'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SHOW_PRICE_FILTER'; UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_PRODUCTS_ORDER_WAY'; UPDATE `PREFIX_configuration` SET value = '4' WHERE name = 'PS_PRODUCTS_ORDER_BY'; UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_DISPLAY_QTIES'; diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 1f47c24e9..4eaa78730 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -62,6 +62,12 @@ 9 + + 1 + + + 1 + 0 @@ -431,6 +437,15 @@ + + 1 + + + 2 + + + 3 + 0 @@ -449,6 +464,9 @@ 480 + + Lax + 0 diff --git a/install/data/xml/order_return_state.xml b/install/data/xml/order_return_state.xml index bac44cc62..831f53aea 100644 --- a/install/data/xml/order_return_state.xml +++ b/install/data/xml/order_return_state.xml @@ -4,8 +4,7 @@ - - + diff --git a/install/langs/bg/data/order_return_state.xml b/install/langs/bg/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/bg/data/order_return_state.xml +++ b/install/langs/bg/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/bn/data/order_return_state.xml b/install/langs/bn/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/bn/data/order_return_state.xml +++ b/install/langs/bn/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/br/data/order_return_state.xml b/install/langs/br/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/br/data/order_return_state.xml +++ b/install/langs/br/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/cs/data/order_return_state.xml b/install/langs/cs/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/cs/data/order_return_state.xml +++ b/install/langs/cs/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/de/data/order_return_state.xml b/install/langs/de/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/de/data/order_return_state.xml +++ b/install/langs/de/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/en/data/order_return_state.xml b/install/langs/en/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/en/data/order_return_state.xml +++ b/install/langs/en/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/es/data/order_return_state.xml b/install/langs/es/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/es/data/order_return_state.xml +++ b/install/langs/es/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/fa/data/order_return_state.xml b/install/langs/fa/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/fa/data/order_return_state.xml +++ b/install/langs/fa/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/fr/data/order_return_state.xml b/install/langs/fr/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/fr/data/order_return_state.xml +++ b/install/langs/fr/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/he/data/order_return_state.xml b/install/langs/he/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/he/data/order_return_state.xml +++ b/install/langs/he/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/hr/data/order_return_state.xml b/install/langs/hr/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/hr/data/order_return_state.xml +++ b/install/langs/hr/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/hu/data/order_return_state.xml b/install/langs/hu/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/hu/data/order_return_state.xml +++ b/install/langs/hu/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/id/data/order_return_state.xml b/install/langs/id/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/id/data/order_return_state.xml +++ b/install/langs/id/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/it/data/order_return_state.xml b/install/langs/it/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/it/data/order_return_state.xml +++ b/install/langs/it/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/lt/data/order_return_state.xml b/install/langs/lt/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/lt/data/order_return_state.xml +++ b/install/langs/lt/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/mk/data/order_return_state.xml b/install/langs/mk/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/mk/data/order_return_state.xml +++ b/install/langs/mk/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/nl/data/order_return_state.xml b/install/langs/nl/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/nl/data/order_return_state.xml +++ b/install/langs/nl/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/no/data/order_return_state.xml b/install/langs/no/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/no/data/order_return_state.xml +++ b/install/langs/no/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/pl/data/order_return_state.xml b/install/langs/pl/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/pl/data/order_return_state.xml +++ b/install/langs/pl/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/pt/data/order_return_state.xml b/install/langs/pt/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/pt/data/order_return_state.xml +++ b/install/langs/pt/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/qc/data/order_return_state.xml b/install/langs/qc/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/qc/data/order_return_state.xml +++ b/install/langs/qc/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/ro/data/order_return_state.xml b/install/langs/ro/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/ro/data/order_return_state.xml +++ b/install/langs/ro/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/ru/data/order_return_state.xml b/install/langs/ru/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/ru/data/order_return_state.xml +++ b/install/langs/ru/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/si/data/order_return_state.xml b/install/langs/si/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/si/data/order_return_state.xml +++ b/install/langs/si/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/sr/data/order_return_state.xml b/install/langs/sr/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/sr/data/order_return_state.xml +++ b/install/langs/sr/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/sv/data/order_return_state.xml b/install/langs/sv/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/sv/data/order_return_state.xml +++ b/install/langs/sv/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/tw/data/order_return_state.xml b/install/langs/tw/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/tw/data/order_return_state.xml +++ b/install/langs/tw/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/vn/data/order_return_state.xml b/install/langs/vn/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/vn/data/order_return_state.xml +++ b/install/langs/vn/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/install/langs/zh/data/order_return_state.xml b/install/langs/zh/data/order_return_state.xml index 370d7c3e1..c7b945970 100644 --- a/install/langs/zh/data/order_return_state.xml +++ b/install/langs/zh/data/order_return_state.xml @@ -1,14 +1,9 @@ - - Waiting for confirmation - order_refund_waiting_customer - order_refund_waiting_admin - - - Request received - order_refund_received_customer - order_refund_received_admin + + Pending + order_refund_pending_customer + order_refund_pending_admin Refund denied diff --git a/js/admin/orders.js b/js/admin/orders.js index c5cd90028..812db8ea6 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -383,6 +383,15 @@ function init() else { $('tr#new_product input, tr#new_product select, tr#new_product button').removeAttr('disabled'); + $('tr#new_product .booking_guest_occupancy').removeClass('disabled'); + if (data.room_type_info) { + $('tr#new_product .max_adults').val(data.room_type_info.max_adults); + $('tr#new_product .max_children').val(data.room_type_info.max_children); + $('tr#new_product .max_guests').val(data.room_type_info.max_guests); + $('tr#new_product .num_adults').attr('max', data.room_type_info.max_adults); + $('tr#new_product .num_children').attr('max', data.room_type_info.max_children); + } + // Keep product variable current_product = data; $('#add_product_product_id').val(data.id_product); @@ -458,10 +467,220 @@ function init() else $('#add_product_product_stock').css('font-weight', 'normal').css('color', 'black').css('font-size', '1em'); } + // update occupancy input + // updateOccupancyInput() // total update addProductRefreshTotal(); }); + function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) + { + var adults = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adults += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adults) + ' '; + if (parseInt(adults) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + if (parseInt(rooms) > 1) { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + } + + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); + } + + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() < $(this).attr('min')) { + $(this).val($(this).attr('min')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + if ($(this).hasClass('num_children')) { + var totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + let max_child_in_room; + if ($(this).closest(".booking_occupancy_wrapper").find('.max_children').val()) { + max_child_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_children').val(); + } else { + max_child_in_room = window.max_child_in_room; + } + if (totalChilds < max_child_in_room) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + + + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + + var childAgeSelect = '

'; + childAgeSelect += ''; + childAgeSelect += '

'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + + $(document).on('click', '.booking_guest_occupancy:not(.disabled)', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + let hasErrors = 0; + + let adults = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adults.length || (adults.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adults and children + adults.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } + } + } + }); + + $('.booking_occupancy_wrapper .add_new_occupancy_btn').on('click', function(e) { + e.preventDefault(); + + var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var occupancy_block = ''; + var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index')); + roomBlockIndex += 1; + let max_child_in_room; + if ($(this).closest(".booking_occupancy_wrapper").find('.max_children').val()) { + max_child_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_children').val(); + } else { + max_child_in_room = window.max_child_in_room; + } + var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); + countRooms += 1 + occupancy_block += '
'; + occupancy_block += '
' + remove_txt + '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + $(booking_occupancy_wrapper).find('.booking_occupancy_inner').append(occupancy_block); + + setRoomTypeGuestOccupancy(booking_occupancy_wrapper); + }); + + $('input#add_product_product_quantity').on('change', function(){ + // updateOccupancyInput() + addProductRefreshTotal(); + }); + $('#submitAddProduct').unbind('click').click(function(e) { e.preventDefault(); stopAjaxQuery(); @@ -635,16 +854,13 @@ function init() if (!element_list.length) { element_list = element.parents('.product-line-row'); - element_list.find('td .booking_duration_show').hide(); - element_list.find('td .booking_duration_edit').show(); - } - else - { - element_list.find('td .booking_duration_show').hide(); - element_list.find('td .booking_duration_edit').show(); } element_list.find('td .room_unit_price_show').hide(); element_list.find('td .room_unit_price_edit').show(); + element_list.find('td .booking_duration_show').hide(); + element_list.find('td .booking_duration_edit').show(); + element_list.find('td .booking_occupancy_show').hide(); + element_list.find('td .booking_occupancy_edit').show(); //element_list.find('td .product_price_show').hide(); //element_list.find('td .product_price_edit').show(); element_list.find('td.cancelCheck').hide(); @@ -685,6 +901,8 @@ function init() element_list.find('td .booking_duration_edit').hide(); element_list.find('td .room_unit_price_show').show(); element_list.find('td .room_unit_price_edit').hide(); + element_list.find('td .booking_occupancy_show').show(); + element_list.find('td .booking_occupancy_edit').hide(); element_list.find('td.product_invoice').hide(); element_list.find('td.cancelCheck').show(); element_list.find('td.cancelQuantity').show(); @@ -724,10 +942,12 @@ function init() var id_order_detail = $(this).closest('.product-line-row').find('td .edit_product_id_order_detail').val(); //some vaues are added to the query by webkul query = 'ajax=1&token='+token+'&action=editProductOnOrder&id_order='+id_order+'&id_room='+id_room+'&id_product='+id_product+'&id_hotel='+id_hotel+'&date_from='+date_from+'&date_to='+date_to+'&order_detail_id='+order_detail_id+'&'; - if (element_list.length) + + if (element_list.length) { query += element_list.parent().parent().find('input, select, .edit_product_id_order_detail').serialize(); - else + } else { query += element.parent().parent().find('input, select, .edit_product_id_order_detail').serialize(); + } $.ajax({ type: 'POST', @@ -942,21 +1162,19 @@ function init() var flagRefund = ''; $(document).ready(function() { + // Used for Cancel bookings/Initiate refund button $('#desc-order-standard_refund').click(function() { - $('.cancel_product_change_link:visible').trigger('click'); closeAddProduct(); - if (flagRefund == 'standard') { - flagRefund = ''; - $('.partial_refund_fields').hide(); - $('.standard_refund_fields').hide(); - } - else { - flagRefund = 'standard'; - $('.partial_refund_fields').hide(); - $('.standard_refund_fields').fadeIn(); - } - if (order_discount_price) + $('.cancel_product_change_link:visible').trigger('click'); + if (order_discount_price) { actualizeTotalRefundVoucher(); + } + $('.standard_refund_fields, .order_action').fadeIn(); + scroll_if_anchor('#refundForm', 170); + }); + + $('#cancelRefund').click(function() { + $('.standard_refund_fields').hide(); }); $('#desc-order-partial_refund').click(function() { diff --git a/js/admin/ppreferences.js b/js/admin/ppreferences.js new file mode 100644 index 000000000..7300ba9d2 --- /dev/null +++ b/js/admin/ppreferences.js @@ -0,0 +1,48 @@ +/** +* 2010-2023 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through LICENSE.txt file inside our module +* +* 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 CustomizationPolicy.txt file inside our module for more information. +* +* @author Webkul IN +* @copyright 2010-2023 Webkul IN +* @license LICENSE.txt +*/ + +$(document).ready(function() { + setFrontOccupancyView(); + $('#PS_FRONT_SEARCH_TYPE').on('change', setFrontOccupancyView); + setBackOccupancyView(); + $('#PS_BACKOFFICE_SEARCH_TYPE').on('change', setBackOccupancyView); + + function setFrontOccupancyView() + { + if ($('#PS_FRONT_SEARCH_TYPE').val() == SEARCH_TYPE_OWS) { + $('#PS_FRONT_OWS_SEARCH_ALGO_TYPE').closest('.form-group').show('fast'); + $('#PS_FRONT_ROOM_UNIT_SELECTION_TYPE').closest('.form-group').hide('fast'); + } else { + $('#PS_FRONT_OWS_SEARCH_ALGO_TYPE').closest('.form-group').hide('fast'); + $('#PS_FRONT_ROOM_UNIT_SELECTION_TYPE').closest('.form-group').show('fast'); + } + } + + function setBackOccupancyView() + { + if ($('#PS_BACKOFFICE_SEARCH_TYPE').val() == SEARCH_TYPE_OWS) { + $('#PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE').closest('.form-group').show('fast'); + $('#PS_BACKOFFICE_ROOM_BOOKING_TYPE').closest('.form-group').hide('fast'); + } else { + $('#PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE').closest('.form-group').hide('fast'); + $('#PS_BACKOFFICE_ROOM_BOOKING_TYPE').closest('.form-group').show('fast'); + } + } + +}); diff --git a/js/daterangepicker/LICENSE.txt b/js/daterangepicker/LICENSE.txt new file mode 100644 index 000000000..171f9923c --- /dev/null +++ b/js/daterangepicker/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Chunlong + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/js/daterangepicker/jquery.daterangepicker.css b/js/daterangepicker/jquery.daterangepicker.css new file mode 100644 index 000000000..7bff17336 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.css @@ -0,0 +1,460 @@ +.date-picker { + width: 170px; + height: 25px; + padding: 0; + border: 0; + line-height: 25px; + padding-left: 10px; + font-size: 12px; + font-family: Arial, sans-serif; + font-weight: bold; + cursor: pointer; + color: #303030; + position: relative; + z-index: 2; +} + +.date-picker-wrapper { + position: absolute; + z-index: 1; + border: 1px solid #bfbfbf; + background-color: #efefef; + padding: 5px 12px; + font-size: 12px; + line-height: 20px; + color: #aaa; + font-family: Arial, sans-serif; + -webkit-box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5); + box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5); + -webkit-box-sizing: initial; + box-sizing: initial; +} + +.dp-clearfix { + clear: both; + height: 0; + font-size: 0; +} + +.date-picker-wrapper.inline-wrapper { + position: relative; + -webkit-box-shadow: none; + box-shadow: none; + display: inline-block; +} + +.date-picker-wrapper.single-date { + width: auto; +} + +.date-picker-wrapper.no-shortcuts { + padding-bottom: 12px; +} + +.date-picker-wrapper.no-topbar { + padding-top: 12px; +} + +.date-picker-wrapper .footer { + font-size: 11px; + padding-top: 3px; +} + +.date-picker-wrapper b { + color: #666; + font-weight: 700; +} + +.date-picker-wrapper a { + color: #6bb4d6; + text-decoration: underline; +} + +.date-picker-wrapper .month-name { + text-transform: uppercase; +} + +.date-picker-wrapper .select-wrapper { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: middle; +} + +.date-picker-wrapper .select-wrapper:hover { + text-decoration: underline; +} + +.date-picker-wrapper .month-element { + display: inline-block; + vertical-align: middle; +} + +.date-picker-wrapper .select-wrapper select { + position: absolute; + margin: 0; + padding: 0; + left: 0; + top: -1px; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + text-transform: inherit; + color: inherit; + cursor: pointer; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background: transparent; + border: 0; + outline: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; + filter: alpha(opacity=1); + opacity: 0.01; +} + +.date-picker-wrapper .month-wrapper { + border: 1px solid #bfbfbf; + border-radius: 3px; + background-color: #fff; + padding: 5px; + cursor: default; + position: relative; + _overflow: hidden; +} + +.date-picker-wrapper .month-wrapper table { + width: 190px; + float: left; +} + +.date-picker-wrapper .month-wrapper table.month2 { + width: 190px; + float: left; +} + +.date-picker-wrapper .month-wrapper table th, .date-picker-wrapper .month-wrapper table td { + vertical-align: middle; + text-align: center; + line-height: 14px; + margin: 0px; + padding: 0px; +} + +.date-picker-wrapper .month-wrapper table .day { + padding: 5px 0; + line-height: 1; + font-size: 12px; + margin-bottom: 1px; + color: #ccc; + cursor: default; +} + +.date-picker-wrapper .month-wrapper table div.day.lastMonth, .date-picker-wrapper .month-wrapper table div.day.nextMonth { + color: #999; + cursor: default; +} + +.date-picker-wrapper .month-wrapper table .day.checked { + background-color: #9cdbf7; +} + +.date-picker-wrapper .month-wrapper table .week-name { + height: 20px; + line-height: 20px; + font-weight: 100; + text-transform: uppercase; +} + +.date-picker-wrapper .month-wrapper table .day.has-tooltip { + cursor: help !important; +} + +.date-picker-wrapper .month-wrapper table .day.has-tooltip .tooltip { + white-space: nowrap; +} + +.date-picker-wrapper .time label { + white-space: nowrap; +} + +.date-picker-wrapper .month-wrapper table .day.toMonth.valid { + color: #333; + cursor: pointer; +} + +.date-picker-wrapper .month-wrapper table .day.toMonth.hovering { + background-color: #cdecfa; +} + +.date-picker-wrapper .month-wrapper table .day.nextMonth, .date-picker-wrapper .month-wrapper table .day.lastMonth { + display: none; +} + +.date-picker-wrapper .month-wrapper table .day.real-today { + background-color: #ffe684; +} + +.date-picker-wrapper .month-wrapper table .day.real-today.checked, .date-picker-wrapper .month-wrapper table .day.real-today.hovering { + background-color: #70ccd5; +} + +.date-picker-wrapper table .caption { + height: 40px; +} + +.date-picker-wrapper table .caption > th:first-of-type, .date-picker-wrapper table .caption > th:last-of-type { + width: 27px; +} + +.date-picker-wrapper table .caption .next, .date-picker-wrapper table .caption .prev { + padding: 0 5px; + cursor: pointer; +} + +.date-picker-wrapper table .caption .next:hover, .date-picker-wrapper table .caption .prev:hover { + background-color: #ccc; + color: white; +} + +.date-picker-wrapper .gap { + position: relative; + z-index: 1; + width: 15px; + height: 100%; + background-color: red; + font-size: 0; + line-height: 0; + float: left; + top: -5px; + margin: 0 10px -10px; + visibility: hidden; + height: 0; +} + +.date-picker-wrapper .gap .gap-lines { + height: 100%; + overflow: hidden; +} + +.date-picker-wrapper .gap .gap-line { + height: 15px; + width: 15px; + position: relative; +} + +.date-picker-wrapper .gap .gap-line .gap-1 { + z-index: 1; + height: 0; + border-left: 8px solid white; + border-top: 8px solid #eee; + border-bottom: 8px solid #eee; +} + +.date-picker-wrapper .gap .gap-line .gap-2 { + position: absolute; + right: 0; + top: 0px; + z-index: 2; + height: 0; + border-left: 8px solid transparent; + border-top: 8px solid white; +} + +.date-picker-wrapper .gap .gap-line .gap-3 { + position: absolute; + right: 0; + top: 8px; + z-index: 2; + height: 0; + border-left: 8px solid transparent; + border-bottom: 8px solid white; +} + +.date-picker-wrapper .gap .gap-top-mask { + width: 6px; + height: 1px; + position: absolute; + top: -1px; + left: 1px; + background-color: #eee; + z-index: 3; +} + +.date-picker-wrapper .gap .gap-bottom-mask { + width: 6px; + height: 1px; + position: absolute; + bottom: -1px; + left: 7px; + background-color: #eee; + z-index: 3; +} + +.date-picker-wrapper .selected-days { + display: none; +} + +.date-picker-wrapper .drp_top-bar { + line-height: 1.4; + position: relative; + padding: 10px 40px 10px 0; +} + +.date-picker-wrapper .drp_top-bar .error-top, .date-picker-wrapper .drp_top-bar .normal-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar .default-top { + display: block; +} + +.date-picker-wrapper .drp_top-bar.error .default-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar.error .error-top { + display: block; + color: red; +} + +.date-picker-wrapper .drp_top-bar.normal .default-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar.normal .normal-top { + display: block; +} + +.date-picker-wrapper .drp_top-bar.normal .normal-top .selection-top { + color: #333; +} + +.date-picker-wrapper .drp_top-bar .apply-btn { + position: absolute; + right: 0px; + top: 6px; + padding: 3px 5px; + margin: 0; + font-size: 12px; + border-radius: 4px; + cursor: pointer; + color: #d9eef7; + border: solid 1px #0076a3; + background: #0095cd; + background: -moz-linear-gradient(top, #00adee, #0078a5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); + color: white; + line-height: initial; +} + +.date-picker-wrapper .drp_top-bar .apply-btn.disabled { + cursor: pointer; + color: #606060; + border: solid 1px #b7b7b7; + background: #fff; + background: -moz-linear-gradient(top, #fff, #ededed); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed'); +} + +.date-picker-wrapper .time { + position: relative; +} + +.date-picker-wrapper.single-month .time { + display: block; +} + +.date-picker-wrapper .time input[type=range] { + vertical-align: middle; + width: 129px; + padding: 0; + margin: 0; + height: 20px; +} + +.date-picker-wrapper .time1 { + width: 180px; + padding: 0 5px; + text-align: center; +} + +/*time styling*/ +.time2 { + width: 180px; + padding: 0 5px; + text-align: center; +} + +.date-picker-wrapper .time1 { + float: left; +} + +.date-picker-wrapper .time2 { + float: right; +} + +.date-picker-wrapper .hour { + text-align: right; +} + +.minute { + text-align: right; +} + +.date-picker-wrapper .hide { + display: none; +} + +.date-picker-wrapper .first-date-selected, .date-picker-wrapper .last-date-selected { + background-color: #49e !important; + color: white !important; +} + +.date-picker-wrapper .date-range-length-tip { + position: absolute; + margin-top: -4px; + margin-left: -8px; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); + display: none; + background-color: yellow; + padding: 0 6px; + border-radius: 2px; + font-size: 12px; + line-height: 16px; + -webkit-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -moz-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -ms-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -o-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); +} + +.date-picker-wrapper .date-range-length-tip:after { + content: ''; + position: absolute; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid yellow; + left: 50%; + margin-left: -4px; + bottom: -4px; +} + +.date-picker-wrapper.two-months.no-gap .month1 .next, .date-picker-wrapper.two-months.no-gap .month2 .prev { + display: none; +} + +.date-picker-wrapper .week-number { + padding: 5px 0; + line-height: 1; + font-size: 12px; + margin-bottom: 1px; + color: #999; + cursor: pointer; +} + +.date-picker-wrapper .week-number.week-number-selected { + color: #49e; + font-weight: bold; +} diff --git a/js/daterangepicker/jquery.daterangepicker.js b/js/daterangepicker/jquery.daterangepicker.js new file mode 100755 index 000000000..c104e536b --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.js @@ -0,0 +1,2638 @@ +// jquery.daterangepicker.js +// author : Chunlong Liu +// license : MIT +// www.jszen.com + +(function(factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery', 'moment'], factory); + } else if (typeof exports === 'object' && typeof module !== 'undefined') { + // CommonJS. Register as a module + module.exports = factory(require('jquery'), require('moment')); + } else { + // Browser globals + factory(jQuery, moment); + } +}(function($, moment) { + 'use strict'; + $.dateRangePickerLanguages = { + "default": //default language: English + { + "selected": "Selected:", + "day": "Day", + "days": "Days", + "apply": "Close", + "week-1": "mo", + "week-2": "tu", + "week-3": "we", + "week-4": "th", + "week-5": "fr", + "week-6": "sa", + "week-7": "su", + "week-number": "W", + "month-name": ["january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"], + "shortcuts": "Shortcuts", + "custom-values": "Custom Values", + "past": "Past", + "following": "Following", + "previous": "Previous", + "prev-week": "Week", + "prev-month": "Month", + "prev-year": "Year", + "next": "Next", + "next-week": "Week", + "next-month": "Month", + "next-year": "Year", + "less-than": "Date range should not be more than %d days", + "more-than": "Date range should not be less than %d days", + "default-more": "Please select a date range longer than %d days", + "default-single": "Please select a date", + "default-less": "Please select a date range less than %d days", + "default-range": "Please select a date range between %d and %d days", + "default-default": "Please select a date range", + "time": "Time", + "hour": "Hour", + "minute": "Minute" + }, + "id": { + "selected": "Terpilih:", + "day": "Hari", + "days": "Hari", + "apply": "Tutup", + "week-1": "sen", + "week-2": "sel", + "week-3": "rab", + "week-4": "kam", + "week-5": "jum", + "week-6": "sab", + "week-7": "min", + "week-number": "W", + "month-name": ["januari", "februari", "maret", "april", "mei", "juni", "juli", "agustus", "september", "oktober", "november", "desember"], + "shortcuts": "Pintas", + "custom-values": "Nilai yang ditentukan", + "past": "Yang Lalu", + "following": "Mengikuti", + "previous": "Sebelumnya", + "prev-week": "Minggu", + "prev-month": "Bulan", + "prev-year": "Tahun", + "next": "Selanjutnya", + "next-week": "Minggu", + "next-month": "Bulan", + "next-year": "Tahun", + "less-than": "Tanggal harus lebih dari %d hari", + "more-than": "Tanggal harus kurang dari %d hari", + "default-more": "Jarak tanggal harus lebih lama dari %d hari", + "default-single": "Silakan pilih tanggal", + "default-less": "Jarak rentang tanggal tidak boleh lebih lama dari %d hari", + "default-range": "Rentang tanggal harus antara %d dan %d hari", + "default-default": "Silakan pilih rentang tanggal", + "time": "Waktu", + "hour": "Jam", + "minute": "Menit" + }, + "az": { + "selected": "Seçildi:", + "day": " gün", + "days": " gün", + "apply": "tətbiq", + "week-1": "1", + "week-2": "2", + "week-3": "3", + "week-4": "4", + "week-5": "5", + "week-6": "6", + "week-7": "7", + "month-name": ["yanvar", "fevral", "mart", "aprel", "may", "iyun", "iyul", "avqust", "sentyabr", "oktyabr", "noyabr", "dekabr"], + "shortcuts": "Qısayollar", + "past": "Keçmiş", + "following": "Növbəti", + "previous": "   ", + "prev-week": "Öncəki həftə", + "prev-month": "Öncəki ay", + "prev-year": "Öncəki il", + "next": "   ", + "next-week": "Növbəti həftə", + "next-month": "Növbəti ay", + "next-year": "Növbəti il", + "less-than": "Tarix aralığı %d gündən çox olmamalıdır", + "more-than": "Tarix aralığı %d gündən az olmamalıdır", + "default-more": "%d gündən çox bir tarix seçin", + "default-single": "Tarix seçin", + "default-less": "%d gündən az bir tarix seçin", + "default-range": "%d və %d gün aralığında tarixlər seçin", + "default-default": "Tarix aralığı seçin" + }, + "bg": { + "selected": "Избрано:", + "day": "Ден", + "days": "Дни", + "apply": "Затвори", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "нд", + "week-number": "С", + "month-name": ["януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември"], + "shortcuts": "Преки пътища", + "custom-values": "Персонализирани стойности", + "past": "Минал", + "following": "Следващ", + "previous": "Предишен", + "prev-week": "Седмица", + "prev-month": "Месец", + "prev-year": "Година", + "next": "Следващ", + "next-week": "Седмица", + "next-month": "Месец", + "next-year": "Година", + "less-than": "Периодът от време не трябва да е повече от %d дни", + "more-than": "Периодът от време не трябва да е по-малко от %d дни", + "default-more": "Моля изберете период по-дълъг от %d дни", + "default-single": "Моля изберете дата", + "default-less": "Моля изберете период по-къс от %d дни", + "default-range": "Моля изберете период между %d и %d дни", + "default-default": "Моля изберете период", + "time": "Време", + "hour": "Час", + "minute": "Минута" + }, + "cn": //simplified chinese + { + "selected": "已选择:", + "day": "天", + "days": "天", + "apply": "确定", + "week-1": "一", + "week-2": "二", + "week-3": "三", + "week-4": "四", + "week-5": "五", + "week-6": "六", + "week-7": "日", + "week-number": "周", + "month-name": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + "shortcuts": "快捷选择", + "past": "过去", + "following": "将来", + "previous": "   ", + "prev-week": "上周", + "prev-month": "上个月", + "prev-year": "去年", + "next": "   ", + "next-week": "下周", + "next-month": "下个月", + "next-year": "明年", + "less-than": "所选日期范围不能大于%d天", + "more-than": "所选日期范围不能小于%d天", + "default-more": "请选择大于%d天的日期范围", + "default-less": "请选择小于%d天的日期范围", + "default-range": "请选择%d天到%d天的日期范围", + "default-single": "请选择一个日期", + "default-default": "请选择一个日期范围", + "time": "时间", + "hour": "小时", + "minute": "分钟" + }, + "cz": { + "selected": "Vybráno:", + "day": "Den", + "days": "Dny", + "apply": "Zavřít", + "week-1": "po", + "week-2": "út", + "week-3": "st", + "week-4": "čt", + "week-5": "pá", + "week-6": "so", + "week-7": "ne", + "month-name": ["leden", "únor", "březen", "duben", "květen", "červen", "červenec", "srpen", "září", "říjen", "listopad", "prosinec"], + "shortcuts": "Zkratky", + "past": "po", + "following": "následující", + "previous": "předchozí", + "prev-week": "týden", + "prev-month": "měsíc", + "prev-year": "rok", + "next": "další", + "next-week": "týden", + "next-month": "měsíc", + "next-year": "rok", + "less-than": "Rozsah data by neměl být větší než %d dnů", + "more-than": "Rozsah data by neměl být menší než %d dnů", + "default-more": "Prosím zvolte rozsah data větší než %d dnů", + "default-single": "Prosím zvolte datum", + "default-less": "Prosím zvolte rozsah data menší než %d dnů", + "default-range": "Prosím zvolte rozsah data mezi %d a %d dny", + "default-default": "Prosím zvolte rozsah data" + }, + "de": { + "selected": "Auswahl:", + "day": "Tag", + "days": "Tage", + "apply": "Schließen", + "week-1": "mo", + "week-2": "di", + "week-3": "mi", + "week-4": "do", + "week-5": "fr", + "week-6": "sa", + "week-7": "so", + "month-name": ["januar", "februar", "märz", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "dezember"], + "shortcuts": "Schnellwahl", + "past": "Vorherige", + "following": "Folgende", + "previous": "Vorherige", + "prev-week": "Woche", + "prev-month": "Monat", + "prev-year": "Jahr", + "next": "Nächste", + "next-week": "Woche", + "next-month": "Monat", + "next-year": "Jahr", + "less-than": "Datumsbereich darf nicht größer sein als %d Tage", + "more-than": "Datumsbereich darf nicht kleiner sein als %d Tage", + "default-more": "Bitte mindestens %d Tage auswählen", + "default-single": "Bitte ein Datum auswählen", + "default-less": "Bitte weniger als %d Tage auswählen", + "default-range": "Bitte einen Datumsbereich zwischen %d und %d Tagen auswählen", + "default-default": "Bitte ein Start- und Enddatum auswählen", + "Time": "Zeit", + "hour": "Stunde", + "minute": "Minute" + }, + "es": { + "selected": "Seleccionado:", + "day": "Día", + "days": "Días", + "apply": "Cerrar", + "week-1": "lu", + "week-2": "ma", + "week-3": "mi", + "week-4": "ju", + "week-5": "vi", + "week-6": "sa", + "week-7": "do", + "month-name": ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"], + "shortcuts": "Accesos directos", + "past": "Pasado", + "following": "Siguiente", + "previous": "Anterior", + "prev-week": "Semana", + "prev-month": "Mes", + "prev-year": "Año", + "next": "Siguiente", + "next-week": "Semana", + "next-month": "Mes", + "next-year": "Año", + "less-than": "El rango no debería ser mayor de %d días", + "more-than": "El rango no debería ser menor de %d días", + "default-more": "Por favor selecciona un rango mayor a %d días", + "default-single": "Por favor selecciona un día", + "default-less": "Por favor selecciona un rango menor a %d días", + "default-range": "Por favor selecciona un rango entre %d y %d días", + "default-default": "Por favor selecciona un rango de fechas." + }, + "fr": { + "selected": "Sélection:", + "day": "Jour", + "days": "Jours", + "apply": "Fermer", + "week-1": "lu", + "week-2": "ma", + "week-3": "me", + "week-4": "je", + "week-5": "ve", + "week-6": "sa", + "week-7": "di", + "month-name": ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"], + "shortcuts": "Raccourcis", + "past": "Passé", + "following": "Suivant", + "previous": "Précédent", + "prev-week": "Semaine", + "prev-month": "Mois", + "prev-year": "Année", + "next": "Suivant", + "next-week": "Semaine", + "next-month": "Mois", + "next-year": "Année", + "less-than": "L'intervalle ne doit pas être supérieure à %d jours", + "more-than": "L'intervalle ne doit pas être inférieure à %d jours", + "default-more": "Merci de choisir une intervalle supérieure à %d jours", + "default-single": "Merci de choisir une date", + "default-less": "Merci de choisir une intervalle inférieure %d jours", + "default-range": "Merci de choisir une intervalle comprise entre %d et %d jours", + "default-default": "Merci de choisir une date" + }, + "hu": { + "selected": "Kiválasztva:", + "day": "Nap", + "days": "Nap", + "apply": "Ok", + "week-1": "h", + "week-2": "k", + "week-3": "sz", + "week-4": "cs", + "week-5": "p", + "week-6": "sz", + "week-7": "v", + "month-name": ["január", "február", "március", "április", "május", "június", "július", "augusztus", "szeptember", "október", "november", "december"], + "shortcuts": "Gyorsválasztó", + "past": "Múlt", + "following": "Következő", + "previous": "Előző", + "prev-week": "Hét", + "prev-month": "Hónap", + "prev-year": "Év", + "next": "Következő", + "next-week": "Hét", + "next-month": "Hónap", + "next-year": "Év", + "less-than": "A kiválasztás nem lehet több %d napnál", + "more-than": "A kiválasztás nem lehet több %d napnál", + "default-more": "Válassz ki egy időszakot ami hosszabb mint %d nap", + "default-single": "Válassz egy napot", + "default-less": "Válassz ki egy időszakot ami rövidebb mint %d nap", + "default-range": "Válassz ki egy %d - %d nap hosszú időszakot", + "default-default": "Válassz ki egy időszakot" + }, + "it": { + "selected": "Selezionati:", + "day": "Giorno", + "days": "Giorni", + "apply": "Chiudi", + "week-1": "lu", + "week-2": "ma", + "week-3": "me", + "week-4": "gi", + "week-5": "ve", + "week-6": "sa", + "week-7": "do", + "month-name": ["gennaio", "febbraio", "marzo", "aprile", "maggio", "giugno", "luglio", "agosto", "settembre", "ottobre", "novembre", "dicembre"], + "shortcuts": "Scorciatoie", + "past": "Scorso", + "following": "Successivo", + "previous": "Precedente", + "prev-week": "Settimana", + "prev-month": "Mese", + "prev-year": "Anno", + "next": "Prossimo", + "next-week": "Settimana", + "next-month": "Mese", + "next-year": "Anno", + "less-than": "L'intervallo non dev'essere maggiore di %d giorni", + "more-than": "L'intervallo non dev'essere minore di %d giorni", + "default-more": "Seleziona un intervallo maggiore di %d giorni", + "default-single": "Seleziona una data", + "default-less": "Seleziona un intervallo minore di %d giorni", + "default-range": "Seleziona un intervallo compreso tra i %d e i %d giorni", + "default-default": "Seleziona un intervallo di date" + }, + "ko": { + "selected": "기간:", + "day": "일", + "days": "일간", + "apply": "닫기", + "week-1": "월", + "week-2": "화", + "week-3": "수", + "week-4": "목", + "week-5": "금", + "week-6": "토", + "week-7": "일", + "week-number": "주", + "month-name": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], + "shortcuts": "단축키들", + "past": "지난(오늘기준)", + "following": "이후(오늘기준)", + "previous": "이전", + "prev-week": "1주", + "prev-month": "1달", + "prev-year": "1년", + "next": "다음", + "next-week": "1주", + "next-month": "1달", + "next-year": "1년", + "less-than": "날짜 범위는 %d 일보다 많을 수 없습니다", + "more-than": "날짜 범위는 %d 일보다 작을 수 없습니다", + "default-more": "날짜 범위를 %d 일보다 길게 선택해 주세요", + "default-single": "날짜를 선택해 주세요", + "default-less": "%d 일보다 작은 날짜를 선택해 주세요", + "default-range": "%d와 %d 일 사이의 날짜 범위를 선택해 주세요", + "default-default": "날짜 범위를 선택해 주세요", + "time": "시각", + "hour": "시", + "minute": "분" + }, + "no": { + "selected": "Valgt:", + "day": "Dag", + "days": "Dager", + "apply": "Lukk", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lø", + "week-7": "sø", + "month-name": ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"], + "shortcuts": "Snarveier", + "custom-values": "Egendefinerte Verdier", + "past": "Over", // Not quite sure about the context of this one + "following": "Følger", + "previous": "Forrige", + "prev-week": "Uke", + "prev-month": "Måned", + "prev-year": "År", + "next": "Neste", + "next-week": "Uke", + "next-month": "Måned", + "next-year": "År", + "less-than": "Datoperioden skal ikkje være lengre enn %d dager", + "more-than": "Datoperioden skal ikkje være kortere enn %d dager", + "default-more": "Vennligst velg ein datoperiode lengre enn %d dager", + "default-single": "Vennligst velg ein dato", + "default-less": "Vennligst velg ein datoperiode mindre enn %d dager", + "default-range": "Vennligst velg ein datoperiode mellom %d og %d dager", + "default-default": "Vennligst velg ein datoperiode", + "time": "Tid", + "hour": "Time", + "minute": "Minutter" + }, + "nl": { + "selected": "Geselecteerd:", + "day": "Dag", + "days": "Dagen", + "apply": "Ok", + "week-1": "ma", + "week-2": "di", + "week-3": "wo", + "week-4": "do", + "week-5": "vr", + "week-6": "za", + "week-7": "zo", + "month-name": ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"], + "shortcuts": "Snelkoppelingen", + "custom-values": "Aangepaste waarden", + "past": "Verleden", + "following": "Komend", + "previous": "Vorige", + "prev-week": "Week", + "prev-month": "Maand", + "prev-year": "Jaar", + "next": "Volgende", + "next-week": "Week", + "next-month": "Maand", + "next-year": "Jaar", + "less-than": "Interval moet langer dan %d dagen zijn", + "more-than": "Interval mag niet minder dan %d dagen zijn", + "default-more": "Selecteer een interval langer dan %dagen", + "default-single": "Selecteer een datum", + "default-less": "Selecteer een interval minder dan %d dagen", + "default-range": "Selecteer een interval tussen %d en %d dagen", + "default-default": "Selecteer een interval", + "time": "Tijd", + "hour": "Uur", + "minute": "Minuut" + }, + "ru": { + "selected": "Выбрано:", + "day": "День", + "days": "Дней", + "apply": "Применить", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "вс", + "month-name": ["январь", "февраль", "март", "апрель", "май", "июнь", "июль", "август", "сентябрь", "октябрь", "ноябрь", "декабрь"], + "shortcuts": "Быстрый выбор", + "custom-values": "Пользовательские значения", + "past": "Прошедшие", + "following": "Следующие", + "previous": "   ", + "prev-week": "Неделя", + "prev-month": "Месяц", + "prev-year": "Год", + "next": "   ", + "next-week": "Неделя", + "next-month": "Месяц", + "next-year": "Год", + "less-than": "Диапазон не может быть больше %d дней", + "more-than": "Диапазон не может быть меньше %d дней", + "default-more": "Пожалуйста выберите диапазон больше %d дней", + "default-single": "Пожалуйста выберите дату", + "default-less": "Пожалуйста выберите диапазон меньше %d дней", + "default-range": "Пожалуйста выберите диапазон между %d и %d днями", + "default-default": "Пожалуйста выберите диапазон", + "time": "Время", + "hour": "Часы", + "minute": "Минуты" + }, + "uk": { + "selected": "Вибрано:", + "day": "День", + "days": "Днів", + "apply": "Застосувати", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "нд", + "month-name": ["січень", "лютий", "березень", "квітень", "травень", "червень", "липень", "серпень", "вересень", "жовтень", "листопад", "грудень"], + "shortcuts": "Швидкий вибір", + "custom-values": "Значення користувача", + "past": "Минулі", + "following": "Наступні", + "previous": "   ", + "prev-week": "Тиждень", + "prev-month": "Місяць", + "prev-year": "Рік", + "next": "   ", + "next-week": "Тиждень", + "next-month": "Місяць", + "next-year": "Рік", + "less-than": "Діапазон не може бути більш ніж %d днів", + "more-than": "Діапазон не може бути меньш ніж %d днів", + "default-more": "Будь ласка виберіть діапазон більше %d днів", + "default-single": "Будь ласка виберіть дату", + "default-less": "Будь ласка виберіть діапазон менше %d днів", + "default-range": "Будь ласка виберіть діапазон між %d та %d днями", + "default-default": "Будь ласка виберіть діапазон", + "time": "Час", + "hour": "Години", + "minute": "Хвилини" + }, + "pl": { + "selected": "Wybrany:", + "day": "Dzień", + "days": "Dni", + "apply": "Zamknij", + "week-1": "pon", + "week-2": "wt", + "week-3": "śr", + "week-4": "czw", + "week-5": "pt", + "week-6": "so", + "week-7": "nd", + "month-name": ["styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień"], + "shortcuts": "Skróty", + "custom-values": "Niestandardowe wartości", + "past": "Przeszłe", + "following": "Następne", + "previous": "Poprzednie", + "prev-week": "tydzień", + "prev-month": "miesiąc", + "prev-year": "rok", + "next": "Następny", + "next-week": "tydzień", + "next-month": "miesiąc", + "next-year": "rok", + "less-than": "Okres nie powinien być dłuższy niż %d dni", + "more-than": "Okres nie powinien być krótszy niż %d ni", + "default-more": "Wybierz okres dłuższy niż %d dni", + "default-single": "Wybierz datę", + "default-less": "Wybierz okres krótszy niż %d dni", + "default-range": "Wybierz okres trwający od %d do %d dni", + "default-default": "Wybierz okres", + "time": "Czas", + "hour": "Godzina", + "minute": "Minuta" + }, + "se": { + "selected": "Vald:", + "day": "dag", + "days": "dagar", + "apply": "godkänn", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lö", + "week-7": "sö", + "month-name": ["januari", "februari", "mars", "april", "maj", "juni", "juli", "augusti", "september", "oktober", "november", "december"], + "shortcuts": "genvägar", + "custom-values": "Anpassade värden", + "past": "över", + "following": "följande", + "previous": "förra", + "prev-week": "vecka", + "prev-month": "månad", + "prev-year": "år", + "next": "nästa", + "next-week": "vecka", + "next-month": "måned", + "next-year": "år", + "less-than": "Datumintervall bör inte vara mindre än %d dagar", + "more-than": "Datumintervall bör inte vara mer än %d dagar", + "default-more": "Välj ett datumintervall längre än %d dagar", + "default-single": "Välj ett datum", + "default-less": "Välj ett datumintervall mindre än %d dagar", + "default-range": "Välj ett datumintervall mellan %d och %d dagar", + "default-default": "Välj ett datumintervall", + "time": "tid", + "hour": "timme", + "minute": "minut" + }, + "pt": //Portuguese (European) + { + "selected": "Selecionado:", + "day": "Dia", + "days": "Dias", + "apply": "Fechar", + "week-1": "seg", + "week-2": "ter", + "week-3": "qua", + "week-4": "qui", + "week-5": "sex", + "week-6": "sab", + "week-7": "dom", + "week-number": "N", + "month-name": ["janeiro", "fevereiro", "março", "abril", "maio", "junho", "julho", "agosto", "setembro", "outubro", "novembro", "dezembro"], + "shortcuts": "Atalhos", + "custom-values": "Valores Personalizados", + "past": "Passado", + "following": "Seguinte", + "previous": "Anterior", + "prev-week": "Semana", + "prev-month": "Mês", + "prev-year": "Ano", + "next": "Próximo", + "next-week": "Próxima Semana", + "next-month": "Próximo Mês", + "next-year": "Próximo Ano", + "less-than": "O período selecionado não deve ser maior que %d dias", + "more-than": "O período selecionado não deve ser menor que %d dias", + "default-more": "Selecione um período superior a %d dias", + "default-single": "Selecione uma data", + "default-less": "Selecione um período inferior a %d dias", + "default-range": "Selecione um período de %d a %d dias", + "default-default": "Selecione um período", + "time": "Tempo", + "hour": "Hora", + "minute": "Minuto" + }, + "tc": // traditional chinese + { + "selected": "已選擇:", + "day": "天", + "days": "天", + "apply": "確定", + "week-1": "一", + "week-2": "二", + "week-3": "三", + "week-4": "四", + "week-5": "五", + "week-6": "六", + "week-7": "日", + "week-number": "週", + "month-name": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + "shortcuts": "快速選擇", + "past": "過去", + "following": "將來", + "previous": "   ", + "prev-week": "上週", + "prev-month": "上個月", + "prev-year": "去年", + "next": "   ", + "next-week": "下週", + "next-month": "下個月", + "next-year": "明年", + "less-than": "所選日期範圍不能大於%d天", + "more-than": "所選日期範圍不能小於%d天", + "default-more": "請選擇大於%d天的日期範圍", + "default-less": "請選擇少於%d天的日期範圍", + "default-range": "請選擇%d天到%d天的日期範圍", + "default-single": "請選擇一個日期", + "default-default": "請選擇一個日期範圍", + "time": "日期", + "hour": "小時", + "minute": "分鐘" + }, + "ja": { + "selected": "選択しました:", + "day": "日", + "days": "日", + "apply": "確定", + "week-1": "月", + "week-2": "火", + "week-3": "水", + "week-4": "木", + "week-5": "金", + "week-6": "土", + "week-7": "日", + "month-name": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], + "shortcuts": "クイック選択", + "past": "過去", + "following": "将来", + "previous": "   ", + "prev-week": "先週", + "prev-month": "先月", + "prev-year": "昨年", + "next": "   ", + "next-week": "来週", + "next-month": "来月", + "next-year": "来年", + "less-than": "日付の範囲は％d日以上にすべきではありません", + "more-than": "日付の範囲は％d日を下回ってはいけません", + "default-more": "％d日よりも長い期間を選択してください", + "default-less": "％d日未満の期間を選択してください", + "default-range": "％d日と％d日の間の日付範囲を選択してください", + "default-single": "日付を選択してください", + "default-default": "日付範囲を選択してください", + "time": "時間", + "hour": "時間", + "minute": "分" + }, + "da": { + "selected": "Valgt:", + "day": "Dag", + "days": "Dage", + "apply": "Luk", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lø", + "week-7": "sø", + "month-name": ["januar", "februar", "marts", "april", "maj", "juni", "juli", "august", "september", "oktober", "november", "december"], + "shortcuts": "genveje", + "custom-values": "Brugerdefinerede værdier", + "past": "Forbi", + "following": "Følgende", + "previous": "Forrige", + "prev-week": "uge", + "prev-month": "måned", + "prev-year": "år", + "next": "Næste", + "next-week": "uge", + "next-month": "måned", + "next-year": "år", + "less-than": "Dato interval bør ikke være med end %d dage", + "more-than": "Dato interval bør ikke være mindre end %d dage", + "default-more": "Vælg datointerval længere end %d dage", + "default-single": "Vælg dato", + "default-less": "Vælg datointerval mindre end %d dage", + "default-range": "Vælg datointerval mellem %d og %d dage", + "default-default": "Vælg datointerval", + "time": "tid", + "hour": "time", + "minute": "minut" + }, + "fi": // Finnish + { + "selected": "Valittu:", + "day": "Päivä", + "days": "Päivää", + "apply": "Sulje", + "week-1": "ma", + "week-2": "ti", + "week-3": "ke", + "week-4": "to", + "week-5": "pe", + "week-6": "la", + "week-7": "su", + "week-number": "V", + "month-name": ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"], + "shortcuts": "Pikavalinnat", + "custom-values": "Mukautetut Arvot", + "past": "Menneet", + "following": "Tulevat", + "previous": "Edellinen", + "prev-week": "Viikko", + "prev-month": "Kuukausi", + "prev-year": "Vuosi", + "next": "Seuraava", + "next-week": "Viikko", + "next-month": "Kuukausi", + "next-year": "Vuosi", + "less-than": "Aikajakson tulisi olla vähemmän kuin %d päivää", + "more-than": "Aikajakson ei tulisi olla vähempää kuin %d päivää", + "default-more": "Valitse pidempi aikajakso kuin %d päivää", + "default-single": "Valitse päivä", + "default-less": "Valitse lyhyempi aikajakso kuin %d päivää", + "default-range": "Valitse aikajakso %d ja %d päivän väliltä", + "default-default": "Valitse aikajakso", + "time": "Aika", + "hour": "Tunti", + "minute": "Minuutti" + }, + "cat": // Catala + { + "selected": "Seleccionats:", + "day": "Dia", + "days": "Dies", + "apply": "Tanca", + "week-1": "Dl", + "week-2": "Dm", + "week-3": "Dc", + "week-4": "Dj", + "week-5": "Dv", + "week-6": "Ds", + "week-7": "Dg", + "week-number": "S", + "month-name": ["gener", "febrer", "març", "abril", "maig", "juny", "juliol", "agost", "setembre", "octubre", "novembre", "desembre"], + "shortcuts": "Dreçeres", + "custom-values": "Valors personalitzats", + "past": "Passat", + "following": "Futur", + "previous": "Anterior", + "prev-week": "Setmana", + "prev-month": "Mes", + "prev-year": "Any", + "next": "Següent", + "next-week": "Setmana", + "next-month": "Mes", + "next-year": "Any", + "less-than": "El període no hauria de ser de més de %d dies", + "more-than": "El període no hauria de ser de menys de %d dies", + "default-more": "Perfavor selecciona un període més gran de %d dies", + "default-single": "Perfavor selecciona una data", + "default-less": "Perfavor selecciona un període de menys de %d dies", + "default-range": "Perfavor selecciona un període d'entre %d i %d dies", + "default-default": "Perfavor selecciona un període", + "time": "Temps", + "hour": "Hora", + "minute": "Minut" + }, + "sk": { + "selected": "Vybrané:", + "day": "Deň", + "days": "Dni", + "apply": "Zavrieť", + "week-1": "po", + "week-2": "út", + "week-3": "st", + "week-4": "št", + "week-5": "pi", + "week-6": "so", + "week-7": "ne", + "week-number": "T", + "month-name": ["január", "február", "marec", "apríl", "máj", "jún", "júl", "august", "september", "október", "november", "december"], + "shortcuts": "Skratky", + "custom-values": "Vlastné hodnoty", + "past": "po", + "following": "nasledujúci", + "previous": "predchádzajúci", + "prev-week": "týždeň", + "prev-month": "mesiac", + "prev-year": "rok", + "next": "ďalší", + "next-week": "týždeň", + "next-month": "mesiac", + "next-year": "rok", + "less-than": "Rozsah dátumu by nemal byť väčší ako %d dní", + "more-than": "Rozsah dátumu by nemal byť menší ako %d dní", + "default-more": "Prosím zvoľte rozsah dlhší ako %d dní", + "default-single": "Prosím zvoľte dátum", + "default-less": "Prosím zvoľte rozsah menší ako %d dní", + "default-range": "Prosím zvoľte rozsah medzi %d a %d dňami", + "default-default": "Prosím zvoľte rozsah", + "time": "Čas", + "hour": "Hodina", + "minute": "Minúta" + } + }; + + $.fn.dateRangePicker = function(opt) { + if (!opt) opt = {}; + opt = $.extend(true, { + autoClose: false, + format: 'YYYY-MM-DD', + separator: ' to ', + language: 'auto', + startOfWeek: 'sunday', // or monday + getValue: function() { + return $(this).val(); + }, + setValue: function(s) { + if (!$(this).attr('readonly') && !$(this).is(':disabled') && s != $(this).val()) { + $(this).val(s); + } + }, + startDate: false, + endDate: false, + time: { + enabled: false + }, + minDays: 0, + maxDays: 0, + showShortcuts: false, + shortcuts: { + //'prev-days': [1,3,5,7], + // 'next-days': [3,5,7], + //'prev' : ['week','month','year'], + // 'next' : ['week','month','year'] + }, + customShortcuts: [], + inline: false, + container: 'body', + alwaysOpen: false, + singleDate: false, + lookBehind: false, + batchMode: false, + duration: 200, + stickyMonths: false, + dayDivAttrs: [], + dayTdAttrs: [], + selectForward: false, + selectBackward: false, + applyBtnClass: '', + singleMonth: 'auto', + hoveringTooltip: function(days, startTime, hoveringTime) { + return days > 1 ? days + ' ' + translate('days') : ''; + }, + showTopbar: true, + swapTime: false, + showWeekNumbers: false, + getWeekNumber: function(date) //date will be the first day of a week + { + return moment(date).format('w'); + }, + customOpenAnimation: null, + customCloseAnimation: null, + customArrowPrevSymbol: null, + customArrowNextSymbol: null, + monthSelect: false, + yearSelect: false + }, opt); + + opt.start = false; + opt.end = false; + + opt.startWeek = false; + + //detect a touch device + opt.isTouchDevice = 'ontouchstart' in window || navigator.msMaxTouchPoints; + + //if it is a touch device, hide hovering tooltip + if (opt.isTouchDevice) opt.hoveringTooltip = false; + + //show one month on mobile devices + if (opt.singleMonth == 'auto') opt.singleMonth = $(window).width() < 480; + if (opt.singleMonth) opt.stickyMonths = false; + + if (!opt.showTopbar) opt.autoClose = true; + + if (opt.startDate && typeof opt.startDate == 'string') opt.startDate = moment(opt.startDate, opt.format).toDate(); + if (opt.endDate && typeof opt.endDate == 'string') opt.endDate = moment(opt.endDate, opt.format).toDate(); + + if (opt.yearSelect && typeof opt.yearSelect === 'boolean') { + opt.yearSelect = function(current) { return [current - 5, current + 5]; } + } + + var languages = getLanguages(); + var box; + var initiated = false; + var self = this; + var selfDom = $(self).get(0); + var domChangeTimer; + + $(this).off('.datepicker').on('click.datepicker', function(evt) { + var isOpen = box.is(':visible'); + if (!isOpen) open(opt.duration); + }).on('change.datepicker', function(evt) { + checkAndSetDefaultValue(); + }).on('keyup.datepicker', function() { + try { + clearTimeout(domChangeTimer); + } catch (e) {} + domChangeTimer = setTimeout(function() { + checkAndSetDefaultValue(); + }, 2000); + }); + + init_datepicker.call(this); + + if (opt.alwaysOpen) { + open(0); + } + + // expose some api + $(this).data('dateRangePicker', { + setStart: function(d1) { + if (typeof d1 == 'string') { + d1 = moment(d1, opt.format).toDate(); + } + + opt.end = false; + setSingleDate(d1); + + return this; + }, + setEnd: function(d2, silent) { + var start = new Date(); + start.setTime(opt.start); + if (typeof d2 == 'string') { + d2 = moment(d2, opt.format).toDate(); + } + setDateRange(start, d2, silent); + return this; + }, + setDateRange: function(d1, d2, silent) { + if (typeof d1 == 'string' && typeof d2 == 'string') { + d1 = moment(d1, opt.format).toDate(); + d2 = moment(d2, opt.format).toDate(); + } + setDateRange(d1, d2, silent); + }, + clear: clearSelection, + close: closeDatePicker, + open: open, + redraw: redrawDatePicker, + getDatePicker: getDatePicker, + resetMonthsView: resetMonthsView, + destroy: function() { + $(self).off('.datepicker'); + $(self).data('dateRangePicker', ''); + $(self).data('date-picker-opened', null); + box.remove(); + $(window).off('resize.datepicker', calcPosition); + $(document).off('click.datepicker', outsideClickClose); + } + }); + + $(window).on('resize.datepicker', calcPosition); + + return this; + + function IsOwnDatePickerClicked(evt, selfObj) { + return (selfObj.contains(evt.target) || evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes) >= 0)); + } + + function init_datepicker() { + var self = this; + + if ($(this).data('date-picker-opened')) { + closeDatePicker(); + return; + } + $(this).data('date-picker-opened', true); + + + box = createDom().hide(); + box.append('
'); + + $(opt.container).append(box); + + if (!opt.inline) { + calcPosition(); + } else { + box.addClass('inline-wrapper'); + } + + if (opt.alwaysOpen) { + box.find('.apply-btn').hide(); + } + + var defaultTime = getDefaultTime(); + resetMonthsView(defaultTime); + + if (opt.time.enabled) { + if ((opt.startDate && opt.endDate) || (opt.start && opt.end)) { + showTime(moment(opt.start || opt.startDate).toDate(), 'time1'); + showTime(moment(opt.end || opt.endDate).toDate(), 'time2'); + } else { + var defaultEndTime = opt.defaultEndTime ? opt.defaultEndTime : defaultTime; + showTime(defaultTime, 'time1'); + showTime(defaultEndTime, 'time2'); + } + } + + //showSelectedInfo(); + + + var defaultTopText = ''; + if (opt.singleDate) + defaultTopText = translate('default-single'); + else if (opt.minDays && opt.maxDays) + defaultTopText = translate('default-range'); + else if (opt.minDays) + defaultTopText = translate('default-more'); + else if (opt.maxDays) + defaultTopText = translate('default-less'); + else + defaultTopText = translate('default-default'); + + box.find('.default-top').html(defaultTopText.replace(/\%d/, opt.minDays).replace(/\%d/, opt.maxDays)); + if (opt.singleMonth) { + box.addClass('single-month'); + } else { + box.addClass('two-months'); + } + + + setTimeout(function() { + updateCalendarWidth(); + initiated = true; + }, 0); + + box.on('click', function(evt) { + evt.stopPropagation(); + }); + + //if user click other place of the webpage, close date range picker window + $(document).on('click.datepicker', outsideClickClose); + + box.find('.next').on('click', function() { + if (!opt.stickyMonths) + gotoNextMonth(this); + else + gotoNextMonth_stickily(this); + }); + + function gotoNextMonth(self) { + var isMonth2 = $(self).parents('table').hasClass('month2'); + var month = isMonth2 ? opt.month2 : opt.month1; + month = nextMonth(month); + if (!opt.singleMonth && !opt.singleDate && !isMonth2 && compare_month(month, opt.month2) >= 0 || isMonthOutOfBounds(month)) return; + showMonth(month, isMonth2 ? 'month2' : 'month1'); + showGap(); + } + + function gotoNextMonth_stickily(self) { + var nextMonth1 = nextMonth(opt.month1); + var nextMonth2 = nextMonth(opt.month2); + if (isMonthOutOfBounds(nextMonth2)) return; + if (!opt.singleDate && compare_month(nextMonth1, nextMonth2) >= 0) return; + showMonth(nextMonth1, 'month1'); + showMonth(nextMonth2, 'month2'); + showSelectedDays(); + } + + + box.find('.prev').on('click', function() { + if (!opt.stickyMonths) + gotoPrevMonth(this); + else + gotoPrevMonth_stickily(this); + }); + + function gotoPrevMonth(self) { + var isMonth2 = $(self).parents('table').hasClass('month2'); + var month = isMonth2 ? opt.month2 : opt.month1; + month = prevMonth(month); + if (isMonth2 && compare_month(month, opt.month1) <= 0 || isMonthOutOfBounds(month)) return; + showMonth(month, isMonth2 ? 'month2' : 'month1'); + showGap(); + } + + function gotoPrevMonth_stickily(self) { + var prevMonth1 = prevMonth(opt.month1); + var prevMonth2 = prevMonth(opt.month2); + if (isMonthOutOfBounds(prevMonth1)) return; + if (!opt.singleDate && compare_month(prevMonth2, prevMonth1) <= 0) return; + showMonth(prevMonth2, 'month2'); + showMonth(prevMonth1, 'month1'); + showSelectedDays(); + } + + box.attr('unselectable', 'on') + .css('user-select', 'none') + .on('selectstart', function(e) { + e.preventDefault(); + return false; + }); + + box.find('.apply-btn').on('click', function() { + closeDatePicker(); + var dateRange = getDateString(new Date(opt.start)) + opt.separator + getDateString(new Date(opt.end)); + $(self).trigger('datepicker-apply', { + 'value': dateRange, + 'date1': new Date(opt.start), + 'date2': new Date(opt.end) + }); + }); + + box.find('[custom]').on('click', function() { + var valueName = $(this).attr('custom'); + opt.start = false; + opt.end = false; + box.find('.day.checked').removeClass('checked'); + opt.setValue.call(selfDom, valueName); + checkSelectionValid(); + showSelectedInfo(true); + showSelectedDays(); + if (opt.autoClose) closeDatePicker(); + }); + + box.find('[shortcut]').on('click', function() { + var shortcut = $(this).attr('shortcut'); + var end = new Date(), + start = false; + var dir; + if (shortcut.indexOf('day') != -1) { + var day = parseInt(shortcut.split(',', 2)[1], 10); + start = new Date(new Date().getTime() + 86400000 * day); + end = new Date(end.getTime() + 86400000 * (day > 0 ? 1 : -1)); + } else if (shortcut.indexOf('week') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + var stopDay; + if (dir == 1) + stopDay = opt.startOfWeek == 'monday' ? 1 : 0; + else + stopDay = opt.startOfWeek == 'monday' ? 0 : 6; + + end = new Date(end.getTime() - 86400000); + while (end.getDay() != stopDay) end = new Date(end.getTime() + dir * 86400000); + start = new Date(end.getTime() + dir * 86400000 * 6); + } else if (shortcut.indexOf('month') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + if (dir == 1) + start = nextMonth(end); + else + start = prevMonth(end); + start.setDate(1); + end = nextMonth(start); + end.setDate(1); + end = new Date(end.getTime() - 86400000); + } else if (shortcut.indexOf('year') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + start = new Date(); + start.setFullYear(end.getFullYear() + dir); + start.setMonth(0); + start.setDate(1); + end.setFullYear(end.getFullYear() + dir); + end.setMonth(11); + end.setDate(31); + } else if (shortcut == 'custom') { + var name = $(this).html(); + if (opt.customShortcuts && opt.customShortcuts.length > 0) { + for (var i = 0; i < opt.customShortcuts.length; i++) { + var sh = opt.customShortcuts[i]; + if (sh.name == name) { + var data = []; + // try + // { + data = sh['dates'].call(); + //}catch(e){} + if (data && data.length == 2) { + start = data[0]; + end = data[1]; + } + + // if only one date is specified then just move calendars there + // move calendars to show this date's month and next months + if (data && data.length == 1) { + var movetodate = data[0]; + showMonth(movetodate, 'month1'); + showMonth(nextMonth(movetodate), 'month2'); + showGap(); + } + + break; + } + } + } + } + if (start && end) { + setDateRange(start, end); + checkSelectionValid(); + } + }); + + box.find('.time1 input[type=range]').on('change touchmove', function(e) { + var target = e.target, + hour = target.name == 'hour' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined, + min = target.name == 'minute' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined; + setTime('time1', hour, min); + }); + + box.find('.time2 input[type=range]').on('change touchmove', function(e) { + var target = e.target, + hour = target.name == 'hour' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined, + min = target.name == 'minute' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined; + setTime('time2', hour, min); + }); + + } + + + function calcPosition() { + if (!opt.inline) { + var offset = $(self).offset(); + if ($(opt.container).css('position') == 'relative') { + var containerOffset = $(opt.container).offset(); + var leftIndent = Math.max(0, offset.left + box.outerWidth() - $('body').width() + 16); + box.css({ + top: offset.top - containerOffset.top + $(self).outerHeight() + 4, + left: offset.left - containerOffset.left - leftIndent + }); + } else { + if (offset.left < 460) //left to right + { + box.css({ + top: offset.top + $(self).outerHeight() + parseInt($('body').css('border-top') || 0, 10), + left: offset.left + }); + } else { + box.css({ + top: offset.top + $(self).outerHeight() + parseInt($('body').css('border-top') || 0, 10), + left: offset.left + $(self).width() - box.width() - 16 + }); + } + } + } + } + + // Return the date picker wrapper element + function getDatePicker() { + return box; + } + + function open(animationTime) { + redrawDatePicker(); + checkAndSetDefaultValue(); + if (opt.customOpenAnimation) { + opt.customOpenAnimation.call(box.get(0), function() { + $(self).trigger('datepicker-opened', { + relatedTarget: box + }); + }); + } else { + box.slideDown(animationTime, function() { + $(self).trigger('datepicker-opened', { + relatedTarget: box + }); + }); + } + $(self).trigger('datepicker-open', { + relatedTarget: box + }); + showGap(); + updateCalendarWidth(); + calcPosition(); + } + + function checkAndSetDefaultValue() { + var __default_string = opt.getValue.call(selfDom); + var defaults = __default_string ? __default_string.split(opt.separator) : ''; + + if (defaults && ((defaults.length == 1 && opt.singleDate) || defaults.length >= 2)) { + var ___format = opt.format; + if (___format.match(/Do/)) { + + ___format = ___format.replace(/Do/, 'D'); + defaults[0] = defaults[0].replace(/(\d+)(th|nd|st)/, '$1'); + if (defaults.length >= 2) { + defaults[1] = defaults[1].replace(/(\d+)(th|nd|st)/, '$1'); + } + } + // set initiated to avoid triggerring datepicker-change event + initiated = false; + if (defaults.length >= 2) { + setDateRange(getValidValue(defaults[0], ___format, moment.locale(opt.language)), getValidValue(defaults[1], ___format, moment.locale(opt.language))); + } else if (defaults.length == 1 && opt.singleDate) { + setSingleDate(getValidValue(defaults[0], ___format, moment.locale(opt.language))); + } + + initiated = true; + } + } + + function getValidValue(date, format, locale) { + if (moment(date, format, locale).isValid()) { + return moment(date, format, locale).toDate(); + } else { + return moment().toDate(); + } + } + + function updateCalendarWidth() { + var gapMargin = box.find('.gap').css('margin-left'); + if (gapMargin) gapMargin = parseInt(gapMargin); + var w1 = box.find('.month1').width(); + var w2 = box.find('.gap').width() + (gapMargin ? gapMargin * 2 : 0); + var w3 = box.find('.month2').width(); + box.find('.month-wrapper').width(w1 + w2 + w3); + } + + function renderTime(name, date) { + box.find('.' + name + ' input[type=range].hour-range').val(moment(date).hours()); + box.find('.' + name + ' input[type=range].minute-range').val(moment(date).minutes()); + setTime(name, moment(date).format('HH'), moment(date).format('mm')); + } + + function changeTime(name, date) { + opt[name] = parseInt( + moment(parseInt(date)) + .hour(moment(opt[name + 'Time']).format('HH'), 'h') + .minute(moment(opt[name + 'Time']).format('mm'), 'm').valueOf() + ); + } + + function swapTime() { + renderTime('time1', opt.start); + renderTime('time2', opt.end); + } + + function setTime(name, hour, minute) { + hour && (box.find('.' + name + ' .hour-val').text(hour)); + minute && (box.find('.' + name + ' .minute-val').text(minute)); + switch (name) { + case 'time1': + if (opt.start) { + setRange('start', moment(opt.start)); + } + setRange('startTime', moment(opt.startTime || moment().valueOf())); + break; + case 'time2': + if (opt.end) { + setRange('end', moment(opt.end)); + } + setRange('endTime', moment(opt.endTime || moment().valueOf())); + break; + } + + function setRange(name, timePoint) { + var h = timePoint.format('HH'), + m = timePoint.format('mm'); + opt[name] = timePoint + .hour(hour || h, 'h') + .minute(minute || m, 'm') + .valueOf(); + } + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + } + + function clearSelection() { + opt.start = false; + opt.end = false; + box.find('.day.checked').removeClass('checked'); + box.find('.day.last-date-selected').removeClass('last-date-selected'); + box.find('.day.first-date-selected').removeClass('first-date-selected'); + opt.setValue.call(selfDom, ''); + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + } + + function handleStart(time) { + var r = time; + if (opt.batchMode === 'week-range') { + if (opt.startOfWeek === 'monday') { + r = moment(parseInt(time)).startOf('isoweek').valueOf(); + } else { + r = moment(parseInt(time)).startOf('week').valueOf(); + } + } else if (opt.batchMode === 'month-range') { + r = moment(parseInt(time)).startOf('month').valueOf(); + } + return r; + } + + function handleEnd(time) { + var r = time; + if (opt.batchMode === 'week-range') { + if (opt.startOfWeek === 'monday') { + r = moment(parseInt(time)).endOf('isoweek').valueOf(); + } else { + r = moment(parseInt(time)).endOf('week').valueOf(); + } + } else if (opt.batchMode === 'month-range') { + r = moment(parseInt(time)).endOf('month').valueOf(); + } + return r; + } + + + function dayClicked(day) { + if (day.hasClass('invalid')) return; + var time = day.attr('time'); + day.addClass('checked'); + if (opt.singleDate) { + opt.start = time; + opt.end = false; + } else if (opt.batchMode === 'week') { + if (opt.startOfWeek === 'monday') { + opt.start = moment(parseInt(time)).startOf('isoweek').valueOf(); + opt.end = moment(parseInt(time)).endOf('isoweek').valueOf(); + } else { + opt.end = moment(parseInt(time)).endOf('week').valueOf(); + opt.start = moment(parseInt(time)).startOf('week').valueOf(); + } + } else if (opt.batchMode === 'workweek') { + opt.start = moment(parseInt(time)).day(1).valueOf(); + opt.end = moment(parseInt(time)).day(5).valueOf(); + } else if (opt.batchMode === 'weekend') { + opt.start = moment(parseInt(time)).day(6).valueOf(); + opt.end = moment(parseInt(time)).day(7).valueOf(); + } else if (opt.batchMode === 'month') { + opt.start = moment(parseInt(time)).startOf('month').valueOf(); + opt.end = moment(parseInt(time)).endOf('month').valueOf(); + } else if ((opt.start && opt.end) || (!opt.start && !opt.end)) { + opt.start = handleStart(time); + opt.end = false; + } else if (opt.start) { + opt.end = handleEnd(time); + if (opt.time.enabled) { + changeTime('end', opt.end); + } + } + + //Update time in case it is enabled and timestamps are available + if (opt.time.enabled) { + if (opt.start) { + changeTime('start', opt.start); + } + if (opt.end) { + changeTime('end', opt.end); + } + } + + //In case the start is after the end, swap the timestamps + if (!opt.singleDate && opt.start && opt.end && opt.start > opt.end) { + var tmp = opt.end; + opt.end = handleEnd(opt.start); + opt.start = handleStart(tmp); + if (opt.time.enabled && opt.swapTime) { + swapTime(); + } + } + + opt.start = parseInt(opt.start); + opt.end = parseInt(opt.end); + + clearHovering(); + if (opt.start && !opt.end) { + $(self).trigger('datepicker-first-date-selected', { + 'date1': new Date(opt.start) + }); + dayHovering(day); + } + updateSelectableRange(time); + + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + autoclose(); + } + + + function weekNumberClicked(weekNumberDom) { + var thisTime = parseInt(weekNumberDom.attr('data-start-time'), 10); + var date1, date2; + if (!opt.startWeek) { + opt.startWeek = thisTime; + weekNumberDom.addClass('week-number-selected'); + date1 = new Date(thisTime); + opt.start = moment(date1).day(opt.startOfWeek == 'monday' ? 1 : 0).valueOf(); + opt.end = moment(date1).day(opt.startOfWeek == 'monday' ? 7 : 6).valueOf(); + } else { + box.find('.week-number-selected').removeClass('week-number-selected'); + date1 = new Date(thisTime < opt.startWeek ? thisTime : opt.startWeek); + date2 = new Date(thisTime < opt.startWeek ? opt.startWeek : thisTime); + opt.startWeek = false; + opt.start = moment(date1).day(opt.startOfWeek == 'monday' ? 1 : 0).valueOf(); + opt.end = moment(date2).day(opt.startOfWeek == 'monday' ? 7 : 6).valueOf(); + } + updateSelectableRange(); + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + autoclose(); + } + + function isValidTime(time) { + time = parseInt(time, 10); + if (opt.startDate && compare_day(time, opt.startDate) < 0) return false; + if (opt.endDate && compare_day(time, opt.endDate) > 0) return false; + + if (opt.start && !opt.end && !opt.singleDate) { + //check maxDays and minDays setting + if (opt.maxDays > 0 && countDays(time, opt.start) > opt.maxDays) return false; + if (opt.minDays > 0 && countDays(time, opt.start) < opt.minDays) return false; + + //check selectForward and selectBackward + if (opt.selectForward && time < opt.start) return false; + if (opt.selectBackward && time > opt.start) return false; + + //check disabled days + if (opt.beforeShowDay && typeof opt.beforeShowDay == 'function') { + var valid = true; + var timeTmp = time; + while (countDays(timeTmp, opt.start) > 1) { + var arr = opt.beforeShowDay(new Date(timeTmp)); + if (!arr[0]) { + valid = false; + break; + } + if (Math.abs(timeTmp - opt.start) < 86400000) break; + if (timeTmp > opt.start) timeTmp -= 86400000; + if (timeTmp < opt.start) timeTmp += 86400000; + } + if (!valid) return false; + } + } + return true; + } + + + function updateSelectableRange() { + box.find('.day.invalid.tmp').removeClass('tmp invalid').addClass('valid'); + if (opt.start && !opt.end) { + box.find('.day.toMonth.valid').each(function() { + var time = parseInt($(this).attr('time'), 10); + if (!isValidTime(time)) + $(this).addClass('invalid tmp').removeClass('valid'); + else + $(this).addClass('valid tmp').removeClass('invalid'); + }); + } + + return true; + } + + + function dayHovering(day) { + var hoverTime = parseInt(day.attr('time')); + var tooltip = ''; + + if (day.hasClass('has-tooltip') && day.attr('data-tooltip')) { + tooltip = '' + day.attr('data-tooltip') + ''; + } else if (!day.hasClass('invalid')) { + if (opt.singleDate) { + box.find('.day.hovering').removeClass('hovering'); + day.addClass('hovering'); + } else { + box.find('.day').each(function() { + var time = parseInt($(this).attr('time')), + start = opt.start, + end = opt.end; + + if (time == hoverTime) { + $(this).addClass('hovering'); + } else { + $(this).removeClass('hovering'); + } + + if ( + (opt.start && !opt.end) && + ( + (opt.start < time && hoverTime >= time) || + (opt.start > time && hoverTime <= time) + ) + ) { + $(this).addClass('hovering'); + } else { + $(this).removeClass('hovering'); + } + }); + + if (opt.start && !opt.end) { + var days = countDays(hoverTime, opt.start); + if (opt.hoveringTooltip) { + if (typeof opt.hoveringTooltip == 'function') { + tooltip = opt.hoveringTooltip(days, opt.start, hoverTime); + } else if (opt.hoveringTooltip === true && days > 1) { + tooltip = days + ' ' + translate('days'); + } + } + } + } + } + + if (tooltip) { + var posDay = day.offset(); + var posBox = box.offset(); + + var _left = posDay.left - posBox.left; + var _top = posDay.top - posBox.top; + _left += day.width() / 2; + + + var $tip = box.find('.date-range-length-tip'); + var w = $tip.css({ + 'visibility': 'hidden', + 'display': 'none' + }).html(tooltip).width(); + var h = $tip.height(); + _left -= w / 2; + _top -= h; + setTimeout(function() { + $tip.css({ + left: _left, + top: _top, + display: 'block', + 'visibility': 'visible' + }); + }, 10); + } else { + box.find('.date-range-length-tip').hide(); + } + } + + function clearHovering() { + box.find('.day.hovering').removeClass('hovering'); + box.find('.date-range-length-tip').hide(); + } + + function dateChanged(date) { + var value = date.val(); + var name = date.attr('name'); + var type = date.parents('table').hasClass('month1') ? 'month1' : 'month2'; + var oppositeType = type === 'month1' ? 'month2' : 'month1'; + var startDate = opt.startDate ? moment(opt.startDate) : false; + var endDate = opt.endDate ? moment(opt.endDate) : false; + var newDate = moment(opt[type])[name](value); + + + if (startDate && newDate.isSameOrBefore(startDate)) { + newDate = startDate.add(type === 'month2' ? 1 : 0, 'month'); + } + + if (endDate && newDate.isSameOrAfter(endDate)) { + newDate = endDate.add(!opt.singleMonth && type === 'month1' ? -1 : 0, 'month'); + } + + showMonth(newDate, type); + + if (type === 'month1') { + if (opt.stickyMonths || moment(newDate).isSameOrAfter(opt[oppositeType], 'month')) { + showMonth(moment(newDate).add(1, 'month'), oppositeType); + } + } else { + if (opt.stickyMonths || moment(newDate).isSameOrBefore(opt[oppositeType], 'month')) { + showMonth(moment(newDate).add(-1, 'month'), oppositeType); + } + } + + showGap(); + } + + function autoclose() { + if (opt.singleDate === true) { + if (initiated && opt.start) { + if (opt.autoClose) closeDatePicker(); + } + } else { + if (initiated && opt.start && opt.end) { + if (opt.autoClose) closeDatePicker(); + } + } + } + + function checkSelectionValid() { + var days = Math.ceil((opt.end - opt.start) / 86400000) + 1; + if (opt.singleDate) { // Validate if only start is there + if (opt.start && !opt.end) + box.find('.drp_top-bar').removeClass('error').addClass('normal'); + else + box.find('.drp_top-bar').removeClass('error').removeClass('normal'); + } else if (opt.maxDays && days > opt.maxDays) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + box.find('.drp_top-bar').removeClass('normal').addClass('error').find('.error-top').html(translate('less-than').replace('%d', opt.maxDays)); + } else if (opt.minDays && days < opt.minDays) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + box.find('.drp_top-bar').removeClass('normal').addClass('error').find('.error-top').html(translate('more-than').replace('%d', opt.minDays)); + } else { + if (opt.start || opt.end) + box.find('.drp_top-bar').removeClass('error').addClass('normal'); + else + box.find('.drp_top-bar').removeClass('error').removeClass('normal'); + } + + if ((opt.singleDate && opt.start && !opt.end) || (!opt.singleDate && opt.start && opt.end)) { + box.find('.apply-btn').removeClass('disabled'); + } else { + box.find('.apply-btn').addClass('disabled'); + } + + if (opt.batchMode) { + if ( + (opt.start && opt.startDate && compare_day(opt.start, opt.startDate) < 0) || + (opt.end && opt.endDate && compare_day(opt.end, opt.endDate) > 0) + ) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + } + } + } + + function showSelectedInfo(forceValid, silent) { + box.find('.start-day').html('...'); + box.find('.end-day').html('...'); + box.find('.selected-days').hide(); + if (opt.start) { + box.find('.start-day').html(getDateString(new Date(parseInt(opt.start)))); + } + if (opt.end) { + box.find('.end-day').html(getDateString(new Date(parseInt(opt.end)))); + } + var dateRange; + if (opt.start && opt.singleDate) { + box.find('.apply-btn').removeClass('disabled'); + dateRange = getDateString(new Date(opt.start)); + opt.setValue.call(selfDom, dateRange, getDateString(new Date(opt.start)), getDateString(new Date(opt.end))); + + if (initiated && !silent) { + $(self).trigger('datepicker-change', { + 'value': dateRange, + 'date1': new Date(opt.start) + }); + } + } else if (opt.start && opt.end) { + box.find('.selected-days').show().find('.selected-days-num').html(countDays(opt.end, opt.start)); + box.find('.apply-btn').removeClass('disabled'); + dateRange = getDateString(new Date(opt.start)) + opt.separator + getDateString(new Date(opt.end)); + opt.setValue.call(selfDom, dateRange, getDateString(new Date(opt.start)), getDateString(new Date(opt.end))); + if (initiated && !silent) { + $(self).trigger('datepicker-change', { + 'value': dateRange, + 'date1': new Date(opt.start), + 'date2': new Date(opt.end) + }); + } + } else if (forceValid) { + box.find('.apply-btn').removeClass('disabled'); + } else { + box.find('.apply-btn').addClass('disabled'); + } + } + + function countDays(start, end) { + return Math.abs(moment(start).diff(moment(end), 'd')) + 1; + } + + function setDateRange(date1, date2, silent) { + if (date1.getTime() > date2.getTime()) { + var tmp = date2; + date2 = date1; + date1 = tmp; + tmp = null; + } + var valid = true; + if (opt.startDate && compare_day(date1, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(date2, opt.endDate) > 0) valid = false; + if (!valid) { + showMonth(opt.startDate, 'month1'); + showMonth(nextMonth(opt.startDate), 'month2'); + showGap(); + return; + } + + opt.start = date1.getTime(); + opt.end = date2.getTime(); + + if (opt.time.enabled) { + renderTime('time1', date1); + renderTime('time2', date2); + } + + if (opt.stickyMonths || (compare_day(date1, date2) > 0 && compare_month(date1, date2) === 0)) { + if (opt.lookBehind) { + date1 = prevMonth(date2); + } else { + date2 = nextMonth(date1); + } + } + + if (opt.stickyMonths && opt.endDate !== false && compare_month(date2, opt.endDate) > 0) { + date1 = prevMonth(date1); + date2 = prevMonth(date2); + } + + if (!opt.stickyMonths) { + if (compare_month(date1, date2) === 0) { + if (opt.lookBehind) { + date1 = prevMonth(date2); + } else { + date2 = nextMonth(date1); + } + } + } + + showMonth(date1, 'month1'); + showMonth(date2, 'month2'); + showGap(); + checkSelectionValid(); + showSelectedInfo(false, silent); + autoclose(); + } + + function setSingleDate(date1) { + + var valid = true; + if (opt.startDate && compare_day(date1, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(date1, opt.endDate) > 0) valid = false; + if (!valid) { + showMonth(opt.startDate, 'month1'); + return; + } + + opt.start = date1.getTime(); + + + if (opt.time.enabled) { + renderTime('time1', date1); + + } + showMonth(date1, 'month1'); + if (opt.singleMonth !== true) { + var date2 = nextMonth(date1); + showMonth(date2, 'month2'); + } + showGap(); + showSelectedInfo(); + autoclose(); + } + + function showSelectedDays() { + if (!opt.start && !opt.end) return; + box.find('.day').each(function() { + var time = parseInt($(this).attr('time')), + start = opt.start, + end = opt.end; + if (opt.time.enabled) { + time = moment(time).startOf('day').valueOf(); + start = moment(start || moment().valueOf()).startOf('day').valueOf(); + end = moment(end || moment().valueOf()).startOf('day').valueOf(); + } + if ( + (opt.start && opt.end && end >= time && start <= time) || + (opt.start && !opt.end && moment(start).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) + ) { + $(this).addClass('checked'); + } else { + $(this).removeClass('checked'); + } + + //add first-date-selected class name to the first date selected + if (opt.start && moment(start).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) { + $(this).addClass('first-date-selected'); + } else { + $(this).removeClass('first-date-selected'); + } + //add last-date-selected + if (opt.end && moment(end).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) { + $(this).addClass('last-date-selected'); + } else { + $(this).removeClass('last-date-selected'); + } + }); + + box.find('.week-number').each(function() { + if ($(this).attr('data-start-time') == opt.startWeek) { + $(this).addClass('week-number-selected'); + } + }); + } + + function showMonth(date, month) { + date = moment(date).toDate(); + var monthElement = generateMonthElement(date, month); + var yearElement = generateYearElement(date, month); + + box.find('.' + month + ' .month-name').html(monthElement + ' ' + yearElement); + box.find('.' + month + ' tbody').html(createMonthHTML(date)); + opt[month] = date; + updateSelectableRange(); + bindEvents(); + } + + function generateMonthElement(date, month) { + date = moment(date); + var currentMonth = date.get('month'); + var currentMonthName = nameMonth(currentMonth); + var nonSelectableMonth = '
' + currentMonthName + '
'; + + if (!opt.monthSelect) { return nonSelectableMonth; } + + var startDate = opt.startDate ? moment(opt.startDate).add(!opt.singleMonth && month === 'month2' ? 1 : 0, 'month') : false; + var endDate = opt.endDate ? moment(opt.endDate).add(!opt.singleMonth && month === 'month1' ? -1 : 0, 'month') : false; + + var minSelectableMonth = startDate && date.isSame(startDate, 'year') ? startDate.get('month') : 0; + var maxSelectableMonth = endDate && date.isSame(endDate, 'year') ? endDate.get('month') : 11; + var minVisibleMonth = Math.min(minSelectableMonth, currentMonth); + var maxVisibleMonth = Math.max(maxSelectableMonth, currentMonth); + + if (minVisibleMonth === maxVisibleMonth) { return nonSelectableMonth; } + + var selectData = generateSelectData( + { + minSelectable: minSelectableMonth, + maxSelectable: maxSelectableMonth, + minVisible: minVisibleMonth, + maxVisible: maxVisibleMonth, + }, + currentMonth, + function (value) { return nameMonth(value); } + ) + return generateSelect('month', selectData); + } + + function generateYearElement(date, month) { + date = moment(date); + var currentYear = date.get('year'); + var nonSelectableMonth = '
' + currentYear + '
'; + + if (!opt.yearSelect) { return nonSelectableMonth; } + + var isYearFunction = opt.yearSelect && typeof opt.yearSelect === 'function'; + var startDate = opt.startDate ? moment(opt.startDate).add(!opt.singleMonth && month === 'month2' ? 1 : 0, 'month') : false; + var endDate = opt.endDate ? moment(opt.endDate).add(!opt.singleMonth && month === 'month1' ? -1 : 0, 'month') : false; + var range = isYearFunction ? opt.yearSelect(currentYear) : opt.yearSelect.slice(); + + var minSelectableYear = startDate ? Math.max(range[0], startDate.get('year')) : Math.min(range[0], currentYear); + var maxSelectableYear = endDate ? Math.min(range[1], endDate.get('year')) : Math.max(range[1], currentYear); + var minVisibleYear = Math.min(minSelectableYear, currentYear); + var maxVisibleYear = Math.max(maxSelectableYear, currentYear); + + if (minVisibleYear === maxVisibleYear) { return nonSelectableMonth; } + + var selectData = generateSelectData( + { + minSelectable: minSelectableYear, + maxSelectable: maxSelectableYear, + minVisible: minVisibleYear, + maxVisible: maxVisibleYear, + }, + currentYear + ) + return generateSelect('year', selectData); + } + + + function generateSelectData(range, current, valueBeautifier) { + var data = []; + valueBeautifier = valueBeautifier || function(value) { return value; }; + + for (var i = range.minVisible; i <= range.maxVisible; i++) { + data.push({ + value: i, + text: valueBeautifier(i), + selected: i === current, + disabled: ((i < range.minSelectable) || (i > range.maxSelectable)), + }); + } + + return data; + } + + function generateSelect(name, data) { + var select = '
' + current + '
'; + + return select; + } + + function bindEvents() { + box.find('.day').off("click").on('click', function(evt) { + dayClicked($(this)); + }); + + box.find('.day').off("mouseenter").on('mouseenter', function(evt) { + dayHovering($(this)); + }); + + box.find('.day').off("mouseleave").on('mouseleave', function(evt) { + box.find('.date-range-length-tip').hide(); + if (opt.singleDate) { + clearHovering(); + } + }); + + box.find('.week-number').off("click").on('click', function(evt) { + weekNumberClicked($(this)); + }); + + box.find('.month').off("change").on('change', function(evt) { + dateChanged($(this)); + }); + + box.find('.year').off("change").on('change', function(evt) { + dateChanged($(this)); + }); + } + + function showTime(date, name) { + box.find('.' + name).append(getTimeHTML()); + renderTime(name, date); + } + + function nameMonth(m) { + return translate('month-name')[m]; + } + + function getDateString(d) { + return moment(d).format(opt.format); + } + + function showGap() { + showSelectedDays(); + var m1 = parseInt(moment(opt.month1).format('YYYYMM')); + var m2 = parseInt(moment(opt.month2).format('YYYYMM')); + var p = Math.abs(m1 - m2); + var shouldShow = (p > 1 && p != 89); + if (shouldShow) { + box.addClass('has-gap').removeClass('no-gap').find('.gap').css('visibility', 'visible'); + } else { + box.removeClass('has-gap').addClass('no-gap').find('.gap').css('visibility', 'hidden'); + } + var h1 = box.find('table.month1').height(); + var h2 = box.find('table.month2').height(); + box.find('.gap').height(Math.max(h1, h2) + 10); + } + + function closeDatePicker() { + if (opt.alwaysOpen) return; + + var afterAnim = function() { + $(self).data('date-picker-opened', false); + $(self).trigger('datepicker-closed', { + relatedTarget: box + }); + }; + if (opt.customCloseAnimation) { + opt.customCloseAnimation.call(box.get(0), afterAnim); + } else { + $(box).slideUp(opt.duration, afterAnim); + } + $(self).trigger('datepicker-close', { + relatedTarget: box + }); + } + + function redrawDatePicker() { + showMonth(opt.month1, 'month1'); + showMonth(opt.month2, 'month2'); + } + + function compare_month(m1, m2) { + var p = parseInt(moment(m1).format('YYYYMM')) - parseInt(moment(m2).format('YYYYMM')); + if (p > 0) return 1; + if (p === 0) return 0; + return -1; + } + + function compare_day(m1, m2) { + var p = parseInt(moment(m1).format('YYYYMMDD')) - parseInt(moment(m2).format('YYYYMMDD')); + if (p > 0) return 1; + if (p === 0) return 0; + return -1; + } + + function nextMonth(month) { + return moment(month).add(1, 'months').toDate(); + } + + function prevMonth(month) { + return moment(month).add(-1, 'months').toDate(); + } + + function getTimeHTML() { + return '
' + + '' + translate('Time') + ': 00:00' + + '
' + + '
' + + '' + + '
' + + '
' + + '' + + '
'; + } + + function createDom() { + var html = '
'; + + if (opt.showTopbar) { + html += '
'; + + if (opt.customTopBar) { + if (typeof opt.customTopBar == 'function') opt.customTopBar = opt.customTopBar(); + html += '
' + opt.customTopBar + '
'; + } else { + html += '
' + + '' + translate('selected') + ' ...'; + if (!opt.singleDate) { + html += ' ' + opt.separator + ' ... (3 ' + translate('days') + ')'; + } + html += '
'; + html += '
error
' + + '
default
'; + } + + html += ''; + html += '
'; + } + + var _colspan = opt.showWeekNumbers ? 6 : 5; + + var arrowPrev = '<'; + if (opt.customArrowPrevSymbol) arrowPrev = opt.customArrowPrevSymbol; + + var arrowNext = '>'; + if (opt.customArrowNextSymbol) arrowNext = opt.customArrowNextSymbol; + + html += '
' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + getWeekHead() + + ' ' + + ' ' + + '
' + + ' ' + + arrowPrev + + ' ' + + ' ' + + ' ' + + (opt.singleDate || !opt.stickyMonths ? '' + arrowNext + '' : '') + + '
'; + + if (hasMonth2()) { + html += '
' + getGapHTML() + '
' + + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + getWeekHead() + + ' ' + + ' ' + + '
' + + (!opt.stickyMonths ? '' + arrowPrev + '' : '') + + ' ' + + ' ' + + ' ' + arrowNext + '' + + '
'; + + } + //+'
' + html += '
' + + '
' + + '
'; + if (!opt.singleDate) { + html += '
'; + } + html += '
' + + '
' + + '
'; + + html += '
'; + if (opt.showShortcuts) { + html += '
' + translate('shortcuts') + ''; + + var data = opt.shortcuts; + if (data) { + var name; + if (data['prev-days'] && data['prev-days'].length > 0) { + html += ' ' + translate('past'); + for (var i = 0; i < data['prev-days'].length; i++) { + name = data['prev-days'][i]; + name += (data['prev-days'][i] > 1) ? translate('days') : translate('day'); + html += ' ' + name + ''; + } + html += ''; + } + + if (data['next-days'] && data['next-days'].length > 0) { + html += ' ' + translate('following'); + for (var i = 0; i < data['next-days'].length; i++) { + name = data['next-days'][i]; + name += (data['next-days'][i] > 1) ? translate('days') : translate('day'); + html += ' ' + name + ''; + } + html += ''; + } + + if (data.prev && data.prev.length > 0) { + html += ' ' + translate('previous'); + for (var i = 0; i < data.prev.length; i++) { + name = translate('prev-' + data.prev[i]); + html += ' ' + name + ''; + } + html += ''; + } + + if (data.next && data.next.length > 0) { + html += ' ' + translate('next'); + for (var i = 0; i < data.next.length; i++) { + name = translate('next-' + data.next[i]); + html += ' ' + name + ''; + } + html += ''; + } + } + + if (opt.customShortcuts) { + for (var i = 0; i < opt.customShortcuts.length; i++) { + var sh = opt.customShortcuts[i]; + html += ' ' + sh.name + ''; + } + } + html += '
'; + } + + // Add Custom Values Dom + if (opt.showCustomValues) { + html += '
' + (opt.customValueLabel || translate('custom-values')) + ''; + + if (opt.customValues) { + for (var i = 0; i < opt.customValues.length; i++) { + var val = opt.customValues[i]; + html += ' ' + val.name + ''; + } + } + } + + html += '
'; + + + return $(html); + } + + function getApplyBtnClass() { + var klass = ''; + if (opt.autoClose === true) { + klass += ' hide'; + } + if (opt.applyBtnClass !== '') { + klass += ' ' + opt.applyBtnClass; + } + return klass; + } + + function getWeekHead() { + var prepend = opt.showWeekNumbers ? '' + translate('week-number') + '' : ''; + if (opt.startOfWeek == 'monday') { + return prepend + '' + translate('week-1') + '' + + '' + translate('week-2') + '' + + '' + translate('week-3') + '' + + '' + translate('week-4') + '' + + '' + translate('week-5') + '' + + '' + translate('week-6') + '' + + '' + translate('week-7') + ''; + } else { + return prepend + '' + translate('week-7') + '' + + '' + translate('week-1') + '' + + '' + translate('week-2') + '' + + '' + translate('week-3') + '' + + '' + translate('week-4') + '' + + '' + translate('week-5') + '' + + '' + translate('week-6') + ''; + } + } + + function isMonthOutOfBounds(month) { + month = moment(month); + if (opt.startDate && month.endOf('month').isBefore(opt.startDate)) { + return true; + } + if (opt.endDate && month.startOf('month').isAfter(opt.endDate)) { + return true; + } + return false; + } + + function getGapHTML() { + var html = ['
']; + for (var i = 0; i < 20; i++) { + html.push('
' + + '
' + + '
' + + '
' + + '
'); + } + html.push('
'); + return html.join(''); + } + + function hasMonth2() { + return (!opt.singleMonth); + } + + function attributesCallbacks(initialObject, callbacksArray, today) { + var resultObject = $.extend(true, {}, initialObject); + + $.each(callbacksArray, function(cbAttrIndex, cbAttr) { + var addAttributes = cbAttr(today); + for (var attr in addAttributes) { + if (resultObject.hasOwnProperty(attr)) { + resultObject[attr] += addAttributes[attr]; + } else { + resultObject[attr] = addAttributes[attr]; + } + } + }); + + var attrString = ''; + + for (var attr in resultObject) { + if (resultObject.hasOwnProperty(attr)) { + attrString += attr + '="' + resultObject[attr] + '" '; + } + } + + return attrString; + } + + function createMonthHTML(d) { + var days = []; + d.setDate(1); + var lastMonth = new Date(d.getTime() - 86400000); + var now = new Date(); + + var dayOfWeek = d.getDay(); + if ((dayOfWeek === 0) && (opt.startOfWeek === 'monday')) { + // add one week + dayOfWeek = 7; + } + var today, valid; + + if (dayOfWeek > 0) { + for (var i = dayOfWeek; i > 0; i--) { + var day = new Date(d.getTime() - 86400000 * i); + valid = isValidTime(day.getTime()); + if (opt.startDate && compare_day(day, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(day, opt.endDate) > 0) valid = false; + days.push({ + date: day, + type: 'lastMonth', + day: day.getDate(), + time: day.getTime(), + valid: valid + }); + } + } + var toMonth = d.getMonth(); + for (var i = 0; i < 40; i++) { + today = moment(d).add(i, 'days').toDate(); + valid = isValidTime(today.getTime()); + if (opt.startDate && compare_day(today, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(today, opt.endDate) > 0) valid = false; + days.push({ + date: today, + type: today.getMonth() == toMonth ? 'toMonth' : 'nextMonth', + day: today.getDate(), + time: today.getTime(), + valid: valid + }); + } + var html = []; + for (var week = 0; week < 6; week++) { + if (days[week * 7].type == 'nextMonth') break; + html.push(''); + + for (var day = 0; day < 7; day++) { + var _day = (opt.startOfWeek == 'monday') ? day + 1 : day; + today = days[week * 7 + _day]; + var highlightToday = moment(today.time).format('L') == moment(now).format('L'); + today.extraClass = ''; + today.tooltip = ''; + if (today.valid && opt.beforeShowDay && typeof opt.beforeShowDay == 'function') { + var _r = opt.beforeShowDay(moment(today.time).toDate()); + today.valid = _r[0]; + today.extraClass = _r[1] || ''; + today.tooltip = _r[2] || ''; + if (today.tooltip !== '') today.extraClass += ' has-tooltip '; + } + + var todayDivAttr = { + time: today.time, + 'data-tooltip': today.tooltip, + 'class': 'day ' + today.type + ' ' + today.extraClass + ' ' + (today.valid ? 'valid' : 'invalid') + ' ' + (highlightToday ? 'real-today' : '') + }; + + if (day === 0 && opt.showWeekNumbers) { + html.push('
' + opt.getWeekNumber(today.date) + '
'); + } + + html.push('
' + showDayHTML(today.time, today.day) + '
'); + } + html.push(''); + } + return html.join(''); + } + + function showDayHTML(time, date) { + if (opt.showDateFilter && typeof opt.showDateFilter == 'function') return opt.showDateFilter(time, date); + return date; + } + + function getLanguages() { + if (opt.language == 'auto') { + var language = navigator.language ? navigator.language : navigator.browserLanguage; + if (!language) { + return $.dateRangePickerLanguages['default']; + } + language = language.toLowerCase(); + if(language in $.dateRangePickerLanguages){ + return $.dateRangePickerLanguages[language]; + } + + return $.dateRangePickerLanguages['default']; + } else if (opt.language && opt.language in $.dateRangePickerLanguages) { + return $.dateRangePickerLanguages[opt.language]; + } else { + return $.dateRangePickerLanguages['default']; + } + } + + /** + * Translate language string, try both the provided translation key, as the lower case version + */ + function translate(translationKey) { + var translationKeyLowerCase = translationKey.toLowerCase(); + console.log(languages); + var result = (translationKey in languages) ? languages[translationKey] : (translationKeyLowerCase in languages) ? languages[translationKeyLowerCase] : null; + var defaultLanguage = $.dateRangePickerLanguages['default']; + if (result == null) result = (translationKey in defaultLanguage) ? defaultLanguage[translationKey] : (translationKeyLowerCase in defaultLanguage) ? defaultLanguage[translationKeyLowerCase] : ''; + console.log(result); + + return result; + } + + function getDefaultTime() { + var defaultTime = opt.defaultTime ? opt.defaultTime : new Date(); + + if (opt.lookBehind) { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = nextMonth(moment(opt.startDate).toDate()); + if (opt.endDate && compare_month(defaultTime, opt.endDate) > 0) defaultTime = moment(opt.endDate).toDate(); + } else { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = moment(opt.startDate).toDate(); + if (opt.endDate && compare_month(nextMonth(defaultTime), opt.endDate) > 0) defaultTime = prevMonth(moment(opt.endDate).toDate()); + } + + if (opt.singleDate) { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = moment(opt.startDate).toDate(); + if (opt.endDate && compare_month(defaultTime, opt.endDate) > 0) defaultTime = moment(opt.endDate).toDate(); + } + + return defaultTime; + } + + function resetMonthsView(time) { + if (!time) { + time = getDefaultTime(); + } + + if (opt.lookBehind) { + showMonth(prevMonth(time), 'month1'); + showMonth(time, 'month2'); + } else { + showMonth(time, 'month1'); + showMonth(nextMonth(time), 'month2'); + } + + if (opt.singleDate) { + showMonth(time, 'month1'); + } + + showSelectedDays(); + showGap(); + } + + function outsideClickClose(evt) { + if (!IsOwnDatePickerClicked(evt, self[0])) { + if (box.is(':visible')) closeDatePicker(); + } + } + + }; +})); diff --git a/js/daterangepicker/jquery.daterangepicker.min.css b/js/daterangepicker/jquery.daterangepicker.min.css new file mode 100644 index 000000000..45d658857 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.min.css @@ -0,0 +1 @@ +.date-picker{width:170px;height:25px;padding:0;border:0;line-height:25px;padding-left:10px;font-size:12px;font-family:Arial,sans-serif;font-weight:700;cursor:pointer;color:#303030;position:relative;z-index:2}.date-picker-wrapper{position:absolute;z-index:1;border:1px solid #bfbfbf;background-color:#efefef;padding:5px 12px;font-size:12px;line-height:20px;color:#aaa;font-family:Arial,sans-serif;-webkit-box-shadow:3px 3px 10px rgba(0,0,0,.5);box-shadow:3px 3px 10px rgba(0,0,0,.5);-webkit-box-sizing:initial;box-sizing:initial}.dp-clearfix{clear:both;height:0;font-size:0}.date-picker-wrapper.inline-wrapper{position:relative;-webkit-box-shadow:none;box-shadow:none;display:inline-block}.date-picker-wrapper.single-date{width:auto}.date-picker-wrapper.no-shortcuts{padding-bottom:12px}.date-picker-wrapper.no-topbar{padding-top:12px}.date-picker-wrapper .footer{font-size:11px;padding-top:3px}.date-picker-wrapper b{color:#666;font-weight:700}.date-picker-wrapper a{color:#6bb4d6;text-decoration:underline}.date-picker-wrapper .month-name{text-transform:uppercase}.date-picker-wrapper .select-wrapper{position:relative;overflow:hidden;display:inline-block;vertical-align:middle}.date-picker-wrapper .select-wrapper:hover{text-decoration:underline}.date-picker-wrapper .month-element{display:inline-block;vertical-align:middle}.date-picker-wrapper .select-wrapper select{position:absolute;margin:0;padding:0;left:0;top:-1px;font-size:inherit;font-style:inherit;font-weight:inherit;text-transform:inherit;color:inherit;cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;border:0;outline:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";filter:alpha(opacity=1);opacity:.01}.date-picker-wrapper .month-wrapper{border:1px solid #bfbfbf;border-radius:3px;background-color:#fff;padding:5px;cursor:default;position:relative;_overflow:hidden}.date-picker-wrapper .month-wrapper table{width:190px;float:left}.date-picker-wrapper .month-wrapper table.month2{width:190px;float:left}.date-picker-wrapper .month-wrapper table td,.date-picker-wrapper .month-wrapper table th{vertical-align:middle;text-align:center;line-height:14px;margin:0;padding:0}.date-picker-wrapper .month-wrapper table .day{padding:5px 0;line-height:1;font-size:12px;margin-bottom:1px;color:#ccc;cursor:default}.date-picker-wrapper .month-wrapper table div.day.lastMonth,.date-picker-wrapper .month-wrapper table div.day.nextMonth{color:#999;cursor:default}.date-picker-wrapper .month-wrapper table .day.checked{background-color:#9cdbf7}.date-picker-wrapper .month-wrapper table .week-name{height:20px;line-height:20px;font-weight:100;text-transform:uppercase}.date-picker-wrapper .month-wrapper table .day.has-tooltip{cursor:help!important}.date-picker-wrapper .month-wrapper table .day.has-tooltip .tooltip{white-space:nowrap}.date-picker-wrapper .time label{white-space:nowrap}.date-picker-wrapper .month-wrapper table .day.toMonth.valid{color:#333;cursor:pointer}.date-picker-wrapper .month-wrapper table .day.toMonth.hovering{background-color:#cdecfa}.date-picker-wrapper .month-wrapper table .day.lastMonth,.date-picker-wrapper .month-wrapper table .day.nextMonth{display:none}.date-picker-wrapper .month-wrapper table .day.real-today{background-color:#ffe684}.date-picker-wrapper .month-wrapper table .day.real-today.checked,.date-picker-wrapper .month-wrapper table .day.real-today.hovering{background-color:#70ccd5}.date-picker-wrapper table .caption{height:40px}.date-picker-wrapper table .caption>th:first-of-type,.date-picker-wrapper table .caption>th:last-of-type{width:27px}.date-picker-wrapper table .caption .next,.date-picker-wrapper table .caption .prev{padding:0 5px;cursor:pointer}.date-picker-wrapper table .caption .next:hover,.date-picker-wrapper table .caption .prev:hover{background-color:#ccc;color:#fff}.date-picker-wrapper .gap{position:relative;z-index:1;width:15px;height:100%;background-color:red;font-size:0;line-height:0;float:left;top:-5px;margin:0 10px -10px;visibility:hidden;height:0}.date-picker-wrapper .gap .gap-lines{height:100%;overflow:hidden}.date-picker-wrapper .gap .gap-line{height:15px;width:15px;position:relative}.date-picker-wrapper .gap .gap-line .gap-1{z-index:1;height:0;border-left:8px solid #fff;border-top:8px solid #eee;border-bottom:8px solid #eee}.date-picker-wrapper .gap .gap-line .gap-2{position:absolute;right:0;top:0;z-index:2;height:0;border-left:8px solid transparent;border-top:8px solid #fff}.date-picker-wrapper .gap .gap-line .gap-3{position:absolute;right:0;top:8px;z-index:2;height:0;border-left:8px solid transparent;border-bottom:8px solid #fff}.date-picker-wrapper .gap .gap-top-mask{width:6px;height:1px;position:absolute;top:-1px;left:1px;background-color:#eee;z-index:3}.date-picker-wrapper .gap .gap-bottom-mask{width:6px;height:1px;position:absolute;bottom:-1px;left:7px;background-color:#eee;z-index:3}.date-picker-wrapper .selected-days{display:none}.date-picker-wrapper .drp_top-bar{line-height:1.4;position:relative;padding:10px 40px 10px 0}.date-picker-wrapper .drp_top-bar .error-top,.date-picker-wrapper .drp_top-bar .normal-top{display:none}.date-picker-wrapper .drp_top-bar .default-top{display:block}.date-picker-wrapper .drp_top-bar.error .default-top{display:none}.date-picker-wrapper .drp_top-bar.error .error-top{display:block;color:red}.date-picker-wrapper .drp_top-bar.normal .default-top{display:none}.date-picker-wrapper .drp_top-bar.normal .normal-top{display:block}.date-picker-wrapper .drp_top-bar.normal .normal-top .selection-top{color:#333}.date-picker-wrapper .drp_top-bar .apply-btn{position:absolute;right:0;top:6px;padding:3px 5px;margin:0;font-size:12px;border-radius:4px;cursor:pointer;color:#d9eef7;border:solid 1px #0076a3;background:#0095cd;background:-moz-linear-gradient(top,#00adee,#0078a5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');color:#fff;line-height:initial}.date-picker-wrapper .drp_top-bar .apply-btn.disabled{cursor:pointer;color:#606060;border:solid 1px #b7b7b7;background:#fff;background:-moz-linear-gradient(top,#fff,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed')}.date-picker-wrapper .time{position:relative}.date-picker-wrapper.single-month .time{display:block}.date-picker-wrapper .time input[type=range]{vertical-align:middle;width:129px;padding:0;margin:0;height:20px}.date-picker-wrapper .time1{width:180px;padding:0 5px;text-align:center}.time2{width:180px;padding:0 5px;text-align:center}.date-picker-wrapper .time1{float:left}.date-picker-wrapper .time2{float:right}.date-picker-wrapper .hour{text-align:right}.minute{text-align:right}.date-picker-wrapper .hide{display:none}.date-picker-wrapper .first-date-selected,.date-picker-wrapper .last-date-selected{background-color:#49e!important;color:#fff!important}.date-picker-wrapper .date-range-length-tip{position:absolute;margin-top:-4px;margin-left:-8px;-webkit-box-shadow:0 0 3px rgba(0,0,0,.3);box-shadow:0 0 3px rgba(0,0,0,.3);display:none;background-color:#ff0;padding:0 6px;border-radius:2px;font-size:12px;line-height:16px;-webkit-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-moz-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-ms-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-o-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3))}.date-picker-wrapper .date-range-length-tip:after{content:'';position:absolute;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ff0;left:50%;margin-left:-4px;bottom:-4px}.date-picker-wrapper.two-months.no-gap .month1 .next,.date-picker-wrapper.two-months.no-gap .month2 .prev{display:none}.date-picker-wrapper .week-number{padding:5px 0;line-height:1;font-size:12px;margin-bottom:1px;color:#999;cursor:pointer}.date-picker-wrapper .week-number.week-number-selected{color:#49e;font-weight:700} \ No newline at end of file diff --git a/js/daterangepicker/jquery.daterangepicker.min.js b/js/daterangepicker/jquery.daterangepicker.min.js new file mode 100755 index 000000000..508ddcce6 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.min.js @@ -0,0 +1,7 @@ +/** + * jquery-date-range-picker + * @version v0.21.1 + * @link https://github.com/longbill/jquery-date-range-picker + * @license MIT + */ +!function(e){"function"==typeof define&&define.amd?define(["jquery","moment"],e):"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery"),require("moment")):e(jQuery,moment)}(function(U,Q){"use strict";U.dateRangePickerLanguages={default:{selected:"Selected:",day:"Day",days:"Days",apply:"Close","week-1":"mo","week-2":"tu","week-3":"we","week-4":"th","week-5":"fr","week-6":"sa","week-7":"su","week-number":"W","month-name":["january","february","march","april","may","june","july","august","september","october","november","december"],shortcuts:"Shortcuts","custom-values":"Custom Values",past:"Past",following:"Following",previous:"Previous","prev-week":"Week","prev-month":"Month","prev-year":"Year",next:"Next","next-week":"Week","next-month":"Month","next-year":"Year","less-than":"Date range should not be more than %d days","more-than":"Date range should not be less than %d days","default-more":"Please select a date range longer than %d days","default-single":"Please select a date","default-less":"Please select a date range less than %d days","default-range":"Please select a date range between %d and %d days","default-default":"Please select a date range",time:"Time",hour:"Hour",minute:"Minute"},id:{selected:"Terpilih:",day:"Hari",days:"Hari",apply:"Tutup","week-1":"sen","week-2":"sel","week-3":"rab","week-4":"kam","week-5":"jum","week-6":"sab","week-7":"min","week-number":"W","month-name":["januari","februari","maret","april","mei","juni","juli","agustus","september","oktober","november","desember"],shortcuts:"Pintas","custom-values":"Nilai yang ditentukan",past:"Yang Lalu",following:"Mengikuti",previous:"Sebelumnya","prev-week":"Minggu","prev-month":"Bulan","prev-year":"Tahun",next:"Selanjutnya","next-week":"Minggu","next-month":"Bulan","next-year":"Tahun","less-than":"Tanggal harus lebih dari %d hari","more-than":"Tanggal harus kurang dari %d hari","default-more":"Jarak tanggal harus lebih lama dari %d hari","default-single":"Silakan pilih tanggal","default-less":"Jarak rentang tanggal tidak boleh lebih lama dari %d hari","default-range":"Rentang tanggal harus antara %d dan %d hari","default-default":"Silakan pilih rentang tanggal",time:"Waktu",hour:"Jam",minute:"Menit"},az:{selected:"Seçildi:",day:" gün",days:" gün",apply:"tətbiq","week-1":"1","week-2":"2","week-3":"3","week-4":"4","week-5":"5","week-6":"6","week-7":"7","month-name":["yanvar","fevral","mart","aprel","may","iyun","iyul","avqust","sentyabr","oktyabr","noyabr","dekabr"],shortcuts:"Qısayollar",past:"Keçmiş",following:"Növbəti",previous:"   ","prev-week":"Öncəki həftə","prev-month":"Öncəki ay","prev-year":"Öncəki il",next:"   ","next-week":"Növbəti həftə","next-month":"Növbəti ay","next-year":"Növbəti il","less-than":"Tarix aralığı %d gündən çox olmamalıdır","more-than":"Tarix aralığı %d gündən az olmamalıdır","default-more":"%d gündən çox bir tarix seçin","default-single":"Tarix seçin","default-less":"%d gündən az bir tarix seçin","default-range":"%d və %d gün aralığında tarixlər seçin","default-default":"Tarix aralığı seçin"},bg:{selected:"Избрано:",day:"Ден",days:"Дни",apply:"Затвори","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","week-number":"С","month-name":["януари","февруари","март","април","май","юни","юли","август","септември","октомври","ноември","декември"],shortcuts:"Преки пътища","custom-values":"Персонализирани стойности",past:"Минал",following:"Следващ",previous:"Предишен","prev-week":"Седмица","prev-month":"Месец","prev-year":"Година",next:"Следващ","next-week":"Седмица","next-month":"Месец","next-year":"Година","less-than":"Периодът от време не трябва да е повече от %d дни","more-than":"Периодът от време не трябва да е по-малко от %d дни","default-more":"Моля изберете период по-дълъг от %d дни","default-single":"Моля изберете дата","default-less":"Моля изберете период по-къс от %d дни","default-range":"Моля изберете период между %d и %d дни","default-default":"Моля изберете период",time:"Време",hour:"Час",minute:"Минута"},cn:{selected:"已选择:",day:"天",days:"天",apply:"确定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"周","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快捷选择",past:"过去",following:"将来",previous:"   ","prev-week":"上周","prev-month":"上个月","prev-year":"去年",next:"   ","next-week":"下周","next-month":"下个月","next-year":"明年","less-than":"所选日期范围不能大于%d天","more-than":"所选日期范围不能小于%d天","default-more":"请选择大于%d天的日期范围","default-less":"请选择小于%d天的日期范围","default-range":"请选择%d天到%d天的日期范围","default-single":"请选择一个日期","default-default":"请选择一个日期范围",time:"时间",hour:"小时",minute:"分钟"},cz:{selected:"Vybráno:",day:"Den",days:"Dny",apply:"Zavřít","week-1":"po","week-2":"út","week-3":"st","week-4":"čt","week-5":"pá","week-6":"so","week-7":"ne","month-name":["leden","únor","březen","duben","květen","červen","červenec","srpen","září","říjen","listopad","prosinec"],shortcuts:"Zkratky",past:"po",following:"následující",previous:"předchozí","prev-week":"týden","prev-month":"měsíc","prev-year":"rok",next:"další","next-week":"týden","next-month":"měsíc","next-year":"rok","less-than":"Rozsah data by neměl být větší než %d dnů","more-than":"Rozsah data by neměl být menší než %d dnů","default-more":"Prosím zvolte rozsah data větší než %d dnů","default-single":"Prosím zvolte datum","default-less":"Prosím zvolte rozsah data menší než %d dnů","default-range":"Prosím zvolte rozsah data mezi %d a %d dny","default-default":"Prosím zvolte rozsah data"},de:{selected:"Auswahl:",day:"Tag",days:"Tage",apply:"Schließen","week-1":"mo","week-2":"di","week-3":"mi","week-4":"do","week-5":"fr","week-6":"sa","week-7":"so","month-name":["januar","februar","märz","april","mai","juni","juli","august","september","oktober","november","dezember"],shortcuts:"Schnellwahl",past:"Vorherige",following:"Folgende",previous:"Vorherige","prev-week":"Woche","prev-month":"Monat","prev-year":"Jahr",next:"Nächste","next-week":"Woche","next-month":"Monat","next-year":"Jahr","less-than":"Datumsbereich darf nicht größer sein als %d Tage","more-than":"Datumsbereich darf nicht kleiner sein als %d Tage","default-more":"Bitte mindestens %d Tage auswählen","default-single":"Bitte ein Datum auswählen","default-less":"Bitte weniger als %d Tage auswählen","default-range":"Bitte einen Datumsbereich zwischen %d und %d Tagen auswählen","default-default":"Bitte ein Start- und Enddatum auswählen",Time:"Zeit",hour:"Stunde",minute:"Minute"},es:{selected:"Seleccionado:",day:"Día",days:"Días",apply:"Cerrar","week-1":"lu","week-2":"ma","week-3":"mi","week-4":"ju","week-5":"vi","week-6":"sa","week-7":"do","month-name":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],shortcuts:"Accesos directos",past:"Pasado",following:"Siguiente",previous:"Anterior","prev-week":"Semana","prev-month":"Mes","prev-year":"Año",next:"Siguiente","next-week":"Semana","next-month":"Mes","next-year":"Año","less-than":"El rango no debería ser mayor de %d días","more-than":"El rango no debería ser menor de %d días","default-more":"Por favor selecciona un rango mayor a %d días","default-single":"Por favor selecciona un día","default-less":"Por favor selecciona un rango menor a %d días","default-range":"Por favor selecciona un rango entre %d y %d días","default-default":"Por favor selecciona un rango de fechas."},fr:{selected:"Sélection:",day:"Jour",days:"Jours",apply:"Fermer","week-1":"lu","week-2":"ma","week-3":"me","week-4":"je","week-5":"ve","week-6":"sa","week-7":"di","month-name":["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],shortcuts:"Raccourcis",past:"Passé",following:"Suivant",previous:"Précédent","prev-week":"Semaine","prev-month":"Mois","prev-year":"Année",next:"Suivant","next-week":"Semaine","next-month":"Mois","next-year":"Année","less-than":"L'intervalle ne doit pas être supérieure à %d jours","more-than":"L'intervalle ne doit pas être inférieure à %d jours","default-more":"Merci de choisir une intervalle supérieure à %d jours","default-single":"Merci de choisir une date","default-less":"Merci de choisir une intervalle inférieure %d jours","default-range":"Merci de choisir une intervalle comprise entre %d et %d jours","default-default":"Merci de choisir une date"},hu:{selected:"Kiválasztva:",day:"Nap",days:"Nap",apply:"Ok","week-1":"h","week-2":"k","week-3":"sz","week-4":"cs","week-5":"p","week-6":"sz","week-7":"v","month-name":["január","február","március","április","május","június","július","augusztus","szeptember","október","november","december"],shortcuts:"Gyorsválasztó",past:"Múlt",following:"Következő",previous:"Előző","prev-week":"Hét","prev-month":"Hónap","prev-year":"Év",next:"Következő","next-week":"Hét","next-month":"Hónap","next-year":"Év","less-than":"A kiválasztás nem lehet több %d napnál","more-than":"A kiválasztás nem lehet több %d napnál","default-more":"Válassz ki egy időszakot ami hosszabb mint %d nap","default-single":"Válassz egy napot","default-less":"Válassz ki egy időszakot ami rövidebb mint %d nap","default-range":"Válassz ki egy %d - %d nap hosszú időszakot","default-default":"Válassz ki egy időszakot"},it:{selected:"Selezionati:",day:"Giorno",days:"Giorni",apply:"Chiudi","week-1":"lu","week-2":"ma","week-3":"me","week-4":"gi","week-5":"ve","week-6":"sa","week-7":"do","month-name":["gennaio","febbraio","marzo","aprile","maggio","giugno","luglio","agosto","settembre","ottobre","novembre","dicembre"],shortcuts:"Scorciatoie",past:"Scorso",following:"Successivo",previous:"Precedente","prev-week":"Settimana","prev-month":"Mese","prev-year":"Anno",next:"Prossimo","next-week":"Settimana","next-month":"Mese","next-year":"Anno","less-than":"L'intervallo non dev'essere maggiore di %d giorni","more-than":"L'intervallo non dev'essere minore di %d giorni","default-more":"Seleziona un intervallo maggiore di %d giorni","default-single":"Seleziona una data","default-less":"Seleziona un intervallo minore di %d giorni","default-range":"Seleziona un intervallo compreso tra i %d e i %d giorni","default-default":"Seleziona un intervallo di date"},ko:{selected:"기간:",day:"일",days:"일간",apply:"닫기","week-1":"월","week-2":"화","week-3":"수","week-4":"목","week-5":"금","week-6":"토","week-7":"일","week-number":"주","month-name":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],shortcuts:"단축키들",past:"지난(오늘기준)",following:"이후(오늘기준)",previous:"이전","prev-week":"1주","prev-month":"1달","prev-year":"1년",next:"다음","next-week":"1주","next-month":"1달","next-year":"1년","less-than":"날짜 범위는 %d 일보다 많을 수 없습니다","more-than":"날짜 범위는 %d 일보다 작을 수 없습니다","default-more":"날짜 범위를 %d 일보다 길게 선택해 주세요","default-single":"날짜를 선택해 주세요","default-less":"%d 일보다 작은 날짜를 선택해 주세요","default-range":"%d와 %d 일 사이의 날짜 범위를 선택해 주세요","default-default":"날짜 범위를 선택해 주세요",time:"시각",hour:"시",minute:"분"},no:{selected:"Valgt:",day:"Dag",days:"Dager",apply:"Lukk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],shortcuts:"Snarveier","custom-values":"Egendefinerte Verdier",past:"Over",following:"Følger",previous:"Forrige","prev-week":"Uke","prev-month":"Måned","prev-year":"År",next:"Neste","next-week":"Uke","next-month":"Måned","next-year":"År","less-than":"Datoperioden skal ikkje være lengre enn %d dager","more-than":"Datoperioden skal ikkje være kortere enn %d dager","default-more":"Vennligst velg ein datoperiode lengre enn %d dager","default-single":"Vennligst velg ein dato","default-less":"Vennligst velg ein datoperiode mindre enn %d dager","default-range":"Vennligst velg ein datoperiode mellom %d og %d dager","default-default":"Vennligst velg ein datoperiode",time:"Tid",hour:"Time",minute:"Minutter"},nl:{selected:"Geselecteerd:",day:"Dag",days:"Dagen",apply:"Ok","week-1":"ma","week-2":"di","week-3":"wo","week-4":"do","week-5":"vr","week-6":"za","week-7":"zo","month-name":["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],shortcuts:"Snelkoppelingen","custom-values":"Aangepaste waarden",past:"Verleden",following:"Komend",previous:"Vorige","prev-week":"Week","prev-month":"Maand","prev-year":"Jaar",next:"Volgende","next-week":"Week","next-month":"Maand","next-year":"Jaar","less-than":"Interval moet langer dan %d dagen zijn","more-than":"Interval mag niet minder dan %d dagen zijn","default-more":"Selecteer een interval langer dan %dagen","default-single":"Selecteer een datum","default-less":"Selecteer een interval minder dan %d dagen","default-range":"Selecteer een interval tussen %d en %d dagen","default-default":"Selecteer een interval",time:"Tijd",hour:"Uur",minute:"Minuut"},ru:{selected:"Выбрано:",day:"День",days:"Дней",apply:"Применить","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"вс","month-name":["январь","февраль","март","апрель","май","июнь","июль","август","сентябрь","октябрь","ноябрь","декабрь"],shortcuts:"Быстрый выбор","custom-values":"Пользовательские значения",past:"Прошедшие",following:"Следующие",previous:"   ","prev-week":"Неделя","prev-month":"Месяц","prev-year":"Год",next:"   ","next-week":"Неделя","next-month":"Месяц","next-year":"Год","less-than":"Диапазон не может быть больше %d дней","more-than":"Диапазон не может быть меньше %d дней","default-more":"Пожалуйста выберите диапазон больше %d дней","default-single":"Пожалуйста выберите дату","default-less":"Пожалуйста выберите диапазон меньше %d дней","default-range":"Пожалуйста выберите диапазон между %d и %d днями","default-default":"Пожалуйста выберите диапазон",time:"Время",hour:"Часы",minute:"Минуты"},uk:{selected:"Вибрано:",day:"День",days:"Днів",apply:"Застосувати","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","month-name":["січень","лютий","березень","квітень","травень","червень","липень","серпень","вересень","жовтень","листопад","грудень"],shortcuts:"Швидкий вибір","custom-values":"Значення користувача",past:"Минулі",following:"Наступні",previous:"   ","prev-week":"Тиждень","prev-month":"Місяць","prev-year":"Рік",next:"   ","next-week":"Тиждень","next-month":"Місяць","next-year":"Рік","less-than":"Діапазон не може бути більш ніж %d днів","more-than":"Діапазон не може бути меньш ніж %d днів","default-more":"Будь ласка виберіть діапазон більше %d днів","default-single":"Будь ласка виберіть дату","default-less":"Будь ласка виберіть діапазон менше %d днів","default-range":"Будь ласка виберіть діапазон між %d та %d днями","default-default":"Будь ласка виберіть діапазон",time:"Час",hour:"Години",minute:"Хвилини"},pl:{selected:"Wybrany:",day:"Dzień",days:"Dni",apply:"Zamknij","week-1":"pon","week-2":"wt","week-3":"śr","week-4":"czw","week-5":"pt","week-6":"so","week-7":"nd","month-name":["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],shortcuts:"Skróty","custom-values":"Niestandardowe wartości",past:"Przeszłe",following:"Następne",previous:"Poprzednie","prev-week":"tydzień","prev-month":"miesiąc","prev-year":"rok",next:"Następny","next-week":"tydzień","next-month":"miesiąc","next-year":"rok","less-than":"Okres nie powinien być dłuższy niż %d dni","more-than":"Okres nie powinien być krótszy niż %d ni","default-more":"Wybierz okres dłuższy niż %d dni","default-single":"Wybierz datę","default-less":"Wybierz okres krótszy niż %d dni","default-range":"Wybierz okres trwający od %d do %d dni","default-default":"Wybierz okres",time:"Czas",hour:"Godzina",minute:"Minuta"},se:{selected:"Vald:",day:"dag",days:"dagar",apply:"godkänn","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lö","week-7":"sö","month-name":["januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december"],shortcuts:"genvägar","custom-values":"Anpassade värden",past:"över",following:"följande",previous:"förra","prev-week":"vecka","prev-month":"månad","prev-year":"år",next:"nästa","next-week":"vecka","next-month":"måned","next-year":"år","less-than":"Datumintervall bör inte vara mindre än %d dagar","more-than":"Datumintervall bör inte vara mer än %d dagar","default-more":"Välj ett datumintervall längre än %d dagar","default-single":"Välj ett datum","default-less":"Välj ett datumintervall mindre än %d dagar","default-range":"Välj ett datumintervall mellan %d och %d dagar","default-default":"Välj ett datumintervall",time:"tid",hour:"timme",minute:"minut"},pt:{selected:"Selecionado:",day:"Dia",days:"Dias",apply:"Fechar","week-1":"seg","week-2":"ter","week-3":"qua","week-4":"qui","week-5":"sex","week-6":"sab","week-7":"dom","week-number":"N","month-name":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],shortcuts:"Atalhos","custom-values":"Valores Personalizados",past:"Passado",following:"Seguinte",previous:"Anterior","prev-week":"Semana","prev-month":"Mês","prev-year":"Ano",next:"Próximo","next-week":"Próxima Semana","next-month":"Próximo Mês","next-year":"Próximo Ano","less-than":"O período selecionado não deve ser maior que %d dias","more-than":"O período selecionado não deve ser menor que %d dias","default-more":"Selecione um período superior a %d dias","default-single":"Selecione uma data","default-less":"Selecione um período inferior a %d dias","default-range":"Selecione um período de %d a %d dias","default-default":"Selecione um período",time:"Tempo",hour:"Hora",minute:"Minuto"},tc:{selected:"已選擇:",day:"天",days:"天",apply:"確定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"週","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快速選擇",past:"過去",following:"將來",previous:"   ","prev-week":"上週","prev-month":"上個月","prev-year":"去年",next:"   ","next-week":"下週","next-month":"下個月","next-year":"明年","less-than":"所選日期範圍不能大於%d天","more-than":"所選日期範圍不能小於%d天","default-more":"請選擇大於%d天的日期範圍","default-less":"請選擇少於%d天的日期範圍","default-range":"請選擇%d天到%d天的日期範圍","default-single":"請選擇一個日期","default-default":"請選擇一個日期範圍",time:"日期",hour:"小時",minute:"分鐘"},ja:{selected:"選択しました:",day:"日",days:"日",apply:"確定","week-1":"月","week-2":"火","week-3":"水","week-4":"木","week-5":"金","week-6":"土","week-7":"日","month-name":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],shortcuts:"クイック選択",past:"過去",following:"将来",previous:"   ","prev-week":"先週","prev-month":"先月","prev-year":"昨年",next:"   ","next-week":"来週","next-month":"来月","next-year":"来年","less-than":"日付の範囲は％d日以上にすべきではありません","more-than":"日付の範囲は％d日を下回ってはいけません","default-more":"％d日よりも長い期間を選択してください","default-less":"％d日未満の期間を選択してください","default-range":"％d日と％d日の間の日付範囲を選択してください","default-single":"日付を選択してください","default-default":"日付範囲を選択してください",time:"時間",hour:"時間",minute:"分"},da:{selected:"Valgt:",day:"Dag",days:"Dage",apply:"Luk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december"],shortcuts:"genveje","custom-values":"Brugerdefinerede værdier",past:"Forbi",following:"Følgende",previous:"Forrige","prev-week":"uge","prev-month":"måned","prev-year":"år",next:"Næste","next-week":"uge","next-month":"måned","next-year":"år","less-than":"Dato interval bør ikke være med end %d dage","more-than":"Dato interval bør ikke være mindre end %d dage","default-more":"Vælg datointerval længere end %d dage","default-single":"Vælg dato","default-less":"Vælg datointerval mindre end %d dage","default-range":"Vælg datointerval mellem %d og %d dage","default-default":"Vælg datointerval",time:"tid",hour:"time",minute:"minut"},fi:{selected:"Valittu:",day:"Päivä",days:"Päivää",apply:"Sulje","week-1":"ma","week-2":"ti","week-3":"ke","week-4":"to","week-5":"pe","week-6":"la","week-7":"su","week-number":"V","month-name":["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],shortcuts:"Pikavalinnat","custom-values":"Mukautetut Arvot",past:"Menneet",following:"Tulevat",previous:"Edellinen","prev-week":"Viikko","prev-month":"Kuukausi","prev-year":"Vuosi",next:"Seuraava","next-week":"Viikko","next-month":"Kuukausi","next-year":"Vuosi","less-than":"Aikajakson tulisi olla vähemmän kuin %d päivää","more-than":"Aikajakson ei tulisi olla vähempää kuin %d päivää","default-more":"Valitse pidempi aikajakso kuin %d päivää","default-single":"Valitse päivä","default-less":"Valitse lyhyempi aikajakso kuin %d päivää","default-range":"Valitse aikajakso %d ja %d päivän väliltä","default-default":"Valitse aikajakso",time:"Aika",hour:"Tunti",minute:"Minuutti"},cat:{selected:"Seleccionats:",day:"Dia",days:"Dies",apply:"Tanca","week-1":"Dl","week-2":"Dm","week-3":"Dc","week-4":"Dj","week-5":"Dv","week-6":"Ds","week-7":"Dg","week-number":"S","month-name":["gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre"],shortcuts:"Dreçeres","custom-values":"Valors personalitzats",past:"Passat",following:"Futur",previous:"Anterior","prev-week":"Setmana","prev-month":"Mes","prev-year":"Any",next:"Següent","next-week":"Setmana","next-month":"Mes","next-year":"Any","less-than":"El període no hauria de ser de més de %d dies","more-than":"El període no hauria de ser de menys de %d dies","default-more":"Perfavor selecciona un període més gran de %d dies","default-single":"Perfavor selecciona una data","default-less":"Perfavor selecciona un període de menys de %d dies","default-range":"Perfavor selecciona un període d'entre %d i %d dies","default-default":"Perfavor selecciona un període",time:"Temps",hour:"Hora",minute:"Minut"},sk:{selected:"Vybrané:",day:"Deň",days:"Dni",apply:"Zavrieť","week-1":"po","week-2":"út","week-3":"st","week-4":"št","week-5":"pi","week-6":"so","week-7":"ne","week-number":"T","month-name":["január","február","marec","apríl","máj","jún","júl","august","september","október","november","december"],shortcuts:"Skratky","custom-values":"Vlastné hodnoty",past:"po",following:"nasledujúci",previous:"predchádzajúci","prev-week":"týždeň","prev-month":"mesiac","prev-year":"rok",next:"ďalší","next-week":"týždeň","next-month":"mesiac","next-year":"rok","less-than":"Rozsah dátumu by nemal byť väčší ako %d dní","more-than":"Rozsah dátumu by nemal byť menší ako %d dní","default-more":"Prosím zvoľte rozsah dlhší ako %d dní","default-single":"Prosím zvoľte dátum","default-less":"Prosím zvoľte rozsah menší ako %d dní","default-range":"Prosím zvoľte rozsah medzi %d a %d dňami","default-default":"Prosím zvoľte rozsah",time:"Čas",hour:"Hodina",minute:"Minúta"}},U.fn.dateRangePicker=function(f){f||(f={}),(f=U.extend(!0,{autoClose:!1,format:"YYYY-MM-DD",separator:" to ",language:"auto",startOfWeek:"sunday",getValue:function(){return U(this).val()},setValue:function(e){U(this).attr("readonly")||U(this).is(":disabled")||e==U(this).val()||U(this).val(e)},startDate:!1,endDate:!1,time:{enabled:!1},minDays:0,maxDays:0,showShortcuts:!1,shortcuts:{},customShortcuts:[],inline:!1,container:"body",alwaysOpen:!1,singleDate:!1,lookBehind:!1,batchMode:!1,duration:200,stickyMonths:!1,dayDivAttrs:[],dayTdAttrs:[],selectForward:!1,selectBackward:!1,applyBtnClass:"",singleMonth:"auto",hoveringTooltip:function(e,t,a){return 1'+f.customTopBar+"
"):(t+='
'+K("selected")+' ...',f.singleDate||(t+=' '+f.separator+' ... (3 '+K("days")+")"),t+="
",t+='
error
default
'),t+='',t+="");var a=f.showWeekNumbers?6:5,n="<";f.customArrowPrevSymbol&&(n=f.customArrowPrevSymbol);var r=">";if(f.customArrowNextSymbol&&(r=f.customArrowNextSymbol),t+='
'+E()+"
'+n+' '+(f.singleDate||!f.stickyMonths?''+r+"":"")+'
",f.singleMonth||(t+='
'+function(){for(var e=['
'],t=0;t<20;t++)e.push('
');return e.push("
"),e.join("")}()+'
'+E()+"
'+(f.stickyMonths?"":''+n+"")+' '+r+'
"),t+='
',f.singleDate||(t+='
'),t+='
',t+='
',f.showShortcuts){t+='
'+K("shortcuts")+"";var s=f.shortcuts;if(s){var o;if(s["prev-days"]&&0'+K("past");for(var i=0;i'+o+"";t+=""}if(s["next-days"]&&0'+K("following");for(var i=0;i'+o+"";t+=""}if(s.prev&&0'+K("previous");for(var i=0;i'+o+"";t+=""}if(s.next&&0'+K("next");for(var i=0;i'+o+"";t+=""}}if(f.customShortcuts)for(var i=0;i'+d.name+""}t+="
"}if(f.showCustomValues&&(t+='
'+(f.customValueLabel||K("custom-values"))+"",f.customValues))for(var i=0;i'+l.name+""}return U(t+="
")}().hide()).append('
'),U(f.container).append(m),f.inline?m.addClass("inline-wrapper"):i();f.alwaysOpen&&m.find(".apply-btn").hide();var e=_();if(G(e),f.time.enabled)if(f.startDate&&f.endDate||f.start&&f.end)Y(Q(f.start||f.startDate).toDate(),"time1"),Y(Q(f.end||f.endDate).toDate(),"time2");else{var a=f.defaultEndTime?f.defaultEndTime:e;Y(e,"time1"),Y(a,"time2")}var n="";n=f.singleDate?K("default-single"):f.minDays&&f.maxDays?K("default-range"):f.minDays?K("default-more"):f.maxDays?K("default-less"):K("default-default");m.find(".default-top").html(n.replace(/\%d/,f.minDays).replace(/\%d/,f.maxDays)),f.singleMonth?m.addClass("single-month"):m.addClass("two-months");setTimeout(function(){l(),s=!0},0),m.on("click",function(e){e.stopPropagation()}),U(document).on("click.datepicker",Z),m.find(".next").on("click",function(){f.stickyMonths?function(e){var t=F(f.month1),a=F(f.month2);if(q(a))return;if(!f.singleDate&&0<=L(t,a))return;O(t,"month1"),O(a,"month2"),C()}():function(e){var t=U(e).parents("table").hasClass("month2"),a=t?f.month2:f.month1;if(a=F(a),!f.singleMonth&&!f.singleDate&&!t&&0<=L(a,f.month2)||q(a))return;O(a,t?"month2":"month1"),I()}(this)}),m.find(".prev").on("click",function(){f.stickyMonths?function(e){var t=R(f.month1),a=R(f.month2);if(q(t))return;if(!f.singleDate&&L(a,t)<=0)return;O(a,"month2"),O(t,"month1"),C()}():function(e){var t=U(e).parents("table").hasClass("month2"),a=t?f.month2:f.month1;if(a=R(a),t&&L(a,f.month1)<=0||q(a))return;O(a,t?"month2":"month1"),I()}(this)}),m.attr("unselectable","on").css("user-select","none").on("selectstart",function(e){return e.preventDefault(),!1}),m.find(".apply-btn").on("click",function(){B();var e=W(new Date(f.start))+f.separator+W(new Date(f.end));U(t).trigger("datepicker-apply",{value:e,date1:new Date(f.start),date2:new Date(f.end)})}),m.find("[custom]").on("click",function(){var e=U(this).attr("custom");f.start=!1,f.end=!1,m.find(".day.checked").removeClass("checked"),f.setValue.call(o,e),M(),S(!0),C(),f.autoClose&&B()}),m.find("[shortcut]").on("click",function(){var e,t=U(this).attr("shortcut"),a=new Date,n=!1;if(-1!=t.indexOf("day")){var r=parseInt(t.split(",",2)[1],10);n=new Date((new Date).getTime()+864e5*r),a=new Date(a.getTime()+864e5*(0f.end){var a=f.end;f.end=v(f.start),f.start=p(a),f.time.enabled&&f.swapTime&&(u("time1",f.start),u("time2",f.end))}f.start=parseInt(f.start),f.end=parseInt(f.end),b(),f.start&&!f.end&&(U(n).trigger("datepicker-first-date-selected",{date1:new Date(f.start)}),y(e)),w(),M(),S(),C(),x()}}function g(e){if(e=parseInt(e,10),f.startDate&&H(e,f.startDate)<0)return!1;if(f.endDate&&0f.maxDays)return!1;if(0f.start)return!1;if(f.beforeShowDay&&"function"==typeof f.beforeShowDay){for(var t=!0,a=e;1f.start&&(a-=864e5),a'+e.attr("data-tooltip")+"";else if(!e.hasClass("invalid"))if(f.singleDate)m.find(".day.hovering").removeClass("hovering"),e.addClass("hovering");else if(m.find(".day").each(function(){var e=parseInt(U(this).attr("time"));f.start,f.end;e==t?U(this).addClass("hovering"):U(this).removeClass("hovering"),f.start&&!f.end&&(f.starte&&t<=e)?U(this).addClass("hovering"):U(this).removeClass("hovering")}),f.start&&!f.end){var n=z(t,f.start);f.hoveringTooltip&&("function"==typeof f.hoveringTooltip?a=f.hoveringTooltip(n,f.start,t):!0===f.hoveringTooltip&&1f.maxDays?(f.start=!1,f.end=!1,m.find(".day").removeClass("checked"),m.find(".drp_top-bar").removeClass("normal").addClass("error").find(".error-top").html(K("less-than").replace("%d",f.maxDays))):f.minDays&&et.getTime()){var n=t;t=e,e=n,n=null}var r=!0;if(f.startDate&&H(e,f.startDate)<0&&(r=!1),f.endDate&&0'+A(a)+"";if(!f.monthSelect)return n;var r=!!f.startDate&&Q(f.startDate).add(f.singleMonth||"month2"!==t?0:1,"month"),s=!!f.endDate&&Q(f.endDate).add(f.singleMonth||"month1"!==t?0:-1,"month"),o=r&&e.isSame(r,"year")?r.get("month"):0,i=s&&e.isSame(s,"year")?s.get("month"):11,d=Math.min(o,a),l=Math.max(i,a);if(d===l)return n;return P("month",V({minSelectable:o,maxSelectable:i,minVisible:d,maxVisible:l},a,function(e){return A(e)}))}(e=Q(e).toDate(),t),n=function(e,t){var a=(e=Q(e)).get("year"),n='
'+a+"
";if(!f.yearSelect)return n;var r=f.yearSelect&&"function"==typeof f.yearSelect,s=!!f.startDate&&Q(f.startDate).add(f.singleMonth||"month2"!==t?0:1,"month"),o=!!f.endDate&&Q(f.endDate).add(f.singleMonth||"month1"!==t?0:-1,"month"),i=r?f.yearSelect(a):f.yearSelect.slice(),d=s?Math.max(i[0],s.get("year")):Math.min(i[0],a),l=o?Math.min(i[1],o.get("year")):Math.max(i[1],a),u=Math.min(d,a),m=Math.max(l,a);if(u===m)return n;return P("year",V({minSelectable:d,maxSelectable:l,minVisible:u,maxVisible:m},a))}(e,t);m.find("."+t+" .month-name").html(a+" "+n),m.find("."+t+" tbody").html(function(e){var t=[];e.setDate(1);new Date(e.getTime()-864e5);var a,n,r=new Date,s=e.getDay();0===s&&"monday"===f.startOfWeek&&(s=7);if(0");for(var i=0;i<7;i++){var m="monday"==f.startOfWeek?i+1:i;a=t[7*u+m];var h=Q(a.time).format("L")==Q(r).format("L");if(a.extraClass="",a.tooltip="",a.valid&&f.beforeShowDay&&"function"==typeof f.beforeShowDay){var c=f.beforeShowDay(Q(a.time).toDate());a.valid=c[0],a.extraClass=c[1]||"",a.tooltip=c[2]||"",""!==a.tooltip&&(a.extraClass+=" has-tooltip ")}var p={time:a.time,"data-tooltip":a.tooltip,class:"day "+a.type+" "+a.extraClass+" "+(a.valid?"valid":"invalid")+" "+(h?"real-today":"")};0===i&&f.showWeekNumbers&&l.push('
'+f.getWeekNumber(a.date)+"
"),l.push("
"+J(a.time,a.day)+"
")}l.push("")}return l.join("")}(e)),f[t]=e,w(),m.find(".day").off("click").on("click",function(e){k(U(this))}),m.find(".day").off("mouseenter").on("mouseenter",function(e){y(U(this))}),m.find(".day").off("mouseleave").on("mouseleave",function(e){m.find(".date-range-length-tip").hide(),f.singleDate&&b()}),m.find(".week-number").off("click").on("click",function(e){var t,a,n,r;t=U(this),r=parseInt(t.attr("data-start-time"),10),f.startWeek?(m.find(".week-number-selected").removeClass("week-number-selected"),a=new Date(re.maxSelectable});return n}function P(e,t){for(var a,n='
"+a+"
"}function Y(e,t){m.find("."+t).append("
"+K("Time")+': 00:00
'),u(t,e)}function A(e){return K("month-name")[e]}function W(e){return Q(e).format(f.format)}function I(){C();var e=parseInt(Q(f.month1).format("YYYYMM")),t=parseInt(Q(f.month2).format("YYYYMM")),a=Math.abs(e-t);1"+K("week-number")+"":"";return"monday"==f.startOfWeek?e+""+K("week-1")+""+K("week-2")+""+K("week-3")+""+K("week-4")+""+K("week-5")+""+K("week-6")+""+K("week-7")+"":e+""+K("week-7")+""+K("week-1")+""+K("week-2")+""+K("week-3")+""+K("week-4")+""+K("week-5")+""+K("week-6")+""}function q(e){return e=Q(e),!(!f.startDate||!e.endOf("month").isBefore(f.startDate))||!(!f.endDate||!e.startOf("month").isAfter(f.endDate))}function $(e,t,r){var s=U.extend(!0,{},e);U.each(t,function(e,t){var a=t(r);for(var n in a)s.hasOwnProperty(n)?s[n]+=a[n]:s[n]=a[n]});var a="";for(var n in s)s.hasOwnProperty(n)&&(a+=n+'="'+s[n]+'" ');return a}function J(e,t){return f.showDateFilter&&"function"==typeof f.showDateFilter?f.showDateFilter(e,t):t}function K(e){var t=e.toLowerCase(),a=e in r?r[e]:t in r?r[t]:null,n=U.dateRangePickerLanguages.default;return null==a&&(a=e in n?n[e]:t in n?n[t]:""),a}function _(){var e=f.defaultTime?f.defaultTime:new Date;return f.lookBehind?(f.startDate&&L(e,f.startDate)<0&&(e=F(Q(f.startDate).toDate())),f.endDate&&0>>0,s=0;sAe(e)?(r=e+1,t-Ae(e)):(r=e,t);return{year:r,dayOfYear:n}}function qe(e,t,n){var s,i,r=ze(e.year(),t,n),r=Math.floor((e.dayOfYear()-r-1)/7)+1;return r<1?s=r+P(i=e.year()-1,t,n):r>P(e.year(),t,n)?(s=r-P(e.year(),t,n),i=e.year()+1):(i=e.year(),s=r),{week:s,year:i}}function P(e,t,n){var s=ze(e,t,n),t=ze(e+1,t,n);return(Ae(e)-s+t)/7}s("w",["ww",2],"wo","week"),s("W",["WW",2],"Wo","isoWeek"),t("week","w"),t("isoWeek","W"),n("week",5),n("isoWeek",5),v("w",p),v("ww",p,w),v("W",p),v("WW",p,w),Te(["w","ww","W","WW"],function(e,t,n,s){t[s.substr(0,1)]=g(e)});function Be(e,t){return e.slice(t,7).concat(e.slice(0,t))}s("d",0,"do","day"),s("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),s("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),s("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),s("e",0,0,"weekday"),s("E",0,0,"isoWeekday"),t("day","d"),t("weekday","e"),t("isoWeekday","E"),n("day",11),n("weekday",11),n("isoWeekday",11),v("d",p),v("e",p),v("E",p),v("dd",function(e,t){return t.weekdaysMinRegex(e)}),v("ddd",function(e,t){return t.weekdaysShortRegex(e)}),v("dddd",function(e,t){return t.weekdaysRegex(e)}),Te(["dd","ddd","dddd"],function(e,t,n,s){s=n._locale.weekdaysParse(e,s,n._strict);null!=s?t.d=s:m(n).invalidWeekday=e}),Te(["d","e","E"],function(e,t,n,s){t[s]=g(e)});var Je="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Qe="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Xe="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ke=k,et=k,tt=k;function nt(){function e(e,t){return t.length-e.length}for(var t,n,s,i=[],r=[],a=[],o=[],u=0;u<7;u++)s=l([2e3,1]).day(u),t=M(this.weekdaysMin(s,"")),n=M(this.weekdaysShort(s,"")),s=M(this.weekdays(s,"")),i.push(t),r.push(n),a.push(s),o.push(t),o.push(n),o.push(s);i.sort(e),r.sort(e),a.sort(e),o.sort(e),this._weekdaysRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+r.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+i.join("|")+")","i")}function st(){return this.hours()%12||12}function it(e,t){s(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function rt(e,t){return t._meridiemParse}s("H",["HH",2],0,"hour"),s("h",["hh",2],0,st),s("k",["kk",2],0,function(){return this.hours()||24}),s("hmm",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)}),s("hmmss",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)+r(this.seconds(),2)}),s("Hmm",0,0,function(){return""+this.hours()+r(this.minutes(),2)}),s("Hmmss",0,0,function(){return""+this.hours()+r(this.minutes(),2)+r(this.seconds(),2)}),it("a",!0),it("A",!1),t("hour","h"),n("hour",13),v("a",rt),v("A",rt),v("H",p),v("h",p),v("k",p),v("HH",p,w),v("hh",p,w),v("kk",p,w),v("hmm",ge),v("hmmss",we),v("Hmm",ge),v("Hmmss",we),D(["H","HH"],x),D(["k","kk"],function(e,t,n){e=g(e);t[x]=24===e?0:e}),D(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),D(["h","hh"],function(e,t,n){t[x]=g(e),m(n).bigHour=!0}),D("hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s)),m(n).bigHour=!0}),D("hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i)),m(n).bigHour=!0}),D("Hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s))}),D("Hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i))});k=de("Hours",!0);var at,ot={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Ce,monthsShort:Ue,week:{dow:0,doy:6},weekdays:Je,weekdaysMin:Xe,weekdaysShort:Qe,meridiemParse:/[ap]\.?m?\.?/i},R={},ut={};function lt(e){return e&&e.toLowerCase().replace("_","-")}function ht(e){for(var t,n,s,i,r=0;r=t&&function(e,t){for(var n=Math.min(e.length,t.length),s=0;s=t-1)break;t--}r++}return at}function dt(t){var e;if(void 0===R[t]&&"undefined"!=typeof module&&module&&module.exports&&null!=t.match("^[^/\\\\]*$"))try{e=at._abbr,require("./locale/"+t),ct(e)}catch(e){R[t]=null}return R[t]}function ct(e,t){return e&&((t=o(t)?mt(e):ft(e,t))?at=t:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),at._abbr}function ft(e,t){if(null===t)return delete R[e],null;var n,s=ot;if(t.abbr=e,null!=R[e])Q("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=R[e]._config;else if(null!=t.parentLocale)if(null!=R[t.parentLocale])s=R[t.parentLocale]._config;else{if(null==(n=dt(t.parentLocale)))return ut[t.parentLocale]||(ut[t.parentLocale]=[]),ut[t.parentLocale].push({name:e,config:t}),null;s=n._config}return R[e]=new K(X(s,t)),ut[e]&&ut[e].forEach(function(e){ft(e.name,e.config)}),ct(e),R[e]}function mt(e){var t;if(!(e=e&&e._locale&&e._locale._abbr?e._locale._abbr:e))return at;if(!a(e)){if(t=dt(e))return t;e=[e]}return ht(e)}function _t(e){var t=e._a;return t&&-2===m(e).overflow&&(t=t[O]<0||11We(t[Y],t[O])?b:t[x]<0||24P(r,u,l)?m(s)._overflowWeeks=!0:null!=h?m(s)._overflowWeekday=!0:(d=$e(r,a,o,u,l),s._a[Y]=d.year,s._dayOfYear=d.dayOfYear)),null!=e._dayOfYear&&(i=bt(e._a[Y],n[Y]),(e._dayOfYear>Ae(i)||0===e._dayOfYear)&&(m(e)._overflowDayOfYear=!0),h=Ze(i,0,e._dayOfYear),e._a[O]=h.getUTCMonth(),e._a[b]=h.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=c[t]=n[t];for(;t<7;t++)e._a[t]=c[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[x]&&0===e._a[T]&&0===e._a[N]&&0===e._a[Ne]&&(e._nextDay=!0,e._a[x]=0),e._d=(e._useUTC?Ze:je).apply(null,c),r=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[x]=24),e._w&&void 0!==e._w.d&&e._w.d!==r&&(m(e).weekdayMismatch=!0)}}function Tt(e){if(e._f===f.ISO_8601)St(e);else if(e._f===f.RFC_2822)Ot(e);else{e._a=[],m(e).empty=!0;for(var t,n,s,i,r,a=""+e._i,o=a.length,u=0,l=ae(e._f,e._locale).match(te)||[],h=l.length,d=0;de.valueOf():e.valueOf()"}),i.toJSON=function(){return this.isValid()?this.toISOString():null},i.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},i.unix=function(){return Math.floor(this.valueOf()/1e3)},i.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},i.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},i.eraName=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;nthis.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},i.isLocal=function(){return!!this.isValid()&&!this._isUTC},i.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},i.isUtc=At,i.isUTC=At,i.zoneAbbr=function(){return this._isUTC?"UTC":""},i.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},i.dates=e("dates accessor is deprecated. Use date instead.",ke),i.months=e("months accessor is deprecated. Use month instead",Ge),i.years=e("years accessor is deprecated. Use year instead",Ie),i.zone=e("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,t){return null!=e?(this.utcOffset(e="string"!=typeof e?-e:e,t),this):-this.utcOffset()}),i.isDSTShifted=e("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!o(this._isDSTShifted))return this._isDSTShifted;var e,t={};return $(t,this),(t=Nt(t))._a?(e=(t._isUTC?l:W)(t._a),this._isDSTShifted=this.isValid()&&0 +* @copyright 2010-2022 Webkul IN +* @license https://store.webkul.com/license.html +*/ + +(function($) { + + var dateRangePickerOrg = $.fn.dateRangePicker; + $.fn.dateRangePicker = function(opt) { + if(typeof opt === "object") { + const custom_opt = { + format: 'DD-MM-YYYY', + showTopbar: false, + autoClose: true, + singleMonth: true, + language: lang_iso, + minDays: 2, + startOfWeek: 'monday', + hoveringTooltip: false, + container: '#page', + customArrowPrevSymbol: '', + customArrowNextSymbol: '', + getValue: function() + { + return $(this).find('span').html(); + }, + setValue: function(s, s1, s2) { + if (s) { + $(this).find('span').html(s.replace('to', '  ')); + } else { + $(this).find('span').html( + RangePickerCheckin + '    ' + RangePickerCheckout + ); + } + } + } + $.each(opt, function(index) { + delete custom_opt[index]; + }); + + $.extend(true, opt, custom_opt); + + } + + var args = Array.prototype.slice.call(arguments,0); + return dateRangePickerOrg.apply(this, args); + } +})(jQuery); \ No newline at end of file diff --git a/js/validate.js b/js/validate.js index a724f516b..79d7af124 100644 --- a/js/validate.js +++ b/js/validate.js @@ -184,9 +184,7 @@ function validate_field(that) var selector = '#id_country'; if ($(that).attr('name') == 'postcode_invoice') selector += '_invoice'; - var id_country = $(selector + ' option:selected').val(); - if (typeof(countriesNeedZipCode[id_country]) != 'undefined' && typeof(countries[id_country]) != 'undefined') var result = window['validate_'+$(that).attr('data-validate')]($(that).val(), countriesNeedZipCode[id_country], countries[id_country]['iso_code']); } diff --git a/mails/en/order_refund_received_customer.html b/mails/en/credit_slip_voucher.html old mode 100755 new mode 100644 similarity index 69% rename from mails/en/order_refund_received_customer.html rename to mails/en/credit_slip_voucher.html index 6a8da4180..1a9da8f38 --- a/mails/en/order_refund_received_customer.html +++ b/mails/en/credit_slip_voucher.html @@ -55,7 +55,7 @@ - + @@ -73,7 +73,6 @@ @@ -87,10 +86,14 @@ @@ -99,35 +102,6 @@
  Hi {firstname} {lastname},
- Your request for booking cancellation has been recieved.
  -

Order details

+

+ VOUCHER GENERATED +

- Order: {order_reference} Placed on {order_date}

- Refund Status: {status_name}

+ Your voucher has been generated successfully against your credit slip #{credit_slip_id}. +

+ Voucher Code: {voucher_code} for an amount of {voucher_amount}.

+ To use this voucher just copy and paste this code during payment process for your next order.
- - - -

Booking details

- - - - - - - - - {refundBookingHtml} - -
Room TypeHotelNum. RoomsDuration
- - - - -   - - - - - - You can review your booking cancelation requests from the "Booking Refund Requests" section of your customer account by clicking "My account". - - -   diff --git a/mails/en/credit_slip_voucher.txt b/mails/en/credit_slip_voucher.txt new file mode 100644 index 000000000..b53903729 --- /dev/null +++ b/mails/en/credit_slip_voucher.txt @@ -0,0 +1,16 @@ + +[/{shop_url}] + +Hi {firstname} {lastname}, + +VOUCHER GENERATED + +Your voucher has been generated successfully against your credit slip #{credit_slip_id}. + +VOUCHER CODE: {voucher_code} for an amount of {voucher_amount}. + +To use this voucher just copy and paste this code during payment process for your next +order. + +{shop_name} [/{shop_url}] powered by Webkul(tm) +[https://www.webkul.com/] diff --git a/mails/en/order_refund_waiting_admin.html b/mails/en/order_refund_pending_admin.html similarity index 97% rename from mails/en/order_refund_waiting_admin.html rename to mails/en/order_refund_pending_admin.html index ae72fbae6..3c5a93547 100755 --- a/mails/en/order_refund_waiting_admin.html +++ b/mails/en/order_refund_pending_admin.html @@ -73,7 +73,7 @@ Hi {firstname} {lastname},
- A request has been generated for the booking cancellation. + A request has been generated for booking cancellations. @@ -104,7 +104,7 @@ -

Booking details

+

Requested Booking Cancellations

diff --git a/mails/en/order_refund_waiting_admin.txt b/mails/en/order_refund_pending_admin.txt similarity index 71% rename from mails/en/order_refund_waiting_admin.txt rename to mails/en/order_refund_pending_admin.txt index 29b1acbbf..f520f617c 100755 --- a/mails/en/order_refund_waiting_admin.txt +++ b/mails/en/order_refund_pending_admin.txt @@ -1,7 +1,7 @@ Message from {shop_name} Hi {firstname} {lastname}, -A request has been generated for the booking cancellation. +A request has been generated for booking cancellations. Order details @@ -9,7 +9,7 @@ Order: {order_reference} Placed on {order_date} Refund Status: {status_name} Cancelation Reason: {cancelation_reason} -Booking details +Requested Booking Cancellations Room Num Room Type diff --git a/mails/en/order_refund_waiting_customer.html b/mails/en/order_refund_pending_customer.html similarity index 100% rename from mails/en/order_refund_waiting_customer.html rename to mails/en/order_refund_pending_customer.html diff --git a/mails/en/order_refund_waiting_customer.txt b/mails/en/order_refund_pending_customer.txt similarity index 100% rename from mails/en/order_refund_waiting_customer.txt rename to mails/en/order_refund_pending_customer.txt diff --git a/mails/en/order_refund_received_admin.html b/mails/en/order_refund_received_admin.html deleted file mode 100755 index 756fc11fd..000000000 --- a/mails/en/order_refund_received_admin.html +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - Message from {shop_name} - - - - - - -
- - - - - -
  - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Hi {firstname} {lastname},
- A request has been recieved for the booking cancellation. - -
 
- - - - - - -
  - -

Order details

- - Order: {order_reference} Placed on {order_date}

- Refund Status: {status_name}

- - - 		 
-
- -

Booking details

- - - - - - - - - {refundBookingHtml} - -
Room NumRoom TypeHotelDuration
- -
- - - - - - -
  - -

Customer details

- - Customer name: {customer_name}

- Customer email: {customer_email}

- - 		 
-
 
- {shop_name} powered by Webkul™ -
- 		 
- - \ No newline at end of file diff --git a/mails/en/order_refund_received_admin.txt b/mails/en/order_refund_received_admin.txt deleted file mode 100755 index 11f19d0ef..000000000 --- a/mails/en/order_refund_received_admin.txt +++ /dev/null @@ -1,25 +0,0 @@ -Message from {shop_name} - -Hi {firstname} {lastname}, - -A request has been recieved for the booking cancellation. - -Order details - -Order: {order_reference} Placed on {order_date} -Refund Status: {status_name} - -Booking details -Room Num -Room Type -Hotel -Duration - -{refundBookingHtml} - -Customer details - -Customer name: {customer_name} -Customer email: {customer_email} - -{shop_url} {shop_name} powered by Webkul \ No newline at end of file diff --git a/mails/en/order_refund_received_customer.txt b/mails/en/order_refund_received_customer.txt deleted file mode 100755 index 9c54f50c9..000000000 --- a/mails/en/order_refund_received_customer.txt +++ /dev/null @@ -1,21 +0,0 @@ -Message from {shop_name} - -Hi {firstname} {lastname}, -Your request for booking cancellation has been recieved. - -Order details - -Order: {order_reference} Placed on {order_date} -Refund Status: {status_name} - -Booking details - -Room Type -Hotel -Num. Rooms -Duration - -{refundBookingHtml} -You can review your booking cancelation requests from the {refund_reqests_url} Booking Refund Requests section of your customer account by clicking {my_account_url} My account - -{shop_url} {shop_name} powered by Webkul \ No newline at end of file diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index 8043f19aa..d36f03166 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -134,26 +134,28 @@ var ajaxCart = { var dateFrom = $(this).attr('cat_rm_check_in'); var dateTo = $(this).attr('cat_rm_check_out'); - + var occupancy = getBookingOccupancyDetails($(this).closest('.booking_room_fields')); /* By Webkul * Note : In our case minimalQuantity is taken from Qty. field */ // var minimalQuantity = parseInt($(this).data('minimal_quantity')); - var minimalQuantity = parseInt($(this).data('minimal_quantity')); - var minimalQuantity = $("#cat_quantity_wanted_" + idProduct).val(); - if (!minimalQuantity) - minimalQuantity = 1; - if ($(this).prop('disabled') != 'disabled') - ajaxCart.add(idProduct, idProductAttribute, false, this, minimalQuantity, null, dateFrom, dateTo); + // var minimalQuantity = parseInt($(this).data('minimal_quantity')); + // var minimalQuantity = $("#quantity_wanted_" + idProduct).val(); + // if (!minimalQuantity) + // minimalQuantity = 1; + if ($(this).prop('disabled') != 'disabled' && occupancy) + ajaxCart.add(idProduct, idProductAttribute, false, this, occupancy, null, dateFrom, dateTo); }); //for product page 'add' button... if ($('.cart_block').length) { - $(document).off('click', '#add_to_cart button').on('click', '#add_to_cart button', function(e) { + $(document).off('click', '#add_to_cart button').on('click', '#add_to_cart button', function(e) { e.preventDefault(); - var date_from = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - var date_to = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); - ajaxCart.add($('#product_page_product_id').val(), $('#idCombination').val(), true, null, $('#quantity_wanted').val(), null, date_from, date_to); - + var date_from = $('#room_check_in').val(); + var date_to = $('#room_check_out').val(); + var occupancy = getBookingOccupancyDetails($(this).closest('.booking_room_fields')); + if (occupancy) { + ajaxCart.add($('#product_page_product_id').val(), $('#idCombination').val(), true, null, occupancy, null, date_from, date_to); + } }); } @@ -214,8 +216,8 @@ var ajaxCart = { /*by webkul*/ if (pagename == 'product') { - dateFrom = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - dateTo = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); + dateFrom = $('#room_check_in').val(); + dateTo = $('#room_check_out').val(); } else if (pagename == 'category') { dateFrom = $('#check_in_time').val(); dateTo = $('#check_out_time').val(); @@ -319,7 +321,7 @@ var ajaxCart = { // close fancybox updateFancyBox: function() {}, // add a product in the cart via ajax - add: function(idProduct, idCombination, addedFromProductPage, callerElement, quantity, whishlist, dateFrom, dateTo) { + add: function(idProduct, idCombination, addedFromProductPage, callerElement, occupancy, whishlist, dateFrom, dateTo) { if (addedFromProductPage && !checkCustomizations()) { if (contentOnly) { @@ -346,8 +348,9 @@ var ajaxCart = { if (addedFromProductPage) { $('#add_to_cart button').prop('disabled', 'disabled').addClass('disabled'); $('.filled').removeClass('filled'); - } else + } else { $(callerElement).prop('disabled', 'disabled'); + } if ($('.cart_block_list').hasClass('collapsed')) this.expand(); @@ -355,6 +358,7 @@ var ajaxCart = { // get the selected extra demands by customer var roomDemands = getRoomsExtraDemands(); + //send the ajax request to the server $.ajax({ type: 'POST', @@ -365,7 +369,7 @@ var ajaxCart = { async: true, cache: false, dataType: "json", - data: 'controller=cart&add=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&roomDemands=' + JSON.stringify(roomDemands) + '&token=' + static_token + ((parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination) : '' + '&id_customization=' + ((typeof customizationId !== 'undefined') ? customizationId : 0)), + data: 'controller=cart&add=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&ajax=true'+(occupancy_required_for_booking ? '&occupancy=' + JSON.stringify(occupancy) : '&qty=' + occupancy) + '&id_product=' + idProduct + '&roomDemands=' + JSON.stringify(roomDemands) + '&token=' + static_token + ((parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination) : '' + '&id_customization=' + ((typeof customizationId !== 'undefined') ? customizationId : 0)), success: function(jsonData, textStatus, jqXHR) { /*by webkul checking and setting availability of rooms*/ /*for product page add to cart quantity management*/ @@ -378,18 +382,19 @@ var ajaxCart = { if (pagename == 'category') { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $(callerElement).closest(".room_cont").find(".rm_left").show(); } else { - $("cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $(callerElement).closest(".room_cont").find(".rm_left").hide(); } /*for category page add to cart quantity management*/ + $(callerElement).closest(".room_cont").find(".remain_rm_qty").text(jsonData.avail_rooms); + $(callerElement).closest(".room_cont").find('.max_avail_type_qty').val(jsonData.avail_rooms); - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').hide(); + $(callerElement).closest(".room_cont").hide(); } - //$('#cat_quantity_wanted_'+idProduct).val(1); + //$('#quantity_wanted_'+idProduct).val(1); } @@ -406,22 +411,27 @@ var ajaxCart = { if (jsonData.crossSelling) $('.crossseling').html(jsonData.crossSelling); - if (idCombination) - $(jsonData.products).each(function() { - if (this.id != undefined && this.id == parseInt(idProduct) && this.idCombination == parseInt(idCombination)) - if (contentOnly) - window.parent.ajaxCart.updateLayer(this); - else - ajaxCart.updateLayer(this); - }); - else - $(jsonData.products).each(function() { - if (this.id != undefined && this.id == parseInt(idProduct)) - if (contentOnly) - window.parent.ajaxCart.updateLayer(this); - else - ajaxCart.updateLayer(this); - }); + // if (idCombination) + // $(jsonData.products).each(function() { + // if (this.id != undefined && this.id == parseInt(idProduct) && this.idCombination == parseInt(idCombination)) + // if (contentOnly) + // window.parent.ajaxCart.updateLayer(this); + // else + // ajaxCart.updateLayer(this); + // }); + // else + // $(jsonData.products).each(function() { + // if (this.id != undefined && this.id == parseInt(idProduct)) + // if (contentOnly) + // window.parent.ajaxCart.updateLayer(this); + // else { + // ajaxCart.updateLayer(this); + // } + // }); + if (jsonData.last_added_product) { + ajaxCart.updateLayer(jsonData.last_added_product); + + } if (contentOnly) parent.$.fancybox.close(); } else { @@ -434,7 +444,9 @@ var ajaxCart = { else $(callerElement).removeProp('disabled'); } - + if (!addedFromProductPage) { + resetOccupancyField($(callerElement).closest('.booking_room_fields').find('.booking_occupancy_wrapper')); + } emptyCustomizations(); }, @@ -495,12 +507,11 @@ var ajaxCart = { /*by webkul checking and setting availability of rooms*/ /*for product page add to cart quantity management*/ if (pagename == 'product') { - var date_checkIn = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - var date_checkOut = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); + var date_checkIn = $('#room_check_in').val(); + var date_checkOut = $('#room_check_out').val(); var product_page_id_product = $('#product_page_product_id').val(); if (idProduct == product_page_id_product && dateFrom < date_checkOut && dateTo >= date_checkIn) { - $("#max_avail_type_qty").val(jsonData.avail_rooms); - + $(".max_avail_type_qty").val(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { disableRoomTypeDemands(1); } @@ -510,18 +521,19 @@ var ajaxCart = { if (pagename == 'category') { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $(".room_cont").find('[data-id-product="'+idProduct+'"] .rm_left').show(); } else { - $("cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $("room_cont").find('[data-id-product="'+idProduct+'"] .rm_left').hide(); } /*for category page add to cart quantity management*/ - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); + $(".room_cont").find('[data-id-product="'+idProduct+'"] .remain_rm_qty').text(jsonData.avail_rooms); + $(".room_cont").find('[data-id-product="'+idProduct+'"] .max_avail_type_qty').val(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').hide(); + $(".room_cont").find('[data-id-product="'+idProduct+'"]').hide(); } - //$('#cat_quantity_wanted_'+idProduct).val(1); + //$('#quantity_wanted_'+idProduct).val(1); } ajaxCart.updateCart(jsonData); @@ -615,14 +627,14 @@ var ajaxCart = { if (pagename == 'category') { // for category page.... - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); - - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').show(0, function() { + $('.room_cont[data-id-product="'+idProduct+'"]').find(".remain_rm_qty").text(jsonData.avail_rooms); + $('.room_cont[data-id-product="'+idProduct+'"]').find('.max_avail_type_qty').val(jsonData.avail_rooms); + $('.room_cont[data-id-product="'+idProduct+'"]').show(0, function() { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $('.room_cont[data-id-product="'+idProduct+'"]').find('.rm_left').show(); } else { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $('.room_cont[data-id-product="'+idProduct+'"]').find('.rm_left').hide(); } }); } @@ -817,7 +829,7 @@ var ajaxCart = { content += '
'; content += '' + capacity_txt + ':'; - content += ' ' + cart_booking_data[key].adult + ' ' + adults_txt + ' & ' + cart_booking_data[key].children + ' ' + children_txt + '' + content += ' ' + cart_booking_data[key].adults + ' ' + adults_txt + ' & ' + cart_booking_data[key].children + ' ' + children_txt + '' content += '
'; if (this.hasAttributes) @@ -1010,17 +1022,25 @@ var ajaxCart = { $('#layer_cart_product_price').text(product.price); //by webkul has to work on it more.. - if (pagename == 'product') { - $('#layer_cart_product_time_duration').text($('#room_check_in').val() + ' - ' + $('#room_check_out').val()); - $('#layer_cart_product_quantity').text($('#quantity_wanted').val()); - $('#quantity_wanted').val(1); - } - if (pagename == 'category') { - $('#layer_cart_product_time_duration').text($('#check_in_time').val() + ' - ' + $('#check_out_time').val()); - $('#layer_cart_product_quantity').text($('#cat_quantity_wanted_' + product.id).val()); - $('#cat_quantity_wanted_' + product.id).val(1); + $('#layer_cart_product_time_duration').text( + product.date_from + ' - ' + product.date_to + ); + let rooms = 0; + let adults = 0; + let children = 0; + let room_quantity_text = ''; + if (occupancy_required_for_booking) { + $.each(product.occupancy, function(index, val) { + rooms++; + adults += parseInt(val.adults); + children += parseInt(val.children); + }); + room_quantity_text = getRoomTypeGuestOccupancyFormated(adults, children, rooms); + } else { + room_quantity_text = product.occupancy; } + $('#layer_cart_product_quantity').text(room_quantity_text); $('.layer_cart_img').html('' + product.name + ''); @@ -1189,4 +1209,48 @@ function getRoomsExtraDemands() }); return roomDemands; +} + +function getBookingOccupancyDetails(bookingform) +{ + let occupancy; + if (occupancy_required_for_booking) { + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + occupancy = []; + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + return false; + } + } + occupancy.push({ + 'adults': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + return false; + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + } + } else { + occupancy = parseInt($(bookingform).find(".quantity_wanted").val()); + } + + return occupancy; } \ No newline at end of file diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 2ad83363e..1571ec2f3 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -129,7 +129,7 @@ class Blockcart extends Module $wrappingCost = (float) ($params['cart']->getOrderTotal($useTax, Cart::ONLY_WRAPPING)); $totalToPay = $params['cart']->getOrderTotal($useTax); $tax_cost = 0; - if ($showTax) { + if ($useTax && $showTax) { $totalToPayWithoutTaxes = $params['cart']->getOrderTotal(false); $tax_cost = Tools::displayPrice($totalToPay - $totalToPayWithoutTaxes, $currency); } @@ -195,6 +195,52 @@ class Blockcart extends Module 1 ); + $addedProduct = false; + // get currently added product if exists + if (!empty($params['cookie']->currentAddedProduct)) { + $addedProduct = json_decode($params['cookie']->currentAddedProduct, true); + $objProduct = new Product($addedProduct['id_product'], false, $this->context->language->id); + + $addedProduct['name'] = $objProduct->name; + $addedProduct['link'] = $this->context->link->getProductLink( + $objProduct->id, + $objProduct->link_rewrite, + $objProduct->category, + null, + null, + $this->context->cart->id_shop + ); + $image = Product::getCover($objProduct->id); + $image['id_product'] = $objProduct->id; + // Product::defineProductImage(array(Product::getCover($objProduct->id)['id_image']/), $this->id_lang) + $addedProduct['image'] = $this->context->link->getImageLink( + $objProduct->link_rewrite, + Product::defineProductImage($image, $this->context->language->id), + 'home_default' + ); + $addedProduct['image_cart'] = $this->context->link->getImageLink( + $objProduct->link_rewrite, + Product::defineProductImage($image, $this->context->language->id), + 'cart_default' + ); + $price = $addedProduct['price'] = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $objProduct->id, + $addedProduct['date_from'], + $addedProduct['date_to'], + $addedProduct['req_rm'] + ); + + if ($priceDisplayMethod == PS_TAX_EXC) { + $addedProduct['price'] = Tools::displayPrice($price['total_price_tax_incl']); + } else { + $addedProduct['price'] = Tools::displayPrice($price['total_price_tax_excl']); + } + $addedProduct['date_from'] = Tools::displayDate($addedProduct['date_from']); + $addedProduct['date_to'] = Tools::displayDate($addedProduct['date_to']); + + unset($this->context->cookie->currentAddedProduct); + } + $response = array( 'products' => $products, 'customizedDatas' => Product::getAllCustomizedDatas((int) ($params['cart']->id)), @@ -206,6 +252,7 @@ class Blockcart extends Module 'shipping_cost_float' => $shipping_cost_float, 'show_wrapping' => $wrappingCost > 0 ? true : false, 'show_tax' => $showTax, + 'use_tax' => $useTax, 'tax_cost' => $tax_cost, 'wrapping_cost' => Tools::displayPrice($wrappingCost, $currency), 'product_total' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::ONLY_PRODUCTS), $currency), @@ -218,7 +265,7 @@ class Blockcart extends Module 'static_token' => Tools::getToken(false), 'free_shipping' => Tools::displayPrice($total_free_shipping), 'free_shipping_float' => $total_free_shipping, - + 'last_added_product' => $addedProduct, 'cart_booking_data' => $htlCartData, 'total_rooms_in_cart' => $totalRooms, ); diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 6192288d3..ab402c9ab 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -24,7 +24,7 @@ *} {if isset($blockcart_top) && $blockcart_top} -
+
{/if}
@@ -67,11 +67,6 @@ {$product.name|truncate:30:'...':true|escape:'html':'UTF-8'}
- -
- {l s='Capacity' mod='blockcart'}: -  {$cart_booking_data[$data_k]['adult']} {l s='Adults' mod='blockcart'} & {$cart_booking_data[$data_k]['children']} {l s='Children' mod='blockcart'} -
{if isset($product.attributes_small)}
@@ -118,7 +113,7 @@ {foreach from=$cart_booking_data[$data_k]['date_diff'] key=data_k1 item=data_v} - {$data_v['data_form']|date_format:"%d %b %Y"} - {$data_v['data_to']|date_format:"%d %b %Y"} + {$data_v['data_form']|date_format:"%d-%m-%Y"} - {$data_v['data_to']|date_format:"%d-%m-%Y"} {$data_v['num_rm']} {convertPrice price=$data_v['amount']} @@ -211,7 +206,7 @@
{/if} --> - {if $show_tax && isset($tax_cost)} + {if $show_tax && $use_tax}
{$tax_cost} {l s='Tax' mod='blockcart'} @@ -271,11 +266,11 @@
- {l s='Rooms Quantity Added' mod='blockcart'}  -  + {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}  - 
- {l s='Total Cart Cost of This Room Type' mod='blockcart'}  -  + {l s='Room type cost' mod='blockcart'}  - 
diff --git a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php index 547daedfa..4aaaf9f5a 100644 --- a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php +++ b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php @@ -31,20 +31,16 @@ class BlockcartCheckRoomAvailabilityAjaxProcessModuleFrontController extends Mod )) { if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { if ($idHotel = $roomTypeInfo['id_hotel']) { - if ($hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest - )) { + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'only_search_data' => 1, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { $totalAvailRooms = $hotelRoomData['stats']['num_avail']; } } diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php index 788071d4e..a012b2b8b 100644 --- a/modules/dashguestcycle/dashguestcycle.php +++ b/modules/dashguestcycle/dashguestcycle.php @@ -44,6 +44,7 @@ class DashGuestCycle extends Module { return (parent::install() && $this->registerHook('dashboardTop') + && $this->registerHook('dashboardZoneTwo') && $this->registerHook('dashboardData') && $this->registerHook('actionAdminControllerSetMedia') ); @@ -56,42 +57,393 @@ class DashGuestCycle extends Module } } - public function hookDashboardTop($params) + public function hookDashboardTop() { return $this->display(__FILE__, 'dashboard-top.tpl'); } + public function hookDashboardZoneTwo() + { + return $this->display(__FILE__, 'dashboard-zone-two.tpl'); + } + public function hookDashboardData($params) { - $data = array(); + $dataValue = array(); + $dataTable = array(); + + $dateToday = date('Y-m-d'); if (Configuration::get('PS_DASHBOARD_SIMULATION')) { - $data['dgc_total_arrivals'] = sprintf('%02d', rand(100, 1000)); - $data['dgc_arrived'] = sprintf('%02d', rand(0, $data['dgc_total_arrivals'])); - $data['dgc_total_departures'] = sprintf('%02d', rand(100, 1000)); - $data['dgc_departed'] = sprintf('%02d', rand(0, $data['dgc_total_departures'])); - $data['dgc_new_bookings'] = sprintf('%02d', rand(10, 500)); - $data['dgc_stay_overs'] = sprintf('%02d', rand(10, 500)); - $data['dgc_new_messages'] = sprintf('%02d', rand(0, 20)); - $data['dgc_cancelled_bookings'] = sprintf('%02d', rand(0, 20)); - $data['dgc_guests_adults'] = sprintf('%02d', rand(100, 1000)); - $data['dgc_guests_children'] = sprintf('%02d', rand(0, $data['dgc_guests_adults'])); + $dataValue['dgc_total_arrivals'] = sprintf('%02d', rand(100, 1000)); + $dataValue['dgc_arrived'] = sprintf('%02d', rand(0, $dataValue['dgc_total_arrivals'])); + $dataValue['dgc_total_departures'] = sprintf('%02d', rand(100, 1000)); + $dataValue['dgc_departed'] = sprintf('%02d', rand(0, $dataValue['dgc_total_departures'])); + $dataValue['dgc_new_bookings'] = sprintf('%02d', rand(10, 500)); + $dataValue['dgc_stay_overs'] = sprintf('%02d', rand(10, 500)); + $dataValue['dgc_new_messages'] = sprintf('%02d', rand(0, 20)); + $dataValue['dgc_cancelled_bookings'] = sprintf('%02d', rand(0, 20)); + $dataValue['dgc_guests_adults'] = sprintf('%02d', rand(100, 1000)); + $dataValue['dgc_guests_children'] = sprintf('%02d', rand(0, $dataValue['dgc_guests_adults'])); } else { - $dateToday = date('Y-m-d'); + // set badges data $arrivalsData = AdminStatsController::getArrivalsByDate($dateToday, $params['id_hotel']); $departuresData = AdminStatsController::getDeparturesByDate($dateToday, $params['id_hotel']); $guestsData = AdminStatsController::getGuestsByDate($dateToday, $params['id_hotel']); - $data['dgc_arrived'] = sprintf('%02d', $arrivalsData['arrived']); - $data['dgc_total_arrivals'] = sprintf('%02d', $arrivalsData['total_arrivals']); - $data['dgc_departed'] = sprintf('%02d', $departuresData['departed']); - $data['dgc_total_departures'] = sprintf('%02d', $departuresData['total_departures']); - $data['dgc_new_bookings'] = sprintf('%02d', AdminStatsController::getBookingsByDate($dateToday, $params['id_hotel'])); - $data['dgc_stay_overs'] = sprintf('%02d', AdminStatsController::getStayOversByDate($dateToday, $params['id_hotel'])); - $data['dgc_new_messages'] = sprintf('%02d', CustomerMessage::getMessagesByDate($dateToday)); - $data['dgc_cancelled_bookings'] = sprintf('%02d', AdminStatsController::getCancelledBookingsByDate($dateToday, $params['id_hotel'])); - $data['dgc_guests_adults'] = sprintf('%02d', $guestsData['adults']); - $data['dgc_guests_children'] = sprintf('%02d', $guestsData['children']); + $dataValue['dgc_arrived'] = sprintf('%02d', $arrivalsData['arrived']); + $dataValue['dgc_total_arrivals'] = sprintf('%02d', $arrivalsData['total_arrivals']); + $dataValue['dgc_departed'] = sprintf('%02d', $departuresData['departed']); + $dataValue['dgc_total_departures'] = sprintf('%02d', $departuresData['total_departures']); + $dataValue['dgc_new_bookings'] = sprintf('%02d', AdminStatsController::getBookingsByDate($dateToday, $params['id_hotel'])); + $dataValue['dgc_stay_overs'] = sprintf('%02d', AdminStatsController::getStayOversByDate($dateToday, $params['id_hotel'])); + $dataValue['dgc_new_messages'] = sprintf('%02d', CustomerMessage::getMessagesByDate($dateToday)); + $dataValue['dgc_cancelled_bookings'] = sprintf('%02d', AdminStatsController::getCancelledBookingsByDate($dateToday, $params['id_hotel'])); + $dataValue['dgc_guests_adults'] = sprintf('%02d', $guestsData['adults']); + $dataValue['dgc_guests_children'] = sprintf('%02d', $guestsData['children']); } - return array('data_value' => $data); + // set tables data + $tableCurrentArrivals = $this->getArrivalsTableContentsByDate($dateToday, $params['id_hotel']); + $dataValue['dgc_count_upcoming_arrivals'] = count($tableCurrentArrivals['body']); + + $tableCurrentDepartures = $this->getDeparturesTableContentsByDate($dateToday, $params['id_hotel']); + $dataValue['dgc_count_upcoming_departures'] = count($tableCurrentDepartures['body']); + + $tableCurrentInHouse = $this->getInHousesTableContents($params['id_hotel']); + $dataValue['dgc_count_current_in_house'] = count($tableCurrentInHouse['body']); + + $tableNewBookings = $this->getNewBookingsTableContentsByDate($dateToday, $params['id_hotel']); + $dataValue['dgc_count_new_bookings'] = count($tableNewBookings['body']); + + $tableCancellations = $this->getCancellationsTableContentsByDate($dateToday, $params['id_hotel']); + $dataValue['dgc_count_cancellations'] = count($tableCancellations['body']); + + $dataTable = array( + 'dgc_table_current_arrivals' => $tableCurrentArrivals, + 'dgc_table_current_departures' => $tableCurrentDepartures, + 'dgc_table_current_in_house' => $tableCurrentInHouse, + 'dgc_table_new_bookings' => $tableNewBookings, + 'dgc_table_cancellations' => $tableCancellations, + ); + + return array('data_value' => $dataValue, 'data_table' => $dataTable); + } + + public function getArrivalsTableContentsByDate($date, $idHotel) + { + $header = array( + 'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'), + 'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'), + 'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'), + 'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'), + 'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'), + 'check_out' => array('title' => $this->l('Check-out (LOS)'), 'class' => 'text-left'), + 'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'), + ); + + if ($idHotel != 0) { + unset($header['hotel']); + } + + $arrivalsInfo = AdminStatsController::getArrivalsInfoByDate($date, $idHotel); + + $body = array(); + foreach ($arrivalsInfo as $arrivalInfo) { + $tr = array(); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($arrivalInfo['customer_name']).'', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => $arrivalInfo['room_num'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($arrivalInfo['room_type_name']).'', + 'class' => 'text-left', + ); + + if ($idHotel == 0) { + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($arrivalInfo['hotel_name']).'', + 'class' => 'text-left', + ); + } + + $tr[] = array( + 'value' => $arrivalInfo['adult'] + $arrivalInfo['children'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => Tools::displayDate($arrivalInfo['date_to']).' ('.$arrivalInfo['los'].' '.($arrivalInfo['los'] > 1 ? $this->l('Nights') : $this->l('Night')).')', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($arrivalInfo['id_order']).'', + 'class' => 'text-center', + ); + + $body[] = $tr; + } + + return array('header' => array_values($header), 'body' => $body); + } + + public function getDeparturesTableContentsByDate($date, $idHotel) + { + $header = array( + 'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'), + 'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'), + 'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'), + 'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'), + 'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'), + 'check_in' => array('title' => $this->l('Check-in (LOS)'), 'class' => 'text-left'), + 'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'), + ); + + if ($idHotel != 0) { + unset($header['hotel']); + } + + $departuresInfo = AdminStatsController::getDeparturesInfoByDate($date, $idHotel); + + $body = array(); + foreach ($departuresInfo as $departureInfo) { + $tr = array(); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($departureInfo['customer_name']).'', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => $departureInfo['room_num'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($departureInfo['room_type_name']).'', + 'class' => 'text-left', + ); + + if ($idHotel == 0) { + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($departureInfo['hotel_name']).'', + 'class' => 'text-left', + ); + } + + $tr[] = array( + 'value' => $departureInfo['adult'] + $departureInfo['children'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => Tools::displayDate($departureInfo['date_from']).' ('.$departureInfo['los'].' '.($departureInfo['los'] > 1 ? $this->l('Nights') : $this->l('Night')).')', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($departureInfo['id_order']).'', + 'class' => 'text-center', + ); + + $body[] = $tr; + } + + return array('header' => array_values($header), 'body' => $body); + } + + public function getInHousesTableContents($idHotel) + { + $header = array( + 'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'), + 'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'), + 'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'), + 'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'), + 'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'), + 'check_in' => array('title' => $this->l('Check-in'), 'class' => 'text-left'), + 'check_out' => array('title' => $this->l('Check-out (LOS)'), 'class' => 'text-left'), + 'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'), + ); + + if ($idHotel != 0) { + unset($header['hotel']); + } + + $inHousesInfo = AdminStatsController::getInHousesInfo($idHotel); + + $body = array(); + foreach ($inHousesInfo as $inHouseInfo) { + $tr = array(); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($inHouseInfo['customer_name']).'', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => $inHouseInfo['room_num'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($inHouseInfo['room_type_name']).'', + 'class' => 'text-left', + ); + + if ($idHotel == 0) { + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($inHouseInfo['hotel_name']).'', + 'class' => 'text-left', + ); + } + + $tr[] = array( + 'value' => $inHouseInfo['adult'] + $inHouseInfo['children'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => Tools::displayDate($inHouseInfo['date_from']), + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => Tools::displayDate($inHouseInfo['date_to']).' ('.$inHouseInfo['los'].' '.($inHouseInfo['los'] > 1 ? $this->l('Nights') : $this->l('Night')).')', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($inHouseInfo['id_order']).'', + 'class' => 'text-center', + ); + + $body[] = $tr; + } + + return array('header' => array_values($header), 'body' => $body); + } + + public function getNewBookingsTableContentsByDate($date, $idHotel) + { + $header = array( + 'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'), + 'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'), + 'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'), + 'total' => array('title' => $this->l('Total Rooms'), 'class' => 'text-center'), + 'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'), + 'order_total' => array('title' => $this->l('Order Total'), 'class' => 'text-right'), + 'order_status' => array('title' => $this->l('Order Status'), 'class' => 'text-left'), + ); + + if ($idHotel != 0) { + unset($header['hotel']); + } + + $newBookingsInfo = AdminStatsController::getNewBookingsInfoByDate($date, $idHotel); + + $body = array(); + foreach ($newBookingsInfo as $newBookingInfo) { + $objCurrency = Currency::getCurrency($newBookingInfo['id_currency']); + + $tr = array(); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($newBookingInfo['id_order']).'', + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($newBookingInfo['customer_name']).'', + 'class' => 'text-left', + ); + + if ($idHotel == 0) { + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($newBookingInfo['hotel_name']).'', + 'class' => 'text-left', + ); + } + + $tr[] = array( + 'value' => $newBookingInfo['total_rooms'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => $newBookingInfo['total_guests'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => Tools::displayPrice($newBookingInfo['total_paid_tax_excl'], $objCurrency), + 'class' => 'text-right', + ); + $tr[] = array( + 'value' => $newBookingInfo['state_name'], + 'class' => 'text-left', + ); + + $body[] = $tr; + } + + return array('header' => array_values($header), 'body' => $body); + } + + public function getCancellationsTableContentsByDate($date, $idHotel) + { + $header = array( + 'request_id' => array('title' => $this->l('Request ID'), 'class' => 'text-center'), + 'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'), + 'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'), + 'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'), + 'hotel' => array('title' => $this->l('Hotel'), 'class' => 'text-left'), + 'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'), + 'check_in' => array('title' => $this->l('Check-in'), 'class' => 'text-left'), + 'check_out' => array('title' => $this->l('Check-out'), 'class' => 'text-left'), + 'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'), + ); + + if ($idHotel != 0) { + unset($header['hotel']); + } + + $cancellationsInfo = AdminStatsController::getCancellationsInfoByDate($date, $idHotel); + + $body = array(); + foreach ($cancellationsInfo as $cancellationInfo) { + $objCurrency = Currency::getCurrency($cancellationInfo['id_currency']); + + $tr = array(); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($cancellationInfo['id_order_return']).'', + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($cancellationInfo['customer_name']).'', + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => $cancellationInfo['room_num'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($cancellationInfo['room_type_name']).'', + 'class' => 'text-left', + ); + + if ($idHotel == 0) { + $tr[] = array( + 'value' => ''.Tools::htmlentitiesUTF8($cancellationInfo['hotel_name']).'', + 'class' => 'text-left', + ); + } + + $tr[] = array( + 'value' => $cancellationInfo['total_guests'], + 'class' => 'text-center', + ); + $tr[] = array( + 'value' => Tools::displayDate($cancellationInfo['date_from']), + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => Tools::displayDate($cancellationInfo['date_to']), + 'class' => 'text-left', + ); + $tr[] = array( + 'value' => '#'.Tools::htmlentitiesUTF8($cancellationInfo['id_order']).'', + 'class' => 'text-center', + ); + + $body[] = $tr; + } + + return array('header' => array_values($header), 'body' => $body); } } diff --git a/modules/dashguestcycle/translations/de.php b/modules/dashguestcycle/translations/de.php index 9f1003d9d..fc325ea29 100644 --- a/modules/dashguestcycle/translations/de.php +++ b/modules/dashguestcycle/translations/de.php @@ -2,13 +2,36 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Dashboard-Gästezyklus'; -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Fügt einen Block mit einer grafischen Darstellung der Gästezyklusstatistiken hinzu.'; -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Bist du sicher, dass du es deinstallieren willst?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Ankunft'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Abflüge'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Neue Buchungen'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Übernachten'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Gastnachrichten'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Stornierte Buchungen'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Gäste (Erwachsene/Kinder)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Dashboard Gastzyklus'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Fügt einen Block mit einer grafischen Darstellung der Gastzyklusstatistiken hinzu.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Bist du dir sicher dass du es deinstallieren willst?'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Name'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Zimmer Nr.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Zimmertyp'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Gäste'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Auschecken (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'Auftragsnummer'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Nächte'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Nacht'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Check-in (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Check-In'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Zimmer insgesamt'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Auftragssumme'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Bestellstatus'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Kasse'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Status abbrechen'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Die Anzahl der für heute geplanten Ankünfte.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Die Anzahl der für heute geplanten Abfahrten.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Die Anzahl der bisher erstellten neuen Buchungen.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Die Anzahl der für heute geplanten Übernachtungen.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Die Anzahl der heute von Gästen erhaltenen neuen Nachrichten.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Die Anzahl der heute bisher stornierten Buchungen.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Die Anzahl der Erwachsenen und Kinder, die heute bleiben sollen.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Betrieb heute'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Aktualisierung'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Ankünfte'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Abflüge'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'Im Haus'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Buchungen'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Stornierungen'; diff --git a/modules/dashguestcycle/translations/es.php b/modules/dashguestcycle/translations/es.php index f7288e0b2..699646e55 100644 --- a/modules/dashguestcycle/translations/es.php +++ b/modules/dashguestcycle/translations/es.php @@ -2,13 +2,36 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de invitado del panel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de invitado del tablero'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Agrega un bloque con una representación gráfica de las estadísticas del ciclo de invitados.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = '¿Estas seguro que lo quieres desinstalar?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Llegadas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Salidas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nuevas reservas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Stay Overs'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Mensajes de invitados'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Reservas canceladas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Invitados (Adultos / Niños)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Nombre'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Habitación no.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Tipo de habitación'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Huéspedes'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Salida (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'Solicitar ID'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Noches'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Noche'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Facturación (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Registrarse'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Habitaciones Totales'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Total del pedido'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Estado del pedido'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Verificar'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Cancelar estado'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'El número de llegadas programadas para hoy.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'El número de salidas programadas para hoy.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'El número de nuevas reservas creadas hoy hasta el momento.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'El número de estancias programadas para hoy.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'El número de mensajes nuevos recibidos de invitados hoy.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'El número de reservas canceladas hoy hasta ahora.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'El número de adultos y niños programados para quedarse hoy.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Operaciones hoy'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Actualizar'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Llegadas'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Salidas'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'interno'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Reservaciones'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Cancelaciones'; diff --git a/modules/dashguestcycle/translations/fr.php b/modules/dashguestcycle/translations/fr.php index 9d0f23019..46597a724 100644 --- a/modules/dashguestcycle/translations/fr.php +++ b/modules/dashguestcycle/translations/fr.php @@ -3,12 +3,35 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Cycle d\'invité du tableau de bord'; -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Ajoute un bloc avec une représentation graphique des statistiques du cycle des invités.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Ajoute un bloc avec une représentation graphique des statistiques du cycle client.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Êtes-vous sur de vouloir désinstaller?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivées'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'départs'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nouvelles réservations'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Séjour Overs'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Messages d\'invité'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Réservations annulées'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Invités (adultes/enfants)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Nom'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Chambre numéro.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Type de chambre'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hôtel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Invités'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Départ (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'numéro de commande'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Nuits'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Nuit'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Enregistrement (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Enregistrement'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Chambres totales'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Total de la commande'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Statut de la commande'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Vérifier'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Annuler le statut'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Le nombre d\'arrivées prévues pour aujourd\'hui.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Le nombre de départs prévus pour aujourd\'hui.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Le nombre de nouvelles réservations créées aujourd\'hui jusqu\'à présent.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Le nombre de séjours programmés pour aujourd\'hui.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Le nombre de nouveaux messages reçus d\'invités aujourd\'hui.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Le nombre de réservations annulées aujourd\'hui jusqu\'à présent.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Le nombre d\'adultes et d\'enfants qui doivent rester aujourd\'hui.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Opérations aujourd\'hui'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Rafraîchir'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivées'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'départs'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'En interne'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Réservations'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Annulations'; diff --git a/modules/dashguestcycle/translations/it.php b/modules/dashguestcycle/translations/it.php index 02bd85964..eda133b4f 100644 --- a/modules/dashguestcycle/translations/it.php +++ b/modules/dashguestcycle/translations/it.php @@ -5,10 +5,33 @@ $_MODULE = array(); $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo ospite del cruscotto'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Aggiunge un blocco con una rappresentazione grafica delle statistiche del ciclo degli ospiti.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Sei sicuro di voler disinstallare?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivi'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Partenze'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nuove prenotazioni'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Soggiorno Overs'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Messaggi degli ospiti'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Prenotazioni annullate'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Ospiti (Adulti/Bambini)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Nome'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Stanza No.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Tipo di stanza'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Ospiti'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Partenza (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'ID ordine'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Notti'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Notte'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Check-in (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Registrare'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Camere totali'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Ordine totale'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Lo stato dell\'ordine'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Guardare'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Annulla stato'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Il numero di arrivi previsti per oggi.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Il numero di partenze previste per oggi.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Il numero di nuove prenotazioni create oggi finora.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Il numero di soggiorni programmati per oggi.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Il numero di nuovi messaggi ricevuti dagli ospiti oggi.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Il numero di prenotazioni cancellate oggi finora.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Il numero di adulti e bambini programmati per soggiornare oggi.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Operazioni Oggi'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'ricaricare'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivi'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Partenze'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'In casa'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Prenotazioni'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Cancellazioni'; diff --git a/modules/dashguestcycle/translations/nl.php b/modules/dashguestcycle/translations/nl.php index 10ec41c6a..e0c09ef6b 100644 --- a/modules/dashguestcycle/translations/nl.php +++ b/modules/dashguestcycle/translations/nl.php @@ -4,11 +4,34 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Dashboard gastcyclus'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Voegt een blok toe met een grafische weergave van gastcyclusstatistieken.'; -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Weet u zeker dat u de installatie ongedaan wilt maken?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Aankomsten'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Vertrek'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nieuwe boekingen'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Overblijven'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Gastberichten'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Geannuleerde boekingen'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Gasten (Volwassenen/Kinderen)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Weet u zeker dat u wilt verwijderen?'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Naam'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Kamer nummer.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Kamertype'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Gasten'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Uitchecken (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'Order ID'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Nachten'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Nacht'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Inchecken (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Check in'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Totaal aantal kamers'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'totale bestelling'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Bestelstatus'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Uitchecken'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Annuleerstatus'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Het aantal geplande aankomsten voor vandaag.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Het aantal geplande vertrekken voor vandaag.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Het aantal nieuwe boekingen dat tot nu toe vandaag is gemaakt.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Het aantal geplande overnachtingen voor vandaag.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Het aantal nieuwe berichten dat vandaag van gasten is ontvangen.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Het aantal boekingen dat tot nu toe vandaag is geannuleerd.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Het aantal volwassenen en kinderen dat gepland staat om vandaag te blijven.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Operaties Vandaag'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Vernieuwen'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Aankomsten'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Vertrek'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'In huis'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Boekingen'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Annuleringen'; diff --git a/modules/dashguestcycle/translations/pl.php b/modules/dashguestcycle/translations/pl.php index de84f9286..9e94df8a9 100644 --- a/modules/dashguestcycle/translations/pl.php +++ b/modules/dashguestcycle/translations/pl.php @@ -2,13 +2,36 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Cykl gościa pulpitu nawigacyjnego'; -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Dodaje blok z graficzną reprezentacją statystyk cyklu gościa.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Cykl gości na pulpicie nawigacyjnym'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Dodaje blok z graficzną reprezentacją statystyk cyklu gości.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Jesteś pewien, że chcesz odinstalować?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Przyloty'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Odloty'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nowe rezerwacje'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Zostań na dłużej'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Wiadomości dla gości'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Anulowane rezerwacje'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Goście (dorośli/dzieci)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Nazwa'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Pokój numer.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Rodzaj pokoju'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Goście'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Wymeldowanie (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'Identyfikator zamówienia'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Noce'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Noc'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Zameldowanie (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Zameldować się'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Razem pokoje'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Suma zamówienia'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Status zamówienia'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Wymeldować się'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Anuluj stan'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Liczba przyjazdów planowanych na dziś.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Liczba odjazdów zaplanowanych na dziś.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Liczba nowych rezerwacji utworzonych dzisiaj do tej pory.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Liczba pobytów zaplanowanych na dziś.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Liczba nowych wiadomości otrzymanych dzisiaj od gości.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Liczba rezerwacji anulowanych dzisiaj do tej pory.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Liczba dorosłych i dzieci planowanych na dzisiejszy pobyt.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Operacje dzisiaj'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Odświeżać'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Przyloty'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Odloty'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'W domu'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Rezerwacje'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Rezygnacje'; diff --git a/modules/dashguestcycle/translations/pt.php b/modules/dashguestcycle/translations/pt.php index 211445ab3..9f823097a 100644 --- a/modules/dashguestcycle/translations/pt.php +++ b/modules/dashguestcycle/translations/pt.php @@ -2,13 +2,36 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de convidado do painel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de convidados do painel'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Adiciona um bloco com uma representação gráfica das estatísticas do ciclo do convidado.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Você tem certeza que quer desinstalar?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Chegadas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Partidas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Novas Reservas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Fique Overs'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Mensagens de Convidados'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Reservas canceladas'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Convidados (adultos / crianças)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Nome'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Nº do quarto'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Tipo de sala'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Hotel'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Convidados'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Saída (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'ID do pedido'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'noites'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Noite'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Entrada (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Check-in'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Quartos totais'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'total de pedidos'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Status do pedido'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Confira'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Cancelar status'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'O número de chegadas programadas para hoje.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'O número de partidas programadas para hoje.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'O número de novas reservas criadas hoje até o momento.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'O número de estadias programadas para hoje.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'O número de novas mensagens recebidas de convidados hoje.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'O número de reservas canceladas hoje até agora.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'O número de adultos e crianças programados para ficar hoje.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Operações hoje'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Atualizar'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Chegadas'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Partidas'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'interno'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Reservas'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Cancelamentos'; diff --git a/modules/dashguestcycle/translations/ru.php b/modules/dashguestcycle/translations/ru.php index 6311834fa..e941b42bf 100644 --- a/modules/dashguestcycle/translations/ru.php +++ b/modules/dashguestcycle/translations/ru.php @@ -2,13 +2,36 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Гостевой цикл панели инструментов'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Гостевой цикл приборной панели'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Добавляет блок с графическим представлением статистики гостевого цикла.'; $_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Вы уверены, что хотите удалить?'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Прибытие'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Отправления'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Новые заказы'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Остаться на ночь'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Гостевые сообщения'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Отмененные бронирования'; -$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Гости (Взрослые / Дети)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_49ee3087348e8d44e1feda1917443987'] = 'Имя'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4ac28a9f6152a6b8b86f5d975a99f96b'] = 'Комната нет.'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_168cd661c523acecfe5261e6a6b5e0d6'] = 'Тип номера'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_26e28738b51eebd25cf4d734b33b539f'] = 'Отель'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_4229e0630f34b4f8085774240b1e39ff'] = 'Гости'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_52da72eb7575b71bf704417043089f2c'] = 'Выезд (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_d79cf3f429596f77db95c65074663a54'] = 'номер заказа'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_e10758a0bbe2e5a1bd948a8fe1a4a3dc'] = 'Ночи'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_0edc9b073397681dc9f2c479686ea0d9'] = 'Ночь'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_66911151e40ada6dabad586733fa0929'] = 'Регистрация (LOS)'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_ec86d6e09689fe97bb7d1a233d5e5e13'] = 'Регистрироваться'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_c48da6e10c4223c777d3eadbb2bafe4e'] = 'Всего номеров'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_fcf35bd8e66b772c865588339b93bfec'] = 'Весь заказ'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_bbd3a18e6d45b8331cf8a715f3f0008d'] = 'Статус заказа'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_edfd56b38f555c58ca8f6902c39dbd04'] = 'Проверить'; +$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_8f85cb22514fc08e5988e09836b8fb4e'] = 'Отменить статус'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_975bfdb44b5907246ef0617e1c9c88bf'] = 'Количество заездов, запланированных на сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_720a541d3696124de85fcd8be6144c8b'] = 'Количество вылетов, запланированных на сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_05526b5bbb4c2e6125d44b2c44990d8d'] = 'Количество новых бронирований, созданных сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_39d6209295eae2edc20adfea3d086a2f'] = 'Количество пересадок, запланированных на сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_7791caa6f05fe31b25060cfa837d426b'] = 'Количество новых сообщений, полученных сегодня от гостей.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a51b52bed091adf999ab6c8e96a7af8a'] = 'Количество бронирований, отмененных сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-top_0f04b7b3005ef88e9ae8411cdff6aaae'] = 'Количество взрослых и детей, запланированное на сегодня.'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_b898f0a62dcfd02184ed0570136bb61f'] = 'Операции сегодня'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_63a6a88c066880c5ac42394a22803ca6'] = 'Обновить'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Прибытие'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_5201bc1c95fed6725def30cb27c01b1a'] = 'Отправления'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_c14ecb2ba5611ae4eb424bfb96676c7f'] = 'Внутренний'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_a35529bfcfdfab2dc01946af64cd2ce4'] = 'Бронирование'; +$_MODULE['<{dashguestcycle}prestashop>dashboard-zone-two_1b08b875cf875b1aeaed558ce21fe4e6'] = 'Аннулирование'; diff --git a/modules/dashguestcycle/views/css/dashguestcycle.css b/modules/dashguestcycle/views/css/dashguestcycle.css index 5dbf79889..b31121c47 100644 --- a/modules/dashguestcycle/views/css/dashguestcycle.css +++ b/modules/dashguestcycle/views/css/dashguestcycle.css @@ -18,18 +18,18 @@ */ /* scrollbar design - start */ -#dashguestcycle ::-webkit-scrollbar { +#dashguestcycle.dashboard-top ::-webkit-scrollbar { height: 12px; margin-bottom: 5px; } - -#dashguestcycle ::-webkit-scrollbar-track { + +#dashguestcycle.dashboard-top ::-webkit-scrollbar-track { background-color: #DDD; margin: 0 6px; border-radius: 10px; } - -#dashguestcycle ::-webkit-scrollbar-thumb { + +#dashguestcycle.dashboard-top ::-webkit-scrollbar-thumb { background-color: #BBB; border-radius: 10px; margin-bottom: 5px; @@ -105,4 +105,9 @@ font-weight: bold; font-size: 24px; line-height: 30px; -} \ No newline at end of file +} + +#dashguestcycle .tab-content { + max-height: 300px; + overflow-y: auto; +} diff --git a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl b/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl index 9a855ed1d..480485694 100644 --- a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl +++ b/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl @@ -19,7 +19,7 @@
-
+
{hook h="displayDashboardBadgeListBefore"}
diff --git a/modules/dashguestcycle/views/templates/hook/dashboard-zone-two.tpl b/modules/dashguestcycle/views/templates/hook/dashboard-zone-two.tpl new file mode 100644 index 000000000..18185c442 --- /dev/null +++ b/modules/dashguestcycle/views/templates/hook/dashboard-zone-two.tpl @@ -0,0 +1,101 @@ +{** +* 2010-2022 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through LICENSE.txt file inside our module +* +* 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 CustomizationPolicy.txt file inside our module for more information. +* +* @author Webkul IN +* @copyright 2010-2022 Webkul IN +* @license LICENSE.txt +*} + +
+
+
+ {l s='Operations Today' mod='dashguestcycle'} + + + + + +
+ +
+ + +
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+
+
+
+
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php index c5f71cce6..b243dfc73 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php @@ -86,7 +86,7 @@ class HotelBookingDemands extends ObjectModel $idCurrency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); } $totalDemandsPrice = 0; - $sql = 'SELECT hb.`id_room`, hd.* FROM `'._DB_PREFIX_.'htl_booking_demands` hd + $sql = 'SELECT hb.`id_room`, hb.`adults`, hb.`children`, hd.* FROM `'._DB_PREFIX_.'htl_booking_demands` hd LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hb ON (hd.`id_htl_booking` = hb.`id`) WHERE hd.`id_htl_booking` IN (SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` @@ -132,6 +132,8 @@ class HotelBookingDemands extends ObjectModel $demand['extra_demands_tax_label'] = $moduleObj->l('No tax', 'HotelBookingDemands'); } $roomDemands[$demand['id_room']]['id_room'] = $demand['id_room']; + $roomDemands[$demand['id_room']]['adults'] = $demand['adults']; + $roomDemands[$demand['id_room']]['children'] = $demand['children']; $roomDemands[$demand['id_room']]['extra_demands'][] = $demand; } unset($taxTemp); diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 63b8aafc2..cfb26c1db 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -58,8 +58,9 @@ class HotelBookingDetail extends ObjectModel public $check_in_time; public $check_out_time; public $room_num; - public $adult; + public $adults; public $children; + public $child_ages; public $date_add; public $date_upd; @@ -72,6 +73,18 @@ class HotelBookingDetail extends ObjectModel const ALLOTMENT_AUTO = 1; const ALLOTMENT_MANUAL = 2; + // Search algorithm: Exact room types reults, All room types + const SEARCH_EXACT_ROOM_TYPE_ALGO = 1; + const SEARCH_ALL_ROOM_TYPE_ALGO = 2; + + // Search Type: Occupancy wise search, Normal search + const SEARCH_TYPE_OWS = 1; + const SEARCH_TYPE_NORMAL = 2; + + // + const PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY = 1; + const PS_FRONT_ROOM_UNIT_SELECTION_TYPE_QUANTITY = 2; + public static $definition = array( 'table' => 'htl_booking_detail', 'primary' => 'id', @@ -109,8 +122,9 @@ class HotelBookingDetail extends ObjectModel 'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'size' => 255, 'required' => true), 'check_in_time' => array('type' => self::TYPE_STRING, 'required' => true), 'check_out_time' => array('type' => self::TYPE_STRING, 'required' => true), - 'adult' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), + 'adults' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'children' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'child_ages' => array('type' => self::TYPE_STRING), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -154,20 +168,14 @@ class HotelBookingDetail extends ObjectModel public function getBookingDataParams($params) { - if (!isset($params['room_type'])) { - $params['room_type'] = 0; + if (!isset($params['id_room_type'])) { + $params['id_room_type'] = 0; } - if (!isset($params['adult'])) { - $params['adult'] = 0; + if (!isset($params['id_cart'])) { + $params['id_cart'] = 0; } - if (!isset($params['children'])) { - $params['children'] = 0; - } - if (!isset($params['num_rooms'])) { - $params['num_rooms'] = 1; - } - if (!isset($params['for_calendar'])) { - $params['for_calendar'] = 0; + if (!isset($params['id_guest'])) { + $params['id_guest'] = 0; } if (!isset($params['search_available'])) { $params['search_available'] = 1; @@ -181,21 +189,34 @@ class HotelBookingDetail extends ObjectModel if (!isset($params['search_unavai'])) { $params['search_unavai'] = 1; } - if (!isset($params['id_cart'])) { - $params['id_cart'] = 0; - } - if (!isset($params['id_guest'])) { - $params['id_guest'] = 0; - } if (!isset($params['search_cart_rms'])) { $params['search_cart_rms'] = 0; } + if (!isset($params['only_active_roomtype'])) { $params['only_active_roomtype'] = 1; } if (!isset($params['only_active_hotel'])) { $params['only_active_hotel'] = 1; } + if (!isset($params['occupancy'])) { + $params['occupancy'] = array(); + } + + if (!isset($params['ratting'])) { + $params['ratting'] = -1; + } + if (!isset($params['amenities'])) { + $params['amenities'] = 0; + } + if (!isset($params['price'])) { + $params['price'] = 0; + } + + if (!isset($params['only_search_data'])) { + $params['only_search_data'] = 0; + } + return $params; } @@ -204,12 +225,9 @@ class HotelBookingDetail extends ObjectModel * * @param [type] $date_from [Start date of booking] * @param [type] $date_to [End date of booking] - * @param [type] $hotel_id [Id of the hotel to which the room belongs] - * @param [type] $room_type [Id of the product to which the room belongs] - * @param int $adult [] - * @param int $children [] + * @param int $hotel_id [Id of the hotel to which the room belongs] + * @param int $id_room_type [Id of the product to which the room belongs] * @param int $num_rooms [Number of rooms booked for the period $date_from to $date_to] - * @param int $for_calendar [Used for calender and also for getting stats of rooms] * @param int $search_available [If you want only data information for available rooms] * @param int $search_partial [If you want only data information for partial rooms] * @param int $search_booked [If you want only data information for booked rooms] @@ -217,422 +235,1020 @@ class HotelBookingDetail extends ObjectModel * @param int $id_cart [Id of the cart to which the room belongs at the time of booking] * @param int $id_guest [Id guest of the customer Who booked the rooms] * @param int $search_cart_rms [If you want data of the current cart in the admin office] + * @param array $occupancy [search occupancy for room] * * @return [array] [Returns Array of rooms data ] * - * Note: Adult and children both are used for front category page only in available rooms - * Note :: $for_calendar is used both for calender and also for getting stats of rooms */ public function getBookingData($params) { $this->context = Context::getContext(); + // extract all keys and values of the array [$params] into variables and values extract($this->getBookingDataParams($params)); + if ($date_from && $date_to && $hotel_id) { $date_from = date('Y-m-d H:i:s', strtotime($date_from)); + $stayStartDate = date('Y-m-d', strtotime($date_from)); $date_to = date('Y-m-d H:i:s', strtotime($date_to)); - $obj_room_info = new HotelRoomInformation(); - $obj_rm_type = new HotelRoomType(); + $objRoomType = new HotelRoomType(); + $lengthOfStay = $this->getNumberOfDays($date_from, $date_to); - if ($room_types = $obj_rm_type->getIdProductByHotelId( + // Check LOS restriction for back-office + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + + if ($room_types = $objRoomType->getIdProductByHotelId( $hotel_id, - $room_type, + $id_room_type, $only_active_roomtype, $only_active_hotel )) { - $total_rooms = 0; - $num_booked = 0; - $num_unavail = 0; - $num_avail = 0; - $num_part_avai = 0; - $num_cart = 0; - $new_part_arr = array(); - $booking_data = array(); - $applyLosRestriction = true; + $allowedIdRoomTypes = implode(",", array_column($room_types, 'id_product')); + // Unavailable Rooms + if ($search_unavai) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + 'applyLosRestriction' => $applyLosRestriction, + ); + $unavailRoomTypes = $this->getSearchUnavailableRooms($params); + } + + // Cart Rooms + if ($search_cart_rms) { + $params = array( + 'idHotel' => $hotel_id, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + $cartRoomTypes = $this->getSearchCartRooms($params); + } + + // Available Rooms + if ($search_available) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'searchOccupancy' => $occupancy, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + 'applyLosRestriction' => $applyLosRestriction, + ); + $availableRoomTypes = $this->getSearchAvailableRooms($params); + if ($availableRoomTypes['unavailableRoomTypes'] && $search_unavai) { + foreach ($availableRoomTypes['unavailableRoomTypes'] as $idProduct => $roomTypeDetail) { + if (!isset($unavailRoomTypes[$idProduct])) { + $unavailRoomTypes[$idProduct] = array(); + } + + // FYI: used array_merge because we have int index + $unavailRoomTypes[$idProduct] = array_merge($unavailRoomTypes[$idProduct], $roomTypeDetail); + } + } + + $availableRoomTypes = $availableRoomTypes['availableRoomTypes']; + } + + // Booked Rooms + if ($search_booked) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + $bookedRoomTypes = $this->getSearchBookedRooms($params); + } + + // Partially available Rooms if ($search_partial) { - $this->partAvaiDates = array(); - $this->allReqDates = $this->createDateRangeArray($date_from, $date_to, 1); + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'searchOccupancy' => $occupancy, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + + $partiallyAvailRoomTypes = $this->getSearchPartiallyAvailRooms($params); + + if ($partiallyAvailRoomTypes['unavailableRoomTypes'] && $search_unavai) { + foreach ($partiallyAvailRoomTypes['unavailableRoomTypes'] as $idProduct => $roomTypeDetail) { + if (!isset($unavailRoomTypes[$idProduct])) { + $unavailRoomTypes[$idProduct] = array(); + } + + // FYI: used array_merge because we have int index + $unavailRoomTypes[$idProduct] = array_merge($unavailRoomTypes[$idProduct], $roomTypeDetail); + } + } + + $partiallyAvailRoomsCount = $partiallyAvailRoomTypes['partiallyAvailRoomsCount']; + $partiallyAvailRoomTypes = $partiallyAvailRoomTypes['partiallyAvailRooms']; } - if (isset(Context::getContext()->employee->id)) { - if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { - $applyLosRestriction = false; - } - } + $roomTypesDetail = $objRoomType->getRoomTypeDetailByRoomTypeIds($allowedIdRoomTypes); + if ($roomTypesDetail) { + // Formate data for response + $finalSearchResponse = array( + 'rm_data' => array(), + 'stats' => array( + 'total_room_type' => count($room_types), + 'total_rooms' => 0, + 'max_avail_occupancy' => 0 + ), + ); + foreach ($roomTypesDetail as $roomTypeDetail) { + $finalSearchResponse['stats']['total_rooms'] += $roomTypeDetail['numberOfRooms']; + $idProduct = $roomTypeDetail['id_product']; - foreach ($room_types as $key => $room_type) { - if ($search_partial) { - $this->dltDates = array(); - } - - $total_rooms += $obj_room_info->getHotelRoomInfo($room_type['id_product'], $hotel_id, 1); - - // Get min & max LOS - $objRoomTypeRestriction = new HotelRoomTypeRestrictionDateRange(); - $losRestriction = $objRoomTypeRestriction->getRoomTypeLengthOfStay($room_type['id_product'], $date_from); - - $obj_product = new Product((int) $room_type['id_product']); - $product_name = $obj_product->name[Configuration::get('PS_LANG_DEFAULT')]; - - if ($search_cart_rms) { - if ($id_cart && $id_guest) { - $sql = 'SELECT cbd.`id_product`, cbd.`id_room`, cbd.`id_hotel`, cbd.`booking_type`, cbd.`comment`, rf.`room_num`, cbd.`date_from`, cbd.`date_to` - FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = cbd.`id_room`) - WHERE cbd.`id_hotel`='.(int)$hotel_id.' AND cbd.`id_product` ='.(int)$room_type['id_product'].' AND cbd.`id_cart` = '.(int)$id_cart.' AND cbd.`id_guest` ='.(int)$id_guest.' AND cbd.`is_refunded` = 0 AND cbd.`is_back_order` = 0'; - $cart_rooms = Db::getInstance()->executeS($sql); - } else { - $cart_rooms = array(); - } - $num_cart += count($cart_rooms); - } - - if ($search_booked) { - $sql = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment`, rf.`room_num`, bd.`date_from`, bd.`date_to` - FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) - WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product` ='.(int)$room_type['id_product'].' AND bd.`is_refunded` = 0 AND bd.`is_back_order` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\', bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.date_to >= \''.pSQL($date_to).'\')'; - - $booked_rooms = Db::getInstance()->executeS($sql); - - foreach ($booked_rooms as $booked_k => $booked_v) { - $booked_rooms[$booked_k]['detail'][] = array( - 'date_from' => $booked_v['date_from'], - 'date_to' => $booked_v['date_to'], - 'id_customer' => $booked_v['id_customer'], - 'booking_type' => $booked_v['booking_type'], - 'booking_status' => $booked_v['booking_status'], - 'comment' => $booked_v['comment'], - ); - - unset($booked_rooms[$booked_k]['date_from']); - unset($booked_rooms[$booked_k]['date_to']); - unset($booked_rooms[$booked_k]['id_customer']); - unset($booked_rooms[$booked_k]['booking_type']); - unset($booked_rooms[$booked_k]['booking_status']); - unset($booked_rooms[$booked_k]['comment']); - } - - $num_booked += count($booked_rooms); - } - - if ($search_unavai) { - $sql1 = 'SELECT `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` - FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product` ='.(int)$room_type['id_product'].' AND (`id_status` = '. HotelRoomInformation::STATUS_INACTIVE; - if ($applyLosRestriction) { - $sql1 .= ' OR ( DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') < '.(int)$losRestriction['min_los']; - if ((int)$losRestriction['max_los']) { - $sql1 .= ' OR DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') > '.(int)$losRestriction['max_los']; - } - $sql1 .= ')'; - } - $sql1 .= ')'; - - $sql2 = 'SELECT hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd. id_room = hri.`id`) - WHERE hri.`id_hotel`='.$hotel_id.' AND hri.`id_product` ='.$room_type['id_product'].' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND hrdd.`date_from` <= \''.pSql($date_from).'\' AND hrdd.`date_to` >= \''.pSql($date_to).'\''; - - $sql = $sql1.' UNION '.$sql2; - - $unavail_rooms = Db::getInstance()->executeS($sql); - $num_unavail += count($unavail_rooms); - } - - if ($search_available) { - $exclude_ids = 'SELECT `id_room` - FROM `'._DB_PREFIX_.'htl_booking_detail` - WHERE `is_back_order` = 0 AND `is_refunded` = 0 AND IF(`id_status` = '. self::STATUS_CHECKED_OUT.', ( - (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") <= \''.PSQL($date_to).'\') AND ( - (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.PSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.pSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `check_out` >= \''.pSQL($date_to).'\') OR - (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` >= \''.pSQL($date_to).'\') - ) - ), ( - (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` > \''.pSQL($date_from).'\' AND `date_to` <= \''.PSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_to` <= \''.pSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `date_to` >= \''.pSQL($date_to).'\') OR - (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` >= \''.pSQL($date_to).'\') - ))'; - - if (!empty($id_cart) && !empty($id_guest)) { - $exclude_ids .= ' UNION - SELECT `id_room` - FROM `'._DB_PREFIX_.'htl_cart_booking_data` - WHERE id_cart='.(int)$id_cart.' AND id_guest='.(int)$id_guest.' AND is_refunded = 0 AND is_back_order = 0 AND ((date_from <= \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_from).'\' AND date_to <= \''.pSQL($date_to).'\') OR (date_from > \''.pSQL($date_from).'\' AND date_to < \''.pSQL($date_to).'\') OR (date_from >= \''.pSQL($date_from).'\' AND date_from < \''.pSQL($date_to).'\' AND date_to >= \''.pSQL($date_to).'\') OR (date_from < \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_to).'\'))'; - } - - // For excludes temporary disable rooms - $exclude_ids .= ' UNION - SELECT hri.`id` AS id_room - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$room_type['id_product'].' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` <= \''.pSql($date_to).'\' AND hrdd.`date_to` >= \''.pSql($date_from).'\')'; - - $selectAvailRoomSearch = 'SELECT ri.`id` AS `id_room`, ri.`id_product`, ri.`id_hotel`, ri.`room_num`, ri.`comment` AS `room_comment`'; - - $joinAvailRoomSearch = ''; - - $whereAvailRoomSearch = 'WHERE ri.`id_hotel`='.(int)$hotel_id.' AND ri.`id_product`='.(int)$room_type['id_product'].' AND ri.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE; - - // Check min & max LOS restrictions - if ($applyLosRestriction) { - $whereAvailRoomSearch .= ' AND DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') >= '.(int)$losRestriction['min_los']; - // check max LOS restriction is greater than zero - if ((int)$losRestriction['max_los']) { - $whereAvailRoomSearch .= ' AND DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') <= '.(int)$losRestriction['max_los']; - } - } - - $whereAvailRoomSearch .= ' AND ri.`id` NOT IN ('.$exclude_ids.')'; - - $groupByAvailRoomSearch = ''; - $orderByAvailRoomSearch = ''; - $orderWayAvailRoomSearch = ''; - - Hook::exec('actionAvailRoomSearchSqlModifier', - array( - 'select' => &$selectAvailRoomSearch, - 'join' => &$joinAvailRoomSearch, - 'where' => &$whereAvailRoomSearch, - 'group_by' => &$groupByAvailRoomSearch, - 'order_by' => &$orderByAvailRoomSearch, - 'order_way' => &$orderWayAvailRoomSearch, - 'params' => array( - 'id_hotel' => $hotel_id, - 'id_product' => $room_type['id_product'], - 'date_from' => $date_from, - 'date_to' => $date_to - ) - ) + $roomTypeSearchData = array( + 'name' => (new Product((int) $idProduct, false, $this->context->cookie->id_lang))->name, + 'id_product' => $idProduct, + 'adults' => $roomTypeDetail['adults'], + 'children' => $roomTypeDetail['children'], + 'max_adults' => $roomTypeDetail['max_adults'], + 'max_children' => $roomTypeDetail['max_children'], + 'max_guests' => $roomTypeDetail['max_guests'], + 'data' => array(), ); - $sql = $selectAvailRoomSearch; - $sql .= ' FROM `'._DB_PREFIX_.'htl_room_information` AS ri'; - $sql .= ' '.$joinAvailRoomSearch; - $sql .= ' '.$whereAvailRoomSearch; - $sql .= ' '.$groupByAvailRoomSearch; - $sql .= ' '.$orderByAvailRoomSearch; - $sql .= ' '.$orderWayAvailRoomSearch; + if ($search_unavai) { + $roomTypeSearchData['data']['unavailable'] = isset($unavailRoomTypes[$idProduct]) ? $unavailRoomTypes[$idProduct] : array(); - $avai_rooms = Db::getInstance()->executeS($sql); - $num_avail += count($avai_rooms); - } - - if ($search_partial) { - $sql1 = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`check_out`, bd.`date_to`) AS `date_to` - FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) - WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product`='.(int)$room_type['id_product'].' AND rf.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE .' AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', ( - (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") < \''.PSQL($date_to).'\') AND ( - (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\') - ) - ), ( - (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`date_to` > \''.pSQL($date_from).'\' AND bd.`date_to` < \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` >= \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` < \''.pSQL($date_to).'\') - ))'; - - $sql2 = 'SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, 0 AS `id_customer`, 0 AS `booking_type`, 0 AS `booking_status`, 0 AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to` - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product`='.(int)$room_type['id_product'].' AND - hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND ( - (hrdd.`date_from` <= \''.pSQL($date_from).'\' AND hrdd.`date_to` > \''.pSQL($date_from).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\') OR - (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` >= \''.pSQL($date_to).'\') OR - (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\') - )'; - // $part_arr2 = Db::getInstance()->executeS($sql2); - // $part_arr = array_merge($part_arr1 ? $part_arr1 : array(), $part_arr2 ? $part_arr2 : array()); - - $sql = $sql1.' UNION '.$sql2; - // NOTE:: Before code if written to use "ORDER BY" with union - $sql = 'SELECT s.* - FROM ('.$sql.') AS s - ORDER BY s.`id_room`'; - $part_arr = Db::getInstance()->executeS($sql); - - $partial_avai_rooms = array(); - foreach ($part_arr as $pr_val) { - $partial_avai_rooms[$pr_val['id_room']]['id_product'] = $pr_val['id_product']; - $partial_avai_rooms[$pr_val['id_room']]['id_room'] = $pr_val['id_room']; - $partial_avai_rooms[$pr_val['id_room']]['id_hotel'] = $pr_val['id_hotel']; - $partial_avai_rooms[$pr_val['id_room']]['room_num'] = $pr_val['room_num']; - - if ($pr_val['id_customer']) { - $partial_avai_rooms[$pr_val['id_room']]['booked_dates'][] = array( - 'date_from' => $pr_val['date_from'], - 'date_to' => $pr_val['date_to'], - 'id_customer' => $pr_val['id_customer'], - 'booking_type' => $pr_val['booking_type'], - 'booking_status' => $pr_val['booking_status'], - 'comment' => $pr_val['room_comment'] - ); - } - - if (!isset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'])) { - if (($pr_val['date_from'] <= $date_from) && ($pr_val['date_to'] > $date_from) && ($pr_val['date_to'] < $date_to)) { - // from lower to middle range - - $forRange = $this->createDateRangeArray($pr_val['date_to'], $date_to, 0, $pr_val['id_room']); - $available_dates = $this->getPartialRange($forRange, $pr_val['id_room'], $key); - } elseif (($pr_val['date_from'] > $date_from) && ($pr_val['date_from'] < $date_to) && ($pr_val['date_to'] >= $date_to)) { - // from middle to higher range - - $forRange = $this->createDateRangeArray($date_from, $pr_val['date_from'], 0, $pr_val['id_room']); - $available_dates = $this->getPartialRange($forRange, $pr_val['id_room'], $key); - } elseif (($pr_val['date_from'] > $date_from) && ($pr_val['date_from'] < $date_to) && ($pr_val['date_to'] > $date_from) && ($pr_val['date_to'] < $date_to)) { - // between range - - $forRange1 = $this->createDateRangeArray($date_from, $pr_val['date_from'], 0, $pr_val['id_room']); - $init_range = $this->getPartialRange($forRange1, $pr_val['id_room'], $key); - - $forRange2 = $this->createDateRangeArray($pr_val['date_to'], $date_to, 0, $pr_val['id_room']); - $last_range = $this->getPartialRange($forRange2, $pr_val['id_room'], $key); - - $available_dates = $init_range + $last_range; - } - - $partial_avai_rooms[$pr_val['id_room']]['avai_dates'] = $available_dates; - } else { - /* - * Note :: createDateRangeArray function check and unset dates from allReqDates(array) but below it will only return array of date because dates already been removed from "if" condition - */ - $bk_dates = $this->createDateRangeArray($pr_val['date_from'], $pr_val['date_to'], 0, 0, 0); - if (count($bk_dates) >= 2) { - for ($i = 0; $i < count($bk_dates) - 1; ++$i) { - $dateJoin = strtotime($bk_dates[$i]); - - if (isset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'][$dateJoin])) { - if (isset($this->dltDates[$pr_val['id_room']]) && $this->dltDates[$pr_val['id_room']]) { - $this->allReqDates[] = $bk_dates[$i]; - } - unset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'][$dateJoin]); - unset($this->partAvaiDates[$pr_val['id_room'].$dateJoin]); - } - } - } + if (!isset($finalSearchResponse['stats']['num_unavail'])) { + $finalSearchResponse['stats']['num_unavail'] = 0; } + $finalSearchResponse['stats']['num_unavail'] += count($roomTypeSearchData['data']['unavailable']); } - $rm_part_avai = count($partial_avai_rooms); - $num_part_avai += $rm_part_avai; - } - - // if (!$for_calendar) - // { - $booking_data['rm_data'][$key]['name'] = $product_name; - $booking_data['rm_data'][$key]['id_product'] = (int) $room_type['id_product']; - - if ($search_available) { - $booking_data['rm_data'][$key]['data']['available'] = $avai_rooms; - } - - if ($search_unavai) { - $booking_data['rm_data'][$key]['data']['unavailable'] = $unavail_rooms; - } - - if ($search_booked) { - $booking_data['rm_data'][$key]['data']['booked'] = $booked_rooms; - } - - if ($search_partial) { - $booking_data['rm_data'][$key]['data']['partially_available'] = $partial_avai_rooms; - } - - if ($search_cart_rms) { - $booking_data['rm_data'][$key]['data']['cart_rooms'] = $cart_rooms; - } - // } - } - - if ($search_partial) { - foreach ($booking_data['rm_data'] as $bk_data_key => $bk_data_val) { - foreach ($bk_data_val['data']['partially_available'] as $part_rm_key => $part_rm_val) { - if (empty($part_rm_val['avai_dates'])) { - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['avai_dates']); - - $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['detail'] = $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']); - - if ($search_booked) { - $booking_data['rm_data'][$bk_data_key]['data']['booked'] = array_merge($booking_data['rm_data'][$bk_data_key]['data']['booked'], array($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key])); - $num_booked += 1; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]); - } - $num_part_avai -= 1; - } elseif (!empty($this->allReqDates)) { - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['avai_dates']); - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']); - if ($search_unavai) { - $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['room_comment'] = ''; - $booking_data['rm_data'][$bk_data_key]['data']['unavailable'] = array_merge($booking_data['rm_data'][$bk_data_key]['data']['unavailable'], array($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key])); - - $num_unavail += 1; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]); - } - $num_part_avai -= 1; - } - } - - // Remove Cart Rooms from Partial available rooms if ($search_cart_rms) { - foreach ($bk_data_val['data']['cart_rooms'] as $cart_key => $cart_val) { - if (isset($this->partAvaiDates[$cart_val['id_room'].strtotime($cart_val['date_from'])])) { - $rm_data_key = $this->partAvaiDates[$cart_val['id_room'].strtotime($cart_val['date_from'])]['rm_data_key']; + $roomTypeSearchData['data']['cart_rooms'] = isset($cartRoomTypes[$idProduct]) ? $cartRoomTypes[$idProduct] : array(); - unset($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]['avai_dates'][strtotime($cart_val['date_from'])]); - - if (empty($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]['avai_dates'])) { - unset($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]); - $num_part_avai -= 1; - } - } + if (!isset($finalSearchResponse['stats']['num_cart'])) { + $finalSearchResponse['stats']['num_cart'] = 0; } - - unset($this->partAvaiDates); + $finalSearchResponse['stats']['num_cart'] += count($roomTypeSearchData['data']['cart_rooms']); } + + if ($search_booked) { + $roomTypeSearchData['data']['booked'] = isset($bookedRoomTypes[$idProduct]) ? $bookedRoomTypes[$idProduct] : array(); + + if (!isset($finalSearchResponse['stats']['num_booked'])) { + $finalSearchResponse['stats']['num_booked'] = 0; + } + $finalSearchResponse['stats']['num_booked'] += count($roomTypeSearchData['data']['booked']); + } + + if ($search_available) { + $roomTypeSearchData['data']['available'] = array(); + if (!isset($finalSearchResponse['stats']['num_avail'])) { + $finalSearchResponse['stats']['num_avail'] = 0; + } + if (isset($availableRoomTypes['roomTypes'][$idProduct])) { + + $roomTypeSearchData['data']['available'] = $availableRoomTypes['roomTypes'][$idProduct]['rooms']; + + $finalSearchResponse['stats']['num_avail'] += count($roomTypeSearchData['data']['available']); + + $finalSearchResponse['stats']['max_avail_occupancy'] += count($roomTypeSearchData['data']['available']) * (int)$availableRoomTypes['roomTypes'][$idProduct]['maxOccupancy']; + } + } + + if ($search_partial) { + $roomTypeSearchData['data']['partially_available'] = isset($partiallyAvailRoomTypes[$idProduct]) ? $partiallyAvailRoomTypes[$idProduct] : array(); + + $finalSearchResponse['stats']['num_part_avai'] = $partiallyAvailRoomsCount; + } + + $finalSearchResponse['rm_data'][$idProduct] = $roomTypeSearchData; } + unset($roomTypesDetail); + + return $finalSearchResponse; } - - if ($for_calendar) { - unset($booking_data['rm_data']); - } - - $booking_data['stats']['total_rooms'] = $total_rooms; - - if ($search_booked) { - $booking_data['stats']['num_booked'] = $num_booked; - } - - if ($search_unavai) { - $booking_data['stats']['num_unavail'] = $num_unavail; - } - - if ($search_available) { - $booking_data['stats']['num_avail'] = $num_avail; - } - - if ($search_partial) { - $booking_data['stats']['num_part_avai'] = $num_part_avai; - } - - if ($search_partial) { - $booking_data['stats']['num_cart'] = $num_cart; - } - - return $booking_data; } } + + return array(); + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * 'applyLosRestriction' => ..., + * ); + */ + protected function getSearchUnavailableRooms($params) + { + $this->context = Context::getContext(); + // Check LOS restriction for back-office + if (!isset($params['applyLosRestriction'])) { + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + } + + extract($params); + + $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo); + $stayStartDate = date('Y-m-d', strtotime($dateFrom)); + + // Room status inactive + $sql1 = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` + WHERE `id_hotel`='.(int)$idHotel.' AND `id_status` = '. HotelRoomInformation::STATUS_INACTIVE.' AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + // if ($idRoomType) { + // $sql1 .= ' AND `id_product` ='.(int)$idRoomType; + // } + + // check room is temperory inactive + $sql2 = 'SELECT hri.`id` AS `id_room`, hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd. id_room = hri.`id`) + WHERE hri.`id_hotel`='.$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND hrdd.`date_from` < \''.pSql($dateTo).'\' AND hrdd.`date_to` > \''.pSql($dateFrom).'\' AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql1.' UNION '.$sql2; + + if ($applyLosRestriction) { + $sql3 = 'SELECT hri.`id` AS `id_room`, hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_restriction_date_range` AS hrtr ON (hrt.`id_product` = hrtr.`id_product` AND (hrtr.`date_from` <= \''.pSQL($stayStartDate).'\' AND hrtr.`date_to` > \''.pSQL($stayStartDate).'\')) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND (IFNULL(hrtr.`min_los`, hrt.`min_los`) >'. (int)$lengthOfStay.' OR IF(IFNULL(hrtr.`max_los`, hrt.`max_los`) > 0, IFNULL(hrtr.`max_los`, hrt.`max_los`) < '.(int)$lengthOfStay.', 0)) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql.' UNION '.$sql3; + } + + $unavailRoomTypes = array(); + if ($unavailRooms = Db::getInstance()->executeS($sql)) { + foreach ($unavailRooms as $unavailRoomDetail) { + $unavailRoomTypes[$unavailRoomDetail['id_product']][] = $unavailRoomDetail; + } + } + + return $unavailRoomTypes; + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchCartRooms($params) + { + extract($params); + + $cartRoomTypes = array(); + if ($idCart && $idGuest) { + $sql = 'SELECT cbd.`id_product`, cbd.`id_room`, cbd.`id_hotel`, cbd.`booking_type`, cbd.`comment`, rf.`room_num`, cbd.`date_from`, cbd.`date_to` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = cbd.`id_room`) + WHERE cbd.`id_hotel`= '.(int)$idHotel.' AND cbd.`id_cart` = '.(int)$idCart.' AND cbd.`id_guest` ='.(int)$idGuest.' AND cbd.`is_refunded` = 0 AND cbd.`is_back_order` = 0 AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + if ($cartRooms = Db::getInstance()->executeS($sql)) { + foreach ($cartRooms as $cartRoomDetail) { + $cartRoomTypes[$cartRoomDetail['id_product']][] = $cartRoomDetail; + } + } + } + + return $cartRoomTypes; + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'searchOccupancy' => ..., + * 'allowedIdRoomTypes' => ..., + * 'applyLosRestriction' => ..., + * ); + */ + protected function getSearchAvailableRooms($params) + { + $this->context = Context::getContext(); + // Check LOS restriction for back-office + if (!isset($params['applyLosRestriction'])) { + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + } + + extract($params); + + $stayStartDate = date('Y-m-d', strtotime($dateFrom)); + $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo); + + if (isset($this->context->employee->id)) { + $QLO_OWS_SEARCH_ALGO_TYPE = Configuration::get('PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE'); + $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE'); + } else { + $QLO_OWS_SEARCH_ALGO_TYPE = Configuration::get('PS_FRONT_OWS_SEARCH_ALGO_TYPE'); + $QLO_SEARCH_TYPE = Configuration::get('PS_FRONT_SEARCH_TYPE'); + } + + // Exculde Booked rooms + $exclude_ids = 'SELECT `id_room` + FROM `'._DB_PREFIX_.'htl_booking_detail` + WHERE `id_hotel` = '.(int)$idHotel.' AND `is_back_order` = 0 AND `is_refunded` = 0 AND IF(`id_status` = '. self::STATUS_CHECKED_OUT.', ( + (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($dateFrom).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") <= \''.PSQL($dateTo).'\') AND ( + (`date_from` <= \''.pSQL($dateFrom).'\' AND `check_out` > \''.pSQL($dateFrom).'\' AND `check_out` <= \''.PSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `check_out` > \''.pSQL($dateFrom).'\' AND `check_out` <= \''.pSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `check_out` >= \''.pSQL($dateTo).'\') OR + (`date_from` <= \''.pSQL($dateFrom).'\' AND `check_out` >= \''.pSQL($dateTo).'\') + ) + ), ( + (`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateFrom).'\' AND `date_to` <= \''.PSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_to` <= \''.pSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `date_to` >= \''.pSQL($dateTo).'\') OR + (`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` >= \''.pSQL($dateTo).'\') + )) AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + // We have removed cart rooms after finally getting available rooms from booking + // Exclude temporary disable rooms + $exclude_ids .= ' UNION + SELECT hri.`id` AS id_room + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` < \''.pSql($dateTo).'\' AND hrdd.`date_to` > \''.pSql($dateFrom).'\') AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + // LOS Restriction. Also, Remember to check max LOS restriction is greater than zero + if ($applyLosRestriction) { + $exclude_ids .= ' UNION + SELECT hri.`id` AS `id_room` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_restriction_date_range` AS hrtr ON (hrt.`id_product` = hrtr.`id_product` AND (hrtr.`date_from` <= \''.pSQL($stayStartDate).'\' AND hrtr.`date_to` > \''.pSQL($stayStartDate).'\')) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND (IFNULL(hrtr.`min_los`, hrt.`min_los`) >'. (int)$lengthOfStay.' OR IF(IFNULL(hrtr.`max_los`, hrt.`max_los`) > 0, IFNULL(hrtr.`max_los`, hrt.`max_los`) < '.(int)$lengthOfStay.', 0)) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + } + + $selectAvailRoomSearch = 'SELECT ri.`id` AS `id_room`, ri.`id_product`, ri.`id_hotel`, ri.`room_num`, ri.`comment` AS `room_comment`, hrt.`max_adults` AS max_adult, hrt.`max_children`, hrt.`max_guests` AS max_occupancy'; + + $joinAvailRoomSearch = 'INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = ri.`id_product`)'; + + $whereAvailRoomSearch = 'WHERE ri.`id_hotel`='.(int)$idHotel.' AND ri.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE.' AND ri.`id` NOT IN ('.$exclude_ids.') AND IF('.(int)$idRoomType.' > 0, ri.`id_product` = '.(int)$idRoomType.', 1) AND ri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $groupByAvailRoomSearch = ''; + $orderByAvailRoomSearch = ''; + $orderWayAvailRoomSearch = ''; + + Hook::exec('actionAvailRoomSearchSqlModifier', + array( + 'select' => $selectAvailRoomSearch, + 'join' => &$joinAvailRoomSearch, + 'where' => &$whereAvailRoomSearch, + 'group_by' => &$groupByAvailRoomSearch, + 'order_by' => &$orderByAvailRoomSearch, + 'order_way' => &$orderWayAvailRoomSearch, + 'params' => array( + 'id_hotel' => $idHotel, + 'id_product' => $idRoomType, + 'date_from' => $dateFrom, + 'date_to' => $dateTo + ) + ) + ); + + $sql = $selectAvailRoomSearch; + $sql .= ' FROM `'._DB_PREFIX_.'htl_room_information` AS ri'; + $sql .= ' '.$joinAvailRoomSearch; + $sql .= ' '.$whereAvailRoomSearch; + $sql .= ' '.$groupByAvailRoomSearch; + $sql .= ' '.$orderByAvailRoomSearch; + $sql .= ' '.$orderWayAvailRoomSearch; + + $availableRoomTypes = array(); + $unavailableRoomTypes = array(); + + $avai_rooms = Db::getInstance()->executeS($sql); + if ($avai_rooms) { + $availableRoomTypes = array( + 'roomTypes' => array(), + 'maxTotalOccupancy' => 0, + // 'totalRooms' => 0, + ); + foreach ($avai_rooms as $avaiRoom) { + if(!isset($availableRoomTypes['roomTypes'][$avaiRoom['id_product']])) { + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']] = array( + 'rooms' => array(), + 'maxAdult' => 0, + 'maxChildren' => 0, + 'maxOccupancy' => 0, + 'roomCount' => 0, + ); + } + + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['rooms'][$avaiRoom['id_room']] = $avaiRoom; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxAdult'] = $avaiRoom['max_adult']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxChildren'] = $avaiRoom['max_children']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxOccupancy'] = $avaiRoom['max_occupancy']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['roomCount'] += 1; + + $availableRoomTypes['maxTotalOccupancy'] += (int)$avaiRoom['max_occupancy']; + // $availableRoomTypes['totalRooms'] += 1; + } + + if ($QLO_SEARCH_TYPE == HotelBookingDetail::SEARCH_TYPE_OWS && $searchOccupancy) { + $availableRoomTypes = $this->getAvailableRoomSatisfingOccupancy($searchOccupancy, $availableRoomTypes, $QLO_OWS_SEARCH_ALGO_TYPE); + $unavailableRoomTypes = $availableRoomTypes['unavailableRoomTypes']; + $availableRoomTypes = $availableRoomTypes['availableRoomTypes']; + } + + if ($availableRoomTypes && !empty($idCart) && !empty($idGuest)) { + $sql = 'SELECT `id_product`, `id_room` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_hotel` = '.(int)$idHotel.' AND `id_cart` = '.(int)$idCart.' AND `id_guest` = '.(int)$idGuest.' AND `is_refunded` = 0 AND `is_back_order` = 0 AND ((`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateFrom).'\' AND `date_to` <= \''.pSQL($dateTo).'\') OR (`date_from` > \''.pSQL($dateFrom).'\' AND `date_to` < \''.pSQL($dateTo).'\') OR (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `date_to` >= \''.pSQL($dateTo).'\') OR (`date_from` < \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateTo).'\')) AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + $availCartRooms = Db::getInstance()->executeS($sql); + // Also, don't forget to remove cart rooms, because we didn't remove cart rooms from sql query + if ($availCartRooms) { + foreach ($availCartRooms as $cartRoomDetail) { + unset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]['rooms'][$cartRoomDetail['id_room']]); + + if (isset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]) && !$availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]['rooms']) { + unset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]); + } + } + unset($availCartRooms); + } + } + + // there might be a change maxTotalOccupancy will give wrong information + // because of all process might have changed the available roooms data/count + // So further it is no use for us + unset($availableRoomTypes['maxTotalOccupancy']); + } + + return array( + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'availableRoomTypes' => $availableRoomTypes, + ); + } + + protected function getAvailableRoomSatisfingOccupancy($searchOccupancy, $availableRoomTypes, $QLO_OWS_SEARCH_ALGO_TYPE, $cartRooms = array()) + { + $unavailableRoomTypes = array(); + if ($searchOccupancy && $availableRoomTypes) { + // TODO: Try to merge with the next loop + $totalReqOccupancy = 0; + foreach ($searchOccupancy as $reqRoomOccupancy) { + $totalReqOccupancy += (int)$reqRoomOccupancy['adults'] + (int)$reqRoomOccupancy['children']; + } + + // Check total required occupancy must be <= hotel total available occupancy + if ($totalReqOccupancy > $availableRoomTypes['maxTotalOccupancy']) { + // This means hotel cannot take the booking of uncoming no. of guest + // Move all the rooms to unavailable rooms and show no available room on front + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + } + + // if total Required Occupancy can be fulfilled by hotel. So, now following step need to check + // step 1: First, assign room type according to the respective required occupancy + // Step 2: required occupancy with minimum available room type will be selected first for assiging room type + // and if multiple required occupancies have same no. of available room types then we will take the weightage of maxOccupancy + // Step 3: After sorting and selecting req occupancy in ascending order according to step 2, + // now we need to select which available room type should be selected in case multiple room types are satisfing required occupancy + // So, for this the weightage which have less MaxOccupancy allowred and having more rooms available if maximumOccupancy is also same. + // Also, for better understanding we have writen step no. where they are executed. + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + $reqOccupancies = array(); + + $eligibleRoomTypes = array(); + $ineligibleRoomTypes = array(); + + foreach ($searchOccupancy as $reqRoomOccupancy) { + if (!isset($reqRoomOccupancy['roomTypes'])) { + $reqRoomOccupancy['roomTypes'] = array(); + } + + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomsDetail) { + // below is STEP 1 + if (($reqRoomOccupancy['adults'] <= $roomsDetail['maxAdult']) && + ($reqRoomOccupancy['children'] <= $roomsDetail['maxChildren']) && + ((int)$reqRoomOccupancy['adults'] + (int)$reqRoomOccupancy['children'] <= $roomsDetail['maxOccupancy'])) { + + // below is STEP 3 + $reqRoomOccupancy['roomTypes'][$idProduct] = ($roomsDetail['maxOccupancy']*100 - $roomsDetail['roomCount']); + + $eligibleRoomTypes[$idProduct] = $idProduct; + if (isset($ineligibleRoomTypes[$idProduct])) { + unset($ineligibleRoomTypes[$idProduct]); + } + } else { + if (!isset($eligibleRoomTypes[$idProduct])) { + $ineligibleRoomTypes[$idProduct] = $idProduct; + } + } + } + + // Sort accordind to weight + asort($reqRoomOccupancy['roomTypes']); + + if ($reqRoomOccupancy['roomTypes']) { + // Room occupancy weight index will tell us which required occupancy (search) should be selected first for assigning roomtype + // below is STEP 2 + $reqRoomOccupancyWt = $this->generateRoomOccupancyWeight( + count($reqRoomOccupancy['roomTypes']), + (int)$reqRoomOccupancy['adults'] + (int)$reqRoomOccupancy['children'], + $reqRoomOccupancy['adults'], + $reqRoomOccupancy['children'] + ); + + // In case avail rooms, required adults and required childers are same + // then to overcome the loose of required occupancy array + while (isset($reqOccupancies[$reqRoomOccupancyWt])) { + $reqRoomOccupancyWt += 1; + } + + $reqOccupancies[$reqRoomOccupancyWt] = $reqRoomOccupancy; + } else { + // In case no room type satisfies specific occupancy + // check if exact search, move all room types to unavailable and break loop + if ($QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + break; + } + } + } + unset($eligibleRoomTypes); + + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + // Sort accordind to weight + ksort($reqOccupancies); + + $usedRoomTypeQty = array(); + foreach ($reqOccupancies as &$reqRoomOccupancy) { + while (count($reqRoomOccupancy['roomTypes']) > 0) { + $selectedRoomTypeId = key($reqRoomOccupancy['roomTypes']); + unset($reqRoomOccupancy['roomTypes'][$selectedRoomTypeId]); + + if (!isset($usedRoomTypeQty[$selectedRoomTypeId])) { + $usedRoomTypeQty[$selectedRoomTypeId] = 0; + } + + if (((int)$availableRoomTypes['roomTypes'][$selectedRoomTypeId]['roomCount'] - (int)$usedRoomTypeQty[$selectedRoomTypeId]) > 0) { + $reqRoomOccupancy['selectedRoomType'] = $selectedRoomTypeId; + $usedRoomTypeQty[$selectedRoomTypeId] += 1; + break; + } + } + + // if no room type is selected, that means we cannot fulfill the the guest requiremtn if exact search + if (!isset($reqRoomOccupancy['selectedRoomType'])) { + + // if exact search, move all room types to unavailable and break loop + if ($QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + break; + } + + } + } + unset($usedRoomTypeQty); + } + } + + // If we are here than hotel can fulfill the required rooms with there respective occupancies + // So, formate according to output data + // but first check HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, + // if true, then only return rooms which satisfy search requirment + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO && count($ineligibleRoomTypes) > 0) { + foreach ($ineligibleRoomTypes as $idProduct) { + // Move ineligibleRoomTypes to unavailable rooms + if (!isset($unavailableRoomTypes[$idProduct])) { + $unavailableRoomTypes[$idProduct] = array(); + } + $unavailableRoomTypes[$idProduct] = $availableRoomTypes['roomTypes'][$idProduct]['rooms']; + + unset($availableRoomTypes['roomTypes'][$idProduct]); + } + } + unset($ineligibleRoomTypes); + } + + return array( + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'availableRoomTypes' => $availableRoomTypes && isset($availableRoomTypes['roomTypes']) ? $availableRoomTypes : array(), + ); + } + + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'searchOccupancy' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchPartiallyAvailRooms($params) + { + extract($params); + + $sql1 = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`check_out`, bd.`date_to`) AS `date_to`, hrt.`max_adults` AS `max_adult`, hrt.`max_children`, hrt.`max_guests` AS `max_occupancy` + FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = rf.`id_product`) + WHERE bd.`id_hotel`='.(int)$idHotel.' AND rf.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE .' AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', ( + (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($dateFrom).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") < \''.PSQL($dateTo).'\') AND ( + (bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`check_out` > \''.pSQL($dateFrom).'\' AND bd.`check_out` < \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`check_out` >= \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`check_out` > \''.pSQL($dateFrom).'\' AND bd.`check_out` < \''.pSQL($dateTo).'\') + ) + ), ( + (bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`date_to` > \''.pSQL($dateFrom).'\' AND bd.`date_to` < \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`date_to` >= \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`date_to` < \''.pSQL($dateTo).'\') + )) AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql2 = 'SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, 0 AS `id_customer`, 0 AS `booking_type`, 0 AS `booking_status`, 0 AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to`, hrt.`max_adults` AS `max_adult`, hrt.`max_children`, hrt.`max_guests` AS `max_occupancy` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND ( + (hrdd.`date_from` <= \''.pSQL($dateFrom).'\' AND hrdd.`date_to` > \''.pSQL($dateFrom).'\' AND hrdd.`date_to` < \''.pSQL($dateTo).'\') OR + (hrdd.`date_from` > \''.pSQL($dateFrom).'\' AND hrdd.`date_from` < \''.pSQL($dateTo).'\' AND hrdd.`date_to` >= \''.pSQL($dateTo).'\') OR + (hrdd.`date_from` > \''.pSQL($dateFrom).'\' AND hrdd.`date_from` < \''.pSQL($dateTo).'\' AND hrdd.`date_to` < \''.pSQL($dateTo).'\') + ) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql1.' UNION '.$sql2; + $part_arr = Db::getInstance()->executeS($sql); + + // Get date wise available rooms + $dateWiseRoomTypes = array(); + + // Below variables will be used for formating + $partialAvailRoomType = array(); + $partialRoomsList = array(); + + + $unavailableRoomTypes = array(); + + if ($part_arr) { + // Occupancy Wise Search OR Normal Search + if (isset($this->context->employee->id)) { + $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE'); + } else { + $QLO_SEARCH_TYPE = Configuration::get('PS_FRONT_SEARCH_TYPE'); + } + + $period = new DatePeriod( + new DateTime($dateFrom), + new DateInterval('P1D'), + new DateTime($dateTo) + ); + + // FYI:: Last date not included + // Get all dates to be covered in booking + $searchDates = array(); + foreach ($period as $objDate) { + $searchDates[$objDate->getTimestamp()] = array( + 'date_from' => $objDate->format('Y-m-d'), + 'date_to' => $objDate->modify('+1 day')->format('Y-m-d'), + ); + } + + $partiallyAvailRooms = array(); + foreach ($part_arr as $roomDetail) { + if (!isset($partiallyAvailRooms[$roomDetail['id_room']])) { + $availableDates = $searchDates; + } else { + $availableDates = $partiallyAvailRooms[$roomDetail['id_room']]['availableDates']; + } + + $period = new DatePeriod( + new DateTime($roomDetail['date_from']), + new DateInterval('P1D'), + new DateTime($roomDetail['date_to']) + ); + foreach ($period as $objDate) { + if (isset($availableDates[$objDate->getTimestamp()])) { + unset($availableDates[$objDate->getTimestamp()]); + } + } + + // If room is available for booking + if ($availableDates) { + if (!isset($partiallyAvailRooms[$roomDetail['id_room']])) { + $partiallyAvailRooms[$roomDetail['id_room']] = array( + 'id_product' => $roomDetail['id_product'], + 'id_room' => $roomDetail['id_room'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'max_adult' => $roomDetail['max_adult'], + 'max_children' => $roomDetail['max_children'], + 'max_occupancy' => $roomDetail['max_occupancy'], + // 'booked_dates' => array(), + ); + } + $partiallyAvailRooms[$roomDetail['id_room']]['availableDates'] = $availableDates; + + // FYI:: For backward compatibility (will help in formating) + // $partiallyAvailRooms[$roomDetail['id_room']]['avai_dates'] = $availableDates; + // $partiallyAvailRooms[$roomDetail['id_room']]['booked_dates'][] = array( + // 'date_from' => $roomDetail['date_from'], + // 'date_to' => $roomDetail['date_to'], + // 'id_customer' => $roomDetail['id_customer'], + // 'booking_type' => $roomDetail['booking_type'], + // 'booking_status' => $roomDetail['booking_status'], + // 'comment' => $roomDetail['room_comment'], + // ); + } else { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + + if (isset($partiallyAvailRooms[$roomDetail['id_room']])) { + unset($partiallyAvailRooms[$roomDetail['id_room']]); + } + } + } + + // will be used to check all dates are covered by partially avail rooms + $datesToCover = $searchDates; + + // Will be used to generate query to find partially avail rooms in cart + $timeStampWiseRooms = array(); + + // Arrange available rooms, date wise + $datetimeObj = new DateTime(); + foreach ($partiallyAvailRooms as $idRoom => &$roomDetail) { + foreach ($roomDetail['availableDates'] as $dateTimeStamp => $dateOnRoomAvail) { + unset($datesToCover[$dateTimeStamp]); + + $timeStampWiseRooms[$dateTimeStamp][] = $idRoom; + + if (!isset($dateWiseRoomTypes[$dateTimeStamp])) { + $dateWiseRoomTypes[$dateTimeStamp] = array( + // 'date' => $dateOnRoomAvail, + 'dateFrom' => $datetimeObj->setTimestamp($dateTimeStamp)->format('Y-m-d'), + 'dateTo' => $datetimeObj->modify('+1 day')->format('Y-m-d'), + 'roomTypes' => array(), + 'maxTotalOccupancy' => 0, + // 'roomTotalCount' => 0 + ); + } + if (!isset($dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']])) { + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']] = array( + 'rooms' => array(), + 'maxAdult' => 0, + 'maxChildren' => 0, + 'maxOccupancy' => 0, + 'roomCount' => 0, + ); + } + // not needed any further + unset($roomDetail['availableDates']); + + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['rooms'][$idRoom] = $roomDetail; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxAdult'] = $roomDetail['max_adult']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxChildren'] = $roomDetail['max_children']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxOccupancy'] = $roomDetail['max_occupancy']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['roomCount'] += 1; + + $dateWiseRoomTypes[$dateTimeStamp]['maxTotalOccupancy'] += $roomDetail['max_occupancy']; + // $dateWiseRoomTypes[$dateTimeStamp]['roomTotalCount'] += 1; + } + } + unset($datetimeObj); + + // If all dates rae covered + if (!$datesToCover) { + // array in ascending order of dates + ksort($dateWiseRoomTypes); + + $dateWiseCartRooms = array(); + // get cart partially available rooms + if (!empty($idCart) && !empty($idGuest)) { + $sql = 'SELECT `id_product`, `id_room`, `date_from` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_hotel` = '.(int)$idHotel.' AND `id_cart` = '.(int)$idCart.' AND `id_guest` = '.(int)$idGuest.' AND `is_refunded` = 0 AND `is_back_order` = 0 AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + $datetimeObj = new DateTime(); + foreach ($timeStampWiseRooms as $timeStamp => $roomList) { + $datetimeObj->setTimestamp($timeStamp); + $partialDateFrom = $datetimeObj->format('Y-m-d H:i:s'); + + $datetimeObj->modify('+1 day'); + $partialDateTo = $datetimeObj->format('Y-m-d H:i:s'); + + $sql .= ' AND (`date_from` = \''.pSQL($partialDateFrom).'\' AND `date_to` = \''.pSQL($partialDateTo).'\' AND `id_room` IN ('.implode(",", $roomList).'))'; + } + unset($datetimeObj); + + $partiallyAvailCartRooms = Db::getInstance()->executeS($sql); + if ($partiallyAvailCartRooms) { + foreach ($partiallyAvailCartRooms as $cartRoomDetail) { + $dateWiseCartRooms[strtotime($cartRoomDetail['date_from'])][] = array( + 'id_product' => $cartRoomDetail['id_product'], + 'id_room' => $cartRoomDetail['id_room'] + ); + } + } + } + + foreach ($dateWiseRoomTypes as $timeStamp => &$roomTypeDetail) { + if ($QLO_SEARCH_TYPE == HotelBookingDetail::SEARCH_TYPE_OWS && $searchOccupancy) { + $dateWiseAvailableRooms = $this->getAvailableRoomSatisfingOccupancy( + $searchOccupancy, + $roomTypeDetail, + HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO // All options for partial rooms + ); + + // Case: Unavailables rooms should be check, if they are available for anyother date range + // Above case is not needed to be checked for now beacuse either the date is completely unavailable for booking + // or we will get available rooms because of "HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO" variable) + + if ($dateWiseAvailableRooms['availableRoomTypes'] && isset($dateWiseAvailableRooms['availableRoomTypes']['roomTypes'])) { + $roomTypeDetail = $dateWiseAvailableRooms['availableRoomTypes']; + + // there might be a change maxTotalOccupancy will give wrong information + // because of all process might have changed the available roooms data/count + // So further it is no use for us + unset($roomTypeDetail['maxTotalOccupancy']); + } else { + // Partial rooms are not availble for this date + // Move all the rooms to unavailable rooms + // Break the loop + foreach ($partiallyAvailRooms as $roomDetail) { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + // $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = $roomDetail; + } + + $partiallyAvailRooms = array(); + $dateWiseRoomTypes = array(); + break; + } + } + + // Don't forget to remove cart rooms + if ($roomTypeDetail['roomTypes'] && $dateWiseCartRooms && isset($dateWiseCartRooms[$timeStamp])) { + foreach ($dateWiseCartRooms[$timeStamp] as $cartRoomDetail) { + unset($roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]['rooms'][$cartRoomDetail['id_room']]); + + if (!$roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]['rooms']) { + unset($roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]); + } + } + } + } + // free space + unset($roomTypeDetail); + + // Return room type wise instead of date wise + foreach ($dateWiseRoomTypes as $timeStamp => $dateWiseDetail) { + foreach ($dateWiseDetail['roomTypes'] as $idProduct => $roomTypeDetail) { + $partialAvailRoomType[$idProduct][$timeStamp] = array( + 'date_from' => $dateWiseDetail['dateFrom'], + 'date_to' => $dateWiseDetail['dateTo'], + 'rooms' => $roomTypeDetail['rooms'], + ); + $partialRoomsList = array_unique(array_merge($partialRoomsList, array_keys($roomTypeDetail['rooms'])), SORT_NUMERIC); + } + } + } else { + // If all dates are not covered then move all partially available room types to unavailable + foreach ($partiallyAvailRooms as $roomDetail) { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + } + + $partiallyAvailRooms = array(); + $dateWiseRoomTypes = array(); + } + unset($datesToCover); + unset($timeStampWiseRooms); + unset($partiallyAvailRooms); + } + + return array( + 'partiallyAvailRooms' => $dateWiseRoomTypes ? $partialAvailRoomType : $dateWiseRoomTypes, + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'partiallyAvailRoomsCount' => count($partialRoomsList), + ); + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchBookedRooms($params) + { + extract($params); + + $sql = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment`, rf.`room_num`, bd.`date_from`, bd.`date_to` + FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) + WHERE bd.`id_hotel`='.(int)$idHotel.' AND bd.`is_refunded` = 0 AND bd.`is_back_order` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`check_out` >= \''.pSQL($dateTo).'\', bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.date_to >= \''.pSQL($dateTo).'\') AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $bookedRoomTypes = array(); + if ($booked_rooms = Db::getInstance()->executeS($sql)) { + foreach ($booked_rooms as $booked_k => $booked_v) { + if (!isset($bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']])) { + $bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']] = array( + 'id_product' => $booked_v['id_product'], + 'id_room' => $booked_v['id_room'], + 'id_hotel' => $booked_v['id_hotel'], + 'room_num' => $booked_v['room_num'], + 'detail' => array() + ); + } + $bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']]['detail'][] = array( + 'date_from' => $booked_v['date_from'], + 'date_to' => $booked_v['date_to'], + 'id_customer' => $booked_v['id_customer'], + 'booking_type' => $booked_v['booking_type'], + 'booking_status' => $booked_v['booking_status'], + 'comment' => $booked_v['comment'], + ); + } + unset($booked_rooms); + } + + return $bookedRoomTypes; } // This function algo is same as available rooms algo and it not similar to booked rooms algo. @@ -765,6 +1381,11 @@ class HotelBookingDetail extends ObjectModel return $daysDifference; } + public function generateRoomOccupancyWeight($availRoomTypeCount, $totalOccupancy, $totalAdult, $totalChildren) + { + return (10000000*(int)$availRoomTypeCount - (100000*(int)$totalOccupancy + 1000*(int)$totalAdult + 10*$totalChildren)); + } + /** * [getBookingDataByOrderId :: To get booking information by id order]. * @@ -787,56 +1408,50 @@ class HotelBookingDetail extends ObjectModel * @return [Boolean] [Returns true if successfully updated else returns false] */ public function updateBookingOrderStatusByOrderId( - $order_id, - $new_status, - $id_room, - $date_from, - $date_to, - $status_date = '' + $idOrder, + $newStatus, + $idRoom, + $dateFrom, + $dateTo, + $statusDate = '' ) { - if ($status_date) { - $status_date = date('Y-m-d H:i:s', strtotime($status_date)); - } else { - $status_date = date('Y-m-d H:i:s'); + $roomBookingData = $this->getRoomBookingData($idRoom, $idOrder, $dateFrom, $dateTo); + $objHotelBookingDetail = new self($roomBookingData['id']); + + if (Validate::isLoadedObject($objHotelBookingDetail)) { + if ($statusDate) { + $statusDate = date('Y-m-d H:i:s', strtotime($statusDate)); + } else { + $statusDate = date('Y-m-d H:i:s'); + } + + if ($newStatus == self::STATUS_CHECKED_IN) { + $objHotelBookingDetail->id_status = $newStatus; + $objHotelBookingDetail->check_in = ($statusDate > $dateTo ? $dateTo : $statusDate); + } elseif ($newStatus == self::STATUS_CHECKED_OUT) { + $objHotelBookingDetail->id_status = $newStatus; + $objHotelBookingDetail->check_out = ($statusDate > $dateTo ? $dateTo : $statusDate); + } else { + $objHotelBookingDetail->id_status = $newStatus; + $objHotelBookingDetail->check_in = ''; + $objHotelBookingDetail->check_out = ''; + } + + return $objHotelBookingDetail->save(); } - $table = 'htl_booking_detail'; - - // create date to update in the table - if ($new_status == self::STATUS_CHECKED_IN) { - $data = array( - 'id_status' => $new_status, - 'check_in' => ($status_date > $date_to ? $date_to : $status_date) - ); - } elseif ($new_status == self::STATUS_CHECKED_OUT) { - $data = array( - 'id_status' => $new_status, - 'check_out' => ($status_date > $date_to ? $date_to : $status_date) - ); - } else { - $data = array( - 'id_status' => $new_status, - 'check_in' => '', - 'check_out' => '' - ); - } - - // where conditions - $where = 'id_order = '.(int)$order_id.' AND id_room = '.(int)$id_room. - ' AND `date_from` = \''.pSQL($date_from).'\' AND `date_to` = \''.pSQL($date_to).'\''; - - return Db::getInstance()->update($table, $data, $where); + return false; } /** - * [DataForFrontSearch ]. + * [dataForFrontSearch ]. * * @param [date] $date_from [Start date of the booking] * @param [date] $date_to [End date of the booking] * @param [int] $id_hotel [Id of the Hotel] * @param [int] $id_product [ID of the product] - * @param [int] $for_room_type [used for product page and category page for block cart] - * @param [int] $adult [] + * @param [int] $only_search_data [used for product page and category page for block cart] + * @param [int] $adults [] * @param [int] $children [] * @param [] $ratting [description] * @param [] $amenities [description] @@ -845,9 +1460,9 @@ class HotelBookingDetail extends ObjectModel * @param [int] $id_guest [Id of the guest] * * @return [array] [Returns true if successfully updated else returns false] - * Note:: $for_room_type is used for product page and category page for block cart + * Note:: $only_search_data is used for product page and category page for block cart */ - public function DataForFrontSearch($date_from, $date_to, $id_hotel, $id_product = 0, $for_room_type = 0, $adult = 0, $children = 0, $ratting = -1, $amenities = 0, $price = 0, $id_cart = 0, $id_guest = 0) + public function dataForFrontSearch($bookingParams) { // if (Module::isInstalled('productcomments')) { // require_once _PS_MODULE_DIR_.'productcomments/ProductComment.php'; @@ -855,31 +1470,22 @@ class HotelBookingDetail extends ObjectModel $this->context = Context::getContext(); - $bookingParams = array(); - $bookingParams['date_from'] = $date_from; - $bookingParams['date_to'] = $date_to; - $bookingParams['hotel_id'] = $id_hotel; - $bookingParams['room_type'] = $id_product; - $bookingParams['adult'] = $adult; - $bookingParams['children'] = $children; - $bookingParams['num_rooms'] = 0; - $bookingParams['for_calendar'] = 0; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 0; $bookingParams['search_booked'] = 0; $bookingParams['search_unavai'] = 0; - $bookingParams['id_cart'] = $id_cart; - $bookingParams['id_guest'] = $id_guest; - $booking_data = $this->getBookingData($bookingParams); + $bookingData = $this->getBookingData($bookingParams); - if (!$for_room_type) { - if (!empty($booking_data)) { - $obj_rm_type = new HotelRoomType(); + extract($this->getBookingDataParams($bookingParams)); - foreach ($booking_data['rm_data'] as $key => $value) { + if (!$only_search_data) { + if (!empty($bookingData)) { + $objRoomType = new HotelRoomType(); + + foreach ($bookingData['rm_data'] as $key => $value) { if (empty($value['data']['available'])) { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } else { $prod_ratting = 0; // if (Module::isInstalled('productcomments')) { @@ -890,7 +1496,7 @@ class HotelBookingDetail extends ObjectModel // } // if ($prod_ratting < $ratting && $ratting != -1) { - // unset($booking_data['rm_data'][$key]); + // unset($bookingData['rm_data'][$key]); // } else // { $product = new Product($value['id_product'], false, $this->context->language->id); @@ -909,7 +1515,7 @@ class HotelBookingDetail extends ObjectModel } } if (!empty($prod_amen)) { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } } @@ -927,37 +1533,46 @@ class HotelBookingDetail extends ObjectModel $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default'); } - $room_left = count($booking_data['rm_data'][$key]['data']['available']); + $room_left = count($bookingData['rm_data'][$key]['data']['available']); - $rm_dtl = $obj_rm_type->getRoomTypeInfoByIdProduct($value['id_product']); + $rm_dtl = $objRoomType->getRoomTypeInfoByIdProduct($value['id_product']); - $booking_data['rm_data'][$key]['name'] = $product->name; - $booking_data['rm_data'][$key]['image'] = $cover_img; - $booking_data['rm_data'][$key]['description'] = $product->description_short; - $booking_data['rm_data'][$key]['feature'] = $product_feature; - $booking_data['rm_data'][$key]['price'] = $prod_price; - $booking_data['rm_data'][$key]['price_without_reduction'] = $productPriceWithoutReduction; - $booking_data['rm_data'][$key]['feature_price'] = $productFeaturePrice; - $booking_data['rm_data'][$key]['feature_price_diff'] = $productPriceWithoutReduction - $productFeaturePrice; + $bookingData['rm_data'][$key]['name'] = $product->name; + $bookingData['rm_data'][$key]['image'] = $cover_img; + $bookingData['rm_data'][$key]['description'] = $product->description_short; + $bookingData['rm_data'][$key]['feature'] = $product_feature; + $bookingData['rm_data'][$key]['price'] = $prod_price; + $bookingData['rm_data'][$key]['price_without_reduction'] = $productPriceWithoutReduction; + $bookingData['rm_data'][$key]['feature_price'] = $productFeaturePrice; + $bookingData['rm_data'][$key]['feature_price_diff'] = $productPriceWithoutReduction - $productFeaturePrice; // if ($room_left <= (int)Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER')) - $booking_data['rm_data'][$key]['room_left'] = $room_left; + $bookingData['rm_data'][$key]['room_left'] = $room_left; - $booking_data['rm_data'][$key]['adult'] = $rm_dtl['adult']; - $booking_data['rm_data'][$key]['children'] = $rm_dtl['children']; + $bookingData['rm_data'][$key]['adults'] = $rm_dtl['adults']; + $bookingData['rm_data'][$key]['children'] = $rm_dtl['children']; - $booking_data['rm_data'][$key]['ratting'] = $prod_ratting; + $bookingData['rm_data'][$key]['ratting'] = $prod_ratting; // if (Module::isInstalled('productcomments')) { - // $booking_data['rm_data'][$key]['num_review'] = ProductComment::getCommentNumber($value['id_product']); - // } + // $bookingData['rm_data'][$key]['num_review'] = ProductComment::getCommentNumber($value['id_product']); + // } + + // create URL with the parameters from URL + $urlData = array ('date_from' => $date_from, 'date_to' => $date_to); + if (!isset($occupancy)) { + $occupancy = Tools::getValue('occupancy'); + } + if ($occupancy) { + $urlData['occupancy'] = $occupancy; + } if (Configuration::get('PS_REWRITING_SETTINGS')) { - $booking_data['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'?date_from='.$date_from.'&date_to='.$date_to; + $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'?'.http_build_query($urlData); } else { - $booking_data['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'&date_from='.$date_from.'&date_to='.$date_to; + $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'&'.http_build_query($urlData); } } else { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } } // } @@ -966,7 +1581,7 @@ class HotelBookingDetail extends ObjectModel } } - return $booking_data; + return $bookingData; } /** @@ -974,15 +1589,16 @@ class HotelBookingDetail extends ObjectModel * * @param [date] $date_from[Start date of booking of the room to be swapped with available rooms] * @param [date] $date_to [End date of booking of the room to be swapped with available rooms] - * @param [int] $room_type [Id of the product to which the room belongs to be swapped] + * @param [int] $id_room_type [Id of the product to which the room belongs to be swapped] * @param [int] $hotel_id [Id of the Hotel to which the room belongs to be swapped] * * @return [array|false] [Returs array of the available rooms for swapping if rooms found else returnss false] */ - public function getAvailableRoomsForReallocation($date_from, $date_to, $room_type, $hotel_id) + public function getAvailableRoomsForReallocation($date_from, $date_to, $id_room_type, $hotel_id) { - if (isset($_COOKIE['wk_id_cart'])) { - $current_admin_cart_id = $_COOKIE['wk_id_cart']; + $context = Context::getContext(); + if (isset($context->cookie->id_cart)) { + $current_admin_cart_id = $context->cookie->id_cart; } $exclude_ids = 'SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from` < \''.pSQL($date_to).'\' AND `date_to` > \''.pSQL($date_from).'\' @@ -991,14 +1607,14 @@ class HotelBookingDetail extends ObjectModel SELECT hri.`id` AS id_room FROM `'._DB_PREFIX_.'htl_room_information` AS hri INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$room_type.' + WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$id_room_type.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` <= \''.pSql($date_to).'\' AND hrdd.`date_to` >= \''.pSql($date_from).'\')'; if (isset($current_admin_cart_id) && $current_admin_cart_id) { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` NOT IN ('.$exclude_ids.') AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='. @@ -1006,7 +1622,7 @@ class HotelBookingDetail extends ObjectModel } else { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` NOT IN ('.$exclude_ids.')'; } @@ -1027,11 +1643,11 @@ class HotelBookingDetail extends ObjectModel * * @return [array|false] [Returs array of the available rooms for swapping if rooms found else returnss false] */ - public function getAvailableRoomsForSwapping($date_from, $date_to, $room_type, $hotel_id, $id_room) + public function getAvailableRoomsForSwapping($date_from, $date_to, $id_room_type, $hotel_id, $id_room) { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` IN ( SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` @@ -1051,36 +1667,48 @@ class HotelBookingDetail extends ObjectModel * * @return [boolean] [true if rooms successfully reallocated else returns false] */ - public function reallocateRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id) + public function reallocateRoomWithAvailableSameRoomType($currentRoomId, $dateFrom, $dateTo, $swappedRoomId) { - $date_from = date('Y-m-d H:i:s', strtotime($date_from)); - $date_to = date('Y-m-d H:i:s', strtotime($date_to)); - $table = 'htl_cart_booking_data'; - $table2 = 'htl_booking_detail'; - $data = array('id_room' => $swapped_room_id); - $where = 'date_from=\''.pSQL($date_from).'\' AND date_to=\''.pSQL($date_to).'\' AND id_room='. - (int)$current_room_id; + $dateFrom = date('Y-m-d H:i:s', strtotime($dateFrom)); + $dateTo = date('Y-m-d H:i:s', strtotime($dateTo)); - if ($result = Db::getInstance()->update($table, $data, $where)) { - if($room_num = Db::getInstance()->getValue( - 'SELECT `room_num` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id` = '.$swapped_room_id - )) { - $data['room_num'] = $room_num; + $idHotelCartBookingData = Db::getInstance()->getValue( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE date_from = "'.pSQL($dateFrom).'" AND date_to = "'.pSQL($dateTo).'" + AND id_room = '.(int) $currentRoomId + ); + + if ($idHotelCartBookingData) { + $objHotelCartBookingData = new HotelCartBookingData($idHotelCartBookingData); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $objHotelCartBookingData->id_room = $swappedRoomId; + if ($objHotelCartBookingData->save()) { + $objHotelRoomInformation = new HotelRoomInformation($swappedRoomId); + + $roomBookingData = $this->getRoomBookingData($currentRoomId, $objHotelCartBookingData->id_order, $dateFrom, $dateTo); + $objHotelBookingDetail = new self($roomBookingData['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + $objHotelBookingDetail->id_room = $swappedRoomId; + $objHotelBookingDetail->room_num = $objHotelRoomInformation->room_num; + if ($objHotelBookingDetail->save()) { + Hook::exec( + 'actionRoomReAllocateAfter', + array( + 'room_id' => $currentRoomId, + 'realloc_room_id' => $swappedRoomId, + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + ) + ); + + return true; + } + } + } } - if ($result2 = Db::getInstance()->update($table2, $data, $where)) { - Hook::exec( - 'actionRoomReAllocateAfter', - array( - 'room_id' => $current_room_id, - 'realloc_room_id' => $swapped_room_id, - 'date_from' => $date_from, - 'date_to' => $date_to, - ) - ); - return true; - } - return false; } + return false; } @@ -1093,58 +1721,69 @@ class HotelBookingDetail extends ObjectModel * * @return [boolean] [true if rooms successfully swapped else returns false] */ - public function swapRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id) + public function swapRoomWithAvailableSameRoomType($currentRoomId, $dateFrom, $dateTo, $swappedRoomId) { - $date_from = date('Y-m-d H:i:s', strtotime($date_from)); - $date_to = date('Y-m-d H:i:s', strtotime($date_to)); + $dateFrom = date('Y-m-d H:i:s', strtotime($dateFrom)); + $dateTo = date('Y-m-d H:i:s', strtotime($dateTo)); - $idcrt1 = Db::getInstance()->getValue( + $idHotelCartBookingData1 = Db::getInstance()->getValue( 'SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `is_refunded` = 0 - AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\' - AND `id_room`='.(int)$swapped_room_id + AND `date_from`=\''.pSQL($dateFrom).'\' AND `date_to`=\''.pSQL($dateTo).'\' + AND `id_room`='.(int)$swappedRoomId ); - $idcrt2 = Db::getInstance()->getValue( + $idHotelCartBookingData2 = Db::getInstance()->getValue( 'SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `is_refunded` = 0 - AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\' - AND `id_room`='.(int)$current_room_id + AND `date_from`=\''.pSQL($dateFrom).'\' AND `date_to`=\''.pSQL($dateTo).'\' + AND `id_room`='.(int)$currentRoomId ); - $swap_room = Db::getInstance()->getRow( - 'SELECT `id`, `room_num` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `is_refunded` = 0 - AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\' - AND `id_room`='.(int)$swapped_room_id + $idHotelBookingDetail1 = Db::getInstance()->getValue( + 'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `is_refunded` = 0 + AND `date_from`=\''.pSQL($dateFrom).'\' AND `date_to`=\''.pSQL($dateTo).'\' + AND `id_room`='.(int)$swappedRoomId ); - $curr_room = Db::getInstance()->getRow( - 'SELECT `id`, `room_num` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `is_refunded` = 0 - AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\' - AND `id_room`='.(int)$current_room_id + $idHotelBookingDetail2 = Db::getInstance()->getValue( + 'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `is_refunded` = 0 + AND `date_from`=\''.pSQL($dateFrom).'\' AND `date_to`=\''.pSQL($dateTo).'\' + AND `id_room`='.(int)$currentRoomId ); - $sql = 'UPDATE `'._DB_PREFIX_.'htl_cart_booking_data` SET `id_room`=IF(`id`='.(int)$idcrt1.','. - (int)$current_room_id.','.(int)$swapped_room_id.') WHERE `id` IN('.(int)$idcrt1.','.(int)$idcrt2.')'; - $sql1 = 'UPDATE `'._DB_PREFIX_.'htl_booking_detail` - SET `id_room`=IF(`id`='.(int)$swap_room['id'].','.(int)$current_room_id.','.(int)$swapped_room_id.'), - `room_num`=IF( - `id`='.(int)$swap_room['id'].',\''.pSQL($curr_room['room_num']).'\',\''.pSQL($swap_room['room_num']).'\' - ) - WHERE `id` IN('.(int)$swap_room['id'].','.(int)$curr_room['id'].')'; + $objHotelCartBookingData1 = new HotelCartBookingData($idHotelCartBookingData1); + $objHotelCartBookingData2 = new HotelCartBookingData($idHotelCartBookingData2); - if ($result = Db::getInstance()->execute($sql)) { - $result2 = Db::getInstance()->execute($sql1); - if ($result2) { - Hook::exec( - 'actionRoomSwapAfter', - array( - 'room_id' => $current_room_id, - 'swapped_room_id' => $swapped_room_id, - 'date_from' => $date_from, - 'date_to' => $date_to, - ) - ); - return true; - } - return false; + $temp = $objHotelCartBookingData1->id_room; + $objHotelCartBookingData1->id_room = $objHotelCartBookingData2->id_room; + $objHotelCartBookingData2->id_room = $temp; + + $objHotelBookingDetail1 = new HotelBookingDetail($idHotelBookingDetail1); + $objHotelBookingDetail2 = new HotelBookingDetail($idHotelBookingDetail2); + + $temp = $objHotelBookingDetail1->id_room; + $objHotelBookingDetail1->id_room = $objHotelBookingDetail2->id_room; + $objHotelBookingDetail2->id_room = $temp; + + $temp = $objHotelBookingDetail1->room_num; + $objHotelBookingDetail1->room_num = $objHotelBookingDetail2->room_num; + $objHotelBookingDetail2->room_num = $temp; + + if ($objHotelCartBookingData1->save() + && $objHotelCartBookingData2->save() + && $objHotelBookingDetail1->save() + && $objHotelBookingDetail2->save() + ) { + Hook::exec( + 'actionRoomSwapAfter', + array( + 'room_id' => $currentRoomId, + 'swapped_room_id' => $swappedRoomId, + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + ) + ); + + return true; } + return false; } @@ -1213,15 +1852,16 @@ class HotelBookingDetail extends ObjectModel * * @return [Boolean] [True if deleted else false] */ - public function deleteOrderedRoomFromOrder($id_order, $id_hotel, $id_room, $date_from, $date_to) + public function deleteOrderedRoomFromOrder($idOrder, $idHotel, $idRoom, $dateFrom, $dateTo) { - return Db::getInstance()->delete( - 'htl_booking_detail', - '`id_order`='.(int) $id_order.' AND `id_hotel`='.(int) $id_hotel.' AND `id_room`='.(int) $id_room. - ' AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\'' - ); + $roomBookingData = $this->getRoomBookingData($idRoom, $idOrder, $dateFrom, $dateTo); + $objHotelBookingDetail = new self($roomBookingData['id']); - return $delete; + if (Validate::isLoadedObject($objHotelBookingDetail)) { + return $objHotelBookingDetail->delete(); + } + + return false; } public function getRoomBookinInformationForDateRangeByOrder( @@ -1240,79 +1880,92 @@ class HotelBookingDetail extends ObjectModel } public function UpdateHotelCartHotelOrderOnOrderEdit( - $id_order, - $id_room, - $old_date_from, - $old_date_to, - $new_date_from, - $new_date_to, - $new_total_price = null + $idOrder, + $idRoom, + $oldDateFrom, + $oldDateTo, + $newDateFrom, + $newDateTo, + $occupancy, + $newTotalPrice = null ) { - $rowByIdOrderIdRoom = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.(int)$id_room.' AND `id_order`='.(int)$id_order); - $newTotalPriceTE = ''; - $newTotalPriceTI = ''; - $newNumDays = $this->getNumberOfDays($new_date_from, $new_date_to); - if ($new_total_price) { - $newTotalPriceTE = $new_total_price['tax_excl']; - $newTotalPriceTI = $new_total_price['tax_incl']; - } else { - $oldNumDays = $this->getNumberOfDays($old_date_from, $old_date_to); - $unitRoomPriceTE = $rowByIdOrderIdRoom['total_price_tax_excl'] / $oldNumDays; - $unitRoomPriceTI = $rowByIdOrderIdRoom['total_price_tax_incl'] / $oldNumDays; - $newTotalPriceTE = $unitRoomPriceTE * $newNumDays; - $newTotalPriceTI = $unitRoomPriceTI * $newNumDays; - } + // retrieve HotelBookingDetail row + $roomBookingData = $this->getRoomBookingData($idRoom, $idOrder, $oldDateFrom, $oldDateTo); + $objHotelBookingDetail = new self($roomBookingData['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + // retrieve HotelCartBookingData row + $idHotelCartBookingData = Db::getInstance()->getValue( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE date_from = "'.pSQL($oldDateFrom).'" AND date_to = "'.pSQL($oldDateTo).'" + AND id_room = '.(int) $idRoom.' AND `id_order` = '.(int) $idOrder + ); - // update `total_paid_amount` on database - $totalPaidAmount = 0; - $isAdvancePayment = Db::getInstance()->getValue( - 'SELECT o.`is_advance_payment` - FROM `'._DB_PREFIX_.'orders` o - WHERE o.`id_order` = '.(int) $id_order - ); + $objHotelCartBookingData = new HotelCartBookingData($idHotelCartBookingData); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + // calculate new prices + $newTotalPriceTE = ''; + $newTotalPriceTI = ''; + $newNumDays = $this->getNumberOfDays($newDateFrom, $newDateTo); + if ($newTotalPrice) { + $newTotalPriceTE = $newTotalPrice['tax_excl']; + $newTotalPriceTI = $newTotalPrice['tax_incl']; + } else { + $oldNumDays = $this->getNumberOfDays($oldDateFrom, $oldDateTo); + $unitRoomPriceTE = $objHotelBookingDetail->total_price_tax_excl / $oldNumDays; + $unitRoomPriceTI = $objHotelBookingDetail->total_price_tax_incl / $oldNumDays; + $newTotalPriceTE = $unitRoomPriceTE * $newNumDays; + $newTotalPriceTI = $unitRoomPriceTI * $newNumDays; + } - if ($isAdvancePayment) { - $objHotelAdvancedPayment = new HotelAdvancedPayment(); - $productAdvancePayment = $objHotelAdvancedPayment->getIdAdvPaymentByIdProduct($rowByIdOrderIdRoom['id_product']); - - if (!$productAdvancePayment || (isset($productAdvancePayment['payment_type']) && $productAdvancePayment['payment_type'])) { - $totalPaidAmount = $objHotelAdvancedPayment->getRoomMinAdvPaymentAmount( - $rowByIdOrderIdRoom['id_product'], - $new_date_from, - $new_date_to + // calculate `total_paid_amount` + $totalPaidAmount = 0; + $isAdvancePayment = Db::getInstance()->getValue( + 'SELECT o.`is_advance_payment` + FROM `'._DB_PREFIX_.'orders` o + WHERE o.`id_order` = '.(int) $idOrder ); + + if ($isAdvancePayment) { + $objHotelAdvancedPayment = new HotelAdvancedPayment(); + $productAdvancePayment = $objHotelAdvancedPayment->getIdAdvPaymentByIdProduct($objHotelBookingDetail->id_product); + + if (!$productAdvancePayment || (isset($productAdvancePayment['payment_type']) && $productAdvancePayment['payment_type'])) { + $totalPaidAmount = $objHotelAdvancedPayment->getRoomMinAdvPaymentAmount( + $objHotelBookingDetail->id_product, + $newDateFrom, + $newDateTo + ); + } + } else { + $totalPaidAmount = $newTotalPriceTI; + } + + // update $objHotelCartBookingData + $objHotelCartBookingData->date_from = $newDateFrom; + $objHotelCartBookingData->date_to = $newDateTo; + $objHotelCartBookingData->quantity = $newNumDays; + $objHotelCartBookingData->adults = $occupancy['adults']; + $objHotelCartBookingData->children = $occupancy['children']; + $objHotelCartBookingData->child_ages = json_encode($occupancy['child_ages']); + + // update $objHotelBookingDetail + $objHotelBookingDetail->date_from = $newDateFrom; + $objHotelBookingDetail->date_to = $newDateTo; + $objHotelBookingDetail->total_price_tax_excl = Tools::ps_round($newTotalPriceTE, 6); + $objHotelBookingDetail->total_price_tax_incl = Tools::ps_round($newTotalPriceTI, 6); + $objHotelBookingDetail->total_paid_amount = Tools::ps_round($totalPaidAmount, 6); + $objHotelBookingDetail->adults = $occupancy['adults']; + $objHotelBookingDetail->children = $occupancy['children']; + $objHotelBookingDetail->child_ages = json_encode($occupancy['child_ages']); + + if ($objHotelCartBookingData->save() && $objHotelBookingDetail->save()) { + return true; + } } - } else { - $totalPaidAmount = $newTotalPriceTI; } - $cart_booking = array( - 'table' => 'htl_cart_booking_data', - 'data' => array( - 'date_from' => $new_date_from, - 'date_to' => $new_date_to, - 'quantity' => $newNumDays, - ), - ); - - $booking_detail = array( - 'table' => 'htl_booking_detail', - 'data' => array( - 'date_from' => $new_date_from, - 'date_to' => $new_date_to, - 'total_price_tax_excl' => $newTotalPriceTE, - 'total_price_tax_incl' => $newTotalPriceTI, - 'total_paid_amount' => $totalPaidAmount, - ), - ); - - $where = 'id_order = '.(int)$id_order.' AND id_room = '.(int)$id_room.' AND date_from= \''.pSQL($old_date_from). - '\' AND date_to = \''.pSQL($old_date_to).'\' AND `is_refunded`=0 AND `is_back_order`=0'; - - $result = Db::getInstance()->update($cart_booking['table'], $cart_booking['data'], $where); - $result &= Db::getInstance()->update($booking_detail['table'], $booking_detail['data'], $where); - - return $result; + return false; } /** @@ -1374,6 +2027,8 @@ class HotelBookingDetail extends ObjectModel $order_detail_data[$key]['feature_price_diff'] = (float)($order_detail_data[$key]['unit_price_without_reduction_tax_incl'] - $order_detail_data[$key]['paid_unit_price_tax_incl']); + $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'])) { $order_detail_data[$key]['refund_info'] = reset($refundInfo); @@ -1632,8 +2287,8 @@ class HotelBookingDetail extends ObjectModel $date_to = date("Y-m-d", strtotime($params['date_to'])); $id_product = $params['id_room_type']; - $obj_booking_dtl = new HotelBookingDetail(); - $num_day = $obj_booking_dtl->getNumberOfDays($date_from, $date_to); //quantity of product + $objBookingDetail = new HotelBookingDetail(); + $num_day = $objBookingDetail->getNumberOfDays($date_from, $date_to); //quantity of product $product = new Product($id_product, false, Configuration::get('PS_LANG_DEFAULT')); $obj_room_type = new HotelRoomType(); $room_info_by_id_product = $obj_room_type->getRoomTypeInfoByIdProduct($id_product); @@ -1652,8 +2307,17 @@ class HotelBookingDetail extends ObjectModel } } /*END*/ - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, $id_product, 1, 0, 0, -1, 0, 0, $id_cart, $this->context->cookie->id_guest); + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $this->context->cookie->id_guest, + ); + $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams); $total_available_rooms = $hotel_room_data['stats']['num_avail']; if ($total_available_rooms < $params['req_qty']) { @@ -1678,7 +2342,7 @@ class HotelBookingDetail extends ObjectModel $id_customer = $this->context->cart->id_customer; $id_currency = $this->context->cart->id_currency; - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; + $hotel_room_info_arr = $hotel_room_data['rm_data'][$id_product]['data']['available']; $chkQty = 0; foreach ($hotel_room_info_arr as $key_hotel_room_info => $val_hotel_room_info) { if ($chkQty < $params['req_qty']) { @@ -1719,37 +2383,105 @@ class HotelBookingDetail extends ObjectModel } } - public function deleteHotelOrderInfo($id_order) + public function deleteHotelOrderInfo($idOrder) { - $cartTable = 'htl_cart_booking_data'; - $orderTable = 'htl_booking_detail'; - $condition = 'id_order = '.(int)$id_order; - if (Db::getInstance()->delete($orderTable, $condition)) { - return Db::getInstance()->delete($cartTable, $condition); + $result = true; + $objHotelCartBookingData = new HotelCartBookingData(); + $bookingsCartData = $objHotelCartBookingData->getCartCurrentDataByOrderId($idOrder); + if (is_array($bookingsCartData) && count($bookingsCartData)) { + foreach ($bookingsData as $bookingCartData) { + $objHotelCartBookingData = new HotelCartBookingData($bookingCartData['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $result &= $objHotelCartBookingData->delete(); + } + } } - return false; + + $bookingsData = $this->getBookingDataByOrderId($idOrder); + if (is_array($bookingsData) && count($bookingsData)) { + foreach ($bookingsData as $bookingData) { + $objHotelBookingDetail = new self($bookingData['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + $result &= $objHotelBookingDetail->delete(); + } + } + } + + return $result; } - public function deleteHotelOrderRoomInfo($id_order, $id_product, $id_room) + public function deleteHotelOrderRoomInfo($idOrder, $idProduct, $idRoom) { - $cartTable = 'htl_cart_booking_data'; - $orderTable = 'htl_booking_detail'; - $condition = 'id_order = '.(int)$id_order.' AND id_product = '.(int)$id_product.' AND id_room = '.(int)$id_room; - if (Db::getInstance()->delete($orderTable, $condition)) { - return Db::getInstance()->delete($cartTable, $condition); + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_order` = '.(int) $idOrder.' AND `id_product` = '.(int) $idProduct.' + AND `id_room` = '.(int) $idRoom + ); + + $return = true; + if (is_array($result) && count($result)) { + foreach ($result as $row) { + $objHotelCartBookingData = new HotelCartBookingData($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } } - return false; + + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_booking_detail` + WHERE `id_order` = '.(int) $idOrder.' AND `id_product` = '.(int) $idProduct.' + AND `id_room` = '.(int) $idRoom + ); + + if (is_array($result) && count($result)) { + foreach ($result as $row) { + $objHotelBookingDetail = new self($row['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + $return &= $objHotelBookingDetail->delete(); + } + } + } + + return $return; } - public function deleteHotelOrderRoomTypeInfo($id_order, $id_product) + public function deleteHotelOrderRoomTypeInfo($idOrder, $idProduct) { - $cartTable = 'htl_cart_booking_data'; - $orderTable = 'htl_booking_detail'; - $condition = 'id_order = '.(int)$id_order.' AND id_product = '.(int)$id_product; - if (Db::getInstance()->delete($orderTable, $condition)) { - return Db::getInstance()->delete($cartTable, $condition); + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_order` = '.(int) $idOrder.' AND `id_product` = '.(int) $idProduct + ); + + $return = true; + if (is_array($result) && count($result)) { + foreach ($result as $row) { + $objHotelCartBookingData = new HotelCartBookingData($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } } - return false; + + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_booking_detail` + WHERE `id_order` = '.(int) $idOrder.' AND `id_product` = '.(int) $idProduct + ); + + if (is_array($result) && count($result)) { + foreach ($result as $row) { + $objHotelBookingDetail = new self($row['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + $return &= $objHotelBookingDetail->delete(); + } + } + } + + return $return; } public function enterHotelOrderBookingFormCartBookingData($id_cart) @@ -1801,6 +2533,8 @@ class HotelBookingDetail extends ObjectModel public function updateHotelOrderRoomDurationInfo($id_order, $id_product, $id_room, $update_params) { + Tools::displayAsDeprecated(); + $cartTable = 'htl_cart_booking_data'; $orderTable = 'htl_booking_detail'; $condition = '`id_order` = '.(int)$id_order.' AND `id_product` = '.(int)$id_product. @@ -1845,11 +2579,19 @@ class HotelBookingDetail extends ObjectModel // Add new entry to the table if ($orderDetail->save()) { - return Db::getInstance()->update( - 'htl_booking_detail', - array('id_order_detail' => $orderDetail->id_order_detail), - '`id_order` = '.(int)$id_order.' AND `id_product` = '.(int)$id_product - ); + $bookingsData = self::getOrderInfoIdOrderIdProduct($id_order, $id_product); + if (is_array($bookingsData) && count($bookingsData)) { + $result = true; + foreach ($bookingsData as $bookingData) { + $objHotelBookingDetail = new self($bookingData['id']); + if (Validate::isLoadedObject($objHotelBookingDetail)) { + $objHotelBookingDetail->id_order_detail = $orderDetail->id_order_detail; + $result &= $objHotelBookingDetail->save(); + } + } + + return $result; + } } } return false; @@ -1874,7 +2616,7 @@ class HotelBookingDetail extends ObjectModel public function getRoomBookingData($idRoom, $idOrder, $date_from, $date_to) { - $sql = 'SELECT `id_product`, `id_order_detail`, `id_hotel`, `id_customer`, `booking_type`, `id_status`, `check_in`, `check_out` + $sql = 'SELECT `id`, `id_product`, `id_order_detail`, `id_hotel`, `id_customer`, `booking_type`, `id_status`, `check_in`, `check_out` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int)$idOrder.' AND `id_room`='.(int)$idRoom.' AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`= \''.pSQL($date_to).'\''; @@ -1935,4 +2677,4 @@ class HotelBookingDetail extends ObjectModel Configuration::get('PS_OS_ERROR'), )); } -} +} \ No newline at end of file diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index dd0fb2cf8..501f540ad 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -36,6 +36,9 @@ class HotelCartBookingData extends ObjectModel public $is_back_order; public $date_from; public $date_to; + public $adults; + public $children; + public $child_ages; public $extra_demands; public $date_add; public $date_upd; @@ -59,6 +62,9 @@ class HotelCartBookingData extends ObjectModel 'is_back_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'date_from' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_to' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), + 'adults' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'children' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'child_ages' => array('type' => self::TYPE_STRING), 'extra_demands' => array('type' => self::TYPE_STRING), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -224,9 +230,13 @@ class HotelCartBookingData extends ObjectModel */ public function deleteRowById($id) { - $delete = Db::getInstance()->delete('htl_cart_booking_data', '`id`='.(int) $id); + $objHotelCartBookingData = new self($id); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $objHotelCartBookingData->delete(); + return true; + } - return $delete; + return false; } /** @@ -246,6 +256,25 @@ class HotelCartBookingData extends ObjectModel } } + /** + * [getLastAddedData :: To get booking information of the cart by cart id]. + * + * @param [int] $cart_id [Id of the cart] + * + * @return [array|false] [If data found Returns the array containing the information of the cart of the passed cart id else returns false] + */ + public function getLastAddedData($cart_id) + { + if ($cart_id) { + return Db::getInstance()->getRow(' + SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_cart`='.$cart_id.' ORDER BY `date_add` DESC + '); + } + + return false; + } + /** * [getCartCurrentDataByCartId :: To get booking information of the cart by Order id]. * @@ -289,28 +318,15 @@ class HotelCartBookingData extends ObjectModel * * @return [boolean] [If cart updated with quantity successfully returns true else returns false] */ - public function changeProductDataByRoomId($roomid, $id_product, $days_diff, $cart_id) + public function changeProductDataByRoomId($idRoom, $idProduct, $daysDiff, $idCart) { - $deleted = Db::getInstance()->delete('htl_cart_booking_data', '`id_room` = '.(int) $roomid.' AND `id_cart` = '.(int) $cart_id); + $cartProductQuantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.$idCart.' AND `id_product`='.$idProduct); + $newQuantity = $cartProductQuantity - $daysDiff; - $cart_product_quantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.$cart_id.' AND `id_product`='.$id_product); - - $new_quantity = $cart_product_quantity - $days_diff; - - if ($new_quantity > 0) { - $update_quantity = Db::getInstance()->update('cart_product', array('quantity' => $new_quantity), '`id_cart`='.$cart_id.' AND `id_product`='.$id_product); - if ($update_quantity) { - return true; - } - - return false; + if ($newQuantity > 0) { + return Db::getInstance()->update('cart_product', array('quantity' => $newQuantity), '`id_cart`='.$idCart.' AND `id_product`='.$idProduct); } else { - $delete_product = Db::getInstance()->delete('cart_product', '`id_cart`='.$cart_id.' AND `id_product`='.$id_product); - if ($delete_product) { - return true; - } - - return false; + return Db::getInstance()->delete('cart_product', '`id_cart`='.$idCart.' AND `id_product`='.$idProduct); } } @@ -402,15 +418,164 @@ class HotelCartBookingData extends ObjectModel } } } + // delete rows from table - if (!Db::getInstance()->delete('htl_cart_booking_data', $where)) { - return false; + foreach ($cartBookingInfo as $row) { + $objHotelCartBookingData = new HotelCartBookingData($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $objHotelCartBookingData->delete(); + } } } + // return number of rooms deleted - return true; + return $numRooms; } + public function addCartBookingData( + $id_product, + $occupancy, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $roomsAvailableList, + $id_cart + ) { + $chkQty = 0; + $num_days = HotelHelper::getNumberOfDays($date_from, $date_to); + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $roomsRequired = count($occupancy); + } else { + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); + $roomsRequired = $occupancy; + } + if (Validate::isLoadedObject($objCart = new Cart($id_cart))) { + foreach ($roomsAvailableList as $hotelRoomInfo) { + if ($chkQty < $roomsRequired) { + + $obj_htl_cart_booking_data = new HotelCartBookingData(); + $obj_htl_cart_booking_data->id_cart = $objCart->id; + $obj_htl_cart_booking_data->id_guest = $objCart->id_guest; + $obj_htl_cart_booking_data->id_customer = $objCart->id_customer; + $obj_htl_cart_booking_data->id_currency = $objCart->id_currency; + $obj_htl_cart_booking_data->id_product = $id_product; + $obj_htl_cart_booking_data->id_room = $hotelRoomInfo['id_room']; + $obj_htl_cart_booking_data->id_hotel = $id_hotel; + $obj_htl_cart_booking_data->booking_type = 1; + $obj_htl_cart_booking_data->quantity = $num_days; + $obj_htl_cart_booking_data->extra_demands = $roomDemand; + $obj_htl_cart_booking_data->date_from = $date_from; + $obj_htl_cart_booking_data->date_to = $date_to; + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $room_occupancy = array_shift($occupancy); + $obj_htl_cart_booking_data->adults = $room_occupancy['adults']; + $obj_htl_cart_booking_data->children = $room_occupancy['children']; + $obj_htl_cart_booking_data->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $obj_htl_cart_booking_data->adults = $roomTypeInfo['adults']; + $obj_htl_cart_booking_data->children = $roomTypeInfo['children']; + $obj_htl_cart_booking_data->child_ages = json_encode(array()); + } + $obj_htl_cart_booking_data->save(); + ++$chkQty; + } else { + break; + } + } + return $objCart->updateQty((int)($roomsRequired * $num_days), $id_product); + } else { + return false; + } + } + + public function updateRoomCartBookingData( + $id_product, + $occupancy, + $operator, + $id_hotel = false, + $date_from = false, + $date_to = false, + $roomDemand = array(), + $id_cart = false, + $id_guest = false + ) { + $context = Context::getContext(); + if (!$id_cart) { + $id_cart = $context->cart->id; + } + if (!$id_guest) { + $id_guest = $context->cart->id_guest; + } + + if ($operator == 'up') { + if (!$date_from && !$date_to) { + return false; + } + + if (!$id_hotel) { + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product)) { + if (!$id_hotel = $roomTypeInfo['id_hotel']) { + return false; + } + } + } + $objBookingDtl = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + + if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $roomsRequired = count($occupancy); + } else { + $roomsRequired = $occupancy; + } + + if ($hotelRoomData = $objBookingDtl->dataForFrontSearch($bookingParams)) { + if (isset($hotelRoomData['stats']['num_avail'])) { + $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; + if ($operator == 'up') { + if ($totalAvailableRooms >= $roomsRequired) { + // add rooms to cart + $roomsAvailableList = $hotelRoomData['rm_data'][$id_product]['data']['available']; + return $this->addCartBookingData( + $id_product, + $occupancy, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $roomsAvailableList, + $id_cart + ); + } else { + return false; + } + } + } else { + return false; + } + } else { + return false; + } + } else { + return $this->deleteCartBookingData( + $id_cart, + $id_product, + 0, + $date_from, + $date_to + ); + } + } /** * [checkExistanceOfRoomInCurrentCart :: To check Whether a room for a date range(which start date is $date_from and End date is $date_to) in current cart is already exists for a customer whose guest id is $id_guest]. * @@ -443,11 +608,19 @@ class HotelCartBookingData extends ObjectModel * * @return [boolean] [Returns true if deleted successfully else returns false] */ - public function deleteCartDataByIdProductIdCart($id_cart, $id_product, $date_from, $date_to) + public function deleteCartDataByIdProductIdCart($idCart, $idProduct, $dateFrom, $dateTo) { - $result = Db::getInstance()->delete('htl_cart_booking_data', '`id_cart`='.$id_cart.' AND `id_product`='.$id_product." AND `date_from` = '$date_from' AND `date_to` = '$date_to'"); - if ($result) { - return true; + $result = $this->getHotelCartRoomsInfoByRoomType($idCart, $idProduct, $dateFrom, $dateTo); + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new self($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } + + return $return; } return false; @@ -478,15 +651,20 @@ class HotelCartBookingData extends ObjectModel $this->context = Context::getContext(); $update_quantity = $this->context->cart->updateQty($qty, $id_product, null, false, 'down'); - $delete_rooms = Db::getInstance()->delete('htl_cart_booking_data', '`id_cart`='.$id_cart.' AND `id_guest`='.$id_guest.' AND `id_product`='.$id_product." AND `date_from`= '$date_from' AND `date_to`= '$date_to'"); - if ($delete_rooms) { - return true; + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new self($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } } - return false; - } else { - return false; + return $return; } + + return false; } /** @@ -498,34 +676,22 @@ class HotelCartBookingData extends ObjectModel */ public function deleteBookingCartDataNotOrderedByProductId($id_product) { - return Db::getInstance()->delete( - 'htl_cart_booking_data', - '`id_product`='.(int) $id_product.' AND `id_order`= 0' + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_product`='.(int) $id_product.' AND `id_order`= 0' ); - } - /** - * [updateOrderRefundStatus :: To update the refund status of a room booked in the Cart(htl_cart_booking_data) if amount refunded by the admin]. - * - * @param [int] $id_cart [Id of the Cart] - * @param [date] $date_from [start date of the bookin of the room] - * @param [date] $date_to [end date of the bookin of the room] - * @param [int] $id_room [id of the room for which refund is done] - * - * @return [boolean] [true if updated otherwise false] - */ - public function updateOrderRefundStatus($id_cart, $date_from, $date_to, $id_rooms) - { - $table = 'htl_cart_booking_data'; - $data = array('is_refunded' => 1); + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new self($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } - foreach ($id_rooms as $key_rm => $val_rm) { - $where = '`id_cart` = '.$id_cart.' AND `id_room` = '.$val_rm['id_room']." AND `date_from` = '$date_from' AND `date_to` = '$date_to'"; - $result = Db::getInstance()->update($table, $data, $where); - } - - if ($result) { - return $result; + return $return; } return false; @@ -564,7 +730,7 @@ class HotelCartBookingData extends ObjectModel return false; } - $dltdata = false; + $dltdata = ''; $stringArr = array('date_from', 'date_to'); @@ -579,9 +745,26 @@ class HotelCartBookingData extends ObjectModel $dltdata .= $c_key.' = '.$c_val; } } - $delete = Db::getInstance()->delete('htl_cart_booking_data', $dltdata); - return $delete; + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE '.$dltdata + ); + + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new self($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } + + return $return; + } + + return false; } /** @@ -598,7 +781,7 @@ class HotelCartBookingData extends ObjectModel return false; } - $where = false; + $where = ''; $stringArr = array('date_from', 'date_to'); foreach ($updBy as $u_key => $u_val) { if ($where) { @@ -611,9 +794,30 @@ class HotelCartBookingData extends ObjectModel $where .= $u_key.' = '.$u_val; } } - $update = Db::getInstance()->update('htl_cart_booking_data', $updData, $where); + // $update = Db::getInstance()->update('htl_cart_booking_data', $updData, $where); + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE '.$where + ); - return $update; + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new self($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + foreach ($updData as $key => $value) { + $objHotelCartBookingData->$key = $value; + } + + $return &= $objHotelCartBookingData->save(); + } + } + + return $return; + } + + return true; } /** @@ -643,6 +847,8 @@ class HotelCartBookingData extends ObjectModel $cart_detail_data[$key]['date_from'] = $value['date_from']; $cart_detail_data[$key]['date_to'] = $value['date_to']; + $cart_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); + $unit_price = Product::getPriceStatic($value['id_product'], true); $unit_price_tax_excl = Product::getPriceStatic($value['id_product'], false); $productPriceWithoutReduction = $productObj->getPriceWithoutReduct(false); @@ -725,12 +931,26 @@ class HotelCartBookingData extends ObjectModel */ public function updateIdCurrencyByIdCart($id_cart, $id_currency) { - $update_currency = Db::getInstance()->update('htl_cart_booking_data', array('id_currency' => $id_currency), '`id_cart`='.$id_cart); - if ($update_currency) { - return true; + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_cart` = '.(int) $idCart + ); + + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new HotelCartBookingData($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $objHotelCartBookingData->id_currency = $id_currency; + $return &= $objHotelCartBookingData->save(); + } + } + + return $return; } - return false; + return true; } /** @@ -745,9 +965,25 @@ class HotelCartBookingData extends ObjectModel */ public function deleteOrderedRoomFromCart($id_order, $id_hotel, $id_room, $date_from, $date_to) { - $delete = Db::getInstance()->delete('htl_cart_booking_data', '`id_order`='.(int) $id_order.' AND `id_hotel`='.(int) $id_hotel.' AND `id_room`='.(int) $id_room." AND `date_from`='$date_from' AND `date_to`='$date_to'"); + $result = Db::getInstance()->executeS( + 'SELECT `id` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE '.'`id_order`='.(int) $id_order.' AND `id_hotel`='.(int) $id_hotel.' AND `id_room`='.(int) $id_room." AND `date_from`='$date_from' AND `date_to`='$date_to'" + ); - return $delete; + if (is_array($result) && count($result)) { + $return = true; + foreach ($result as $row) { + $objHotelCartBookingData = new HotelCartBookingData($row['id']); + if (Validate::isLoadedObject($objHotelCartBookingData)) { + $return &= $objHotelCartBookingData->delete(); + } + } + + return $return; + } + + return true; } /** @@ -877,7 +1113,7 @@ class HotelCartBookingData extends ObjectModel ); $unitPriceWithoutReduction = $objProduct->getPriceWithoutReduct(!$price_tax); - $cartHotelData[$prodKey]['adult'] = $roomDetail['adult']; + $cartHotelData[$prodKey]['adults'] = $roomDetail['adults']; $cartHotelData[$prodKey]['children'] = $roomDetail['children']; $cartHotelData[$prodKey]['total_num_rooms'] = 0; $cartHotelData[$prodKey]['id_product'] = $product['id_product']; @@ -939,7 +1175,6 @@ class HotelCartBookingData extends ObjectModel $cartHotelData[$prodKey]['hotel_info'] = $hotelInfo; } } - if (isset($context->customer->id)) { $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( $context->cart->id, @@ -953,6 +1188,7 @@ class HotelCartBookingData extends ObjectModel $product['id_product'] ); } + if (isset($cartBookingDetails) && $cartBookingDetails) { foreach ($cartBookingDetails as $data_k => $data_v) { $dateJoin = strtotime($data_v['date_from']).strtotime($data_v['date_to']); @@ -970,8 +1206,12 @@ class HotelCartBookingData extends ObjectModel $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] += $demandPrice; $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] += 1; $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['adults'] += $data_v['adults']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['children'] += $data_v['children']; + if (is_array($data_v['child_ages'])) { + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'] = array_merge($cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'], json_decode($data_v['child_ages'])); + } $varQty = (int) $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm']; - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $product['id_product'], $data_v['date_from'], @@ -996,6 +1236,10 @@ class HotelCartBookingData extends ObjectModel strtotime($data_v['date_to']) ); $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['adults'] = $data_v['adults']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['children'] = $data_v['children']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'] = json_decode($data_v['child_ages']); + $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $product['id_product'], $data_v['date_from'], @@ -1041,7 +1285,6 @@ class HotelCartBookingData extends ObjectModel } } } - return $cartHotelData; } diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 50bc7b602..d390a60b7 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -217,6 +217,9 @@ class HotelHelper Configuration::updateValue('WK_ADVANCED_PAYMENT_GLOBAL_MIN_AMOUNT', 10); Configuration::updateValue('WK_ADVANCED_PAYMENT_INC_TAX', 1); + Configuration::updateValue('WK_GLOBAL_CHILD_MAX_AGE', 15); + Configuration::updateValue('WK_GLOBAL_MAX_CHILD_IN_ROOM', 3); + Configuration::updateValue( 'MAX_GLOBAL_BOOKING_DATE', date('d-m-Y', strtotime(date('Y-m-d', time()).' + 1 year')) @@ -250,6 +253,14 @@ class HotelHelper Configuration::updateValue('WK_HTL_TAG_LINE', $WK_HTL_TAG_LINE); Configuration::updateValue('WK_HTL_SHORT_DESC', $WK_HTL_SHORT_DESC); + // Search Fields + Configuration::updateValue('PS_FRONT_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS); + Configuration::updateValue('PS_FRONT_OWS_SEARCH_ALGO_TYPE', HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO); + Configuration::updateValue('PS_FRONT_ROOM_UNIT_SELECTION_TYPE', HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY); + Configuration::updateValue('PS_BACKOFFICE_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS); + Configuration::updateValue('PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE', HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO); + Configuration::updateValue('PS_BACKOFFICE_ROOM_BOOKING_TYPE', HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY); + return true; } @@ -513,8 +524,12 @@ class HotelHelper $htl_rm_type = new HotelRoomType(); $htl_rm_type->id_product = $product_id; $htl_rm_type->id_hotel = $id_hotel; - $htl_rm_type->adult = 2; + $htl_rm_type->adults = 2; $htl_rm_type->children = 2; + $htl_rm_type->max_adults = 2; + $htl_rm_type->max_children = 2; + $htl_rm_type->max_guests = 4; + $htl_rm_type->save(); // Add features to the product @@ -717,4 +732,31 @@ class HotelHelper } return $randZipCode; } + + /** + * Get Super Admin Of Prestashop + * @return int Super Admin Employee ID + */ + public static function getSupperAdmin() + { + if ($data = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'employee` ORDER BY `id_employee`')) { + foreach ($data as $emp) { + $employee = new Employee($emp['id_employee']); + if ($employee->isSuperAdmin()) { + return $emp['id_employee']; + } + } + } + + return false; + } + + public static function getNumberOfDays($dateFrom, $dateTo) + { + $startDate = new DateTime($dateFrom); + $endDate = new DateTime($dateTo); + $daysDifference = $startDate->diff($endDate)->days; + + return $daysDifference; + } } diff --git a/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php b/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php index 52ce74120..e46d9ae5f 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php @@ -93,7 +93,7 @@ class HotelOrderRestrictDate extends ObjectModel foreach ($cartProducts as $product) { if ($product['active']) { $objCartBookingData = new HotelCartBookingData(); - $obj_htl_bk_dtl = new HotelBookingDetail(); + $objBookingDetail = new HotelBookingDetail(); $obj_rm_type = new HotelRoomType(); if ($cart_bk_data = $objCartBookingData->getOnlyCartBookingData( @@ -145,11 +145,18 @@ class HotelOrderRestrictDate extends ObjectModel $cart_data[$date_join]['id_rms'][] = $data['id_room']; } foreach ($cart_data as $cl_key => $cl_val) { - $avai_rm = $obj_htl_bk_dtl->DataForFrontSearch($cl_val['date_from'], $cl_val['date_to'], $cl_val['id_hotel'], $product['id_product'], 1); + $bookingParams = array( + 'date_from' => $cl_val['date_from'], + 'date_to' => $cl_val['date_to'], + 'hotel_id' => $cl_val['id_hotel'], + 'id_room_type' => $product['id_product'], + 'only_search_data' => 1, + ); + $avai_rm = $objBookingDetail->dataForFrontSearch($bookingParams); $isRmBooked = 0; - if (count($avai_rm['rm_data'][0]['data']['available']) < count($cl_val['id_rms'])) { + if (count($avai_rm['rm_data'][$product['id_product']]['data']['available']) < count($cl_val['id_rms'])) { foreach ($cl_val['id_rms'] as $cr_key => $cr_val) { - if($isRmBooked = $obj_htl_bk_dtl->chechRoomBooked($cr_val, $cl_val['date_from'], $cl_val['date_to'])){ + if($isRmBooked = $objBookingDetail->chechRoomBooked($cr_val, $cl_val['date_from'], $cl_val['date_to'])){ break; } } diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index caf02b2a6..52f6c66f7 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -27,8 +27,11 @@ class HotelReservationSystemDb `id` int(11) NOT NULL AUTO_INCREMENT, `id_product` int(11) NOT NULL, `id_hotel` int(11) NOT NULL, - `adult` smallint(6) NOT NULL, - `children` smallint(6) NOT NULL, + `adults` smallint(6) NOT NULL DEFAULT '2', + `children` smallint(6) NOT NULL DEFAULT '0', + `max_adults` smallint(6) NOT NULL DEFAULT '2', + `max_children` smallint(6) NOT NULL DEFAULT '0', + `max_guests` smallint(6) NOT NULL DEFAULT '2', `min_los` smallint(6) NOT NULL DEFAULT '1', `max_los` smallint(6) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, @@ -127,6 +130,9 @@ class HotelReservationSystemDb `extra_demands` text NOT NULL, `date_from` datetime NOT NULL, `date_to` datetime NOT NULL, + `adults` smallint(6) NOT NULL, + `children` smallint(6) NOT NULL, + `child_ages` text NOT NULL, `is_refunded` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, @@ -164,8 +170,9 @@ class HotelReservationSystemDb `check_in_time` varchar(32) DEFAULT NULL, `check_out_time` varchar(32) DEFAULT NULL, `room_num` varchar(225) DEFAULT NULL, - `adult` smallint(6) NOT NULL DEFAULT '0', + `adults` smallint(6) NOT NULL DEFAULT '0', `children` smallint(6) NOT NULL DEFAULT '0', + `child_ages` text NOT NULL, `is_refunded` tinyint(1) NOT NULL DEFAULT '0', -- `available_for_order` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, @@ -374,6 +381,65 @@ class HotelReservationSystemDb `access` int(11) NOT NULL, PRIMARY KEY (`id_profile`, `id_hotel`) ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", + + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_settings_link` ( + `id_settings_link` int(11) NOT NULL AUTO_INCREMENT, + `icon` varchar(32) character set utf8 NOT NULL, + `link` text NOT NULL, + `new_window` tinyint(1) NOT NULL DEFAULT '0', + `position` int(11) unsigned NOT NULL DEFAULT '0', + `unremovable` tinyint(1) NOT NULL DEFAULT '0', + `active` tinyint(1) NOT NULL, + `date_add` datetime NOT NULL, + `date_upd` datetime NOT NULL, + PRIMARY KEY (`id_settings_link`) + ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link` (`id_settings_link`, `icon`, `link`, `new_window`, `position`, `unremovable`, `active`, `date_add`, `date_upd`) VALUES + (1, 'icon-cogs', 'index.php?controller=AdminHotelGeneralSettings', 0, 0, 1, 1, NOW(), NOW()), + (2, 'icon-list-alt', 'index.php?controller=AdminOrderRestrictSettings', 0, 1, 1, 1, NOW(), NOW()), + (3, 'icon-dollar', 'index.php?controller=AdminHotelFeaturePricesSettings', 0, 2, 1, 1, NOW(), NOW()), + (4, 'icon-plus-square', 'index.php?controller=AdminRoomTypeGlobalDemand', 0, 3, 1, 1, NOW(), NOW()), + (5, 'icon-file-text', 'index.php?controller=AdminAboutHotelBlockSetting', 0, 4, 0, 1, NOW(), NOW()), + (6, 'icon-th-list', 'index.php?controller=AdminFeaturesModuleSetting', 0, 5, 0, 1, NOW(), NOW());", + + "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_settings_link_lang` ( + `id_settings_link` int(10) unsigned NOT NULL, + `id_lang` int(10) unsigned NOT NULL, + `name` varchar(255) character set utf8 NOT NULL, + `hint` varchar(255) character set utf8 NOT NULL, + PRIMARY KEY (`id_settings_link`, `id_lang`) + ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 1, `id_lang`, 'General Settings', 'Configure Your hotel general gettings using this option.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 2, `id_lang`, 'Order Restrict', 'Configure if you want to restrict orders till a specific date for your hotels.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 3, `id_lang`, 'Advanced Price Rules', 'Here set Advanced price rules for specific dates.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 4, `id_lang`, 'Additional Facilities', 'Here create Additional facilities and their prices for room types.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 5, `id_lang`, 'Hotel Interior Block', 'Configure Hotel Interior block. You can display hotel interior images using this block. This block will be displayed on home page.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", + + "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) + SELECT 6, `id_lang`, 'Hotel Amenities Block', 'Configure Hotels Amenities settings. You can display hotel amenities images using this block. This block will be displayed on home page.' + FROM `"._DB_PREFIX_."lang` + ORDER BY `id_lang`;", ); } @@ -424,6 +490,8 @@ class HotelReservationSystemDb `'._DB_PREFIX_.'htl_room_type_demand_price`, `'._DB_PREFIX_.'htl_room_type_demand`, `'._DB_PREFIX_.'htl_room_disable_dates`, + `'._DB_PREFIX_.'htl_settings_link`, + `'._DB_PREFIX_.'htl_settings_link_lang`, `'._DB_PREFIX_.'htl_room_type_restriction_date_range`, `'._DB_PREFIX_.'htl_access`' ); diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 49cde494f..1c793e666 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -23,8 +23,11 @@ class HotelRoomType extends ObjectModel public $id; public $id_product; public $id_hotel; - public $adult; + public $adults; public $children; + public $max_adults; + public $max_children; + public $max_guests; public $min_los; public $max_los; public $date_add; @@ -36,8 +39,11 @@ class HotelRoomType extends ObjectModel 'fields' => array( 'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), - 'adult' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'adults' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'children' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'max_adults' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 2), + 'max_children' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'max_guests' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 2), 'min_los' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 1), 'max_los' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 0), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -99,7 +105,7 @@ class HotelRoomType extends ObjectModel $objHotelRoomType = new HotelRoomType(); $objHotelRoomType->id_product = $idProductNew; $objHotelRoomType->id_hotel = $idHotelNew; - $objHotelRoomType->adult = $roomType['adult']; + $objHotelRoomType->adults = $roomType['adults']; $objHotelRoomType->children = $roomType['children']; if ($objHotelRoomType->save()) { $objHotelRoomType->updateCategories(); @@ -220,8 +226,7 @@ class HotelRoomType extends ObjectModel if (!$idLang) { $idLang = Context::getContext()->language->id; } - - $sql = 'SELECT hrt.`id`,hrt.`id_hotel`, hrt.`adult`, hrt.`children`, hbl.`hotel_name`, hrt.`min_los`, hrt.`max_los` + $sql = 'SELECT hrt.*, hbl.`hotel_name` FROM `'._DB_PREFIX_.'htl_room_type` AS hrt INNER JOIN `'._DB_PREFIX_.'htl_branch_info_lang` AS hbl ON (hbl.`id` = hrt.`id_hotel` AND hbl.`id_lang` = '.(int)$idLang.') @@ -268,26 +273,40 @@ class HotelRoomType extends ObjectModel return Db::getInstance()->executeS($sql); } + /** + * @param [int] $roomTypesList: string of idRoomTypes seperated by "," + */ + public function getRoomTypeDetailByRoomTypeIds($roomTypesList) + { + $sql = 'SELECT COUNT(hri.`id`) AS `numberOfRooms`, hrt.`id_product`, `adults`, `children`, `max_adults`, `max_children`, `max_guests` + FROM `'._DB_PREFIX_.'htl_room_type` AS `hrt` + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS `hri` ON (hri.`id_product` = hrt.`id_product`) + WHERE hrt.`id_product` IN ('.$roomTypesList.') + GROUP BY hrt.`id_product`'; + + return Db::getInstance()->executeS($sql); + } + /** * [getIdProductByHotelId :: if (0) * { - * returns array containing all rooms types information belongs to the hotel which id is passed as $hotel_id + * returns array containing all rooms types information belongs to the hotel which id is passed as $idHotel * } * else * { - * returns array containing rooms type information which produt_id=$room_type belongs to the hotel which id is passed as $hotel_id + * returns array containing rooms type information which produt_id=$idRoomType belongs to the hotel which id is passed as $idHotel * }]. * - * @param [type] $hotel_id [Id of the hotel ] - * @param [int] $room_type [ + * @param [type] $idHotel [Id of the hotel ] + * @param [int] $idRoomType [ * Id of the product * if (0) * { - * returns array containing all rooms types information belongs to the hotel which id is passed as $hotel_id + * returns array containing all rooms types information belongs to the hotel which id is passed as $idHotel * } * else * { - * returns array containing rooms type information which produt_id=$room_type belongs to the hotel which id is passed as $hotel_id + * returns array containing rooms type information which produt_id=$idRoomType belongs to the hotel which id is passed as $idHotel * } * ] * @param [1|0] $onlyActiveProd [1 for only active products data and 0 for all products data] @@ -295,10 +314,10 @@ class HotelRoomType extends ObjectModel * * @return [array|false] [If data found returns array containing information of the room types else returns false ] */ - public function getIdProductByHotelId($hotel_id, $room_type = 0, $onlyActiveProd = 0, $onlyActiveHotel = 0) + public function getIdProductByHotelId($idHotel, $idRoomType = 0, $onlyActiveProd = 0, $onlyActiveHotel = 0) { - $sql = 'SELECT DISTINCT hrt.`id_product`, hrt.`adult`, hrt.`children`, hrt.`id` FROM `'._DB_PREFIX_. - 'htl_room_type` AS hrt '; + $sql = 'SELECT DISTINCT hrt.`id_product`, hrt.`adults`, hrt.`children`, hrt.`id` + FROM `'._DB_PREFIX_.'htl_room_type` AS hrt '; if ($onlyActiveHotel) { $sql .= 'INNER JOIN `'._DB_PREFIX_.'htl_branch_info` AS hti ON (hti.id = hrt.id_hotel AND hti.active = 1)'; @@ -306,18 +325,15 @@ class HotelRoomType extends ObjectModel if ($onlyActiveProd) { $sql .= 'INNER JOIN `'._DB_PREFIX_.'product` AS pp ON (hrt.id_product = pp.id_product AND pp.active = 1)'; } - $sql .= 'WHERE hrt.`id_hotel`='.$hotel_id; + $sql .= 'WHERE hrt.`id_hotel`='. (int)$idHotel; - if ($room_type) { - $sql .= ' AND hrt.`id_product` ='.$room_type; + if ($idRoomType) { + $sql .= ' AND hrt.`id_product` = '. (int)$idRoomType; } - $rm_type = Db::getInstance()->executeS($sql); - if ($rm_type) { - return $rm_type; - } - return false; + return Db::getInstance()->executeS($sql); } + /** * [getMaxAdults :: To get Maximum number of adults can be in a room type for a hotel]. * @@ -327,7 +343,7 @@ class HotelRoomType extends ObjectModel */ public static function getMaxAdults($id_hotel) { - $sql = 'SELECT MAX(adult) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel; + $sql = 'SELECT MAX(adults) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel; $max_adult = Db::getInstance()->getValue($sql); diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index e5d235806..9d49185bc 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -269,18 +269,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $currentDate = date('Y-m-d', $date); $nextDayDate = date('Y-m-d', strtotime('+1 day', strtotime($currentDate))); if ($id_product) { - $roomTypeAvailabilityInfo = $objBookingDetail->DataForFrontSearch( - $currentDate, - $nextDayDate, - $id_hotel, - $id_product, - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $currentDate, + 'date_to' => $nextDayDate, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $objBookingDetail->dataForFrontSearch($bookingParams); if (isset($roomTypeAvailabilityInfo['stats']['num_avail'])) { $totalAvailableRooms = $roomTypeAvailabilityInfo['stats']['num_avail']; } else { @@ -302,18 +298,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $currentDate, $nextDayDate ); - $roomTypeAvailabilityInfo = $objBookingDetail->DataForFrontSearch( - $currentDate, - $nextDayDate, - $id_hotel, - $product['id_product'], - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $currentDate, + 'date_to' => $nextDayDate, + 'hotel_id' => $id_hotel, + 'id_room_type' => $product['id_product'], + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $objBookingDetail->dataForFrontSearch($bookingParams); if (isset($roomTypeAvailabilityInfo['stats']['num_avail'])) { $totalAvailableRooms = $roomTypeAvailabilityInfo['stats']['num_avail']; } else { @@ -454,18 +446,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $roomTypeInfo = $hotelRoomType->getRoomTypeInfoByIdProduct($id_product); $id_hotel = $roomTypeInfo['id_hotel']; if ($id_hotel) { - $roomTypeAvailabilityInfo = $hotelBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $id_hotel, - $id_product, - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $hotelBookingDetail->dataForFrontSearch($bookingParams); $bookedRoomsInfo = $hotelRoomInformation->getRoomTypeBookedRoomsForDateRange( $id_hotel, $id_product, diff --git a/modules/hotelreservationsystem/classes/HotelSettingsLink.php b/modules/hotelreservationsystem/classes/HotelSettingsLink.php new file mode 100644 index 000000000..c59ed9ebe --- /dev/null +++ b/modules/hotelreservationsystem/classes/HotelSettingsLink.php @@ -0,0 +1,148 @@ + 'htl_settings_link', + 'primary' => 'id_settings_link', + 'multilang' => true, + 'fields' => array( + 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'lang' => true, 'required' => true), + 'hint' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'lang' => true, 'required' => true), + 'icon' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'required' => true), + 'link' => array('type' => self::TYPE_STRING, 'validate' => 'isUrl', 'required' => true), + 'new_window' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'unremovable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), + 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false), + 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false), + ), + ); + + public function getAllSettingsLinks($active = true) + { + return Db::getInstance()->executeS( + 'SELECT * FROM `'._DB_PREFIX_.'htl_settings_link` hsl + LEFT JOIN `'._DB_PREFIX_.'htl_settings_link_lang` hsll + ON (hsll.`id_settings_link` = hsl.`id_settings_link` AND hsll.`id_lang` = '.(int) Context::getContext()->language->id.') + WHERE hsl.`active` = '.(int) $active.' + ORDER BY hsl.`position`' + ); + } + + public function generateLink($link = null, $id_employee = null) + { + if ($link) { + $this->link = $link; + } + + $context = Context::getContext(); + if ($this->link == '../') { + return $context->shop->getBaseURL(); + } else { + preg_match('/controller=(.+)(&.+)?$/', $this->link, $adminTab); + if (isset($adminTab[1])) { + if (strpos($adminTab[1], '&')) { + $adminTab[1] = substr($adminTab[1], 0, strpos($adminTab[1], '&')); + } + + $token = Tools::getAdminToken($adminTab[1].(int) Tab::getIdFromClassName($adminTab[1]).(int) ($id_employee ? $id_employee : $context->employee->id)); + return $link.'&token='.$token; + } + } + + return $link; + } + + public function getUnremovableLinks() + { + return Db::getInstance()->executeS( + 'SELECT * + FROM `'._DB_PREFIX_.'htl_settings_link` hsl + WHERE hsl.`unremovable` = 1' + ); + } + + public function getHigherPosition() + { + $position = Db::getInstance()->getValue( + 'SELECT MAX(`position`) FROM `'._DB_PREFIX_.'htl_settings_link`' + ); + + $result = (is_numeric($position)) ? $position : -1; + + return $result + 1; + } + + public function updatePosition($way, $position) + { + if (!$result = Db::getInstance()->executeS( + 'SELECT hsl.`id_settings_link`, hsl.`position` + FROM `'._DB_PREFIX_.'htl_settings_link` hsl + WHERE hsl.`id_settings_link` = '.(int) $this->id.' ORDER BY `position` ASC') + ) { + return false; + } + + $movedBlock = false; + foreach ($result as $block) { + if ((int)$block['id_settings_link'] == (int) $this->id) { + $movedBlock = $block; + } + } + + if ($movedBlock === false) { + return false; + } + + return (Db::getInstance()->execute( + 'UPDATE `'._DB_PREFIX_.'htl_settings_link` SET `position`= `position` '.($way ? '- 1' : '+ 1'). + ' WHERE `position`'.($way ? '> '. + (int) $movedBlock['position'].' AND `position` <= '.(int) $position : '< ' + .(int) $movedBlock['position'].' AND `position` >= '.(int) $position) + ) && Db::getInstance()->execute( + 'UPDATE `'._DB_PREFIX_.'htl_settings_link` + SET `position` = '.(int) $position.' + WHERE `id_settings_link`='.(int) $movedBlock['id_settings_link'] + )); + } + + public function cleanPositions() + { + Db::getInstance()->execute('SET @i = -1', false); + $sql = 'UPDATE `'._DB_PREFIX_.'htl_settings_link` SET `position` = @i:=@i+1 ORDER BY `position` ASC'; + + return Db::getInstance()->execute($sql); + } +} \ No newline at end of file diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 4f032457d..fd3805b51 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -216,6 +216,7 @@ class AdminAddHotelController extends ModuleAdminController $longitude = Tools::getValue('loclongitude'); $map_formated_address = Tools::getValue('locformatedAddr'); $map_input_text = Tools::getValue('googleInputField'); + // check if field is atleast in default language. Not available in default prestashop $defaultLangId = Configuration::get('PS_LANG_DEFAULT'); $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php index 9680cf5e4..84368f047 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php @@ -2,36 +2,339 @@ class AdminHotelConfigurationSettingController extends ModuleAdminController { + protected $position_identifier = 'id_settings_link'; + public function __construct() { - $this->table = 'configuration'; - $this->className = 'Configuration'; + $this->table = 'htl_settings_link'; + $this->identifier = 'id_settings_link'; + $this->className = 'HotelSettingsLink'; + $this->_defaultOrderBy = 'position'; + $this->lang = true; $this->bootstrap = true; - if (!($obj = $this->loadObject(true))) { - return; - } - $this->toolbar_title = $this->l('Manage Hotel Settings'); + $this->list_no_link = true; + parent::__construct(); + + $this->addRowAction('edit'); + $this->addRowAction('delete'); + + $this->bulk_actions = array( + 'enableSelection' => array( + 'text' => $this->l('Enable selection'), + 'icon' => 'icon-power-off text-success' + ), + 'disableSelection' => array( + 'text' => $this->l('Disable selection'), + 'icon' => 'icon-power-off text-danger' + ), + 'divider' => array( + 'text' => 'divider' + ), + 'delete' => array( + 'text' => $this->l('Delete selected'), + 'confirm' => $this->l('Delete selected items?'), + 'icon' => 'icon-trash' + ) + ); + + $this->fields_list = array( + 'id_settings_link' => array( + 'title' => $this->l('ID'), + 'hint' => $this->l('ID of the settings link.'), + 'align' => 'center', + 'class' => 'fixed-width-xs', + ), + 'name' => array( + 'title' => $this->l('Name'), + 'hint' => $this->l('Name of the settings link.'), + 'align' => 'left', + 'class' => 'fixed-width-xxl', + ), + 'link' => array( + 'title' => $this->l('Link'), + 'hint' => $this->l('Link of the page where admin is redirected.'), + 'align' => 'left', + 'callback' => 'displayColumnLink', + ), + 'icon' => array( + 'title' => $this->l('Icon'), + 'hint' => $this->l('Icon of the settings link.'), + 'align' => 'center', + 'callback' => 'displayColumnIcon', + ), + 'new_window' => array( + 'title' => $this->l('New Window'), + 'hint' => $this->l('Active if link is opened in a new window.'), + 'align' => 'center', + 'active' => 'new_window', + 'ajax' => true, + 'orderby' => false, + 'type' => 'bool', + 'class' => 'fixed-width-sm', + ), + 'position' => array( + 'title' => $this->l('Position'), + 'filter_key' => 'a!position', + 'position' => 'position', + 'align' => 'center', + 'class' => 'fixed-width-md', + ), + 'active' => array( + 'title' => $this->l('Status'), + 'hint' => $this->l('Current status of the settings link.'), + 'type' => 'bool', + 'active' => 'status', + 'align' => 'center', + 'class' => 'fixed-width-lg', + 'filter_key' => 'a!active', + ), + ); + } + + public function displayColumnIcon($icon) + { + $tpl = $this->context->smarty->createTemplate( + $this->module->getLocalPath().'views/templates/admin/'.$this->tpl_folder.'helpers/list/link-icon.tpl' + ); + + $tpl->assign('icon', $icon); + + return $tpl->fetch(); + } + + public function displayColumnLink($link) + { + $this->loadObject(true); + $tpl = $this->context->smarty->createTemplate( + $this->module->getLocalPath().'views/templates/admin/'.$this->tpl_folder.'helpers/list/link-page.tpl' + ); + + $tpl->assign(array( + 'saved_link' => $link, + 'generated_link' => $this->object->generateLink($link), + )); + + return $tpl->fetch(); + } + + public function initToolbar() + { + parent::initToolbar(); + if ($this->display == 'view') { + $this->toolbar_title = $this->l('Hotel Settings'); + $this->page_header_toolbar_btn['manage_links'] = array( + 'icon' => 'process-icon-cogs', + 'href' => self::$currentIndex.'&display=list&token='.$this->token, + 'desc' => $this->l('Manage links'), + ); + } elseif ($this->display == 'list') { + $this->page_header_toolbar_title = $this->l('Settings Links'); + $this->page_header_toolbar_btn['new'] = array( + 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, + 'desc' => $this->l('Add new link'), + ); + } } public function initContent() { - $this->show_toolbar = false; - $this->display = 'view'; + if (!$this->ajax) { + if (Tools::getValue('display') == 'list') { + $this->display = 'list'; + } elseif (empty($this->display) + && !Tools::isSubmit('submitFilter'.$this->table) + ) { + $this->display = 'view'; + } + } + parent::initContent(); } + public function renderList() + { + $this->context->smarty->assign('icon', 'icon-list'); + $this->toolbar_title = $this->l('Settings Links'); + + $this->loadObject(true); + $unremovableLinks = $this->object->getUnremovableLinks(); + if (is_array($unremovableLinks) && count($unremovableLinks)) { + $ids = array(); + foreach ($unremovableLinks as $unremovableLink) { + $ids[] = $unremovableLink['id_settings_link']; + } + $this->addRowActionSkipList('delete', $ids); + } + + return parent::renderList(); + } + + public function renderForm() + { + $smartyVars = array(); + $idSettingsLink = (int) Tools::getValue($this->identifier); + $objHotelSettingsLink = $this->loadObject(true); + + $smartyVars['id_hotel_settings_link'] = $idSettingsLink; + $smartyVars['currentTab'] = $this; + $smartyVars['currentObject'] = $objHotelSettingsLink; + + $this->fields_form = $this->getFieldsForm(); + $this->context->smarty->assign($smartyVars); + + return parent::renderForm(); + } + + public function getFieldsForm() + { + $fields_form = array(); + + $fields_form[] = array( + 'form' => array( + 'submit' => array( + 'title' => $this->l('Save'), + 'name' => 'submitHotelSettingsLink', + 'class' => 'btn btn-default pull-right', + ), + ), + ); + + return $fields_form; + } + public function renderView() { + $settingsLinks = $this->object->getAllSettingsLinks(); + foreach ($settingsLinks as $index => &$settingsLink) { + $settingsLink['generated_link'] = $this->object->generateLink($settingsLink['link']); + } + $this->tpl_view_vars = array( - 'feature_price_setting_link' => $this->context->link->getAdminLink('AdminHotelFeaturePricesSettings'), - 'general_setting_link' => $this->context->link->getAdminLink('AdminHotelGeneralSettings'), - 'additional_demand_setting_link' => $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand'), + 'settings_links' => $settingsLinks, ); return parent::renderView(); } + public function postProcess() + { + if (Tools::isSubmit('submitHotelSettingsLink') || Tools::isSubmit('submitHotelSettingsLinkAndStay')) { + $idHotelSettingsLink = Tools::getValue($this->identifier); + $this->validateRules(); + + if (is_array($this->errors) && !count($this->errors)) { + $objHotelSettingsLink = new HotelSettingsLink($idHotelSettingsLink); + $this->copyFromPost($objHotelSettingsLink, $this->table); + if (!$idHotelSettingsLink) { + $objHotelSettingsLink->position = $objHotelSettingsLink->getHigherPosition(); + } + if ($objHotelSettingsLink->save()) { + $newId = $objHotelSettingsLink->id; + + if (is_array($this->errors) && !count($this->errors)) { + if (Tools::isSubmit('submitHotelSettingsLinkAndStay')) { + if ($idHotelSettingsLink) { + Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token. + '&update'.$this->table.'&'.$this->identifier.'='.$newId); + } else { + Tools::redirectAdmin(self::$currentIndex.'&conf=3&token='.$this->token. + '&update'.$this->table.'&'.$this->identifier.'='.$newId); + } + } else { + self::$currentIndex .= '&display=list'; + if ($idHotelSettingsLink) { + Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token); + } else { + Tools::redirectAdmin(self::$currentIndex.'&conf=3&token='.$this->token); + } + } + } + } + } + } + + parent::postProcess(); + } + + public function processStatus() + { + self::$currentIndex .= '&display=list'; + return parent::processStatus(); + } + + public function processDelete() + { + self::$currentIndex .= '&display=list'; + return parent::processDelete(); + } + + public function processBulkDelete() + { + self::$currentIndex .= '&display=list'; + return parent::processBulkDelete(); + } + + public function ajaxProcessNewWindowHtlSettingsLink() + { + $response = array( + 'success' => 0, + 'text' => $this->l('An error occurred while updating object.') + ); + + $idSettingsLink = Tools::getValue('id_settings_link'); + $objHotelSettingsLink = new HotelSettingsLink($idSettingsLink); + + if (Validate::isLoadedObject($objHotelSettingsLink)) { + $objHotelSettingsLink->new_window = (int) !$objHotelSettingsLink->new_window; + + if ($objHotelSettingsLink->save()) { + $response['success'] = 1; + $response['text'] = $this->l('The object has been updated successfully.'); + } + } + + $this->ajaxDie(json_encode($response)); + } + + public function ajaxProcessUpdatePositions() + { + $way = (int) Tools::getValue('way'); + $idSettingsLink = (int) Tools::getValue('id'); + $positions = Tools::getValue('settings_link'); + + foreach ($positions as $position => $value) { + $pos = explode('_', $value); + + if (isset($pos[2]) && (int) $pos[2] === $idSettingsLink) { + if ($objHotelSettingsLink = new HotelSettingsLink((int) $pos[2])) { + if (isset($position) && $objHotelSettingsLink->updatePosition($way, $position, $idSettingsLink)) { + $this->ajaxDie(json_encode(true)); + } else { + $this->ajaxDie(json_encode(array( + 'hasError' => true, + 'errors' => sprintf( + $this->l('Can not update position for object ID: %d to position %d'), + (int) $idSettingsLink, + $position + ), + ))); + } + } else { + $this->ajaxDie(json_encode(array( + 'hasError' => true, + 'errors' => sprintf( + $this->l('The object with ID: %d can not be loaded.'), + (int) $idSettingsLink + ), + ))); + } + + break; + } + } + } + public function setMedia() { parent::setMedia(); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php index cd8bab0df..3d4e7aae8 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php @@ -365,6 +365,8 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController $this->errors[] = $this->l('Invalid value of impact value.'); } } + + if (!count($this->errors)) { if ($idFeaturePrice) { $objFeaturePricing = new HotelRoomTypeFeaturePricing($idFeaturePrice); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 1670454bf..96280681b 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -83,6 +83,31 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'title' => $this->l('Save'), ), ), + 'occupancypanel' => array( + 'icon' => 'icon-users', + 'title' => $this->l('Occupancy Setting'), + 'fields' => array( + // max age of child + 'WK_GLOBAL_CHILD_MAX_AGE' => array( + 'title' => $this->l('Consider guest as child below age'), + 'type' => 'text', + 'required' => true, + 'validation' => 'isUnsignedInt', + 'hint' => $this->l('Enter the age of the guest, which that guest will be considered as child.'), + ), + 'WK_GLOBAL_MAX_CHILD_IN_ROOM' => array( + 'title' => $this->l('Maximum children allowed in a room'), + 'type' => 'text', + 'required' => true, + 'validation' => 'isUnsignedInt', + 'hint' => $this->l('Enter number of the child allowed in a room.'), + 'desc' => $this->l('Set as 0 if you do not want to limit children in a room.') + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + ), + ), 'generalsetting' => array( 'title' => $this->l('Configuration'), 'fields' => array( @@ -260,6 +285,13 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); $languages = Language::getLanguages(false); + // Validation for the occupancy settings + // max age of infant after which guest will considered as child // below 18 + $globalChildMaxAge = Tools::getValue('WK_GLOBAL_CHILD_MAX_AGE'); + $globalMaxChildInRoom = Tools::getValue('WK_GLOBAL_MAX_CHILD_IN_ROOM'); + + // End occupancy fields validation + if (!trim(Tools::getValue('WK_HTL_CHAIN_NAME_'.$defaultLangId))) { $this->errors[] = $this->l('Hotel chain name is required at least in ').$objDefaultLanguage['name']; } else { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index d60d06254..3cbb27bb0 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -30,65 +30,51 @@ class AdminHotelRoomsBookingController extends ModuleAdminController parent::__construct(); - $this->setPhpCookieData(); + $this->initCart(); } - public function setPhpCookieData() + public function initCart() { - if (!isset($_COOKIE['wk_id_guest']) || !$_COOKIE['wk_id_guest']) { - if (!isset($this->context->cookie->id_guest)) { - Guest::setNewGuest($this->context->cookie); - } - - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, "/"); - } else { - $this->context->cookie->id_guest = $_COOKIE['wk_id_guest']; - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, "/"); - } - $guest = new Guest($this->context->cookie->id_guest); - - if (!isset($_COOKIE['wk_id_cart']) && !isset($this->context->cart->id)) { - $cart = new Cart(); - - $cart->recyclable = 0; - $cart->gift = 0; - $cart->id_shop = (int)$this->context->shop->id; - $cart->id_lang = (($id_lang = (int)Tools::getValue('id_lang')) ? $id_lang : Configuration::get('PS_LANG_DEFAULT')); - $cart->id_currency = (($id_currency = (int)Tools::getValue('id_currency')) ? $id_currency : Configuration::get('PS_CURRENCY_DEFAULT')); - $cart->id_address_delivery = 0; - $cart->id_address_invoice = 0; - $cart->id_currency = Configuration::get('PS_CURRENCY_DEFAULT'); - $cart->id_guest = (int)$this->context->cookie->id_guest; - $cart->setNoMultishipping(); - $cart->save(); - - $this->context->cart = $cart; - $this->context->cookie->id_cart = $cart->id; - - setcookie('wk_id_cart', $cart->id, time() + 86400, "/"); - } else { - $cart = new Cart((int)$_COOKIE['wk_id_cart']); - - $this->context->cart = $cart; - $this->context->cookie->id_cart = $cart->id; - setcookie('wk_id_cart', $cart->id, time() + 86400, "/"); + if (!isset($this->context->cookie->id_guest)) { + Guest::setNewGuest($this->context->cookie); } - $customer = new Customer(); - $customer->id_gender = 0; - $customer->id_default_group = 1; - $customer->outstanding_allow_amount = 0; - $customer->show_public_prices = 0; - $customer->max_payment_days = 0; - $customer->active = 1; - $customer->is_guest = 0; - $customer->deleted = 0; - $customer->logged = 0; - $customer->id_guest = $this->context->cookie->id_guest; + if (!isset($this->context->cookie->id_cart)) { + // create a new cart + $objCart = new Cart(); + $objCart->recyclable = 0; + $objCart->gift = 0; + $objCart->id_shop = (int) $this->context->shop->id; + $objCart->id_lang = (($id_lang = (int) Tools::getValue('id_lang')) ? $id_lang : (int) Configuration::get('PS_LANG_DEFAULT')); + $objCart->id_currency = (($id_currency = (int) Tools::getValue('id_currency')) ? $id_currency : (int) Configuration::get('PS_CURRENCY_DEFAULT')); + $objCart->id_address_delivery = 0; + $objCart->id_address_invoice = 0; + $objCart->id_currency = (int) Configuration::get('PS_CURRENCY_DEFAULT'); + $objCart->id_guest = (int) $this->context->cookie->id_guest; + $objCart->setNoMultishipping(); - $this->context->customer = $customer; + $this->context->cart = $objCart; + $this->context->cart->save(); - return true; + $this->context->cookie->id_cart = (int) $objCart->id; + } else { + // use previous cart + $this->context->cart = new Cart($this->context->cookie->id_cart); + } + + $objCustomer = new Customer(); + $objCustomer->id_gender = 0; + $objCustomer->id_default_group = 1; + $objCustomer->outstanding_allow_amount = 0; + $objCustomer->show_public_prices = 0; + $objCustomer->max_payment_days = 0; + $objCustomer->active = 1; + $objCustomer->is_guest = 0; + $objCustomer->deleted = 0; + $objCustomer->logged = 0; + $objCustomer->id_guest = (int) $this->context->cookie->id_guest; + + $this->context->customer = $objCustomer; } public function postProcess() @@ -128,12 +114,19 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $id_room_type = 0; } + if (Tools::getValue('occupancy')) { + $occupancy = Tools::getValue('occupancy'); + } else { + $occupancy = array(); + } + if (Tools::isSubmit('search_hotel_list')) { $urlData = array ( 'date_from' => $date_from, 'date_to' => $date_to, 'id_hotel' => $id_hotel, - 'id_room_type' => $id_room_type + 'id_room_type' => $id_room_type, + 'occupancy' => $occupancy ); Tools::redirectAdmin($this->context->link->getAdminLink('AdminHotelRoomsBooking').'&'.http_build_query($urlData)); } @@ -211,6 +204,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->id_room_type = $id_room_type; $this->date_from = $date_from; $this->date_to = $date_to; + $this->occupancy = $occupancy; parent::postprocess(); } @@ -248,6 +242,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'date_from' => $this->date_from, 'date_to' => $this->date_to, 'id_hotel' => $this->id_hotel, + 'occupancy' => $this->occupancy, 'id_room_type' => $this->id_room_type, )); } @@ -269,7 +264,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController { $objHotelBookingDetail = new HotelBookingDetail(); - $adult = 0; + $adults = 0; $children = 0; $num_rooms = 1; $booking_data = $this->getAllBookingDataInfo( @@ -277,8 +272,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->date_to, $this->id_hotel, $this->id_room_type, - $adult, - $children, + $this->occupancy, $num_rooms, $this->context->cart->id, $this->context->cookie->id_guest @@ -287,14 +281,35 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $allotmentTypes = HotelBookingDetail::getAllAllotmentTypes(); $this->context->smarty->assign(array( - 'adult' => $adult, + 'adults' => $adults, 'children' => $children, 'num_rooms' => $num_rooms, 'booking_data' => $booking_data, 'allotment_types' => $allotmentTypes, + 'occupancy' => $this->occupancy, 'date_from' => $this->date_from, 'date_to' => $this->date_to, + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), )); + + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + + $this->context->smarty->assign('occupancy_required_for_booking', $occupancyRequiredForBooking); + + if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS ) { + $this->context->smarty->assign(array( + 'occupancy_adults' => array_sum(array_column($this->occupancy, 'adults')), + 'occupancy_children' => array_sum(array_column($this->occupancy, 'children')), + 'occupancy_child_ages' => array_sum(array_column($this->occupancy, 'child_ages')), + 'is_occupancy_wise_search' => true, + )); + } else { + $this->context->smarty->assign('is_occupancy_wise_search', false); + } } public function initCartData() @@ -355,8 +370,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $searchDateFrom = Tools::getValue('search_date_from'); $searchDateTo = Tools::getValue('search_date_to'); - // No use of adult, child, num_rooms - $adult = 0; + // No use of adults, child, num_rooms + $adults = 0; $children = 0; $num_rooms = 1; @@ -365,7 +380,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_to'] = $searchDateTo; $bookingParams['hotel_id'] = $searchIdHotel; $bookingParams['room_type'] = $searchIdRoomType; - $bookingParams['adult'] = $adult; + $bookingParams['adults'] = $adults; $bookingParams['children'] = $children; $bookingParams['num_rooms'] = $num_rooms; $bookingParams['for_calendar'] = 1; @@ -392,8 +407,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController public function ajaxProcessGetCalenderData() { $events = array(); - // No use of adult, child, num_rooms - $adult = 0; + // No use of adults, child, num_rooms + $adults = 0; $children = 0; $num_rooms = 1; @@ -407,7 +422,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams = array(); $bookingParams['hotel_id'] = $searchIdHotel; $bookingParams['room_type'] = $searchIdRoomType; - $bookingParams['adult'] = $adult; + $bookingParams['adults'] = $adults; $bookingParams['children'] = $children; $bookingParams['num_rooms'] = $num_rooms; $bookingParams['for_calendar'] = 1; @@ -488,6 +503,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $id_product = Tools::getValue('id_prod'); $date_from = Tools::getValue('date_from'); $date_to = Tools::getValue('date_to'); + $occupancy = Tools::getValue('occupancy'); $date_from = date("Y-m-d", strtotime($date_from)); $date_to = date("Y-m-d", strtotime($date_to)); @@ -537,6 +553,9 @@ class AdminHotelRoomsBookingController extends ModuleAdminController ); if ($opt) { // add room in cart + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); + $obj_cart_book_data = new HotelCartBookingData(); $obj_cart_book_data->id_cart = $id_cart; $obj_cart_book_data->id_guest = $id_guest; @@ -549,6 +568,16 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $obj_cart_book_data->comment = $comment; $obj_cart_book_data->date_from = $date_from; $obj_cart_book_data->date_to = $date_to; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $room_occupancy = array_shift($occupancy); + $obj_cart_book_data->adults = $room_occupancy['adults']; + $obj_cart_book_data->children = $room_occupancy['children']; + $obj_cart_book_data->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $obj_cart_book_data->adults = $roomTypeInfo['adults']; + $obj_cart_book_data->children = $roomTypeInfo['children']; + $obj_cart_book_data->child_ages = json_encode(array()); + } if ($obj_cart_book_data->save()) { $response['success'] = true; $response['data']['id_cart_book_data'] = $obj_cart_book_data->id; @@ -583,9 +612,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $date_from, $date_to, $hotel_id, - $room_type, - $adult, - $children, + $id_room_type, + $occupancy, $num_rooms, $id_cart, $id_guest @@ -597,11 +625,9 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_from'] = $date_from; $bookingParams['date_to'] = $date_to; $bookingParams['hotel_id'] = $hotel_id; - $bookingParams['room_type'] = $room_type; - $bookingParams['adult'] = $adult; - $bookingParams['children'] = $children; + $bookingParams['id_room_type'] = $id_room_type; + $bookingParams['occupancy'] = $occupancy; $bookingParams['num_rooms'] = $num_rooms; - $bookingParams['for_calendar'] = 0; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 1; $bookingParams['search_booked'] = 1; @@ -611,8 +637,11 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['search_cart_rms'] = 1; $booking_data = $obj_booking_dtl->getBookingData($bookingParams); + if ($booking_data) { + $objHotelRoomType = new HotelRoomType(); foreach ($booking_data['rm_data'] as $key_bk_data => $value_bk_data) { + $booking_data['rm_data'][$key_bk_data]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value_bk_data['id_product']); if (isset($value_bk_data['data']['booked']) && $value_bk_data['data']['booked']) { foreach ($value_bk_data['data']['booked'] as $booked_k1 => $booked_v1) { if (isset($booked_v1['detail']) && $booked_v1['detail']) { @@ -643,6 +672,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController { parent::setMedia(); $currency = new Currency((int)Configuration::get('PS_CURRENCY_DEFAULT')); + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } $jsVars = array( 'currency_prefix' => $currency->prefix, 'currency_suffix' => $currency->suffix, @@ -651,6 +684,9 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'currency_blank' => $currency->blank, 'ALLOTMENT_AUTO' => HotelBookingDetail::ALLOTMENT_AUTO, 'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL, + '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_booking_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'opt_select_all' => $this->l('All Types'), 'slt_another_htl' => $this->l('Select Another Hotel'), @@ -665,9 +701,27 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'no_rm_avail_txt' => $this->l('No rooms available.'), 'slct_rm_err' => $this->l('Please select a room first.'), 'product_added_cart_txt' => $this->l('Product added in cart'), - 'info_icon_path' => _MODULE_DIR_.$this->module->name.'/views/img/Slices/info-icon.svg' + 'info_icon_path' => _MODULE_DIR_.$this->module->name.'/views/img/Slices/info-icon.svg', + 'select_age_txt' => 'Select age', + 'under_1_age' => 'Under 1', + 'room_txt' => 'Room', + 'rooms_txt' => 'Rooms', + 'remove_txt' => 'Remove', + 'adult_txt' => 'Adults', + 'adults_txt' => 'Adults', + 'child_txt' => 'Child', + 'children_txt' => 'Children', + 'below_txt' => 'Below', + 'years_txt' => 'years', + 'all_children_txt' => 'All Children', + 'invalid_occupancy_txt' => 'Invalid occupancy(adults/children) found.', // 'check_calender_var' => $check_calender_var, ); + if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS ) { + $jsVars['is_occupancy_wise_search'] = true; + } else { + $jsVars['is_occupancy_wise_search'] = false; + } MediaCore::addJsDef($jsVars); // add fullcalender plugin diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 8b0477159..88ce7db9c 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -25,9 +25,11 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $this->bootstrap = true; $this->table = 'order_return'; $this->className = 'OrderReturn'; + $this->list_no_link = true; $this->context = Context::getContext(); - $this->_select = ' COUNT(a.`id_order_return`) as total_refund_requests, ord.`id_currency`, ord.`total_paid_tax_incl` AS total_order, CONCAT(firstname, " ", lastname) AS cust_name, osl.`name` as order_status_name, os.`color`, os.`id_order_state`'; + $this->_select = ' COUNT(IF(a.`state` = '.(int) Configuration::get('PS_ORS_PENDING').', 1, NULL)) AS total_pending_requests, + ord.`id_currency`, ord.`total_paid_tax_incl` AS total_order, SUM(a.`refunded_amount`) AS refunded_amount, CONCAT(firstname, " ", lastname) AS cust_name, os.`color`, os.`id_order_state`'; $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'orders` ord ON (a.`id_order` = ord.`id_order`)'; $this->_join .= 'LEFT JOIN '._DB_PREFIX_.'order_state os ON (os.`id_order_state` = ord.`current_state`)'; $this->_join .= 'LEFT JOIN '._DB_PREFIX_.'order_state_lang osl ON (osl.`id_order_state` = os.`id_order_state` AND osl.`id_lang` = '.(int)$this->context->language->id.')'; @@ -44,7 +46,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController /*for showing status of booking with badge_danger or success*/ $this->fields_list = array( 'id_order' => array( - 'title' => $this->l('Id Order'), + 'title' => $this->l('Order ID'), 'align' => 'center', 'class' => 'fixed-width-xs', 'callback' => 'setOrderLink', @@ -62,16 +64,14 @@ class AdminOrderRefundRequestsController extends ModuleAdminController 'callback' => 'setOrderCurrency', 'havingFilter' => true, ), - 'order_status_name' => array( - 'title' => $this->l('Order Status'), - 'type' => 'select', - 'color' => 'color', - 'list' => $ordStatuses, - 'filter_key' => 'os!id_order_state', + 'refunded_amount' => array( + 'title' => $this->l('Refunded Amount'), + 'align' => 'center', + 'callback' => 'setOrderCurrency', 'havingFilter' => true, ), - 'total_refund_requests' => array( - 'title' => $this->l('Total Requests'), + 'total_pending_requests' => array( + 'title' => $this->l('Pending Requests'), 'align' => 'center', 'havingFilter' => true, ), @@ -92,6 +92,9 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if (Tools::isSubmit('submitResetorder_return') && Tools::getValue('id_order')) { Tools::redirectAdmin($this->context->link->getAdminLink('AdminOrderRefundRequests').'&id_order='.Tools::getValue('id_order').'&view'.$this->table); } + + $this->_conf[101] = $this->l('Refund request has been denied successfully.'); + $this->_conf[102] = $this->l('Refund request has been completed successfully.'); } public function setOrderCurrency($echo, $row) @@ -146,7 +149,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $this->identifier = 'id_order_return'; /*for showing status of booking with badge_danger or success*/ - $this->_select = ' CONCAT(cust.`firstname`, " ", cust.`lastname`) AS `cust_name`, ors.`color`, orsl.`name` as `status_name`'; + $this->_select = ' CONCAT(cust.`firstname`, " ", cust.`lastname`) AS `cust_name`, ors.`color`, orsl.`name` as `status_name`, ord.`id_currency`'; $this->_join = ' LEFT JOIN `'._DB_PREFIX_.'customer` cust ON (cust.`id_customer` = a.`id_customer`)'; $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'orders` ord ON (ord.`id_order` = a.`id_order`)'; $this->_join .= 'LEFT JOIN '._DB_PREFIX_.'order_return_state ors ON (ors.`id_order_return_state` = a.`state`)'; @@ -161,12 +164,12 @@ class AdminOrderRefundRequestsController extends ModuleAdminController } $this->fields_list = array( 'id_order_return' => array( - 'title' => $this->l('Id'), + 'title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs', ), 'id_order' => array( - 'title' => $this->l('Id Order'), + 'title' => $this->l('Order ID'), 'align' => 'center', 'class' => 'fixed-width-xs', 'callback' => 'setOrderLink', @@ -188,6 +191,12 @@ class AdminOrderRefundRequestsController extends ModuleAdminController 'filter_key' => 'ors!id_order_return_state', 'filter_type' => 'int', ), + 'refunded_amount' => array( + 'title' => $this->l('Refunded Amount'), + 'align' => 'center', + 'callback' => 'setOrderCurrency', + 'havingFilter' => true, + ), 'date_add' => array( 'title' => $this->l('Requested Date'), 'type' => 'datetime', @@ -240,6 +249,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $this->context->language->id), 'currentStateInfo' => (array) new OrderReturnState($objOrderReturn->state, $this->context->language->id), + 'current_id_lang' => $this->context->language->id, 'refundStatuses' => $refundStatuses, 'isRefundCompleted' => $objOrderReturn->hasBeenCompleted(), 'paymentMethods' => $paymentMethods, @@ -275,11 +285,11 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if ($refundedAmounts) { foreach ($idsReturnDetail as $idRetDetail) { if (!isset($refundedAmounts[$idRetDetail]) || !Validate::isPrice($refundedAmounts[$idRetDetail])) { - $this->errors[] = $this->l('Invalid refund amounts entered.'); + $this->errors[] = $this->l('Invalid refund amount(s) entered.'); } } } else { - $this->errors[] = $this->l('Invalid refund amounts entered.'); + $this->errors[] = $this->l('Invalid refund amount(s) entered.'); } } else { $this->errors[] = $this->l('Select at least one booking for refund.'); @@ -288,7 +298,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if (Tools::isSubmit('refundTransactionAmount')) { $paymentMode = Tools::getValue('payment_method'); if (!$paymentMode) { - $paymentMode = Tools::getValue('payment_mode'); + $paymentMode = Tools::getValue('other_payment_mode'); if (!$paymentMode) { $this->errors[] = $this->l('Please enter the payment mode of the refund transaction.'); } elseif (!Validate::isGenericName($paymentMode)) { @@ -393,7 +403,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $objOrderReturn->refunded_amount = $totalRefundedAmount; if ($objOrderReturn->save()) { // change state of the order refund - $objOrderReturn->changeIdOrderReturnState($idRefundState, $idOrderReturn); + $objOrderReturn->changeIdOrderReturnState($idRefundState); if ($objRefundState->refunded || $objRefundState->denied) { // check if order is paid the set status of the order to refunded @@ -425,31 +435,33 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if (!$idCreditSlip = OrderSlip::create($objOrder, $bookingList, 0, 0, 0, 0)) { $this->errors[] = $this->l('A credit slip cannot be generated. '); } else { + $objOrderReturn->id_return_type = $idCreditSlip; + $objOrderReturn->return_type = OrderReturn::RETURN_TYPE_ORDER_SLIP; + $objOrderReturn->save(); + Hook::exec('actionOrderSlipAdd', array('order' => $objOrder, 'bookingList' => $bookingList)); - @Mail::Send( - (int)$objOrder->id_lang, - 'credit_slip', - Mail::l('New credit slip regarding your order', (int)$objOrder->id_lang), - $params, - $customer->email, - $customer->firstname.' '.$customer->lastname, - null, - null, - null, - null, - _PS_MAIL_DIR_, - true, - (int)$objOrder->id_shop - ); + @Mail::Send( + (int)$objOrder->id_lang, + 'credit_slip', + Mail::l('New credit slip regarding your order', (int)$objOrder->id_lang), + $params, + $customer->email, + $customer->firstname.' '.$customer->lastname, + null, + null, + null, + null, + _PS_MAIL_DIR_, + true, + (int)$objOrder->id_shop + ); } - } - - // Generate voucher - if (Tools::isSubmit('generateDiscount') && !count($this->errors)) { + } elseif (Tools::isSubmit('generateDiscount') && !count($this->errors)) { + // Generate voucher $cartrule = new CartRule(); $language_ids = Language::getIDs(); - $cartrule->description = sprintf($this->l('Credit card slip for order #%d'), $objOrder->id); + $cartrule->description = sprintf($this->l('Voucher for order #%d'), $objOrder->id); foreach ($language_ids as $id_lang) { // Define a temporary name $cartrule->name[$id_lang] = 'V0C'.(int)($objOrder->id_customer).'O'.(int)($objOrder->id); @@ -474,7 +486,8 @@ class AdminOrderRefundRequestsController extends ModuleAdminController if (!$cartrule->add()) { $this->errors[] = $this->errors('You cannot generate a voucher.'); } else { - $objOrderReturn->id_transaction = $cartrule->id; + $objOrderReturn->id_return_type = $cartrule->id; + $objOrderReturn->return_type = OrderReturn::RETURN_TYPE_CART_RULE; $objOrderReturn->save(); // Update the voucher code and name foreach ($language_ids as $id_lang) { @@ -487,6 +500,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $currency = $this->context->currency; $params['{voucher_amount}'] = Tools::displayPrice($cartrule->reduction_amount, $currency, false); $params['{voucher_num}'] = $cartrule->code; + @Mail::Send( (int)$objOrder->id_lang, 'voucher', @@ -507,8 +521,14 @@ class AdminOrderRefundRequestsController extends ModuleAdminController } // redirect with success if process completed successfully + $confirmation = 4; + if ($objRefundState->denied) { + $confirmation = 101; + } elseif ($objRefundState->refunded) { + $confirmation = 102; + } Tools::redirectAdmin( - self::$currentIndex.'&conf=4&id_order_return='.$idOrderReturn. + self::$currentIndex.'&conf='.$confirmation.'&id_order_return='.$idOrderReturn. '&vieworder_return&token='.$this->token ); } diff --git a/modules/hotelreservationsystem/define.php b/modules/hotelreservationsystem/define.php index ac3b75301..8914bf202 100644 --- a/modules/hotelreservationsystem/define.php +++ b/modules/hotelreservationsystem/define.php @@ -46,5 +46,7 @@ require_once 'classes/QloRoomType.php'; require_once 'classes/HotelRoomDisableDates.php'; require_once 'classes/HotelBranchRefundRules.php'; +require_once 'classes/HotelSettingsLink.php'; + // Web services classes require_once 'classes/WebserviceSpecificManagementQlo.php'; \ No newline at end of file diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index fc59c5d38..669d8ccc3 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -253,123 +253,6 @@ class HotelReservationSystem extends Module } } - public function hookDisplayAdminProductsExtra($params) - { - if ($idProduct = Tools::getValue('id_product')) { - $objGlobalDemand = new HotelRoomTypeGlobalDemand(); - $allDemands = $objGlobalDemand->getAllDemands(); - $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); - // get room type additional services - $objRoomDemand = new HotelRoomTypeDemand(); - $roomDemandPrices = $objRoomDemand->getRoomTypeDemands($idProduct, 0, 0); - $this->context->smarty->assign( - array( - 'idProduct' => $idProduct, - 'roomDemandPrices' => $roomDemandPrices, - 'allDemands' => $allDemands, - 'defaultcurrencySign' => $objCurrency->sign, - ) - ); - } - return $this->display(__FILE__, 'roomTypeDemands.tpl'); - } - - public function moduleProductsExtraTabName() - { - return $this->l('Additional Facilities'); - } - - public function hookActionProductUpdate($params) - { - if ($idProduct = $params['id_product']) { - $objRoomTypeDemand = new HotelRoomTypeDemand(); - $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); - // first delete all the previously saved prices and demands of this room type - $objRoomTypeDemand->deleteRoomTypeDemands($idProduct); - $objRoomTypeDemandPrice->deleteRoomTypeDemandPrices($idProduct); - if ($selectedDemands = Tools::getValue('selected_demand')) { - $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption(); - foreach ($selectedDemands as $idGlobalDemand) { - if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand))) { - // save selected demands for this room type - $objRoomTypeDemand = new HotelRoomTypeDemand(); - $objRoomTypeDemand->id_product = $idProduct; - $objRoomTypeDemand->id_global_demand = $idGlobalDemand; - $objRoomTypeDemand->save(); - - // save selected demands prices for this room type - $demandPrice = Tools::getValue('demand_price_'.$idGlobalDemand); - if (Validate::isPrice($demandPrice)) { - if ($objGlobalDemand->price != $demandPrice) { - $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); - $objRoomTypeDemandPrice->id_product = $idProduct; - $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand; - $objRoomTypeDemandPrice->id_option = 0; - $objRoomTypeDemandPrice->price = $demandPrice; - $objRoomTypeDemandPrice->save(); - } - } else { - $this->context->controller->errors[] = $this->l('Invalid demand price of facility'). - ' : '.$objGlobalDemand->name[$this->context->language->id]; - } - if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) { - foreach ($advOptions as $option) { - if (Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($option['id']))) { - $optionPrice = Tools::getValue('option_price_'.$option['id']); - if (Validate::isPrice($optionPrice)) { - if ($optionPrice != $objAdvOption->price) { - $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); - $objRoomTypeDemandPrice->id_product = $idProduct; - $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand; - $objRoomTypeDemandPrice->id_option = $option['id']; - $objRoomTypeDemandPrice->price = $optionPrice; - $objRoomTypeDemandPrice->save(); - } - } else { - $this->context->controller->errors[] = $this->l('Invalid price of advance option'). - ' : '.$objAdvOption->name[$this->context->language->id]; - } - } - } - } - } - } - if (count($this->context->controller->errors)) { - $this->context->controller->warnings[] = $this->l('Invalid price values are not saved. Please correct them and save again'); - } - - $objCartBookingData = new HotelCartBookingData(); - if ($cartExtraDemands = $objCartBookingData->getCartExtraDemands(0, $idProduct)) { - // delete the demands from cart if not available in cart - $objRoomDemand = new HotelRoomTypeDemand(); - $roomTypeDemandIds = array(); - if ($roomTypeDemands = $objRoomDemand->getRoomTypeDemands($idProduct)) { - $roomTypeDemandIds = array_keys($roomTypeDemands); - } - foreach ($cartExtraDemands as &$demandInfo) { - if (isset($demandInfo['extra_demands']) && $demandInfo['extra_demands']) { - $cartChanged = 0; - foreach ($demandInfo['extra_demands'] as $key => $demand) { - if (!in_array($demand['id_global_demand'], $roomTypeDemandIds)) { - $cartChanged = 1; - unset($demandInfo['extra_demands'][$key]); - } - } - if ($cartChanged) { - if (Validate::isLoadedObject( - $objCartBooking = new HotelCartBookingData($demandInfo['id']) - )) { - $objCartBooking->extra_demands = json_encode($demandInfo['extra_demands']); - $objCartBooking->save(); - } - } - } - } - } - } - } - } - public function hookActionProductSave($params) { $isToggling = Tools::getValue('statusproduct'); @@ -419,14 +302,6 @@ class HotelReservationSystem extends Module } } - public function hookActionAdminControllerSetMedia() - { - if ('AdminProducts' == Tools::getValue('controller')) { - $this->context->controller->addJs($this->_path.'views/js/roomTypeDemand.js'); - $this->context->controller->addCSS($this->_path.'views/css/roomTypeDemand.css'); - } - } - public function hookDisplayBackOfficeHeader() { $this->context->controller->addCSS($this->_path.'views/css/admin/css/hotel_admin_tab_logo.css'); @@ -567,9 +442,6 @@ class HotelReservationSystem extends Module 'actionProductSave', 'addWebserviceResources', 'actionObjectLanguageAddAfter', - 'actionAdminControllerSetMedia', - 'displayAdminProductsExtra', - 'actionProductUpdate', 'actionObjectProfileAddAfter', 'actionObjectProfileDeleteBefore', 'actionObjectGroupDeleteBefore', diff --git a/modules/hotelreservationsystem/views/css/roomTypeDemand.css b/modules/hotelreservationsystem/views/css/roomTypeDemand.css deleted file mode 100644 index e0eb196eb..000000000 --- a/modules/hotelreservationsystem/views/css/roomTypeDemand.css +++ /dev/null @@ -1,42 +0,0 @@ -/** -* 2010-2020 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 2010-2020 Webkul IN -* @license https://store.webkul.com/license.html -*/ - -/*----- Accordion -----*/ -.accordion, .accordion * { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; -} -.accordion { - overflow:hidden; - border-bottom: 1px solid #CCCCCC; -} -.accordion-section-title { - width:100%; - padding:15px; - display:inline-block; - transition:all linear 0.15s; - color:#252525 !important; - text-decoration:none !important; -} -.accordion-section-content { - display:none; - border-top: 1px solid #eee; - padding-top: 15px; -} \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index 54d839773..9ac5f5849 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -783,6 +783,41 @@ $(document).ready(function() { initGoogleMaps(); }); +function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) +{ + var adults = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adults += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adults) + ' '; + if (parseInt(adults) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + if (parseInt(rooms) > 1) { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + } else { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; + } + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); +} + + function showFeaturePriceRuleLangField(lang_iso_code, id_lang) { $('#feature_price_rule_lang_btn').html(lang_iso_code + ' '); diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js index 1a476ce9f..1cc2356b5 100644 --- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js +++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js @@ -265,8 +265,53 @@ $(document).ready(function() { } }); + function getBookingOccupancyDetails(bookingform) + { + let occupancy; + if (parseInt(occupancy_required_for_booking)) { + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + occupancy = []; + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + } + occupancy.push({ + 'adults': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + } + } else { + return true; + } + + return occupancy; + } + // booking form - $('body').on('click', '.avai_add_cart', function() { + $('body').on('click', '.avai_add_cart', function(e) { + e.preventDefault(); $current_btn = $(this); $current_btn.attr('disabled', 'disabled'); var search_id_room_type = $("#search_id_room_type").val(); @@ -282,47 +327,56 @@ $(document).ready(function() { var booking_type = $("input[name='bk_type_" + id_room + "']:checked").val(); var comment = $("#comment_" + id_room).val(); var btn = $(this); + $(this).closest('tr').find('.booking_occupancy_wrapper').parent().removeClass('open'); + var occupancy = getBookingOccupancyDetails($(this).closest('tr').find('.booking_occupancy')); - $.ajax({ - url: rooms_booking_url, - type: 'POST', - dataType: 'json', - data: { - ajax: true, - action: 'addDataToCart', - id_prod: id_prod, - id_room: id_room, - id_hotel: id_hotel, - date_from: date_from, - date_to: date_to, - booking_type: booking_type, - comment: comment, - search_id_hotel: search_id_hotel, - search_id_room_type: search_id_room_type, - search_date_from: search_date_from, - search_date_to: search_date_to, - opt: 1, - }, - success: function(result) { - if (result) { - if (result.success) { - $(".cart_booking_btn").removeAttr('disabled'); - $current_btn.removeAttr('disabled'); + if (occupancy) { + $.ajax({ + url: rooms_booking_url, + type: 'POST', + dataType: 'json', + data: { + ajax: true, + action: 'addDataToCart', + id_prod: id_prod, + id_room: id_room, + id_hotel: id_hotel, + date_from: date_from, + date_to: date_to, + occupancy: occupancy, + booking_type: booking_type, + comment: comment, + search_id_hotel: search_id_hotel, + search_id_room_type: search_id_room_type, + search_date_from: search_date_from, + search_date_to: search_date_to, + opt: 1, + }, + success: function(result) { + if (result) { + if (result.success) { + $(".cart_booking_btn").removeAttr('disabled'); + $current_btn.removeAttr('disabled'); + } + + btn.removeClass('btn-primary').removeClass('avai_add_cart').addClass('btn-danger').addClass('avai_delete_cart_data').html(remove); + + btn.attr('data-id-cart', result.data.id_cart); + btn.attr('data-id-cart-book-data', result.data.id_cart_book_data); + refreshCartData(); + refreshStatsData(); + calendar.refetchEvents(); } - - btn.removeClass('btn-primary').removeClass('avai_add_cart').addClass('btn-danger').addClass('avai_delete_cart_data').html(remove); - - btn.attr('data-id-cart', result.data.id_cart); - btn.attr('data-id-cart-book-data', result.data.id_cart_book_data); - refreshCartData(); - refreshStatsData(); - calendar.refetchEvents(); } - } - }); + }); + } else { + $current_btn.attr('disabled', false); + setRoomTypeGuestOccupancy($(this).closest('tr').find('.booking_occupancy_wrapper')); + } }); - $('body').on('click', '.par_add_cart', function() { + $('body').on('click', '.par_add_cart', function(e) { + e.preventDefault(); $current_btn = $(this); $current_btn.attr('disabled', 'disabled'); var search_id_room_type = $("#search_id_room_type").val(); @@ -340,44 +394,52 @@ $(document).ready(function() { var booking_type = $("input[name='bk_type_" + id_room + "_" + sub_key + "']:checked").val(); var comment = $("#comment_" + id_room + "_" + sub_key).val(); var btn = $(this); + $(this).closest('tr').find('.booking_occupancy_wrapper').parent().removeClass('open'); + var occupancy = getBookingOccupancyDetails($(this).closest('tr').find('.booking_occupancy')); - $.ajax({ - url: rooms_booking_url, - type: 'POST', - dataType: 'json', - data: { - ajax: true, - action: 'addDataToCart', - id_prod: id_prod, - id_room: id_room, - id_hotel: id_hotel, - date_from: date_from, - date_to: date_to, - booking_type: booking_type, - comment: comment, - search_id_hotel: search_id_hotel, - search_id_room_type: search_id_room_type, - search_date_from: search_date_from, - search_date_to: search_date_to, - opt: 1, - }, - success: function(result) { - if (result) { - if (result.success) { - $(".cart_booking_btn").removeAttr('disabled'); - $current_btn.removeAttr('disabled'); + if (occupancy) { + $.ajax({ + url: rooms_booking_url, + type: 'POST', + dataType: 'json', + data: { + ajax: true, + action: 'addDataToCart', + id_prod: id_prod, + id_room: id_room, + id_hotel: id_hotel, + date_from: date_from, + date_to: date_to, + occupancy: occupancy, + booking_type: booking_type, + comment: comment, + search_id_hotel: search_id_hotel, + search_id_room_type: search_id_room_type, + search_date_from: search_date_from, + search_date_to: search_date_to, + opt: 1, + }, + success: function(result) { + if (result) { + if (result.success) { + $(".cart_booking_btn").removeAttr('disabled'); + $current_btn.removeAttr('disabled'); + } + + btn.removeClass('btn-primary').removeClass('par_add_cart').addClass('btn-danger').addClass('part_delete_cart_data').html(remove); + + btn.attr('data-id-cart', result.data.id_cart); + btn.attr('data-id-cart-book-data', result.data.id_cart_book_data); + refreshCartData(); + refreshStatsData(); + calendar.refetchEvents(); } - - btn.removeClass('btn-primary').removeClass('par_add_cart').addClass('btn-danger').addClass('part_delete_cart_data').html(remove); - - btn.attr('data-id-cart', result.data.id_cart); - btn.attr('data-id-cart-book-data', result.data.id_cart_book_data); - refreshCartData(); - refreshStatsData(); - calendar.refetchEvents(); } - } - }); + }); + } else { + $current_btn.attr('disabled', false); + setRoomTypeGuestOccupancy($(this).closest('tr').find('.booking_occupancy_wrapper')); + } }); $('body').on('click', '.ajax_cart_delete_data', function() { @@ -503,6 +565,167 @@ $(document).ready(function() { }); }); + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + + if ($(this).hasClass('num_children')) { + let totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + var childAgeSelect = '
'; + childAgeSelect += ''; + childAgeSelect += '
'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + $(document).on('click', '.booking_guest_occupancy', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + setRoomTypeGuestOccupancy(occupancy_wrapper); + + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".avai_add_cart").length || $(e.target).closest(".par_add_cart").length)) { + let hasErrors = 0; + + let adults = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adults.length || (adults.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adults and children + adults.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().removeClass('has-error'); + + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } else { + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().addClass('has-error'); + } + } + } + }); + + $('.booking_occupancy_wrapper .add_new_occupancy_btn').on('click', function(e) { + e.preventDefault(); + + var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var occupancy_block = ''; + var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index')); + roomBlockIndex += 1; + + + var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); + countRooms += 1 + occupancy_block += '
'; + occupancy_block += '
' + remove_txt + '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + + $(booking_occupancy_wrapper).find('.booking_occupancy_inner').append(occupancy_block); + + setRoomTypeGuestOccupancy(booking_occupancy_wrapper); + }); + function refreshCartData() { $.ajax({ diff --git a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js index 1cda4111f..8652f0ea5 100644 --- a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js +++ b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js @@ -42,11 +42,11 @@ $(document).ready(function() { } }); - $('#refundTransactionAmount, #generateDiscount').click(function() { + $('#generateCreditSlip, #generateDiscount').click(function() { if ($(this).is(':checked')) { - $('#refundTransactionAmount, #generateDiscount').prop('checked', false); + $('#generateCreditSlip, #generateDiscount').prop('checked', false); $(this).prop('checked', true); } - $('#refundTransactionAmount').change(); + $('#generateCreditSlip').change(); }); }); \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/js/roomTypeDemand.js b/modules/hotelreservationsystem/views/js/roomTypeDemand.js deleted file mode 100644 index 8b84ee213..000000000 --- a/modules/hotelreservationsystem/views/js/roomTypeDemand.js +++ /dev/null @@ -1,49 +0,0 @@ -/** -* 2010-2020 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 2010-2020 Webkul IN -* @license https://store.webkul.com/license.html -*/ - -$(document).ready(function() { - function close_accordion_section() { - $('.accordion .accordion-section-title').removeClass('active'); - $('.accordion .accordion-section-content').slideUp(300).removeClass('open'); - } - - $(document).on('click', '.accordion-section-title', function(e) { - // Grab current anchor value - var currentAttrValue = $(this).attr('href'); - - if ($(e.target).is('.active')) { - close_accordion_section(); - $(this).find('i').removeClass('icon-angle-down'); - $(this).find('i').addClass('icon-angle-left'); - } else { - close_accordion_section(); - // Add active class to section title - $(this).addClass('active'); - $(this).find('i').removeClass('icon-angle-left'); - $(this).find('i').addClass('icon-angle-down'); - // Open up the hidden content panel - $('.accordion ' + currentAttrValue).slideDown(300).addClass('open'); - } - e.preventDefault(); - }); - - $(document).on('click', '.selected_demand', function(e) { - e.stopPropagation(); - }); -}); \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/form.tpl new file mode 100644 index 000000000..aba822fce --- /dev/null +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/form.tpl @@ -0,0 +1,181 @@ +{** + * 2010-2022 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + +{extends file='helpers/form/form.tpl'} + +{block name='fieldset'} +
+
+ + {l s='Link Information' mod='hotelreservationsystem'} +
+ +
+
+ +
+ + getFieldValue($currentObject, 'active')|intval}checked="checked"{/if}> + + getFieldValue($currentObject, 'active')|intval}checked="checked"{/if}> + + + +
+
+ +
+ +
+ {if $languages|count > 0} + {foreach $languages as $language} + {assign var='value_text' value=$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)} +
+
+ +
+ {if $languages|count > 1} +
+ + +
+ {/if} +
+ {/foreach} + {/if} +
+
+ +
+ +
+ {if $languages|count > 0} + {foreach $languages as $language} + {assign var='value_text' value=$currentTab->getFieldValue($currentObject, 'hint', $language.id_lang)} +
+
+ +
+ {if $languages|count > 1} +
+ + +
+ {/if} +
+ {/foreach} + {/if} +
+
+ +
+ +
+ +
+
+
+ {l s='Refer to the following link for available icons.' mod='hotelreservationsystem'} + + https://fontawesome.com/v4/cheatsheet + + {l s=' Note: Replace fa- with icon- in icon name.' mod='hotelreservationsystem'} +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ + getFieldValue($currentObject, 'new_window')|intval}checked="checked"{/if}> + + getFieldValue($currentObject, 'new_window')|intval}checked="checked"{/if}> + + + +
+
+
+ +
+ + + + + {l s='Back to list' mod='hotelreservationsystem'} + +
+
+{/block} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/index.php b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/index.php new file mode 100644 index 000000000..b2366adc9 --- /dev/null +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/form/index.php @@ -0,0 +1,29 @@ + diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/list/link-page.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/list/link-page.tpl new file mode 100644 index 000000000..bb307b859 --- /dev/null +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/list/link-page.tpl @@ -0,0 +1,20 @@ +{** + * 2010-2022 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} + +{$saved_link} diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl index 82e7ca383..976a956f9 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl @@ -1,35 +1,36 @@ +{** + * 2010-2022 Webkul. + * + * NOTICE OF LICENSE + * + * All right is reserved, + * Please go through LICENSE.txt file inside our module + * + * 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 CustomizationPolicy.txt file inside our module for more information. + * + * @author Webkul IN + * @copyright 2010-2022 Webkul IN + * @license LICENSE.txt + *} +

   {l s='Hotel Configuration' mod='hotelreservationsystem'}

-
- - - {l s='General Settings' mod='hotelreservationsystem'} - - - - -
- -
- - - {l s='Advanced Price Rules' mod='hotelreservationsystem'} - - - - -
- -
- - - {l s='Additional Facilities' mod='hotelreservationsystem'} - - - - -
+ {foreach from=$settings_links item=settings_link} +
+ + + {$settings_link.name|escape:'html':'UTF-8'} + + + + +
+ {/foreach} {hook h='displayAddModuleSettingLink'}
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 b853484bd..85274c7c9 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 @@ -2,12 +2,19 @@
{foreach from=$booking_data['rm_data'] key=book_k item=book_v} -
+
+ {* room type occupancy Details *} +
+
+ {l s='Room Occupancy'}:    + {l s='Maximum adults'} : {$book_v['room_type_info']['max_adults']}   {l s='Maximum children'} : {$book_v['room_type_info']['max_children']}   {l s='Maximum guests'} : {$book_v['room_type_info']['max_guests']} +
+
  • {l s='Available Rooms' mod='hotelreservationsystem'}
  • {l s='Partially Available' mod='hotelreservationsystem'}
    • @@ -24,6 +31,9 @@ {l s='Duration' mod='hotelreservationsystem'} {l s='Message' mod='hotelreservationsystem'} {l s='Allotment Type' mod='hotelreservationsystem'} + {if $occupancy_required_for_booking} + {l s='Guests' mod='hotelreservationsystem'} + {/if} {l s='Action' mod='hotelreservationsystem'} @@ -42,6 +52,51 @@ {/foreach} + {if $occupancy_required_for_booking} + +
    + +
    + + + +
    +
    +
    +
    +
    +
    + + +
    +
    + + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
    +
    + +
    + {*
    *} +
    +
    + {*
    + {l s='Add Room'} +
    *} +
    +
    + + {/if} @@ -56,40 +111,84 @@ + - - - + + {if $occupancy_required_for_booking} + + {/if} + {foreach from=$book_v['data']['partially_available'] key=part_k item=part_v} - - - - + + + {if $occupancy_required_for_booking} + + {/if} + + + {/foreach} {/foreach}
    {l s='Duration' mod='hotelreservationsystem'} {l s='Room No.' mod='hotelreservationsystem'}{l s='Duration' mod='hotelreservationsystem'}{l s='Allotment Type' mod='hotelreservationsystem'}{l s='Action' mod='hotelreservationsystem'}{l s='Allotment Type' mod='hotelreservationsystem'}{l s='Guests' mod='hotelreservationsystem'}{l s='Action' mod='hotelreservationsystem'}
    {$part_v['room_num']|escape:'htmlall':'UTF-8'} - - {foreach from=$part_v['avai_dates'] key=sub_part_k item=sub_part_v} - - - - - + {foreach from=$part_v['rooms'] key=sub_part_k item=sub_part_v} + + {if $sub_part_v@first} + + {/if} + +
    -

    {dateFormat date=date('Y-m-d', strtotime($sub_part_v['date_from']))} - {dateFormat date=date('Y-m-d', strtotime($sub_part_v['date_to']))}

    -     		- {foreach $allotment_types as $allotment_type} - - {/foreach} - - - -
    +

    {dateFormat date=date('Y-m-d', strtotime($part_v['date_from']))} - {dateFormat date=date('Y-m-d', strtotime($part_v['date_to']))}

    +     		{$sub_part_v['room_num']|escape:'htmlall':'UTF-8'} + {foreach $allotment_types as $allotment_type} + {/foreach} -
    -
    +
    + +
    + + + +
    +
    +
    +
    +
    +
    + + +
    +
    + + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
    +
    + +
    + {*
    *} +
    +
    + {*
    + {l s='Add Room'} +
    *} +
    +
    +     		+ +
    @@ -101,39 +200,35 @@ {l s='Room No.' mod='hotelreservationsystem'} - {l s='Duration' mod='hotelreservationsystem'} - {l s='Message' mod='hotelreservationsystem'} - {l s='Allotment Type' mod='hotelreservationsystem'} + {l s='Duration' mod='hotelreservationsystem'} + {l s='Message' mod='hotelreservationsystem'} + {l s='Allotment Type' mod='hotelreservationsystem'} {l s='Reallocate' mod='hotelreservationsystem'} {foreach from=$book_v['data']['booked'] key=booked_k item=booked_v} - - {$booked_v['room_num']|escape:'htmlall':'UTF-8'} - - - {foreach from=$booked_v['detail'] key=rm_dtl_k item=rm_dtl_v} - - - - - - - {/foreach} -
    {dateFormat date=date('Y-m-d', strtotime($rm_dtl_v['date_from']))} - {dateFormat date=date('Y-m-d', strtotime($rm_dtl_v['date_to']))}{$rm_dtl_v['comment']|escape:'htmlall':'UTF-8'} - {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO}{l s='Auto Allotment' mod='hotelreservationsystem'}{elseif $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_MANUAL}{l s='Manual Allotment' mod='hotelreservationsystem'}{/if} - - {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO} - - {else} - -- - {/if} -
    - - + {foreach from=$booked_v['detail'] key=rm_dtl_k item=rm_dtl_v} + + {if $rm_dtl_v@first} + {$booked_v['room_num']|escape:'htmlall':'UTF-8'} + {/if} + {dateFormat date=date('Y-m-d', strtotime($rm_dtl_v['date_from']))} - {dateFormat date=date('Y-m-d', strtotime($rm_dtl_v['date_to']))} + {$rm_dtl_v['comment']|escape:'htmlall':'UTF-8'} + + {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO}{l s='Auto Allotment' mod='hotelreservationsystem'}{elseif $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_MANUAL}{l s='Manual Allotment' mod='hotelreservationsystem'}{/if} + + + {if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO} + + {else} + -- + {/if} + + + {/foreach} {/foreach} 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 b45a7f04b..413f76771 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 @@ -44,6 +44,101 @@
+ {if $is_occupancy_wise_search} +
+ +
+
+ + +
+
+ {if isset($occupancy) && $occupancy} + {assign var=countRoom value=1} +
+ {foreach from=$occupancy key=key item=$room_occupancy name=occupancyInfo} +
+
{if !$smarty.foreach.occupancyInfo.first}{l s='Remove'}{/if}
+
+
+
+ + +
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+
+
+ +
+
+ {if isset($room_occupancy['child_ages']) && $room_occupancy['child_ages']} + {foreach $room_occupancy['child_ages'] as $childAge} +
+ +
+ {/foreach} + {/if} +
+
+
+
+
+
+
+ {assign var=countRoom value=$countRoom+1} + {/foreach} + {else} +
+
+
+
+
+ + +
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+ +
+
+
+ {/if} +
+
+ {l s='Add Room'} +
+
+
+
+
+ {/if}