From f7c1dc0a5d7a555450ddd3d6dc1d97932713ef07 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 16 Aug 2023 13:25:07 +0530 Subject: [PATCH 001/106] Improve room search UX --- js/daterangepicker/qlodaterangepicker.js | 3 +- .../views/css/wk-global-search.css | 25 +++ .../views/js/wk-room-search-block.js | 187 ++++++++++++++++-- .../views/templates/hook/searchForm.tpl | 3 + .../css/daterangepicker.css | 3 + 5 files changed, 201 insertions(+), 20 deletions(-) diff --git a/js/daterangepicker/qlodaterangepicker.js b/js/daterangepicker/qlodaterangepicker.js index 369ea9325..7e4186a97 100644 --- a/js/daterangepicker/qlodaterangepicker.js +++ b/js/daterangepicker/qlodaterangepicker.js @@ -31,7 +31,8 @@ minDays: 2, startOfWeek: 'monday', hoveringTooltip: false, - container: '#page', + container: page_name == 'index' ? '#date-range-picker-container' : '#page', + inline: page_name == 'index', customArrowPrevSymbol: '', customArrowNextSymbol: '', getValue: function() diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css index a9f773a21..1eeacfa62 100644 --- a/modules/wkroomsearchblock/views/css/wk-global-search.css +++ b/modules/wkroomsearchblock/views/css/wk-global-search.css @@ -63,6 +63,15 @@ column-gap: 5px; grid-template-columns: repeat(2, 1fr); } +#date-range-picker-container { + position: absolute; +} +#date-range-picker-container.top { + bottom: 82px; +} +#date-range-picker-container.bottom { + top: 85px; +} /* #search_hotel_block_form { display: grid; grid-template-columns: 0.8fr repeat(3, 1fr) 0.6fr; @@ -169,6 +178,17 @@ background-color: #379bf0; color: #FFFFFF;} +.header-rmsearch-wrapper .location_search_results_ul.top { + top: unset; + bottom: 55px; } +.header-rmsearch-wrapper .location_search_results_ul.bottom { + top: 100%; } +.header-rmsearch-wrapper .hotel_dropdown_ul.top { + top: unset; + bottom: 100%; } +.header-rmsearch-wrapper .hotel_dropdown_ul.bottom { + top: 100%; } + .header-rmsearch-wrapper .label-desc-txt { font-size: 12px; @@ -217,6 +237,11 @@ box-shadow: 0 8px 25px -4px rgba(0,0,0,0.39); left: 0px; padding: 20px;} + #search_occupancy_wrapper.top { + top: unset; + bottom: 100%; } + #search_occupancy_wrapper.bottom { + top: 100%; } #search_occupancy_wrapper .occupancy-info-separator { margin-bottom: 15px; margin-top: 15px; diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index bfb5f13bc..7dcb7b66f 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -17,6 +17,43 @@ * @license https://store.webkul.com/license.html */ +const BookingSearchManager = { + inputSteps: { + 'location': { + selector: '#hotel_location', + activate: function() { $('#hotel_location').focus(); }, + inputHasValue: function () { return ($('#hotel_location').val() != '') && ($('#location_category_id').val() != ''); }, + }, + 'hotel': { + selector: '#id_hotel_button', + activate: function() { $('#id_hotel_button').click(); }, + inputHasValue: function () { return ($('#id_hotel').val() != '') && ($('#hotel_cat_id').val() != ''); }, + }, + 'date_range': { + selector: '#daterange_value', + activate: function() { $('#daterange_value').data('dateRangePicker').open(); }, + inputHasValue: function () { return ($('#check_in_time').val() != '') && ($('#check_out_time').val() != ''); }, + }, + 'occupancy': { + selector: '#guest_occupancy', + activate: function() { if ($('#search_occupancy_wrapper').css('display') == 'none') { $('#guest_occupancy').click().focus(); } }, + inputHasValue: function () { return false; }, + }, + 'submit': { + selector: '#search_room_submit', + activate: function() { $('#search_room_submit').focus(); }, + inputHasValue: function () { return false; }, + }, + }, + activateStep: function (step, force = false) { + if (step in this.inputSteps) { + if (force || !this.inputSteps[step].inputHasValue()) { + this.inputSteps[step].activate(); + } + } + }, +} + $(document).ready(function() { // for screen size changes for room search var window_width = $(window).width(); @@ -123,6 +160,8 @@ $(document).ready(function() { }).on('datepicker-change', function(event,obj){ $('#check_in_time').val($.datepicker.formatDate('yy-mm-dd', obj.date1)); $('#check_out_time').val($.datepicker.formatDate('yy-mm-dd', obj.date2)); + }).on('datepicker-closed', function() { + BookingSearchManager.activateStep('occupancy'); }); } @@ -184,30 +223,43 @@ $(document).ready(function() { }); // set data on clicking the searched location on dropdown + var focusHotelSelection = true; $(document).on('click', '.location_search_results_ul li', function(e) { + let currentLocationName = $('#hotel_location').val(); + let currentLocationId = $('#location_category_id').val(); + + $('.location_search_results_ul').empty().hide(); $('#hotel_location').attr('value', $(this).html()); $('#location_category_id').val($(this).val()); - $('.location_search_results_ul').empty().hide(); + // check if current location as same as previous one + if (currentLocationName != $(this).html() && currentLocationId != $(this).val()) { + $.ajax({ + url: autocomplete_search_url, + data: { + location_category_id: $('#location_category_id').val(), + }, + method: 'POST', + dataType: 'json', + success: function(result) { + if (result.status == 'success') { + $('#hotel_cat_id').val(''); + $('#hotel_cat_name').html('Select Hotel'); + $('.hotel_dropdown_ul').empty(); + $('.hotel_dropdown_ul').html(result.data); - $.ajax({ - url: autocomplete_search_url, - data: { - location_category_id: $('#location_category_id').val(), - }, - method: 'POST', - dataType: 'json', - success: function(result) { - if (result.status == 'success') { - $('#hotel_cat_id').val(''); - $('#hotel_cat_name').html('Select Hotel'); - $('.hotel_dropdown_ul').empty(); - $('.hotel_dropdown_ul').html(result.data); - } else { - alert(no_results_found_cond); + if (focusHotelSelection) { + BookingSearchManager.activateStep('hotel'); + focusHotelSelection = false; + } + } else { + alert(no_results_found_cond); + } } - } - }); + }); + } else { + BookingSearchManager.activateStep('hotel'); + } }); // navigate to prev and next li in the location/hotel dropdown @@ -268,6 +320,7 @@ $(document).ready(function() { $('#id_hotel').val($(this).attr('data-id-hotel')); $('#hotel_cat_id').val($(this).attr('data-hotel-cat-id')); $('#hotel_cat_name').html($(this).html()); + BookingSearchManager.activateStep('date_range'); }); // If only one hotel then set max order date on date pickers @@ -539,6 +592,7 @@ $(document).ready(function() { if (hasErrors == 0) { $("#search_occupancy_wrapper").hide(); $("#search_hotel_block_form #guest_occupancy").removeClass('error_border'); + BookingSearchManager.activateStep('submit'); } else { $("#search_hotel_block_form #guest_occupancy").addClass('error_border'); return false; @@ -547,6 +601,53 @@ $(document).ready(function() { } } }); + + if (page_name == 'index') { + // set search dropdown position handlers + $('#hotel_location, #id_hotel_button, #guest_occupancy').focus(function () { + setBookingSearchDropdownPositions(); + setBookingSearchCalendarPositions(); + }); + + $('#daterange_value').click(function () { + setBookingSearchDropdownPositions(); + setBookingSearchCalendarPositions(); + }); + } + + // handle Tab/Enter keypresses on input fields - start + $(document).on('keydown', '.location_search_results_ul li', function (e) { + if (e.which == 9 || e.which == 13) { // Tab/Enter key + if (e.which == 9) { + $(this).click(); + } + if ($('#id_hotel_button').length) { + focusHotelSelection = true; + } + } + }); + + $(document).on('keydown', '.hotel_dropdown_ul li', function (e) { + if (e.which == 9 || e.which == 13) { // Tab/Enter key + if (e.which == 9) { + $(this).click(); + } + if ($('#daterange_value').length) { + $('#daterange_value').click(); + } + } + }); + + $(document).on('keydown', '#guest_occupancy', function (e) { + e.preventDefault(); + if (e.which == 9) { // Tab key + if ($('#search_occupancy_wrapper').css('display') != 'none') { + $('#guest_occupancy').click(); + } + BookingSearchManager.activateStep('submit'); + } + }); + // handle Tab keypresses on input fields - end }); // function to set occupancy infor in guest occupancy field(search form) function setGuestOccupancy() @@ -579,4 +680,52 @@ function setGuestOccupancy() guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; } $('#guest_occupancy > span').text(guestButtonVal); -} \ No newline at end of file +} + +function setBookingSearchDropdownPositions() { + let inputFieldsAndDropdowns = [ + { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, + { input: $('#id_hotel_button'), dropdown: $('.dropdown-menu.hotel_dropdown_ul')}, + { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, + ]; + + $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { + // find available space + let inputFieldHeight = inputFieldAndDropdown.input.outerHeight(); + let spaceTop = inputFieldAndDropdown.input.offset().top - $(window).scrollTop(); + let spaceBottom = $(window).height() - inputFieldHeight - spaceTop; + let cssMaxHeight = inputFieldAndDropdown.dropdown.css('max-height') || '292px'; + let dropdownMaxHeight = parseInt(cssMaxHeight.replace('px', '')); + dropdownMaxHeight = Math.max(dropdownMaxHeight, 292); // 292 is height of the calendar + + let dropdownClass = 'bottom'; + if (spaceBottom < dropdownMaxHeight && spaceTop > spaceBottom) { + dropdownClass = 'top'; + } + + // position dropdown + inputFieldAndDropdown.dropdown.removeClass('top bottom').addClass(dropdownClass); + }); +} + +function setBookingSearchCalendarPositions() { + let calendarInputFields = [ + { input: $('#daterange_value'), calendarContainer: $('#date-range-picker-container')}, + ]; + + $(calendarInputFields).each(function (i, calendarInputField) { + // find available space + let inputFieldHeight = calendarInputField.input.outerHeight(); + let spaceTop = calendarInputField.input.offset().top - $(window).scrollTop(); + let spaceBottom = $(window).height() - inputFieldHeight - spaceTop; + let calendarHeight = 292; // 292 is height of the calendar + + let calendarContainerClass = 'bottom'; + if (spaceBottom < calendarHeight && spaceTop > spaceBottom) { + calendarContainerClass = 'top'; + } + + // position calendar + calendarInputField.calendarContainer.removeClass('top bottom').addClass(calendarContainerClass); + }); +} diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index 79e7bcf2f..a515da256 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -57,6 +57,9 @@
{l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
+ {if isset($is_index_page) && $is_index_page} +
+ {/if} {/if} diff --git a/themes/hotel-reservation-theme/css/daterangepicker.css b/themes/hotel-reservation-theme/css/daterangepicker.css index 5d07270cd..f1b6cbe07 100644 --- a/themes/hotel-reservation-theme/css/daterangepicker.css +++ b/themes/hotel-reservation-theme/css/daterangepicker.css @@ -29,6 +29,9 @@ margin-top: -4px; padding: 10px; } +#index .date-picker-wrapper.no-shortcuts { + margin-top: 0; +} .date-picker-wrapper .month-wrapper{ border: none; background-color: transparent; From 87ac2f128e29e59566debac0e129b18bb8d68a42 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 17 Oct 2023 17:47:07 +0530 Subject: [PATCH 002/106] Improve search flow --- .../classes/HotelHelper.php | 1 + .../AdminHotelGeneralSettingsController.php | 17 + .../classes/WkRoomSearchHelper.php | 1 + .../controllers/front/autocompletesearch.php | 42 +- .../wkroomsearchblock/views/css/chosen.css | 483 ++++++++++++++++++ .../views/img/chosen-sprite.png | Bin 0 -> 646 bytes .../views/img/chosen-sprite@2x.png | Bin 0 -> 872 bytes .../views/js/wk-room-search-block.js | 120 +++-- .../views/templates/front/hotel-options.tpl | 27 + .../views/templates/front/index.php | 29 ++ .../templates/front/location-options.tpl | 24 + .../views/templates/hook/searchForm.tpl | 36 +- .../wkroomsearchblock/wkroomsearchblock.php | 5 + 13 files changed, 707 insertions(+), 78 deletions(-) create mode 100644 modules/wkroomsearchblock/views/css/chosen.css create mode 100644 modules/wkroomsearchblock/views/img/chosen-sprite.png create mode 100644 modules/wkroomsearchblock/views/img/chosen-sprite@2x.png create mode 100644 modules/wkroomsearchblock/views/templates/front/hotel-options.tpl create mode 100644 modules/wkroomsearchblock/views/templates/front/index.php create mode 100644 modules/wkroomsearchblock/views/templates/front/location-options.tpl diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 447e95354..0cbce162e 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -199,6 +199,7 @@ class HotelHelper Configuration::updateValue('WK_HOTEL_LOCATION_ENABLE', 1); Configuration::updateValue('WK_HOTEL_NAME_ENABLE', 1); + Configuration::updateValue('WK_HOTEL_NAME_SEARCH_THRESHOLD', 5); Configuration::updateValue('WK_ROOM_LEFT_WARNING_NUMBER', 10); Configuration::updateValue('WK_HTL_ESTABLISHMENT_YEAR', 2010); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 74e120141..2a907425a 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -81,6 +81,15 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'hint' => $this->l('This option can be disabled if only one active hotel in the website. In case of more than one active hotel, Hotel Name will always be shown in the search panel.'), ), + 'WK_HOTEL_NAME_SEARCH_THRESHOLD' => array( + 'title' => $this->l('Hotel name search threshold'), + 'type' => 'text', + 'required' => true, + 'validation' => 'isUnsignedInt', + 'hint' => $this->l('Enter the number of hotels after which user can search hotel by name.'), + 'desc' => $this->l('Set to 0 to always show the search box.'), + 'class' => 'fixed-width-xxl', + ), ), 'submit' => array( 'title' => $this->l('Save'), @@ -290,6 +299,8 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController public function postProcess() { if (Tools::isSubmit('submitOptions'.$this->table)) { + $hotelNameSearchThreshold = Tools::getValue('WK_HOTEL_NAME_SEARCH_THRESHOLD'); + // check if field is atleast in default language. Not available in default prestashop $defaultLangId = Configuration::get('PS_LANG_DEFAULT'); $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); @@ -302,6 +313,12 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController // End occupancy fields validation + if (!$hotelNameSearchThreshold && $hotelNameSearchThreshold !== '0') { + $this->errors[] = $this->l('Hotel name search threshold field is required.'); + } elseif (!Validate::isUnsignedInt(Tools::getValue('WK_HOTEL_NAME_SEARCH_THRESHOLD'))) { + $this->errors[] = $this->l('Hotel name search threshold field is invalid.'); + } + 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/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php index 7ab3d7138..236dbeaae 100644 --- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php +++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php @@ -226,6 +226,7 @@ class WkRoomSearchHelper $smartyVars['hotels_info'] = $hotelsInfo; $smartyVars['show_hotel_name'] = Configuration::get('WK_HOTEL_NAME_ENABLE'); $smartyVars['max_child_age'] = Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'); + $smartyVars['hotel_name_search_threshold'] = (int) Configuration::get('WK_HOTEL_NAME_SEARCH_THRESHOLD'); $maxOrderDate = HotelOrderRestrictDate::getMaxOrderDate($idHotel); $smartyVars['max_order_date'] = date('Y-m-d', strtotime($maxOrderDate)); diff --git a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php index 4a051c103..487e9c2d2 100644 --- a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php +++ b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php @@ -29,29 +29,39 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro $location_category_id = Tools::getValue('location_category_id'); $obj_htl_info = new HotelBranchInformation(); if (isset($search_data) && $search_data) { - $return_data = $obj_htl_info->getHotelCategoryTree($search_data); - if ($return_data) { - $html = ''; - foreach ($return_data as $value) { - $html .= '
  • '. - $value['name'].'
    • '; - } + $locationCategories = $obj_htl_info->getHotelCategoryTree($search_data); + if ($locationCategories) { + $this->context->smarty->assign(array('location_categories' => $locationCategories)); + $html = $this->context->smarty->fetch( + $this->module->getTemplatePath('location-options.tpl') + ); $result['status'] = 'success'; $result['data'] = $html; } } elseif (isset($location_category_id) && $location_category_id) { - $cat_ids = Category::getAllCategoriesName($location_category_id); - if ($cat_ids) { - $html = ''; - foreach ($cat_ids as $value) { - if ($hotel_info = $obj_htl_info->hotelBranchInfoByCategoryId($value['id_category'])) { - $maxOrderDate = HotelOrderRestrictDate::getMaxOrderDate($hotel_info['id']); + $locationCategories = Category::getAllCategoriesName($location_category_id); + if ($locationCategories) { + $hotelsInfo = array(); + foreach ($locationCategories as $category) { + if ($hotelInfo = $obj_htl_info->hotelBranchInfoByCategoryId($category['id_category'])) { + $maxOrderDate = HotelOrderRestrictDate::getMaxOrderDate($hotelInfo['id']); $maxOrderDate = date('Y-m-d', strtotime($maxOrderDate)); - $html .= '
  • '. - $hotel_info['hotel_name'].'
    • '; + + $hotelsInfo[] = array( + 'id_hotel' => $hotelInfo['id'], + 'id_category' => $hotelInfo['id_category'], + 'hotel_name' => $hotelInfo['hotel_name'], + 'max_order_date' => $maxOrderDate, + ); } } + + $this->context->smarty->assign(array('hotels_info' => $hotelsInfo)); + $html = $this->context->smarty->fetch( + $this->module->getTemplatePath('hotel-options.tpl') + ); + + $result['status'] = 'success'; $result['data'] = $html; } else { diff --git a/modules/wkroomsearchblock/views/css/chosen.css b/modules/wkroomsearchblock/views/css/chosen.css new file mode 100644 index 000000000..c53604007 --- /dev/null +++ b/modules/wkroomsearchblock/views/css/chosen.css @@ -0,0 +1,483 @@ +/** + * 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 + */ + +/* @group Base */ +.chosen-container { + position: relative; + vertical-align: middle; + font-size: 14px; + zoom: 1; + display: inline; + -moz-user-select: -moz-none; + -ms-user-select: none; + -webkit-user-select: none; + user-select: none; +} +.chosen-container .chosen-drop { + position: absolute; + top: 0; + left: -9999px; + z-index: 1010; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; + border-top: 0; + box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); +} +.chosen-container.chosen-container-single-nosearch .chosen-drop { + top: 100%; +} +.chosen-container.chosen-with-drop .chosen-drop { + left: 0; +} +.chosen-container a { + cursor: pointer; +} + +/* @end */ +/* @group Single Chosen */ +.chosen-container-single .chosen-single { + position: relative; + display: block; + overflow: hidden; + padding-left: 35px; + height: 100%; + border: 1px solid #aaa; + border-radius: 4px; + background-clip: padding-box; + box-shadow: 0 0 3px #fff inset, 0 1px 1px rgba(0, 0, 0, 0.1); + color: #444; + text-decoration: none; + white-space: nowrap; + line-height: 24px; + background: #fff url('../img/icon-hotel.svg') no-repeat 10px 50%; +} +.chosen-container-single.error_border .chosen-single { + border: 2px solid red !important; +} + +.chosen-container-single .chosen-default { + color: #999; +} +.chosen-container-single .chosen-single span { + display: block; + overflow: hidden; + margin-right: 26px; + text-overflow: ellipsis; + white-space: nowrap; + position: relative; + top: 15px; + color: #333; +} +.chosen-container-single .chosen-single-with-deselect span { + margin-right: 38px; +} +.chosen-container-single .chosen-single abbr { + position: absolute; + top: 6px; + right: 26px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-single .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single.chosen-disabled .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single .chosen-single div { + position: absolute; + top: 0; + right: 0; + display: block; + width: 18px; + height: 100%; +} +.chosen-container-single .chosen-single div b { + display: block; + width: 100%; + height: 100%; + background: url('../../../../themes/hotel-reservation-theme/img/icon/icon-dropdown-arrow.svg') no-repeat calc(100% - 8px) 50%; +} +.chosen-container-single .chosen-search { + position: relative; + z-index: 1010; + margin: 0; + white-space: nowrap; + background: #fff; + border-radius: 4px; + height: 55px; +} +.chosen-container-single .chosen-search::after { + content: ''; + position: absolute; + top: 16px; + right: 1px; + height: 22px; + width: 19px; + background: url('../../../../themes/hotel-reservation-theme/img/icon/icon-dropdown-arrow.svg') no-repeat calc(100% - 8px) 50%; + /* background: url('../img/icon-hotel.svg') no-repeat 9px 50%; */ +} +.chosen-container-single .chosen-search input[type="text"] { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + margin: 0; + padding: 0; + padding-left: 35px; + width: 100%; + height: 100%; + outline: 0; + border: none; + font-size: 1em; + line-height: normal; + border-radius: 4px; + background: url('../img/icon-hotel.svg') no-repeat 9px 50%; +} +.chosen-container-single.chosen-container-active .chosen-search input[type="text"] { + border: 2px solid #1292FF; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} +.chosen-container-single .chosen-drop { + margin-top: -1px; + border-radius: 0 0 4px 4px; + background-clip: padding-box; +} +.chosen-container-single.chosen-container-single-nosearch .chosen-search { + position: absolute; + left: -9999px; +} + +/* @end */ +/* @group Results */ +.chosen-container .chosen-results { + position: relative; + overflow-x: hidden; + overflow-y: auto; + max-height: 240px; + background: #fff; + margin-top: 2px; + margin-bottom: 0; +} +.chosen-container .chosen-results li { + display: none; + margin: 0; + padding: 15px; + list-style: none; + color: #333; +} +.chosen-container .chosen-results li.active-result { + display: list-item; + cursor: pointer; +} +.chosen-container .chosen-results li.disabled-result { + display: list-item; + color: #ccc; + cursor: default; +} +.chosen-container .chosen-results li.highlighted { + background-color: #379bf0; + color: #fff; +} +.chosen-container .chosen-results li.no-results { + display: list-item; + background: #f4f4f4; +} +.chosen-container .chosen-results li.group-result { + display: list-item; + font-weight: bold; + cursor: default; +} +.chosen-container .chosen-results li.group-option { + padding-left: 15px; +} +.chosen-container .chosen-results li em { + font-style: normal; + text-decoration: underline; +} + +/* @end */ +/* @group Multi Chosen */ +.chosen-container-multi .chosen-choices { + position: relative; + overflow: hidden; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + margin: 0; + padding: 0; + width: 100%; + height: auto !important; + height: 1%; + border: 1px solid #aaa; + background-color: #fff; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2VlZWVlZSIvPjxzdG9wIG9mZnNldD0iMTUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); + background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: linear-gradient(#eeeeee 1%, #ffffff 15%); + cursor: text; +} +.chosen-container-multi .chosen-choices li { + float: left; + list-style: none; +} +.chosen-container-multi .chosen-choices li.search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} +.chosen-container-multi .chosen-choices li.search-field input[type="text"] { + margin: 1px 0; + padding: 5px; + height: 15px; + outline: 0; + border: 0 !important; + background: transparent !important; + box-shadow: none; + color: #666; + font-size: 100%; + line-height: normal; + border-radius: 0; +} +.chosen-container-multi .chosen-choices li.search-field .default { + color: #999; +} +.chosen-container-multi .chosen-choices li.search-choice { + position: relative; + margin: 3px 0 3px 5px; + padding: 3px 20px 3px 5px; + border: 1px solid #aaa; + border-radius: 3px; + background-color: #e4e4e4; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiNmNGY0ZjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iI2YwZjBmMCIvPjxzdG9wIG9mZnNldD0iNTIlIiBzdG9wLWNvbG9yPSIjZThlOGU4Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZWVlZWVlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-clip: padding-box; + box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + color: #333; + line-height: 13px; + cursor: default; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close { + position: absolute; + top: 4px; + right: 3px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-choices li.search-choice-disabled { + padding-right: 5px; + border: 1px solid #ccc; + background-color: #e4e4e4; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiNmNGY0ZjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iI2YwZjBmMCIvPjxzdG9wIG9mZnNldD0iNTIlIiBzdG9wLWNvbG9yPSIjZThlOGU4Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZWVlZWVlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + color: #666; +} +.chosen-container-multi .chosen-choices li.search-choice-focus { + background: #d4d4d4; +} +.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-results { + margin: 0; + padding: 0; +} +.chosen-container-multi .chosen-drop .result-selected { + display: list-item; + color: #ccc; + cursor: default; +} + +/* @end */ +/* @group Active */ +.chosen-container-active .chosen-single { + border: 2px solid #1292FF; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} +.chosen-container-active.chosen-with-drop .chosen-single div { + border-left: none; + background: transparent; +} +.chosen-container-active .chosen-choices { + border: 1px solid #5897fb; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +} +.chosen-container-active .chosen-choices li.search-field input[type="text"] { + color: #111 !important; +} + +/* @end */ +/* @group Disabled Support */ +.chosen-disabled { + opacity: 0.5 !important; + cursor: default; +} +.chosen-disabled .chosen-single { + cursor: default; +} +.chosen-disabled .chosen-choices .search-choice .search-choice-close { + cursor: default; +} + +/* chosen-drop top - start */ +.hotel-selector-wrap .chosen-container .chosen-drop.top .chosen-results { + position: absolute; + width: 100%; + bottom: calc(100% + 2px); +} +.hotel-selector-wrap .chosen-container.chosen-container-single-nosearch .chosen-drop.top .chosen-results { + position: absolute; + width: 100%; + bottom: calc(100% + 55px); +} +/* chosen-drop top - end */ + + +/* @end */ +/* @group Right to Left */ +.chosen-rtl { + text-align: right; +} +.chosen-rtl .chosen-single { + overflow: visible; + padding: 0 8px 0 0; +} +.chosen-rtl .chosen-single span { + margin-right: 0; + margin-left: 26px; + direction: rtl; +} +.chosen-rtl .chosen-single-with-deselect span { + margin-left: 38px; +} +.chosen-rtl .chosen-single div { + right: auto; + left: 3px; +} +.chosen-rtl .chosen-single abbr { + right: auto; + left: 26px; +} +.chosen-rtl .chosen-choices li { + float: right; +} +.chosen-rtl .chosen-choices li.search-field input[type="text"] { + direction: rtl; +} +.chosen-rtl .chosen-choices li.search-choice { + margin: 3px 5px 3px 0; + padding: 3px 5px 3px 19px; +} +.chosen-rtl .chosen-choices li.search-choice .search-choice-close { + right: auto; + left: 4px; +} +.chosen-rtl.chosen-container-single-nosearch .chosen-search, +.chosen-rtl .chosen-drop { + left: 9999px; +} +.chosen-rtl.chosen-container-single .chosen-results { + margin: 0 0 4px 4px; + padding: 0 4px 0 0; +} +.chosen-rtl .chosen-results li.group-option { + padding-right: 15px; + padding-left: 0; +} +.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div { + border-right: none; +} +.chosen-rtl .chosen-search input[type="text"] { + padding: 4px 5px 4px 20px; + background: #fff url('chosen-sprite.png') no-repeat -30px -20px; + background: url('chosen-sprite.png') no-repeat -30px -20px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2VlZWVlZSIvPjxzdG9wIG9mZnNldD0iMTUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background: url('chosen-sprite.png') no-repeat -30px -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); + background: url('chosen-sprite.png') no-repeat -30px -20px, -moz-linear-gradient(#eeeeee 1%, #ffffff 15%); + background: url('chosen-sprite.png') no-repeat -30px -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%); + background: url('chosen-sprite.png') no-repeat -30px -20px, linear-gradient(#eeeeee 1%, #ffffff 15%); + direction: rtl; +} +.chosen-rtl.chosen-container-single .chosen-single div b { + background-position: 6px 2px; +} +.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b { + background-position: -12px 2px; +} + +.chosen-container .chosen-drop.dropup { + border-bottom: 0; + border-top: 1px solid #aaa; + top: auto; + bottom: 40px; +} + +.chosen-container.chosen-with-drop .chosen-single.dropup { + background-image: none; +} + +.chosen-container.chosen-with-drop .chosen-drop.dropup { + box-shadow: none; + margin-bottom: -16px; +} + +/* @end */ +/* @group Retina compatibility */ +@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) { + .chosen-rtl .chosen-search input[type="text"], + .chosen-container-single .chosen-single abbr, + .chosen-container-single .chosen-single div b, + .chosen-container-single .chosen-search input[type="text"], + .chosen-container-multi .chosen-choices .search-choice .search-choice-close, + .chosen-container .chosen-results-scroll-down span, + .chosen-container .chosen-results-scroll-up span { + background-image: url('chosen-sprite@2x.png') !important; + background-size: 52px 37px !important; + background-repeat: no-repeat !important; + } +} +/* @end */ + +/* search results page - start */ +#category .chosen-container-single .chosen-single span { + min-height: 45px; + top: 11px; +} +/* search results page - end */ \ No newline at end of file diff --git a/modules/wkroomsearchblock/views/img/chosen-sprite.png b/modules/wkroomsearchblock/views/img/chosen-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..3611ae4ace1c4b1cbeacd6145b5a79cbc72e0bdc GIT binary patch literal 646 zcmV;10(t$3P)0006_Nkl&pbAC0n?)s%2x5M$#UgGxI1~gymp~v; zh<`zGaTJP5BybQY4tlRo;SIcmE0t>ueW3>*u6N;@_u;;|BoL8PuhZ#FWY9$(flan1oVvxDBL8~}0Q5z;^2p>Ov z7}Q$E7=l>$BZLUt1*uKMCaQwKYf$lsJCyerWMd+%BeGH6f_f&Vpy%=$BN%uK%Ahxi zF+%Jj=Pc-WXF;djSiJw|m4>cN%^Fi|FBZ!E{_yJLS?RI<3U696XLkQSs z{{&kQJ$K(#5CgC1;GbA>mjm56zJZ^-Hg2_ASKI_K@CybPh7Rq}8ud``)NM~eZx}qT z)oK?Lf>t!B;%Uh}*P+)Ef?jbx#w|BNEVb(l{2LK}m#fw4xx>ddF;&j}!S{N-e!<&Q z?kvzyI_AT@H-u4tUz1h&GCh8>?TnA~?BZ7WGP<9`r gQ6DuZO!_~60ju@{TzXF%TmS$707*qoM6N<$g2#CqL;wH) literal 0 HcmV?d00001 diff --git a/modules/wkroomsearchblock/views/img/chosen-sprite@2x.png b/modules/wkroomsearchblock/views/img/chosen-sprite@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ffe4d7d1121ca45cd35783696940050c690a8676 GIT binary patch literal 872 zcmeAS@N?(olHy`uVBq!ia0vp^89?mC!3-o5mOWetq|OBRgt-3y{~yTgfB`oc01C8& zL0el}Lqh|Q1oD8A5J8A6G6@lfkU;ftMr&&;+$f+RkloVK0wm!8C|FWb0x`e2xj8g6 z6i7l;BAWwL4-tfu5G@ccP!{MmqnYOy06pVW666=m!0_*bfx(A_gav;C1PU5HKT!C5 z;g7@l4POuZ{>hQBP{j4uqq`I2WP9&Sn{}I8xJi*&v*QL&+Dw-Bf-CQLyLk0Ht2-;T zynum$iPO`?F{C2y?bYjfj|~J`6Xz~`vM4Ef+U{Vpli%)D%kKSey_RG0Bi9Xw4jtOb z@!)?~_%DVelO793W#Pl3vjdNCDTnGGb(^YY+BbF2;mJK!nq}@nBGoHxCn#7X*gdxr z+~ZQF6rpL6;MDP)JzehcJBL53AM-QU?@65Plc4-}1EW@`H@EEGrnFmTubZ~5iUzVn zrZYyBIm|RmW$3F@+wkq2)c>|mGh5Rv3%(p~zjStyruBl(TP2_51LpTH2noN*e&}J; z1;$+4EpJ(Mb+^1}Fv>ms%b`r}+KYy~zf5x(4?8l28%eNnEHzx({;NGP)_hX&tEw9t zSKv=Qjt(d#~b;F7hbDdUu$OUK8iumkkl&-=~$APCd2zdqHg6@=Z#Pt*5RY_s@Hw*YS9+ z^u)7AmzM6Ux!dus_!gJY)Vtf?+t>a3wO2S)_Vct=T}#@RuG(h!d8WYZS9Tst+VfKv zt~zntPsvfyqLY`klZSPslCz_dlcSRJLa$Px)_+W2Y&u!?oJrIMCNTz2S3j3^P6 spaceBottom) { - dropdownClass = 'top'; - } + dropdownHeightMax = Math.max(dropdownHeightMax, dropdownHeight); + spaceTopMax = Math.max(spaceTopMax, spaceTop); + spaceBottomMax = Math.max(spaceBottomMax, spaceBottom); + }); - // position dropdown + let dropdownClass = 'bottom'; + if (spaceBottomMax < dropdownHeightMax && spaceTopMax > spaceBottomMax) { + dropdownClass = 'top'; + } + + $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { inputFieldAndDropdown.dropdown.removeClass('top bottom').addClass(dropdownClass); }); } diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options.tpl new file mode 100644 index 000000000..8c4c9912a --- /dev/null +++ b/modules/wkroomsearchblock/views/templates/front/hotel-options.tpl @@ -0,0 +1,27 @@ +{** + * 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 + *} + + +{if isset($hotels_info) && is_array($hotels_info)} + {foreach from=$hotels_info item=hotel_info} + + {/foreach} +{/if} diff --git a/modules/wkroomsearchblock/views/templates/front/index.php b/modules/wkroomsearchblock/views/templates/front/index.php new file mode 100644 index 000000000..1ad696d30 --- /dev/null +++ b/modules/wkroomsearchblock/views/templates/front/index.php @@ -0,0 +1,29 @@ +{$category.name} + {/foreach} +{/if} diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index a515da256..ad5a675eb 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -1,7 +1,7 @@
    {if isset($location_enabled) && $location_enabled}
    - +
      @@ -16,29 +16,19 @@ {else}
      - {if isset($hotels_info) && count($hotels_info)} -
      - - - - + + + + - -
        - {if isset($hotels_info) && $hotels_info} - {foreach $hotels_info as $name_val} -
      • {$name_val['hotel_name']|escape:'htmlall':'UTF-8'}
        • - {/foreach} - {/if} -
      -
      - {/if} +
      + +
      {/if} {if isset($multiple_dates_input) && $multiple_dates_input} diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php index f40e7f0f1..31e42af68 100644 --- a/modules/wkroomsearchblock/wkroomsearchblock.php +++ b/modules/wkroomsearchblock/wkroomsearchblock.php @@ -51,6 +51,9 @@ class WkRoomSearchBlock extends Module $objHotelBranchInformation = new HotelBranchInformation(); $hotelBranchesInfo = $objHotelBranchInformation->hotelBranchesInfo(0, 1); if (is_array($hotelBranchesInfo) && count($hotelBranchesInfo)) { + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/jquery.chosen.js'); + $this->context->controller->addCSS($this->_path.'/views/css/chosen.css'); + $this->context->controller->addCSS($this->_path.'/views/css/wk-global-search.css'); $this->context->controller->addJS($this->_path.'/views/js/wk-room-search-block.js'); @@ -66,6 +69,7 @@ class WkRoomSearchBlock extends Module 'check_out_time_cond' => $this->l('Please enter Check Out time', false, true), 'less_checkin_date' => $this->l('Check In date can not be before current date.', false, true), 'more_checkout_date' => $this->l('Check Out date must be greater than Check In date.', false, true), + 'hotel_location_txt' => $this->l('Hotel Location', false, true), 'select_htl_txt' => $this->l('Select Hotel', false, true), 'select_age_txt' => $this->l('Select age', false, true), 'under_1_age' => $this->l('Under 1', false, true), @@ -80,6 +84,7 @@ class WkRoomSearchBlock extends Module 'years_txt' => $this->l('years', false, true), 'all_children_txt' => $this->l('All Children', false, true), 'invalid_occupancy_txt' => $this->l('Invalid occupancy(adults/children) found.', false, true), + 'hotel_name_has_search' => count($hotelBranchesInfo) >= Configuration::get('WK_HOTEL_NAME_SEARCH_THRESHOLD'), ) ); } From be6148c2d1e3458a2c234c25536879f928562e37 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 18 Oct 2023 19:16:22 +0530 Subject: [PATCH 003/106] Change Hotel location icon --- themes/hotel-reservation-theme/css/global.css | 2 +- themes/hotel-reservation-theme/img/icon/icon-location.svg | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 themes/hotel-reservation-theme/img/icon/icon-location.svg diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index 3cd05730d..9e952e5bf 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -6534,7 +6534,7 @@ table.table_block td { transform: scale(0.8, 0.6);} .input-hotel, .form-control .input-hotel, .input-location, .form-control .input-location { - background: url("../img/icon/icon-hotel.svg") no-repeat 10px 50%; + background: url("../img/icon/icon-location.svg") no-repeat 10px 50%; padding-left: 35px; background-color: #FFF; } diff --git a/themes/hotel-reservation-theme/img/icon/icon-location.svg b/themes/hotel-reservation-theme/img/icon/icon-location.svg new file mode 100644 index 000000000..830c4304b --- /dev/null +++ b/themes/hotel-reservation-theme/img/icon/icon-location.svg @@ -0,0 +1,4 @@ + + + + From 2726dbd4cd10ff7845a2051cd9d76741b4e505b4 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Nov 2023 19:33:45 +0530 Subject: [PATCH 004/106] Add dropdown fallback --- .../AdminHotelGeneralSettingsController.php | 2 +- .../controllers/front/autocompletesearch.php | 10 +- .../wkroomsearchblock/views/css/chosen.css | 24 +--- .../views/css/wk-category-search.css | 6 + .../views/css/wk-global-search.css | 18 ++- .../views/js/wk-room-search-block.js | 118 ++++++++++-------- .../front/hotel-options-dropdown.tpl | 26 ++++ ...l-options.tpl => hotel-options-select.tpl} | 0 .../views/templates/hook/searchForm.tpl | 38 ++++-- 9 files changed, 153 insertions(+), 89 deletions(-) create mode 100644 modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl rename modules/wkroomsearchblock/views/templates/front/{hotel-options.tpl => hotel-options-select.tpl} (100%) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 2a907425a..38d6b95e1 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -315,7 +315,7 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController if (!$hotelNameSearchThreshold && $hotelNameSearchThreshold !== '0') { $this->errors[] = $this->l('Hotel name search threshold field is required.'); - } elseif (!Validate::isUnsignedInt(Tools::getValue('WK_HOTEL_NAME_SEARCH_THRESHOLD'))) { + } elseif (!Validate::isUnsignedInt($hotelNameSearchThreshold)) { $this->errors[] = $this->l('Hotel name search threshold field is invalid.'); } diff --git a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php index 487e9c2d2..696179ef5 100644 --- a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php +++ b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php @@ -57,13 +57,17 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro } $this->context->smarty->assign(array('hotels_info' => $hotelsInfo)); - $html = $this->context->smarty->fetch( - $this->module->getTemplatePath('hotel-options.tpl') + $html_select = $this->context->smarty->fetch( + $this->module->getTemplatePath('hotel-options-select.tpl') ); + $html_dropdown = $this->context->smarty->fetch( + $this->module->getTemplatePath('hotel-options-dropdown.tpl') + ); $result['status'] = 'success'; - $result['data'] = $html; + $result['data_select'] = $html_select; + $result['data_dropdown'] = $html_dropdown; } else { $result['status'] = 'failed2'; } diff --git a/modules/wkroomsearchblock/views/css/chosen.css b/modules/wkroomsearchblock/views/css/chosen.css index c53604007..8ff89bf18 100644 --- a/modules/wkroomsearchblock/views/css/chosen.css +++ b/modules/wkroomsearchblock/views/css/chosen.css @@ -23,7 +23,7 @@ vertical-align: middle; font-size: 14px; zoom: 1; - display: inline; + /* display: inline; */ -moz-user-select: -moz-none; -ms-user-select: none; -webkit-user-select: none; @@ -59,7 +59,7 @@ overflow: hidden; padding-left: 35px; height: 100%; - border: 1px solid #aaa; + border: 1px solid #555555; border-radius: 4px; background-clip: padding-box; box-shadow: 0 0 3px #fff inset, 0 1px 1px rgba(0, 0, 0, 0.1); @@ -68,6 +68,7 @@ white-space: nowrap; line-height: 24px; background: #fff url('../img/icon-hotel.svg') no-repeat 10px 50%; + min-height: 55px; } .chosen-container-single.error_border .chosen-single { border: 2px solid red !important; @@ -458,26 +459,9 @@ margin-bottom: -16px; } -/* @end */ -/* @group Retina compatibility */ -@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) { - .chosen-rtl .chosen-search input[type="text"], - .chosen-container-single .chosen-single abbr, - .chosen-container-single .chosen-single div b, - .chosen-container-single .chosen-search input[type="text"], - .chosen-container-multi .chosen-choices .search-choice .search-choice-close, - .chosen-container .chosen-results-scroll-down span, - .chosen-container .chosen-results-scroll-up span { - background-image: url('chosen-sprite@2x.png') !important; - background-size: 52px 37px !important; - background-repeat: no-repeat !important; - } -} -/* @end */ - /* search results page - start */ #category .chosen-container-single .chosen-single span { min-height: 45px; top: 11px; } -/* search results page - end */ \ No newline at end of file +/* search results page - end */ diff --git a/modules/wkroomsearchblock/views/css/wk-category-search.css b/modules/wkroomsearchblock/views/css/wk-category-search.css index fd3ce4f30..d5ee2fce4 100644 --- a/modules/wkroomsearchblock/views/css/wk-category-search.css +++ b/modules/wkroomsearchblock/views/css/wk-category-search.css @@ -48,6 +48,12 @@ height: unset; min-height: 45px; } + #search_hotel_block_form .hotel-selector-wrap .chosen-container-single .chosen-single { + min-height: 45px; + } + #search_hotel_block_form .hotel-selector-wrap .chosen-container-single .chosen-search { + height: 45px; + } /* #search_hotel_block_form #search_room_submit { height: 45px; } */ diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css index 1eeacfa62..aecd6bdf4 100644 --- a/modules/wkroomsearchblock/views/css/wk-global-search.css +++ b/modules/wkroomsearchblock/views/css/wk-global-search.css @@ -72,6 +72,12 @@ #date-range-picker-container.bottom { top: 85px; } +.fancybox-wrap #search_hotel_block_form .form-group.xs-calendar { + position: relative; +} +.fancybox-wrap #search_hotel_block_form #date-range-picker-container { + top: 56px; +} /* #search_hotel_block_form { display: grid; grid-template-columns: 0.8fr repeat(3, 1fr) 0.6fr; @@ -126,14 +132,16 @@ color: #333;} .header-rmsearch-input:-moz-placeholder { /* Firefox 18- */ - color: #999999; - font-weight: 400;} + color: #333; + font-weight: 400; + opacity: 1;} .header-rmsearch-input::-moz-placeholder { /* Firefox 19+ */ - color: #999999; - font-weight: 400;} + color: #333; + font-weight: 400; + opacity: 1;} .header-rmsearch-input:-ms-input-placeholder { - color: #999999; + color: #333; font-weight: 400;} .search_block_container .dropdown-toggle { background-color: #f2f2f2; diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 4c96e5abf..415a6cf65 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -86,9 +86,14 @@ $(document).ready(function() { helpers: { overlay: { closeClick: false } //Disable click outside event }, + 'beforeShow': function() { + $('#date-range-picker-container').closest('.form-group').addClass('xs-calendar'); + }, 'afterClose': function() { $('.header-rmsearch-container').show(); $('#xs_room_search_form').show(); + + $('#date-range-picker-container').closest('.form-group').removeClass('xs-calendar'); }, }); }); @@ -250,7 +255,9 @@ $(document).ready(function() { success: function(result) { if (result.status == 'success') { $('#hotel_cat_id').val(''); - $('#id_hotel_button').html(result.data); + $('#id_hotel_button').html(result.data_select); + $('.hotel_dropdown_ul').empty(); + $('.hotel_dropdown_ul').html(result.data_dropdown); $('#id_hotel_button').trigger('chosen:updated'); if (focusHotelSelection) { @@ -312,9 +319,7 @@ $(document).ready(function() { } }); - $(document).on('change', '#id_hotel_button', function() { - let selectedHotel = $(this).find('option:selected'); - + function selectHotelFromList(selectedHotel) { let max_order_date = $(selectedHotel).attr('data-max_order_date'); let preparation_time = $(selectedHotel).attr('data-preparation_time') @@ -327,6 +332,14 @@ $(document).ready(function() { $('#hotel_cat_name').html($(selectedHotel).html()); BookingSearchManager.activateStep('date_range'); + } + + $(document).on('change', '#id_hotel_button', function() { + selectHotelFromList($(this).find('option:selected')); + }); + + $(document).on('click', '.hotel_dropdown_ul li', function() { + selectHotelFromList($(this)); }); // If only one hotel then set max order date on date pickers @@ -612,22 +625,19 @@ $(document).ready(function() { }); if (page_name == 'index') { - $('#hotel_location, #guest_occupancy').focus(function () { - setBookingSearchDropdownPositions(); - setBookingSearchCalendarPositions(); + $('#hotel_location, #id_hotel_button, #guest_occupancy').focus(function () { + setBookingSearchPositions(); }); // after chosen has been initialized $('select#id_hotel_button').on('chosen:ready', function() { $('#id_hotel_button_chosen .chosen-search input').focus(function () { - setBookingSearchDropdownPositions(); - setBookingSearchCalendarPositions(); + setBookingSearchPositions(); }); }); $('#daterange_value').click(function () { - setBookingSearchDropdownPositions(); - setBookingSearchCalendarPositions(); + setBookingSearchPositions(); }); } @@ -681,6 +691,12 @@ $(document).ready(function() { $(this).siblings('.chosen-container').find('.chosen-single').removeClass('invisible') }); } + + // if hotel chosen is not intialized use dropdown + if ($('select#id_hotel_button').data('chosen') === undefined) { + $('#search_hotel_block_form .hotel-select-wrap').addClass('hide'); + $('#search_hotel_block_form .hotel-dropdown-wrap').removeClass('hide'); + } }); // function to set occupancy infor in guest occupancy field(search form) function setGuestOccupancy() @@ -715,59 +731,55 @@ function setGuestOccupancy() $('#guest_occupancy > span').text(guestButtonVal); } -function setBookingSearchDropdownPositions() { +// position dropdowns and the calendar +function setBookingSearchPositions() { + // calculate available spaces + let searchForm = $('#search_hotel_block_form'); + let inputFieldsAndDropdowns = [ { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, + { input: $('#id_hotel_button'), dropdown: $('.hotel_dropdown_ul')}, { input: $('.hotel-selector-wrap'), dropdown: $('#id_hotel_button_chosen .chosen-drop')}, { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, ]; - let dropdownHeightMax = 0; - let spaceTopMax = 0; - let spaceBottomMax = 0; + let calendarInputField = { input: $('#daterange_value'), calendarContainer: $('#date-range-picker-container')}; - $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { - // find available space - let inputFieldHeight = inputFieldAndDropdown.input.outerHeight(); - let spaceTop = inputFieldAndDropdown.input.offset().top - $(window).scrollTop(); - let spaceBottom = $(window).height() - inputFieldHeight - spaceTop; - let cssMaxHeight = inputFieldAndDropdown.dropdown.css('max-height') || '292px'; - let dropdownHeight = parseInt(cssMaxHeight.replace('px', '')); - dropdownHeight = Math.max(dropdownHeight || 0, 292); // 292 is height of the calendar + let positionClass = 'bottom'; + if (!searchForm.closest('.fancybox-wrap').length) { + let searchFormHeight = searchForm.outerHeight(); + let spaceTop = searchForm.offset().top - $(window).scrollTop(); + let spaceBottom = $(window).height() - searchFormHeight - spaceTop; - dropdownHeightMax = Math.max(dropdownHeightMax, dropdownHeight); - spaceTopMax = Math.max(spaceTopMax, spaceTop); - spaceBottomMax = Math.max(spaceBottomMax, spaceBottom); - }); + let calendarHeight = 292; - let dropdownClass = 'bottom'; - if (spaceBottomMax < dropdownHeightMax && spaceTopMax > spaceBottomMax) { - dropdownClass = 'top'; + // calculate max height for dropdowns + let maxHeightNeeded = 0; + $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { + if (!inputFieldAndDropdown.input.length) return false; + + // find needed space height + let cssMaxHeight = inputFieldAndDropdown.dropdown.css('max-height') || calendarHeight + 'px'; + let dropdownHeight = parseInt(cssMaxHeight.replace('px', '')); + dropdownHeight = Math.max(dropdownHeight || 0, calendarHeight); + + maxHeightNeeded = Math.max(maxHeightNeeded, dropdownHeight); + }); + + // manage calendar now + maxHeightNeeded = Math.max(maxHeightNeeded, calendarHeight); + + // determine position class + if (spaceBottom < maxHeightNeeded && spaceTop > spaceBottom) { + positionClass = 'top'; + } } + // position dropdowns $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { - inputFieldAndDropdown.dropdown.removeClass('top bottom').addClass(dropdownClass); - }); -} - -function setBookingSearchCalendarPositions() { - let calendarInputFields = [ - { input: $('#daterange_value'), calendarContainer: $('#date-range-picker-container')}, - ]; - - $(calendarInputFields).each(function (i, calendarInputField) { - // find available space - let inputFieldHeight = calendarInputField.input.outerHeight(); - let spaceTop = calendarInputField.input.offset().top - $(window).scrollTop(); - let spaceBottom = $(window).height() - inputFieldHeight - spaceTop; - let calendarHeight = 292; // 292 is height of the calendar - - let calendarContainerClass = 'bottom'; - if (spaceBottom < calendarHeight && spaceTop > spaceBottom) { - calendarContainerClass = 'top'; - } - - // position calendar - calendarInputField.calendarContainer.removeClass('top bottom').addClass(calendarContainerClass); + inputFieldAndDropdown.dropdown.removeClass('top bottom').addClass(positionClass); }); + + // position calendar + calendarInputField.calendarContainer.removeClass('top bottom').addClass(positionClass); } diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl new file mode 100644 index 000000000..9f6431809 --- /dev/null +++ b/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl @@ -0,0 +1,26 @@ +{** + * 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 + *} + +{if isset($hotels_info) && is_array($hotels_info)} + {foreach from=$hotels_info item=hotel_info} +
    • + {$hotel_info.hotel_name} +
      • + {/foreach} +{/if} diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl similarity index 100% rename from modules/wkroomsearchblock/views/templates/front/hotel-options.tpl rename to modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index ad5a675eb..711755b4a 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -21,13 +21,37 @@ -
      - +
      +
      + +
      +
      +
      + {if isset($hotels_info) && count($hotels_info)} +
      + +
        + {if isset($hotels_info) && $hotels_info} + {foreach $hotels_info as $name_val} +
      • + {$name_val['hotel_name']|escape:'htmlall':'UTF-8'} +
        • + {/foreach} + {/if} +
      +
      + {/if}
      {/if} From 273e96bc064bd966bc58d6e696a6cc01d685f464 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 11:35:48 +0530 Subject: [PATCH 005/106] Fix minor issues, make auto focus optional --- .../classes/HotelHelper.php | 1 + .../AdminHotelGeneralSettingsController.php | 17 ++ .../wkroomsearchblock/views/css/chosen.css | 3 + .../views/css/wk-global-search.css | 2 + .../views/js/wk-room-search-block.js | 155 ++++++++++++------ .../views/templates/hook/searchForm.tpl | 2 +- .../wkroomsearchblock/wkroomsearchblock.php | 6 + 7 files changed, 136 insertions(+), 50 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 0cbce162e..8a7a6ab59 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -200,6 +200,7 @@ class HotelHelper Configuration::updateValue('WK_HOTEL_LOCATION_ENABLE', 1); Configuration::updateValue('WK_HOTEL_NAME_ENABLE', 1); Configuration::updateValue('WK_HOTEL_NAME_SEARCH_THRESHOLD', 5); + Configuration::updateValue('WK_SEARCH_AUTO_FOCUS_NEXT_FIELD', 1); Configuration::updateValue('WK_ROOM_LEFT_WARNING_NUMBER', 10); Configuration::updateValue('WK_HTL_ESTABLISHMENT_YEAR', 2010); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 38d6b95e1..bc8d8bc93 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -81,6 +81,23 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'hint' => $this->l('This option can be disabled if only one active hotel in the website. In case of more than one active hotel, Hotel Name will always be shown in the search panel.'), ), + 'WK_SEARCH_AUTO_FOCUS_NEXT_FIELD' => array( + 'title' => $this->l('Focus next field automatically'), + 'cast' => 'intval', + 'type' => 'bool', + 'default' => '0', + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + ), + array( + 'id' => 'active_off', + 'value' => 0, + ), + ), + 'hint' => $this->l('Enable if you want the next booking search field to be focused automatically after setting value for a field.'), + ), 'WK_HOTEL_NAME_SEARCH_THRESHOLD' => array( 'title' => $this->l('Hotel name search threshold'), 'type' => 'text', diff --git a/modules/wkroomsearchblock/views/css/chosen.css b/modules/wkroomsearchblock/views/css/chosen.css index 8ff89bf18..b5b31fd7a 100644 --- a/modules/wkroomsearchblock/views/css/chosen.css +++ b/modules/wkroomsearchblock/views/css/chosen.css @@ -70,6 +70,9 @@ background: #fff url('../img/icon-hotel.svg') no-repeat 10px 50%; min-height: 55px; } +.chosen-container-single.error_border { + border: none !important; +} .chosen-container-single.error_border .chosen-single { border: 2px solid red !important; } diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css index aecd6bdf4..b5f3e2e44 100644 --- a/modules/wkroomsearchblock/views/css/wk-global-search.css +++ b/modules/wkroomsearchblock/views/css/wk-global-search.css @@ -124,6 +124,8 @@ #search_hotel_block_form .input-date { display: grid; cursor: text;} + #search_hotel_block_form .input-date.focused { + border: 2px solid #1292FF; } #search_hotel_block_form .input-date span { align-self: center;} #search_hotel_block_form .input-date span i { diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 415a6cf65..418d39d6d 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -45,11 +45,9 @@ const BookingSearchManager = { inputHasValue: function () { return false; }, }, }, - activateStep: function (step, force = false) { + activateStep: function (step) { if (step in this.inputSteps) { - if (force || !this.inputSteps[step].inputHasValue()) { - this.inputSteps[step].activate(); - } + this.inputSteps[step].activate(); } }, allFieldsFilled: function () { @@ -169,9 +167,22 @@ $(document).ready(function() { }).on('datepicker-change', function(event,obj){ $('#check_in_time').val($.datepicker.formatDate('yy-mm-dd', obj.date1)); $('#check_out_time').val($.datepicker.formatDate('yy-mm-dd', obj.date2)); + focusNextOnCalendarClose = true; + }).on('datepicker-open', function() { + $('#daterange_value').addClass('focused').focus(); + }).on('datepicker-close', function() { + $('#daterange_value').removeClass('focused').blur(); }).on('datepicker-closed', function() { - if ($('#check_in_time').val() != '' && $('#check_out_time').val() != '') { - BookingSearchManager.activateStep('occupancy'); + if (search_auto_focus_next_field && focusNextOnCalendarClose) { + if (is_occupancy_wise_search) { + if ($('#check_in_time').val() != '' && $('#check_out_time').val() != '') { + BookingSearchManager.activateStep('occupancy'); + } + } else { + if (BookingSearchManager.allFieldsFilled()) { + BookingSearchManager.activateStep('submit'); + } + } } }); } @@ -193,6 +204,10 @@ $(document).ready(function() { // search location with users searched characters $(document).on('keyup', "#hotel_location", function(e) { + if (e.which == 13) { + return; + } + if (($('.location_search_results_ul').is(':visible')) && (e.which == 40 || e.which == 38)) { $(this).blur(); if (e.which == 40) { @@ -233,45 +248,51 @@ $(document).ready(function() { } }); + var focusNextOnCalendarClose = true; + // check if user clicked outside calendar + $('body').on('click', function(e) { + if ($('#date-range-picker-container').is(':visible')) { + if (!$(e.target).closest('.form-group').find('#date-range-picker-container').length) { + focusNextOnCalendarClose = false; + } + } + }); + // set data on clicking the searched location on dropdown var focusHotelSelection = true; $(document).on('click', '.location_search_results_ul li', function(e) { - let currentLocationName = $('#hotel_location').val(); - let currentLocationId = $('#location_category_id').val(); + e.preventDefault(); $('.location_search_results_ul').empty().hide(); $('#hotel_location').attr('value', $(this).html()); $('#location_category_id').val($(this).val()); - // check if current location as same as previous one - if (currentLocationName != $(this).html() && currentLocationId != $(this).val()) { - $.ajax({ - url: autocomplete_search_url, - data: { - location_category_id: $('#location_category_id').val(), - }, - method: 'POST', - dataType: 'json', - success: function(result) { - if (result.status == 'success') { - $('#hotel_cat_id').val(''); - $('#id_hotel_button').html(result.data_select); - $('.hotel_dropdown_ul').empty(); - $('.hotel_dropdown_ul').html(result.data_dropdown); - $('#id_hotel_button').trigger('chosen:updated'); + // fetch hotels for selected location + $.ajax({ + url: autocomplete_search_url, + data: { + location_category_id: $('#location_category_id').val(), + }, + method: 'POST', + dataType: 'json', + success: function(result) { + if (result.status == 'success') { + $('#hotel_cat_id').val(''); + $('#id_hotel_button').html(result.data_select); + $('.hotel_dropdown_ul').empty(); + $('.hotel_dropdown_ul').html(result.data_dropdown); + $('#id_hotel_button').trigger('chosen:updated'); - if (focusHotelSelection) { - BookingSearchManager.activateStep('hotel'); - focusHotelSelection = false; - } - } else { - alert(no_results_found_cond); + if (search_auto_focus_next_field) { + BookingSearchManager.activateStep('hotel'); } + } else { + alert(no_results_found_cond); } - }); - } else { - BookingSearchManager.activateStep('hotel'); - } + } + }); + + $('#id_hotel_button_chosen .chosen-search input').blur(); }); // prevents calendar from closing on hotel selection @@ -331,10 +352,17 @@ $(document).ready(function() { $('#hotel_cat_id').val($(selectedHotel).attr('data-hotel-cat-id')); $('#hotel_cat_name').html($(selectedHotel).html()); - BookingSearchManager.activateStep('date_range'); + if (search_auto_focus_next_field) { + setTimeout(function () { + $('#id_hotel_button').data('chosen').close_field(); + }, 10); + + BookingSearchManager.activateStep('date_range'); + } } $(document).on('change', '#id_hotel_button', function() { + $('#id_hotel_button_chosen .chosen-search input').blur(); selectHotelFromList($(this).find('option:selected')); }); @@ -562,7 +590,9 @@ $(document).ready(function() { // toggle occupancy block $('#guest_occupancy').on('click', function(e) { e.stopPropagation(); - $('#daterange_value').data('dateRangePicker').close(); + if ($('#date-range-picker-container').is(':visible')) { + $('#daterange_value').data('dateRangePicker').close(); + } $("#search_occupancy_wrapper").toggle(); }); @@ -612,9 +642,6 @@ $(document).ready(function() { if (hasErrors == 0) { $("#search_occupancy_wrapper").hide(); $("#search_hotel_block_form #guest_occupancy").removeClass('error_border'); - if (BookingSearchManager.allFieldsFilled()) { - BookingSearchManager.activateStep('submit'); - } } else { $("#search_hotel_block_form #guest_occupancy").addClass('error_border'); return false; @@ -642,18 +669,23 @@ $(document).ready(function() { } // handle Tab/Enter keypresses on input fields - start - $(document).on('keydown', '.location_search_results_ul li', function (e) { - if (e.which == 9 || e.which == 13) { // Tab/Enter key - if (e.which == 9) { + $(document).on('keydown', '#hotel_location', function (e) { + if (e.which == 9) { // Tab key + if ($('.location_search_results_ul').is(':visible')) { e.preventDefault(); - $(this).click(); - } - if ($('#id_hotel_button').length) { - focusHotelSelection = true; + + $('.location_search_results_ul li:first').focus().click(); } } }); + $(document).on('keydown', '.location_search_results_ul li', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + $(this).click(); + } + }); + $(document).on('keydown', '.hotel_dropdown_ul li', function (e) { if (e.which == 9 || e.which == 13) { // Tab/Enter key if (e.which == 9) { @@ -665,16 +697,41 @@ $(document).ready(function() { } }); - $(document).on('keydown', '#guest_occupancy', function (e) { - e.preventDefault(); + $(document).on('keydown', '#id_hotel_button_chosen.chosen-container-active', function (e) { if (e.which == 9) { // Tab key + e.preventDefault(); + if ($('#daterange_value').length) { + $('#daterange_value').focus(); + $('#daterange_value').click(); + } + } + }); + + $(document).on('keydown', '#daterange_value', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + $('#daterange_value').removeClass('focused').blur(); + + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + $('#daterange_value').data('dateRangePicker').close(); + BookingSearchManager.activateStep('submit'); + } + } + }); + + $(document).on('keydown', '#guest_occupancy', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); if ($('#search_occupancy_wrapper').css('display') != 'none') { $('#guest_occupancy').click(); } + BookingSearchManager.activateStep('submit'); } }); - // handle Tab keypresses on input fields - end + // handle Tab/Enter keypresses on input fields - end $('select#id_hotel_button').chosen({ search_contains: true, diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index 711755b4a..e0964a3a2 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -70,7 +70,7 @@
      -
      {l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
      +
      {l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
      {if isset($is_index_page) && $is_index_page}
      {/if} diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php index 31e42af68..6133663ad 100644 --- a/modules/wkroomsearchblock/wkroomsearchblock.php +++ b/modules/wkroomsearchblock/wkroomsearchblock.php @@ -57,6 +57,10 @@ class WkRoomSearchBlock extends Module $this->context->controller->addCSS($this->_path.'/views/css/wk-global-search.css'); $this->context->controller->addJS($this->_path.'/views/js/wk-room-search-block.js'); + $isOccupancyWiseSearch = false; + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $isOccupancyWiseSearch = true; + } Media::addJsDef( array ( 'autocomplete_search_url' => $this->context->link->getModuleLink( @@ -85,6 +89,8 @@ class WkRoomSearchBlock extends Module 'all_children_txt' => $this->l('All Children', false, true), 'invalid_occupancy_txt' => $this->l('Invalid occupancy(adults/children) found.', false, true), 'hotel_name_has_search' => count($hotelBranchesInfo) >= Configuration::get('WK_HOTEL_NAME_SEARCH_THRESHOLD'), + 'search_auto_focus_next_field' => (bool) Configuration::get('WK_SEARCH_AUTO_FOCUS_NEXT_FIELD'), + 'is_occupancy_wise_search' => $isOccupancyWiseSearch, ) ); } From 3dba93b59448321741d79f3a891368218e3e5588 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 11:51:44 +0530 Subject: [PATCH 006/106] Fix calendar issue --- modules/wkroomsearchblock/views/js/wk-room-search-block.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 418d39d6d..d95cad638 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -712,10 +712,13 @@ $(document).ready(function() { e.preventDefault(); $('#daterange_value').removeClass('focused').blur(); + if ($('#daterange_value').data('dateRangePicker') != undefined) { + $('#daterange_value').data('dateRangePicker').close(); + } + if (is_occupancy_wise_search) { BookingSearchManager.activateStep('occupancy'); } else { - $('#daterange_value').data('dateRangePicker').close(); BookingSearchManager.activateStep('submit'); } } From c98220b7b4831641e3d31015fed502c470a6c862 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 12:58:25 +0530 Subject: [PATCH 007/106] Fix calendar issue --- .../views/js/wk-room-search-block.js | 17 +++++++++++++++++ .../views/templates/hook/searchForm.tpl | 3 +++ 2 files changed, 20 insertions(+) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index d95cad638..66e647ada 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -158,6 +158,23 @@ $(document).ready(function() { }).on('datepicker-change', function(event,obj){ $('#check_in_time').val($.datepicker.formatDate('yy-mm-dd', obj.date1)); $('#check_out_time').val($.datepicker.formatDate('yy-mm-dd', obj.date2)); + focusNextOnCalendarClose = true; + }).on('datepicker-open', function() { + $('#daterange_value').addClass('focused').focus(); + }).on('datepicker-close', function() { + $('#daterange_value').removeClass('focused').blur(); + }).on('datepicker-closed', function() { + if (search_auto_focus_next_field && focusNextOnCalendarClose) { + if (is_occupancy_wise_search) { + if ($('#check_in_time').val() != '' && $('#check_out_time').val() != '') { + BookingSearchManager.activateStep('occupancy'); + } + } else { + if (BookingSearchManager.allFieldsFilled()) { + BookingSearchManager.activateStep('submit'); + } + } + } }); } else { $('#daterange_value').dateRangePicker({ diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index e0964a3a2..cbaee97cf 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -65,6 +65,9 @@
      {l s='Check-out' mod='wkroomsearchblock'}
      + {if isset($is_index_page) && $is_index_page} +
      + {/if}
      {else}
      From 911055e5a5749e4868d1f43740d70b808054a3fb Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 14:52:26 +0530 Subject: [PATCH 008/106] Fix hotel field issue --- modules/wkroomsearchblock/views/js/wk-room-search-block.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 66e647ada..6f6e13477 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -688,10 +688,12 @@ $(document).ready(function() { // handle Tab/Enter keypresses on input fields - start $(document).on('keydown', '#hotel_location', function (e) { if (e.which == 9) { // Tab key - if ($('.location_search_results_ul').is(':visible')) { - e.preventDefault(); + e.preventDefault(); + if ($('.location_search_results_ul').is(':visible')) { $('.location_search_results_ul li:first').focus().click(); + } else { + BookingSearchManager.activateStep('hotel'); } } }); From d938b6e10d57575145f6757578b83bba49a35d3b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 15:35:11 +0530 Subject: [PATCH 009/106] Fix calendar issue --- .../wkroomsearchblock/views/js/wk-room-search-block.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 6f6e13477..3c006972f 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -275,8 +275,14 @@ $(document).ready(function() { } }); + // fix for: if user pressed Tab after selecting only one date + $('body').on('keydown', function(e) { + if (e.which == 9 && $('#date-range-picker-container').is(':visible')) { + $('#daterange_value').data('dateRangePicker').close(); + } + }); + // set data on clicking the searched location on dropdown - var focusHotelSelection = true; $(document).on('click', '.location_search_results_ul li', function(e) { e.preventDefault(); From d8063e7e2762b168a719a986002c33177109aa97 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 28 Dec 2023 19:36:26 +0530 Subject: [PATCH 010/106] Fix occupancy and calendar issues --- .../views/js/wk-room-search-block.js | 142 ++++++++++++------ 1 file changed, 94 insertions(+), 48 deletions(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 3c006972f..ad4c75220 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -155,10 +155,13 @@ $(document).ready(function() { } }, endDate: max_order_date, + }).on('datepicker-first-date-selected', function() { + calendarFirstDateSelected = true; }).on('datepicker-change', function(event,obj){ $('#check_in_time').val($.datepicker.formatDate('yy-mm-dd', obj.date1)); $('#check_out_time').val($.datepicker.formatDate('yy-mm-dd', obj.date2)); focusNextOnCalendarClose = true; + calendarFirstDateSelected = false; }).on('datepicker-open', function() { $('#daterange_value').addClass('focused').focus(); }).on('datepicker-close', function() { @@ -181,14 +184,18 @@ $(document).ready(function() { startDate: $.datepicker.formatDate('dd-mm-yy', new Date()), startDate: start_date, endDate: max_order_date, + }).on('datepicker-first-date-selected', function() { + calendarFirstDateSelected = true; }).on('datepicker-change', function(event,obj){ $('#check_in_time').val($.datepicker.formatDate('yy-mm-dd', obj.date1)); $('#check_out_time').val($.datepicker.formatDate('yy-mm-dd', obj.date2)); focusNextOnCalendarClose = true; + calendarFirstDateSelected = false; }).on('datepicker-open', function() { $('#daterange_value').addClass('focused').focus(); }).on('datepicker-close', function() { $('#daterange_value').removeClass('focused').blur(); + calendarFirstDateSelected = false; }).on('datepicker-closed', function() { if (search_auto_focus_next_field && focusNextOnCalendarClose) { if (is_occupancy_wise_search) { @@ -265,7 +272,7 @@ $(document).ready(function() { } }); - var focusNextOnCalendarClose = true; + var focusNextOnCalendarClose = true, calendarFirstDateSelected = false;; // check if user clicked outside calendar $('body').on('click', function(e) { if ($('#date-range-picker-container').is(':visible')) { @@ -275,10 +282,22 @@ $(document).ready(function() { } }); - // fix for: if user pressed Tab after selecting only one date + // fix for: if user pressed Tab after selecting only first date $('body').on('keydown', function(e) { - if (e.which == 9 && $('#date-range-picker-container').is(':visible')) { + if (e.which == 9 + && $('#date-range-picker-container').is(':visible') + && calendarFirstDateSelected + ) { + e.preventDefault(); $('#daterange_value').data('dateRangePicker').close(); + + setTimeout(function () { + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + BookingSearchManager.activateStep('submit'); + } + }, 10); } }); @@ -378,9 +397,8 @@ $(document).ready(function() { if (search_auto_focus_next_field) { setTimeout(function () { $('#id_hotel_button').data('chosen').close_field(); + BookingSearchManager.activateStep('date_range'); }, 10); - - BookingSearchManager.activateStep('date_range'); } } @@ -619,6 +637,54 @@ $(document).ready(function() { $("#search_occupancy_wrapper").toggle(); }); + function validateOccupancies() { + let hasErrors = 0; + + let adults = $("#search_occupancy_wrapper").find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $("#search_occupancy_wrapper").find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $("#search_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 { + $("#search_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; + $("#search_occupancy_wrapper .num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $("#search_occupancy_wrapper .num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $("#search_occupancy_wrapper").find('.guest_child_age').removeClass('error_border'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $("#search_occupancy_wrapper .guest_child_age").eq(index).addClass('error_border'); + } + }); + } + + if (hasErrors == 0) { + $("#search_occupancy_wrapper").hide(); + $("#search_hotel_block_form #guest_occupancy").removeClass('error_border'); + } else { + $("#search_hotel_block_form #guest_occupancy").addClass('error_border'); + return false; + } + + return true; + } + // close the occupancy block when clink anywhere in the body outside occupancy block $('body').on('click', function(e) { // @TODO better approach to be found @@ -626,54 +692,21 @@ $(document).ready(function() { if ($('#search_occupancy_wrapper').css('display') !== 'none') { if (!($(e.target).closest("#search_occupancy_wrapper").length)) { // Before closing the occupancy block validate the vaules inside - let hasErrors = 0; - - let adults = $("#search_occupancy_wrapper").find(".num_adults").map(function(){return $(this).val();}).get(); - let children = $("#search_occupancy_wrapper").find(".num_children").map(function(){return $(this).val();}).get(); - let child_ages = $("#search_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 { - $("#search_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; - $("#search_occupancy_wrapper .num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); - } - if (isNaN(children[index])) { - hasErrors = 1; - $("#search_occupancy_wrapper .num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); - } - }); - - // validate values of selected child ages - $("#search_occupancy_wrapper").find('.guest_child_age').removeClass('error_border'); - child_ages.forEach(function (age, index) { - age = parseInt(age); - if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { - hasErrors = 1; - $("#search_occupancy_wrapper .guest_child_age").eq(index).addClass('error_border'); - } - }); - } - - if (hasErrors == 0) { - $("#search_occupancy_wrapper").hide(); - $("#search_hotel_block_form #guest_occupancy").removeClass('error_border'); - } else { - $("#search_hotel_block_form #guest_occupancy").addClass('error_border'); - return false; - } + return validateOccupancies(); } } } }); + $('body').on('keydown', function(e) { + if (e.which == 9 && $('#search_occupancy_wrapper:visible').length) { + e.preventDefault(); + if (validateOccupancies()) { + BookingSearchManager.activateStep('submit'); + } + } + }); + if (page_name == 'index') { $('#hotel_location, #id_hotel_button, #guest_occupancy').focus(function () { setBookingSearchPositions(); @@ -732,6 +765,19 @@ $(document).ready(function() { } }); + $(document).on('keydown', '#id_hotel_button_chosen .chosen-search input', function (e) { + if (e.which == 9 && $('#date-range-picker-container').is(':visible')) { // Tab key + e.preventDefault(); + $('#daterange_value').data('dateRangePicker').close(); + + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + BookingSearchManager.activateStep('submit'); + } + } + }); + $(document).on('keydown', '#daterange_value', function (e) { if (e.which == 9) { // Tab key e.preventDefault(); From 730841d8c4ac223d6aa28005e1c2e1a19d44e2df Mon Sep 17 00:00:00 2001 From: abhishek-webkul <84142535+abhishek-webkul@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:25:33 +0530 Subject: [PATCH 011/106] 2023 -> 2024 --- modules/wkroomsearchblock/views/css/chosen.css | 4 ++-- .../views/templates/front/hotel-options-dropdown.tpl | 4 ++-- .../views/templates/front/hotel-options-select.tpl | 4 ++-- modules/wkroomsearchblock/views/templates/front/index.php | 4 ++-- .../views/templates/front/location-options.tpl | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/wkroomsearchblock/views/css/chosen.css b/modules/wkroomsearchblock/views/css/chosen.css index b5b31fd7a..779c5e4c7 100644 --- a/modules/wkroomsearchblock/views/css/chosen.css +++ b/modules/wkroomsearchblock/views/css/chosen.css @@ -1,5 +1,5 @@ /** - * 2010-2023 Webkul. + * 2010-2024 Webkul. * * NOTICE OF LICENSE * @@ -13,7 +13,7 @@ * needs please refer to CustomizationPolicy.txt file inside our module for more information. * * @author Webkul IN - * @copyright 2010-2023 Webkul IN + * @copyright 2010-2024 Webkul IN * @license LICENSE.txt */ diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl index 9f6431809..8939516b2 100644 --- a/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl +++ b/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl @@ -1,5 +1,5 @@ {** - * 2010-2023 Webkul. + * 2010-2024 Webkul. * * NOTICE OF LICENSE * @@ -13,7 +13,7 @@ * needs please refer to CustomizationPolicy.txt file inside our module for more information. * * @author Webkul IN - * @copyright 2010-2023 Webkul IN + * @copyright 2010-2024 Webkul IN * @license LICENSE.txt *} diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl index 8c4c9912a..b6dd9cd0d 100644 --- a/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl +++ b/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl @@ -1,5 +1,5 @@ {** - * 2010-2023 Webkul. + * 2010-2024 Webkul. * * NOTICE OF LICENSE * @@ -13,7 +13,7 @@ * needs please refer to CustomizationPolicy.txt file inside our module for more information. * * @author Webkul IN - * @copyright 2010-2023 Webkul IN + * @copyright 2010-2024 Webkul IN * @license LICENSE.txt *} diff --git a/modules/wkroomsearchblock/views/templates/front/index.php b/modules/wkroomsearchblock/views/templates/front/index.php index 1ad696d30..089d93577 100644 --- a/modules/wkroomsearchblock/views/templates/front/index.php +++ b/modules/wkroomsearchblock/views/templates/front/index.php @@ -1,6 +1,6 @@ Date: Thu, 29 Feb 2024 16:42:11 +0530 Subject: [PATCH 012/106] Fix placeholder issue --- modules/wkroomsearchblock/views/js/wk-room-search-block.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index ad4c75220..dc8226e9b 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -268,7 +268,7 @@ $(document).ready(function() { && e.target.id != 'hotel_location' ) { $('.location_search_results_ul').hide(); - $('#hotel_location').val(hotel_location_txt); + $('#hotel_location').attr('placeholder', hotel_location_txt); } }); From b5eef16554822c3c1801a9a120b4d283996d1e77 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 3 Apr 2024 15:06:33 +0530 Subject: [PATCH 013/106] Code organization --- js/daterangepicker/qlodaterangepicker.js | 59 +- .../controllers/front/autocompletesearch.php | 25 +- .../views/css/wk-global-search.css | 33 +- .../views/js/wk-room-search-block.js | 724 ++++++++++-------- ...l-options-select.tpl => hotel-options.tpl} | 0 .../views/templates/hook/searchForm.tpl | 44 +- .../css/daterangepicker.css | 6 +- themes/hotel-reservation-theme/css/global.css | 4 +- 8 files changed, 461 insertions(+), 434 deletions(-) rename modules/wkroomsearchblock/views/templates/front/{hotel-options-select.tpl => hotel-options.tpl} (100%) diff --git a/js/daterangepicker/qlodaterangepicker.js b/js/daterangepicker/qlodaterangepicker.js index 7e4186a97..401d2b6bc 100644 --- a/js/daterangepicker/qlodaterangepicker.js +++ b/js/daterangepicker/qlodaterangepicker.js @@ -22,6 +22,9 @@ var dateRangePickerOrg = $.fn.dateRangePicker; $.fn.dateRangePicker = function(opt) { if(typeof opt === "object") { + let container = $(this).parent(); + container.css({ position: 'relative' }); + const custom_opt = { format: 'DD-MM-YYYY', showTopbar: false, @@ -31,15 +34,14 @@ minDays: 2, startOfWeek: 'monday', hoveringTooltip: false, - container: page_name == 'index' ? '#date-range-picker-container' : '#page', - inline: page_name == 'index', + container: container, + inline: true, customArrowPrevSymbol: '', customArrowNextSymbol: '', - getValue: function() - { + getValue: function() { return $(this).find('span').html(); }, - setValue: function(s, s1, s2) { + setValue: function(s) { if (s) { $(this).find('span').html(s.replace('to', '  ')); } else { @@ -49,15 +51,56 @@ } } } + $.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); + + const dateRangePickerInput = dateRangePickerOrg.apply(this, args); + const calendarDom = $(dateRangePickerInput).data('dateRangePicker').getDatePicker(); + + dateRangePickerInput.on('datepicker-open', function() { + const positionClass = getPositionClass(dateRangePickerInput, calendarDom); + $(calendarDom).removeClass('top bottom').addClass(positionClass); + setPosition(dateRangePickerInput, calendarDom, positionClass) + }); + + return dateRangePickerInput; + + // helper function definitions + function getPositionClass(dateRangePickerInput, calendarDom) { + const inputElementHeight = dateRangePickerInput.outerHeight(); + const spaceTop = dateRangePickerInput.offset().top - $(window).scrollTop(); + const spaceBottom = $(window).height() - inputElementHeight - spaceTop; + const maxHeightNeeded = $(calendarDom).get(0).scrollHeight; + + let positionClass = 'bottom'; + // determine position class + if (spaceBottom < maxHeightNeeded && spaceTop > spaceBottom) { + positionClass = 'top'; + } + + return positionClass; + } + + function setPosition(dateRangePickerInput, calendarDom, positionClass) { + const inputElementHeight = dateRangePickerInput.outerHeight(); + + const css = {}; + if (positionClass == 'top') { + css.top = 'unset'; + css.bottom = inputElementHeight; + } else { + css.bottom = 'unset'; + css.top = $(dateRangePickerInput).position().top + inputElementHeight; + } + + $(calendarDom).css(css); + } } -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php index 696179ef5..9dfa3bed5 100644 --- a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php +++ b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php @@ -22,9 +22,10 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro { public function initContent() { - $result = array(); $this->display_column_left = false; $this->display_column_right = false; + + $result = array('status' => false); $search_data = Tools::getValue('to_search_data'); $location_category_id = Tools::getValue('location_category_id'); $obj_htl_info = new HotelBranchInformation(); @@ -35,7 +36,7 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro $html = $this->context->smarty->fetch( $this->module->getTemplatePath('location-options.tpl') ); - $result['status'] = 'success'; + $result['status'] = true; $result['data'] = $html; } } elseif (isset($location_category_id) && $location_category_id) { @@ -57,23 +58,15 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro } $this->context->smarty->assign(array('hotels_info' => $hotelsInfo)); - $html_select = $this->context->smarty->fetch( - $this->module->getTemplatePath('hotel-options-select.tpl') + $html = $this->context->smarty->fetch( + $this->module->getTemplatePath('hotel-options.tpl') ); - $html_dropdown = $this->context->smarty->fetch( - $this->module->getTemplatePath('hotel-options-dropdown.tpl') - ); - - $result['status'] = 'success'; - $result['data_select'] = $html_select; - $result['data_dropdown'] = $html_dropdown; - } else { - $result['status'] = 'failed2'; + $result['status'] = true; + $result['html_hotel_options'] = $html; } - } else { - $result['status'] = 'failed3'; } - die(json_encode($result)); + + $this->ajaxDie(json_encode($result)); } } diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css index 5196325af..89acdfa75 100644 --- a/modules/wkroomsearchblock/views/css/wk-global-search.css +++ b/modules/wkroomsearchblock/views/css/wk-global-search.css @@ -63,21 +63,9 @@ column-gap: 5px; grid-template-columns: repeat(2, 1fr); } -#date-range-picker-container { - position: absolute; -} -#date-range-picker-container.top { - bottom: 82px; -} -#date-range-picker-container.bottom { - top: 85px; -} .fancybox-wrap #search_hotel_block_form .form-group.xs-calendar { position: relative; } -.fancybox-wrap #search_hotel_block_form #date-range-picker-container { - top: 56px; -} /* #search_hotel_block_form { display: grid; grid-template-columns: 0.8fr repeat(3, 1fr) 0.6fr; @@ -115,6 +103,9 @@ #search_hotel_block_form .header-rmsearch-input:active, #search_hotel_block_form .header-rmsearch-input:focus { border: 2px solid #1292FF;} #search_hotel_block_form #id_hotel_button { + appearance: none; + width: 100%; + padding-left: 35px; background: url("../../views/img/icon-hotel.svg") no-repeat 10px 50%, url("../../views/img/icon-dropdown-arrow.svg") no-repeat calc(100% - 10px) 50%; background-color: #FFF;} #search_hotel_block_form #guest_occupancy { @@ -157,15 +148,6 @@ position: relative;} .header-rmsearch-wrapper .dropdown-menu { margin: 0px;} -.header-rmsearch-wrapper .hotel_dropdown_ul { - position: absolute; - font-size: 14px; - font-weight: 400; - padding: 0px; - width: 100%; - box-shadow: 0 8px 25px -4px rgba(0,0,0,0.39); - max-height: 145px; - overflow-y: auto;} .header-rmsearch-wrapper .location_search_results_ul { position: absolute; font-size: 14px; @@ -176,7 +158,7 @@ box-shadow: 0 8px 25px -4px rgba(0,0,0,0.39); max-height: 145px; overflow-y: auto;} - .header-rmsearch-wrapper .location_search_results_ul li, .header-rmsearch-wrapper .hotel_dropdown_ul li { + .header-rmsearch-wrapper .location_search_results_ul li { background-color: #fff; color: #333333; cursor: pointer; @@ -184,7 +166,7 @@ font-size: 14px; list-style: outside none none; padding: 15px;} - .header-rmsearch-wrapper .location_search_results_ul li:hover, .header-rmsearch-wrapper .location_search_results_ul li:focus, .header-rmsearch-wrapper .location_search_results_ul li:active, .header-rmsearch-wrapper .hotel_dropdown_ul li:hover, .header-rmsearch-wrapper .hotel_dropdown_ul li:focus, .header-rmsearch-wrapper .hotel_dropdown_ul li:active { + .header-rmsearch-wrapper .location_search_results_ul li:hover, .header-rmsearch-wrapper .location_search_results_ul li:focus, .header-rmsearch-wrapper .location_search_results_ul li:active { background-color: #379bf0; color: #FFFFFF;} @@ -193,11 +175,6 @@ bottom: 55px; } .header-rmsearch-wrapper .location_search_results_ul.bottom { top: 100%; } -.header-rmsearch-wrapper .hotel_dropdown_ul.top { - top: unset; - bottom: 100%; } -.header-rmsearch-wrapper .hotel_dropdown_ul.bottom { - top: 100%; } .header-rmsearch-wrapper .label-desc-txt { diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 9e458db28..f0c1d2dba 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -20,31 +20,294 @@ const BookingSearchManager = { inputSteps: { 'location': { - selector: '#hotel_location', - activate: function() { $('#hotel_location').focus(); }, - inputHasValue: function () { return ($('#hotel_location').val() != '') && ($('#location_category_id').val() != ''); }, + init: function() { + $('.location_search_results_ul').hide(); + + // search location with users searched characters + $(document).on('keyup', '#hotel_location', function(e) { + BookingSearchManager.inputSteps['location'].onInput.call(this, e); + }); + + // set data on clicking the searched location on dropdown + $(document).on('click', '.location_search_results_ul li', function(e) { + e.preventDefault(); + + BookingSearchManager.inputSteps['location'].onInputComplete.call(this, e); + }); + + // handle Tab key press on hotel location field + $(document).on('keydown', '#hotel_location', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + + if ($('.location_search_results_ul').is(':visible')) { + $('.location_search_results_ul li:first').focus().click(); + } else { + BookingSearchManager.activateStep('hotel'); + } + } + }); + + // handle Tab key press on hotel location list + $(document).on('keydown', '.location_search_results_ul li', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + $(this).click(); + } + }); + + // navigate to prev and next li in the location dropdown + $('body').on('keydown', '.location_search_results_ul li', function(e) { + if (e.which == 40 || e.which == 38) { + var ulElement = $(this).closest('ul'); + var ulLength = ulElement.find('li').length; + $(this).blur(); + ulElement.scrollTop($(this).index() * $(this).outerHeight()); + if (e.which == 40) { + if ($(this).index() != (ulLength - 1)) { + $(this).next('li.search_result_li').focus(); + } else { + ulElement.find('li:first').focus(); + } + } else if (e.which == 38) { + if ($(this).index()) { + $(this).prev('li.search_result_li').focus(); + } else { + ulElement.find('li:last').focus(); + } + } + } + }); + }, + activate: function() { + $('#hotel_location').focus(); + }, + inputHasValue: function () { + return ($('#hotel_location').val() != '') && ($('#location_category_id').val() != ''); + }, + onInput: function (e) { + if (e.which == 13) { + return; + } + + if (($('.location_search_results_ul').is(':visible')) && (e.which == 40 || e.which == 38)) { + $(this).blur(); + if (e.which == 40) { + $('.location_search_results_ul li:first').focus(); + } else if (e.which == 38) { + $('.location_search_results_ul li:last').focus(); + } + } else { + $('.location_search_results_ul').empty().hide(); + if ($(this).val() != '') { + abortRunningAjax(); + ajax_check_var = $.ajax({ + url: autocomplete_search_url, + data: { + to_search_data: $(this).val(), + }, + method: 'POST', + dataType: 'json', + success: function(result) { + if (result.status) { + $('.location_search_results_ul').html(result.data); + $('.location_search_results_ul').show(); + } + } + }); + } + } + }, + onInputComplete: function (e) { + e.preventDefault(); + + $('.location_search_results_ul').empty().hide(); + $('#hotel_location').attr('value', $(this).html()); + $('#location_category_id').val($(this).val()); + + // fetch hotels for selected location + $.ajax({ + url: autocomplete_search_url, + data: { + location_category_id: $('#location_category_id').val(), + }, + method: 'POST', + dataType: 'json', + success: function(result) { + if (result.status) { + $('#hotel_cat_id').val(''); + $('#id_hotel_button').html(result.html_hotel_options); + $('#id_hotel_button').trigger('chosen:updated'); + + if (search_auto_focus_next_field) { + BookingSearchManager.activateStep('hotel'); + } + } else { + alert(no_results_found_cond); + } + } + }); + }, }, 'hotel': { - selector: '#id_hotel_button', - activate: function() { $('#id_hotel_button').trigger('chosen:open'); }, - inputHasValue: function () { return ($('#id_hotel').val() != '') && ($('#hotel_cat_id').val() != ''); }, + init: function() { + $('select#id_hotel_button').chosen({ + search_contains: true, + disable_search: !hotel_name_has_search, + width: '100%', + }); + + $(document).on('change', '#id_hotel_button', function() { + if ($(this).find('option:selected').val().trim() != '') { + $('#id_hotel_button_chosen .chosen-search input').blur(); + BookingSearchManager.inputSteps['hotel'].onInputComplete.call(this); + } + }); + + // prevents calendar from closing on hotel selection + $(document).on('click', '#id_hotel_button_chosen li', function(e) { + e.stopPropagation(); + }); + + $(document).on('keydown', '#id_hotel_button_chosen.chosen-container-active', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + if ($('#daterange_value').length) { + $('#daterange_value').focus(); + $('#daterange_value').click(); + } + } + }); + + $(document).on('keydown', '#id_hotel_button_chosen .chosen-search input', function (e) { + if (e.which == 9 && $('#daterange_value').siblings('.date-picker-wrapper').is(':visible')) { // Tab key + e.preventDefault(); + $('#daterange_value').data('dateRangePicker').close(); + + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + BookingSearchManager.activateStep('submit'); + } + } + }); + + // if chosen will not be initialized add placeholder to hotel select element as first option + if (!BookingSearchManager.isBrowserSupported()) { + $('select#id_hotel_button option').first().html(select_htl_txt); + } + + if (hotel_name_has_search) { + $('select#id_hotel_button').on('chosen:showing_dropdown', function() { + $(this).siblings('.chosen-container').find('.chosen-single').addClass('invisible') + }); + + $('select#id_hotel_button').on('chosen:hiding_dropdown', function() { + $(this).siblings('.chosen-container').find('.chosen-single').removeClass('invisible') + }); + } + }, + activate: function() { + $('#id_hotel_button').trigger('chosen:open'); + }, + inputHasValue: function () { + return ($('#id_hotel').val() != '') && ($('#hotel_cat_id').val() != ''); + }, + onInputComplete: function () { + $('#id_hotel_button_chosen .chosen-search input').blur(); + const selectedHotel = $(this).find('option:selected'); + + if ($(selectedHotel).val().trim() != '') { + const maxOrderDate = $(selectedHotel).attr('data-max_order_date'); + const preparationTime = $(selectedHotel).attr('data-preparation_time') + + createDateRangePicker(maxOrderDate, preparationTime, $('#check_in_time').val(), $('#check_out_time').val()); + + $('#max_order_date').val(maxOrderDate); + $('#preparation_time').val(preparationTime); + $('#id_hotel').val($(selectedHotel).attr('data-id-hotel')); + $('#hotel_cat_id').val($(selectedHotel).attr('data-hotel-cat-id')); + + if (search_auto_focus_next_field) { + setTimeout(function () { + if ($('#id_hotel_button').data('chosen') != undefined) { + $('#id_hotel_button').data('chosen').close_field(); + } + + BookingSearchManager.activateStep('date_range'); + }, 10); + } + } else { + $('#id_hotel').val(''); + $('#hotel_cat_id').val(''); + } + }, }, 'date_range': { - selector: '#daterange_value', - activate: function() { $('#daterange_value').data('dateRangePicker').open(); }, - inputHasValue: function () { return ($('#check_in_time').val() != '') && ($('#check_out_time').val() != ''); }, + init: function() { + $(document).on('keydown', '#daterange_value', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + $('#daterange_value').removeClass('focused').blur(); + + if ($('#daterange_value').data('dateRangePicker') != undefined) { + $('#daterange_value').data('dateRangePicker').close(); + } + + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + BookingSearchManager.activateStep('submit'); + } + } + }); + }, + activate: function() { + $('#daterange_value').data('dateRangePicker').open(); + }, + inputHasValue: function () { + return ($('#check_in_time').val() != '') && ($('#check_out_time').val() != ''); + }, }, 'occupancy': { - selector: '#guest_occupancy', - activate: function() { if ($('#search_occupancy_wrapper').css('display') == 'none') { $('#guest_occupancy').click().focus(); } }, - inputHasValue: function () { return false; }, + init: function() { + $(document).on('keydown', '#guest_occupancy', function (e) { + if (e.which == 9) { // Tab key + e.preventDefault(); + if ($('#search_occupancy_wrapper').css('display') != 'none') { + $('#guest_occupancy').click(); + } + + BookingSearchManager.activateStep('submit'); + } + }); + }, + activate: function() { + if ($('#search_occupancy_wrapper').css('display') == 'none') { + $('#guest_occupancy').click().focus(); + } + }, + inputHasValue: function () { + return false; + }, }, 'submit': { - selector: '#search_room_submit', - activate: function() { $('#search_room_submit').focus(); }, - inputHasValue: function () { return false; }, + activate: function() { + $('#search_room_submit').focus(); + }, + inputHasValue: function () { + return false; + }, }, }, + init: function () { + this.inputSteps['location'].init(); + this.inputSteps['hotel'].init(); + this.inputSteps['date_range'].init(); + if (is_occupancy_wise_search) { + this.inputSteps['occupancy'].init(); + } + }, activateStep: function (step) { if (step in this.inputSteps) { this.inputSteps[step].activate(); @@ -53,10 +316,28 @@ const BookingSearchManager = { allFieldsFilled: function () { return this.inputSteps['hotel'].inputHasValue() && this.inputSteps['date_range'].inputHasValue() - } + }, + isBrowserSupported: function() { // defined as it is from chosen to decide if chosen will be initialized + if (window.navigator.appName === "Microsoft Internet Explorer") { + return document.documentMode >= 8; + } + if (/iP(od|hone)/i.test(window.navigator.userAgent)) { + return false; + } + if (/Android/i.test(window.navigator.userAgent)) { + if (/Mobile/i.test(window.navigator.userAgent)) { + return false; + } + } + + return true; + }, } $(document).ready(function() { + // initialize booking search fields + BookingSearchManager.init(); + // for screen size changes for room search var window_width = $(window).width(); if (window_width > 767) { @@ -84,24 +365,17 @@ $(document).ready(function() { helpers: { overlay: { closeClick: false } //Disable click outside event }, - 'beforeShow': function() { - $('#date-range-picker-container').closest('.form-group').addClass('xs-calendar'); - }, 'afterClose': function() { $('.header-rmsearch-container').show(); $('#xs_room_search_form').show(); - - $('#date-range-picker-container').closest('.form-group').removeClass('xs-calendar'); }, }); }); /*END*/ var ajax_check_var = ''; - $('.location_search_results_ul').hide(); - function createDateRangePicker(max_order_date, preparation_time, dateFrom, dateTo) - { + createDateRangePicker = function (max_order_date, preparation_time, dateFrom, dateTo) { let start_date = new Date(); if (preparation_time) { start_date.setDate(start_date.getDate() + parseInt(preparation_time)); @@ -177,6 +451,8 @@ $(document).ready(function() { BookingSearchManager.activateStep('submit'); } } + + focusNextOnCalendarClose = false; } }); } else { @@ -207,6 +483,8 @@ $(document).ready(function() { BookingSearchManager.activateStep('submit'); } } + + focusNextOnCalendarClose = false; } }); } @@ -217,207 +495,21 @@ $(document).ready(function() { $.datepicker.formatDate('dd-mm-yy', $.datepicker.parseDate('yy-mm-dd', dateTo)) ); } - } - function abortRunningAjax() { + abortRunningAjax = function () { if (ajax_check_var) { ajax_check_var.abort(); } } - // search location with users searched characters - $(document).on('keyup', "#hotel_location", function(e) { - if (e.which == 13) { - return; - } - - if (($('.location_search_results_ul').is(':visible')) && (e.which == 40 || e.which == 38)) { - $(this).blur(); - if (e.which == 40) { - $(".location_search_results_ul li:first").focus(); - } else if (e.which == 38) { - $(".location_search_results_ul li:last").focus(); - } - } else { - $('.location_search_results_ul').empty().hide(); - if ($(this).val() != '') { - abortRunningAjax(); - ajax_check_var = $.ajax({ - url: autocomplete_search_url, - data: { - to_search_data: $(this).val(), - }, - method: 'POST', - dataType: 'json', - success: function(result) { - if (result.status == 'success') { - $('.location_search_results_ul').html(result.data); - $('.location_search_results_ul').show(); - } - } - }); - } - } - }); - - // if user clicks anywhere and location li is visible then close it - $('body').on('click', function(e) { - if ($('.location_search_results_ul').is(':visible') - && e.target.className != 'search_result_li' - && e.target.id != 'hotel_location' - ) { - $('.location_search_results_ul').hide(); - $('#hotel_location').attr('placeholder', hotel_location_txt); - } - }); - - var focusNextOnCalendarClose = true, calendarFirstDateSelected = false;; - // check if user clicked outside calendar - $('body').on('click', function(e) { - if ($('#date-range-picker-container').is(':visible')) { - if (!$(e.target).closest('.form-group').find('#date-range-picker-container').length) { - focusNextOnCalendarClose = false; - } - } - }); - - // fix for: if user pressed Tab after selecting only first date - $('body').on('keydown', function(e) { - if (e.which == 9 - && $('#date-range-picker-container').is(':visible') - && calendarFirstDateSelected - ) { - e.preventDefault(); - $('#daterange_value').data('dateRangePicker').close(); - - setTimeout(function () { - if (is_occupancy_wise_search) { - BookingSearchManager.activateStep('occupancy'); - } else { - BookingSearchManager.activateStep('submit'); - } - }, 10); - } - }); - - // set data on clicking the searched location on dropdown - $(document).on('click', '.location_search_results_ul li', function(e) { - e.preventDefault(); - - $('.location_search_results_ul').empty().hide(); - $('#hotel_location').attr('value', $(this).html()); - $('#location_category_id').val($(this).val()); - - // fetch hotels for selected location - $.ajax({ - url: autocomplete_search_url, - data: { - location_category_id: $('#location_category_id').val(), - }, - method: 'POST', - dataType: 'json', - success: function(result) { - if (result.status == 'success') { - $('#hotel_cat_id').val(''); - $('#id_hotel_button').html(result.data_select); - $('.hotel_dropdown_ul').empty(); - $('.hotel_dropdown_ul').html(result.data_dropdown); - $('#id_hotel_button').trigger('chosen:updated'); - - if (search_auto_focus_next_field) { - BookingSearchManager.activateStep('hotel'); - } - } else { - alert(no_results_found_cond); - } - } - }); - - $('#id_hotel_button_chosen .chosen-search input').blur(); - }); - - // prevents calendar from closing on hotel selection - $(document).on('click', '#id_hotel_button_chosen li', function(e) { - e.stopPropagation(); - }); - - // navigate to prev and next li in the location/hotel dropdown - $('body').on('keyup', 'li.search_result_li', function(e) { - if (e.which == 40 || e.which == 38) { - var ulElement = $(this).closest('ul'); - var ulLength = ulElement.find('li').length; - $(this).blur(); - ulElement.scrollTop($(this).index() * $(this).outerHeight()); - if (e.which == 40) { - if ($(this).index() != (ulLength - 1)) { - $(this).next('li.search_result_li').focus(); - } else { - ulElement.find("li:first").focus(); - } - } else if (e.which == 38) { - if ($(this).index()) { - $(this).prev('li.search_result_li').focus(); - } else { - ulElement.find("li:last").focus(); - } - } - } - }); - - // if user is selecting the location by keydown / up key - $(document).on('keydown', 'body', function(e) { - if ((e.which == 40 || e.which == 38) && ($('.location_search_results_ul li.search_result_li').is(':visible') || $('.hotel_dropdown_ul li.search_result_li').is(':visible'))) { - return false; - } else if (e.which == 13 && e.target.className == 'search_result_li') { - e.target.click(); - } else if (e.which == 9 && $('.location_search_results_ul').is(':visible')) { - if ($('.location_search_results_ul .search_result_li').length) { - $('.location_search_results_ul li.search_result_li:first').click(); - } - } else if (e.which == 9 && $('.hotel_dropdown_ul').is(':visible')) { - if ($('.hotel_dropdown_ul .search_result_li').length) { - $('.hotel_dropdown_ul li.search_result_li:first').click(); - } - } - }); - - function selectHotelFromList(selectedHotel) { - let max_order_date = $(selectedHotel).attr('data-max_order_date'); - let preparation_time = $(selectedHotel).attr('data-preparation_time') - - createDateRangePicker(max_order_date, preparation_time, $('#check_in_time').val(), $('#check_out_time').val()); - - $("#max_order_date").val(max_order_date); - $('#preparation_time').val(preparation_time); - $('#id_hotel').val($(selectedHotel).attr('data-id-hotel')); - $('#hotel_cat_id').val($(selectedHotel).attr('data-hotel-cat-id')); - $('#hotel_cat_name').html($(selectedHotel).html()); - - if (search_auto_focus_next_field) { - setTimeout(function () { - $('#id_hotel_button').data('chosen').close_field(); - BookingSearchManager.activateStep('date_range'); - }, 10); - } - } - - $(document).on('change', '#id_hotel_button', function() { - $('#id_hotel_button_chosen .chosen-search input').blur(); - selectHotelFromList($(this).find('option:selected')); - }); - - $(document).on('click', '.hotel_dropdown_ul li', function() { - selectHotelFromList($(this)); - }); - // If only one hotel then set max order date on date pickers var max_order_date = $('#max_order_date').val(); var preparation_time = $('#preparation_time').val(); createDateRangePicker(max_order_date, preparation_time, $('#check_in_time').val(), $('#check_out_time').val()); // validations on the submit of the search fields - $('#search_room_submit').on('click', function(e) { + $(document).on('click', '#search_room_submit', function() { var check_in_time = $("#check_in_time").val(); var check_out_time = $("#check_out_time").val(); var max_order_date = $("#max_order_date").val(); @@ -474,9 +566,10 @@ $(document).ready(function() { else return true; }); + // Occupancy field dropdown // add occupancy info block - $('#search_occupancy_wrapper .add_new_occupancy_btn').on('click', function(e) { + $(document).on('click', '#search_occupancy_wrapper .add_new_occupancy_btn', function(e) { e.preventDefault(); var occupancy_block = ''; @@ -653,7 +746,7 @@ $(document).ready(function() { // toggle occupancy block $('#guest_occupancy').on('click', function(e) { e.stopPropagation(); - if ($('#date-range-picker-container').is(':visible')) { + if ($('#daterange_value').siblings('.date-picker-wrapper').is(':visible')) { $('#daterange_value').data('dateRangePicker').close(); } $("#search_occupancy_wrapper").toggle(); @@ -707,28 +800,95 @@ $(document).ready(function() { return true; } - // close the occupancy block when clink anywhere in the body outside occupancy block + // Body Events - start + var focusNextOnCalendarClose = true; + var calendarFirstDateSelected = false; $('body').on('click', function(e) { - // @TODO better approach to be found + // if user clicks anywhere and location li is visible then close it + if ($('.location_search_results_ul').is(':visible') + && e.target.className != 'search_result_li' + && e.target.id != 'hotel_location' + ) { + $('.location_search_results_ul').hide(); + $('#hotel_location').attr('placeholder', hotel_location_txt); + } + + // check if user clicked outside calendar + if ($('#daterange_value').siblings('.date-picker-wrapper').is(':visible')) { + if (!$(e.target).closest('.form-group').find('.date-picker-wrapper').length) { + focusNextOnCalendarClose = false; + } + } + + // close the occupancy block when clink anywhere in the body outside occupancy block if ($('#search_occupancy_wrapper').length) { if ($('#search_occupancy_wrapper').css('display') !== 'none') { if (!($(e.target).closest("#search_occupancy_wrapper").length)) { - // Before closing the occupancy block validate the vaules inside + // Before closing the occupancy block validate the values inside return validateOccupancies(); } } } }); + var isEnterKeyHeldOnLocation = false; $('body').on('keydown', function(e) { + let preventDefault = false; + + // fix for: if user pressed Tab after selecting only first date + if (e.which == 9 + && $('#daterange_value').siblings('.date-picker-wrapper').is(':visible') + && calendarFirstDateSelected + ) { + preventDefault = true; + $('#daterange_value').data('dateRangePicker').close(); + + setTimeout(function () { + if (is_occupancy_wise_search) { + BookingSearchManager.activateStep('occupancy'); + } else { + BookingSearchManager.activateStep('submit'); + } + }, 10); + } + + // if user is selecting the location by Up, Down, Enter or Tab keys + if ((e.which == 40 || e.which == 38) && $('.location_search_results_ul li.search_result_li').is(':visible')) { + return false; + } else if (e.which == 13 && e.target.className == 'search_result_li') { + // select location only after held Enter key is unheld + preventDefault = true; + isEnterKeyHeldOnLocation = true; + } else if (e.which == 9 && $('.location_search_results_ul').is(':visible')) { + preventDefault = true; + $(e.target).click(); + } + + // check if submit button must be focused if (e.which == 9 && $('#search_occupancy_wrapper:visible').length) { - e.preventDefault(); + preventDefault = true; if (validateOccupancies()) { BookingSearchManager.activateStep('submit'); } } + + if (preventDefault) { + e.preventDefault(); + } }); + // select location only after held Enter key is unheld + $('body').on('keyup', function(e) { + if ($(e.target).is('.location_search_results_ul li') + && isEnterKeyHeldOnLocation + && e.which == 13 + ) { + $(e.target).click(); + } + }); + // Body Events - end + + // set positions of popups when required if (page_name == 'index') { $('#hotel_location, #id_hotel_button, #guest_occupancy').focus(function () { setBookingSearchPositions(); @@ -745,112 +905,8 @@ $(document).ready(function() { setBookingSearchPositions(); }); } - - // handle Tab/Enter keypresses on input fields - start - $(document).on('keydown', '#hotel_location', function (e) { - if (e.which == 9) { // Tab key - e.preventDefault(); - - if ($('.location_search_results_ul').is(':visible')) { - $('.location_search_results_ul li:first').focus().click(); - } else { - BookingSearchManager.activateStep('hotel'); - } - } - }); - - $(document).on('keydown', '.location_search_results_ul li', function (e) { - if (e.which == 9) { // Tab key - e.preventDefault(); - $(this).click(); - } - }); - - $(document).on('keydown', '.hotel_dropdown_ul li', function (e) { - if (e.which == 9 || e.which == 13) { // Tab/Enter key - if (e.which == 9) { - $(this).click(); - } - if ($('#daterange_value').length) { - $('#daterange_value').click(); - } - } - }); - - $(document).on('keydown', '#id_hotel_button_chosen.chosen-container-active', function (e) { - if (e.which == 9) { // Tab key - e.preventDefault(); - if ($('#daterange_value').length) { - $('#daterange_value').focus(); - $('#daterange_value').click(); - } - } - }); - - $(document).on('keydown', '#id_hotel_button_chosen .chosen-search input', function (e) { - if (e.which == 9 && $('#date-range-picker-container').is(':visible')) { // Tab key - e.preventDefault(); - $('#daterange_value').data('dateRangePicker').close(); - - if (is_occupancy_wise_search) { - BookingSearchManager.activateStep('occupancy'); - } else { - BookingSearchManager.activateStep('submit'); - } - } - }); - - $(document).on('keydown', '#daterange_value', function (e) { - if (e.which == 9) { // Tab key - e.preventDefault(); - $('#daterange_value').removeClass('focused').blur(); - - if ($('#daterange_value').data('dateRangePicker') != undefined) { - $('#daterange_value').data('dateRangePicker').close(); - } - - if (is_occupancy_wise_search) { - BookingSearchManager.activateStep('occupancy'); - } else { - BookingSearchManager.activateStep('submit'); - } - } - }); - - $(document).on('keydown', '#guest_occupancy', function (e) { - if (e.which == 9) { // Tab key - e.preventDefault(); - if ($('#search_occupancy_wrapper').css('display') != 'none') { - $('#guest_occupancy').click(); - } - - BookingSearchManager.activateStep('submit'); - } - }); - // handle Tab/Enter keypresses on input fields - end - - $('select#id_hotel_button').chosen({ - search_contains: true, - disable_search: !hotel_name_has_search, - width: '100%', - }); - - if (hotel_name_has_search) { - $('select#id_hotel_button').on('chosen:showing_dropdown', function() { - $(this).siblings('.chosen-container').find('.chosen-single').addClass('invisible') - }); - - $('select#id_hotel_button').on('chosen:hiding_dropdown', function() { - $(this).siblings('.chosen-container').find('.chosen-single').removeClass('invisible') - }); - } - - // if hotel chosen is not intialized use dropdown - if ($('select#id_hotel_button').data('chosen') === undefined) { - $('#search_hotel_block_form .hotel-select-wrap').addClass('hide'); - $('#search_hotel_block_form .hotel-dropdown-wrap').removeClass('hide'); - } }); + // function to set occupancy infor in guest occupancy field(search form) function setGuestOccupancy() { @@ -884,44 +940,35 @@ function setGuestOccupancy() $('#guest_occupancy > span').text(guestButtonVal); } -// position dropdowns and the calendar +// position dropdowns function setBookingSearchPositions() { // calculate available spaces let searchForm = $('#search_hotel_block_form'); let inputFieldsAndDropdowns = [ { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, - { input: $('#id_hotel_button'), dropdown: $('.hotel_dropdown_ul')}, { input: $('.hotel-selector-wrap'), dropdown: $('#id_hotel_button_chosen .chosen-drop')}, { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, ]; - let calendarInputField = { input: $('#daterange_value'), calendarContainer: $('#date-range-picker-container')}; - let positionClass = 'bottom'; if (!searchForm.closest('.fancybox-wrap').length) { let searchFormHeight = searchForm.outerHeight(); let spaceTop = searchForm.offset().top - $(window).scrollTop(); let spaceBottom = $(window).height() - searchFormHeight - spaceTop; - let calendarHeight = 292; - // calculate max height for dropdowns let maxHeightNeeded = 0; $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { if (!inputFieldAndDropdown.input.length) return false; // find needed space height - let cssMaxHeight = inputFieldAndDropdown.dropdown.css('max-height') || calendarHeight + 'px'; - let dropdownHeight = parseInt(cssMaxHeight.replace('px', '')); - dropdownHeight = Math.max(dropdownHeight || 0, calendarHeight); - - maxHeightNeeded = Math.max(maxHeightNeeded, dropdownHeight); + let cssMaxHeight = parseInt(inputFieldAndDropdown.dropdown.css('max-height')); + if (Number.isInteger(cssMaxHeight)) { + maxHeightNeeded = Math.max(maxHeightNeeded, cssMaxHeight); + } }); - // manage calendar now - maxHeightNeeded = Math.max(maxHeightNeeded, calendarHeight); - // determine position class if (spaceBottom < maxHeightNeeded && spaceTop > spaceBottom) { positionClass = 'top'; @@ -932,7 +979,4 @@ function setBookingSearchPositions() { $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { inputFieldAndDropdown.dropdown.removeClass('top bottom').addClass(positionClass); }); - - // position calendar - calendarInputField.calendarContainer.removeClass('top bottom').addClass(positionClass); } diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options.tpl similarity index 100% rename from modules/wkroomsearchblock/views/templates/front/hotel-options-select.tpl rename to modules/wkroomsearchblock/views/templates/front/hotel-options.tpl diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index 2dbe8961d..1703b29bf 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -21,37 +21,13 @@ -
      -
      - -
      -
      -
      - {if isset($hotels_info) && count($hotels_info)} -
      - -
        - {if isset($hotels_info) && $hotels_info} - {foreach $hotels_info as $name_val} -
      • - {$name_val['hotel_name']|escape:'htmlall':'UTF-8'} -
        • - {/foreach} - {/if} -
      -
      - {/if} +
      +
      {/if} @@ -65,18 +41,12 @@
      {l s='Check-out' mod='wkroomsearchblock'}
      - {if isset($is_index_page) && $is_index_page} -
      - {/if}
      {else}
      {l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
      - {if isset($is_index_page) && $is_index_page} -
      - {/if}
      {/if} diff --git a/themes/hotel-reservation-theme/css/daterangepicker.css b/themes/hotel-reservation-theme/css/daterangepicker.css index f1b6cbe07..a84b58ff0 100644 --- a/themes/hotel-reservation-theme/css/daterangepicker.css +++ b/themes/hotel-reservation-theme/css/daterangepicker.css @@ -26,11 +26,11 @@ box-shadow: 0 4px 10px 0 rgb(0 0 0 / 26%); } .date-picker-wrapper.no-shortcuts { - margin-top: -4px; padding: 10px; } -#index .date-picker-wrapper.no-shortcuts { - margin-top: 0; +.date-picker-wrapper.top, +.date-picker-wrapper.bottom { + position: absolute; } .date-picker-wrapper .month-wrapper{ border: none; diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index 50095cd66..6d8662914 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -6533,8 +6533,8 @@ table.table_block td { .input-date span i, .form-control .input-date span i { transform: scale(0.8, 0.6);} -.input-hotel, .form-control .input-hotel, .input-location, .form-control .input-location { - background: url("../img/icon/icon-location.svg") no-repeat 10px 50%; +.input-location, .form-control .input-location { + background: url("../img/icon/icon-location.svg") no-repeat 6px 50%; padding-left: 35px; background-color: #FFF; } From 43374957176ffec7416e35056c2d28ab71cad9d8 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 3 Apr 2024 15:10:49 +0530 Subject: [PATCH 014/106] Remove unwanted file hotel-options-dropdown.tpl --- .../front/hotel-options-dropdown.tpl | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl diff --git a/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl b/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl deleted file mode 100644 index 8939516b2..000000000 --- a/modules/wkroomsearchblock/views/templates/front/hotel-options-dropdown.tpl +++ /dev/null @@ -1,26 +0,0 @@ -{** - * 2010-2024 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-2024 Webkul IN - * @license LICENSE.txt - *} - -{if isset($hotels_info) && is_array($hotels_info)} - {foreach from=$hotels_info item=hotel_info} -
    • - {$hotel_info.hotel_name} -
      • - {/foreach} -{/if} From 9cfb77554a08f220fd4204b571407d812f197bd0 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 3 Apr 2024 15:13:35 +0530 Subject: [PATCH 015/106] Fixed: Notice in Admin products when QloApps is installed without the demo data --- controllers/admin/AdminProductsController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 3763fb057..0a5bbcf7e 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -245,9 +245,10 @@ class AdminProductsControllerCore extends AdminController ); } else { $hotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1); + $hotelsArray = array(); foreach ($hotels as $hotel) { $addressInfo = HotelBranchInformation::getAddress($hotel['id_hotel']); - $this->hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city']; + $hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city']; } $this->fields_list['hotel_name'] = array( @@ -256,7 +257,7 @@ class AdminProductsControllerCore extends AdminController 'multiple' => true, 'operator' => 'or', 'filter_key' => 'hrt!id_hotel', - 'list' => $this->hotelsArray, + 'list' => $hotelsArray, 'optional' => true, 'class' => 'chosen', 'remove_onchange' => true, @@ -401,7 +402,10 @@ class AdminProductsControllerCore extends AdminController $idLocationsCategory = Configuration::get('PS_LOCATIONS_CATEGORY'); $this->objLocationsCategory = new Category($idLocationsCategory, $this->context->language->id); $nestedCategories = Category::getNestedCategories($idLocationsCategory); - if ($nestedCategories) { + if (isset($nestedCategories[$idLocationsCategory]['children']) + && is_array($nestedCategories[$idLocationsCategory]['children']) + && count($nestedCategories[$idLocationsCategory]['children']) + ) { foreach ($nestedCategories[$idLocationsCategory]['children'] as $childCategory) { $this->buildCategoryOptions($childCategory); } @@ -617,7 +621,7 @@ class AdminProductsControllerCore extends AdminController // convert price with the currency from context $this->_list[$i]['price'] = Tools::convertPrice($this->_list[$i]['price'], $this->context->currency, true, $this->context); $this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null, - (int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, $nothing, true, true, + (int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, null, true, true, $context); } } From 21597693548eb63ec092cca8a00aae1b92ca4ae9 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 17 Apr 2024 11:15:04 +0530 Subject: [PATCH 016/106] Update the icon for the invoice in search list --- admin/themes/default/template/search_form.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/search_form.tpl b/admin/themes/default/template/search_form.tpl index ac11075f7..b7c2e195a 100644 --- a/admin/themes/default/template/search_form.tpl +++ b/admin/themes/default/template/search_form.tpl @@ -64,7 +64,7 @@
    • - {l s='Invoices'} + {l s='Invoices'}
    • From 0be773cc480d4a33a759b86b5797a9271505e59a Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 19 Apr 2024 10:12:18 +0530 Subject: [PATCH 017/106] Updated: Select fields created with fields_options will now show empty dropdown in case no option is availabe --- admin/themes/default/template/helpers/options/options.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/themes/default/template/helpers/options/options.tpl b/admin/themes/default/template/helpers/options/options.tpl index 24a6094cd..527850f73 100644 --- a/admin/themes/default/template/helpers/options/options.tpl +++ b/admin/themes/default/template/helpers/options/options.tpl @@ -138,6 +138,9 @@ {elseif isset($input.empty_message)} {$input.empty_message} + {else} + {/if} {elseif $field['type'] == 'bool'} From 8b749566a43c8b5982751ef703679dbcbbc4afdd Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 19 Apr 2024 15:15:12 +0530 Subject: [PATCH 018/106] Fixed: Service product associated room types are shown according to hotel permission --- .../admin/AdminNormalProductsController.php | 39 ++----------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 87a959951..b0c0715b8 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -186,19 +186,17 @@ class AdminNormalProductsControllerCore extends AdminController $id_shop = Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP? (int)$this->context->shop->id : 'a.id_shop_default'; $this->_join .= ' JOIN `'._DB_PREFIX_.'product_shop` sa ON (a.`id_product` = sa.`id_product` AND sa.id_shop = '.$id_shop.') - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (a.`id_product` = hrt.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'htl_branch_info` hb ON (hrt.`id_hotel` = hb.`id`) - LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl ON (hb.`id` = hbl.`id` AND b.`id_lang` = hbl.`id_lang`) LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON ('.$alias.'.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = '.$id_shop.') LEFT JOIN `'._DB_PREFIX_.'shop` shop ON (shop.id_shop = '.$id_shop.') LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (image_shop.`id_product` = a.`id_product` AND image_shop.`cover` = 1 AND image_shop.id_shop = '.$id_shop.') LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_image` = image_shop.`id_image`) LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (pd.`id_product` = a.`id_product` AND pd.`active` = 1) LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product` rsp ON (rsp.`id_product` = a.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)'; + LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (rsp.`id_element` = hrt.`id_product` AND rsp.`element_type` = '.(int)RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE.') + '.HotelBranchInformation::addHotelRestriction(false, 'hrt'); $this->_select .= ' IF(a.`auto_add_to_cart`, "'.$this->l('Yes').'", "'.$this->l('No').'") as auto_added, IF(a.`auto_add_to_cart`, 1, 0) as badge_success, IF(a.`show_at_front`, "'.$this->l('Yes').'", "'.$this->l('No').'") as show_at_front_txt, IF(a.`price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_PER_DAY.', "'.$this->l('Per Day').'", "'.$this->l('Per Booking').'") as price_calculation_method_txt, (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, '; - $this->_select .= ' COUNT(rsp.`id_product`) as products_associated, hrt.`adults`, hrt.`children`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, '; + $this->_select .= ' COUNT(hrt.`id_product`) as products_associated, '; $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`'; @@ -368,15 +366,6 @@ class AdminNormalProductsControllerCore extends AdminController return '--'; } - public function getHotelName($hotelName, $row) - { - if ($hotelName && isset($row['city'])) { - return $hotelName.' - '.$row['city']; - } - - return '--'; - } - public static function getQuantities($hotelName, $tr) { if ((int)$tr['is_virtual'] == 1 && $tr['nb_downloadable'] == 0) { @@ -3531,15 +3520,6 @@ class AdminNormalProductsControllerCore extends AdminController )); $data->assign($this->tpl_form_vars); - $objRoomType = new HotelRoomType(); - $objHotelInfo = new HotelBranchInformation(); - $data->assign('htl_info', $objHotelInfo->hotelsNameAndId()); - if ($hotelRoomType = $objRoomType->getRoomTypeInfoByIdProduct($product->id)) { - $data->assign('htl_room_type', $hotelRoomType); - $hotelFullInfo = $objHotelInfo->hotelBranchInfoById($hotelRoomType['id_hotel']); - $data->assign('htl_full_info', $hotelFullInfo); - } - $this->tpl_form_vars['product'] = $product; $this->tpl_form_vars['custom_form'] = $data->fetch(); } @@ -4113,19 +4093,6 @@ class AdminNormalProductsControllerCore extends AdminController } } - public function ajaxProcessGetIdHotelByIdProduct() - { - $response = array('status' => 'failed'); - $idProduct = Tools::getValue('id_product'); - $objHotelRoomType = new HotelRoomType(); - $roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($idProduct); - if ($roomTypeInfo) { - $response['status'] = 'success'; - $response['id_hotel'] = (int)$roomTypeInfo['id_hotel']; - } - die(json_encode($response)); - } - public function processImageLegends() { if (Tools::getValue('key_tab') == 'Images' && Tools::getValue('submitAddproductAndStay') == 'update_legends' && Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) { From 1a72a65037055b76e3200a8d091f3ab359b101bb Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 20 Apr 2024 10:38:05 +0530 Subject: [PATCH 019/106] Fixed: Name of the guest user is not present on order detail page in backoffice --- .../default/template/controllers/orders/helpers/view/view.tpl | 1 + 1 file changed, 1 insertion(+) 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 f28080e92..d875932f1 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -542,6 +542,7 @@
      +
       {$customer->firstname} {$customer->lastname}
       {$customer->email}
      {if $addresses.invoice->phone_mobile || $addresses.invoice->phone}
       {if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}
      From e67f9be5e87f48348930cb89c9c0223bdbf7d766 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 22 Apr 2024 09:35:33 +0530 Subject: [PATCH 020/106] Fixed: notice on product page when service product has tax rule with no tax as option --- classes/tax/TaxRulesTaxManager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php index 6f78d4de7..3956fa95e 100644 --- a/classes/tax/TaxRulesTaxManager.php +++ b/classes/tax/TaxRulesTaxManager.php @@ -104,6 +104,7 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface AND tr.`id_country` = '.(int)$this->address->id_country.' AND tr.`id_tax_rules_group` = '.(int)$this->type.' AND tr.`id_state` IN (0, '.(int)$this->address->id_state.') + AND tr.`id_tax` !=0 AND (\''.pSQL($postcode).'\' BETWEEN tr.`zipcode_from` AND tr.`zipcode_to` OR (tr.`zipcode_to` = 0 AND tr.`zipcode_from` IN(0, \''.pSQL($postcode).'\'))) ORDER BY tr.`zipcode_from` DESC, tr.`zipcode_to` DESC, tr.`id_state` DESC, tr.`id_country` DESC'); From b1474bb9b6cdc80ed467191f6f23a77b56dbd9ba Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 24 Apr 2024 11:12:19 +0530 Subject: [PATCH 021/106] Fixed: Unable to send customer request mail from contact us page --- controllers/front/ContactController.php | 172 +++++----- .../hotel-reservation-theme/contact-form.tpl | 311 +++++++++--------- 2 files changed, 243 insertions(+), 240 deletions(-) diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index ba68dd08c..75f4cf868 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -118,96 +118,96 @@ class ContactControllerCore extends FrontController $this->context->smarty->assign('alreadySent', 1); $contact->email = ''; $contact->customer_service = 0; - } - - if ($contact->customer_service) { - if ((int)$id_customer_thread) { - $ct = new CustomerThread($id_customer_thread); - $ct->status = 'open'; - $ct->id_lang = (int)$this->context->language->id; - $ct->id_contact = (int)$id_contact; - $ct->id_order = (int)$id_order; - if ($id_product = (int)Tools::getValue('id_product')) { - $ct->id_product = $id_product; + } else { + if ($contact->customer_service) { + if ((int)$id_customer_thread) { + $ct = new CustomerThread($id_customer_thread); + $ct->status = 'open'; + $ct->id_lang = (int)$this->context->language->id; + $ct->id_contact = (int)$id_contact; + $ct->id_order = (int)$id_order; + if ($id_product = (int)Tools::getValue('id_product')) { + $ct->id_product = $id_product; + } + $ct->update(); + } else { + $ct = new CustomerThread(); + if (isset($customer->id)) { + $ct->id_customer = (int)$customer->id; + } + $ct->id_shop = (int)$this->context->shop->id; + $ct->id_order = (int)$id_order; + if ($id_product = (int)Tools::getValue('id_product')) { + $ct->id_product = $id_product; + } + $ct->id_contact = (int)$id_contact; + $ct->id_lang = (int)$this->context->language->id; + $ct->email = $from; + $ct->status = 'open'; + $ct->token = Tools::passwdGen(12); + $ct->add(); } - $ct->update(); - } else { - $ct = new CustomerThread(); - if (isset($customer->id)) { - $ct->id_customer = (int)$customer->id; - } - $ct->id_shop = (int)$this->context->shop->id; - $ct->id_order = (int)$id_order; - if ($id_product = (int)Tools::getValue('id_product')) { - $ct->id_product = $id_product; - } - $ct->id_contact = (int)$id_contact; - $ct->id_lang = (int)$this->context->language->id; - $ct->email = $from; - $ct->status = 'open'; - $ct->token = Tools::passwdGen(12); - $ct->add(); - } - if ($ct->id) { - $cm = new CustomerMessage(); - $cm->id_customer_thread = $ct->id; - $cm->message = $message; - if (isset($file_attachment['rename']) && !empty($file_attachment['rename']) && rename($file_attachment['tmp_name'], _PS_UPLOAD_DIR_.basename($file_attachment['rename']))) { - $cm->file_name = $file_attachment['rename']; - @chmod(_PS_UPLOAD_DIR_.basename($file_attachment['rename']), 0664); - } - $cm->ip_address = (int)ip2long(Tools::getRemoteAddr()); - $cm->user_agent = $_SERVER['HTTP_USER_AGENT']; - if (!$cm->add()) { - $this->errors[] = Tools::displayError('An error occurred while sending the message.'); - } - } else { - $this->errors[] = Tools::displayError('An error occurred while sending the message.'); - } - } - - if (!count($this->errors)) { - $var_list = array( - '{order_name}' => '-', - '{attached_file}' => '-', - '{message}' => Tools::nl2br(stripslashes($message)), - '{email}' => $from, - '{product_name}' => '', - ); - - if (isset($file_attachment['name'])) { - $var_list['{attached_file}'] = $file_attachment['name']; - } - - $id_product = (int)Tools::getValue('id_product'); - - if (isset($ct) && Validate::isLoadedObject($ct) && $ct->id_order) { - $order = new Order((int)$ct->id_order); - $var_list['{order_name}'] = $order->getUniqReference(); - $var_list['{id_order}'] = (int)$order->id; - } - - if ($id_product) { - $product = new Product((int)$id_product); - if (Validate::isLoadedObject($product) && isset($product->name[Context::getContext()->language->id])) { - $var_list['{product_name}'] = $product->name[Context::getContext()->language->id]; - } - } - - if (!empty($contact->email)) { - if (!Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form').' [no_sync]', - $var_list, $contact->email, $contact->name, null, null, - $file_attachment, null, _PS_MAIL_DIR_, false, null, null, $from)) { + if ($ct->id) { + $cm = new CustomerMessage(); + $cm->id_customer_thread = $ct->id; + $cm->message = $message; + if (isset($file_attachment['rename']) && !empty($file_attachment['rename']) && rename($file_attachment['tmp_name'], _PS_UPLOAD_DIR_.basename($file_attachment['rename']))) { + $cm->file_name = $file_attachment['rename']; + @chmod(_PS_UPLOAD_DIR_.basename($file_attachment['rename']), 0664); + } + $cm->ip_address = (int)ip2long(Tools::getRemoteAddr()); + $cm->user_agent = $_SERVER['HTTP_USER_AGENT']; + if (!$cm->add()) { + $this->errors[] = Tools::displayError('An error occurred while sending the message.'); + } + } else { $this->errors[] = Tools::displayError('An error occurred while sending the message.'); } } - } - if (count($this->errors) > 1) { - array_unique($this->errors); - } elseif (!count($this->errors)) { - $this->context->smarty->assign('confirmation', 1); + if (!count($this->errors)) { + $var_list = array( + '{order_name}' => '-', + '{attached_file}' => '-', + '{message}' => Tools::nl2br(stripslashes($message)), + '{email}' => $from, + '{product_name}' => '', + ); + + if (isset($file_attachment['name'])) { + $var_list['{attached_file}'] = $file_attachment['name']; + } + + $id_product = (int)Tools::getValue('id_product'); + + if (isset($ct) && Validate::isLoadedObject($ct) && $ct->id_order) { + $order = new Order((int)$ct->id_order); + $var_list['{order_name}'] = $order->getUniqReference(); + $var_list['{id_order}'] = (int)$order->id; + } + + if ($id_product) { + $product = new Product((int)$id_product); + if (Validate::isLoadedObject($product) && isset($product->name[Context::getContext()->language->id])) { + $var_list['{product_name}'] = $product->name[Context::getContext()->language->id]; + } + } + + if (!empty($contact->email)) { + if (!Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form').' [no_sync]', + $var_list, $contact->email, $contact->name, null, null, + $file_attachment, null, _PS_MAIL_DIR_, false, null, null, $from)) { + $this->errors[] = Tools::displayError('An error occurred while sending the message.'); + } + } + } + + if (count($this->errors) > 1) { + array_unique($this->errors); + } elseif (!count($this->errors)) { + Tools::redirect($this->context->link->getPageLink('contact', null, null, array('confirm' => 1))); + } } } } @@ -312,6 +312,10 @@ class ContactControllerCore extends FrontController } } //End + + if (Tools::getValue('confirm')) { + $this->context->smarty->assign('confirmation', 1); + } $this->setTemplate(_PS_THEME_DIR_.'contact-form.tpl'); } diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl index 6e7cbdc7e..9c16eca35 100644 --- a/themes/hotel-reservation-theme/contact-form.tpl +++ b/themes/hotel-reservation-theme/contact-form.tpl @@ -45,174 +45,173 @@
      • -{else} - {include file="$tpl_dir./errors.tpl"} -
      -
      -

      {l s='Contact Us'}

      -

      {l s='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry`s standard dummy text.'}

      -
      -
      - {if (isset($gblHtlAddress) && $gblHtlAddress) && (isset($gblHtlPhone) && $gblHtlPhone) && (isset($gblHtlEmail) && $gblHtlEmail)} -
      -
      - {if isset($gblHtlPhone) && $gblHtlPhone } -
      -

      {l s='Main Branch'}

      -

      - {$gblHtlAddress} -

      -
      - {/if} - {if isset($gblHtlPhone) && $gblHtlPhone} -
      -

      {l s='Phone'}

      -

      - {$gblHtlPhone} -

      -
      - {/if} - {if isset($gblHtlEmail) && $gblHtlEmail} -
      -

      {l s='Mail Us'}

      -

      - {$gblHtlEmail} -

      -
      - {/if} -
      -
      - {/if} -
      - - {if isset($customerThread.id_contact) && $customerThread.id_contact && $contacts|count} - {assign var=flag value=true} - {foreach from=$contacts item=contact} - {if $contact.id_contact == $customerThread.id_contact} - - - {$flag=false} - {/if} - {/foreach} - {if $flag && isset($contacts.0.id_contact)} - - - {/if} - {else} -
      -
      - -
      - -
        - {foreach from=$contacts item=contact} -
      • {$contact.name|escape:'html':'UTF-8'} -
        • - {/foreach} - - {if isset($all_hotels_info) && $all_hotels_info} - {foreach from=$all_hotels_info key=htl_k item=htl_v} - {/foreach} - {/if} -
      -
      -
      +{/if} +{include file="$tpl_dir./errors.tpl"} +
      +
      +

      {l s='Contact Us'}

      +

      {l s='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry`s standard dummy text.'}

      +
      +
      + {if (isset($gblHtlAddress) && $gblHtlAddress) && (isset($gblHtlPhone) && $gblHtlPhone) && (isset($gblHtlEmail) && $gblHtlEmail)} +
      +
      + {if isset($gblHtlPhone) && $gblHtlPhone } +
      +

      {l s='Main Branch'}

      +

      + {$gblHtlAddress} +

      {/if} -
      -
      - - {if isset($customerThread.email)} - - {else} - - {/if} + {if isset($gblHtlPhone) && $gblHtlPhone} +
      +

      {l s='Phone'}

      +

      + {$gblHtlPhone} +

      -
      + {/if} + {if isset($gblHtlEmail) && $gblHtlEmail} +
      +

      {l s='Mail Us'}

      +

      + {$gblHtlEmail} +

      +
      + {/if} +
      +
      + {/if} +
      + + {if isset($customerThread.id_contact) && $customerThread.id_contact && $contacts|count} + {assign var=flag value=true} + {foreach from=$contacts item=contact} + {if $contact.id_contact == $customerThread.id_contact} + + + {$flag=false} + {/if} + {/foreach} + {if $flag && isset($contacts.0.id_contact)} + + + {/if} + {else}
      - -
      -
      - {if $fileupload == 1} -
      -
      - - - +
      + +
        + {foreach from=$contacts item=contact} +
      • {$contact.name|escape:'html':'UTF-8'} +
        • + {/foreach} + + {if isset($all_hotels_info) && $all_hotels_info} + {foreach from=$all_hotels_info key=htl_k item=htl_v} + {/foreach} + {/if} +
      - {/if} - {hook h='displayGDPRConsent' moduleName='contactform'} -
      - - -
      - + {/if} +
      +
      + + {if isset($customerThread.email)} + + {else} + + {/if} +
      +
      +
      +
      + + +
      +
      + {if $fileupload == 1} +
      +
      + + + +
      +
      + {/if} + {hook h='displayGDPRConsent' moduleName='contactform'} +
      + + + +
      + +
      +
      + {if isset($hotelsInfo) && $hotelsInfo} +
      +
      + {l s='Our Hotels'} +
      + {foreach $hotelsInfo as $hotel} +
      +
      + {$hotel['city']} +
      +
      +
      + +
      +
      +

      {$hotel['hotel_name']}

      +

      {$hotel['address']}, {$hotel['city']}, {if {$hotel['state_name']}}{$hotel['state_name']},{/if} {$hotel['country_name']}, {$hotel['postcode']}

      + {if $hotel['latitude'] != 0 || $hotel['longitude'] != 0} +

      + + {l s='View on map'} + +

      + {/if} +

      + {$hotel['phone']} +

      +

      + {$hotel['email']} +

      +
      +
      +
      + {/foreach} +
      + {/if} + {if isset($hotelLocationArray)} +
      +
      +
      - {if isset($hotelsInfo) && $hotelsInfo} -
      -
      - {l s='Our Hotels'} -
      - {foreach $hotelsInfo as $hotel} -
      -
      - {$hotel['city']} -
      -
      -
      - -
      -
      -

      {$hotel['hotel_name']}

      -

      {$hotel['address']}, {$hotel['city']}, {if {$hotel['state_name']}}{$hotel['state_name']},{/if} {$hotel['country_name']}, {$hotel['postcode']}

      - {if $hotel['latitude'] != 0 || $hotel['longitude'] != 0} -

      - - {l s='View on map'} - -

      - {/if} -

      - {$hotel['phone']} -

      -

      - {$hotel['email']} -

      -
      -
      -
      - {/foreach} -
      - {/if} - {if isset($hotelLocationArray)} -
      -
      -
      -
      -
      - {/if} -
      -
      -{/if} + {/if} +
      +
      {strip} {addJsDefL name='contact_fileDefaultHtml'}{l s='No file selected' js=1}{/addJsDefL} From 13e3b59f6e5d7d6d23ef8bdf980cc43942e5d485 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 30 Apr 2024 16:16:09 +0530 Subject: [PATCH 022/106] Fixed: Fixed the warning for price of additional facilities on the AdminProductsController, which occured whenever there was an error in the controller --- controllers/admin/AdminProductsController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..b86d926db 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3672,6 +3672,7 @@ class AdminProductsControllerCore extends AdminController public function processAdditionalFacilities() { if ($idProduct = Tools::getValue('id_product')) { + $errors = array(); $objRoomTypeDemand = new HotelRoomTypeDemand(); $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice(); // first delete all the previously saved prices and demands of this room type @@ -3699,7 +3700,7 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeDemandPrice->save(); } } else { - $this->errors[] = Tools::displayError('Invalid demand price of facility.'). + $errors[] = Tools::displayError('Invalid demand price of facility.'). ' : '.$objGlobalDemand->name[$this->context->language->id]; } if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) { @@ -3716,15 +3717,16 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeDemandPrice->save(); } } else { - $this->errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id]; + $errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id]; } } } } } } - if (count($this->errors)) { + if (count($errors)) { $this->warnings[] = Tools::displayError('Invalid price values are not saved. Please correct them and save again.'); + $this->errors = array_merge($this->errors, $errors); } $objCartBookingData = new HotelCartBookingData(); From 4d67e38fa0b9a43c1b03269807475176632148e9 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 30 Apr 2024 18:19:32 +0530 Subject: [PATCH 023/106] Updated: The room type dropdown for customer message on order detail front controller will now show a room type only once --- controllers/front/OrderDetailController.php | 4 +++- themes/hotel-reservation-theme/order-detail.tpl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index afa1ea9e8..915847a1f 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -100,6 +100,7 @@ class OrderDetailControllerCore extends FrontController $total_demands_price_ti = 0; $total_convenience_fee_te = 0; $total_convenience_fee_ti = 0; + $formattedProducts = array(); if (!empty($products)) { foreach ($products as $type_key => $type_value) { if (in_array($type_value['product_id'], $processedProducts)) { @@ -374,7 +375,7 @@ class OrderDetailControllerCore extends FrontController } } - + $formattedProducts[$type_value['id_product']] = $type_value; } $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); @@ -437,6 +438,7 @@ class OrderDetailControllerCore extends FrontController 'order_history' => $order->getHistory($this->context->language->id, false, true), 'overbooking_order_states' => OrderState::getOverBookingStates(), 'products' => $products, + 'formattedProducts' => $formattedProducts, 'discounts' => $order->getCartRules(), 'carrier' => $carrier, 'address_invoice' => $addressInvoice, diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index b265ab018..4dfe3737d 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -450,7 +450,7 @@ -

      {l s='Please note that position numbering starts from 0. A position of 0 means room type will be displayed at the topmost.'}

      +

      {l s='Please note that position numbering starts from 0. A position of 0 means room type will be displayed at the topmost position.'}

      +
      + {l s='You can manage positions of the room types of this hotel from'} + {l s='here.'} +
      {/if} - {if isset($product->id) && $product->id} -
      - {l s='You can change positions of room types of this hotel from '} - {l s='here.'} -
      - {/if} - {*
      - +
      @@ -47,7 +47,7 @@
      - +
      @@ -68,7 +68,7 @@
      - +
      @@ -79,7 +79,7 @@
      - +
      @@ -90,7 +90,7 @@
      - +
      From 6166453524b7aa1f4afca8c61125bbe529438eb3 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 7 Jun 2024 11:28:31 +0530 Subject: [PATCH 073/106] Fix attempts issue --- classes/MaintenanceAccess.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/MaintenanceAccess.php b/classes/MaintenanceAccess.php index 8760ac16a..17ce4ecc4 100644 --- a/classes/MaintenanceAccess.php +++ b/classes/MaintenanceAccess.php @@ -50,8 +50,9 @@ class MaintenanceAccessCore extends ObjectModel SELECT MAX(ma.`date_add`) FROM `'._DB_PREFIX_.'maintenance_access` ma WHERE (ma.`email` = "'.pSQL($email).'" OR ma.`ip_address` = "'.pSQL($ipAddress).'") + AND TIMESTAMPDIFF(MINUTE, ma.`date_add`, NOW()) < '.(int) MaintenanceAccess::LOGIN_ATTEMPTS_WINDOW.' ) - ) <= '.(int) MaintenanceAccess::LOGIN_ATTEMPTS_WINDOW; + ) < '.(int) MaintenanceAccess::LOGIN_ATTEMPTS_WINDOW; return Db::getInstance()->getValue($sql); } From 187dc2b86d5c1eb06a84e8730561cb3f3ae38757 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Fri, 7 Jun 2024 11:37:17 +0530 Subject: [PATCH 074/106] Tex corrections --- modules/hotelreservationsystem/hotelreservationsystem.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 1636bf8b7..0b9f5b984 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -484,11 +484,11 @@ class HotelReservationSystem extends Module // Make rooms available for booking if order status is cancelled, refunded or error if (in_array($params['newOrderStatus']->id, $objHtlBkDtl->getOrderStatusToFreeBookedRoom())) { - $isCancalled = 0; + $isCancelled = 0; if ($params['newOrderStatus']->id == Configuration::get('PS_OS_CANCELED')) { - $isCancalled = 1; + $isCancelled = 1; } - if (!$objHtlBkDtl->updateOrderRefundStatus($params['id_order'], false, false, array(), 1, $isCancalled)) { + if (!$objHtlBkDtl->updateOrderRefundStatus($params['id_order'], false, false, array(), 1, $isCancelled)) { $this->context->controller->errors[] = $this->l('Error while making booked rooms available, attached with this order. Please try again !!'); } } From b062da351c31534820ccf4244a54a4b26092c225 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 7 Jun 2024 12:35:08 +0530 Subject: [PATCH 075/106] added redirect_after after the configuration is saved --- controllers/admin/AdminCustomerPreferencesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 4dd5e4990..df1f13f6b 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -182,9 +182,11 @@ class AdminCustomerPreferencesControllerCore extends AdminController if (Tools::isSubmit('submitCustomerKpiConfig')) { unset($this->fields_options['general']); $this->processUpdateOptions(); + $this->redirect_after = self::$currentIndex.'&token='.$this->token.'&conf=6'; } else if (Tools::isSubmit('submitCustomerGeneralConfig')) { unset($this->fields_options['customer_kpi']); $this->processUpdateOptions(); + $this->redirect_after = self::$currentIndex.'&token='.$this->token.'&conf=6'; } $this->fields_options = $fields; From 021366be2c2eb0a35d8b9bf5d94f8ff5a9e3b8c7 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 7 Jun 2024 17:21:11 +0530 Subject: [PATCH 076/106] Fix attempts issue --- classes/MaintenanceAccess.php | 8 ++++++++ classes/controller/FrontController.php | 3 +++ 2 files changed, 11 insertions(+) diff --git a/classes/MaintenanceAccess.php b/classes/MaintenanceAccess.php index 17ce4ecc4..4c08b2e9b 100644 --- a/classes/MaintenanceAccess.php +++ b/classes/MaintenanceAccess.php @@ -38,6 +38,14 @@ class MaintenanceAccessCore extends ObjectModel ), ); + public function removeFailedAttempts($email, $ipAddress) + { + Db::getInstance()->execute( + 'DELETE FROM `' . _DB_PREFIX_ .'maintenance_access` ma + WHERE (ma.`email` = "'.pSQL($email).'" AND ma.`ip_address` = "'.pSQL($ipAddress).'")' + ); + } + public function getFailedAttemptsCount($email, $ipAddress) { $sql = 'SELECT COUNT(ma.`id_maintenance_access`) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index f89e481b9..f7ba791f7 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -867,6 +867,9 @@ class FrontControllerCore extends Controller $cookie->enable_maintenance_view = $this->context->employee->id; $cookie->remote_addr = ip2long($remoteIpAddress); $cookie->write(); + + // Reset attempts count on successful login + $objMaintenanceAccess->removeFailedAttempts($email, $remoteIpAddress); } if (count($this->errors)) { From 66d2f6a00eee411f4f781250f1b792339a8a9924 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 8 Jun 2024 10:19:03 +0530 Subject: [PATCH 077/106] Fixed:Getting currency conversion issue in order if default currency is changed while creating booking from back-office --- controllers/admin/AdminOrdersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index d56966e0c..270b70609 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -376,11 +376,11 @@ class AdminOrdersControllerCore extends AdminController $cart_order_exists = $cart->orderExists(); if (!$cart_order_exists) { $this->context->cart = $cart; + $this->context->currency = new Currency((int)$cart->id_currency); // validate cart for removing invalid data from cart before new order creation $this->errors = array_merge($this->errors, HotelCartBookingData::validateCartBookings()); - $this->context->currency = new Currency((int)$cart->id_currency); $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail(); @@ -1555,6 +1555,7 @@ class AdminOrdersControllerCore extends AdminController $objCart = new Cart($id_cart); if (Validate::isLoadedObject($objCart)) { $this->context->cart = $objCart; + $this->context->currency = new Currency((int)$objCart->id_currency); $this->errors = HotelCartBookingData::validateCartBookings(); $orderTotal = $objCart->getOrderTotal(true, Cart::BOTH); From 13e1094d887034a396481e119e49f4ce431e618c Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 8 Jun 2024 16:48:29 +0530 Subject: [PATCH 078/106] Fixed: Admin can refund check-in rooms also --- controllers/admin/AdminOrdersController.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 77fce26ff..b3c29ce77 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -943,16 +943,8 @@ class AdminOrdersControllerCore extends AdminController $objBookingDetail = new HotelBookingDetail(); $objOrderReturn = new OrderReturn(); $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); - if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) { - foreach($bookingOrderInfo as $key => $booking) { - if ((in_array($booking['id'], $refundReqBookings)) - || $booking['is_refunded'] - || $booking['id_status'] != HotelBookingDetail::STATUS_ALLOTED - ) { - unset($bookingOrderInfo[$key]); - } - } - } + $bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id); + $this->context->smarty->assign( array( 'order' => $objOrder, From bd29fcae5cf29819ad33700daa2c733da5a15c5d Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 8 Jun 2024 17:27:19 +0530 Subject: [PATCH 079/106] Fixed: Admin can refund check-in rooms also --- controllers/admin/AdminOrdersController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index b3c29ce77..9193b4d75 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -943,7 +943,13 @@ class AdminOrdersControllerCore extends AdminController $objBookingDetail = new HotelBookingDetail(); $objOrderReturn = new OrderReturn(); $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); - $bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id); + if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) { + foreach($bookingOrderInfo as $key => $booking) { + if ((in_array($booking['id'], $refundReqBookings)) || $booking['is_refunded']) { + unset($bookingOrderInfo[$key]); + } + } + } $this->context->smarty->assign( array( From 1643314817312b8cc2fe568cbd34783ac6fa1eca Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sun, 9 Jun 2024 14:43:09 +0530 Subject: [PATCH 080/106] Fixed: Admin can refund the bookings which are not selected to refund in previous completed Refudn request --- .../controllers/orders/_product_line.tpl | 2 +- classes/order/Order.php | 9 +- classes/order/OrderReturn.php | 177 +++++++++++------- classes/order/OrderReturnDetail.php | 4 + controllers/admin/AdminOrdersController.php | 23 ++- controllers/front/OrderOpcController.php | 1 - .../classes/HotelBookingDetail.php | 2 +- .../AdminOrderRefundRequestsController.php | 2 + .../helpers/view/view.tpl | 7 +- 9 files changed, 144 insertions(+), 83 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index f79d9c3d0..5b5c2f317 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -208,7 +208,7 @@ {/if} - {if isset($data.refund_info) && $data.refund_info} + {if $data.is_refunded && isset($data.refund_info) && $data.refund_info} {convertPriceWithCurrency price=$data.refund_info.refunded_amount currency=$currency->id} {else} -- diff --git a/classes/order/Order.php b/classes/order/Order.php index b8bf30dee..f89ccea7c 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -2661,11 +2661,18 @@ class OrderCore extends ObjectModel } elseif ($action == Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG) { foreach ($orderBookings as $booking) { if (!$booking['is_refunded']) { - if (!OrderReturn::getOrdersReturnDetail($this->id, 0, $booking['id'])) { + // If booking refund request is created and request is completed but booking is not refunded then return false + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($this->id, 0, $booking['id'])) { + $bookingRefundDetail = reset($bookingRefundDetail); + if ($bookingRefundDetail['refunded']) { + return false; + } + } else { return false; } } } + return true; // Default process to check if order is fully refunded or cancelled or not } else { diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index b64d9a024..4d8ab297a 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -177,9 +177,18 @@ class OrderReturnCore extends ObjectModel return (int)($data['total']); } - public function getOrderRefundRequestedBookings($idOrder, $idOrderReturn = 0, $onlyBookingIds = 0, $customerView = 0) + /** + * Get order refund requested bookings + * @param integer $idOrder + * @param integer $idOrderReturn + * @param integer $onlyBookingIds + * @param integer $customerView + * @param integer $skipReqCompletedNonRefunded: send 1 if you want to skip refund request completed but non-refunded booking + * @return array of refund requested bookings + */ + public function getOrderRefundRequestedBookings($idOrder, $idOrderReturn = 0, $onlyBookingIds = 0, $customerView = 0, $skipReqCompletedNonRefunded = 0) { - $sql = 'SELECT hbd.*, ord.* FROM `'._DB_PREFIX_.'order_return` orr'; + $sql = 'SELECT hbd.*, ord.*, orr.`state` as id_return_state FROM `'._DB_PREFIX_.'order_return` orr'; $sql .= ' LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (orr.`id_order_return` = ord.`id_order_return`)'; $sql .= ' LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id` = ord.`id_htl_booking`)'; $sql .= ' WHERE orr.`id_order` = '.(int)$idOrder; @@ -189,79 +198,92 @@ class OrderReturnCore extends ObjectModel } if ($returnDetails = Db::getInstance()->executeS($sql)) { + if ($customerView) { + $returnsCustView = array(); + } + + $objOrder = new Order($idOrder); + $objBookingDemands = new HotelBookingDemands(); + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + + foreach ($returnDetails as $key => &$bookingRow) { + if ($skipReqCompletedNonRefunded) { + $objReturnState = new OrderReturnState($bookingRow['id_return_state']); + if ($objReturnState->refunded && !$bookingRow['is_refunded']) { + unset($returnDetails[$key]); + continue; + } + } + + if (!$onlyBookingIds) { + $bookingRow['extra_service_total_paid_amount'] = 0; + $bookingRow['extra_service_total_price_tax_incl'] = 0; + $bookingRow['room_paid_amount'] = 0; + if ($bookingRow['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['room_paid_amount'] = ($objOrder->total_paid_real*$bookingRow['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + } + $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( + $idOrder, + $bookingRow['id_product'], + $bookingRow['id_room'], + $bookingRow['date_from'], + $bookingRow['date_to'], + 0 + ); + if (count($roomSelectedDemands)) { + foreach ($roomSelectedDemands as $demand) { + if ($demand['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; + } + } + } + + if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( + $bookingRow['id_htl_booking'] + )) { + if (count($roomSelectedServices['additional_services'])) { + foreach ($roomSelectedServices['additional_services'] as $service) { + if ($service['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { + $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$service['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; + } + $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; + } + } + } + } + if ($customerView) { + $dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']); + if (isset($returnsCustView[$dateJoin]['num_rooms'])) { + $returnsCustView[$dateJoin]['num_rooms'] += 1; + $returnsCustView[$dateJoin]['refunded_amount'] += $bookingRow['refunded_amount']; + $returnsCustView[$dateJoin]['total_price_tax_incl'] += $bookingRow['total_price_tax_incl']; + $returnsCustView[$dateJoin]['total_paid_amount'] += $bookingRow['total_paid_amount']; + } else { + unset($bookingRow['id_room']); + unset($bookingRow['room_num']); + unset($bookingRow['id_htl_booking']); + $returnsCustView[$dateJoin] = $bookingRow; + $returnsCustView[$dateJoin]['num_rooms'] = 1; + } + } + } + } + if ($onlyBookingIds) { return array_column($returnDetails, 'id_htl_booking'); } - if ($customerView) { - $returnsCustView = array(); - } - - $objBookingDemands = new HotelBookingDemands(); - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - $objOrder = new Order($idOrder); - foreach ($returnDetails as &$bookingRow) { - $bookingRow['extra_service_total_paid_amount'] = 0; - $bookingRow['extra_service_total_price_tax_incl'] = 0; - $bookingRow['room_paid_amount'] = 0; - if ($bookingRow['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['room_paid_amount'] = ($objOrder->total_paid_real*$bookingRow['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - } - $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( - $idOrder, - $bookingRow['id_product'], - $bookingRow['id_room'], - $bookingRow['date_from'], - $bookingRow['date_to'], - 0 - ); - if (count($roomSelectedDemands)) { - foreach ($roomSelectedDemands as $demand) { - if ($demand['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; - } - } - } - - if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( - $bookingRow['id_htl_booking'] - )) { - if (count($roomSelectedServices['additional_services'])) { - foreach ($roomSelectedServices['additional_services'] as $service) { - if ($service['total_price_tax_incl'] > 0) { - if ($objOrder->total_paid_real > 0) { - $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$service['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - } - $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; - } - } - } - } - if ($customerView) { - $dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']); - if (isset($returnsCustView[$dateJoin]['num_rooms'])) { - $returnsCustView[$dateJoin]['num_rooms'] += 1; - $returnsCustView[$dateJoin]['refunded_amount'] += $bookingRow['refunded_amount']; - $returnsCustView[$dateJoin]['total_price_tax_incl'] += $bookingRow['total_price_tax_incl']; - $returnsCustView[$dateJoin]['total_paid_amount'] += $bookingRow['total_paid_amount']; - } else { - unset($bookingRow['id_room']); - unset($bookingRow['room_num']); - unset($bookingRow['id_htl_booking']); - $returnsCustView[$dateJoin] = $bookingRow; - $returnsCustView[$dateJoin]['num_rooms'] = 1; - } - } - } if ($customerView) { return $returnsCustView; } } + return $returnDetails; } @@ -297,8 +319,21 @@ class OrderReturnCore extends ObjectModel return $data; } - public static function getOrdersReturnDetail($idOrder, $idOrderReturn = 0, $idHtlBooking = 0, $idLang = 0) - { + /** + * @param $idOrder + * @param int $idOrderReturn + * @param int $idHtlBooking + * @param int $idLang + * @param int $orderByLatestRequest : If you want to return request with in the Desc order of refund requests + * @return array + */ + public static function getOrdersReturnDetail( + $idOrder, + $idOrderReturn = 0, + $idHtlBooking = 0, + $idLang = 0, + $orderByLatestRequest = 1 + ) { if (!$idLang) { $idLang = Context::getContext()->language->id; } @@ -316,6 +351,10 @@ class OrderReturnCore extends ObjectModel $sql .= ' AND ord.`id_htl_booking` = '.(int)$idHtlBooking; } + if ($orderByLatestRequest) { + $sql .= ' ORDER BY orr.`id_order_return` DESC'; + } + return Db::getInstance()->executeS($sql); } diff --git a/classes/order/OrderReturnDetail.php b/classes/order/OrderReturnDetail.php index b956347c1..988d9d27e 100644 --- a/classes/order/OrderReturnDetail.php +++ b/classes/order/OrderReturnDetail.php @@ -33,6 +33,10 @@ class OrderReturnDetailCore extends ObjectModel public $id_customization; public $product_quantity; + const REFUND_REQUEST_STATUS_LATEST = 1; + const REFUND_REQUEST_STATUS_PENDING = 2; + const REFUND_REQUEST_STATUS_COMPLETED = 3; + /** * @see ObjectModel::$definition */ diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9193b4d75..e1477b34c 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -942,7 +942,7 @@ class AdminOrdersControllerCore extends AdminController // get booking information by order $objBookingDetail = new HotelBookingDetail(); $objOrderReturn = new OrderReturn(); - $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); + $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1, 0, 1); if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) { foreach($bookingOrderInfo as $key => $booking) { if ((in_array($booking['id'], $refundReqBookings)) || $booking['is_refunded']) { @@ -1314,7 +1314,9 @@ class AdminOrdersControllerCore extends AdminController if ($orderBookings = $objHotelBooking->getOrderCurrentDataByOrderId($order->id)) { foreach ($orderBookings as $orderBooking) { // If booking is refunded then no need to check inventory - if ((OrderReturn::getOrdersReturnDetail($order->id, 0, $orderBooking['id']) && $orderBooking['is_refunded']) + $bookingRefundDetail = OrderReturn::getOrdersReturnDetail($order->id, 0, $orderBooking['id']); + $bookingRefundDetail = reset($bookingRefundDetail); + if (($bookingRefundDetail && $bookingRefundDetail['refunded'] && $orderBooking['is_refunded']) || ($orderBooking['is_cancelled'] && $orderBooking['is_refunded']) ) { continue; @@ -1498,19 +1500,22 @@ class AdminOrdersControllerCore extends AdminController } } } else { - $this->errors[] = Tools::displayError('You do not have permission to delete this.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } /* booking refunds from order */ elseif (Tools::isSubmit('initiateRefund') && isset($order)) { - if ($this->tabAccess['delete'] === '1') { + if ($this->tabAccess['edit'] === '1') { $bookings = Tools::getValue('id_htl_booking'); if ($bookings && count($bookings)) { foreach ($bookings as $idHtlBooking) { - if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { - $this->errors[] = Tools::displayError('Wrong bookings found for booking cancelation.'); - break; + if ($bookingRefundDetail = OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { + $bookingRefundDetail = reset($bookingRefundDetail); + if (!$bookingRefundDetail['refunded']) { + $this->errors[] = Tools::displayError('Wrong bookings found for booking cancelation.'); + break; + } } } } else { @@ -1592,7 +1597,7 @@ class AdminOrdersControllerCore extends AdminController Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=3&token='.$this->token); } } else { - $this->errors[] = Tools::displayError('You do not have permission to delete this.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } elseif (Tools::isSubmit('messageReaded')) { Message::markAsReaded(Tools::getValue('messageReaded'), $this->context->employee->id); @@ -2811,7 +2816,7 @@ class AdminOrdersControllerCore extends AdminController $objOrderReturn = new OrderReturn(); $refundedAmount = 0; - if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1)) { + if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1, 0, 1)) { $refundedAmount = $objOrderReturn->getRefundedAmount($order->id); } diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 95a0adceb..1730af000 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -591,7 +591,6 @@ class OrderOpcControllerCore extends ParentOrderController if (!empty($cartProducts)) { if ($cartBookingInfo = HotelCartBookingData::getHotelCartBookingData()) { - // ddd($cartBookingInfo); $this->context->smarty->assign('cart_htl_data', $cartBookingInfo); } $objHotelServiceProductCartDetail = new HotelServiceProductCartDetail(); diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 5bddb91b5..c27ee00e6 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -2196,7 +2196,7 @@ class HotelBookingDetail extends ObjectModel $order_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); // Check if this booking as any refund history then enter refund data - if ($refundInfo = OrderReturnCore::getOrdersReturnDetail($id_order, 0, $value['id'])) { + if ($refundInfo = OrderReturn::getOrdersReturnDetail($id_order, 0, $value['id'])) { $order_detail_data[$key]['refund_info'] = reset($refundInfo); } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 9f49d48ac..981f0c181 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -373,6 +373,8 @@ class AdminOrderRefundRequestsController extends ModuleAdminController // save individual booking amount for every booking refund $refundedAmount = $refundedAmounts[$idRetDetail]; $objOrderReturnDetail->refunded_amount = $refundedAmount; + // set the id_customization to check if in this request which bookings are refunded or not for future + $objOrderReturnDetail->id_customization = 1; $objOrderReturnDetail->save(); // sum the refund amount for total order refund amount diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl index 767e2801c..affcbb585 100644 --- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl @@ -188,7 +188,12 @@
      {if $isRefundCompleted} - {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']} + {* used id_customization to check if in this request which bookings are refunded or not*} + {if $booking['is_refunded'] && $booking['id_customization']} + {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']} + {else} + {l s='Not refunded' mod='hotelreservationsystem'} + {/if} {else} {$orderCurrency['sign']|escape:'html':'UTF-8'} From 60e7ff67a0645d7e1e7872184be88e280690f58f Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sun, 9 Jun 2024 15:10:40 +0530 Subject: [PATCH 081/106] intallq folder added by mistake removing --- {installq => install}/classes/controllerConsole.php | 0 {installq => install}/classes/controllerHttp.php | 0 {installq => install}/classes/datas.php | 0 {installq => install}/classes/exception.php | 0 {installq => install}/classes/index.php | 0 {installq => install}/classes/language.php | 0 {installq => install}/classes/languages.php | 0 {installq => install}/classes/model.php | 0 {installq => install}/classes/session.php | 0 {installq => install}/classes/simplexml.php | 0 {installq => install}/classes/sqlLoader.php | 0 {installq => install}/classes/xmlLoader.php | 0 {installq => install}/controllers/console/index.php | 0 .../controllers/console/process.php | 0 .../controllers/http/configure.php | 0 {installq => install}/controllers/http/database.php | 0 {installq => install}/controllers/http/index.php | 0 {installq => install}/controllers/http/license.php | 0 {installq => install}/controllers/http/process.php | 0 .../controllers/http/smarty_compile.php | 0 {installq => install}/controllers/http/system.php | 0 {installq => install}/controllers/http/welcome.php | 0 {installq => install}/controllers/index.php | 0 {installq => install}/data/db_structure.sql | 0 {installq => install}/data/img/genders/Mr.jpg | Bin {installq => install}/data/img/genders/Mrs.jpg | Bin {installq => install}/data/img/genders/Unknown.jpg | Bin {installq => install}/data/img/genders/index.php | 0 {installq => install}/data/img/index.php | 0 .../data/img/os/Awaiting_payment.gif | Bin .../data/img/os/Awaiting_remote_payment.gif | Bin {installq => install}/data/img/os/Canceled.gif | Bin .../data/img/os/Overbooking_paid.gif | Bin .../data/img/os/Overbooking_partial_paid.gif | Bin .../data/img/os/Overbooking_unpaid.gif | Bin .../data/img/os/Partial_payment_accepted.gif | Bin .../data/img/os/Payment_accepted.gif | Bin {installq => install}/data/img/os/Payment_error.gif | Bin .../data/img/os/Payment_remotely_accepted.gif | Bin .../data/img/os/Processing_in_progress.gif | Bin {installq => install}/data/img/os/Refund.gif | Bin {installq => install}/data/img/os/index.php | 0 {installq => install}/data/index.php | 0 {installq => install}/data/iso_to_timezone.xml | 0 {installq => install}/data/theme.sql | 0 {installq => install}/data/xml/access.xml | 0 {installq => install}/data/xml/address_format.xml | 0 {installq => install}/data/xml/category.xml | 0 {installq => install}/data/xml/category_group.xml | 0 {installq => install}/data/xml/cms.xml | 0 {installq => install}/data/xml/cms_category.xml | 0 {installq => install}/data/xml/configuration.xml | 0 {installq => install}/data/xml/contact.xml | 0 {installq => install}/data/xml/country.xml | 0 {installq => install}/data/xml/gender.xml | 0 {installq => install}/data/xml/group.xml | 0 {installq => install}/data/xml/hook.xml | 0 {installq => install}/data/xml/hook_alias.xml | 0 {installq => install}/data/xml/image_type.xml | 0 {installq => install}/data/xml/index.php | 0 {installq => install}/data/xml/meta.xml | 0 {installq => install}/data/xml/operating_system.xml | 0 .../data/xml/order_return_state.xml | 0 {installq => install}/data/xml/order_state.xml | 0 {installq => install}/data/xml/profile.xml | 0 {installq => install}/data/xml/quick_access.xml | 0 {installq => install}/data/xml/risk.xml | 0 {installq => install}/data/xml/search_engine.xml | 0 {installq => install}/data/xml/state.xml | 0 {installq => install}/data/xml/stock_mvt_reason.xml | 0 .../data/xml/supply_order_state.xml | 0 {installq => install}/data/xml/tab.xml | 0 {installq => install}/data/xml/theme.xml | 0 {installq => install}/data/xml/theme_meta.xml | 0 {installq => install}/data/xml/timezone.xml | 0 {installq => install}/data/xml/warehouse.xml | 0 {installq => install}/data/xml/web_browser.xml | 0 {installq => install}/data/xml/zone.xml | 0 {installq => install}/dev/index.php | 0 {installq => install}/dev/index.phtml | 0 {installq => install}/dev/style.css | 0 {installq => install}/dev/translate.php | 0 .../dev/update_eu_taxrulegroups.php | 0 .../fixtures/fashion/data/access.xml | 0 .../fixtures/fashion/data/address.xml | 0 .../fixtures/fashion/data/alias.xml | 0 .../fixtures/fashion/data/connections.xml | 0 .../fixtures/fashion/data/customer.xml | 0 .../fixtures/fashion/data/guest.xml | 0 .../fixtures/fashion/data/index.php | 0 .../fixtures/fashion/data/profile.xml | 0 .../fashion/img/c/Blouses-category_default.jpg | Bin .../fashion/img/c/Blouses-medium_default.jpg | Bin .../fixtures/fashion/img/c/Blouses.jpg | Bin .../img/c/Casual_Dresses-category_default.jpg | Bin .../fashion/img/c/Casual_Dresses-medium_default.jpg | Bin .../fixtures/fashion/img/c/Casual_Dresses.jpg | Bin .../fashion/img/c/Dresses-category_default.jpg | Bin .../fashion/img/c/Dresses-medium_default.jpg | Bin .../fixtures/fashion/img/c/Dresses.jpg | Bin .../img/c/Evening_Dresses-category_default.jpg | Bin .../img/c/Evening_Dresses-medium_default.jpg | Bin .../fixtures/fashion/img/c/Evening_Dresses.jpg | Bin .../img/c/Summer_Dresses-category_default.jpg | Bin .../fashion/img/c/Summer_Dresses-medium_default.jpg | Bin .../fixtures/fashion/img/c/Summer_Dresses.jpg | Bin .../fashion/img/c/T-shirts-category_default.jpg | Bin .../fashion/img/c/T-shirts-medium_default.jpg | Bin .../fixtures/fashion/img/c/T-shirts.jpg | Bin .../fashion/img/c/Tops-category_default.jpg | Bin .../fixtures/fashion/img/c/Tops-medium_default.jpg | Bin .../fixtures/fashion/img/c/Tops.jpg | Bin .../fashion/img/c/Tops_1-category_default.jpg | Bin .../fashion/img/c/Tops_1-medium_default.jpg | Bin .../fixtures/fashion/img/c/Tops_1.jpg | Bin .../fashion/img/c/Women-category_default.jpg | Bin .../fixtures/fashion/img/c/Women-medium_default.jpg | Bin .../fixtures/fashion/img/c/Women.jpg | Bin .../fixtures/fashion/img/c/index.php | 0 .../fixtures/fashion/img/c/resize.php | 0 .../fixtures/fashion/img/index.php | 0 .../img/m/Fashion_Manufacturer-large_default.jpg | Bin .../img/m/Fashion_Manufacturer-medium_default.jpg | Bin .../img/m/Fashion_Manufacturer-small_default.jpg | Bin .../fixtures/fashion/img/m/Fashion_Manufacturer.jpg | Bin .../fixtures/fashion/img/m/index.php | 0 .../fixtures/fashion/img/p/image_1-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_1-home_default.jpg | Bin .../fashion/img/p/image_1-large_default.jpg | Bin .../fashion/img/p/image_1-medium_default.jpg | Bin .../fashion/img/p/image_1-small_default.jpg | Bin .../fashion/img/p/image_1-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_1.jpg | Bin .../fashion/img/p/image_10-cart_default.jpg | Bin .../fashion/img/p/image_10-home_default.jpg | Bin .../fashion/img/p/image_10-large_default.jpg | Bin .../fashion/img/p/image_10-medium_default.jpg | Bin .../fashion/img/p/image_10-small_default.jpg | Bin .../fashion/img/p/image_10-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_10.jpg | Bin .../fashion/img/p/image_11-cart_default.jpg | Bin .../fashion/img/p/image_11-home_default.jpg | Bin .../fashion/img/p/image_11-large_default.jpg | Bin .../fashion/img/p/image_11-medium_default.jpg | Bin .../fashion/img/p/image_11-small_default.jpg | Bin .../fashion/img/p/image_11-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_11.jpg | Bin .../fashion/img/p/image_12-cart_default.jpg | Bin .../fashion/img/p/image_12-home_default.jpg | Bin .../fashion/img/p/image_12-large_default.jpg | Bin .../fashion/img/p/image_12-medium_default.jpg | Bin .../fashion/img/p/image_12-small_default.jpg | Bin .../fashion/img/p/image_12-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_12.jpg | Bin .../fashion/img/p/image_13-cart_default.jpg | Bin .../fashion/img/p/image_13-home_default.jpg | Bin .../fashion/img/p/image_13-large_default.jpg | Bin .../fashion/img/p/image_13-medium_default.jpg | Bin .../fashion/img/p/image_13-small_default.jpg | Bin .../fashion/img/p/image_13-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_13.jpg | Bin .../fashion/img/p/image_14-cart_default.jpg | Bin .../fashion/img/p/image_14-home_default.jpg | Bin .../fashion/img/p/image_14-large_default.jpg | Bin .../fashion/img/p/image_14-medium_default.jpg | Bin .../fashion/img/p/image_14-small_default.jpg | Bin .../fashion/img/p/image_14-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_14.jpg | Bin .../fashion/img/p/image_15-cart_default.jpg | Bin .../fashion/img/p/image_15-home_default.jpg | Bin .../fashion/img/p/image_15-large_default.jpg | Bin .../fashion/img/p/image_15-medium_default.jpg | Bin .../fashion/img/p/image_15-small_default.jpg | Bin .../fashion/img/p/image_15-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_15.jpg | Bin .../fashion/img/p/image_16-cart_default.jpg | Bin .../fashion/img/p/image_16-home_default.jpg | Bin .../fashion/img/p/image_16-large_default.jpg | Bin .../fashion/img/p/image_16-medium_default.jpg | Bin .../fashion/img/p/image_16-small_default.jpg | Bin .../fashion/img/p/image_16-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_16.jpg | Bin .../fashion/img/p/image_17-cart_default.jpg | Bin .../fashion/img/p/image_17-home_default.jpg | Bin .../fashion/img/p/image_17-large_default.jpg | Bin .../fashion/img/p/image_17-medium_default.jpg | Bin .../fashion/img/p/image_17-small_default.jpg | Bin .../fashion/img/p/image_17-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_17.jpg | Bin .../fashion/img/p/image_18-cart_default.jpg | Bin .../fashion/img/p/image_18-home_default.jpg | Bin .../fashion/img/p/image_18-large_default.jpg | Bin .../fashion/img/p/image_18-medium_default.jpg | Bin .../fashion/img/p/image_18-small_default.jpg | Bin .../fashion/img/p/image_18-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_18.jpg | Bin .../fashion/img/p/image_19-cart_default.jpg | Bin .../fashion/img/p/image_19-home_default.jpg | Bin .../fashion/img/p/image_19-large_default.jpg | Bin .../fashion/img/p/image_19-medium_default.jpg | Bin .../fashion/img/p/image_19-small_default.jpg | Bin .../fashion/img/p/image_19-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_19.jpg | Bin .../fixtures/fashion/img/p/image_2-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_2-home_default.jpg | Bin .../fashion/img/p/image_2-large_default.jpg | Bin .../fashion/img/p/image_2-medium_default.jpg | Bin .../fashion/img/p/image_2-small_default.jpg | Bin .../fashion/img/p/image_2-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_2.jpg | Bin .../fashion/img/p/image_20-cart_default.jpg | Bin .../fashion/img/p/image_20-home_default.jpg | Bin .../fashion/img/p/image_20-large_default.jpg | Bin .../fashion/img/p/image_20-medium_default.jpg | Bin .../fashion/img/p/image_20-small_default.jpg | Bin .../fashion/img/p/image_20-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_20.jpg | Bin .../fashion/img/p/image_21-cart_default.jpg | Bin .../fashion/img/p/image_21-home_default.jpg | Bin .../fashion/img/p/image_21-large_default.jpg | Bin .../fashion/img/p/image_21-medium_default.jpg | Bin .../fashion/img/p/image_21-small_default.jpg | Bin .../fashion/img/p/image_21-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_21.jpg | Bin .../fashion/img/p/image_22-cart_default.jpg | Bin .../fashion/img/p/image_22-home_default.jpg | Bin .../fashion/img/p/image_22-large_default.jpg | Bin .../fashion/img/p/image_22-medium_default.jpg | Bin .../fashion/img/p/image_22-small_default.jpg | Bin .../fashion/img/p/image_22-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_22.jpg | Bin .../fashion/img/p/image_23-cart_default.jpg | Bin .../fashion/img/p/image_23-home_default.jpg | Bin .../fashion/img/p/image_23-large_default.jpg | Bin .../fashion/img/p/image_23-medium_default.jpg | Bin .../fashion/img/p/image_23-small_default.jpg | Bin .../fashion/img/p/image_23-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_23.jpg | Bin .../fixtures/fashion/img/p/image_3-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_3-home_default.jpg | Bin .../fashion/img/p/image_3-large_default.jpg | Bin .../fashion/img/p/image_3-medium_default.jpg | Bin .../fashion/img/p/image_3-small_default.jpg | Bin .../fashion/img/p/image_3-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_3.jpg | Bin .../fixtures/fashion/img/p/image_4-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_4-home_default.jpg | Bin .../fashion/img/p/image_4-large_default.jpg | Bin .../fashion/img/p/image_4-medium_default.jpg | Bin .../fashion/img/p/image_4-small_default.jpg | Bin .../fashion/img/p/image_4-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_4.jpg | Bin .../fixtures/fashion/img/p/image_5-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_5-home_default.jpg | Bin .../fashion/img/p/image_5-large_default.jpg | Bin .../fashion/img/p/image_5-medium_default.jpg | Bin .../fashion/img/p/image_5-small_default.jpg | Bin .../fashion/img/p/image_5-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_5.jpg | Bin .../fixtures/fashion/img/p/image_6-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_6-home_default.jpg | Bin .../fashion/img/p/image_6-large_default.jpg | Bin .../fashion/img/p/image_6-medium_default.jpg | Bin .../fashion/img/p/image_6-small_default.jpg | Bin .../fashion/img/p/image_6-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_6.jpg | Bin .../fixtures/fashion/img/p/image_7-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_7-home_default.jpg | Bin .../fashion/img/p/image_7-large_default.jpg | Bin .../fashion/img/p/image_7-medium_default.jpg | Bin .../fashion/img/p/image_7-small_default.jpg | Bin .../fashion/img/p/image_7-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_7.jpg | Bin .../fixtures/fashion/img/p/image_8-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_8-home_default.jpg | Bin .../fashion/img/p/image_8-large_default.jpg | Bin .../fashion/img/p/image_8-medium_default.jpg | Bin .../fashion/img/p/image_8-small_default.jpg | Bin .../fashion/img/p/image_8-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_8.jpg | Bin .../fixtures/fashion/img/p/image_9-cart_default.jpg | Bin .../fixtures/fashion/img/p/image_9-home_default.jpg | Bin .../fashion/img/p/image_9-large_default.jpg | Bin .../fashion/img/p/image_9-medium_default.jpg | Bin .../fashion/img/p/image_9-small_default.jpg | Bin .../fashion/img/p/image_9-thickbox_default.jpg | Bin .../fixtures/fashion/img/p/image_9.jpg | Bin .../fixtures/fashion/img/p/index.php | 0 .../fixtures/fashion/img/p/resize.php | 0 .../fixtures/fashion/img/scenes/index.php | 0 .../fixtures/fashion/img/scenes/thumbs/index.php | 0 .../fashion/img/st/Coconut_Grove-medium_default.jpg | Bin .../fixtures/fashion/img/st/Coconut_Grove.jpg | Bin .../fashion/img/st/Dade_County-medium_default.jpg | Bin .../fixtures/fashion/img/st/Dade_County.jpg | Bin .../img/st/E_Fort_Lauderdale-medium_default.jpg | Bin .../fixtures/fashion/img/st/E_Fort_Lauderdale.jpg | Bin .../img/st/N_Miami_Biscayne-medium_default.jpg | Bin .../fixtures/fashion/img/st/N_Miami_Biscayne.jpg | Bin .../img/st/Pembroke_Pines-medium_default.jpg | Bin .../fixtures/fashion/img/st/Pembroke_Pines.jpg | Bin .../fixtures/fashion/img/st/index.php | 0 .../img/su/Fashion_Supplier-large_default.jpg | Bin .../img/su/Fashion_Supplier-medium_default.jpg | Bin .../img/su/Fashion_Supplier-small_default.jpg | Bin .../fixtures/fashion/img/su/Fashion_Supplier.jpg | Bin .../fixtures/fashion/img/su/index.php | 0 {installq => install}/fixtures/fashion/index.php | 0 {installq => install}/fixtures/fashion/install.php | 0 .../fixtures/fashion/langs/bn/data/index.php | 0 .../fixtures/fashion/langs/bn/data/profile.xml | 0 .../fixtures/fashion/langs/bn/index.php | 0 .../fixtures/fashion/langs/br/data/index.php | 0 .../fixtures/fashion/langs/br/data/profile.xml | 0 .../fixtures/fashion/langs/br/index.php | 0 .../fixtures/fashion/langs/de/data/index.php | 0 .../fixtures/fashion/langs/de/data/profile.xml | 0 .../fixtures/fashion/langs/de/index.php | 0 .../fixtures/fashion/langs/en/data/index.php | 0 .../fixtures/fashion/langs/en/data/profile.xml | 0 .../fixtures/fashion/langs/en/index.php | 0 .../fixtures/fashion/langs/es/data/index.php | 0 .../fixtures/fashion/langs/es/data/profile.xml | 0 .../fixtures/fashion/langs/es/index.php | 0 .../fixtures/fashion/langs/fa/data/index.php | 0 .../fixtures/fashion/langs/fa/data/profile.xml | 0 .../fixtures/fashion/langs/fa/index.php | 0 .../fixtures/fashion/langs/fr/data/index.php | 0 .../fixtures/fashion/langs/fr/data/profile.xml | 0 .../fixtures/fashion/langs/fr/index.php | 0 .../fixtures/fashion/langs/id/data/index.php | 0 .../fixtures/fashion/langs/id/data/profile.xml | 0 .../fixtures/fashion/langs/id/index.php | 0 .../fixtures/fashion/langs/index.php | 0 .../fixtures/fashion/langs/it/data/index.php | 0 .../fixtures/fashion/langs/it/data/profile.xml | 0 .../fixtures/fashion/langs/it/index.php | 0 .../fixtures/fashion/langs/nl/data/index.php | 0 .../fixtures/fashion/langs/nl/data/profile.xml | 0 .../fixtures/fashion/langs/nl/index.php | 0 .../fixtures/fashion/langs/pl/data/index.php | 0 .../fixtures/fashion/langs/pl/data/profile.xml | 0 .../fixtures/fashion/langs/pl/index.php | 0 .../fixtures/fashion/langs/qc/data/index.php | 0 .../fixtures/fashion/langs/qc/data/profile.xml | 0 .../fixtures/fashion/langs/qc/index.php | 0 .../fixtures/fashion/langs/ro/data/index.php | 0 .../fixtures/fashion/langs/ro/data/profile.xml | 0 .../fixtures/fashion/langs/ro/index.php | 0 .../fixtures/fashion/langs/ru/data/index.php | 0 .../fixtures/fashion/langs/ru/data/profile.xml | 0 .../fixtures/fashion/langs/ru/index.php | 0 .../fixtures/fashion/langs/tw/data/index.php | 0 .../fixtures/fashion/langs/tw/data/profile.xml | 0 .../fixtures/fashion/langs/tw/index.php | 0 .../fixtures/fashion/langs/vn/data/index.php | 0 .../fixtures/fashion/langs/vn/data/profile.xml | 0 .../fixtures/fashion/langs/vn/index.php | 0 .../fixtures/fashion/langs/zh/data/index.php | 0 .../fixtures/fashion/langs/zh/data/profile.xml | 0 .../fixtures/fashion/langs/zh/index.php | 0 {installq => install}/fixtures/index.php | 0 {installq => install}/index.php | 0 {installq => install}/index_cli.php | 0 {installq => install}/init.php | 0 {installq => install}/install_version.php | 0 {installq => install}/langs/bg/data/carrier.xml | 0 {installq => install}/langs/bg/data/category.xml | 0 {installq => install}/langs/bg/data/cms.xml | 0 .../langs/bg/data/cms_category.xml | 0 .../langs/bg/data/configuration.xml | 0 {installq => install}/langs/bg/data/contact.xml | 0 {installq => install}/langs/bg/data/country.xml | 0 {installq => install}/langs/bg/data/gender.xml | 0 {installq => install}/langs/bg/data/group.xml | 0 {installq => install}/langs/bg/data/index.php | 0 {installq => install}/langs/bg/data/meta.xml | 0 .../langs/bg/data/order_return_state.xml | 0 {installq => install}/langs/bg/data/order_state.xml | 0 {installq => install}/langs/bg/data/profile.xml | 0 .../langs/bg/data/quick_access.xml | 0 {installq => install}/langs/bg/data/risk.xml | 0 .../langs/bg/data/stock_mvt_reason.xml | 0 .../langs/bg/data/supplier_order_state.xml | 0 .../langs/bg/data/supply_order_state.xml | 0 {installq => install}/langs/bg/data/tab.xml | 0 {installq => install}/langs/bg/flag.jpg | Bin .../langs/bg/img/bg-default-category.jpg | Bin .../langs/bg/img/bg-default-home.jpg | Bin .../langs/bg/img/bg-default-large.jpg | Bin .../langs/bg/img/bg-default-large_scene.jpg | Bin .../langs/bg/img/bg-default-medium.jpg | Bin .../langs/bg/img/bg-default-small.jpg | Bin .../langs/bg/img/bg-default-thickbox.jpg | Bin .../langs/bg/img/bg-default-thumb_scene.jpg | Bin {installq => install}/langs/bg/img/bg.jpg | Bin {installq => install}/langs/bg/img/index.php | 0 {installq => install}/langs/bg/index.php | 0 {installq => install}/langs/bg/install.php | 0 {installq => install}/langs/bg/language.xml | 0 {installq => install}/langs/bg/mail_identifiers.txt | 0 {installq => install}/langs/bn/data/carrier.xml | 0 {installq => install}/langs/bn/data/category.xml | 0 {installq => install}/langs/bn/data/cms.xml | 0 .../langs/bn/data/cms_category.xml | 0 .../langs/bn/data/configuration.xml | 0 {installq => install}/langs/bn/data/contact.xml | 0 {installq => install}/langs/bn/data/country.xml | 0 {installq => install}/langs/bn/data/gender.xml | 0 {installq => install}/langs/bn/data/group.xml | 0 {installq => install}/langs/bn/data/index.php | 0 {installq => install}/langs/bn/data/meta.xml | 0 .../langs/bn/data/order_return_state.xml | 0 {installq => install}/langs/bn/data/order_state.xml | 0 {installq => install}/langs/bn/data/profile.xml | 0 .../langs/bn/data/quick_access.xml | 0 {installq => install}/langs/bn/data/risk.xml | 0 .../langs/bn/data/stock_mvt_reason.xml | 0 .../langs/bn/data/supplier_order_state.xml | 0 .../langs/bn/data/supply_order_state.xml | 0 {installq => install}/langs/bn/data/tab.xml | 0 {installq => install}/langs/bn/flag.jpg | Bin .../langs/bn/img/bn-default-category.jpg | Bin .../langs/bn/img/bn-default-home.jpg | Bin .../langs/bn/img/bn-default-large.jpg | Bin .../langs/bn/img/bn-default-large_scene.jpg | Bin .../langs/bn/img/bn-default-medium.jpg | Bin .../langs/bn/img/bn-default-small.jpg | Bin .../langs/bn/img/bn-default-thickbox.jpg | Bin .../langs/bn/img/bn-default-thumb_scene.jpg | Bin {installq => install}/langs/bn/img/bn.jpg | Bin {installq => install}/langs/bn/img/index.php | 0 {installq => install}/langs/bn/index.php | 0 {installq => install}/langs/bn/install.php | 0 {installq => install}/langs/bn/language.xml | 0 {installq => install}/langs/bn/mail_identifiers.txt | 0 {installq => install}/langs/br/data/carrier.xml | 0 {installq => install}/langs/br/data/category.xml | 0 {installq => install}/langs/br/data/cms.xml | 0 .../langs/br/data/cms_category.xml | 0 .../langs/br/data/configuration.xml | 0 {installq => install}/langs/br/data/contact.xml | 0 {installq => install}/langs/br/data/country.xml | 0 {installq => install}/langs/br/data/gender.xml | 0 {installq => install}/langs/br/data/group.xml | 0 {installq => install}/langs/br/data/index.php | 0 {installq => install}/langs/br/data/meta.xml | 0 .../langs/br/data/order_return_state.xml | 0 {installq => install}/langs/br/data/order_state.xml | 0 {installq => install}/langs/br/data/profile.xml | 0 .../langs/br/data/quick_access.xml | 0 {installq => install}/langs/br/data/risk.xml | 0 .../langs/br/data/stock_mvt_reason.xml | 0 .../langs/br/data/supplier_order_state.xml | 0 .../langs/br/data/supply_order_state.xml | 0 {installq => install}/langs/br/data/tab.xml | 0 {installq => install}/langs/br/flag.jpg | Bin .../langs/br/img/br-default-category.jpg | Bin .../langs/br/img/br-default-home.jpg | Bin .../langs/br/img/br-default-large.jpg | Bin .../langs/br/img/br-default-large_scene.jpg | Bin .../langs/br/img/br-default-medium.jpg | Bin .../langs/br/img/br-default-small.jpg | Bin .../langs/br/img/br-default-thickbox.jpg | Bin .../langs/br/img/br-default-thumb_scene.jpg | Bin {installq => install}/langs/br/img/br.jpg | Bin {installq => install}/langs/br/img/index.php | 0 {installq => install}/langs/br/index.php | 0 {installq => install}/langs/br/install.php | 0 {installq => install}/langs/br/language.xml | 0 {installq => install}/langs/br/mail_identifiers.txt | 0 {installq => install}/langs/ca/flag.jpg | Bin {installq => install}/langs/ca/index.php | 0 {installq => install}/langs/ca/install.php | 0 {installq => install}/langs/ca/language.xml | 0 {installq => install}/langs/cs/data/carrier.xml | 0 {installq => install}/langs/cs/data/category.xml | 0 {installq => install}/langs/cs/data/cms.xml | 0 .../langs/cs/data/cms_category.xml | 0 .../langs/cs/data/configuration.xml | 0 {installq => install}/langs/cs/data/contact.xml | 0 {installq => install}/langs/cs/data/country.xml | 0 {installq => install}/langs/cs/data/gender.xml | 0 {installq => install}/langs/cs/data/group.xml | 0 {installq => install}/langs/cs/data/index.php | 0 {installq => install}/langs/cs/data/meta.xml | 0 .../langs/cs/data/order_return_state.xml | 0 {installq => install}/langs/cs/data/order_state.xml | 0 {installq => install}/langs/cs/data/profile.xml | 0 .../langs/cs/data/quick_access.xml | 0 {installq => install}/langs/cs/data/risk.xml | 0 .../langs/cs/data/stock_mvt_reason.xml | 0 .../langs/cs/data/supplier_order_state.xml | 0 .../langs/cs/data/supply_order_state.xml | 0 {installq => install}/langs/cs/data/tab.xml | 0 {installq => install}/langs/cs/flag.jpg | Bin .../langs/cs/img/cs-default-category.jpg | Bin .../langs/cs/img/cs-default-home.jpg | Bin .../langs/cs/img/cs-default-large.jpg | Bin .../langs/cs/img/cs-default-large_scene.jpg | Bin .../langs/cs/img/cs-default-medium.jpg | Bin .../langs/cs/img/cs-default-small.jpg | Bin .../langs/cs/img/cs-default-thickbox.jpg | Bin .../langs/cs/img/cs-default-thumb_scene.jpg | Bin {installq => install}/langs/cs/img/cs.jpg | Bin {installq => install}/langs/cs/img/index.php | 0 {installq => install}/langs/cs/index.php | 0 {installq => install}/langs/cs/install.php | 0 {installq => install}/langs/cs/language.xml | 0 {installq => install}/langs/cs/mail_identifiers.txt | 0 {installq => install}/langs/de/data/carrier.xml | 0 {installq => install}/langs/de/data/category.xml | 0 {installq => install}/langs/de/data/cms.xml | 0 .../langs/de/data/cms_category.xml | 0 .../langs/de/data/configuration.xml | 0 {installq => install}/langs/de/data/contact.xml | 0 {installq => install}/langs/de/data/country.xml | 0 {installq => install}/langs/de/data/gender.xml | 0 {installq => install}/langs/de/data/group.xml | 0 {installq => install}/langs/de/data/index.php | 0 {installq => install}/langs/de/data/meta.xml | 0 .../langs/de/data/order_return_state.xml | 0 {installq => install}/langs/de/data/order_state.xml | 0 {installq => install}/langs/de/data/profile.xml | 0 .../langs/de/data/quick_access.xml | 0 {installq => install}/langs/de/data/risk.xml | 0 .../langs/de/data/stock_mvt_reason.xml | 0 .../langs/de/data/supply_order_state.xml | 0 {installq => install}/langs/de/data/tab.xml | 0 {installq => install}/langs/de/flag.jpg | Bin .../langs/de/img/de-default-category.jpg | Bin .../langs/de/img/de-default-home.jpg | Bin .../langs/de/img/de-default-large.jpg | Bin .../langs/de/img/de-default-large_scene.jpg | Bin .../langs/de/img/de-default-medium.jpg | Bin .../langs/de/img/de-default-small.jpg | Bin .../langs/de/img/de-default-thickbox.jpg | Bin .../langs/de/img/de-default-thumb_scene.jpg | Bin {installq => install}/langs/de/img/de.jpg | Bin {installq => install}/langs/de/img/index.php | 0 {installq => install}/langs/de/index.php | 0 {installq => install}/langs/de/install.php | 0 {installq => install}/langs/de/language.xml | 0 {installq => install}/langs/de/mail_identifiers.txt | 0 {installq => install}/langs/en/data/carrier.xml | 0 {installq => install}/langs/en/data/category.xml | 0 {installq => install}/langs/en/data/cms.xml | 0 .../langs/en/data/cms_category.xml | 0 .../langs/en/data/configuration.xml | 0 {installq => install}/langs/en/data/contact.xml | 0 {installq => install}/langs/en/data/country.xml | 0 {installq => install}/langs/en/data/gender.xml | 0 {installq => install}/langs/en/data/group.xml | 0 {installq => install}/langs/en/data/index.php | 0 {installq => install}/langs/en/data/meta.xml | 0 .../langs/en/data/order_return_state.xml | 0 {installq => install}/langs/en/data/order_state.xml | 0 {installq => install}/langs/en/data/profile.xml | 0 .../langs/en/data/quick_access.xml | 0 {installq => install}/langs/en/data/risk.xml | 0 .../langs/en/data/stock_mvt_reason.xml | 0 .../langs/en/data/supplier_order_state.xml | 0 .../langs/en/data/supply_order_state.xml | 0 {installq => install}/langs/en/data/tab.xml | 0 {installq => install}/langs/en/flag.jpg | Bin .../langs/en/img/en-default-category.jpg | Bin .../langs/en/img/en-default-home.jpg | Bin .../langs/en/img/en-default-large.jpg | Bin .../langs/en/img/en-default-large_scene.jpg | Bin .../langs/en/img/en-default-medium.jpg | Bin .../langs/en/img/en-default-small.jpg | Bin .../langs/en/img/en-default-thickbox.jpg | Bin .../langs/en/img/en-default-thumb_scene.jpg | Bin {installq => install}/langs/en/img/en.jpg | Bin {installq => install}/langs/en/img/index.php | 0 {installq => install}/langs/en/index.php | 0 {installq => install}/langs/en/install.php | 0 {installq => install}/langs/en/language.xml | 0 {installq => install}/langs/en/mail_identifiers.txt | 0 {installq => install}/langs/es/data/carrier.xml | 0 {installq => install}/langs/es/data/category.xml | 0 {installq => install}/langs/es/data/cms.xml | 0 .../langs/es/data/cms_category.xml | 0 .../langs/es/data/configuration.xml | 0 {installq => install}/langs/es/data/contact.xml | 0 {installq => install}/langs/es/data/country.xml | 0 {installq => install}/langs/es/data/gender.xml | 0 {installq => install}/langs/es/data/group.xml | 0 {installq => install}/langs/es/data/index.php | 0 {installq => install}/langs/es/data/meta.xml | 0 .../langs/es/data/order_return_state.xml | 0 {installq => install}/langs/es/data/order_state.xml | 0 {installq => install}/langs/es/data/profile.xml | 0 .../langs/es/data/quick_access.xml | 0 {installq => install}/langs/es/data/risk.xml | 0 .../langs/es/data/stock_mvt_reason.xml | 0 .../langs/es/data/supplier_order_state.xml | 0 .../langs/es/data/supply_order_state.xml | 0 {installq => install}/langs/es/data/tab.xml | 0 {installq => install}/langs/es/flag.jpg | Bin .../langs/es/img/es-default-category.jpg | Bin .../langs/es/img/es-default-home.jpg | Bin .../langs/es/img/es-default-large.jpg | Bin .../langs/es/img/es-default-large_scene.jpg | Bin .../langs/es/img/es-default-medium.jpg | Bin .../langs/es/img/es-default-small.jpg | Bin .../langs/es/img/es-default-thickbox.jpg | Bin .../langs/es/img/es-default-thumb_scene.jpg | Bin {installq => install}/langs/es/img/es.jpg | Bin {installq => install}/langs/es/img/index.php | 0 {installq => install}/langs/es/index.php | 0 {installq => install}/langs/es/install.php | 0 {installq => install}/langs/es/language.xml | 0 {installq => install}/langs/es/mail_identifiers.txt | 0 {installq => install}/langs/fa/Flag_of_Iran.svg | 0 {installq => install}/langs/fa/data/carrier.xml | 0 {installq => install}/langs/fa/data/category.xml | 0 {installq => install}/langs/fa/data/cms.xml | 0 .../langs/fa/data/cms_category.xml | 0 .../langs/fa/data/configuration.xml | 0 {installq => install}/langs/fa/data/contact.xml | 0 {installq => install}/langs/fa/data/country.xml | 0 {installq => install}/langs/fa/data/gender.xml | 0 {installq => install}/langs/fa/data/group.xml | 0 {installq => install}/langs/fa/data/index.php | 0 {installq => install}/langs/fa/data/meta.xml | 0 .../langs/fa/data/order_return_state.xml | 0 {installq => install}/langs/fa/data/order_state.xml | 0 {installq => install}/langs/fa/data/profile.xml | 0 .../langs/fa/data/quick_access.xml | 0 {installq => install}/langs/fa/data/risk.xml | 0 .../langs/fa/data/stock_mvt_reason.xml | 0 .../langs/fa/data/supplier_order_state.xml | 0 .../langs/fa/data/supply_order_state.xml | 0 {installq => install}/langs/fa/data/tab.xml | 0 {installq => install}/langs/fa/flag.jpg | Bin .../langs/fa/img/fa-default-category.jpg | Bin .../langs/fa/img/fa-default-home.jpg | Bin .../langs/fa/img/fa-default-large.jpg | Bin .../langs/fa/img/fa-default-large_scene.jpg | Bin .../langs/fa/img/fa-default-medium.jpg | Bin .../langs/fa/img/fa-default-small.jpg | Bin .../langs/fa/img/fa-default-thickbox.jpg | Bin .../langs/fa/img/fa-default-thumb_scene.jpg | Bin {installq => install}/langs/fa/img/fa.jpg | Bin {installq => install}/langs/fa/img/index.php | 0 {installq => install}/langs/fa/index.php | 0 {installq => install}/langs/fa/install.php | 0 {installq => install}/langs/fa/language.xml | 0 {installq => install}/langs/fa/mail_identifiers.txt | 0 {installq => install}/langs/fr/data/carrier.xml | 0 {installq => install}/langs/fr/data/category.xml | 0 {installq => install}/langs/fr/data/cms.xml | 0 .../langs/fr/data/cms_category.xml | 0 .../langs/fr/data/configuration.xml | 0 {installq => install}/langs/fr/data/contact.xml | 0 {installq => install}/langs/fr/data/country.xml | 0 {installq => install}/langs/fr/data/gender.xml | 0 {installq => install}/langs/fr/data/group.xml | 0 {installq => install}/langs/fr/data/index.php | 0 {installq => install}/langs/fr/data/meta.xml | 0 .../langs/fr/data/order_return_state.xml | 0 {installq => install}/langs/fr/data/order_state.xml | 0 {installq => install}/langs/fr/data/profile.xml | 0 .../langs/fr/data/quick_access.xml | 0 {installq => install}/langs/fr/data/risk.xml | 0 .../langs/fr/data/stock_mvt_reason.xml | 0 .../langs/fr/data/supplier_order_state.xml | 0 .../langs/fr/data/supply_order_state.xml | 0 {installq => install}/langs/fr/data/tab.xml | 0 {installq => install}/langs/fr/flag.jpg | Bin .../langs/fr/img/fr-default-category.jpg | Bin .../langs/fr/img/fr-default-home.jpg | Bin .../langs/fr/img/fr-default-large.jpg | Bin .../langs/fr/img/fr-default-large_scene.jpg | Bin .../langs/fr/img/fr-default-medium.jpg | Bin .../langs/fr/img/fr-default-small.jpg | Bin .../langs/fr/img/fr-default-thickbox.jpg | Bin .../langs/fr/img/fr-default-thumb_scene.jpg | Bin {installq => install}/langs/fr/img/fr.jpg | Bin {installq => install}/langs/fr/img/index.php | 0 {installq => install}/langs/fr/index.php | 0 {installq => install}/langs/fr/install.php | 0 {installq => install}/langs/fr/language.xml | 0 {installq => install}/langs/fr/mail_identifiers.txt | 0 {installq => install}/langs/he/data/carrier.xml | 0 {installq => install}/langs/he/data/category.xml | 0 {installq => install}/langs/he/data/cms.xml | 0 .../langs/he/data/cms_category.xml | 0 .../langs/he/data/configuration.xml | 0 {installq => install}/langs/he/data/contact.xml | 0 {installq => install}/langs/he/data/country.xml | 0 {installq => install}/langs/he/data/gender.xml | 0 {installq => install}/langs/he/data/group.xml | 0 {installq => install}/langs/he/data/index.php | 0 {installq => install}/langs/he/data/meta.xml | 0 .../langs/he/data/order_return_state.xml | 0 {installq => install}/langs/he/data/order_state.xml | 0 {installq => install}/langs/he/data/profile.xml | 0 .../langs/he/data/quick_access.xml | 0 {installq => install}/langs/he/data/risk.xml | 0 .../langs/he/data/stock_mvt_reason.xml | 0 .../langs/he/data/supplier_order_state.xml | 0 .../langs/he/data/supply_order_state.xml | 0 {installq => install}/langs/he/data/tab.xml | 0 {installq => install}/langs/he/flag.jpg | Bin .../langs/he/img/he-default-category.jpg | Bin .../langs/he/img/he-default-home.jpg | Bin .../langs/he/img/he-default-large.jpg | Bin .../langs/he/img/he-default-large_scene.jpg | Bin .../langs/he/img/he-default-medium.jpg | Bin .../langs/he/img/he-default-small.jpg | Bin .../langs/he/img/he-default-thickbox.jpg | Bin .../langs/he/img/he-default-thumb_scene.jpg | Bin {installq => install}/langs/he/img/he.jpg | Bin {installq => install}/langs/he/img/index.php | 0 {installq => install}/langs/he/index.php | 0 {installq => install}/langs/he/install.php | 0 {installq => install}/langs/he/language.xml | 0 {installq => install}/langs/he/mail_identifiers.txt | 0 {installq => install}/langs/hr/data/carrier.xml | 0 {installq => install}/langs/hr/data/category.xml | 0 {installq => install}/langs/hr/data/cms.xml | 0 .../langs/hr/data/cms_category.xml | 0 .../langs/hr/data/configuration.xml | 0 {installq => install}/langs/hr/data/contact.xml | 0 {installq => install}/langs/hr/data/country.xml | 0 {installq => install}/langs/hr/data/gender.xml | 0 {installq => install}/langs/hr/data/group.xml | 0 {installq => install}/langs/hr/data/index.php | 0 {installq => install}/langs/hr/data/meta.xml | 0 .../langs/hr/data/order_return_state.xml | 0 {installq => install}/langs/hr/data/order_state.xml | 0 {installq => install}/langs/hr/data/profile.xml | 0 .../langs/hr/data/quick_access.xml | 0 {installq => install}/langs/hr/data/risk.xml | 0 .../langs/hr/data/stock_mvt_reason.xml | 0 .../langs/hr/data/supplier_order_state.xml | 0 .../langs/hr/data/supply_order_state.xml | 0 {installq => install}/langs/hr/data/tab.xml | 0 {installq => install}/langs/hr/flag.jpg | Bin .../langs/hr/img/hr-default-category.jpg | Bin .../langs/hr/img/hr-default-home.jpg | Bin .../langs/hr/img/hr-default-large.jpg | Bin .../langs/hr/img/hr-default-large_scene.jpg | Bin .../langs/hr/img/hr-default-medium.jpg | Bin .../langs/hr/img/hr-default-small.jpg | Bin .../langs/hr/img/hr-default-thickbox.jpg | Bin .../langs/hr/img/hr-default-thumb_scene.jpg | Bin {installq => install}/langs/hr/img/hr.jpg | Bin {installq => install}/langs/hr/img/index.php | 0 {installq => install}/langs/hr/index.php | 0 {installq => install}/langs/hr/install.php | 0 {installq => install}/langs/hr/language.xml | 0 {installq => install}/langs/hr/mail_identifiers.txt | 0 {installq => install}/langs/hu/data/carrier.xml | 0 {installq => install}/langs/hu/data/category.xml | 0 {installq => install}/langs/hu/data/cms.xml | 0 .../langs/hu/data/cms_category.xml | 0 .../langs/hu/data/configuration.xml | 0 {installq => install}/langs/hu/data/contact.xml | 0 {installq => install}/langs/hu/data/country.xml | 0 {installq => install}/langs/hu/data/gender.xml | 0 {installq => install}/langs/hu/data/group.xml | 0 {installq => install}/langs/hu/data/index.php | 0 {installq => install}/langs/hu/data/meta.xml | 0 .../langs/hu/data/order_return_state.xml | 0 {installq => install}/langs/hu/data/order_state.xml | 0 {installq => install}/langs/hu/data/profile.xml | 0 .../langs/hu/data/quick_access.xml | 0 {installq => install}/langs/hu/data/risk.xml | 0 .../langs/hu/data/stock_mvt_reason.xml | 0 .../langs/hu/data/supplier_order_state.xml | 0 .../langs/hu/data/supply_order_state.xml | 0 {installq => install}/langs/hu/data/tab.xml | 0 {installq => install}/langs/hu/flag.jpg | Bin .../langs/hu/img/hu-default-category.jpg | Bin .../langs/hu/img/hu-default-home.jpg | Bin .../langs/hu/img/hu-default-large.jpg | Bin .../langs/hu/img/hu-default-large_scene.jpg | Bin .../langs/hu/img/hu-default-medium.jpg | Bin .../langs/hu/img/hu-default-small.jpg | Bin .../langs/hu/img/hu-default-thickbox.jpg | Bin .../langs/hu/img/hu-default-thumb_scene.jpg | Bin {installq => install}/langs/hu/img/hu.jpg | Bin {installq => install}/langs/hu/img/index.php | 0 {installq => install}/langs/hu/index.php | 0 {installq => install}/langs/hu/install.php | 0 {installq => install}/langs/hu/language.xml | 0 {installq => install}/langs/hu/mail_identifiers.txt | 0 {installq => install}/langs/id/data/carrier.xml | 0 {installq => install}/langs/id/data/category.xml | 0 {installq => install}/langs/id/data/cms.xml | 0 .../langs/id/data/cms_category.xml | 0 .../langs/id/data/configuration.xml | 0 {installq => install}/langs/id/data/contact.xml | 0 {installq => install}/langs/id/data/country.xml | 0 {installq => install}/langs/id/data/gender.xml | 0 {installq => install}/langs/id/data/group.xml | 0 {installq => install}/langs/id/data/index.php | 0 {installq => install}/langs/id/data/meta.xml | 0 .../langs/id/data/order_return_state.xml | 0 {installq => install}/langs/id/data/order_state.xml | 0 {installq => install}/langs/id/data/profile.xml | 0 .../langs/id/data/quick_access.xml | 0 {installq => install}/langs/id/data/risk.xml | 0 .../langs/id/data/stock_mvt_reason.xml | 0 .../langs/id/data/supplier_order_state.xml | 0 .../langs/id/data/supply_order_state.xml | 0 {installq => install}/langs/id/data/tab.xml | 0 {installq => install}/langs/id/flag.jpg | Bin .../langs/id/img/id-default-category.jpg | Bin .../langs/id/img/id-default-home.jpg | Bin .../langs/id/img/id-default-large.jpg | Bin .../langs/id/img/id-default-large_scene.jpg | Bin .../langs/id/img/id-default-medium.jpg | Bin .../langs/id/img/id-default-small.jpg | Bin .../langs/id/img/id-default-thickbox.jpg | Bin .../langs/id/img/id-default-thumb_scene.jpg | Bin {installq => install}/langs/id/img/id.jpg | Bin {installq => install}/langs/id/img/index.php | 0 {installq => install}/langs/id/index.php | 0 {installq => install}/langs/id/install.php | 0 {installq => install}/langs/id/language.xml | 0 {installq => install}/langs/id/mail_identifiers.txt | 0 {installq => install}/langs/index.php | 0 {installq => install}/langs/it/data/carrier.xml | 0 {installq => install}/langs/it/data/category.xml | 0 {installq => install}/langs/it/data/cms.xml | 0 .../langs/it/data/cms_category.xml | 0 .../langs/it/data/configuration.xml | 0 {installq => install}/langs/it/data/contact.xml | 0 {installq => install}/langs/it/data/country.xml | 0 {installq => install}/langs/it/data/gender.xml | 0 {installq => install}/langs/it/data/group.xml | 0 {installq => install}/langs/it/data/index.php | 0 {installq => install}/langs/it/data/meta.xml | 0 .../langs/it/data/order_return_state.xml | 0 {installq => install}/langs/it/data/order_state.xml | 0 {installq => install}/langs/it/data/profile.xml | 0 .../langs/it/data/quick_access.xml | 0 {installq => install}/langs/it/data/risk.xml | 0 .../langs/it/data/stock_mvt_reason.xml | 0 .../langs/it/data/supplier_order_state.xml | 0 .../langs/it/data/supply_order_state.xml | 0 {installq => install}/langs/it/data/tab.xml | 0 {installq => install}/langs/it/flag.jpg | Bin {installq => install}/langs/it/img/index.php | 0 .../langs/it/img/it-default-category.jpg | Bin .../langs/it/img/it-default-home.jpg | Bin .../langs/it/img/it-default-large.jpg | Bin .../langs/it/img/it-default-large_scene.jpg | Bin .../langs/it/img/it-default-medium.jpg | Bin .../langs/it/img/it-default-small.jpg | Bin .../langs/it/img/it-default-thickbox.jpg | Bin .../langs/it/img/it-default-thumb_scene.jpg | Bin {installq => install}/langs/it/img/it.jpg | Bin {installq => install}/langs/it/index.php | 0 {installq => install}/langs/it/install.php | 0 {installq => install}/langs/it/language.xml | 0 {installq => install}/langs/it/mail_identifiers.txt | 0 {installq => install}/langs/lt/data/carrier.xml | 0 {installq => install}/langs/lt/data/category.xml | 0 {installq => install}/langs/lt/data/cms.xml | 0 .../langs/lt/data/cms_category.xml | 0 .../langs/lt/data/configuration.xml | 0 {installq => install}/langs/lt/data/contact.xml | 0 {installq => install}/langs/lt/data/country.xml | 0 {installq => install}/langs/lt/data/gender.xml | 0 {installq => install}/langs/lt/data/group.xml | 0 {installq => install}/langs/lt/data/index.php | 0 {installq => install}/langs/lt/data/meta.xml | 0 .../langs/lt/data/order_return_state.xml | 0 {installq => install}/langs/lt/data/order_state.xml | 0 {installq => install}/langs/lt/data/profile.xml | 0 .../langs/lt/data/quick_access.xml | 0 {installq => install}/langs/lt/data/risk.xml | 0 .../langs/lt/data/stock_mvt_reason.xml | 0 .../langs/lt/data/supplier_order_state.xml | 0 .../langs/lt/data/supply_order_state.xml | 0 {installq => install}/langs/lt/data/tab.xml | 0 {installq => install}/langs/lt/flag.jpg | Bin {installq => install}/langs/lt/img/index.php | 0 .../langs/lt/img/lt-default-category.jpg | Bin .../langs/lt/img/lt-default-home.jpg | Bin .../langs/lt/img/lt-default-large.jpg | Bin .../langs/lt/img/lt-default-large_scene.jpg | Bin .../langs/lt/img/lt-default-medium.jpg | Bin .../langs/lt/img/lt-default-small.jpg | Bin .../langs/lt/img/lt-default-thickbox.jpg | Bin .../langs/lt/img/lt-default-thumb_scene.jpg | Bin {installq => install}/langs/lt/img/lt.jpg | Bin {installq => install}/langs/lt/index.php | 0 {installq => install}/langs/lt/install.php | 0 {installq => install}/langs/lt/language.xml | 0 {installq => install}/langs/lt/mail_identifiers.txt | 0 {installq => install}/langs/mk/data/carrier.xml | 0 {installq => install}/langs/mk/data/category.xml | 0 {installq => install}/langs/mk/data/cms.xml | 0 .../langs/mk/data/cms_category.xml | 0 .../langs/mk/data/configuration.xml | 0 {installq => install}/langs/mk/data/contact.xml | 0 {installq => install}/langs/mk/data/country.xml | 0 {installq => install}/langs/mk/data/gender.xml | 0 {installq => install}/langs/mk/data/group.xml | 0 {installq => install}/langs/mk/data/index.php | 0 {installq => install}/langs/mk/data/meta.xml | 0 .../langs/mk/data/order_return_state.xml | 0 {installq => install}/langs/mk/data/order_state.xml | 0 {installq => install}/langs/mk/data/profile.xml | 0 .../langs/mk/data/quick_access.xml | 0 {installq => install}/langs/mk/data/risk.xml | 0 .../langs/mk/data/stock_mvt_reason.xml | 0 .../langs/mk/data/supplier_order_state.xml | 0 .../langs/mk/data/supply_order_state.xml | 0 {installq => install}/langs/mk/data/tab.xml | 0 {installq => install}/langs/mk/flag.jpg | Bin {installq => install}/langs/mk/img/index.php | 0 .../langs/mk/img/mk-default-category.jpg | Bin .../langs/mk/img/mk-default-home.jpg | Bin .../langs/mk/img/mk-default-large.jpg | Bin .../langs/mk/img/mk-default-large_scene.jpg | Bin .../langs/mk/img/mk-default-medium.jpg | Bin .../langs/mk/img/mk-default-small.jpg | Bin .../langs/mk/img/mk-default-thickbox.jpg | Bin .../langs/mk/img/mk-default-thumb_scene.jpg | Bin {installq => install}/langs/mk/img/mk.jpg | Bin {installq => install}/langs/mk/index.php | 0 {installq => install}/langs/mk/install.php | 0 {installq => install}/langs/mk/language.xml | 0 {installq => install}/langs/mk/mail_identifiers.txt | 0 {installq => install}/langs/nl/data/carrier.xml | 0 {installq => install}/langs/nl/data/category.xml | 0 {installq => install}/langs/nl/data/cms.xml | 0 .../langs/nl/data/cms_category.xml | 0 .../langs/nl/data/configuration.xml | 0 {installq => install}/langs/nl/data/contact.xml | 0 {installq => install}/langs/nl/data/country.xml | 0 {installq => install}/langs/nl/data/gender.xml | 0 {installq => install}/langs/nl/data/group.xml | 0 {installq => install}/langs/nl/data/index.php | 0 {installq => install}/langs/nl/data/meta.xml | 0 .../langs/nl/data/order_return_state.xml | 0 {installq => install}/langs/nl/data/order_state.xml | 0 {installq => install}/langs/nl/data/profile.xml | 0 .../langs/nl/data/quick_access.xml | 0 {installq => install}/langs/nl/data/risk.xml | 0 .../langs/nl/data/stock_mvt_reason.xml | 0 .../langs/nl/data/supplier_order_state.xml | 0 .../langs/nl/data/supply_order_state.xml | 0 {installq => install}/langs/nl/data/tab.xml | 0 {installq => install}/langs/nl/flag.jpg | Bin {installq => install}/langs/nl/img/index.php | 0 .../langs/nl/img/nl-default-category.jpg | Bin .../langs/nl/img/nl-default-home.jpg | Bin .../langs/nl/img/nl-default-large.jpg | Bin .../langs/nl/img/nl-default-large_scene.jpg | Bin .../langs/nl/img/nl-default-medium.jpg | Bin .../langs/nl/img/nl-default-small.jpg | Bin .../langs/nl/img/nl-default-thickbox.jpg | Bin .../langs/nl/img/nl-default-thumb_scene.jpg | Bin {installq => install}/langs/nl/img/nl.jpg | Bin {installq => install}/langs/nl/index.php | 0 {installq => install}/langs/nl/install.php | 0 {installq => install}/langs/nl/language.xml | 0 {installq => install}/langs/nl/mail_identifiers.txt | 0 {installq => install}/langs/no/data/carrier.xml | 0 {installq => install}/langs/no/data/category.xml | 0 {installq => install}/langs/no/data/cms.xml | 0 .../langs/no/data/cms_category.xml | 0 .../langs/no/data/configuration.xml | 0 {installq => install}/langs/no/data/contact.xml | 0 {installq => install}/langs/no/data/country.xml | 0 {installq => install}/langs/no/data/gender.xml | 0 {installq => install}/langs/no/data/group.xml | 0 {installq => install}/langs/no/data/index.php | 0 {installq => install}/langs/no/data/meta.xml | 0 .../langs/no/data/order_return_state.xml | 0 {installq => install}/langs/no/data/order_state.xml | 0 {installq => install}/langs/no/data/profile.xml | 0 .../langs/no/data/quick_access.xml | 0 {installq => install}/langs/no/data/risk.xml | 0 .../langs/no/data/stock_mvt_reason.xml | 0 .../langs/no/data/supplier_order_state.xml | 0 .../langs/no/data/supply_order_state.xml | 0 {installq => install}/langs/no/data/tab.xml | 0 {installq => install}/langs/no/flag.jpg | Bin {installq => install}/langs/no/img/index.php | 0 .../langs/no/img/no-default-category.jpg | Bin .../langs/no/img/no-default-home.jpg | Bin .../langs/no/img/no-default-large.jpg | Bin .../langs/no/img/no-default-large_scene.jpg | Bin .../langs/no/img/no-default-medium.jpg | Bin .../langs/no/img/no-default-small.jpg | Bin .../langs/no/img/no-default-thickbox.jpg | Bin .../langs/no/img/no-default-thumb_scene.jpg | Bin {installq => install}/langs/no/img/no.jpg | Bin {installq => install}/langs/no/index.php | 0 {installq => install}/langs/no/install.php | 0 {installq => install}/langs/no/language.xml | 0 {installq => install}/langs/no/mail_identifiers.txt | 0 {installq => install}/langs/pl/data/carrier.xml | 0 {installq => install}/langs/pl/data/category.xml | 0 {installq => install}/langs/pl/data/cms.xml | 0 .../langs/pl/data/cms_category.xml | 0 .../langs/pl/data/configuration.xml | 0 {installq => install}/langs/pl/data/contact.xml | 0 {installq => install}/langs/pl/data/country.xml | 0 {installq => install}/langs/pl/data/gender.xml | 0 {installq => install}/langs/pl/data/group.xml | 0 {installq => install}/langs/pl/data/index.php | 0 {installq => install}/langs/pl/data/meta.xml | 0 .../langs/pl/data/order_return_state.xml | 0 {installq => install}/langs/pl/data/order_state.xml | 0 {installq => install}/langs/pl/data/profile.xml | 0 .../langs/pl/data/quick_access.xml | 0 {installq => install}/langs/pl/data/risk.xml | 0 .../langs/pl/data/stock_mvt_reason.xml | 0 .../langs/pl/data/supplier_order_state.xml | 0 .../langs/pl/data/supply_order_state.xml | 0 {installq => install}/langs/pl/data/tab.xml | 0 {installq => install}/langs/pl/flag.jpg | Bin {installq => install}/langs/pl/img/flag.jpg | Bin {installq => install}/langs/pl/img/index.php | 0 .../langs/pl/img/pl-default-category.jpg | Bin .../langs/pl/img/pl-default-home.jpg | Bin .../langs/pl/img/pl-default-large.jpg | Bin .../langs/pl/img/pl-default-large_scene.jpg | Bin .../langs/pl/img/pl-default-medium.jpg | Bin .../langs/pl/img/pl-default-small.jpg | Bin .../langs/pl/img/pl-default-thickbox.jpg | Bin .../langs/pl/img/pl-default-thumb_scene.jpg | Bin {installq => install}/langs/pl/img/pl.jpg | Bin {installq => install}/langs/pl/index.php | 0 {installq => install}/langs/pl/install.php | 0 {installq => install}/langs/pl/language.xml | 0 {installq => install}/langs/pl/mail_identifiers.txt | 0 {installq => install}/langs/pt/data/carrier.xml | 0 {installq => install}/langs/pt/data/category.xml | 0 {installq => install}/langs/pt/data/cms.xml | 0 .../langs/pt/data/cms_category.xml | 0 .../langs/pt/data/configuration.xml | 0 {installq => install}/langs/pt/data/contact.xml | 0 {installq => install}/langs/pt/data/country.xml | 0 {installq => install}/langs/pt/data/gender.xml | 0 {installq => install}/langs/pt/data/group.xml | 0 {installq => install}/langs/pt/data/index.php | 0 {installq => install}/langs/pt/data/meta.xml | 0 .../langs/pt/data/order_return_state.xml | 0 {installq => install}/langs/pt/data/order_state.xml | 0 {installq => install}/langs/pt/data/profile.xml | 0 .../langs/pt/data/quick_access.xml | 0 {installq => install}/langs/pt/data/risk.xml | 0 .../langs/pt/data/stock_mvt_reason.xml | 0 .../langs/pt/data/supplier_order_state.xml | 0 .../langs/pt/data/supply_order_state.xml | 0 {installq => install}/langs/pt/data/tab.xml | 0 {installq => install}/langs/pt/flag.jpg | Bin {installq => install}/langs/pt/img/index.php | 0 .../langs/pt/img/pt-default-category.jpg | Bin .../langs/pt/img/pt-default-home.jpg | Bin .../langs/pt/img/pt-default-large.jpg | Bin .../langs/pt/img/pt-default-large_scene.jpg | Bin .../langs/pt/img/pt-default-medium.jpg | Bin .../langs/pt/img/pt-default-small.jpg | Bin .../langs/pt/img/pt-default-thickbox.jpg | Bin .../langs/pt/img/pt-default-thumb_scene.jpg | Bin {installq => install}/langs/pt/img/pt.jpg | Bin {installq => install}/langs/pt/index.php | 0 {installq => install}/langs/pt/install.php | 0 {installq => install}/langs/pt/language.xml | 0 {installq => install}/langs/pt/mail_identifiers.txt | 0 {installq => install}/langs/qc/data/carrier.xml | 0 {installq => install}/langs/qc/data/category.xml | 0 {installq => install}/langs/qc/data/cms.xml | 0 .../langs/qc/data/cms_category.xml | 0 .../langs/qc/data/configuration.xml | 0 {installq => install}/langs/qc/data/contact.xml | 0 {installq => install}/langs/qc/data/country.xml | 0 {installq => install}/langs/qc/data/gender.xml | 0 {installq => install}/langs/qc/data/group.xml | 0 {installq => install}/langs/qc/data/index.php | 0 {installq => install}/langs/qc/data/meta.xml | 0 .../langs/qc/data/order_return_state.xml | 0 {installq => install}/langs/qc/data/order_state.xml | 0 {installq => install}/langs/qc/data/profile.xml | 0 .../langs/qc/data/quick_access.xml | 0 {installq => install}/langs/qc/data/risk.xml | 0 .../langs/qc/data/stock_mvt_reason.xml | 0 .../langs/qc/data/supplier_order_state.xml | 0 .../langs/qc/data/supply_order_state.xml | 0 {installq => install}/langs/qc/data/tab.xml | 0 {installq => install}/langs/qc/flag.jpg | Bin {installq => install}/langs/qc/img/index.php | 0 .../langs/qc/img/qc-default-category.jpg | Bin .../langs/qc/img/qc-default-home.jpg | Bin .../langs/qc/img/qc-default-large.jpg | Bin .../langs/qc/img/qc-default-large_scene.jpg | Bin .../langs/qc/img/qc-default-medium.jpg | Bin .../langs/qc/img/qc-default-small.jpg | Bin .../langs/qc/img/qc-default-thickbox.jpg | Bin .../langs/qc/img/qc-default-thumb_scene.jpg | Bin {installq => install}/langs/qc/img/qc.jpg | Bin {installq => install}/langs/qc/index.php | 0 {installq => install}/langs/qc/install.php | 0 {installq => install}/langs/qc/language.xml | 0 {installq => install}/langs/qc/mail_identifiers.txt | 0 {installq => install}/langs/ro/data/carrier.xml | 0 {installq => install}/langs/ro/data/category.xml | 0 {installq => install}/langs/ro/data/cms.xml | 0 .../langs/ro/data/cms_category.xml | 0 .../langs/ro/data/configuration.xml | 0 {installq => install}/langs/ro/data/contact.xml | 0 {installq => install}/langs/ro/data/country.xml | 0 {installq => install}/langs/ro/data/gender.xml | 0 {installq => install}/langs/ro/data/group.xml | 0 {installq => install}/langs/ro/data/index.php | 0 {installq => install}/langs/ro/data/meta.xml | 0 .../langs/ro/data/order_return_state.xml | 0 {installq => install}/langs/ro/data/order_state.xml | 0 {installq => install}/langs/ro/data/profile.xml | 0 .../langs/ro/data/quick_access.xml | 0 {installq => install}/langs/ro/data/risk.xml | 0 .../langs/ro/data/stock_mvt_reason.xml | 0 .../langs/ro/data/supplier_order_state.xml | 0 .../langs/ro/data/supply_order_state.xml | 0 {installq => install}/langs/ro/data/tab.xml | 0 {installq => install}/langs/ro/flag.jpg | Bin {installq => install}/langs/ro/img/index.php | 0 .../langs/ro/img/ro-default-category.jpg | Bin .../langs/ro/img/ro-default-home.jpg | Bin .../langs/ro/img/ro-default-large.jpg | Bin .../langs/ro/img/ro-default-large_scene.jpg | Bin .../langs/ro/img/ro-default-medium.jpg | Bin .../langs/ro/img/ro-default-small.jpg | Bin .../langs/ro/img/ro-default-thickbox.jpg | Bin .../langs/ro/img/ro-default-thumb_scene.jpg | Bin {installq => install}/langs/ro/img/ro.jpg | Bin {installq => install}/langs/ro/index.php | 0 {installq => install}/langs/ro/install.php | 0 {installq => install}/langs/ro/language.xml | 0 {installq => install}/langs/ro/mail_identifiers.txt | 0 {installq => install}/langs/ru/data/carrier.xml | 0 {installq => install}/langs/ru/data/category.xml | 0 {installq => install}/langs/ru/data/cms.xml | 0 .../langs/ru/data/cms_category.xml | 0 .../langs/ru/data/configuration.xml | 0 {installq => install}/langs/ru/data/contact.xml | 0 {installq => install}/langs/ru/data/country.xml | 0 {installq => install}/langs/ru/data/gender.xml | 0 {installq => install}/langs/ru/data/group.xml | 0 {installq => install}/langs/ru/data/index.php | 0 {installq => install}/langs/ru/data/meta.xml | 0 .../langs/ru/data/order_return_state.xml | 0 {installq => install}/langs/ru/data/order_state.xml | 0 {installq => install}/langs/ru/data/profile.xml | 0 .../langs/ru/data/quick_access.xml | 0 {installq => install}/langs/ru/data/risk.xml | 0 .../langs/ru/data/stock_mvt_reason.xml | 0 .../langs/ru/data/supplier_order_state.xml | 0 .../langs/ru/data/supply_order_state.xml | 0 {installq => install}/langs/ru/data/tab.xml | 0 {installq => install}/langs/ru/flag.jpg | Bin {installq => install}/langs/ru/img/flag.jpg | Bin {installq => install}/langs/ru/img/index.php | 0 .../langs/ru/img/ru-default-category.jpg | Bin .../langs/ru/img/ru-default-home.jpg | Bin .../langs/ru/img/ru-default-large.jpg | Bin .../langs/ru/img/ru-default-large_scene.jpg | Bin .../langs/ru/img/ru-default-medium.jpg | Bin .../langs/ru/img/ru-default-small.jpg | Bin .../langs/ru/img/ru-default-thickbox.jpg | Bin .../langs/ru/img/ru-default-thumb_scene.jpg | Bin {installq => install}/langs/ru/img/ru.jpg | Bin {installq => install}/langs/ru/index.php | 0 {installq => install}/langs/ru/install.php | 0 {installq => install}/langs/ru/language.xml | 0 {installq => install}/langs/ru/mail_identifiers.txt | 0 {installq => install}/langs/si/data/carrier.xml | 0 {installq => install}/langs/si/data/category.xml | 0 {installq => install}/langs/si/data/cms.xml | 0 .../langs/si/data/cms_category.xml | 0 .../langs/si/data/configuration.xml | 0 {installq => install}/langs/si/data/contact.xml | 0 {installq => install}/langs/si/data/country.xml | 0 {installq => install}/langs/si/data/gender.xml | 0 {installq => install}/langs/si/data/group.xml | 0 {installq => install}/langs/si/data/index.php | 0 {installq => install}/langs/si/data/meta.xml | 0 .../langs/si/data/order_return_state.xml | 0 {installq => install}/langs/si/data/order_state.xml | 0 {installq => install}/langs/si/data/profile.xml | 0 .../langs/si/data/quick_access.xml | 0 {installq => install}/langs/si/data/risk.xml | 0 .../langs/si/data/stock_mvt_reason.xml | 0 .../langs/si/data/supplier_order_state.xml | 0 .../langs/si/data/supply_order_state.xml | 0 {installq => install}/langs/si/data/tab.xml | 0 {installq => install}/langs/si/flag.jpg | Bin {installq => install}/langs/si/img/index.php | 0 .../langs/si/img/si-default-category.jpg | Bin .../langs/si/img/si-default-home.jpg | Bin .../langs/si/img/si-default-large.jpg | Bin .../langs/si/img/si-default-large_scene.jpg | Bin .../langs/si/img/si-default-medium.jpg | Bin .../langs/si/img/si-default-small.jpg | Bin .../langs/si/img/si-default-thickbox.jpg | Bin .../langs/si/img/si-default-thumb_scene.jpg | Bin {installq => install}/langs/si/img/si.jpg | Bin {installq => install}/langs/si/index.php | 0 {installq => install}/langs/si/install.php | 0 {installq => install}/langs/si/language.xml | 0 {installq => install}/langs/si/mail_identifiers.txt | 0 {installq => install}/langs/sr/data/carrier.xml | 0 {installq => install}/langs/sr/data/category.xml | 0 {installq => install}/langs/sr/data/cms.xml | 0 .../langs/sr/data/cms_category.xml | 0 .../langs/sr/data/configuration.xml | 0 {installq => install}/langs/sr/data/contact.xml | 0 {installq => install}/langs/sr/data/country.xml | 0 {installq => install}/langs/sr/data/gender.xml | 0 {installq => install}/langs/sr/data/group.xml | 0 {installq => install}/langs/sr/data/index.php | 0 {installq => install}/langs/sr/data/meta.xml | 0 .../langs/sr/data/order_return_state.xml | 0 {installq => install}/langs/sr/data/order_state.xml | 0 {installq => install}/langs/sr/data/profile.xml | 0 .../langs/sr/data/quick_access.xml | 0 {installq => install}/langs/sr/data/risk.xml | 0 .../langs/sr/data/stock_mvt_reason.xml | 0 .../langs/sr/data/supplier_order_state.xml | 0 .../langs/sr/data/supply_order_state.xml | 0 {installq => install}/langs/sr/data/tab.xml | 0 {installq => install}/langs/sr/flag.jpg | Bin {installq => install}/langs/sr/img/index.php | 0 .../langs/sr/img/sr-default-category.jpg | Bin .../langs/sr/img/sr-default-home.jpg | Bin .../langs/sr/img/sr-default-large.jpg | Bin .../langs/sr/img/sr-default-large_scene.jpg | Bin .../langs/sr/img/sr-default-medium.jpg | Bin .../langs/sr/img/sr-default-small.jpg | Bin .../langs/sr/img/sr-default-thickbox.jpg | Bin .../langs/sr/img/sr-default-thumb_scene.jpg | Bin {installq => install}/langs/sr/img/sr.jpg | Bin {installq => install}/langs/sr/index.php | 0 {installq => install}/langs/sr/install.php | 0 {installq => install}/langs/sr/language.xml | 0 {installq => install}/langs/sr/mail_identifiers.txt | 0 {installq => install}/langs/sv/data/carrier.xml | 0 {installq => install}/langs/sv/data/category.xml | 0 {installq => install}/langs/sv/data/cms.xml | 0 .../langs/sv/data/cms_category.xml | 0 .../langs/sv/data/configuration.xml | 0 {installq => install}/langs/sv/data/contact.xml | 0 {installq => install}/langs/sv/data/country.xml | 0 {installq => install}/langs/sv/data/gender.xml | 0 {installq => install}/langs/sv/data/group.xml | 0 {installq => install}/langs/sv/data/index.php | 0 {installq => install}/langs/sv/data/meta.xml | 0 .../langs/sv/data/order_return_state.xml | 0 {installq => install}/langs/sv/data/order_state.xml | 0 {installq => install}/langs/sv/data/profile.xml | 0 .../langs/sv/data/quick_access.xml | 0 {installq => install}/langs/sv/data/risk.xml | 0 .../langs/sv/data/stock_mvt_reason.xml | 0 .../langs/sv/data/supplier_order_state.xml | 0 .../langs/sv/data/supply_order_state.xml | 0 {installq => install}/langs/sv/data/tab.xml | 0 {installq => install}/langs/sv/flag.jpg | Bin {installq => install}/langs/sv/img/index.php | 0 .../langs/sv/img/sv-default-category.jpg | Bin .../langs/sv/img/sv-default-home.jpg | Bin .../langs/sv/img/sv-default-large.jpg | Bin .../langs/sv/img/sv-default-large_scene.jpg | Bin .../langs/sv/img/sv-default-medium.jpg | Bin .../langs/sv/img/sv-default-small.jpg | Bin .../langs/sv/img/sv-default-thickbox.jpg | Bin .../langs/sv/img/sv-default-thumb_scene.jpg | Bin {installq => install}/langs/sv/img/sv.jpg | Bin {installq => install}/langs/sv/index.php | 0 {installq => install}/langs/sv/install.php | 0 {installq => install}/langs/sv/language.xml | 0 {installq => install}/langs/sv/mail_identifiers.txt | 0 {installq => install}/langs/tr/flag.jpg | Bin {installq => install}/langs/tr/img/index.php | 0 .../langs/tr/img/tr-default-category.jpg | Bin .../langs/tr/img/tr-default-home.jpg | Bin .../langs/tr/img/tr-default-large.jpg | Bin .../langs/tr/img/tr-default-large_scene.jpg | Bin .../langs/tr/img/tr-default-medium.jpg | Bin .../langs/tr/img/tr-default-small.jpg | Bin .../langs/tr/img/tr-default-thickbox.jpg | Bin .../langs/tr/img/tr-default-thumb_scene.jpg | Bin {installq => install}/langs/tr/img/tr.jpg | Bin {installq => install}/langs/tr/index.php | 0 {installq => install}/langs/tr/install.php | 0 {installq => install}/langs/tr/language.xml | 0 {installq => install}/langs/tr/mail_identifiers.txt | 0 {installq => install}/langs/tw/data/carrier.xml | 0 {installq => install}/langs/tw/data/category.xml | 0 {installq => install}/langs/tw/data/cms.xml | 0 .../langs/tw/data/cms_category.xml | 0 .../langs/tw/data/configuration.xml | 0 {installq => install}/langs/tw/data/contact.xml | 0 {installq => install}/langs/tw/data/country.xml | 0 {installq => install}/langs/tw/data/gender.xml | 0 {installq => install}/langs/tw/data/group.xml | 0 {installq => install}/langs/tw/data/index.php | 0 {installq => install}/langs/tw/data/meta.xml | 0 .../langs/tw/data/order_return_state.xml | 0 {installq => install}/langs/tw/data/order_state.xml | 0 {installq => install}/langs/tw/data/profile.xml | 0 .../langs/tw/data/quick_access.xml | 0 {installq => install}/langs/tw/data/risk.xml | 0 .../langs/tw/data/stock_mvt_reason.xml | 0 .../langs/tw/data/supplier_order_state.xml | 0 .../langs/tw/data/supply_order_state.xml | 0 {installq => install}/langs/tw/data/tab.xml | 0 {installq => install}/langs/tw/flag.jpg | Bin {installq => install}/langs/tw/img/index.php | 0 .../langs/tw/img/tw-default-category.jpg | Bin .../langs/tw/img/tw-default-home.jpg | Bin .../langs/tw/img/tw-default-large.jpg | Bin .../langs/tw/img/tw-default-large_scene.jpg | Bin .../langs/tw/img/tw-default-medium.jpg | Bin .../langs/tw/img/tw-default-small.jpg | Bin .../langs/tw/img/tw-default-thickbox.jpg | Bin .../langs/tw/img/tw-default-thumb_scene.jpg | Bin {installq => install}/langs/tw/img/tw.jpg | Bin {installq => install}/langs/tw/index.php | 0 {installq => install}/langs/tw/install.php | 0 {installq => install}/langs/tw/language.xml | 0 {installq => install}/langs/tw/mail_identifiers.txt | 0 {installq => install}/langs/vn/data/carrier.xml | 0 {installq => install}/langs/vn/data/category.xml | 0 {installq => install}/langs/vn/data/cms.xml | 0 .../langs/vn/data/cms_category.xml | 0 .../langs/vn/data/configuration.xml | 0 {installq => install}/langs/vn/data/contact.xml | 0 {installq => install}/langs/vn/data/country.xml | 0 {installq => install}/langs/vn/data/gender.xml | 0 {installq => install}/langs/vn/data/group.xml | 0 {installq => install}/langs/vn/data/index.php | 0 {installq => install}/langs/vn/data/meta.xml | 0 .../langs/vn/data/order_return_state.xml | 0 {installq => install}/langs/vn/data/order_state.xml | 0 {installq => install}/langs/vn/data/profile.xml | 0 .../langs/vn/data/quick_access.xml | 0 {installq => install}/langs/vn/data/risk.xml | 0 .../langs/vn/data/stock_mvt_reason.xml | 0 .../langs/vn/data/supplier_order_state.xml | 0 .../langs/vn/data/supply_order_state.xml | 0 {installq => install}/langs/vn/data/tab.xml | 0 {installq => install}/langs/vn/flag.jpg | Bin {installq => install}/langs/vn/img/index.php | 0 .../langs/vn/img/vn-default-category.jpg | Bin .../langs/vn/img/vn-default-home.jpg | Bin .../langs/vn/img/vn-default-large.jpg | Bin .../langs/vn/img/vn-default-large_scene.jpg | Bin .../langs/vn/img/vn-default-medium.jpg | Bin .../langs/vn/img/vn-default-small.jpg | Bin .../langs/vn/img/vn-default-thickbox.jpg | Bin .../langs/vn/img/vn-default-thumb_scene.jpg | Bin {installq => install}/langs/vn/img/vn.jpg | Bin {installq => install}/langs/vn/index.php | 0 {installq => install}/langs/vn/install.php | 0 {installq => install}/langs/vn/language.xml | 0 {installq => install}/langs/vn/mail_identifiers.txt | 0 {installq => install}/langs/zh/data/carrier.xml | 0 {installq => install}/langs/zh/data/category.xml | 0 {installq => install}/langs/zh/data/cms.xml | 0 .../langs/zh/data/cms_category.xml | 0 .../langs/zh/data/configuration.xml | 0 {installq => install}/langs/zh/data/contact.xml | 0 {installq => install}/langs/zh/data/country.xml | 0 {installq => install}/langs/zh/data/gender.xml | 0 {installq => install}/langs/zh/data/group.xml | 0 {installq => install}/langs/zh/data/index.php | 0 {installq => install}/langs/zh/data/meta.xml | 0 .../langs/zh/data/order_return_state.xml | 0 {installq => install}/langs/zh/data/order_state.xml | 0 {installq => install}/langs/zh/data/profile.xml | 0 .../langs/zh/data/quick_access.xml | 0 {installq => install}/langs/zh/data/risk.xml | 0 .../langs/zh/data/stock_mvt_reason.xml | 0 .../langs/zh/data/supplier_order_state.xml | 0 .../langs/zh/data/supply_order_state.xml | 0 {installq => install}/langs/zh/data/tab.xml | 0 {installq => install}/langs/zh/flag.jpg | Bin {installq => install}/langs/zh/img/index.php | 0 .../langs/zh/img/zh-default-category.jpg | Bin .../langs/zh/img/zh-default-home.jpg | Bin .../langs/zh/img/zh-default-large.jpg | Bin .../langs/zh/img/zh-default-large_scene.jpg | Bin .../langs/zh/img/zh-default-medium.jpg | Bin .../langs/zh/img/zh-default-small.jpg | Bin .../langs/zh/img/zh-default-thickbox.jpg | Bin .../langs/zh/img/zh-default-thumb_scene.jpg | Bin {installq => install}/langs/zh/img/zh.jpg | Bin {installq => install}/langs/zh/index.php | 0 {installq => install}/langs/zh/install.php | 0 {installq => install}/langs/zh/language.xml | 0 {installq => install}/langs/zh/mail_identifiers.txt | 0 {installq => install}/models/database.php | 0 {installq => install}/models/index.php | 0 {installq => install}/models/install.php | 0 {installq => install}/models/mail.php | 0 {installq => install}/models/system.php | 0 {installq => install}/sandbox/.htaccess | 0 {installq => install}/sandbox/index.php | 0 {installq => install}/sandbox/test.php | 0 {installq => install}/theme/img/01-gd100.png | Bin {installq => install}/theme/img/01-pt100.png | Bin {installq => install}/theme/img/01-pt70.png | Bin {installq => install}/theme/img/02-gd100.png | Bin {installq => install}/theme/img/02-pt100.png | Bin {installq => install}/theme/img/02-pt70.png | Bin {installq => install}/theme/img/03-gd100.png | Bin {installq => install}/theme/img/03-pt100.png | Bin {installq => install}/theme/img/03-pt70.png | Bin {installq => install}/theme/img/04-gd100.png | Bin {installq => install}/theme/img/04-pt100.png | Bin {installq => install}/theme/img/04-pt70.png | Bin {installq => install}/theme/img/05-gd100.png | Bin {installq => install}/theme/img/05-pt100.png | Bin {installq => install}/theme/img/05-pt70.png | Bin .../theme/img/ajax-loader-small.gif | Bin {installq => install}/theme/img/ajax-loader.gif | Bin {installq => install}/theme/img/bad.gif | Bin {installq => install}/theme/img/bg-body.png | Bin {installq => install}/theme/img/bg-contentTitle.png | Bin {installq => install}/theme/img/bg-ctnr.png | Bin {installq => install}/theme/img/bg-input-text.png | Bin .../theme/img/bg-li-headerLinks.png | Bin .../theme/img/bg-li-tabs-finished.png | Bin {installq => install}/theme/img/bg-li-tabs-rtl.png | Bin {installq => install}/theme/img/bg-li-tabs.png | Bin {installq => install}/theme/img/bg-phone_block.png | Bin {installq => install}/theme/img/bg-tab.png | Bin {installq => install}/theme/img/bg_blockInfoEnd.png | Bin .../theme/img/bg_bt_blockInfoEnd.png | Bin {installq => install}/theme/img/bg_field.png | Bin {installq => install}/theme/img/bg_help.png | Bin {installq => install}/theme/img/bg_input_button.png | Bin {installq => install}/theme/img/bg_li_stepList.png | Bin {installq => install}/theme/img/bg_li_title.png | Bin {installq => install}/theme/img/bg_loaderSpace.png | Bin .../theme/img/bg_moduleTable_th.png | Bin .../theme/img/boutonpt-disabled.png | Bin {installq => install}/theme/img/boutonpt-on.png | Bin {installq => install}/theme/img/boutonpt-over.png | Bin {installq => install}/theme/img/bt - Copie.png | Bin {installq => install}/theme/img/bt-dsbl - Copie.png | Bin {installq => install}/theme/img/bt-dsbl.png | Bin {installq => install}/theme/img/bt-hover.png | Bin {installq => install}/theme/img/bt.png | Bin {installq => install}/theme/img/bt_off.png | Bin {installq => install}/theme/img/bt_off_hover.png | Bin {installq => install}/theme/img/btn-installeur.png | Bin {installq => install}/theme/img/bullet.png | Bin {installq => install}/theme/img/chosen-sprite.png | Bin .../theme/img/chosen-sprite@2x.png | Bin {installq => install}/theme/img/favicon.ico | Bin {installq => install}/theme/img/help.png | Bin {installq => install}/theme/img/ico_help.gif | Bin {installq => install}/theme/img/icon-bulb.png | Bin .../theme/img/icon-installation-guide.png | Bin {installq => install}/theme/img/icon-services.png | Bin {installq => install}/theme/img/icon-tutorials.png | Bin {installq => install}/theme/img/index.php | 0 {installq => install}/theme/img/logo.png | Bin {installq => install}/theme/img/noflag.jpg | Bin {installq => install}/theme/img/ok.gif | Bin {installq => install}/theme/img/ombrage-bas.png | Bin {installq => install}/theme/img/ombrage-droit.png | Bin {installq => install}/theme/img/phone.png | Bin {installq => install}/theme/img/pict_error.png | Bin {installq => install}/theme/img/pict_h3_infos.png | Bin {installq => install}/theme/img/pict_info.png | Bin {installq => install}/theme/img/print.png | Bin {installq => install}/theme/img/puce.gif | Bin {installq => install}/theme/img/shadow-left.png | Bin .../theme/img/suggested-modules.png | Bin .../theme/img/suggested-themes.png | Bin {installq => install}/theme/img/visu_boBlock.png | Bin {installq => install}/theme/img/visu_foBlock.png | Bin {installq => install}/theme/index.php | 0 {installq => install}/theme/js/configure.js | 0 {installq => install}/theme/js/database.js | 0 {installq => install}/theme/js/index.php | 0 {installq => install}/theme/js/install.js | 0 {installq => install}/theme/js/license.js | 0 {installq => install}/theme/js/process.js | 0 {installq => install}/theme/js/welcome.js | 0 {installq => install}/theme/rtl.css | 0 {installq => install}/theme/view.css | 0 {installq => install}/theme/views/configure.phtml | 0 {installq => install}/theme/views/database.phtml | 0 {installq => install}/theme/views/footer.phtml | 0 {installq => install}/theme/views/header.phtml | 0 {installq => install}/theme/views/index.php | 0 {installq => install}/theme/views/license.phtml | 0 .../theme/views/license_content.phtml | 0 {installq => install}/theme/views/process.phtml | 0 {installq => install}/theme/views/system.phtml | 0 {installq => install}/theme/views/welcome.phtml | 0 .../upgrade/classes/AbstractLogger.php | 0 .../upgrade/classes/AddConfToFile.php | 0 .../upgrade/classes/FileLogger.php | 0 .../upgrade/classes/ToolsInstall.php | 0 {installq => install}/upgrade/classes/index.php | 0 {installq => install}/upgrade/index.php | 0 .../upgrade/php/add_accounting_tab.php | 0 .../upgrade/php/add_attribute_position.php | 0 .../upgrade/php/add_carrier_position.php | 0 ...add_column_order_state_deleted_if_not_exists.php | 0 .../add_column_orders_reference_if_not_exists.php | 0 .../php/add_default_restrictions_modules_groups.php | 0 .../upgrade/php/add_feature_position.php | 0 .../upgrade/php/add_group_attribute_position.php | 0 .../php/add_id_shop_to_shipper_lang_index.php | 0 .../upgrade/php/add_missing_columns_customer.php | 0 .../upgrade/php/add_missing_image_key.php | 0 .../upgrade/php/add_missing_rewrite_value.php | 0 .../php/add_missing_shop_column_pagenotfound.php | 0 .../upgrade/php/add_module_to_hook.php | 0 .../upgrade/php/add_new_groups.php | 0 {installq => install}/upgrade/php/add_new_tab.php | 0 .../php/add_order_reference_in_order_payment.php | 0 .../upgrade/php/add_order_state.php | 0 .../php/add_required_customization_field_flag.php | 0 {installq => install}/upgrade/php/add_stock_tab.php | 0 .../upgrade/php/add_unknown_gender.php | 0 .../upgrade/php/alter_blocklink.php | 0 .../upgrade/php/alter_cms_block.php | 0 .../php/alter_productcomments_guest_index.php | 0 .../php/attribute_group_clean_combinations.php | 0 .../upgrade/php/block_category_1521.php | 0 .../upgrade/php/blocknewsletter.php | 0 .../upgrade/php/blocknewsletter1530.php | 0 .../upgrade/php/category_product_index_unique.php | 0 .../upgrade/php/change_feature_image_to_jpg.php | 0 .../upgrade/php/check_webservice_account_table.php | 0 .../upgrade/php/clean_category_product.php | 0 {installq => install}/upgrade/php/clean_tabs_15.php | 0 {installq => install}/upgrade/php/cms_block.php | 0 {installq => install}/upgrade/php/cms_multishop.php | 0 .../upgrade/php/configuration_double_cleaner.php | 0 .../upgrade/php/convert_product_price.php | 0 .../upgrade/php/country_to_timezone.php | 0 .../upgrade/php/create_multistore.php | 0 .../php/customization_field_multishop_lang.php | 0 .../upgrade/php/deactivate_custom_modules.php | 0 .../upgrade/php/delivery_number_set.php | 0 .../php/drop_image_type_non_unique_index.php | 0 .../upgrade/php/drop_module_non_unique_index.php | 0 .../upgrade/php/ecotax_tax_application_fix.php | 0 .../upgrade/php/editorial_update.php | 0 .../upgrade/php/editorial_update_multishop.php | 0 .../upgrade/php/fix_cms_shop_1520.php | 0 .../php/fix_download_product_feature_active.php | 0 .../upgrade/php/fix_unique_specific_price.php | 0 .../upgrade/php/generate_new_cookie_key.php | 0 .../upgrade/php/generate_ntree.php | 0 .../php/generate_root_category_for_multishop.php | 0 .../upgrade/php/generate_tax_rules.php | 0 .../upgrade/php/generic_add_missing_column.php | 0 .../upgrade/php/gridextjs_deprecated.php | 0 .../upgrade/php/group_reduction_column_fix.php | 0 .../upgrade/php/hook_blocksearch_on_header.php | 0 .../upgrade/php/id_currency_country_fix.php | 0 .../upgrade/php/image_shop1510.php | 0 {installq => install}/upgrade/php/index.php | 0 .../upgrade/php/invoice_number_set.php | 0 .../upgrade/php/latin1_database_to_utf8.php | 0 .../upgrade/php/migrate_block_info_to_cms_block.php | 0 .../upgrade/php/migrate_orders.php | 0 .../upgrade/php/migrate_tabs_15.php | 0 .../upgrade/php/migrate_tabs_multi_shop.php | 0 .../upgrade/php/module_blockwishlist_multishop.php | 0 .../upgrade/php/module_reinstall_blockmyaccount.php | 0 .../upgrade/php/module_reinstall_blocksearch.php | 0 .../upgrade/php/move_crossselling.php | 0 .../upgrade/php/move_translations_module_file.php | 0 .../upgrade/php/outstanding_allow_amount1530.php | 0 .../php/p15010_drop_column_id_address_if_exists.php | 0 .../upgrade/php/p15012_add_missing_columns.php | 0 .../upgrade/php/p15013_add_missing_columns.php | 0 .../upgrade/php/p15014_add_missing_columns.php | 0 ...15014_copy_missing_images_tab_from_installer.php | 0 .../upgrade/php/p15014_upgrade_sekeywords.php | 0 .../php/p15015_blockadvertising_extension.php | 0 .../upgrade/php/p15016_add_missing_columns.php | 0 .../php/p15017_add_id_shop_to_primary_key.php | 0 .../upgrade/php/p15018_change_image_types.php | 0 .../upgrade/php/p1531_redirect_type.php | 0 .../upgrade/php/p1540_add_missing_columns.php | 0 .../upgrade/php/p16011_media_server.php | 0 .../upgrade/php/p16012_pack_rework.php | 0 .../upgrade/php/p1603_add_attachment_size.php | 0 .../upgrade/php/p1606module_exceptions.php | 0 .../php/p1607_drop_primary_key_if_exists.php | 0 .../upgrade/php/ps1600_add_missing_index.php | 0 .../upgrade/php/ps16012_update_alias.php | 0 .../upgrade/php/ps1604_update_employee_date.php | 0 .../upgrade/php/ps1605_change_index.php | 0 .../upgrade/php/ps1607_language_code_update.php | 0 .../upgrade/php/ps1610_safe_remove_indexes.php | 0 .../upgrade/php/regenerate_level_depth.php | 0 .../php/remove_duplicate_category_groups.php | 0 .../upgrade/php/remove_module_from_hook.php | 0 {installq => install}/upgrade/php/remove_tab.php | 0 .../upgrade/php/reorderpositions.php | 0 .../upgrade/php/set_discount_category.php | 0 .../upgrade/php/set_payment_module.php | 0 .../upgrade/php/set_payment_module_group.php | 0 .../upgrade/php/set_product_suppliers.php | 0 .../upgrade/php/set_stock_available.php | 0 .../upgrade/php/setallgroupsonhomecategory.php | 0 {installq => install}/upgrade/php/shop_url.php | 0 .../upgrade/php/update_carrier_url.php | 0 .../upgrade/php/update_customer_default_group.php | 0 .../upgrade/php/update_feature_detachable_cache.php | 0 .../upgrade/php/update_for_13version.php | 0 .../upgrade/php/update_genders_images.php | 0 .../upgrade/php/update_image_size_in_db.php | 0 .../php/update_mailalerts_add_column_idshop.php | 0 .../upgrade/php/update_module_blocklayered.php | 0 .../upgrade/php/update_module_followup.php | 0 .../upgrade/php/update_module_loyalty.php | 0 .../upgrade/php/update_module_pagesnotfound.php | 0 .../upgrade/php/update_module_product_comments.php | 0 .../upgrade/php/update_modules_multishop.php | 0 .../upgrade/php/update_modules_sql.php | 0 .../upgrade/php/update_order_canada.php | 0 .../upgrade/php/update_order_detail_taxes.php | 0 .../upgrade/php/update_order_details.php | 0 .../upgrade/php/update_order_messages.php | 0 .../upgrade/php/update_products_ecotax_v133.php | 0 .../upgrade/php/update_stock_mvt_reason.php | 0 .../upgrade/php/updateproductcomments.php | 0 .../upgrade/php/updatetabicon_from_11version.php | 0 .../upgrade/php/upgrade_cms_15.php | 0 .../upgrade/php/upgrade_cms_15_rename.php | 0 {installq => install}/upgrade/sql/1.4.1.sql | 0 {installq => install}/upgrade/sql/1.5.0.sql | 0 {installq => install}/upgrade/sql/1.5.1.0.sql | 0 {installq => install}/upgrade/sql/1.5.2.0.sql | 0 {installq => install}/upgrade/sql/index.php | 0 {installq => install}/upgrade/upgrade.php | 0 1650 files changed, 0 insertions(+), 0 deletions(-) rename {installq => install}/classes/controllerConsole.php (100%) rename {installq => install}/classes/controllerHttp.php (100%) rename {installq => install}/classes/datas.php (100%) rename {installq => install}/classes/exception.php (100%) rename {installq => install}/classes/index.php (100%) rename {installq => install}/classes/language.php (100%) rename {installq => install}/classes/languages.php (100%) rename {installq => install}/classes/model.php (100%) rename {installq => install}/classes/session.php (100%) rename {installq => install}/classes/simplexml.php (100%) rename {installq => install}/classes/sqlLoader.php (100%) rename {installq => install}/classes/xmlLoader.php (100%) rename {installq => install}/controllers/console/index.php (100%) rename {installq => install}/controllers/console/process.php (100%) rename {installq => install}/controllers/http/configure.php (100%) rename {installq => install}/controllers/http/database.php (100%) rename {installq => install}/controllers/http/index.php (100%) rename {installq => install}/controllers/http/license.php (100%) rename {installq => install}/controllers/http/process.php (100%) rename {installq => install}/controllers/http/smarty_compile.php (100%) rename {installq => install}/controllers/http/system.php (100%) rename {installq => install}/controllers/http/welcome.php (100%) rename {installq => install}/controllers/index.php (100%) rename {installq => install}/data/db_structure.sql (100%) rename {installq => install}/data/img/genders/Mr.jpg (100%) rename {installq => install}/data/img/genders/Mrs.jpg (100%) rename {installq => install}/data/img/genders/Unknown.jpg (100%) rename {installq => install}/data/img/genders/index.php (100%) rename {installq => install}/data/img/index.php (100%) rename {installq => install}/data/img/os/Awaiting_payment.gif (100%) rename {installq => install}/data/img/os/Awaiting_remote_payment.gif (100%) rename {installq => install}/data/img/os/Canceled.gif (100%) rename {installq => install}/data/img/os/Overbooking_paid.gif (100%) rename {installq => install}/data/img/os/Overbooking_partial_paid.gif (100%) rename {installq => install}/data/img/os/Overbooking_unpaid.gif (100%) rename {installq => install}/data/img/os/Partial_payment_accepted.gif (100%) rename {installq => install}/data/img/os/Payment_accepted.gif (100%) rename {installq => install}/data/img/os/Payment_error.gif (100%) rename {installq => install}/data/img/os/Payment_remotely_accepted.gif (100%) rename {installq => install}/data/img/os/Processing_in_progress.gif (100%) rename {installq => install}/data/img/os/Refund.gif (100%) rename {installq => install}/data/img/os/index.php (100%) rename {installq => install}/data/index.php (100%) rename {installq => install}/data/iso_to_timezone.xml (100%) rename {installq => install}/data/theme.sql (100%) rename {installq => install}/data/xml/access.xml (100%) rename {installq => install}/data/xml/address_format.xml (100%) rename {installq => install}/data/xml/category.xml (100%) rename {installq => install}/data/xml/category_group.xml (100%) rename {installq => install}/data/xml/cms.xml (100%) rename {installq => install}/data/xml/cms_category.xml (100%) rename {installq => install}/data/xml/configuration.xml (100%) rename {installq => install}/data/xml/contact.xml (100%) rename {installq => install}/data/xml/country.xml (100%) rename {installq => install}/data/xml/gender.xml (100%) rename {installq => install}/data/xml/group.xml (100%) rename {installq => install}/data/xml/hook.xml (100%) rename {installq => install}/data/xml/hook_alias.xml (100%) rename {installq => install}/data/xml/image_type.xml (100%) rename {installq => install}/data/xml/index.php (100%) rename {installq => install}/data/xml/meta.xml (100%) rename {installq => install}/data/xml/operating_system.xml (100%) rename {installq => install}/data/xml/order_return_state.xml (100%) rename {installq => install}/data/xml/order_state.xml (100%) rename {installq => install}/data/xml/profile.xml (100%) rename {installq => install}/data/xml/quick_access.xml (100%) rename {installq => install}/data/xml/risk.xml (100%) rename {installq => install}/data/xml/search_engine.xml (100%) rename {installq => install}/data/xml/state.xml (100%) rename {installq => install}/data/xml/stock_mvt_reason.xml (100%) rename {installq => install}/data/xml/supply_order_state.xml (100%) rename {installq => install}/data/xml/tab.xml (100%) rename {installq => install}/data/xml/theme.xml (100%) rename {installq => install}/data/xml/theme_meta.xml (100%) rename {installq => install}/data/xml/timezone.xml (100%) rename {installq => install}/data/xml/warehouse.xml (100%) rename {installq => install}/data/xml/web_browser.xml (100%) rename {installq => install}/data/xml/zone.xml (100%) rename {installq => install}/dev/index.php (100%) rename {installq => install}/dev/index.phtml (100%) rename {installq => install}/dev/style.css (100%) rename {installq => install}/dev/translate.php (100%) rename {installq => install}/dev/update_eu_taxrulegroups.php (100%) rename {installq => install}/fixtures/fashion/data/access.xml (100%) rename {installq => install}/fixtures/fashion/data/address.xml (100%) rename {installq => install}/fixtures/fashion/data/alias.xml (100%) rename {installq => install}/fixtures/fashion/data/connections.xml (100%) rename {installq => install}/fixtures/fashion/data/customer.xml (100%) rename {installq => install}/fixtures/fashion/data/guest.xml (100%) rename {installq => install}/fixtures/fashion/data/index.php (100%) rename {installq => install}/fixtures/fashion/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/img/c/Blouses-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Blouses-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Blouses.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Casual_Dresses-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Casual_Dresses-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Casual_Dresses.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Dresses-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Dresses-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Dresses.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Evening_Dresses-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Evening_Dresses-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Evening_Dresses.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Summer_Dresses-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Summer_Dresses-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Summer_Dresses.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/T-shirts-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/T-shirts-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/T-shirts.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops_1-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops_1-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Tops_1.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Women-category_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Women-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/Women.jpg (100%) rename {installq => install}/fixtures/fashion/img/c/index.php (100%) rename {installq => install}/fixtures/fashion/img/c/resize.php (100%) rename {installq => install}/fixtures/fashion/img/index.php (100%) rename {installq => install}/fixtures/fashion/img/m/Fashion_Manufacturer-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/m/Fashion_Manufacturer-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/m/Fashion_Manufacturer-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/m/Fashion_Manufacturer.jpg (100%) rename {installq => install}/fixtures/fashion/img/m/index.php (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_1.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_10.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_11.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_12.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_13.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_14.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_15.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_16.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_17.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_18.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_19.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_2.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_20.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_21.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_22.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_23.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_3.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_4.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_5.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_6.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_7.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_8.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-cart_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-home_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9-thickbox_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/image_9.jpg (100%) rename {installq => install}/fixtures/fashion/img/p/index.php (100%) rename {installq => install}/fixtures/fashion/img/p/resize.php (100%) rename {installq => install}/fixtures/fashion/img/scenes/index.php (100%) rename {installq => install}/fixtures/fashion/img/scenes/thumbs/index.php (100%) rename {installq => install}/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/Coconut_Grove.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/Dade_County-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/Dade_County.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/N_Miami_Biscayne.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/Pembroke_Pines.jpg (100%) rename {installq => install}/fixtures/fashion/img/st/index.php (100%) rename {installq => install}/fixtures/fashion/img/su/Fashion_Supplier-large_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/su/Fashion_Supplier-medium_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/su/Fashion_Supplier-small_default.jpg (100%) rename {installq => install}/fixtures/fashion/img/su/Fashion_Supplier.jpg (100%) rename {installq => install}/fixtures/fashion/img/su/index.php (100%) rename {installq => install}/fixtures/fashion/index.php (100%) rename {installq => install}/fixtures/fashion/install.php (100%) rename {installq => install}/fixtures/fashion/langs/bn/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/bn/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/bn/index.php (100%) rename {installq => install}/fixtures/fashion/langs/br/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/br/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/br/index.php (100%) rename {installq => install}/fixtures/fashion/langs/de/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/de/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/de/index.php (100%) rename {installq => install}/fixtures/fashion/langs/en/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/en/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/en/index.php (100%) rename {installq => install}/fixtures/fashion/langs/es/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/es/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/es/index.php (100%) rename {installq => install}/fixtures/fashion/langs/fa/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/fa/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/fa/index.php (100%) rename {installq => install}/fixtures/fashion/langs/fr/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/fr/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/fr/index.php (100%) rename {installq => install}/fixtures/fashion/langs/id/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/id/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/id/index.php (100%) rename {installq => install}/fixtures/fashion/langs/index.php (100%) rename {installq => install}/fixtures/fashion/langs/it/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/it/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/it/index.php (100%) rename {installq => install}/fixtures/fashion/langs/nl/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/nl/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/nl/index.php (100%) rename {installq => install}/fixtures/fashion/langs/pl/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/pl/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/pl/index.php (100%) rename {installq => install}/fixtures/fashion/langs/qc/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/qc/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/qc/index.php (100%) rename {installq => install}/fixtures/fashion/langs/ro/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/ro/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/ro/index.php (100%) rename {installq => install}/fixtures/fashion/langs/ru/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/ru/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/ru/index.php (100%) rename {installq => install}/fixtures/fashion/langs/tw/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/tw/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/tw/index.php (100%) rename {installq => install}/fixtures/fashion/langs/vn/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/vn/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/vn/index.php (100%) rename {installq => install}/fixtures/fashion/langs/zh/data/index.php (100%) rename {installq => install}/fixtures/fashion/langs/zh/data/profile.xml (100%) rename {installq => install}/fixtures/fashion/langs/zh/index.php (100%) rename {installq => install}/fixtures/index.php (100%) rename {installq => install}/index.php (100%) rename {installq => install}/index_cli.php (100%) rename {installq => install}/init.php (100%) rename {installq => install}/install_version.php (100%) rename {installq => install}/langs/bg/data/carrier.xml (100%) rename {installq => install}/langs/bg/data/category.xml (100%) rename {installq => install}/langs/bg/data/cms.xml (100%) rename {installq => install}/langs/bg/data/cms_category.xml (100%) rename {installq => install}/langs/bg/data/configuration.xml (100%) rename {installq => install}/langs/bg/data/contact.xml (100%) rename {installq => install}/langs/bg/data/country.xml (100%) rename {installq => install}/langs/bg/data/gender.xml (100%) rename {installq => install}/langs/bg/data/group.xml (100%) rename {installq => install}/langs/bg/data/index.php (100%) rename {installq => install}/langs/bg/data/meta.xml (100%) rename {installq => install}/langs/bg/data/order_return_state.xml (100%) rename {installq => install}/langs/bg/data/order_state.xml (100%) rename {installq => install}/langs/bg/data/profile.xml (100%) rename {installq => install}/langs/bg/data/quick_access.xml (100%) rename {installq => install}/langs/bg/data/risk.xml (100%) rename {installq => install}/langs/bg/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/bg/data/supplier_order_state.xml (100%) rename {installq => install}/langs/bg/data/supply_order_state.xml (100%) rename {installq => install}/langs/bg/data/tab.xml (100%) rename {installq => install}/langs/bg/flag.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-category.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-home.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-large.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-large_scene.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-medium.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-small.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-thickbox.jpg (100%) rename {installq => install}/langs/bg/img/bg-default-thumb_scene.jpg (100%) rename {installq => install}/langs/bg/img/bg.jpg (100%) rename {installq => install}/langs/bg/img/index.php (100%) rename {installq => install}/langs/bg/index.php (100%) rename {installq => install}/langs/bg/install.php (100%) rename {installq => install}/langs/bg/language.xml (100%) rename {installq => install}/langs/bg/mail_identifiers.txt (100%) rename {installq => install}/langs/bn/data/carrier.xml (100%) rename {installq => install}/langs/bn/data/category.xml (100%) rename {installq => install}/langs/bn/data/cms.xml (100%) rename {installq => install}/langs/bn/data/cms_category.xml (100%) rename {installq => install}/langs/bn/data/configuration.xml (100%) rename {installq => install}/langs/bn/data/contact.xml (100%) rename {installq => install}/langs/bn/data/country.xml (100%) rename {installq => install}/langs/bn/data/gender.xml (100%) rename {installq => install}/langs/bn/data/group.xml (100%) rename {installq => install}/langs/bn/data/index.php (100%) rename {installq => install}/langs/bn/data/meta.xml (100%) rename {installq => install}/langs/bn/data/order_return_state.xml (100%) rename {installq => install}/langs/bn/data/order_state.xml (100%) rename {installq => install}/langs/bn/data/profile.xml (100%) rename {installq => install}/langs/bn/data/quick_access.xml (100%) rename {installq => install}/langs/bn/data/risk.xml (100%) rename {installq => install}/langs/bn/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/bn/data/supplier_order_state.xml (100%) rename {installq => install}/langs/bn/data/supply_order_state.xml (100%) rename {installq => install}/langs/bn/data/tab.xml (100%) rename {installq => install}/langs/bn/flag.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-category.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-home.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-large.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-large_scene.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-medium.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-small.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-thickbox.jpg (100%) rename {installq => install}/langs/bn/img/bn-default-thumb_scene.jpg (100%) rename {installq => install}/langs/bn/img/bn.jpg (100%) rename {installq => install}/langs/bn/img/index.php (100%) rename {installq => install}/langs/bn/index.php (100%) rename {installq => install}/langs/bn/install.php (100%) rename {installq => install}/langs/bn/language.xml (100%) rename {installq => install}/langs/bn/mail_identifiers.txt (100%) rename {installq => install}/langs/br/data/carrier.xml (100%) rename {installq => install}/langs/br/data/category.xml (100%) rename {installq => install}/langs/br/data/cms.xml (100%) rename {installq => install}/langs/br/data/cms_category.xml (100%) rename {installq => install}/langs/br/data/configuration.xml (100%) rename {installq => install}/langs/br/data/contact.xml (100%) rename {installq => install}/langs/br/data/country.xml (100%) rename {installq => install}/langs/br/data/gender.xml (100%) rename {installq => install}/langs/br/data/group.xml (100%) rename {installq => install}/langs/br/data/index.php (100%) rename {installq => install}/langs/br/data/meta.xml (100%) rename {installq => install}/langs/br/data/order_return_state.xml (100%) rename {installq => install}/langs/br/data/order_state.xml (100%) rename {installq => install}/langs/br/data/profile.xml (100%) rename {installq => install}/langs/br/data/quick_access.xml (100%) rename {installq => install}/langs/br/data/risk.xml (100%) rename {installq => install}/langs/br/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/br/data/supplier_order_state.xml (100%) rename {installq => install}/langs/br/data/supply_order_state.xml (100%) rename {installq => install}/langs/br/data/tab.xml (100%) rename {installq => install}/langs/br/flag.jpg (100%) rename {installq => install}/langs/br/img/br-default-category.jpg (100%) rename {installq => install}/langs/br/img/br-default-home.jpg (100%) rename {installq => install}/langs/br/img/br-default-large.jpg (100%) rename {installq => install}/langs/br/img/br-default-large_scene.jpg (100%) rename {installq => install}/langs/br/img/br-default-medium.jpg (100%) rename {installq => install}/langs/br/img/br-default-small.jpg (100%) rename {installq => install}/langs/br/img/br-default-thickbox.jpg (100%) rename {installq => install}/langs/br/img/br-default-thumb_scene.jpg (100%) rename {installq => install}/langs/br/img/br.jpg (100%) rename {installq => install}/langs/br/img/index.php (100%) rename {installq => install}/langs/br/index.php (100%) rename {installq => install}/langs/br/install.php (100%) rename {installq => install}/langs/br/language.xml (100%) rename {installq => install}/langs/br/mail_identifiers.txt (100%) rename {installq => install}/langs/ca/flag.jpg (100%) rename {installq => install}/langs/ca/index.php (100%) rename {installq => install}/langs/ca/install.php (100%) rename {installq => install}/langs/ca/language.xml (100%) rename {installq => install}/langs/cs/data/carrier.xml (100%) rename {installq => install}/langs/cs/data/category.xml (100%) rename {installq => install}/langs/cs/data/cms.xml (100%) rename {installq => install}/langs/cs/data/cms_category.xml (100%) rename {installq => install}/langs/cs/data/configuration.xml (100%) rename {installq => install}/langs/cs/data/contact.xml (100%) rename {installq => install}/langs/cs/data/country.xml (100%) rename {installq => install}/langs/cs/data/gender.xml (100%) rename {installq => install}/langs/cs/data/group.xml (100%) rename {installq => install}/langs/cs/data/index.php (100%) rename {installq => install}/langs/cs/data/meta.xml (100%) rename {installq => install}/langs/cs/data/order_return_state.xml (100%) rename {installq => install}/langs/cs/data/order_state.xml (100%) rename {installq => install}/langs/cs/data/profile.xml (100%) rename {installq => install}/langs/cs/data/quick_access.xml (100%) rename {installq => install}/langs/cs/data/risk.xml (100%) rename {installq => install}/langs/cs/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/cs/data/supplier_order_state.xml (100%) rename {installq => install}/langs/cs/data/supply_order_state.xml (100%) rename {installq => install}/langs/cs/data/tab.xml (100%) rename {installq => install}/langs/cs/flag.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-category.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-home.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-large.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-large_scene.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-medium.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-small.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-thickbox.jpg (100%) rename {installq => install}/langs/cs/img/cs-default-thumb_scene.jpg (100%) rename {installq => install}/langs/cs/img/cs.jpg (100%) rename {installq => install}/langs/cs/img/index.php (100%) rename {installq => install}/langs/cs/index.php (100%) rename {installq => install}/langs/cs/install.php (100%) rename {installq => install}/langs/cs/language.xml (100%) rename {installq => install}/langs/cs/mail_identifiers.txt (100%) rename {installq => install}/langs/de/data/carrier.xml (100%) rename {installq => install}/langs/de/data/category.xml (100%) rename {installq => install}/langs/de/data/cms.xml (100%) rename {installq => install}/langs/de/data/cms_category.xml (100%) rename {installq => install}/langs/de/data/configuration.xml (100%) rename {installq => install}/langs/de/data/contact.xml (100%) rename {installq => install}/langs/de/data/country.xml (100%) rename {installq => install}/langs/de/data/gender.xml (100%) rename {installq => install}/langs/de/data/group.xml (100%) rename {installq => install}/langs/de/data/index.php (100%) rename {installq => install}/langs/de/data/meta.xml (100%) rename {installq => install}/langs/de/data/order_return_state.xml (100%) rename {installq => install}/langs/de/data/order_state.xml (100%) rename {installq => install}/langs/de/data/profile.xml (100%) rename {installq => install}/langs/de/data/quick_access.xml (100%) rename {installq => install}/langs/de/data/risk.xml (100%) rename {installq => install}/langs/de/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/de/data/supply_order_state.xml (100%) rename {installq => install}/langs/de/data/tab.xml (100%) rename {installq => install}/langs/de/flag.jpg (100%) rename {installq => install}/langs/de/img/de-default-category.jpg (100%) rename {installq => install}/langs/de/img/de-default-home.jpg (100%) rename {installq => install}/langs/de/img/de-default-large.jpg (100%) rename {installq => install}/langs/de/img/de-default-large_scene.jpg (100%) rename {installq => install}/langs/de/img/de-default-medium.jpg (100%) rename {installq => install}/langs/de/img/de-default-small.jpg (100%) rename {installq => install}/langs/de/img/de-default-thickbox.jpg (100%) rename {installq => install}/langs/de/img/de-default-thumb_scene.jpg (100%) rename {installq => install}/langs/de/img/de.jpg (100%) rename {installq => install}/langs/de/img/index.php (100%) rename {installq => install}/langs/de/index.php (100%) rename {installq => install}/langs/de/install.php (100%) rename {installq => install}/langs/de/language.xml (100%) rename {installq => install}/langs/de/mail_identifiers.txt (100%) rename {installq => install}/langs/en/data/carrier.xml (100%) rename {installq => install}/langs/en/data/category.xml (100%) rename {installq => install}/langs/en/data/cms.xml (100%) rename {installq => install}/langs/en/data/cms_category.xml (100%) rename {installq => install}/langs/en/data/configuration.xml (100%) rename {installq => install}/langs/en/data/contact.xml (100%) rename {installq => install}/langs/en/data/country.xml (100%) rename {installq => install}/langs/en/data/gender.xml (100%) rename {installq => install}/langs/en/data/group.xml (100%) rename {installq => install}/langs/en/data/index.php (100%) rename {installq => install}/langs/en/data/meta.xml (100%) rename {installq => install}/langs/en/data/order_return_state.xml (100%) rename {installq => install}/langs/en/data/order_state.xml (100%) rename {installq => install}/langs/en/data/profile.xml (100%) rename {installq => install}/langs/en/data/quick_access.xml (100%) rename {installq => install}/langs/en/data/risk.xml (100%) rename {installq => install}/langs/en/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/en/data/supplier_order_state.xml (100%) rename {installq => install}/langs/en/data/supply_order_state.xml (100%) rename {installq => install}/langs/en/data/tab.xml (100%) rename {installq => install}/langs/en/flag.jpg (100%) rename {installq => install}/langs/en/img/en-default-category.jpg (100%) rename {installq => install}/langs/en/img/en-default-home.jpg (100%) rename {installq => install}/langs/en/img/en-default-large.jpg (100%) rename {installq => install}/langs/en/img/en-default-large_scene.jpg (100%) rename {installq => install}/langs/en/img/en-default-medium.jpg (100%) rename {installq => install}/langs/en/img/en-default-small.jpg (100%) rename {installq => install}/langs/en/img/en-default-thickbox.jpg (100%) rename {installq => install}/langs/en/img/en-default-thumb_scene.jpg (100%) rename {installq => install}/langs/en/img/en.jpg (100%) rename {installq => install}/langs/en/img/index.php (100%) rename {installq => install}/langs/en/index.php (100%) rename {installq => install}/langs/en/install.php (100%) rename {installq => install}/langs/en/language.xml (100%) rename {installq => install}/langs/en/mail_identifiers.txt (100%) rename {installq => install}/langs/es/data/carrier.xml (100%) rename {installq => install}/langs/es/data/category.xml (100%) rename {installq => install}/langs/es/data/cms.xml (100%) rename {installq => install}/langs/es/data/cms_category.xml (100%) rename {installq => install}/langs/es/data/configuration.xml (100%) rename {installq => install}/langs/es/data/contact.xml (100%) rename {installq => install}/langs/es/data/country.xml (100%) rename {installq => install}/langs/es/data/gender.xml (100%) rename {installq => install}/langs/es/data/group.xml (100%) rename {installq => install}/langs/es/data/index.php (100%) rename {installq => install}/langs/es/data/meta.xml (100%) rename {installq => install}/langs/es/data/order_return_state.xml (100%) rename {installq => install}/langs/es/data/order_state.xml (100%) rename {installq => install}/langs/es/data/profile.xml (100%) rename {installq => install}/langs/es/data/quick_access.xml (100%) rename {installq => install}/langs/es/data/risk.xml (100%) rename {installq => install}/langs/es/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/es/data/supplier_order_state.xml (100%) rename {installq => install}/langs/es/data/supply_order_state.xml (100%) rename {installq => install}/langs/es/data/tab.xml (100%) rename {installq => install}/langs/es/flag.jpg (100%) rename {installq => install}/langs/es/img/es-default-category.jpg (100%) rename {installq => install}/langs/es/img/es-default-home.jpg (100%) rename {installq => install}/langs/es/img/es-default-large.jpg (100%) rename {installq => install}/langs/es/img/es-default-large_scene.jpg (100%) rename {installq => install}/langs/es/img/es-default-medium.jpg (100%) rename {installq => install}/langs/es/img/es-default-small.jpg (100%) rename {installq => install}/langs/es/img/es-default-thickbox.jpg (100%) rename {installq => install}/langs/es/img/es-default-thumb_scene.jpg (100%) rename {installq => install}/langs/es/img/es.jpg (100%) rename {installq => install}/langs/es/img/index.php (100%) rename {installq => install}/langs/es/index.php (100%) rename {installq => install}/langs/es/install.php (100%) rename {installq => install}/langs/es/language.xml (100%) rename {installq => install}/langs/es/mail_identifiers.txt (100%) rename {installq => install}/langs/fa/Flag_of_Iran.svg (100%) rename {installq => install}/langs/fa/data/carrier.xml (100%) rename {installq => install}/langs/fa/data/category.xml (100%) rename {installq => install}/langs/fa/data/cms.xml (100%) rename {installq => install}/langs/fa/data/cms_category.xml (100%) rename {installq => install}/langs/fa/data/configuration.xml (100%) rename {installq => install}/langs/fa/data/contact.xml (100%) rename {installq => install}/langs/fa/data/country.xml (100%) rename {installq => install}/langs/fa/data/gender.xml (100%) rename {installq => install}/langs/fa/data/group.xml (100%) rename {installq => install}/langs/fa/data/index.php (100%) rename {installq => install}/langs/fa/data/meta.xml (100%) rename {installq => install}/langs/fa/data/order_return_state.xml (100%) rename {installq => install}/langs/fa/data/order_state.xml (100%) rename {installq => install}/langs/fa/data/profile.xml (100%) rename {installq => install}/langs/fa/data/quick_access.xml (100%) rename {installq => install}/langs/fa/data/risk.xml (100%) rename {installq => install}/langs/fa/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/fa/data/supplier_order_state.xml (100%) rename {installq => install}/langs/fa/data/supply_order_state.xml (100%) rename {installq => install}/langs/fa/data/tab.xml (100%) rename {installq => install}/langs/fa/flag.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-category.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-home.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-large.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-large_scene.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-medium.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-small.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-thickbox.jpg (100%) rename {installq => install}/langs/fa/img/fa-default-thumb_scene.jpg (100%) rename {installq => install}/langs/fa/img/fa.jpg (100%) rename {installq => install}/langs/fa/img/index.php (100%) rename {installq => install}/langs/fa/index.php (100%) rename {installq => install}/langs/fa/install.php (100%) rename {installq => install}/langs/fa/language.xml (100%) rename {installq => install}/langs/fa/mail_identifiers.txt (100%) rename {installq => install}/langs/fr/data/carrier.xml (100%) rename {installq => install}/langs/fr/data/category.xml (100%) rename {installq => install}/langs/fr/data/cms.xml (100%) rename {installq => install}/langs/fr/data/cms_category.xml (100%) rename {installq => install}/langs/fr/data/configuration.xml (100%) rename {installq => install}/langs/fr/data/contact.xml (100%) rename {installq => install}/langs/fr/data/country.xml (100%) rename {installq => install}/langs/fr/data/gender.xml (100%) rename {installq => install}/langs/fr/data/group.xml (100%) rename {installq => install}/langs/fr/data/index.php (100%) rename {installq => install}/langs/fr/data/meta.xml (100%) rename {installq => install}/langs/fr/data/order_return_state.xml (100%) rename {installq => install}/langs/fr/data/order_state.xml (100%) rename {installq => install}/langs/fr/data/profile.xml (100%) rename {installq => install}/langs/fr/data/quick_access.xml (100%) rename {installq => install}/langs/fr/data/risk.xml (100%) rename {installq => install}/langs/fr/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/fr/data/supplier_order_state.xml (100%) rename {installq => install}/langs/fr/data/supply_order_state.xml (100%) rename {installq => install}/langs/fr/data/tab.xml (100%) rename {installq => install}/langs/fr/flag.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-category.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-home.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-large.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-large_scene.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-medium.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-small.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-thickbox.jpg (100%) rename {installq => install}/langs/fr/img/fr-default-thumb_scene.jpg (100%) rename {installq => install}/langs/fr/img/fr.jpg (100%) rename {installq => install}/langs/fr/img/index.php (100%) rename {installq => install}/langs/fr/index.php (100%) rename {installq => install}/langs/fr/install.php (100%) rename {installq => install}/langs/fr/language.xml (100%) rename {installq => install}/langs/fr/mail_identifiers.txt (100%) rename {installq => install}/langs/he/data/carrier.xml (100%) rename {installq => install}/langs/he/data/category.xml (100%) rename {installq => install}/langs/he/data/cms.xml (100%) rename {installq => install}/langs/he/data/cms_category.xml (100%) rename {installq => install}/langs/he/data/configuration.xml (100%) rename {installq => install}/langs/he/data/contact.xml (100%) rename {installq => install}/langs/he/data/country.xml (100%) rename {installq => install}/langs/he/data/gender.xml (100%) rename {installq => install}/langs/he/data/group.xml (100%) rename {installq => install}/langs/he/data/index.php (100%) rename {installq => install}/langs/he/data/meta.xml (100%) rename {installq => install}/langs/he/data/order_return_state.xml (100%) rename {installq => install}/langs/he/data/order_state.xml (100%) rename {installq => install}/langs/he/data/profile.xml (100%) rename {installq => install}/langs/he/data/quick_access.xml (100%) rename {installq => install}/langs/he/data/risk.xml (100%) rename {installq => install}/langs/he/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/he/data/supplier_order_state.xml (100%) rename {installq => install}/langs/he/data/supply_order_state.xml (100%) rename {installq => install}/langs/he/data/tab.xml (100%) rename {installq => install}/langs/he/flag.jpg (100%) rename {installq => install}/langs/he/img/he-default-category.jpg (100%) rename {installq => install}/langs/he/img/he-default-home.jpg (100%) rename {installq => install}/langs/he/img/he-default-large.jpg (100%) rename {installq => install}/langs/he/img/he-default-large_scene.jpg (100%) rename {installq => install}/langs/he/img/he-default-medium.jpg (100%) rename {installq => install}/langs/he/img/he-default-small.jpg (100%) rename {installq => install}/langs/he/img/he-default-thickbox.jpg (100%) rename {installq => install}/langs/he/img/he-default-thumb_scene.jpg (100%) rename {installq => install}/langs/he/img/he.jpg (100%) rename {installq => install}/langs/he/img/index.php (100%) rename {installq => install}/langs/he/index.php (100%) rename {installq => install}/langs/he/install.php (100%) rename {installq => install}/langs/he/language.xml (100%) rename {installq => install}/langs/he/mail_identifiers.txt (100%) rename {installq => install}/langs/hr/data/carrier.xml (100%) rename {installq => install}/langs/hr/data/category.xml (100%) rename {installq => install}/langs/hr/data/cms.xml (100%) rename {installq => install}/langs/hr/data/cms_category.xml (100%) rename {installq => install}/langs/hr/data/configuration.xml (100%) rename {installq => install}/langs/hr/data/contact.xml (100%) rename {installq => install}/langs/hr/data/country.xml (100%) rename {installq => install}/langs/hr/data/gender.xml (100%) rename {installq => install}/langs/hr/data/group.xml (100%) rename {installq => install}/langs/hr/data/index.php (100%) rename {installq => install}/langs/hr/data/meta.xml (100%) rename {installq => install}/langs/hr/data/order_return_state.xml (100%) rename {installq => install}/langs/hr/data/order_state.xml (100%) rename {installq => install}/langs/hr/data/profile.xml (100%) rename {installq => install}/langs/hr/data/quick_access.xml (100%) rename {installq => install}/langs/hr/data/risk.xml (100%) rename {installq => install}/langs/hr/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/hr/data/supplier_order_state.xml (100%) rename {installq => install}/langs/hr/data/supply_order_state.xml (100%) rename {installq => install}/langs/hr/data/tab.xml (100%) rename {installq => install}/langs/hr/flag.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-category.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-home.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-large.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-large_scene.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-medium.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-small.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-thickbox.jpg (100%) rename {installq => install}/langs/hr/img/hr-default-thumb_scene.jpg (100%) rename {installq => install}/langs/hr/img/hr.jpg (100%) rename {installq => install}/langs/hr/img/index.php (100%) rename {installq => install}/langs/hr/index.php (100%) rename {installq => install}/langs/hr/install.php (100%) rename {installq => install}/langs/hr/language.xml (100%) rename {installq => install}/langs/hr/mail_identifiers.txt (100%) rename {installq => install}/langs/hu/data/carrier.xml (100%) rename {installq => install}/langs/hu/data/category.xml (100%) rename {installq => install}/langs/hu/data/cms.xml (100%) rename {installq => install}/langs/hu/data/cms_category.xml (100%) rename {installq => install}/langs/hu/data/configuration.xml (100%) rename {installq => install}/langs/hu/data/contact.xml (100%) rename {installq => install}/langs/hu/data/country.xml (100%) rename {installq => install}/langs/hu/data/gender.xml (100%) rename {installq => install}/langs/hu/data/group.xml (100%) rename {installq => install}/langs/hu/data/index.php (100%) rename {installq => install}/langs/hu/data/meta.xml (100%) rename {installq => install}/langs/hu/data/order_return_state.xml (100%) rename {installq => install}/langs/hu/data/order_state.xml (100%) rename {installq => install}/langs/hu/data/profile.xml (100%) rename {installq => install}/langs/hu/data/quick_access.xml (100%) rename {installq => install}/langs/hu/data/risk.xml (100%) rename {installq => install}/langs/hu/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/hu/data/supplier_order_state.xml (100%) rename {installq => install}/langs/hu/data/supply_order_state.xml (100%) rename {installq => install}/langs/hu/data/tab.xml (100%) rename {installq => install}/langs/hu/flag.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-category.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-home.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-large.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-large_scene.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-medium.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-small.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-thickbox.jpg (100%) rename {installq => install}/langs/hu/img/hu-default-thumb_scene.jpg (100%) rename {installq => install}/langs/hu/img/hu.jpg (100%) rename {installq => install}/langs/hu/img/index.php (100%) rename {installq => install}/langs/hu/index.php (100%) rename {installq => install}/langs/hu/install.php (100%) rename {installq => install}/langs/hu/language.xml (100%) rename {installq => install}/langs/hu/mail_identifiers.txt (100%) rename {installq => install}/langs/id/data/carrier.xml (100%) rename {installq => install}/langs/id/data/category.xml (100%) rename {installq => install}/langs/id/data/cms.xml (100%) rename {installq => install}/langs/id/data/cms_category.xml (100%) rename {installq => install}/langs/id/data/configuration.xml (100%) rename {installq => install}/langs/id/data/contact.xml (100%) rename {installq => install}/langs/id/data/country.xml (100%) rename {installq => install}/langs/id/data/gender.xml (100%) rename {installq => install}/langs/id/data/group.xml (100%) rename {installq => install}/langs/id/data/index.php (100%) rename {installq => install}/langs/id/data/meta.xml (100%) rename {installq => install}/langs/id/data/order_return_state.xml (100%) rename {installq => install}/langs/id/data/order_state.xml (100%) rename {installq => install}/langs/id/data/profile.xml (100%) rename {installq => install}/langs/id/data/quick_access.xml (100%) rename {installq => install}/langs/id/data/risk.xml (100%) rename {installq => install}/langs/id/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/id/data/supplier_order_state.xml (100%) rename {installq => install}/langs/id/data/supply_order_state.xml (100%) rename {installq => install}/langs/id/data/tab.xml (100%) rename {installq => install}/langs/id/flag.jpg (100%) rename {installq => install}/langs/id/img/id-default-category.jpg (100%) rename {installq => install}/langs/id/img/id-default-home.jpg (100%) rename {installq => install}/langs/id/img/id-default-large.jpg (100%) rename {installq => install}/langs/id/img/id-default-large_scene.jpg (100%) rename {installq => install}/langs/id/img/id-default-medium.jpg (100%) rename {installq => install}/langs/id/img/id-default-small.jpg (100%) rename {installq => install}/langs/id/img/id-default-thickbox.jpg (100%) rename {installq => install}/langs/id/img/id-default-thumb_scene.jpg (100%) rename {installq => install}/langs/id/img/id.jpg (100%) rename {installq => install}/langs/id/img/index.php (100%) rename {installq => install}/langs/id/index.php (100%) rename {installq => install}/langs/id/install.php (100%) rename {installq => install}/langs/id/language.xml (100%) rename {installq => install}/langs/id/mail_identifiers.txt (100%) rename {installq => install}/langs/index.php (100%) rename {installq => install}/langs/it/data/carrier.xml (100%) rename {installq => install}/langs/it/data/category.xml (100%) rename {installq => install}/langs/it/data/cms.xml (100%) rename {installq => install}/langs/it/data/cms_category.xml (100%) rename {installq => install}/langs/it/data/configuration.xml (100%) rename {installq => install}/langs/it/data/contact.xml (100%) rename {installq => install}/langs/it/data/country.xml (100%) rename {installq => install}/langs/it/data/gender.xml (100%) rename {installq => install}/langs/it/data/group.xml (100%) rename {installq => install}/langs/it/data/index.php (100%) rename {installq => install}/langs/it/data/meta.xml (100%) rename {installq => install}/langs/it/data/order_return_state.xml (100%) rename {installq => install}/langs/it/data/order_state.xml (100%) rename {installq => install}/langs/it/data/profile.xml (100%) rename {installq => install}/langs/it/data/quick_access.xml (100%) rename {installq => install}/langs/it/data/risk.xml (100%) rename {installq => install}/langs/it/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/it/data/supplier_order_state.xml (100%) rename {installq => install}/langs/it/data/supply_order_state.xml (100%) rename {installq => install}/langs/it/data/tab.xml (100%) rename {installq => install}/langs/it/flag.jpg (100%) rename {installq => install}/langs/it/img/index.php (100%) rename {installq => install}/langs/it/img/it-default-category.jpg (100%) rename {installq => install}/langs/it/img/it-default-home.jpg (100%) rename {installq => install}/langs/it/img/it-default-large.jpg (100%) rename {installq => install}/langs/it/img/it-default-large_scene.jpg (100%) rename {installq => install}/langs/it/img/it-default-medium.jpg (100%) rename {installq => install}/langs/it/img/it-default-small.jpg (100%) rename {installq => install}/langs/it/img/it-default-thickbox.jpg (100%) rename {installq => install}/langs/it/img/it-default-thumb_scene.jpg (100%) rename {installq => install}/langs/it/img/it.jpg (100%) rename {installq => install}/langs/it/index.php (100%) rename {installq => install}/langs/it/install.php (100%) rename {installq => install}/langs/it/language.xml (100%) rename {installq => install}/langs/it/mail_identifiers.txt (100%) rename {installq => install}/langs/lt/data/carrier.xml (100%) rename {installq => install}/langs/lt/data/category.xml (100%) rename {installq => install}/langs/lt/data/cms.xml (100%) rename {installq => install}/langs/lt/data/cms_category.xml (100%) rename {installq => install}/langs/lt/data/configuration.xml (100%) rename {installq => install}/langs/lt/data/contact.xml (100%) rename {installq => install}/langs/lt/data/country.xml (100%) rename {installq => install}/langs/lt/data/gender.xml (100%) rename {installq => install}/langs/lt/data/group.xml (100%) rename {installq => install}/langs/lt/data/index.php (100%) rename {installq => install}/langs/lt/data/meta.xml (100%) rename {installq => install}/langs/lt/data/order_return_state.xml (100%) rename {installq => install}/langs/lt/data/order_state.xml (100%) rename {installq => install}/langs/lt/data/profile.xml (100%) rename {installq => install}/langs/lt/data/quick_access.xml (100%) rename {installq => install}/langs/lt/data/risk.xml (100%) rename {installq => install}/langs/lt/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/lt/data/supplier_order_state.xml (100%) rename {installq => install}/langs/lt/data/supply_order_state.xml (100%) rename {installq => install}/langs/lt/data/tab.xml (100%) rename {installq => install}/langs/lt/flag.jpg (100%) rename {installq => install}/langs/lt/img/index.php (100%) rename {installq => install}/langs/lt/img/lt-default-category.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-home.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-large.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-large_scene.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-medium.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-small.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-thickbox.jpg (100%) rename {installq => install}/langs/lt/img/lt-default-thumb_scene.jpg (100%) rename {installq => install}/langs/lt/img/lt.jpg (100%) rename {installq => install}/langs/lt/index.php (100%) rename {installq => install}/langs/lt/install.php (100%) rename {installq => install}/langs/lt/language.xml (100%) rename {installq => install}/langs/lt/mail_identifiers.txt (100%) rename {installq => install}/langs/mk/data/carrier.xml (100%) rename {installq => install}/langs/mk/data/category.xml (100%) rename {installq => install}/langs/mk/data/cms.xml (100%) rename {installq => install}/langs/mk/data/cms_category.xml (100%) rename {installq => install}/langs/mk/data/configuration.xml (100%) rename {installq => install}/langs/mk/data/contact.xml (100%) rename {installq => install}/langs/mk/data/country.xml (100%) rename {installq => install}/langs/mk/data/gender.xml (100%) rename {installq => install}/langs/mk/data/group.xml (100%) rename {installq => install}/langs/mk/data/index.php (100%) rename {installq => install}/langs/mk/data/meta.xml (100%) rename {installq => install}/langs/mk/data/order_return_state.xml (100%) rename {installq => install}/langs/mk/data/order_state.xml (100%) rename {installq => install}/langs/mk/data/profile.xml (100%) rename {installq => install}/langs/mk/data/quick_access.xml (100%) rename {installq => install}/langs/mk/data/risk.xml (100%) rename {installq => install}/langs/mk/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/mk/data/supplier_order_state.xml (100%) rename {installq => install}/langs/mk/data/supply_order_state.xml (100%) rename {installq => install}/langs/mk/data/tab.xml (100%) rename {installq => install}/langs/mk/flag.jpg (100%) rename {installq => install}/langs/mk/img/index.php (100%) rename {installq => install}/langs/mk/img/mk-default-category.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-home.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-large.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-large_scene.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-medium.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-small.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-thickbox.jpg (100%) rename {installq => install}/langs/mk/img/mk-default-thumb_scene.jpg (100%) rename {installq => install}/langs/mk/img/mk.jpg (100%) rename {installq => install}/langs/mk/index.php (100%) rename {installq => install}/langs/mk/install.php (100%) rename {installq => install}/langs/mk/language.xml (100%) rename {installq => install}/langs/mk/mail_identifiers.txt (100%) rename {installq => install}/langs/nl/data/carrier.xml (100%) rename {installq => install}/langs/nl/data/category.xml (100%) rename {installq => install}/langs/nl/data/cms.xml (100%) rename {installq => install}/langs/nl/data/cms_category.xml (100%) rename {installq => install}/langs/nl/data/configuration.xml (100%) rename {installq => install}/langs/nl/data/contact.xml (100%) rename {installq => install}/langs/nl/data/country.xml (100%) rename {installq => install}/langs/nl/data/gender.xml (100%) rename {installq => install}/langs/nl/data/group.xml (100%) rename {installq => install}/langs/nl/data/index.php (100%) rename {installq => install}/langs/nl/data/meta.xml (100%) rename {installq => install}/langs/nl/data/order_return_state.xml (100%) rename {installq => install}/langs/nl/data/order_state.xml (100%) rename {installq => install}/langs/nl/data/profile.xml (100%) rename {installq => install}/langs/nl/data/quick_access.xml (100%) rename {installq => install}/langs/nl/data/risk.xml (100%) rename {installq => install}/langs/nl/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/nl/data/supplier_order_state.xml (100%) rename {installq => install}/langs/nl/data/supply_order_state.xml (100%) rename {installq => install}/langs/nl/data/tab.xml (100%) rename {installq => install}/langs/nl/flag.jpg (100%) rename {installq => install}/langs/nl/img/index.php (100%) rename {installq => install}/langs/nl/img/nl-default-category.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-home.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-large.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-large_scene.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-medium.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-small.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-thickbox.jpg (100%) rename {installq => install}/langs/nl/img/nl-default-thumb_scene.jpg (100%) rename {installq => install}/langs/nl/img/nl.jpg (100%) rename {installq => install}/langs/nl/index.php (100%) rename {installq => install}/langs/nl/install.php (100%) rename {installq => install}/langs/nl/language.xml (100%) rename {installq => install}/langs/nl/mail_identifiers.txt (100%) rename {installq => install}/langs/no/data/carrier.xml (100%) rename {installq => install}/langs/no/data/category.xml (100%) rename {installq => install}/langs/no/data/cms.xml (100%) rename {installq => install}/langs/no/data/cms_category.xml (100%) rename {installq => install}/langs/no/data/configuration.xml (100%) rename {installq => install}/langs/no/data/contact.xml (100%) rename {installq => install}/langs/no/data/country.xml (100%) rename {installq => install}/langs/no/data/gender.xml (100%) rename {installq => install}/langs/no/data/group.xml (100%) rename {installq => install}/langs/no/data/index.php (100%) rename {installq => install}/langs/no/data/meta.xml (100%) rename {installq => install}/langs/no/data/order_return_state.xml (100%) rename {installq => install}/langs/no/data/order_state.xml (100%) rename {installq => install}/langs/no/data/profile.xml (100%) rename {installq => install}/langs/no/data/quick_access.xml (100%) rename {installq => install}/langs/no/data/risk.xml (100%) rename {installq => install}/langs/no/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/no/data/supplier_order_state.xml (100%) rename {installq => install}/langs/no/data/supply_order_state.xml (100%) rename {installq => install}/langs/no/data/tab.xml (100%) rename {installq => install}/langs/no/flag.jpg (100%) rename {installq => install}/langs/no/img/index.php (100%) rename {installq => install}/langs/no/img/no-default-category.jpg (100%) rename {installq => install}/langs/no/img/no-default-home.jpg (100%) rename {installq => install}/langs/no/img/no-default-large.jpg (100%) rename {installq => install}/langs/no/img/no-default-large_scene.jpg (100%) rename {installq => install}/langs/no/img/no-default-medium.jpg (100%) rename {installq => install}/langs/no/img/no-default-small.jpg (100%) rename {installq => install}/langs/no/img/no-default-thickbox.jpg (100%) rename {installq => install}/langs/no/img/no-default-thumb_scene.jpg (100%) rename {installq => install}/langs/no/img/no.jpg (100%) rename {installq => install}/langs/no/index.php (100%) rename {installq => install}/langs/no/install.php (100%) rename {installq => install}/langs/no/language.xml (100%) rename {installq => install}/langs/no/mail_identifiers.txt (100%) rename {installq => install}/langs/pl/data/carrier.xml (100%) rename {installq => install}/langs/pl/data/category.xml (100%) rename {installq => install}/langs/pl/data/cms.xml (100%) rename {installq => install}/langs/pl/data/cms_category.xml (100%) rename {installq => install}/langs/pl/data/configuration.xml (100%) rename {installq => install}/langs/pl/data/contact.xml (100%) rename {installq => install}/langs/pl/data/country.xml (100%) rename {installq => install}/langs/pl/data/gender.xml (100%) rename {installq => install}/langs/pl/data/group.xml (100%) rename {installq => install}/langs/pl/data/index.php (100%) rename {installq => install}/langs/pl/data/meta.xml (100%) rename {installq => install}/langs/pl/data/order_return_state.xml (100%) rename {installq => install}/langs/pl/data/order_state.xml (100%) rename {installq => install}/langs/pl/data/profile.xml (100%) rename {installq => install}/langs/pl/data/quick_access.xml (100%) rename {installq => install}/langs/pl/data/risk.xml (100%) rename {installq => install}/langs/pl/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/pl/data/supplier_order_state.xml (100%) rename {installq => install}/langs/pl/data/supply_order_state.xml (100%) rename {installq => install}/langs/pl/data/tab.xml (100%) rename {installq => install}/langs/pl/flag.jpg (100%) rename {installq => install}/langs/pl/img/flag.jpg (100%) rename {installq => install}/langs/pl/img/index.php (100%) rename {installq => install}/langs/pl/img/pl-default-category.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-home.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-large.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-large_scene.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-medium.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-small.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-thickbox.jpg (100%) rename {installq => install}/langs/pl/img/pl-default-thumb_scene.jpg (100%) rename {installq => install}/langs/pl/img/pl.jpg (100%) rename {installq => install}/langs/pl/index.php (100%) rename {installq => install}/langs/pl/install.php (100%) rename {installq => install}/langs/pl/language.xml (100%) rename {installq => install}/langs/pl/mail_identifiers.txt (100%) rename {installq => install}/langs/pt/data/carrier.xml (100%) rename {installq => install}/langs/pt/data/category.xml (100%) rename {installq => install}/langs/pt/data/cms.xml (100%) rename {installq => install}/langs/pt/data/cms_category.xml (100%) rename {installq => install}/langs/pt/data/configuration.xml (100%) rename {installq => install}/langs/pt/data/contact.xml (100%) rename {installq => install}/langs/pt/data/country.xml (100%) rename {installq => install}/langs/pt/data/gender.xml (100%) rename {installq => install}/langs/pt/data/group.xml (100%) rename {installq => install}/langs/pt/data/index.php (100%) rename {installq => install}/langs/pt/data/meta.xml (100%) rename {installq => install}/langs/pt/data/order_return_state.xml (100%) rename {installq => install}/langs/pt/data/order_state.xml (100%) rename {installq => install}/langs/pt/data/profile.xml (100%) rename {installq => install}/langs/pt/data/quick_access.xml (100%) rename {installq => install}/langs/pt/data/risk.xml (100%) rename {installq => install}/langs/pt/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/pt/data/supplier_order_state.xml (100%) rename {installq => install}/langs/pt/data/supply_order_state.xml (100%) rename {installq => install}/langs/pt/data/tab.xml (100%) rename {installq => install}/langs/pt/flag.jpg (100%) rename {installq => install}/langs/pt/img/index.php (100%) rename {installq => install}/langs/pt/img/pt-default-category.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-home.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-large.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-large_scene.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-medium.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-small.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-thickbox.jpg (100%) rename {installq => install}/langs/pt/img/pt-default-thumb_scene.jpg (100%) rename {installq => install}/langs/pt/img/pt.jpg (100%) rename {installq => install}/langs/pt/index.php (100%) rename {installq => install}/langs/pt/install.php (100%) rename {installq => install}/langs/pt/language.xml (100%) rename {installq => install}/langs/pt/mail_identifiers.txt (100%) rename {installq => install}/langs/qc/data/carrier.xml (100%) rename {installq => install}/langs/qc/data/category.xml (100%) rename {installq => install}/langs/qc/data/cms.xml (100%) rename {installq => install}/langs/qc/data/cms_category.xml (100%) rename {installq => install}/langs/qc/data/configuration.xml (100%) rename {installq => install}/langs/qc/data/contact.xml (100%) rename {installq => install}/langs/qc/data/country.xml (100%) rename {installq => install}/langs/qc/data/gender.xml (100%) rename {installq => install}/langs/qc/data/group.xml (100%) rename {installq => install}/langs/qc/data/index.php (100%) rename {installq => install}/langs/qc/data/meta.xml (100%) rename {installq => install}/langs/qc/data/order_return_state.xml (100%) rename {installq => install}/langs/qc/data/order_state.xml (100%) rename {installq => install}/langs/qc/data/profile.xml (100%) rename {installq => install}/langs/qc/data/quick_access.xml (100%) rename {installq => install}/langs/qc/data/risk.xml (100%) rename {installq => install}/langs/qc/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/qc/data/supplier_order_state.xml (100%) rename {installq => install}/langs/qc/data/supply_order_state.xml (100%) rename {installq => install}/langs/qc/data/tab.xml (100%) rename {installq => install}/langs/qc/flag.jpg (100%) rename {installq => install}/langs/qc/img/index.php (100%) rename {installq => install}/langs/qc/img/qc-default-category.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-home.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-large.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-large_scene.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-medium.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-small.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-thickbox.jpg (100%) rename {installq => install}/langs/qc/img/qc-default-thumb_scene.jpg (100%) rename {installq => install}/langs/qc/img/qc.jpg (100%) rename {installq => install}/langs/qc/index.php (100%) rename {installq => install}/langs/qc/install.php (100%) rename {installq => install}/langs/qc/language.xml (100%) rename {installq => install}/langs/qc/mail_identifiers.txt (100%) rename {installq => install}/langs/ro/data/carrier.xml (100%) rename {installq => install}/langs/ro/data/category.xml (100%) rename {installq => install}/langs/ro/data/cms.xml (100%) rename {installq => install}/langs/ro/data/cms_category.xml (100%) rename {installq => install}/langs/ro/data/configuration.xml (100%) rename {installq => install}/langs/ro/data/contact.xml (100%) rename {installq => install}/langs/ro/data/country.xml (100%) rename {installq => install}/langs/ro/data/gender.xml (100%) rename {installq => install}/langs/ro/data/group.xml (100%) rename {installq => install}/langs/ro/data/index.php (100%) rename {installq => install}/langs/ro/data/meta.xml (100%) rename {installq => install}/langs/ro/data/order_return_state.xml (100%) rename {installq => install}/langs/ro/data/order_state.xml (100%) rename {installq => install}/langs/ro/data/profile.xml (100%) rename {installq => install}/langs/ro/data/quick_access.xml (100%) rename {installq => install}/langs/ro/data/risk.xml (100%) rename {installq => install}/langs/ro/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/ro/data/supplier_order_state.xml (100%) rename {installq => install}/langs/ro/data/supply_order_state.xml (100%) rename {installq => install}/langs/ro/data/tab.xml (100%) rename {installq => install}/langs/ro/flag.jpg (100%) rename {installq => install}/langs/ro/img/index.php (100%) rename {installq => install}/langs/ro/img/ro-default-category.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-home.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-large.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-large_scene.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-medium.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-small.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-thickbox.jpg (100%) rename {installq => install}/langs/ro/img/ro-default-thumb_scene.jpg (100%) rename {installq => install}/langs/ro/img/ro.jpg (100%) rename {installq => install}/langs/ro/index.php (100%) rename {installq => install}/langs/ro/install.php (100%) rename {installq => install}/langs/ro/language.xml (100%) rename {installq => install}/langs/ro/mail_identifiers.txt (100%) rename {installq => install}/langs/ru/data/carrier.xml (100%) rename {installq => install}/langs/ru/data/category.xml (100%) rename {installq => install}/langs/ru/data/cms.xml (100%) rename {installq => install}/langs/ru/data/cms_category.xml (100%) rename {installq => install}/langs/ru/data/configuration.xml (100%) rename {installq => install}/langs/ru/data/contact.xml (100%) rename {installq => install}/langs/ru/data/country.xml (100%) rename {installq => install}/langs/ru/data/gender.xml (100%) rename {installq => install}/langs/ru/data/group.xml (100%) rename {installq => install}/langs/ru/data/index.php (100%) rename {installq => install}/langs/ru/data/meta.xml (100%) rename {installq => install}/langs/ru/data/order_return_state.xml (100%) rename {installq => install}/langs/ru/data/order_state.xml (100%) rename {installq => install}/langs/ru/data/profile.xml (100%) rename {installq => install}/langs/ru/data/quick_access.xml (100%) rename {installq => install}/langs/ru/data/risk.xml (100%) rename {installq => install}/langs/ru/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/ru/data/supplier_order_state.xml (100%) rename {installq => install}/langs/ru/data/supply_order_state.xml (100%) rename {installq => install}/langs/ru/data/tab.xml (100%) rename {installq => install}/langs/ru/flag.jpg (100%) rename {installq => install}/langs/ru/img/flag.jpg (100%) rename {installq => install}/langs/ru/img/index.php (100%) rename {installq => install}/langs/ru/img/ru-default-category.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-home.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-large.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-large_scene.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-medium.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-small.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-thickbox.jpg (100%) rename {installq => install}/langs/ru/img/ru-default-thumb_scene.jpg (100%) rename {installq => install}/langs/ru/img/ru.jpg (100%) rename {installq => install}/langs/ru/index.php (100%) rename {installq => install}/langs/ru/install.php (100%) rename {installq => install}/langs/ru/language.xml (100%) rename {installq => install}/langs/ru/mail_identifiers.txt (100%) rename {installq => install}/langs/si/data/carrier.xml (100%) rename {installq => install}/langs/si/data/category.xml (100%) rename {installq => install}/langs/si/data/cms.xml (100%) rename {installq => install}/langs/si/data/cms_category.xml (100%) rename {installq => install}/langs/si/data/configuration.xml (100%) rename {installq => install}/langs/si/data/contact.xml (100%) rename {installq => install}/langs/si/data/country.xml (100%) rename {installq => install}/langs/si/data/gender.xml (100%) rename {installq => install}/langs/si/data/group.xml (100%) rename {installq => install}/langs/si/data/index.php (100%) rename {installq => install}/langs/si/data/meta.xml (100%) rename {installq => install}/langs/si/data/order_return_state.xml (100%) rename {installq => install}/langs/si/data/order_state.xml (100%) rename {installq => install}/langs/si/data/profile.xml (100%) rename {installq => install}/langs/si/data/quick_access.xml (100%) rename {installq => install}/langs/si/data/risk.xml (100%) rename {installq => install}/langs/si/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/si/data/supplier_order_state.xml (100%) rename {installq => install}/langs/si/data/supply_order_state.xml (100%) rename {installq => install}/langs/si/data/tab.xml (100%) rename {installq => install}/langs/si/flag.jpg (100%) rename {installq => install}/langs/si/img/index.php (100%) rename {installq => install}/langs/si/img/si-default-category.jpg (100%) rename {installq => install}/langs/si/img/si-default-home.jpg (100%) rename {installq => install}/langs/si/img/si-default-large.jpg (100%) rename {installq => install}/langs/si/img/si-default-large_scene.jpg (100%) rename {installq => install}/langs/si/img/si-default-medium.jpg (100%) rename {installq => install}/langs/si/img/si-default-small.jpg (100%) rename {installq => install}/langs/si/img/si-default-thickbox.jpg (100%) rename {installq => install}/langs/si/img/si-default-thumb_scene.jpg (100%) rename {installq => install}/langs/si/img/si.jpg (100%) rename {installq => install}/langs/si/index.php (100%) rename {installq => install}/langs/si/install.php (100%) rename {installq => install}/langs/si/language.xml (100%) rename {installq => install}/langs/si/mail_identifiers.txt (100%) rename {installq => install}/langs/sr/data/carrier.xml (100%) rename {installq => install}/langs/sr/data/category.xml (100%) rename {installq => install}/langs/sr/data/cms.xml (100%) rename {installq => install}/langs/sr/data/cms_category.xml (100%) rename {installq => install}/langs/sr/data/configuration.xml (100%) rename {installq => install}/langs/sr/data/contact.xml (100%) rename {installq => install}/langs/sr/data/country.xml (100%) rename {installq => install}/langs/sr/data/gender.xml (100%) rename {installq => install}/langs/sr/data/group.xml (100%) rename {installq => install}/langs/sr/data/index.php (100%) rename {installq => install}/langs/sr/data/meta.xml (100%) rename {installq => install}/langs/sr/data/order_return_state.xml (100%) rename {installq => install}/langs/sr/data/order_state.xml (100%) rename {installq => install}/langs/sr/data/profile.xml (100%) rename {installq => install}/langs/sr/data/quick_access.xml (100%) rename {installq => install}/langs/sr/data/risk.xml (100%) rename {installq => install}/langs/sr/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/sr/data/supplier_order_state.xml (100%) rename {installq => install}/langs/sr/data/supply_order_state.xml (100%) rename {installq => install}/langs/sr/data/tab.xml (100%) rename {installq => install}/langs/sr/flag.jpg (100%) rename {installq => install}/langs/sr/img/index.php (100%) rename {installq => install}/langs/sr/img/sr-default-category.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-home.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-large.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-large_scene.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-medium.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-small.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-thickbox.jpg (100%) rename {installq => install}/langs/sr/img/sr-default-thumb_scene.jpg (100%) rename {installq => install}/langs/sr/img/sr.jpg (100%) rename {installq => install}/langs/sr/index.php (100%) rename {installq => install}/langs/sr/install.php (100%) rename {installq => install}/langs/sr/language.xml (100%) rename {installq => install}/langs/sr/mail_identifiers.txt (100%) rename {installq => install}/langs/sv/data/carrier.xml (100%) rename {installq => install}/langs/sv/data/category.xml (100%) rename {installq => install}/langs/sv/data/cms.xml (100%) rename {installq => install}/langs/sv/data/cms_category.xml (100%) rename {installq => install}/langs/sv/data/configuration.xml (100%) rename {installq => install}/langs/sv/data/contact.xml (100%) rename {installq => install}/langs/sv/data/country.xml (100%) rename {installq => install}/langs/sv/data/gender.xml (100%) rename {installq => install}/langs/sv/data/group.xml (100%) rename {installq => install}/langs/sv/data/index.php (100%) rename {installq => install}/langs/sv/data/meta.xml (100%) rename {installq => install}/langs/sv/data/order_return_state.xml (100%) rename {installq => install}/langs/sv/data/order_state.xml (100%) rename {installq => install}/langs/sv/data/profile.xml (100%) rename {installq => install}/langs/sv/data/quick_access.xml (100%) rename {installq => install}/langs/sv/data/risk.xml (100%) rename {installq => install}/langs/sv/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/sv/data/supplier_order_state.xml (100%) rename {installq => install}/langs/sv/data/supply_order_state.xml (100%) rename {installq => install}/langs/sv/data/tab.xml (100%) rename {installq => install}/langs/sv/flag.jpg (100%) rename {installq => install}/langs/sv/img/index.php (100%) rename {installq => install}/langs/sv/img/sv-default-category.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-home.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-large.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-large_scene.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-medium.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-small.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-thickbox.jpg (100%) rename {installq => install}/langs/sv/img/sv-default-thumb_scene.jpg (100%) rename {installq => install}/langs/sv/img/sv.jpg (100%) rename {installq => install}/langs/sv/index.php (100%) rename {installq => install}/langs/sv/install.php (100%) rename {installq => install}/langs/sv/language.xml (100%) rename {installq => install}/langs/sv/mail_identifiers.txt (100%) rename {installq => install}/langs/tr/flag.jpg (100%) rename {installq => install}/langs/tr/img/index.php (100%) rename {installq => install}/langs/tr/img/tr-default-category.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-home.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-large.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-large_scene.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-medium.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-small.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-thickbox.jpg (100%) rename {installq => install}/langs/tr/img/tr-default-thumb_scene.jpg (100%) rename {installq => install}/langs/tr/img/tr.jpg (100%) rename {installq => install}/langs/tr/index.php (100%) rename {installq => install}/langs/tr/install.php (100%) rename {installq => install}/langs/tr/language.xml (100%) rename {installq => install}/langs/tr/mail_identifiers.txt (100%) rename {installq => install}/langs/tw/data/carrier.xml (100%) rename {installq => install}/langs/tw/data/category.xml (100%) rename {installq => install}/langs/tw/data/cms.xml (100%) rename {installq => install}/langs/tw/data/cms_category.xml (100%) rename {installq => install}/langs/tw/data/configuration.xml (100%) rename {installq => install}/langs/tw/data/contact.xml (100%) rename {installq => install}/langs/tw/data/country.xml (100%) rename {installq => install}/langs/tw/data/gender.xml (100%) rename {installq => install}/langs/tw/data/group.xml (100%) rename {installq => install}/langs/tw/data/index.php (100%) rename {installq => install}/langs/tw/data/meta.xml (100%) rename {installq => install}/langs/tw/data/order_return_state.xml (100%) rename {installq => install}/langs/tw/data/order_state.xml (100%) rename {installq => install}/langs/tw/data/profile.xml (100%) rename {installq => install}/langs/tw/data/quick_access.xml (100%) rename {installq => install}/langs/tw/data/risk.xml (100%) rename {installq => install}/langs/tw/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/tw/data/supplier_order_state.xml (100%) rename {installq => install}/langs/tw/data/supply_order_state.xml (100%) rename {installq => install}/langs/tw/data/tab.xml (100%) rename {installq => install}/langs/tw/flag.jpg (100%) rename {installq => install}/langs/tw/img/index.php (100%) rename {installq => install}/langs/tw/img/tw-default-category.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-home.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-large.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-large_scene.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-medium.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-small.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-thickbox.jpg (100%) rename {installq => install}/langs/tw/img/tw-default-thumb_scene.jpg (100%) rename {installq => install}/langs/tw/img/tw.jpg (100%) rename {installq => install}/langs/tw/index.php (100%) rename {installq => install}/langs/tw/install.php (100%) rename {installq => install}/langs/tw/language.xml (100%) rename {installq => install}/langs/tw/mail_identifiers.txt (100%) rename {installq => install}/langs/vn/data/carrier.xml (100%) rename {installq => install}/langs/vn/data/category.xml (100%) rename {installq => install}/langs/vn/data/cms.xml (100%) rename {installq => install}/langs/vn/data/cms_category.xml (100%) rename {installq => install}/langs/vn/data/configuration.xml (100%) rename {installq => install}/langs/vn/data/contact.xml (100%) rename {installq => install}/langs/vn/data/country.xml (100%) rename {installq => install}/langs/vn/data/gender.xml (100%) rename {installq => install}/langs/vn/data/group.xml (100%) rename {installq => install}/langs/vn/data/index.php (100%) rename {installq => install}/langs/vn/data/meta.xml (100%) rename {installq => install}/langs/vn/data/order_return_state.xml (100%) rename {installq => install}/langs/vn/data/order_state.xml (100%) rename {installq => install}/langs/vn/data/profile.xml (100%) rename {installq => install}/langs/vn/data/quick_access.xml (100%) rename {installq => install}/langs/vn/data/risk.xml (100%) rename {installq => install}/langs/vn/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/vn/data/supplier_order_state.xml (100%) rename {installq => install}/langs/vn/data/supply_order_state.xml (100%) rename {installq => install}/langs/vn/data/tab.xml (100%) rename {installq => install}/langs/vn/flag.jpg (100%) rename {installq => install}/langs/vn/img/index.php (100%) rename {installq => install}/langs/vn/img/vn-default-category.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-home.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-large.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-large_scene.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-medium.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-small.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-thickbox.jpg (100%) rename {installq => install}/langs/vn/img/vn-default-thumb_scene.jpg (100%) rename {installq => install}/langs/vn/img/vn.jpg (100%) rename {installq => install}/langs/vn/index.php (100%) rename {installq => install}/langs/vn/install.php (100%) rename {installq => install}/langs/vn/language.xml (100%) rename {installq => install}/langs/vn/mail_identifiers.txt (100%) rename {installq => install}/langs/zh/data/carrier.xml (100%) rename {installq => install}/langs/zh/data/category.xml (100%) rename {installq => install}/langs/zh/data/cms.xml (100%) rename {installq => install}/langs/zh/data/cms_category.xml (100%) rename {installq => install}/langs/zh/data/configuration.xml (100%) rename {installq => install}/langs/zh/data/contact.xml (100%) rename {installq => install}/langs/zh/data/country.xml (100%) rename {installq => install}/langs/zh/data/gender.xml (100%) rename {installq => install}/langs/zh/data/group.xml (100%) rename {installq => install}/langs/zh/data/index.php (100%) rename {installq => install}/langs/zh/data/meta.xml (100%) rename {installq => install}/langs/zh/data/order_return_state.xml (100%) rename {installq => install}/langs/zh/data/order_state.xml (100%) rename {installq => install}/langs/zh/data/profile.xml (100%) rename {installq => install}/langs/zh/data/quick_access.xml (100%) rename {installq => install}/langs/zh/data/risk.xml (100%) rename {installq => install}/langs/zh/data/stock_mvt_reason.xml (100%) rename {installq => install}/langs/zh/data/supplier_order_state.xml (100%) rename {installq => install}/langs/zh/data/supply_order_state.xml (100%) rename {installq => install}/langs/zh/data/tab.xml (100%) rename {installq => install}/langs/zh/flag.jpg (100%) rename {installq => install}/langs/zh/img/index.php (100%) rename {installq => install}/langs/zh/img/zh-default-category.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-home.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-large.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-large_scene.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-medium.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-small.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-thickbox.jpg (100%) rename {installq => install}/langs/zh/img/zh-default-thumb_scene.jpg (100%) rename {installq => install}/langs/zh/img/zh.jpg (100%) rename {installq => install}/langs/zh/index.php (100%) rename {installq => install}/langs/zh/install.php (100%) rename {installq => install}/langs/zh/language.xml (100%) rename {installq => install}/langs/zh/mail_identifiers.txt (100%) rename {installq => install}/models/database.php (100%) rename {installq => install}/models/index.php (100%) rename {installq => install}/models/install.php (100%) rename {installq => install}/models/mail.php (100%) rename {installq => install}/models/system.php (100%) rename {installq => install}/sandbox/.htaccess (100%) rename {installq => install}/sandbox/index.php (100%) rename {installq => install}/sandbox/test.php (100%) rename {installq => install}/theme/img/01-gd100.png (100%) rename {installq => install}/theme/img/01-pt100.png (100%) rename {installq => install}/theme/img/01-pt70.png (100%) rename {installq => install}/theme/img/02-gd100.png (100%) rename {installq => install}/theme/img/02-pt100.png (100%) rename {installq => install}/theme/img/02-pt70.png (100%) rename {installq => install}/theme/img/03-gd100.png (100%) rename {installq => install}/theme/img/03-pt100.png (100%) rename {installq => install}/theme/img/03-pt70.png (100%) rename {installq => install}/theme/img/04-gd100.png (100%) rename {installq => install}/theme/img/04-pt100.png (100%) rename {installq => install}/theme/img/04-pt70.png (100%) rename {installq => install}/theme/img/05-gd100.png (100%) rename {installq => install}/theme/img/05-pt100.png (100%) rename {installq => install}/theme/img/05-pt70.png (100%) rename {installq => install}/theme/img/ajax-loader-small.gif (100%) rename {installq => install}/theme/img/ajax-loader.gif (100%) rename {installq => install}/theme/img/bad.gif (100%) rename {installq => install}/theme/img/bg-body.png (100%) rename {installq => install}/theme/img/bg-contentTitle.png (100%) rename {installq => install}/theme/img/bg-ctnr.png (100%) rename {installq => install}/theme/img/bg-input-text.png (100%) rename {installq => install}/theme/img/bg-li-headerLinks.png (100%) rename {installq => install}/theme/img/bg-li-tabs-finished.png (100%) rename {installq => install}/theme/img/bg-li-tabs-rtl.png (100%) rename {installq => install}/theme/img/bg-li-tabs.png (100%) rename {installq => install}/theme/img/bg-phone_block.png (100%) rename {installq => install}/theme/img/bg-tab.png (100%) rename {installq => install}/theme/img/bg_blockInfoEnd.png (100%) rename {installq => install}/theme/img/bg_bt_blockInfoEnd.png (100%) rename {installq => install}/theme/img/bg_field.png (100%) rename {installq => install}/theme/img/bg_help.png (100%) rename {installq => install}/theme/img/bg_input_button.png (100%) rename {installq => install}/theme/img/bg_li_stepList.png (100%) rename {installq => install}/theme/img/bg_li_title.png (100%) rename {installq => install}/theme/img/bg_loaderSpace.png (100%) rename {installq => install}/theme/img/bg_moduleTable_th.png (100%) rename {installq => install}/theme/img/boutonpt-disabled.png (100%) rename {installq => install}/theme/img/boutonpt-on.png (100%) rename {installq => install}/theme/img/boutonpt-over.png (100%) rename {installq => install}/theme/img/bt - Copie.png (100%) rename {installq => install}/theme/img/bt-dsbl - Copie.png (100%) rename {installq => install}/theme/img/bt-dsbl.png (100%) rename {installq => install}/theme/img/bt-hover.png (100%) rename {installq => install}/theme/img/bt.png (100%) rename {installq => install}/theme/img/bt_off.png (100%) rename {installq => install}/theme/img/bt_off_hover.png (100%) rename {installq => install}/theme/img/btn-installeur.png (100%) rename {installq => install}/theme/img/bullet.png (100%) rename {installq => install}/theme/img/chosen-sprite.png (100%) rename {installq => install}/theme/img/chosen-sprite@2x.png (100%) rename {installq => install}/theme/img/favicon.ico (100%) rename {installq => install}/theme/img/help.png (100%) rename {installq => install}/theme/img/ico_help.gif (100%) rename {installq => install}/theme/img/icon-bulb.png (100%) rename {installq => install}/theme/img/icon-installation-guide.png (100%) rename {installq => install}/theme/img/icon-services.png (100%) rename {installq => install}/theme/img/icon-tutorials.png (100%) rename {installq => install}/theme/img/index.php (100%) rename {installq => install}/theme/img/logo.png (100%) rename {installq => install}/theme/img/noflag.jpg (100%) rename {installq => install}/theme/img/ok.gif (100%) rename {installq => install}/theme/img/ombrage-bas.png (100%) rename {installq => install}/theme/img/ombrage-droit.png (100%) rename {installq => install}/theme/img/phone.png (100%) rename {installq => install}/theme/img/pict_error.png (100%) rename {installq => install}/theme/img/pict_h3_infos.png (100%) rename {installq => install}/theme/img/pict_info.png (100%) rename {installq => install}/theme/img/print.png (100%) rename {installq => install}/theme/img/puce.gif (100%) rename {installq => install}/theme/img/shadow-left.png (100%) rename {installq => install}/theme/img/suggested-modules.png (100%) rename {installq => install}/theme/img/suggested-themes.png (100%) rename {installq => install}/theme/img/visu_boBlock.png (100%) rename {installq => install}/theme/img/visu_foBlock.png (100%) rename {installq => install}/theme/index.php (100%) rename {installq => install}/theme/js/configure.js (100%) rename {installq => install}/theme/js/database.js (100%) rename {installq => install}/theme/js/index.php (100%) rename {installq => install}/theme/js/install.js (100%) rename {installq => install}/theme/js/license.js (100%) rename {installq => install}/theme/js/process.js (100%) rename {installq => install}/theme/js/welcome.js (100%) rename {installq => install}/theme/rtl.css (100%) rename {installq => install}/theme/view.css (100%) rename {installq => install}/theme/views/configure.phtml (100%) rename {installq => install}/theme/views/database.phtml (100%) rename {installq => install}/theme/views/footer.phtml (100%) rename {installq => install}/theme/views/header.phtml (100%) rename {installq => install}/theme/views/index.php (100%) rename {installq => install}/theme/views/license.phtml (100%) rename {installq => install}/theme/views/license_content.phtml (100%) rename {installq => install}/theme/views/process.phtml (100%) rename {installq => install}/theme/views/system.phtml (100%) rename {installq => install}/theme/views/welcome.phtml (100%) rename {installq => install}/upgrade/classes/AbstractLogger.php (100%) rename {installq => install}/upgrade/classes/AddConfToFile.php (100%) rename {installq => install}/upgrade/classes/FileLogger.php (100%) rename {installq => install}/upgrade/classes/ToolsInstall.php (100%) rename {installq => install}/upgrade/classes/index.php (100%) rename {installq => install}/upgrade/index.php (100%) rename {installq => install}/upgrade/php/add_accounting_tab.php (100%) rename {installq => install}/upgrade/php/add_attribute_position.php (100%) rename {installq => install}/upgrade/php/add_carrier_position.php (100%) rename {installq => install}/upgrade/php/add_column_order_state_deleted_if_not_exists.php (100%) rename {installq => install}/upgrade/php/add_column_orders_reference_if_not_exists.php (100%) rename {installq => install}/upgrade/php/add_default_restrictions_modules_groups.php (100%) rename {installq => install}/upgrade/php/add_feature_position.php (100%) rename {installq => install}/upgrade/php/add_group_attribute_position.php (100%) rename {installq => install}/upgrade/php/add_id_shop_to_shipper_lang_index.php (100%) rename {installq => install}/upgrade/php/add_missing_columns_customer.php (100%) rename {installq => install}/upgrade/php/add_missing_image_key.php (100%) rename {installq => install}/upgrade/php/add_missing_rewrite_value.php (100%) rename {installq => install}/upgrade/php/add_missing_shop_column_pagenotfound.php (100%) rename {installq => install}/upgrade/php/add_module_to_hook.php (100%) rename {installq => install}/upgrade/php/add_new_groups.php (100%) rename {installq => install}/upgrade/php/add_new_tab.php (100%) rename {installq => install}/upgrade/php/add_order_reference_in_order_payment.php (100%) rename {installq => install}/upgrade/php/add_order_state.php (100%) rename {installq => install}/upgrade/php/add_required_customization_field_flag.php (100%) rename {installq => install}/upgrade/php/add_stock_tab.php (100%) rename {installq => install}/upgrade/php/add_unknown_gender.php (100%) rename {installq => install}/upgrade/php/alter_blocklink.php (100%) rename {installq => install}/upgrade/php/alter_cms_block.php (100%) rename {installq => install}/upgrade/php/alter_productcomments_guest_index.php (100%) rename {installq => install}/upgrade/php/attribute_group_clean_combinations.php (100%) rename {installq => install}/upgrade/php/block_category_1521.php (100%) rename {installq => install}/upgrade/php/blocknewsletter.php (100%) rename {installq => install}/upgrade/php/blocknewsletter1530.php (100%) rename {installq => install}/upgrade/php/category_product_index_unique.php (100%) rename {installq => install}/upgrade/php/change_feature_image_to_jpg.php (100%) rename {installq => install}/upgrade/php/check_webservice_account_table.php (100%) rename {installq => install}/upgrade/php/clean_category_product.php (100%) rename {installq => install}/upgrade/php/clean_tabs_15.php (100%) rename {installq => install}/upgrade/php/cms_block.php (100%) rename {installq => install}/upgrade/php/cms_multishop.php (100%) rename {installq => install}/upgrade/php/configuration_double_cleaner.php (100%) rename {installq => install}/upgrade/php/convert_product_price.php (100%) rename {installq => install}/upgrade/php/country_to_timezone.php (100%) rename {installq => install}/upgrade/php/create_multistore.php (100%) rename {installq => install}/upgrade/php/customization_field_multishop_lang.php (100%) rename {installq => install}/upgrade/php/deactivate_custom_modules.php (100%) rename {installq => install}/upgrade/php/delivery_number_set.php (100%) rename {installq => install}/upgrade/php/drop_image_type_non_unique_index.php (100%) rename {installq => install}/upgrade/php/drop_module_non_unique_index.php (100%) rename {installq => install}/upgrade/php/ecotax_tax_application_fix.php (100%) rename {installq => install}/upgrade/php/editorial_update.php (100%) rename {installq => install}/upgrade/php/editorial_update_multishop.php (100%) rename {installq => install}/upgrade/php/fix_cms_shop_1520.php (100%) rename {installq => install}/upgrade/php/fix_download_product_feature_active.php (100%) rename {installq => install}/upgrade/php/fix_unique_specific_price.php (100%) rename {installq => install}/upgrade/php/generate_new_cookie_key.php (100%) rename {installq => install}/upgrade/php/generate_ntree.php (100%) rename {installq => install}/upgrade/php/generate_root_category_for_multishop.php (100%) rename {installq => install}/upgrade/php/generate_tax_rules.php (100%) rename {installq => install}/upgrade/php/generic_add_missing_column.php (100%) rename {installq => install}/upgrade/php/gridextjs_deprecated.php (100%) rename {installq => install}/upgrade/php/group_reduction_column_fix.php (100%) rename {installq => install}/upgrade/php/hook_blocksearch_on_header.php (100%) rename {installq => install}/upgrade/php/id_currency_country_fix.php (100%) rename {installq => install}/upgrade/php/image_shop1510.php (100%) rename {installq => install}/upgrade/php/index.php (100%) rename {installq => install}/upgrade/php/invoice_number_set.php (100%) rename {installq => install}/upgrade/php/latin1_database_to_utf8.php (100%) rename {installq => install}/upgrade/php/migrate_block_info_to_cms_block.php (100%) rename {installq => install}/upgrade/php/migrate_orders.php (100%) rename {installq => install}/upgrade/php/migrate_tabs_15.php (100%) rename {installq => install}/upgrade/php/migrate_tabs_multi_shop.php (100%) rename {installq => install}/upgrade/php/module_blockwishlist_multishop.php (100%) rename {installq => install}/upgrade/php/module_reinstall_blockmyaccount.php (100%) rename {installq => install}/upgrade/php/module_reinstall_blocksearch.php (100%) rename {installq => install}/upgrade/php/move_crossselling.php (100%) rename {installq => install}/upgrade/php/move_translations_module_file.php (100%) rename {installq => install}/upgrade/php/outstanding_allow_amount1530.php (100%) rename {installq => install}/upgrade/php/p15010_drop_column_id_address_if_exists.php (100%) rename {installq => install}/upgrade/php/p15012_add_missing_columns.php (100%) rename {installq => install}/upgrade/php/p15013_add_missing_columns.php (100%) rename {installq => install}/upgrade/php/p15014_add_missing_columns.php (100%) rename {installq => install}/upgrade/php/p15014_copy_missing_images_tab_from_installer.php (100%) rename {installq => install}/upgrade/php/p15014_upgrade_sekeywords.php (100%) rename {installq => install}/upgrade/php/p15015_blockadvertising_extension.php (100%) rename {installq => install}/upgrade/php/p15016_add_missing_columns.php (100%) rename {installq => install}/upgrade/php/p15017_add_id_shop_to_primary_key.php (100%) rename {installq => install}/upgrade/php/p15018_change_image_types.php (100%) rename {installq => install}/upgrade/php/p1531_redirect_type.php (100%) rename {installq => install}/upgrade/php/p1540_add_missing_columns.php (100%) rename {installq => install}/upgrade/php/p16011_media_server.php (100%) rename {installq => install}/upgrade/php/p16012_pack_rework.php (100%) rename {installq => install}/upgrade/php/p1603_add_attachment_size.php (100%) rename {installq => install}/upgrade/php/p1606module_exceptions.php (100%) rename {installq => install}/upgrade/php/p1607_drop_primary_key_if_exists.php (100%) rename {installq => install}/upgrade/php/ps1600_add_missing_index.php (100%) rename {installq => install}/upgrade/php/ps16012_update_alias.php (100%) rename {installq => install}/upgrade/php/ps1604_update_employee_date.php (100%) rename {installq => install}/upgrade/php/ps1605_change_index.php (100%) rename {installq => install}/upgrade/php/ps1607_language_code_update.php (100%) rename {installq => install}/upgrade/php/ps1610_safe_remove_indexes.php (100%) rename {installq => install}/upgrade/php/regenerate_level_depth.php (100%) rename {installq => install}/upgrade/php/remove_duplicate_category_groups.php (100%) rename {installq => install}/upgrade/php/remove_module_from_hook.php (100%) rename {installq => install}/upgrade/php/remove_tab.php (100%) rename {installq => install}/upgrade/php/reorderpositions.php (100%) rename {installq => install}/upgrade/php/set_discount_category.php (100%) rename {installq => install}/upgrade/php/set_payment_module.php (100%) rename {installq => install}/upgrade/php/set_payment_module_group.php (100%) rename {installq => install}/upgrade/php/set_product_suppliers.php (100%) rename {installq => install}/upgrade/php/set_stock_available.php (100%) rename {installq => install}/upgrade/php/setallgroupsonhomecategory.php (100%) rename {installq => install}/upgrade/php/shop_url.php (100%) rename {installq => install}/upgrade/php/update_carrier_url.php (100%) rename {installq => install}/upgrade/php/update_customer_default_group.php (100%) rename {installq => install}/upgrade/php/update_feature_detachable_cache.php (100%) rename {installq => install}/upgrade/php/update_for_13version.php (100%) rename {installq => install}/upgrade/php/update_genders_images.php (100%) rename {installq => install}/upgrade/php/update_image_size_in_db.php (100%) rename {installq => install}/upgrade/php/update_mailalerts_add_column_idshop.php (100%) rename {installq => install}/upgrade/php/update_module_blocklayered.php (100%) rename {installq => install}/upgrade/php/update_module_followup.php (100%) rename {installq => install}/upgrade/php/update_module_loyalty.php (100%) rename {installq => install}/upgrade/php/update_module_pagesnotfound.php (100%) rename {installq => install}/upgrade/php/update_module_product_comments.php (100%) rename {installq => install}/upgrade/php/update_modules_multishop.php (100%) rename {installq => install}/upgrade/php/update_modules_sql.php (100%) rename {installq => install}/upgrade/php/update_order_canada.php (100%) rename {installq => install}/upgrade/php/update_order_detail_taxes.php (100%) rename {installq => install}/upgrade/php/update_order_details.php (100%) rename {installq => install}/upgrade/php/update_order_messages.php (100%) rename {installq => install}/upgrade/php/update_products_ecotax_v133.php (100%) rename {installq => install}/upgrade/php/update_stock_mvt_reason.php (100%) rename {installq => install}/upgrade/php/updateproductcomments.php (100%) rename {installq => install}/upgrade/php/updatetabicon_from_11version.php (100%) rename {installq => install}/upgrade/php/upgrade_cms_15.php (100%) rename {installq => install}/upgrade/php/upgrade_cms_15_rename.php (100%) rename {installq => install}/upgrade/sql/1.4.1.sql (100%) rename {installq => install}/upgrade/sql/1.5.0.sql (100%) rename {installq => install}/upgrade/sql/1.5.1.0.sql (100%) rename {installq => install}/upgrade/sql/1.5.2.0.sql (100%) rename {installq => install}/upgrade/sql/index.php (100%) rename {installq => install}/upgrade/upgrade.php (100%) diff --git a/installq/classes/controllerConsole.php b/install/classes/controllerConsole.php similarity index 100% rename from installq/classes/controllerConsole.php rename to install/classes/controllerConsole.php diff --git a/installq/classes/controllerHttp.php b/install/classes/controllerHttp.php similarity index 100% rename from installq/classes/controllerHttp.php rename to install/classes/controllerHttp.php diff --git a/installq/classes/datas.php b/install/classes/datas.php similarity index 100% rename from installq/classes/datas.php rename to install/classes/datas.php diff --git a/installq/classes/exception.php b/install/classes/exception.php similarity index 100% rename from installq/classes/exception.php rename to install/classes/exception.php diff --git a/installq/classes/index.php b/install/classes/index.php similarity index 100% rename from installq/classes/index.php rename to install/classes/index.php diff --git a/installq/classes/language.php b/install/classes/language.php similarity index 100% rename from installq/classes/language.php rename to install/classes/language.php diff --git a/installq/classes/languages.php b/install/classes/languages.php similarity index 100% rename from installq/classes/languages.php rename to install/classes/languages.php diff --git a/installq/classes/model.php b/install/classes/model.php similarity index 100% rename from installq/classes/model.php rename to install/classes/model.php diff --git a/installq/classes/session.php b/install/classes/session.php similarity index 100% rename from installq/classes/session.php rename to install/classes/session.php diff --git a/installq/classes/simplexml.php b/install/classes/simplexml.php similarity index 100% rename from installq/classes/simplexml.php rename to install/classes/simplexml.php diff --git a/installq/classes/sqlLoader.php b/install/classes/sqlLoader.php similarity index 100% rename from installq/classes/sqlLoader.php rename to install/classes/sqlLoader.php diff --git a/installq/classes/xmlLoader.php b/install/classes/xmlLoader.php similarity index 100% rename from installq/classes/xmlLoader.php rename to install/classes/xmlLoader.php diff --git a/installq/controllers/console/index.php b/install/controllers/console/index.php similarity index 100% rename from installq/controllers/console/index.php rename to install/controllers/console/index.php diff --git a/installq/controllers/console/process.php b/install/controllers/console/process.php similarity index 100% rename from installq/controllers/console/process.php rename to install/controllers/console/process.php diff --git a/installq/controllers/http/configure.php b/install/controllers/http/configure.php similarity index 100% rename from installq/controllers/http/configure.php rename to install/controllers/http/configure.php diff --git a/installq/controllers/http/database.php b/install/controllers/http/database.php similarity index 100% rename from installq/controllers/http/database.php rename to install/controllers/http/database.php diff --git a/installq/controllers/http/index.php b/install/controllers/http/index.php similarity index 100% rename from installq/controllers/http/index.php rename to install/controllers/http/index.php diff --git a/installq/controllers/http/license.php b/install/controllers/http/license.php similarity index 100% rename from installq/controllers/http/license.php rename to install/controllers/http/license.php diff --git a/installq/controllers/http/process.php b/install/controllers/http/process.php similarity index 100% rename from installq/controllers/http/process.php rename to install/controllers/http/process.php diff --git a/installq/controllers/http/smarty_compile.php b/install/controllers/http/smarty_compile.php similarity index 100% rename from installq/controllers/http/smarty_compile.php rename to install/controllers/http/smarty_compile.php diff --git a/installq/controllers/http/system.php b/install/controllers/http/system.php similarity index 100% rename from installq/controllers/http/system.php rename to install/controllers/http/system.php diff --git a/installq/controllers/http/welcome.php b/install/controllers/http/welcome.php similarity index 100% rename from installq/controllers/http/welcome.php rename to install/controllers/http/welcome.php diff --git a/installq/controllers/index.php b/install/controllers/index.php similarity index 100% rename from installq/controllers/index.php rename to install/controllers/index.php diff --git a/installq/data/db_structure.sql b/install/data/db_structure.sql similarity index 100% rename from installq/data/db_structure.sql rename to install/data/db_structure.sql diff --git a/installq/data/img/genders/Mr.jpg b/install/data/img/genders/Mr.jpg similarity index 100% rename from installq/data/img/genders/Mr.jpg rename to install/data/img/genders/Mr.jpg diff --git a/installq/data/img/genders/Mrs.jpg b/install/data/img/genders/Mrs.jpg similarity index 100% rename from installq/data/img/genders/Mrs.jpg rename to install/data/img/genders/Mrs.jpg diff --git a/installq/data/img/genders/Unknown.jpg b/install/data/img/genders/Unknown.jpg similarity index 100% rename from installq/data/img/genders/Unknown.jpg rename to install/data/img/genders/Unknown.jpg diff --git a/installq/data/img/genders/index.php b/install/data/img/genders/index.php similarity index 100% rename from installq/data/img/genders/index.php rename to install/data/img/genders/index.php diff --git a/installq/data/img/index.php b/install/data/img/index.php similarity index 100% rename from installq/data/img/index.php rename to install/data/img/index.php diff --git a/installq/data/img/os/Awaiting_payment.gif b/install/data/img/os/Awaiting_payment.gif similarity index 100% rename from installq/data/img/os/Awaiting_payment.gif rename to install/data/img/os/Awaiting_payment.gif diff --git a/installq/data/img/os/Awaiting_remote_payment.gif b/install/data/img/os/Awaiting_remote_payment.gif similarity index 100% rename from installq/data/img/os/Awaiting_remote_payment.gif rename to install/data/img/os/Awaiting_remote_payment.gif diff --git a/installq/data/img/os/Canceled.gif b/install/data/img/os/Canceled.gif similarity index 100% rename from installq/data/img/os/Canceled.gif rename to install/data/img/os/Canceled.gif diff --git a/installq/data/img/os/Overbooking_paid.gif b/install/data/img/os/Overbooking_paid.gif similarity index 100% rename from installq/data/img/os/Overbooking_paid.gif rename to install/data/img/os/Overbooking_paid.gif diff --git a/installq/data/img/os/Overbooking_partial_paid.gif b/install/data/img/os/Overbooking_partial_paid.gif similarity index 100% rename from installq/data/img/os/Overbooking_partial_paid.gif rename to install/data/img/os/Overbooking_partial_paid.gif diff --git a/installq/data/img/os/Overbooking_unpaid.gif b/install/data/img/os/Overbooking_unpaid.gif similarity index 100% rename from installq/data/img/os/Overbooking_unpaid.gif rename to install/data/img/os/Overbooking_unpaid.gif diff --git a/installq/data/img/os/Partial_payment_accepted.gif b/install/data/img/os/Partial_payment_accepted.gif similarity index 100% rename from installq/data/img/os/Partial_payment_accepted.gif rename to install/data/img/os/Partial_payment_accepted.gif diff --git a/installq/data/img/os/Payment_accepted.gif b/install/data/img/os/Payment_accepted.gif similarity index 100% rename from installq/data/img/os/Payment_accepted.gif rename to install/data/img/os/Payment_accepted.gif diff --git a/installq/data/img/os/Payment_error.gif b/install/data/img/os/Payment_error.gif similarity index 100% rename from installq/data/img/os/Payment_error.gif rename to install/data/img/os/Payment_error.gif diff --git a/installq/data/img/os/Payment_remotely_accepted.gif b/install/data/img/os/Payment_remotely_accepted.gif similarity index 100% rename from installq/data/img/os/Payment_remotely_accepted.gif rename to install/data/img/os/Payment_remotely_accepted.gif diff --git a/installq/data/img/os/Processing_in_progress.gif b/install/data/img/os/Processing_in_progress.gif similarity index 100% rename from installq/data/img/os/Processing_in_progress.gif rename to install/data/img/os/Processing_in_progress.gif diff --git a/installq/data/img/os/Refund.gif b/install/data/img/os/Refund.gif similarity index 100% rename from installq/data/img/os/Refund.gif rename to install/data/img/os/Refund.gif diff --git a/installq/data/img/os/index.php b/install/data/img/os/index.php similarity index 100% rename from installq/data/img/os/index.php rename to install/data/img/os/index.php diff --git a/installq/data/index.php b/install/data/index.php similarity index 100% rename from installq/data/index.php rename to install/data/index.php diff --git a/installq/data/iso_to_timezone.xml b/install/data/iso_to_timezone.xml similarity index 100% rename from installq/data/iso_to_timezone.xml rename to install/data/iso_to_timezone.xml diff --git a/installq/data/theme.sql b/install/data/theme.sql similarity index 100% rename from installq/data/theme.sql rename to install/data/theme.sql diff --git a/installq/data/xml/access.xml b/install/data/xml/access.xml similarity index 100% rename from installq/data/xml/access.xml rename to install/data/xml/access.xml diff --git a/installq/data/xml/address_format.xml b/install/data/xml/address_format.xml similarity index 100% rename from installq/data/xml/address_format.xml rename to install/data/xml/address_format.xml diff --git a/installq/data/xml/category.xml b/install/data/xml/category.xml similarity index 100% rename from installq/data/xml/category.xml rename to install/data/xml/category.xml diff --git a/installq/data/xml/category_group.xml b/install/data/xml/category_group.xml similarity index 100% rename from installq/data/xml/category_group.xml rename to install/data/xml/category_group.xml diff --git a/installq/data/xml/cms.xml b/install/data/xml/cms.xml similarity index 100% rename from installq/data/xml/cms.xml rename to install/data/xml/cms.xml diff --git a/installq/data/xml/cms_category.xml b/install/data/xml/cms_category.xml similarity index 100% rename from installq/data/xml/cms_category.xml rename to install/data/xml/cms_category.xml diff --git a/installq/data/xml/configuration.xml b/install/data/xml/configuration.xml similarity index 100% rename from installq/data/xml/configuration.xml rename to install/data/xml/configuration.xml diff --git a/installq/data/xml/contact.xml b/install/data/xml/contact.xml similarity index 100% rename from installq/data/xml/contact.xml rename to install/data/xml/contact.xml diff --git a/installq/data/xml/country.xml b/install/data/xml/country.xml similarity index 100% rename from installq/data/xml/country.xml rename to install/data/xml/country.xml diff --git a/installq/data/xml/gender.xml b/install/data/xml/gender.xml similarity index 100% rename from installq/data/xml/gender.xml rename to install/data/xml/gender.xml diff --git a/installq/data/xml/group.xml b/install/data/xml/group.xml similarity index 100% rename from installq/data/xml/group.xml rename to install/data/xml/group.xml diff --git a/installq/data/xml/hook.xml b/install/data/xml/hook.xml similarity index 100% rename from installq/data/xml/hook.xml rename to install/data/xml/hook.xml diff --git a/installq/data/xml/hook_alias.xml b/install/data/xml/hook_alias.xml similarity index 100% rename from installq/data/xml/hook_alias.xml rename to install/data/xml/hook_alias.xml diff --git a/installq/data/xml/image_type.xml b/install/data/xml/image_type.xml similarity index 100% rename from installq/data/xml/image_type.xml rename to install/data/xml/image_type.xml diff --git a/installq/data/xml/index.php b/install/data/xml/index.php similarity index 100% rename from installq/data/xml/index.php rename to install/data/xml/index.php diff --git a/installq/data/xml/meta.xml b/install/data/xml/meta.xml similarity index 100% rename from installq/data/xml/meta.xml rename to install/data/xml/meta.xml diff --git a/installq/data/xml/operating_system.xml b/install/data/xml/operating_system.xml similarity index 100% rename from installq/data/xml/operating_system.xml rename to install/data/xml/operating_system.xml diff --git a/installq/data/xml/order_return_state.xml b/install/data/xml/order_return_state.xml similarity index 100% rename from installq/data/xml/order_return_state.xml rename to install/data/xml/order_return_state.xml diff --git a/installq/data/xml/order_state.xml b/install/data/xml/order_state.xml similarity index 100% rename from installq/data/xml/order_state.xml rename to install/data/xml/order_state.xml diff --git a/installq/data/xml/profile.xml b/install/data/xml/profile.xml similarity index 100% rename from installq/data/xml/profile.xml rename to install/data/xml/profile.xml diff --git a/installq/data/xml/quick_access.xml b/install/data/xml/quick_access.xml similarity index 100% rename from installq/data/xml/quick_access.xml rename to install/data/xml/quick_access.xml diff --git a/installq/data/xml/risk.xml b/install/data/xml/risk.xml similarity index 100% rename from installq/data/xml/risk.xml rename to install/data/xml/risk.xml diff --git a/installq/data/xml/search_engine.xml b/install/data/xml/search_engine.xml similarity index 100% rename from installq/data/xml/search_engine.xml rename to install/data/xml/search_engine.xml diff --git a/installq/data/xml/state.xml b/install/data/xml/state.xml similarity index 100% rename from installq/data/xml/state.xml rename to install/data/xml/state.xml diff --git a/installq/data/xml/stock_mvt_reason.xml b/install/data/xml/stock_mvt_reason.xml similarity index 100% rename from installq/data/xml/stock_mvt_reason.xml rename to install/data/xml/stock_mvt_reason.xml diff --git a/installq/data/xml/supply_order_state.xml b/install/data/xml/supply_order_state.xml similarity index 100% rename from installq/data/xml/supply_order_state.xml rename to install/data/xml/supply_order_state.xml diff --git a/installq/data/xml/tab.xml b/install/data/xml/tab.xml similarity index 100% rename from installq/data/xml/tab.xml rename to install/data/xml/tab.xml diff --git a/installq/data/xml/theme.xml b/install/data/xml/theme.xml similarity index 100% rename from installq/data/xml/theme.xml rename to install/data/xml/theme.xml diff --git a/installq/data/xml/theme_meta.xml b/install/data/xml/theme_meta.xml similarity index 100% rename from installq/data/xml/theme_meta.xml rename to install/data/xml/theme_meta.xml diff --git a/installq/data/xml/timezone.xml b/install/data/xml/timezone.xml similarity index 100% rename from installq/data/xml/timezone.xml rename to install/data/xml/timezone.xml diff --git a/installq/data/xml/warehouse.xml b/install/data/xml/warehouse.xml similarity index 100% rename from installq/data/xml/warehouse.xml rename to install/data/xml/warehouse.xml diff --git a/installq/data/xml/web_browser.xml b/install/data/xml/web_browser.xml similarity index 100% rename from installq/data/xml/web_browser.xml rename to install/data/xml/web_browser.xml diff --git a/installq/data/xml/zone.xml b/install/data/xml/zone.xml similarity index 100% rename from installq/data/xml/zone.xml rename to install/data/xml/zone.xml diff --git a/installq/dev/index.php b/install/dev/index.php similarity index 100% rename from installq/dev/index.php rename to install/dev/index.php diff --git a/installq/dev/index.phtml b/install/dev/index.phtml similarity index 100% rename from installq/dev/index.phtml rename to install/dev/index.phtml diff --git a/installq/dev/style.css b/install/dev/style.css similarity index 100% rename from installq/dev/style.css rename to install/dev/style.css diff --git a/installq/dev/translate.php b/install/dev/translate.php similarity index 100% rename from installq/dev/translate.php rename to install/dev/translate.php diff --git a/installq/dev/update_eu_taxrulegroups.php b/install/dev/update_eu_taxrulegroups.php similarity index 100% rename from installq/dev/update_eu_taxrulegroups.php rename to install/dev/update_eu_taxrulegroups.php diff --git a/installq/fixtures/fashion/data/access.xml b/install/fixtures/fashion/data/access.xml similarity index 100% rename from installq/fixtures/fashion/data/access.xml rename to install/fixtures/fashion/data/access.xml diff --git a/installq/fixtures/fashion/data/address.xml b/install/fixtures/fashion/data/address.xml similarity index 100% rename from installq/fixtures/fashion/data/address.xml rename to install/fixtures/fashion/data/address.xml diff --git a/installq/fixtures/fashion/data/alias.xml b/install/fixtures/fashion/data/alias.xml similarity index 100% rename from installq/fixtures/fashion/data/alias.xml rename to install/fixtures/fashion/data/alias.xml diff --git a/installq/fixtures/fashion/data/connections.xml b/install/fixtures/fashion/data/connections.xml similarity index 100% rename from installq/fixtures/fashion/data/connections.xml rename to install/fixtures/fashion/data/connections.xml diff --git a/installq/fixtures/fashion/data/customer.xml b/install/fixtures/fashion/data/customer.xml similarity index 100% rename from installq/fixtures/fashion/data/customer.xml rename to install/fixtures/fashion/data/customer.xml diff --git a/installq/fixtures/fashion/data/guest.xml b/install/fixtures/fashion/data/guest.xml similarity index 100% rename from installq/fixtures/fashion/data/guest.xml rename to install/fixtures/fashion/data/guest.xml diff --git a/installq/fixtures/fashion/data/index.php b/install/fixtures/fashion/data/index.php similarity index 100% rename from installq/fixtures/fashion/data/index.php rename to install/fixtures/fashion/data/index.php diff --git a/installq/fixtures/fashion/data/profile.xml b/install/fixtures/fashion/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/data/profile.xml rename to install/fixtures/fashion/data/profile.xml diff --git a/installq/fixtures/fashion/img/c/Blouses-category_default.jpg b/install/fixtures/fashion/img/c/Blouses-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Blouses-category_default.jpg rename to install/fixtures/fashion/img/c/Blouses-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Blouses-medium_default.jpg b/install/fixtures/fashion/img/c/Blouses-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Blouses-medium_default.jpg rename to install/fixtures/fashion/img/c/Blouses-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Blouses.jpg b/install/fixtures/fashion/img/c/Blouses.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Blouses.jpg rename to install/fixtures/fashion/img/c/Blouses.jpg diff --git a/installq/fixtures/fashion/img/c/Casual_Dresses-category_default.jpg b/install/fixtures/fashion/img/c/Casual_Dresses-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Casual_Dresses-category_default.jpg rename to install/fixtures/fashion/img/c/Casual_Dresses-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Casual_Dresses-medium_default.jpg b/install/fixtures/fashion/img/c/Casual_Dresses-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Casual_Dresses-medium_default.jpg rename to install/fixtures/fashion/img/c/Casual_Dresses-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Casual_Dresses.jpg b/install/fixtures/fashion/img/c/Casual_Dresses.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Casual_Dresses.jpg rename to install/fixtures/fashion/img/c/Casual_Dresses.jpg diff --git a/installq/fixtures/fashion/img/c/Dresses-category_default.jpg b/install/fixtures/fashion/img/c/Dresses-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Dresses-category_default.jpg rename to install/fixtures/fashion/img/c/Dresses-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Dresses-medium_default.jpg b/install/fixtures/fashion/img/c/Dresses-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Dresses-medium_default.jpg rename to install/fixtures/fashion/img/c/Dresses-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Dresses.jpg b/install/fixtures/fashion/img/c/Dresses.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Dresses.jpg rename to install/fixtures/fashion/img/c/Dresses.jpg diff --git a/installq/fixtures/fashion/img/c/Evening_Dresses-category_default.jpg b/install/fixtures/fashion/img/c/Evening_Dresses-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Evening_Dresses-category_default.jpg rename to install/fixtures/fashion/img/c/Evening_Dresses-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Evening_Dresses-medium_default.jpg b/install/fixtures/fashion/img/c/Evening_Dresses-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Evening_Dresses-medium_default.jpg rename to install/fixtures/fashion/img/c/Evening_Dresses-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Evening_Dresses.jpg b/install/fixtures/fashion/img/c/Evening_Dresses.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Evening_Dresses.jpg rename to install/fixtures/fashion/img/c/Evening_Dresses.jpg diff --git a/installq/fixtures/fashion/img/c/Summer_Dresses-category_default.jpg b/install/fixtures/fashion/img/c/Summer_Dresses-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Summer_Dresses-category_default.jpg rename to install/fixtures/fashion/img/c/Summer_Dresses-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Summer_Dresses-medium_default.jpg b/install/fixtures/fashion/img/c/Summer_Dresses-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Summer_Dresses-medium_default.jpg rename to install/fixtures/fashion/img/c/Summer_Dresses-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Summer_Dresses.jpg b/install/fixtures/fashion/img/c/Summer_Dresses.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Summer_Dresses.jpg rename to install/fixtures/fashion/img/c/Summer_Dresses.jpg diff --git a/installq/fixtures/fashion/img/c/T-shirts-category_default.jpg b/install/fixtures/fashion/img/c/T-shirts-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/T-shirts-category_default.jpg rename to install/fixtures/fashion/img/c/T-shirts-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/T-shirts-medium_default.jpg b/install/fixtures/fashion/img/c/T-shirts-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/T-shirts-medium_default.jpg rename to install/fixtures/fashion/img/c/T-shirts-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/T-shirts.jpg b/install/fixtures/fashion/img/c/T-shirts.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/T-shirts.jpg rename to install/fixtures/fashion/img/c/T-shirts.jpg diff --git a/installq/fixtures/fashion/img/c/Tops-category_default.jpg b/install/fixtures/fashion/img/c/Tops-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops-category_default.jpg rename to install/fixtures/fashion/img/c/Tops-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Tops-medium_default.jpg b/install/fixtures/fashion/img/c/Tops-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops-medium_default.jpg rename to install/fixtures/fashion/img/c/Tops-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Tops.jpg b/install/fixtures/fashion/img/c/Tops.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops.jpg rename to install/fixtures/fashion/img/c/Tops.jpg diff --git a/installq/fixtures/fashion/img/c/Tops_1-category_default.jpg b/install/fixtures/fashion/img/c/Tops_1-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops_1-category_default.jpg rename to install/fixtures/fashion/img/c/Tops_1-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Tops_1-medium_default.jpg b/install/fixtures/fashion/img/c/Tops_1-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops_1-medium_default.jpg rename to install/fixtures/fashion/img/c/Tops_1-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Tops_1.jpg b/install/fixtures/fashion/img/c/Tops_1.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Tops_1.jpg rename to install/fixtures/fashion/img/c/Tops_1.jpg diff --git a/installq/fixtures/fashion/img/c/Women-category_default.jpg b/install/fixtures/fashion/img/c/Women-category_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Women-category_default.jpg rename to install/fixtures/fashion/img/c/Women-category_default.jpg diff --git a/installq/fixtures/fashion/img/c/Women-medium_default.jpg b/install/fixtures/fashion/img/c/Women-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Women-medium_default.jpg rename to install/fixtures/fashion/img/c/Women-medium_default.jpg diff --git a/installq/fixtures/fashion/img/c/Women.jpg b/install/fixtures/fashion/img/c/Women.jpg similarity index 100% rename from installq/fixtures/fashion/img/c/Women.jpg rename to install/fixtures/fashion/img/c/Women.jpg diff --git a/installq/fixtures/fashion/img/c/index.php b/install/fixtures/fashion/img/c/index.php similarity index 100% rename from installq/fixtures/fashion/img/c/index.php rename to install/fixtures/fashion/img/c/index.php diff --git a/installq/fixtures/fashion/img/c/resize.php b/install/fixtures/fashion/img/c/resize.php similarity index 100% rename from installq/fixtures/fashion/img/c/resize.php rename to install/fixtures/fashion/img/c/resize.php diff --git a/installq/fixtures/fashion/img/index.php b/install/fixtures/fashion/img/index.php similarity index 100% rename from installq/fixtures/fashion/img/index.php rename to install/fixtures/fashion/img/index.php diff --git a/installq/fixtures/fashion/img/m/Fashion_Manufacturer-large_default.jpg b/install/fixtures/fashion/img/m/Fashion_Manufacturer-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/m/Fashion_Manufacturer-large_default.jpg rename to install/fixtures/fashion/img/m/Fashion_Manufacturer-large_default.jpg diff --git a/installq/fixtures/fashion/img/m/Fashion_Manufacturer-medium_default.jpg b/install/fixtures/fashion/img/m/Fashion_Manufacturer-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/m/Fashion_Manufacturer-medium_default.jpg rename to install/fixtures/fashion/img/m/Fashion_Manufacturer-medium_default.jpg diff --git a/installq/fixtures/fashion/img/m/Fashion_Manufacturer-small_default.jpg b/install/fixtures/fashion/img/m/Fashion_Manufacturer-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/m/Fashion_Manufacturer-small_default.jpg rename to install/fixtures/fashion/img/m/Fashion_Manufacturer-small_default.jpg diff --git a/installq/fixtures/fashion/img/m/Fashion_Manufacturer.jpg b/install/fixtures/fashion/img/m/Fashion_Manufacturer.jpg similarity index 100% rename from installq/fixtures/fashion/img/m/Fashion_Manufacturer.jpg rename to install/fixtures/fashion/img/m/Fashion_Manufacturer.jpg diff --git a/installq/fixtures/fashion/img/m/index.php b/install/fixtures/fashion/img/m/index.php similarity index 100% rename from installq/fixtures/fashion/img/m/index.php rename to install/fixtures/fashion/img/m/index.php diff --git a/installq/fixtures/fashion/img/p/image_1-cart_default.jpg b/install/fixtures/fashion/img/p/image_1-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-cart_default.jpg rename to install/fixtures/fashion/img/p/image_1-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1-home_default.jpg b/install/fixtures/fashion/img/p/image_1-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-home_default.jpg rename to install/fixtures/fashion/img/p/image_1-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1-large_default.jpg b/install/fixtures/fashion/img/p/image_1-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-large_default.jpg rename to install/fixtures/fashion/img/p/image_1-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1-medium_default.jpg b/install/fixtures/fashion/img/p/image_1-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-medium_default.jpg rename to install/fixtures/fashion/img/p/image_1-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1-small_default.jpg b/install/fixtures/fashion/img/p/image_1-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-small_default.jpg rename to install/fixtures/fashion/img/p/image_1-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_1-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_1-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_1.jpg b/install/fixtures/fashion/img/p/image_1.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_1.jpg rename to install/fixtures/fashion/img/p/image_1.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-cart_default.jpg b/install/fixtures/fashion/img/p/image_10-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-cart_default.jpg rename to install/fixtures/fashion/img/p/image_10-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-home_default.jpg b/install/fixtures/fashion/img/p/image_10-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-home_default.jpg rename to install/fixtures/fashion/img/p/image_10-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-large_default.jpg b/install/fixtures/fashion/img/p/image_10-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-large_default.jpg rename to install/fixtures/fashion/img/p/image_10-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-medium_default.jpg b/install/fixtures/fashion/img/p/image_10-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-medium_default.jpg rename to install/fixtures/fashion/img/p/image_10-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-small_default.jpg b/install/fixtures/fashion/img/p/image_10-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-small_default.jpg rename to install/fixtures/fashion/img/p/image_10-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_10-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_10-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_10.jpg b/install/fixtures/fashion/img/p/image_10.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_10.jpg rename to install/fixtures/fashion/img/p/image_10.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-cart_default.jpg b/install/fixtures/fashion/img/p/image_11-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-cart_default.jpg rename to install/fixtures/fashion/img/p/image_11-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-home_default.jpg b/install/fixtures/fashion/img/p/image_11-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-home_default.jpg rename to install/fixtures/fashion/img/p/image_11-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-large_default.jpg b/install/fixtures/fashion/img/p/image_11-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-large_default.jpg rename to install/fixtures/fashion/img/p/image_11-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-medium_default.jpg b/install/fixtures/fashion/img/p/image_11-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-medium_default.jpg rename to install/fixtures/fashion/img/p/image_11-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-small_default.jpg b/install/fixtures/fashion/img/p/image_11-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-small_default.jpg rename to install/fixtures/fashion/img/p/image_11-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_11-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_11-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_11.jpg b/install/fixtures/fashion/img/p/image_11.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_11.jpg rename to install/fixtures/fashion/img/p/image_11.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-cart_default.jpg b/install/fixtures/fashion/img/p/image_12-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-cart_default.jpg rename to install/fixtures/fashion/img/p/image_12-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-home_default.jpg b/install/fixtures/fashion/img/p/image_12-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-home_default.jpg rename to install/fixtures/fashion/img/p/image_12-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-large_default.jpg b/install/fixtures/fashion/img/p/image_12-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-large_default.jpg rename to install/fixtures/fashion/img/p/image_12-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-medium_default.jpg b/install/fixtures/fashion/img/p/image_12-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-medium_default.jpg rename to install/fixtures/fashion/img/p/image_12-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-small_default.jpg b/install/fixtures/fashion/img/p/image_12-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-small_default.jpg rename to install/fixtures/fashion/img/p/image_12-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_12-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_12-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_12.jpg b/install/fixtures/fashion/img/p/image_12.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_12.jpg rename to install/fixtures/fashion/img/p/image_12.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-cart_default.jpg b/install/fixtures/fashion/img/p/image_13-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-cart_default.jpg rename to install/fixtures/fashion/img/p/image_13-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-home_default.jpg b/install/fixtures/fashion/img/p/image_13-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-home_default.jpg rename to install/fixtures/fashion/img/p/image_13-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-large_default.jpg b/install/fixtures/fashion/img/p/image_13-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-large_default.jpg rename to install/fixtures/fashion/img/p/image_13-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-medium_default.jpg b/install/fixtures/fashion/img/p/image_13-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-medium_default.jpg rename to install/fixtures/fashion/img/p/image_13-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-small_default.jpg b/install/fixtures/fashion/img/p/image_13-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-small_default.jpg rename to install/fixtures/fashion/img/p/image_13-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_13-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_13-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_13.jpg b/install/fixtures/fashion/img/p/image_13.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_13.jpg rename to install/fixtures/fashion/img/p/image_13.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-cart_default.jpg b/install/fixtures/fashion/img/p/image_14-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-cart_default.jpg rename to install/fixtures/fashion/img/p/image_14-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-home_default.jpg b/install/fixtures/fashion/img/p/image_14-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-home_default.jpg rename to install/fixtures/fashion/img/p/image_14-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-large_default.jpg b/install/fixtures/fashion/img/p/image_14-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-large_default.jpg rename to install/fixtures/fashion/img/p/image_14-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-medium_default.jpg b/install/fixtures/fashion/img/p/image_14-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-medium_default.jpg rename to install/fixtures/fashion/img/p/image_14-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-small_default.jpg b/install/fixtures/fashion/img/p/image_14-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-small_default.jpg rename to install/fixtures/fashion/img/p/image_14-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_14-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_14-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_14.jpg b/install/fixtures/fashion/img/p/image_14.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_14.jpg rename to install/fixtures/fashion/img/p/image_14.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-cart_default.jpg b/install/fixtures/fashion/img/p/image_15-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-cart_default.jpg rename to install/fixtures/fashion/img/p/image_15-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-home_default.jpg b/install/fixtures/fashion/img/p/image_15-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-home_default.jpg rename to install/fixtures/fashion/img/p/image_15-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-large_default.jpg b/install/fixtures/fashion/img/p/image_15-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-large_default.jpg rename to install/fixtures/fashion/img/p/image_15-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-medium_default.jpg b/install/fixtures/fashion/img/p/image_15-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-medium_default.jpg rename to install/fixtures/fashion/img/p/image_15-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-small_default.jpg b/install/fixtures/fashion/img/p/image_15-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-small_default.jpg rename to install/fixtures/fashion/img/p/image_15-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_15-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_15-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_15.jpg b/install/fixtures/fashion/img/p/image_15.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_15.jpg rename to install/fixtures/fashion/img/p/image_15.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-cart_default.jpg b/install/fixtures/fashion/img/p/image_16-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-cart_default.jpg rename to install/fixtures/fashion/img/p/image_16-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-home_default.jpg b/install/fixtures/fashion/img/p/image_16-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-home_default.jpg rename to install/fixtures/fashion/img/p/image_16-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-large_default.jpg b/install/fixtures/fashion/img/p/image_16-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-large_default.jpg rename to install/fixtures/fashion/img/p/image_16-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-medium_default.jpg b/install/fixtures/fashion/img/p/image_16-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-medium_default.jpg rename to install/fixtures/fashion/img/p/image_16-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-small_default.jpg b/install/fixtures/fashion/img/p/image_16-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-small_default.jpg rename to install/fixtures/fashion/img/p/image_16-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_16-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_16-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_16.jpg b/install/fixtures/fashion/img/p/image_16.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_16.jpg rename to install/fixtures/fashion/img/p/image_16.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-cart_default.jpg b/install/fixtures/fashion/img/p/image_17-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-cart_default.jpg rename to install/fixtures/fashion/img/p/image_17-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-home_default.jpg b/install/fixtures/fashion/img/p/image_17-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-home_default.jpg rename to install/fixtures/fashion/img/p/image_17-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-large_default.jpg b/install/fixtures/fashion/img/p/image_17-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-large_default.jpg rename to install/fixtures/fashion/img/p/image_17-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-medium_default.jpg b/install/fixtures/fashion/img/p/image_17-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-medium_default.jpg rename to install/fixtures/fashion/img/p/image_17-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-small_default.jpg b/install/fixtures/fashion/img/p/image_17-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-small_default.jpg rename to install/fixtures/fashion/img/p/image_17-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_17-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_17-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_17.jpg b/install/fixtures/fashion/img/p/image_17.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_17.jpg rename to install/fixtures/fashion/img/p/image_17.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-cart_default.jpg b/install/fixtures/fashion/img/p/image_18-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-cart_default.jpg rename to install/fixtures/fashion/img/p/image_18-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-home_default.jpg b/install/fixtures/fashion/img/p/image_18-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-home_default.jpg rename to install/fixtures/fashion/img/p/image_18-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-large_default.jpg b/install/fixtures/fashion/img/p/image_18-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-large_default.jpg rename to install/fixtures/fashion/img/p/image_18-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-medium_default.jpg b/install/fixtures/fashion/img/p/image_18-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-medium_default.jpg rename to install/fixtures/fashion/img/p/image_18-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-small_default.jpg b/install/fixtures/fashion/img/p/image_18-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-small_default.jpg rename to install/fixtures/fashion/img/p/image_18-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_18-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_18-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_18.jpg b/install/fixtures/fashion/img/p/image_18.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_18.jpg rename to install/fixtures/fashion/img/p/image_18.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-cart_default.jpg b/install/fixtures/fashion/img/p/image_19-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-cart_default.jpg rename to install/fixtures/fashion/img/p/image_19-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-home_default.jpg b/install/fixtures/fashion/img/p/image_19-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-home_default.jpg rename to install/fixtures/fashion/img/p/image_19-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-large_default.jpg b/install/fixtures/fashion/img/p/image_19-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-large_default.jpg rename to install/fixtures/fashion/img/p/image_19-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-medium_default.jpg b/install/fixtures/fashion/img/p/image_19-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-medium_default.jpg rename to install/fixtures/fashion/img/p/image_19-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-small_default.jpg b/install/fixtures/fashion/img/p/image_19-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-small_default.jpg rename to install/fixtures/fashion/img/p/image_19-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_19-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_19-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_19.jpg b/install/fixtures/fashion/img/p/image_19.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_19.jpg rename to install/fixtures/fashion/img/p/image_19.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-cart_default.jpg b/install/fixtures/fashion/img/p/image_2-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-cart_default.jpg rename to install/fixtures/fashion/img/p/image_2-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-home_default.jpg b/install/fixtures/fashion/img/p/image_2-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-home_default.jpg rename to install/fixtures/fashion/img/p/image_2-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-large_default.jpg b/install/fixtures/fashion/img/p/image_2-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-large_default.jpg rename to install/fixtures/fashion/img/p/image_2-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-medium_default.jpg b/install/fixtures/fashion/img/p/image_2-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-medium_default.jpg rename to install/fixtures/fashion/img/p/image_2-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-small_default.jpg b/install/fixtures/fashion/img/p/image_2-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-small_default.jpg rename to install/fixtures/fashion/img/p/image_2-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_2-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_2-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_2.jpg b/install/fixtures/fashion/img/p/image_2.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_2.jpg rename to install/fixtures/fashion/img/p/image_2.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-cart_default.jpg b/install/fixtures/fashion/img/p/image_20-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-cart_default.jpg rename to install/fixtures/fashion/img/p/image_20-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-home_default.jpg b/install/fixtures/fashion/img/p/image_20-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-home_default.jpg rename to install/fixtures/fashion/img/p/image_20-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-large_default.jpg b/install/fixtures/fashion/img/p/image_20-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-large_default.jpg rename to install/fixtures/fashion/img/p/image_20-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-medium_default.jpg b/install/fixtures/fashion/img/p/image_20-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-medium_default.jpg rename to install/fixtures/fashion/img/p/image_20-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-small_default.jpg b/install/fixtures/fashion/img/p/image_20-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-small_default.jpg rename to install/fixtures/fashion/img/p/image_20-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_20-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_20-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_20.jpg b/install/fixtures/fashion/img/p/image_20.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_20.jpg rename to install/fixtures/fashion/img/p/image_20.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-cart_default.jpg b/install/fixtures/fashion/img/p/image_21-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-cart_default.jpg rename to install/fixtures/fashion/img/p/image_21-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-home_default.jpg b/install/fixtures/fashion/img/p/image_21-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-home_default.jpg rename to install/fixtures/fashion/img/p/image_21-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-large_default.jpg b/install/fixtures/fashion/img/p/image_21-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-large_default.jpg rename to install/fixtures/fashion/img/p/image_21-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-medium_default.jpg b/install/fixtures/fashion/img/p/image_21-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-medium_default.jpg rename to install/fixtures/fashion/img/p/image_21-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-small_default.jpg b/install/fixtures/fashion/img/p/image_21-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-small_default.jpg rename to install/fixtures/fashion/img/p/image_21-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_21-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_21-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_21.jpg b/install/fixtures/fashion/img/p/image_21.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_21.jpg rename to install/fixtures/fashion/img/p/image_21.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-cart_default.jpg b/install/fixtures/fashion/img/p/image_22-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-cart_default.jpg rename to install/fixtures/fashion/img/p/image_22-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-home_default.jpg b/install/fixtures/fashion/img/p/image_22-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-home_default.jpg rename to install/fixtures/fashion/img/p/image_22-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-large_default.jpg b/install/fixtures/fashion/img/p/image_22-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-large_default.jpg rename to install/fixtures/fashion/img/p/image_22-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-medium_default.jpg b/install/fixtures/fashion/img/p/image_22-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-medium_default.jpg rename to install/fixtures/fashion/img/p/image_22-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-small_default.jpg b/install/fixtures/fashion/img/p/image_22-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-small_default.jpg rename to install/fixtures/fashion/img/p/image_22-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_22-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_22-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_22.jpg b/install/fixtures/fashion/img/p/image_22.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_22.jpg rename to install/fixtures/fashion/img/p/image_22.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-cart_default.jpg b/install/fixtures/fashion/img/p/image_23-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-cart_default.jpg rename to install/fixtures/fashion/img/p/image_23-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-home_default.jpg b/install/fixtures/fashion/img/p/image_23-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-home_default.jpg rename to install/fixtures/fashion/img/p/image_23-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-large_default.jpg b/install/fixtures/fashion/img/p/image_23-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-large_default.jpg rename to install/fixtures/fashion/img/p/image_23-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-medium_default.jpg b/install/fixtures/fashion/img/p/image_23-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-medium_default.jpg rename to install/fixtures/fashion/img/p/image_23-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-small_default.jpg b/install/fixtures/fashion/img/p/image_23-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-small_default.jpg rename to install/fixtures/fashion/img/p/image_23-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_23-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_23-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_23.jpg b/install/fixtures/fashion/img/p/image_23.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_23.jpg rename to install/fixtures/fashion/img/p/image_23.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-cart_default.jpg b/install/fixtures/fashion/img/p/image_3-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-cart_default.jpg rename to install/fixtures/fashion/img/p/image_3-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-home_default.jpg b/install/fixtures/fashion/img/p/image_3-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-home_default.jpg rename to install/fixtures/fashion/img/p/image_3-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-large_default.jpg b/install/fixtures/fashion/img/p/image_3-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-large_default.jpg rename to install/fixtures/fashion/img/p/image_3-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-medium_default.jpg b/install/fixtures/fashion/img/p/image_3-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-medium_default.jpg rename to install/fixtures/fashion/img/p/image_3-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-small_default.jpg b/install/fixtures/fashion/img/p/image_3-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-small_default.jpg rename to install/fixtures/fashion/img/p/image_3-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_3-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_3-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_3.jpg b/install/fixtures/fashion/img/p/image_3.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_3.jpg rename to install/fixtures/fashion/img/p/image_3.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-cart_default.jpg b/install/fixtures/fashion/img/p/image_4-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-cart_default.jpg rename to install/fixtures/fashion/img/p/image_4-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-home_default.jpg b/install/fixtures/fashion/img/p/image_4-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-home_default.jpg rename to install/fixtures/fashion/img/p/image_4-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-large_default.jpg b/install/fixtures/fashion/img/p/image_4-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-large_default.jpg rename to install/fixtures/fashion/img/p/image_4-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-medium_default.jpg b/install/fixtures/fashion/img/p/image_4-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-medium_default.jpg rename to install/fixtures/fashion/img/p/image_4-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-small_default.jpg b/install/fixtures/fashion/img/p/image_4-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-small_default.jpg rename to install/fixtures/fashion/img/p/image_4-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_4-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_4-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_4.jpg b/install/fixtures/fashion/img/p/image_4.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_4.jpg rename to install/fixtures/fashion/img/p/image_4.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-cart_default.jpg b/install/fixtures/fashion/img/p/image_5-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-cart_default.jpg rename to install/fixtures/fashion/img/p/image_5-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-home_default.jpg b/install/fixtures/fashion/img/p/image_5-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-home_default.jpg rename to install/fixtures/fashion/img/p/image_5-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-large_default.jpg b/install/fixtures/fashion/img/p/image_5-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-large_default.jpg rename to install/fixtures/fashion/img/p/image_5-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-medium_default.jpg b/install/fixtures/fashion/img/p/image_5-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-medium_default.jpg rename to install/fixtures/fashion/img/p/image_5-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-small_default.jpg b/install/fixtures/fashion/img/p/image_5-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-small_default.jpg rename to install/fixtures/fashion/img/p/image_5-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_5-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_5-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_5.jpg b/install/fixtures/fashion/img/p/image_5.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_5.jpg rename to install/fixtures/fashion/img/p/image_5.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-cart_default.jpg b/install/fixtures/fashion/img/p/image_6-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-cart_default.jpg rename to install/fixtures/fashion/img/p/image_6-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-home_default.jpg b/install/fixtures/fashion/img/p/image_6-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-home_default.jpg rename to install/fixtures/fashion/img/p/image_6-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-large_default.jpg b/install/fixtures/fashion/img/p/image_6-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-large_default.jpg rename to install/fixtures/fashion/img/p/image_6-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-medium_default.jpg b/install/fixtures/fashion/img/p/image_6-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-medium_default.jpg rename to install/fixtures/fashion/img/p/image_6-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-small_default.jpg b/install/fixtures/fashion/img/p/image_6-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-small_default.jpg rename to install/fixtures/fashion/img/p/image_6-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_6-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_6-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_6.jpg b/install/fixtures/fashion/img/p/image_6.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_6.jpg rename to install/fixtures/fashion/img/p/image_6.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-cart_default.jpg b/install/fixtures/fashion/img/p/image_7-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-cart_default.jpg rename to install/fixtures/fashion/img/p/image_7-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-home_default.jpg b/install/fixtures/fashion/img/p/image_7-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-home_default.jpg rename to install/fixtures/fashion/img/p/image_7-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-large_default.jpg b/install/fixtures/fashion/img/p/image_7-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-large_default.jpg rename to install/fixtures/fashion/img/p/image_7-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-medium_default.jpg b/install/fixtures/fashion/img/p/image_7-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-medium_default.jpg rename to install/fixtures/fashion/img/p/image_7-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-small_default.jpg b/install/fixtures/fashion/img/p/image_7-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-small_default.jpg rename to install/fixtures/fashion/img/p/image_7-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_7-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_7-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_7.jpg b/install/fixtures/fashion/img/p/image_7.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_7.jpg rename to install/fixtures/fashion/img/p/image_7.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-cart_default.jpg b/install/fixtures/fashion/img/p/image_8-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-cart_default.jpg rename to install/fixtures/fashion/img/p/image_8-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-home_default.jpg b/install/fixtures/fashion/img/p/image_8-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-home_default.jpg rename to install/fixtures/fashion/img/p/image_8-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-large_default.jpg b/install/fixtures/fashion/img/p/image_8-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-large_default.jpg rename to install/fixtures/fashion/img/p/image_8-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-medium_default.jpg b/install/fixtures/fashion/img/p/image_8-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-medium_default.jpg rename to install/fixtures/fashion/img/p/image_8-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-small_default.jpg b/install/fixtures/fashion/img/p/image_8-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-small_default.jpg rename to install/fixtures/fashion/img/p/image_8-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_8-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_8-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_8.jpg b/install/fixtures/fashion/img/p/image_8.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_8.jpg rename to install/fixtures/fashion/img/p/image_8.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-cart_default.jpg b/install/fixtures/fashion/img/p/image_9-cart_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-cart_default.jpg rename to install/fixtures/fashion/img/p/image_9-cart_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-home_default.jpg b/install/fixtures/fashion/img/p/image_9-home_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-home_default.jpg rename to install/fixtures/fashion/img/p/image_9-home_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-large_default.jpg b/install/fixtures/fashion/img/p/image_9-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-large_default.jpg rename to install/fixtures/fashion/img/p/image_9-large_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-medium_default.jpg b/install/fixtures/fashion/img/p/image_9-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-medium_default.jpg rename to install/fixtures/fashion/img/p/image_9-medium_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-small_default.jpg b/install/fixtures/fashion/img/p/image_9-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-small_default.jpg rename to install/fixtures/fashion/img/p/image_9-small_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9-thickbox_default.jpg b/install/fixtures/fashion/img/p/image_9-thickbox_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9-thickbox_default.jpg rename to install/fixtures/fashion/img/p/image_9-thickbox_default.jpg diff --git a/installq/fixtures/fashion/img/p/image_9.jpg b/install/fixtures/fashion/img/p/image_9.jpg similarity index 100% rename from installq/fixtures/fashion/img/p/image_9.jpg rename to install/fixtures/fashion/img/p/image_9.jpg diff --git a/installq/fixtures/fashion/img/p/index.php b/install/fixtures/fashion/img/p/index.php similarity index 100% rename from installq/fixtures/fashion/img/p/index.php rename to install/fixtures/fashion/img/p/index.php diff --git a/installq/fixtures/fashion/img/p/resize.php b/install/fixtures/fashion/img/p/resize.php similarity index 100% rename from installq/fixtures/fashion/img/p/resize.php rename to install/fixtures/fashion/img/p/resize.php diff --git a/installq/fixtures/fashion/img/scenes/index.php b/install/fixtures/fashion/img/scenes/index.php similarity index 100% rename from installq/fixtures/fashion/img/scenes/index.php rename to install/fixtures/fashion/img/scenes/index.php diff --git a/installq/fixtures/fashion/img/scenes/thumbs/index.php b/install/fixtures/fashion/img/scenes/thumbs/index.php similarity index 100% rename from installq/fixtures/fashion/img/scenes/thumbs/index.php rename to install/fixtures/fashion/img/scenes/thumbs/index.php diff --git a/installq/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg b/install/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg rename to install/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg diff --git a/installq/fixtures/fashion/img/st/Coconut_Grove.jpg b/install/fixtures/fashion/img/st/Coconut_Grove.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Coconut_Grove.jpg rename to install/fixtures/fashion/img/st/Coconut_Grove.jpg diff --git a/installq/fixtures/fashion/img/st/Dade_County-medium_default.jpg b/install/fixtures/fashion/img/st/Dade_County-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Dade_County-medium_default.jpg rename to install/fixtures/fashion/img/st/Dade_County-medium_default.jpg diff --git a/installq/fixtures/fashion/img/st/Dade_County.jpg b/install/fixtures/fashion/img/st/Dade_County.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Dade_County.jpg rename to install/fixtures/fashion/img/st/Dade_County.jpg diff --git a/installq/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg b/install/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg rename to install/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg diff --git a/installq/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg b/install/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg rename to install/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg diff --git a/installq/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg b/install/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg rename to install/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg diff --git a/installq/fixtures/fashion/img/st/N_Miami_Biscayne.jpg b/install/fixtures/fashion/img/st/N_Miami_Biscayne.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/N_Miami_Biscayne.jpg rename to install/fixtures/fashion/img/st/N_Miami_Biscayne.jpg diff --git a/installq/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg b/install/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg rename to install/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg diff --git a/installq/fixtures/fashion/img/st/Pembroke_Pines.jpg b/install/fixtures/fashion/img/st/Pembroke_Pines.jpg similarity index 100% rename from installq/fixtures/fashion/img/st/Pembroke_Pines.jpg rename to install/fixtures/fashion/img/st/Pembroke_Pines.jpg diff --git a/installq/fixtures/fashion/img/st/index.php b/install/fixtures/fashion/img/st/index.php similarity index 100% rename from installq/fixtures/fashion/img/st/index.php rename to install/fixtures/fashion/img/st/index.php diff --git a/installq/fixtures/fashion/img/su/Fashion_Supplier-large_default.jpg b/install/fixtures/fashion/img/su/Fashion_Supplier-large_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/su/Fashion_Supplier-large_default.jpg rename to install/fixtures/fashion/img/su/Fashion_Supplier-large_default.jpg diff --git a/installq/fixtures/fashion/img/su/Fashion_Supplier-medium_default.jpg b/install/fixtures/fashion/img/su/Fashion_Supplier-medium_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/su/Fashion_Supplier-medium_default.jpg rename to install/fixtures/fashion/img/su/Fashion_Supplier-medium_default.jpg diff --git a/installq/fixtures/fashion/img/su/Fashion_Supplier-small_default.jpg b/install/fixtures/fashion/img/su/Fashion_Supplier-small_default.jpg similarity index 100% rename from installq/fixtures/fashion/img/su/Fashion_Supplier-small_default.jpg rename to install/fixtures/fashion/img/su/Fashion_Supplier-small_default.jpg diff --git a/installq/fixtures/fashion/img/su/Fashion_Supplier.jpg b/install/fixtures/fashion/img/su/Fashion_Supplier.jpg similarity index 100% rename from installq/fixtures/fashion/img/su/Fashion_Supplier.jpg rename to install/fixtures/fashion/img/su/Fashion_Supplier.jpg diff --git a/installq/fixtures/fashion/img/su/index.php b/install/fixtures/fashion/img/su/index.php similarity index 100% rename from installq/fixtures/fashion/img/su/index.php rename to install/fixtures/fashion/img/su/index.php diff --git a/installq/fixtures/fashion/index.php b/install/fixtures/fashion/index.php similarity index 100% rename from installq/fixtures/fashion/index.php rename to install/fixtures/fashion/index.php diff --git a/installq/fixtures/fashion/install.php b/install/fixtures/fashion/install.php similarity index 100% rename from installq/fixtures/fashion/install.php rename to install/fixtures/fashion/install.php diff --git a/installq/fixtures/fashion/langs/bn/data/index.php b/install/fixtures/fashion/langs/bn/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/bn/data/index.php rename to install/fixtures/fashion/langs/bn/data/index.php diff --git a/installq/fixtures/fashion/langs/bn/data/profile.xml b/install/fixtures/fashion/langs/bn/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/bn/data/profile.xml rename to install/fixtures/fashion/langs/bn/data/profile.xml diff --git a/installq/fixtures/fashion/langs/bn/index.php b/install/fixtures/fashion/langs/bn/index.php similarity index 100% rename from installq/fixtures/fashion/langs/bn/index.php rename to install/fixtures/fashion/langs/bn/index.php diff --git a/installq/fixtures/fashion/langs/br/data/index.php b/install/fixtures/fashion/langs/br/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/br/data/index.php rename to install/fixtures/fashion/langs/br/data/index.php diff --git a/installq/fixtures/fashion/langs/br/data/profile.xml b/install/fixtures/fashion/langs/br/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/br/data/profile.xml rename to install/fixtures/fashion/langs/br/data/profile.xml diff --git a/installq/fixtures/fashion/langs/br/index.php b/install/fixtures/fashion/langs/br/index.php similarity index 100% rename from installq/fixtures/fashion/langs/br/index.php rename to install/fixtures/fashion/langs/br/index.php diff --git a/installq/fixtures/fashion/langs/de/data/index.php b/install/fixtures/fashion/langs/de/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/de/data/index.php rename to install/fixtures/fashion/langs/de/data/index.php diff --git a/installq/fixtures/fashion/langs/de/data/profile.xml b/install/fixtures/fashion/langs/de/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/de/data/profile.xml rename to install/fixtures/fashion/langs/de/data/profile.xml diff --git a/installq/fixtures/fashion/langs/de/index.php b/install/fixtures/fashion/langs/de/index.php similarity index 100% rename from installq/fixtures/fashion/langs/de/index.php rename to install/fixtures/fashion/langs/de/index.php diff --git a/installq/fixtures/fashion/langs/en/data/index.php b/install/fixtures/fashion/langs/en/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/en/data/index.php rename to install/fixtures/fashion/langs/en/data/index.php diff --git a/installq/fixtures/fashion/langs/en/data/profile.xml b/install/fixtures/fashion/langs/en/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/en/data/profile.xml rename to install/fixtures/fashion/langs/en/data/profile.xml diff --git a/installq/fixtures/fashion/langs/en/index.php b/install/fixtures/fashion/langs/en/index.php similarity index 100% rename from installq/fixtures/fashion/langs/en/index.php rename to install/fixtures/fashion/langs/en/index.php diff --git a/installq/fixtures/fashion/langs/es/data/index.php b/install/fixtures/fashion/langs/es/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/es/data/index.php rename to install/fixtures/fashion/langs/es/data/index.php diff --git a/installq/fixtures/fashion/langs/es/data/profile.xml b/install/fixtures/fashion/langs/es/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/es/data/profile.xml rename to install/fixtures/fashion/langs/es/data/profile.xml diff --git a/installq/fixtures/fashion/langs/es/index.php b/install/fixtures/fashion/langs/es/index.php similarity index 100% rename from installq/fixtures/fashion/langs/es/index.php rename to install/fixtures/fashion/langs/es/index.php diff --git a/installq/fixtures/fashion/langs/fa/data/index.php b/install/fixtures/fashion/langs/fa/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/fa/data/index.php rename to install/fixtures/fashion/langs/fa/data/index.php diff --git a/installq/fixtures/fashion/langs/fa/data/profile.xml b/install/fixtures/fashion/langs/fa/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/fa/data/profile.xml rename to install/fixtures/fashion/langs/fa/data/profile.xml diff --git a/installq/fixtures/fashion/langs/fa/index.php b/install/fixtures/fashion/langs/fa/index.php similarity index 100% rename from installq/fixtures/fashion/langs/fa/index.php rename to install/fixtures/fashion/langs/fa/index.php diff --git a/installq/fixtures/fashion/langs/fr/data/index.php b/install/fixtures/fashion/langs/fr/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/fr/data/index.php rename to install/fixtures/fashion/langs/fr/data/index.php diff --git a/installq/fixtures/fashion/langs/fr/data/profile.xml b/install/fixtures/fashion/langs/fr/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/fr/data/profile.xml rename to install/fixtures/fashion/langs/fr/data/profile.xml diff --git a/installq/fixtures/fashion/langs/fr/index.php b/install/fixtures/fashion/langs/fr/index.php similarity index 100% rename from installq/fixtures/fashion/langs/fr/index.php rename to install/fixtures/fashion/langs/fr/index.php diff --git a/installq/fixtures/fashion/langs/id/data/index.php b/install/fixtures/fashion/langs/id/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/id/data/index.php rename to install/fixtures/fashion/langs/id/data/index.php diff --git a/installq/fixtures/fashion/langs/id/data/profile.xml b/install/fixtures/fashion/langs/id/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/id/data/profile.xml rename to install/fixtures/fashion/langs/id/data/profile.xml diff --git a/installq/fixtures/fashion/langs/id/index.php b/install/fixtures/fashion/langs/id/index.php similarity index 100% rename from installq/fixtures/fashion/langs/id/index.php rename to install/fixtures/fashion/langs/id/index.php diff --git a/installq/fixtures/fashion/langs/index.php b/install/fixtures/fashion/langs/index.php similarity index 100% rename from installq/fixtures/fashion/langs/index.php rename to install/fixtures/fashion/langs/index.php diff --git a/installq/fixtures/fashion/langs/it/data/index.php b/install/fixtures/fashion/langs/it/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/it/data/index.php rename to install/fixtures/fashion/langs/it/data/index.php diff --git a/installq/fixtures/fashion/langs/it/data/profile.xml b/install/fixtures/fashion/langs/it/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/it/data/profile.xml rename to install/fixtures/fashion/langs/it/data/profile.xml diff --git a/installq/fixtures/fashion/langs/it/index.php b/install/fixtures/fashion/langs/it/index.php similarity index 100% rename from installq/fixtures/fashion/langs/it/index.php rename to install/fixtures/fashion/langs/it/index.php diff --git a/installq/fixtures/fashion/langs/nl/data/index.php b/install/fixtures/fashion/langs/nl/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/nl/data/index.php rename to install/fixtures/fashion/langs/nl/data/index.php diff --git a/installq/fixtures/fashion/langs/nl/data/profile.xml b/install/fixtures/fashion/langs/nl/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/nl/data/profile.xml rename to install/fixtures/fashion/langs/nl/data/profile.xml diff --git a/installq/fixtures/fashion/langs/nl/index.php b/install/fixtures/fashion/langs/nl/index.php similarity index 100% rename from installq/fixtures/fashion/langs/nl/index.php rename to install/fixtures/fashion/langs/nl/index.php diff --git a/installq/fixtures/fashion/langs/pl/data/index.php b/install/fixtures/fashion/langs/pl/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/pl/data/index.php rename to install/fixtures/fashion/langs/pl/data/index.php diff --git a/installq/fixtures/fashion/langs/pl/data/profile.xml b/install/fixtures/fashion/langs/pl/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/pl/data/profile.xml rename to install/fixtures/fashion/langs/pl/data/profile.xml diff --git a/installq/fixtures/fashion/langs/pl/index.php b/install/fixtures/fashion/langs/pl/index.php similarity index 100% rename from installq/fixtures/fashion/langs/pl/index.php rename to install/fixtures/fashion/langs/pl/index.php diff --git a/installq/fixtures/fashion/langs/qc/data/index.php b/install/fixtures/fashion/langs/qc/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/qc/data/index.php rename to install/fixtures/fashion/langs/qc/data/index.php diff --git a/installq/fixtures/fashion/langs/qc/data/profile.xml b/install/fixtures/fashion/langs/qc/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/qc/data/profile.xml rename to install/fixtures/fashion/langs/qc/data/profile.xml diff --git a/installq/fixtures/fashion/langs/qc/index.php b/install/fixtures/fashion/langs/qc/index.php similarity index 100% rename from installq/fixtures/fashion/langs/qc/index.php rename to install/fixtures/fashion/langs/qc/index.php diff --git a/installq/fixtures/fashion/langs/ro/data/index.php b/install/fixtures/fashion/langs/ro/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/ro/data/index.php rename to install/fixtures/fashion/langs/ro/data/index.php diff --git a/installq/fixtures/fashion/langs/ro/data/profile.xml b/install/fixtures/fashion/langs/ro/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/ro/data/profile.xml rename to install/fixtures/fashion/langs/ro/data/profile.xml diff --git a/installq/fixtures/fashion/langs/ro/index.php b/install/fixtures/fashion/langs/ro/index.php similarity index 100% rename from installq/fixtures/fashion/langs/ro/index.php rename to install/fixtures/fashion/langs/ro/index.php diff --git a/installq/fixtures/fashion/langs/ru/data/index.php b/install/fixtures/fashion/langs/ru/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/ru/data/index.php rename to install/fixtures/fashion/langs/ru/data/index.php diff --git a/installq/fixtures/fashion/langs/ru/data/profile.xml b/install/fixtures/fashion/langs/ru/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/ru/data/profile.xml rename to install/fixtures/fashion/langs/ru/data/profile.xml diff --git a/installq/fixtures/fashion/langs/ru/index.php b/install/fixtures/fashion/langs/ru/index.php similarity index 100% rename from installq/fixtures/fashion/langs/ru/index.php rename to install/fixtures/fashion/langs/ru/index.php diff --git a/installq/fixtures/fashion/langs/tw/data/index.php b/install/fixtures/fashion/langs/tw/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/tw/data/index.php rename to install/fixtures/fashion/langs/tw/data/index.php diff --git a/installq/fixtures/fashion/langs/tw/data/profile.xml b/install/fixtures/fashion/langs/tw/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/tw/data/profile.xml rename to install/fixtures/fashion/langs/tw/data/profile.xml diff --git a/installq/fixtures/fashion/langs/tw/index.php b/install/fixtures/fashion/langs/tw/index.php similarity index 100% rename from installq/fixtures/fashion/langs/tw/index.php rename to install/fixtures/fashion/langs/tw/index.php diff --git a/installq/fixtures/fashion/langs/vn/data/index.php b/install/fixtures/fashion/langs/vn/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/vn/data/index.php rename to install/fixtures/fashion/langs/vn/data/index.php diff --git a/installq/fixtures/fashion/langs/vn/data/profile.xml b/install/fixtures/fashion/langs/vn/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/vn/data/profile.xml rename to install/fixtures/fashion/langs/vn/data/profile.xml diff --git a/installq/fixtures/fashion/langs/vn/index.php b/install/fixtures/fashion/langs/vn/index.php similarity index 100% rename from installq/fixtures/fashion/langs/vn/index.php rename to install/fixtures/fashion/langs/vn/index.php diff --git a/installq/fixtures/fashion/langs/zh/data/index.php b/install/fixtures/fashion/langs/zh/data/index.php similarity index 100% rename from installq/fixtures/fashion/langs/zh/data/index.php rename to install/fixtures/fashion/langs/zh/data/index.php diff --git a/installq/fixtures/fashion/langs/zh/data/profile.xml b/install/fixtures/fashion/langs/zh/data/profile.xml similarity index 100% rename from installq/fixtures/fashion/langs/zh/data/profile.xml rename to install/fixtures/fashion/langs/zh/data/profile.xml diff --git a/installq/fixtures/fashion/langs/zh/index.php b/install/fixtures/fashion/langs/zh/index.php similarity index 100% rename from installq/fixtures/fashion/langs/zh/index.php rename to install/fixtures/fashion/langs/zh/index.php diff --git a/installq/fixtures/index.php b/install/fixtures/index.php similarity index 100% rename from installq/fixtures/index.php rename to install/fixtures/index.php diff --git a/installq/index.php b/install/index.php similarity index 100% rename from installq/index.php rename to install/index.php diff --git a/installq/index_cli.php b/install/index_cli.php similarity index 100% rename from installq/index_cli.php rename to install/index_cli.php diff --git a/installq/init.php b/install/init.php similarity index 100% rename from installq/init.php rename to install/init.php diff --git a/installq/install_version.php b/install/install_version.php similarity index 100% rename from installq/install_version.php rename to install/install_version.php diff --git a/installq/langs/bg/data/carrier.xml b/install/langs/bg/data/carrier.xml similarity index 100% rename from installq/langs/bg/data/carrier.xml rename to install/langs/bg/data/carrier.xml diff --git a/installq/langs/bg/data/category.xml b/install/langs/bg/data/category.xml similarity index 100% rename from installq/langs/bg/data/category.xml rename to install/langs/bg/data/category.xml diff --git a/installq/langs/bg/data/cms.xml b/install/langs/bg/data/cms.xml similarity index 100% rename from installq/langs/bg/data/cms.xml rename to install/langs/bg/data/cms.xml diff --git a/installq/langs/bg/data/cms_category.xml b/install/langs/bg/data/cms_category.xml similarity index 100% rename from installq/langs/bg/data/cms_category.xml rename to install/langs/bg/data/cms_category.xml diff --git a/installq/langs/bg/data/configuration.xml b/install/langs/bg/data/configuration.xml similarity index 100% rename from installq/langs/bg/data/configuration.xml rename to install/langs/bg/data/configuration.xml diff --git a/installq/langs/bg/data/contact.xml b/install/langs/bg/data/contact.xml similarity index 100% rename from installq/langs/bg/data/contact.xml rename to install/langs/bg/data/contact.xml diff --git a/installq/langs/bg/data/country.xml b/install/langs/bg/data/country.xml similarity index 100% rename from installq/langs/bg/data/country.xml rename to install/langs/bg/data/country.xml diff --git a/installq/langs/bg/data/gender.xml b/install/langs/bg/data/gender.xml similarity index 100% rename from installq/langs/bg/data/gender.xml rename to install/langs/bg/data/gender.xml diff --git a/installq/langs/bg/data/group.xml b/install/langs/bg/data/group.xml similarity index 100% rename from installq/langs/bg/data/group.xml rename to install/langs/bg/data/group.xml diff --git a/installq/langs/bg/data/index.php b/install/langs/bg/data/index.php similarity index 100% rename from installq/langs/bg/data/index.php rename to install/langs/bg/data/index.php diff --git a/installq/langs/bg/data/meta.xml b/install/langs/bg/data/meta.xml similarity index 100% rename from installq/langs/bg/data/meta.xml rename to install/langs/bg/data/meta.xml diff --git a/installq/langs/bg/data/order_return_state.xml b/install/langs/bg/data/order_return_state.xml similarity index 100% rename from installq/langs/bg/data/order_return_state.xml rename to install/langs/bg/data/order_return_state.xml diff --git a/installq/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml similarity index 100% rename from installq/langs/bg/data/order_state.xml rename to install/langs/bg/data/order_state.xml diff --git a/installq/langs/bg/data/profile.xml b/install/langs/bg/data/profile.xml similarity index 100% rename from installq/langs/bg/data/profile.xml rename to install/langs/bg/data/profile.xml diff --git a/installq/langs/bg/data/quick_access.xml b/install/langs/bg/data/quick_access.xml similarity index 100% rename from installq/langs/bg/data/quick_access.xml rename to install/langs/bg/data/quick_access.xml diff --git a/installq/langs/bg/data/risk.xml b/install/langs/bg/data/risk.xml similarity index 100% rename from installq/langs/bg/data/risk.xml rename to install/langs/bg/data/risk.xml diff --git a/installq/langs/bg/data/stock_mvt_reason.xml b/install/langs/bg/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/bg/data/stock_mvt_reason.xml rename to install/langs/bg/data/stock_mvt_reason.xml diff --git a/installq/langs/bg/data/supplier_order_state.xml b/install/langs/bg/data/supplier_order_state.xml similarity index 100% rename from installq/langs/bg/data/supplier_order_state.xml rename to install/langs/bg/data/supplier_order_state.xml diff --git a/installq/langs/bg/data/supply_order_state.xml b/install/langs/bg/data/supply_order_state.xml similarity index 100% rename from installq/langs/bg/data/supply_order_state.xml rename to install/langs/bg/data/supply_order_state.xml diff --git a/installq/langs/bg/data/tab.xml b/install/langs/bg/data/tab.xml similarity index 100% rename from installq/langs/bg/data/tab.xml rename to install/langs/bg/data/tab.xml diff --git a/installq/langs/bg/flag.jpg b/install/langs/bg/flag.jpg similarity index 100% rename from installq/langs/bg/flag.jpg rename to install/langs/bg/flag.jpg diff --git a/installq/langs/bg/img/bg-default-category.jpg b/install/langs/bg/img/bg-default-category.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-category.jpg rename to install/langs/bg/img/bg-default-category.jpg diff --git a/installq/langs/bg/img/bg-default-home.jpg b/install/langs/bg/img/bg-default-home.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-home.jpg rename to install/langs/bg/img/bg-default-home.jpg diff --git a/installq/langs/bg/img/bg-default-large.jpg b/install/langs/bg/img/bg-default-large.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-large.jpg rename to install/langs/bg/img/bg-default-large.jpg diff --git a/installq/langs/bg/img/bg-default-large_scene.jpg b/install/langs/bg/img/bg-default-large_scene.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-large_scene.jpg rename to install/langs/bg/img/bg-default-large_scene.jpg diff --git a/installq/langs/bg/img/bg-default-medium.jpg b/install/langs/bg/img/bg-default-medium.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-medium.jpg rename to install/langs/bg/img/bg-default-medium.jpg diff --git a/installq/langs/bg/img/bg-default-small.jpg b/install/langs/bg/img/bg-default-small.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-small.jpg rename to install/langs/bg/img/bg-default-small.jpg diff --git a/installq/langs/bg/img/bg-default-thickbox.jpg b/install/langs/bg/img/bg-default-thickbox.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-thickbox.jpg rename to install/langs/bg/img/bg-default-thickbox.jpg diff --git a/installq/langs/bg/img/bg-default-thumb_scene.jpg b/install/langs/bg/img/bg-default-thumb_scene.jpg similarity index 100% rename from installq/langs/bg/img/bg-default-thumb_scene.jpg rename to install/langs/bg/img/bg-default-thumb_scene.jpg diff --git a/installq/langs/bg/img/bg.jpg b/install/langs/bg/img/bg.jpg similarity index 100% rename from installq/langs/bg/img/bg.jpg rename to install/langs/bg/img/bg.jpg diff --git a/installq/langs/bg/img/index.php b/install/langs/bg/img/index.php similarity index 100% rename from installq/langs/bg/img/index.php rename to install/langs/bg/img/index.php diff --git a/installq/langs/bg/index.php b/install/langs/bg/index.php similarity index 100% rename from installq/langs/bg/index.php rename to install/langs/bg/index.php diff --git a/installq/langs/bg/install.php b/install/langs/bg/install.php similarity index 100% rename from installq/langs/bg/install.php rename to install/langs/bg/install.php diff --git a/installq/langs/bg/language.xml b/install/langs/bg/language.xml similarity index 100% rename from installq/langs/bg/language.xml rename to install/langs/bg/language.xml diff --git a/installq/langs/bg/mail_identifiers.txt b/install/langs/bg/mail_identifiers.txt similarity index 100% rename from installq/langs/bg/mail_identifiers.txt rename to install/langs/bg/mail_identifiers.txt diff --git a/installq/langs/bn/data/carrier.xml b/install/langs/bn/data/carrier.xml similarity index 100% rename from installq/langs/bn/data/carrier.xml rename to install/langs/bn/data/carrier.xml diff --git a/installq/langs/bn/data/category.xml b/install/langs/bn/data/category.xml similarity index 100% rename from installq/langs/bn/data/category.xml rename to install/langs/bn/data/category.xml diff --git a/installq/langs/bn/data/cms.xml b/install/langs/bn/data/cms.xml similarity index 100% rename from installq/langs/bn/data/cms.xml rename to install/langs/bn/data/cms.xml diff --git a/installq/langs/bn/data/cms_category.xml b/install/langs/bn/data/cms_category.xml similarity index 100% rename from installq/langs/bn/data/cms_category.xml rename to install/langs/bn/data/cms_category.xml diff --git a/installq/langs/bn/data/configuration.xml b/install/langs/bn/data/configuration.xml similarity index 100% rename from installq/langs/bn/data/configuration.xml rename to install/langs/bn/data/configuration.xml diff --git a/installq/langs/bn/data/contact.xml b/install/langs/bn/data/contact.xml similarity index 100% rename from installq/langs/bn/data/contact.xml rename to install/langs/bn/data/contact.xml diff --git a/installq/langs/bn/data/country.xml b/install/langs/bn/data/country.xml similarity index 100% rename from installq/langs/bn/data/country.xml rename to install/langs/bn/data/country.xml diff --git a/installq/langs/bn/data/gender.xml b/install/langs/bn/data/gender.xml similarity index 100% rename from installq/langs/bn/data/gender.xml rename to install/langs/bn/data/gender.xml diff --git a/installq/langs/bn/data/group.xml b/install/langs/bn/data/group.xml similarity index 100% rename from installq/langs/bn/data/group.xml rename to install/langs/bn/data/group.xml diff --git a/installq/langs/bn/data/index.php b/install/langs/bn/data/index.php similarity index 100% rename from installq/langs/bn/data/index.php rename to install/langs/bn/data/index.php diff --git a/installq/langs/bn/data/meta.xml b/install/langs/bn/data/meta.xml similarity index 100% rename from installq/langs/bn/data/meta.xml rename to install/langs/bn/data/meta.xml diff --git a/installq/langs/bn/data/order_return_state.xml b/install/langs/bn/data/order_return_state.xml similarity index 100% rename from installq/langs/bn/data/order_return_state.xml rename to install/langs/bn/data/order_return_state.xml diff --git a/installq/langs/bn/data/order_state.xml b/install/langs/bn/data/order_state.xml similarity index 100% rename from installq/langs/bn/data/order_state.xml rename to install/langs/bn/data/order_state.xml diff --git a/installq/langs/bn/data/profile.xml b/install/langs/bn/data/profile.xml similarity index 100% rename from installq/langs/bn/data/profile.xml rename to install/langs/bn/data/profile.xml diff --git a/installq/langs/bn/data/quick_access.xml b/install/langs/bn/data/quick_access.xml similarity index 100% rename from installq/langs/bn/data/quick_access.xml rename to install/langs/bn/data/quick_access.xml diff --git a/installq/langs/bn/data/risk.xml b/install/langs/bn/data/risk.xml similarity index 100% rename from installq/langs/bn/data/risk.xml rename to install/langs/bn/data/risk.xml diff --git a/installq/langs/bn/data/stock_mvt_reason.xml b/install/langs/bn/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/bn/data/stock_mvt_reason.xml rename to install/langs/bn/data/stock_mvt_reason.xml diff --git a/installq/langs/bn/data/supplier_order_state.xml b/install/langs/bn/data/supplier_order_state.xml similarity index 100% rename from installq/langs/bn/data/supplier_order_state.xml rename to install/langs/bn/data/supplier_order_state.xml diff --git a/installq/langs/bn/data/supply_order_state.xml b/install/langs/bn/data/supply_order_state.xml similarity index 100% rename from installq/langs/bn/data/supply_order_state.xml rename to install/langs/bn/data/supply_order_state.xml diff --git a/installq/langs/bn/data/tab.xml b/install/langs/bn/data/tab.xml similarity index 100% rename from installq/langs/bn/data/tab.xml rename to install/langs/bn/data/tab.xml diff --git a/installq/langs/bn/flag.jpg b/install/langs/bn/flag.jpg similarity index 100% rename from installq/langs/bn/flag.jpg rename to install/langs/bn/flag.jpg diff --git a/installq/langs/bn/img/bn-default-category.jpg b/install/langs/bn/img/bn-default-category.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-category.jpg rename to install/langs/bn/img/bn-default-category.jpg diff --git a/installq/langs/bn/img/bn-default-home.jpg b/install/langs/bn/img/bn-default-home.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-home.jpg rename to install/langs/bn/img/bn-default-home.jpg diff --git a/installq/langs/bn/img/bn-default-large.jpg b/install/langs/bn/img/bn-default-large.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-large.jpg rename to install/langs/bn/img/bn-default-large.jpg diff --git a/installq/langs/bn/img/bn-default-large_scene.jpg b/install/langs/bn/img/bn-default-large_scene.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-large_scene.jpg rename to install/langs/bn/img/bn-default-large_scene.jpg diff --git a/installq/langs/bn/img/bn-default-medium.jpg b/install/langs/bn/img/bn-default-medium.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-medium.jpg rename to install/langs/bn/img/bn-default-medium.jpg diff --git a/installq/langs/bn/img/bn-default-small.jpg b/install/langs/bn/img/bn-default-small.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-small.jpg rename to install/langs/bn/img/bn-default-small.jpg diff --git a/installq/langs/bn/img/bn-default-thickbox.jpg b/install/langs/bn/img/bn-default-thickbox.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-thickbox.jpg rename to install/langs/bn/img/bn-default-thickbox.jpg diff --git a/installq/langs/bn/img/bn-default-thumb_scene.jpg b/install/langs/bn/img/bn-default-thumb_scene.jpg similarity index 100% rename from installq/langs/bn/img/bn-default-thumb_scene.jpg rename to install/langs/bn/img/bn-default-thumb_scene.jpg diff --git a/installq/langs/bn/img/bn.jpg b/install/langs/bn/img/bn.jpg similarity index 100% rename from installq/langs/bn/img/bn.jpg rename to install/langs/bn/img/bn.jpg diff --git a/installq/langs/bn/img/index.php b/install/langs/bn/img/index.php similarity index 100% rename from installq/langs/bn/img/index.php rename to install/langs/bn/img/index.php diff --git a/installq/langs/bn/index.php b/install/langs/bn/index.php similarity index 100% rename from installq/langs/bn/index.php rename to install/langs/bn/index.php diff --git a/installq/langs/bn/install.php b/install/langs/bn/install.php similarity index 100% rename from installq/langs/bn/install.php rename to install/langs/bn/install.php diff --git a/installq/langs/bn/language.xml b/install/langs/bn/language.xml similarity index 100% rename from installq/langs/bn/language.xml rename to install/langs/bn/language.xml diff --git a/installq/langs/bn/mail_identifiers.txt b/install/langs/bn/mail_identifiers.txt similarity index 100% rename from installq/langs/bn/mail_identifiers.txt rename to install/langs/bn/mail_identifiers.txt diff --git a/installq/langs/br/data/carrier.xml b/install/langs/br/data/carrier.xml similarity index 100% rename from installq/langs/br/data/carrier.xml rename to install/langs/br/data/carrier.xml diff --git a/installq/langs/br/data/category.xml b/install/langs/br/data/category.xml similarity index 100% rename from installq/langs/br/data/category.xml rename to install/langs/br/data/category.xml diff --git a/installq/langs/br/data/cms.xml b/install/langs/br/data/cms.xml similarity index 100% rename from installq/langs/br/data/cms.xml rename to install/langs/br/data/cms.xml diff --git a/installq/langs/br/data/cms_category.xml b/install/langs/br/data/cms_category.xml similarity index 100% rename from installq/langs/br/data/cms_category.xml rename to install/langs/br/data/cms_category.xml diff --git a/installq/langs/br/data/configuration.xml b/install/langs/br/data/configuration.xml similarity index 100% rename from installq/langs/br/data/configuration.xml rename to install/langs/br/data/configuration.xml diff --git a/installq/langs/br/data/contact.xml b/install/langs/br/data/contact.xml similarity index 100% rename from installq/langs/br/data/contact.xml rename to install/langs/br/data/contact.xml diff --git a/installq/langs/br/data/country.xml b/install/langs/br/data/country.xml similarity index 100% rename from installq/langs/br/data/country.xml rename to install/langs/br/data/country.xml diff --git a/installq/langs/br/data/gender.xml b/install/langs/br/data/gender.xml similarity index 100% rename from installq/langs/br/data/gender.xml rename to install/langs/br/data/gender.xml diff --git a/installq/langs/br/data/group.xml b/install/langs/br/data/group.xml similarity index 100% rename from installq/langs/br/data/group.xml rename to install/langs/br/data/group.xml diff --git a/installq/langs/br/data/index.php b/install/langs/br/data/index.php similarity index 100% rename from installq/langs/br/data/index.php rename to install/langs/br/data/index.php diff --git a/installq/langs/br/data/meta.xml b/install/langs/br/data/meta.xml similarity index 100% rename from installq/langs/br/data/meta.xml rename to install/langs/br/data/meta.xml diff --git a/installq/langs/br/data/order_return_state.xml b/install/langs/br/data/order_return_state.xml similarity index 100% rename from installq/langs/br/data/order_return_state.xml rename to install/langs/br/data/order_return_state.xml diff --git a/installq/langs/br/data/order_state.xml b/install/langs/br/data/order_state.xml similarity index 100% rename from installq/langs/br/data/order_state.xml rename to install/langs/br/data/order_state.xml diff --git a/installq/langs/br/data/profile.xml b/install/langs/br/data/profile.xml similarity index 100% rename from installq/langs/br/data/profile.xml rename to install/langs/br/data/profile.xml diff --git a/installq/langs/br/data/quick_access.xml b/install/langs/br/data/quick_access.xml similarity index 100% rename from installq/langs/br/data/quick_access.xml rename to install/langs/br/data/quick_access.xml diff --git a/installq/langs/br/data/risk.xml b/install/langs/br/data/risk.xml similarity index 100% rename from installq/langs/br/data/risk.xml rename to install/langs/br/data/risk.xml diff --git a/installq/langs/br/data/stock_mvt_reason.xml b/install/langs/br/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/br/data/stock_mvt_reason.xml rename to install/langs/br/data/stock_mvt_reason.xml diff --git a/installq/langs/br/data/supplier_order_state.xml b/install/langs/br/data/supplier_order_state.xml similarity index 100% rename from installq/langs/br/data/supplier_order_state.xml rename to install/langs/br/data/supplier_order_state.xml diff --git a/installq/langs/br/data/supply_order_state.xml b/install/langs/br/data/supply_order_state.xml similarity index 100% rename from installq/langs/br/data/supply_order_state.xml rename to install/langs/br/data/supply_order_state.xml diff --git a/installq/langs/br/data/tab.xml b/install/langs/br/data/tab.xml similarity index 100% rename from installq/langs/br/data/tab.xml rename to install/langs/br/data/tab.xml diff --git a/installq/langs/br/flag.jpg b/install/langs/br/flag.jpg similarity index 100% rename from installq/langs/br/flag.jpg rename to install/langs/br/flag.jpg diff --git a/installq/langs/br/img/br-default-category.jpg b/install/langs/br/img/br-default-category.jpg similarity index 100% rename from installq/langs/br/img/br-default-category.jpg rename to install/langs/br/img/br-default-category.jpg diff --git a/installq/langs/br/img/br-default-home.jpg b/install/langs/br/img/br-default-home.jpg similarity index 100% rename from installq/langs/br/img/br-default-home.jpg rename to install/langs/br/img/br-default-home.jpg diff --git a/installq/langs/br/img/br-default-large.jpg b/install/langs/br/img/br-default-large.jpg similarity index 100% rename from installq/langs/br/img/br-default-large.jpg rename to install/langs/br/img/br-default-large.jpg diff --git a/installq/langs/br/img/br-default-large_scene.jpg b/install/langs/br/img/br-default-large_scene.jpg similarity index 100% rename from installq/langs/br/img/br-default-large_scene.jpg rename to install/langs/br/img/br-default-large_scene.jpg diff --git a/installq/langs/br/img/br-default-medium.jpg b/install/langs/br/img/br-default-medium.jpg similarity index 100% rename from installq/langs/br/img/br-default-medium.jpg rename to install/langs/br/img/br-default-medium.jpg diff --git a/installq/langs/br/img/br-default-small.jpg b/install/langs/br/img/br-default-small.jpg similarity index 100% rename from installq/langs/br/img/br-default-small.jpg rename to install/langs/br/img/br-default-small.jpg diff --git a/installq/langs/br/img/br-default-thickbox.jpg b/install/langs/br/img/br-default-thickbox.jpg similarity index 100% rename from installq/langs/br/img/br-default-thickbox.jpg rename to install/langs/br/img/br-default-thickbox.jpg diff --git a/installq/langs/br/img/br-default-thumb_scene.jpg b/install/langs/br/img/br-default-thumb_scene.jpg similarity index 100% rename from installq/langs/br/img/br-default-thumb_scene.jpg rename to install/langs/br/img/br-default-thumb_scene.jpg diff --git a/installq/langs/br/img/br.jpg b/install/langs/br/img/br.jpg similarity index 100% rename from installq/langs/br/img/br.jpg rename to install/langs/br/img/br.jpg diff --git a/installq/langs/br/img/index.php b/install/langs/br/img/index.php similarity index 100% rename from installq/langs/br/img/index.php rename to install/langs/br/img/index.php diff --git a/installq/langs/br/index.php b/install/langs/br/index.php similarity index 100% rename from installq/langs/br/index.php rename to install/langs/br/index.php diff --git a/installq/langs/br/install.php b/install/langs/br/install.php similarity index 100% rename from installq/langs/br/install.php rename to install/langs/br/install.php diff --git a/installq/langs/br/language.xml b/install/langs/br/language.xml similarity index 100% rename from installq/langs/br/language.xml rename to install/langs/br/language.xml diff --git a/installq/langs/br/mail_identifiers.txt b/install/langs/br/mail_identifiers.txt similarity index 100% rename from installq/langs/br/mail_identifiers.txt rename to install/langs/br/mail_identifiers.txt diff --git a/installq/langs/ca/flag.jpg b/install/langs/ca/flag.jpg similarity index 100% rename from installq/langs/ca/flag.jpg rename to install/langs/ca/flag.jpg diff --git a/installq/langs/ca/index.php b/install/langs/ca/index.php similarity index 100% rename from installq/langs/ca/index.php rename to install/langs/ca/index.php diff --git a/installq/langs/ca/install.php b/install/langs/ca/install.php similarity index 100% rename from installq/langs/ca/install.php rename to install/langs/ca/install.php diff --git a/installq/langs/ca/language.xml b/install/langs/ca/language.xml similarity index 100% rename from installq/langs/ca/language.xml rename to install/langs/ca/language.xml diff --git a/installq/langs/cs/data/carrier.xml b/install/langs/cs/data/carrier.xml similarity index 100% rename from installq/langs/cs/data/carrier.xml rename to install/langs/cs/data/carrier.xml diff --git a/installq/langs/cs/data/category.xml b/install/langs/cs/data/category.xml similarity index 100% rename from installq/langs/cs/data/category.xml rename to install/langs/cs/data/category.xml diff --git a/installq/langs/cs/data/cms.xml b/install/langs/cs/data/cms.xml similarity index 100% rename from installq/langs/cs/data/cms.xml rename to install/langs/cs/data/cms.xml diff --git a/installq/langs/cs/data/cms_category.xml b/install/langs/cs/data/cms_category.xml similarity index 100% rename from installq/langs/cs/data/cms_category.xml rename to install/langs/cs/data/cms_category.xml diff --git a/installq/langs/cs/data/configuration.xml b/install/langs/cs/data/configuration.xml similarity index 100% rename from installq/langs/cs/data/configuration.xml rename to install/langs/cs/data/configuration.xml diff --git a/installq/langs/cs/data/contact.xml b/install/langs/cs/data/contact.xml similarity index 100% rename from installq/langs/cs/data/contact.xml rename to install/langs/cs/data/contact.xml diff --git a/installq/langs/cs/data/country.xml b/install/langs/cs/data/country.xml similarity index 100% rename from installq/langs/cs/data/country.xml rename to install/langs/cs/data/country.xml diff --git a/installq/langs/cs/data/gender.xml b/install/langs/cs/data/gender.xml similarity index 100% rename from installq/langs/cs/data/gender.xml rename to install/langs/cs/data/gender.xml diff --git a/installq/langs/cs/data/group.xml b/install/langs/cs/data/group.xml similarity index 100% rename from installq/langs/cs/data/group.xml rename to install/langs/cs/data/group.xml diff --git a/installq/langs/cs/data/index.php b/install/langs/cs/data/index.php similarity index 100% rename from installq/langs/cs/data/index.php rename to install/langs/cs/data/index.php diff --git a/installq/langs/cs/data/meta.xml b/install/langs/cs/data/meta.xml similarity index 100% rename from installq/langs/cs/data/meta.xml rename to install/langs/cs/data/meta.xml diff --git a/installq/langs/cs/data/order_return_state.xml b/install/langs/cs/data/order_return_state.xml similarity index 100% rename from installq/langs/cs/data/order_return_state.xml rename to install/langs/cs/data/order_return_state.xml diff --git a/installq/langs/cs/data/order_state.xml b/install/langs/cs/data/order_state.xml similarity index 100% rename from installq/langs/cs/data/order_state.xml rename to install/langs/cs/data/order_state.xml diff --git a/installq/langs/cs/data/profile.xml b/install/langs/cs/data/profile.xml similarity index 100% rename from installq/langs/cs/data/profile.xml rename to install/langs/cs/data/profile.xml diff --git a/installq/langs/cs/data/quick_access.xml b/install/langs/cs/data/quick_access.xml similarity index 100% rename from installq/langs/cs/data/quick_access.xml rename to install/langs/cs/data/quick_access.xml diff --git a/installq/langs/cs/data/risk.xml b/install/langs/cs/data/risk.xml similarity index 100% rename from installq/langs/cs/data/risk.xml rename to install/langs/cs/data/risk.xml diff --git a/installq/langs/cs/data/stock_mvt_reason.xml b/install/langs/cs/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/cs/data/stock_mvt_reason.xml rename to install/langs/cs/data/stock_mvt_reason.xml diff --git a/installq/langs/cs/data/supplier_order_state.xml b/install/langs/cs/data/supplier_order_state.xml similarity index 100% rename from installq/langs/cs/data/supplier_order_state.xml rename to install/langs/cs/data/supplier_order_state.xml diff --git a/installq/langs/cs/data/supply_order_state.xml b/install/langs/cs/data/supply_order_state.xml similarity index 100% rename from installq/langs/cs/data/supply_order_state.xml rename to install/langs/cs/data/supply_order_state.xml diff --git a/installq/langs/cs/data/tab.xml b/install/langs/cs/data/tab.xml similarity index 100% rename from installq/langs/cs/data/tab.xml rename to install/langs/cs/data/tab.xml diff --git a/installq/langs/cs/flag.jpg b/install/langs/cs/flag.jpg similarity index 100% rename from installq/langs/cs/flag.jpg rename to install/langs/cs/flag.jpg diff --git a/installq/langs/cs/img/cs-default-category.jpg b/install/langs/cs/img/cs-default-category.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-category.jpg rename to install/langs/cs/img/cs-default-category.jpg diff --git a/installq/langs/cs/img/cs-default-home.jpg b/install/langs/cs/img/cs-default-home.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-home.jpg rename to install/langs/cs/img/cs-default-home.jpg diff --git a/installq/langs/cs/img/cs-default-large.jpg b/install/langs/cs/img/cs-default-large.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-large.jpg rename to install/langs/cs/img/cs-default-large.jpg diff --git a/installq/langs/cs/img/cs-default-large_scene.jpg b/install/langs/cs/img/cs-default-large_scene.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-large_scene.jpg rename to install/langs/cs/img/cs-default-large_scene.jpg diff --git a/installq/langs/cs/img/cs-default-medium.jpg b/install/langs/cs/img/cs-default-medium.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-medium.jpg rename to install/langs/cs/img/cs-default-medium.jpg diff --git a/installq/langs/cs/img/cs-default-small.jpg b/install/langs/cs/img/cs-default-small.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-small.jpg rename to install/langs/cs/img/cs-default-small.jpg diff --git a/installq/langs/cs/img/cs-default-thickbox.jpg b/install/langs/cs/img/cs-default-thickbox.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-thickbox.jpg rename to install/langs/cs/img/cs-default-thickbox.jpg diff --git a/installq/langs/cs/img/cs-default-thumb_scene.jpg b/install/langs/cs/img/cs-default-thumb_scene.jpg similarity index 100% rename from installq/langs/cs/img/cs-default-thumb_scene.jpg rename to install/langs/cs/img/cs-default-thumb_scene.jpg diff --git a/installq/langs/cs/img/cs.jpg b/install/langs/cs/img/cs.jpg similarity index 100% rename from installq/langs/cs/img/cs.jpg rename to install/langs/cs/img/cs.jpg diff --git a/installq/langs/cs/img/index.php b/install/langs/cs/img/index.php similarity index 100% rename from installq/langs/cs/img/index.php rename to install/langs/cs/img/index.php diff --git a/installq/langs/cs/index.php b/install/langs/cs/index.php similarity index 100% rename from installq/langs/cs/index.php rename to install/langs/cs/index.php diff --git a/installq/langs/cs/install.php b/install/langs/cs/install.php similarity index 100% rename from installq/langs/cs/install.php rename to install/langs/cs/install.php diff --git a/installq/langs/cs/language.xml b/install/langs/cs/language.xml similarity index 100% rename from installq/langs/cs/language.xml rename to install/langs/cs/language.xml diff --git a/installq/langs/cs/mail_identifiers.txt b/install/langs/cs/mail_identifiers.txt similarity index 100% rename from installq/langs/cs/mail_identifiers.txt rename to install/langs/cs/mail_identifiers.txt diff --git a/installq/langs/de/data/carrier.xml b/install/langs/de/data/carrier.xml similarity index 100% rename from installq/langs/de/data/carrier.xml rename to install/langs/de/data/carrier.xml diff --git a/installq/langs/de/data/category.xml b/install/langs/de/data/category.xml similarity index 100% rename from installq/langs/de/data/category.xml rename to install/langs/de/data/category.xml diff --git a/installq/langs/de/data/cms.xml b/install/langs/de/data/cms.xml similarity index 100% rename from installq/langs/de/data/cms.xml rename to install/langs/de/data/cms.xml diff --git a/installq/langs/de/data/cms_category.xml b/install/langs/de/data/cms_category.xml similarity index 100% rename from installq/langs/de/data/cms_category.xml rename to install/langs/de/data/cms_category.xml diff --git a/installq/langs/de/data/configuration.xml b/install/langs/de/data/configuration.xml similarity index 100% rename from installq/langs/de/data/configuration.xml rename to install/langs/de/data/configuration.xml diff --git a/installq/langs/de/data/contact.xml b/install/langs/de/data/contact.xml similarity index 100% rename from installq/langs/de/data/contact.xml rename to install/langs/de/data/contact.xml diff --git a/installq/langs/de/data/country.xml b/install/langs/de/data/country.xml similarity index 100% rename from installq/langs/de/data/country.xml rename to install/langs/de/data/country.xml diff --git a/installq/langs/de/data/gender.xml b/install/langs/de/data/gender.xml similarity index 100% rename from installq/langs/de/data/gender.xml rename to install/langs/de/data/gender.xml diff --git a/installq/langs/de/data/group.xml b/install/langs/de/data/group.xml similarity index 100% rename from installq/langs/de/data/group.xml rename to install/langs/de/data/group.xml diff --git a/installq/langs/de/data/index.php b/install/langs/de/data/index.php similarity index 100% rename from installq/langs/de/data/index.php rename to install/langs/de/data/index.php diff --git a/installq/langs/de/data/meta.xml b/install/langs/de/data/meta.xml similarity index 100% rename from installq/langs/de/data/meta.xml rename to install/langs/de/data/meta.xml diff --git a/installq/langs/de/data/order_return_state.xml b/install/langs/de/data/order_return_state.xml similarity index 100% rename from installq/langs/de/data/order_return_state.xml rename to install/langs/de/data/order_return_state.xml diff --git a/installq/langs/de/data/order_state.xml b/install/langs/de/data/order_state.xml similarity index 100% rename from installq/langs/de/data/order_state.xml rename to install/langs/de/data/order_state.xml diff --git a/installq/langs/de/data/profile.xml b/install/langs/de/data/profile.xml similarity index 100% rename from installq/langs/de/data/profile.xml rename to install/langs/de/data/profile.xml diff --git a/installq/langs/de/data/quick_access.xml b/install/langs/de/data/quick_access.xml similarity index 100% rename from installq/langs/de/data/quick_access.xml rename to install/langs/de/data/quick_access.xml diff --git a/installq/langs/de/data/risk.xml b/install/langs/de/data/risk.xml similarity index 100% rename from installq/langs/de/data/risk.xml rename to install/langs/de/data/risk.xml diff --git a/installq/langs/de/data/stock_mvt_reason.xml b/install/langs/de/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/de/data/stock_mvt_reason.xml rename to install/langs/de/data/stock_mvt_reason.xml diff --git a/installq/langs/de/data/supply_order_state.xml b/install/langs/de/data/supply_order_state.xml similarity index 100% rename from installq/langs/de/data/supply_order_state.xml rename to install/langs/de/data/supply_order_state.xml diff --git a/installq/langs/de/data/tab.xml b/install/langs/de/data/tab.xml similarity index 100% rename from installq/langs/de/data/tab.xml rename to install/langs/de/data/tab.xml diff --git a/installq/langs/de/flag.jpg b/install/langs/de/flag.jpg similarity index 100% rename from installq/langs/de/flag.jpg rename to install/langs/de/flag.jpg diff --git a/installq/langs/de/img/de-default-category.jpg b/install/langs/de/img/de-default-category.jpg similarity index 100% rename from installq/langs/de/img/de-default-category.jpg rename to install/langs/de/img/de-default-category.jpg diff --git a/installq/langs/de/img/de-default-home.jpg b/install/langs/de/img/de-default-home.jpg similarity index 100% rename from installq/langs/de/img/de-default-home.jpg rename to install/langs/de/img/de-default-home.jpg diff --git a/installq/langs/de/img/de-default-large.jpg b/install/langs/de/img/de-default-large.jpg similarity index 100% rename from installq/langs/de/img/de-default-large.jpg rename to install/langs/de/img/de-default-large.jpg diff --git a/installq/langs/de/img/de-default-large_scene.jpg b/install/langs/de/img/de-default-large_scene.jpg similarity index 100% rename from installq/langs/de/img/de-default-large_scene.jpg rename to install/langs/de/img/de-default-large_scene.jpg diff --git a/installq/langs/de/img/de-default-medium.jpg b/install/langs/de/img/de-default-medium.jpg similarity index 100% rename from installq/langs/de/img/de-default-medium.jpg rename to install/langs/de/img/de-default-medium.jpg diff --git a/installq/langs/de/img/de-default-small.jpg b/install/langs/de/img/de-default-small.jpg similarity index 100% rename from installq/langs/de/img/de-default-small.jpg rename to install/langs/de/img/de-default-small.jpg diff --git a/installq/langs/de/img/de-default-thickbox.jpg b/install/langs/de/img/de-default-thickbox.jpg similarity index 100% rename from installq/langs/de/img/de-default-thickbox.jpg rename to install/langs/de/img/de-default-thickbox.jpg diff --git a/installq/langs/de/img/de-default-thumb_scene.jpg b/install/langs/de/img/de-default-thumb_scene.jpg similarity index 100% rename from installq/langs/de/img/de-default-thumb_scene.jpg rename to install/langs/de/img/de-default-thumb_scene.jpg diff --git a/installq/langs/de/img/de.jpg b/install/langs/de/img/de.jpg similarity index 100% rename from installq/langs/de/img/de.jpg rename to install/langs/de/img/de.jpg diff --git a/installq/langs/de/img/index.php b/install/langs/de/img/index.php similarity index 100% rename from installq/langs/de/img/index.php rename to install/langs/de/img/index.php diff --git a/installq/langs/de/index.php b/install/langs/de/index.php similarity index 100% rename from installq/langs/de/index.php rename to install/langs/de/index.php diff --git a/installq/langs/de/install.php b/install/langs/de/install.php similarity index 100% rename from installq/langs/de/install.php rename to install/langs/de/install.php diff --git a/installq/langs/de/language.xml b/install/langs/de/language.xml similarity index 100% rename from installq/langs/de/language.xml rename to install/langs/de/language.xml diff --git a/installq/langs/de/mail_identifiers.txt b/install/langs/de/mail_identifiers.txt similarity index 100% rename from installq/langs/de/mail_identifiers.txt rename to install/langs/de/mail_identifiers.txt diff --git a/installq/langs/en/data/carrier.xml b/install/langs/en/data/carrier.xml similarity index 100% rename from installq/langs/en/data/carrier.xml rename to install/langs/en/data/carrier.xml diff --git a/installq/langs/en/data/category.xml b/install/langs/en/data/category.xml similarity index 100% rename from installq/langs/en/data/category.xml rename to install/langs/en/data/category.xml diff --git a/installq/langs/en/data/cms.xml b/install/langs/en/data/cms.xml similarity index 100% rename from installq/langs/en/data/cms.xml rename to install/langs/en/data/cms.xml diff --git a/installq/langs/en/data/cms_category.xml b/install/langs/en/data/cms_category.xml similarity index 100% rename from installq/langs/en/data/cms_category.xml rename to install/langs/en/data/cms_category.xml diff --git a/installq/langs/en/data/configuration.xml b/install/langs/en/data/configuration.xml similarity index 100% rename from installq/langs/en/data/configuration.xml rename to install/langs/en/data/configuration.xml diff --git a/installq/langs/en/data/contact.xml b/install/langs/en/data/contact.xml similarity index 100% rename from installq/langs/en/data/contact.xml rename to install/langs/en/data/contact.xml diff --git a/installq/langs/en/data/country.xml b/install/langs/en/data/country.xml similarity index 100% rename from installq/langs/en/data/country.xml rename to install/langs/en/data/country.xml diff --git a/installq/langs/en/data/gender.xml b/install/langs/en/data/gender.xml similarity index 100% rename from installq/langs/en/data/gender.xml rename to install/langs/en/data/gender.xml diff --git a/installq/langs/en/data/group.xml b/install/langs/en/data/group.xml similarity index 100% rename from installq/langs/en/data/group.xml rename to install/langs/en/data/group.xml diff --git a/installq/langs/en/data/index.php b/install/langs/en/data/index.php similarity index 100% rename from installq/langs/en/data/index.php rename to install/langs/en/data/index.php diff --git a/installq/langs/en/data/meta.xml b/install/langs/en/data/meta.xml similarity index 100% rename from installq/langs/en/data/meta.xml rename to install/langs/en/data/meta.xml diff --git a/installq/langs/en/data/order_return_state.xml b/install/langs/en/data/order_return_state.xml similarity index 100% rename from installq/langs/en/data/order_return_state.xml rename to install/langs/en/data/order_return_state.xml diff --git a/installq/langs/en/data/order_state.xml b/install/langs/en/data/order_state.xml similarity index 100% rename from installq/langs/en/data/order_state.xml rename to install/langs/en/data/order_state.xml diff --git a/installq/langs/en/data/profile.xml b/install/langs/en/data/profile.xml similarity index 100% rename from installq/langs/en/data/profile.xml rename to install/langs/en/data/profile.xml diff --git a/installq/langs/en/data/quick_access.xml b/install/langs/en/data/quick_access.xml similarity index 100% rename from installq/langs/en/data/quick_access.xml rename to install/langs/en/data/quick_access.xml diff --git a/installq/langs/en/data/risk.xml b/install/langs/en/data/risk.xml similarity index 100% rename from installq/langs/en/data/risk.xml rename to install/langs/en/data/risk.xml diff --git a/installq/langs/en/data/stock_mvt_reason.xml b/install/langs/en/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/en/data/stock_mvt_reason.xml rename to install/langs/en/data/stock_mvt_reason.xml diff --git a/installq/langs/en/data/supplier_order_state.xml b/install/langs/en/data/supplier_order_state.xml similarity index 100% rename from installq/langs/en/data/supplier_order_state.xml rename to install/langs/en/data/supplier_order_state.xml diff --git a/installq/langs/en/data/supply_order_state.xml b/install/langs/en/data/supply_order_state.xml similarity index 100% rename from installq/langs/en/data/supply_order_state.xml rename to install/langs/en/data/supply_order_state.xml diff --git a/installq/langs/en/data/tab.xml b/install/langs/en/data/tab.xml similarity index 100% rename from installq/langs/en/data/tab.xml rename to install/langs/en/data/tab.xml diff --git a/installq/langs/en/flag.jpg b/install/langs/en/flag.jpg similarity index 100% rename from installq/langs/en/flag.jpg rename to install/langs/en/flag.jpg diff --git a/installq/langs/en/img/en-default-category.jpg b/install/langs/en/img/en-default-category.jpg similarity index 100% rename from installq/langs/en/img/en-default-category.jpg rename to install/langs/en/img/en-default-category.jpg diff --git a/installq/langs/en/img/en-default-home.jpg b/install/langs/en/img/en-default-home.jpg similarity index 100% rename from installq/langs/en/img/en-default-home.jpg rename to install/langs/en/img/en-default-home.jpg diff --git a/installq/langs/en/img/en-default-large.jpg b/install/langs/en/img/en-default-large.jpg similarity index 100% rename from installq/langs/en/img/en-default-large.jpg rename to install/langs/en/img/en-default-large.jpg diff --git a/installq/langs/en/img/en-default-large_scene.jpg b/install/langs/en/img/en-default-large_scene.jpg similarity index 100% rename from installq/langs/en/img/en-default-large_scene.jpg rename to install/langs/en/img/en-default-large_scene.jpg diff --git a/installq/langs/en/img/en-default-medium.jpg b/install/langs/en/img/en-default-medium.jpg similarity index 100% rename from installq/langs/en/img/en-default-medium.jpg rename to install/langs/en/img/en-default-medium.jpg diff --git a/installq/langs/en/img/en-default-small.jpg b/install/langs/en/img/en-default-small.jpg similarity index 100% rename from installq/langs/en/img/en-default-small.jpg rename to install/langs/en/img/en-default-small.jpg diff --git a/installq/langs/en/img/en-default-thickbox.jpg b/install/langs/en/img/en-default-thickbox.jpg similarity index 100% rename from installq/langs/en/img/en-default-thickbox.jpg rename to install/langs/en/img/en-default-thickbox.jpg diff --git a/installq/langs/en/img/en-default-thumb_scene.jpg b/install/langs/en/img/en-default-thumb_scene.jpg similarity index 100% rename from installq/langs/en/img/en-default-thumb_scene.jpg rename to install/langs/en/img/en-default-thumb_scene.jpg diff --git a/installq/langs/en/img/en.jpg b/install/langs/en/img/en.jpg similarity index 100% rename from installq/langs/en/img/en.jpg rename to install/langs/en/img/en.jpg diff --git a/installq/langs/en/img/index.php b/install/langs/en/img/index.php similarity index 100% rename from installq/langs/en/img/index.php rename to install/langs/en/img/index.php diff --git a/installq/langs/en/index.php b/install/langs/en/index.php similarity index 100% rename from installq/langs/en/index.php rename to install/langs/en/index.php diff --git a/installq/langs/en/install.php b/install/langs/en/install.php similarity index 100% rename from installq/langs/en/install.php rename to install/langs/en/install.php diff --git a/installq/langs/en/language.xml b/install/langs/en/language.xml similarity index 100% rename from installq/langs/en/language.xml rename to install/langs/en/language.xml diff --git a/installq/langs/en/mail_identifiers.txt b/install/langs/en/mail_identifiers.txt similarity index 100% rename from installq/langs/en/mail_identifiers.txt rename to install/langs/en/mail_identifiers.txt diff --git a/installq/langs/es/data/carrier.xml b/install/langs/es/data/carrier.xml similarity index 100% rename from installq/langs/es/data/carrier.xml rename to install/langs/es/data/carrier.xml diff --git a/installq/langs/es/data/category.xml b/install/langs/es/data/category.xml similarity index 100% rename from installq/langs/es/data/category.xml rename to install/langs/es/data/category.xml diff --git a/installq/langs/es/data/cms.xml b/install/langs/es/data/cms.xml similarity index 100% rename from installq/langs/es/data/cms.xml rename to install/langs/es/data/cms.xml diff --git a/installq/langs/es/data/cms_category.xml b/install/langs/es/data/cms_category.xml similarity index 100% rename from installq/langs/es/data/cms_category.xml rename to install/langs/es/data/cms_category.xml diff --git a/installq/langs/es/data/configuration.xml b/install/langs/es/data/configuration.xml similarity index 100% rename from installq/langs/es/data/configuration.xml rename to install/langs/es/data/configuration.xml diff --git a/installq/langs/es/data/contact.xml b/install/langs/es/data/contact.xml similarity index 100% rename from installq/langs/es/data/contact.xml rename to install/langs/es/data/contact.xml diff --git a/installq/langs/es/data/country.xml b/install/langs/es/data/country.xml similarity index 100% rename from installq/langs/es/data/country.xml rename to install/langs/es/data/country.xml diff --git a/installq/langs/es/data/gender.xml b/install/langs/es/data/gender.xml similarity index 100% rename from installq/langs/es/data/gender.xml rename to install/langs/es/data/gender.xml diff --git a/installq/langs/es/data/group.xml b/install/langs/es/data/group.xml similarity index 100% rename from installq/langs/es/data/group.xml rename to install/langs/es/data/group.xml diff --git a/installq/langs/es/data/index.php b/install/langs/es/data/index.php similarity index 100% rename from installq/langs/es/data/index.php rename to install/langs/es/data/index.php diff --git a/installq/langs/es/data/meta.xml b/install/langs/es/data/meta.xml similarity index 100% rename from installq/langs/es/data/meta.xml rename to install/langs/es/data/meta.xml diff --git a/installq/langs/es/data/order_return_state.xml b/install/langs/es/data/order_return_state.xml similarity index 100% rename from installq/langs/es/data/order_return_state.xml rename to install/langs/es/data/order_return_state.xml diff --git a/installq/langs/es/data/order_state.xml b/install/langs/es/data/order_state.xml similarity index 100% rename from installq/langs/es/data/order_state.xml rename to install/langs/es/data/order_state.xml diff --git a/installq/langs/es/data/profile.xml b/install/langs/es/data/profile.xml similarity index 100% rename from installq/langs/es/data/profile.xml rename to install/langs/es/data/profile.xml diff --git a/installq/langs/es/data/quick_access.xml b/install/langs/es/data/quick_access.xml similarity index 100% rename from installq/langs/es/data/quick_access.xml rename to install/langs/es/data/quick_access.xml diff --git a/installq/langs/es/data/risk.xml b/install/langs/es/data/risk.xml similarity index 100% rename from installq/langs/es/data/risk.xml rename to install/langs/es/data/risk.xml diff --git a/installq/langs/es/data/stock_mvt_reason.xml b/install/langs/es/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/es/data/stock_mvt_reason.xml rename to install/langs/es/data/stock_mvt_reason.xml diff --git a/installq/langs/es/data/supplier_order_state.xml b/install/langs/es/data/supplier_order_state.xml similarity index 100% rename from installq/langs/es/data/supplier_order_state.xml rename to install/langs/es/data/supplier_order_state.xml diff --git a/installq/langs/es/data/supply_order_state.xml b/install/langs/es/data/supply_order_state.xml similarity index 100% rename from installq/langs/es/data/supply_order_state.xml rename to install/langs/es/data/supply_order_state.xml diff --git a/installq/langs/es/data/tab.xml b/install/langs/es/data/tab.xml similarity index 100% rename from installq/langs/es/data/tab.xml rename to install/langs/es/data/tab.xml diff --git a/installq/langs/es/flag.jpg b/install/langs/es/flag.jpg similarity index 100% rename from installq/langs/es/flag.jpg rename to install/langs/es/flag.jpg diff --git a/installq/langs/es/img/es-default-category.jpg b/install/langs/es/img/es-default-category.jpg similarity index 100% rename from installq/langs/es/img/es-default-category.jpg rename to install/langs/es/img/es-default-category.jpg diff --git a/installq/langs/es/img/es-default-home.jpg b/install/langs/es/img/es-default-home.jpg similarity index 100% rename from installq/langs/es/img/es-default-home.jpg rename to install/langs/es/img/es-default-home.jpg diff --git a/installq/langs/es/img/es-default-large.jpg b/install/langs/es/img/es-default-large.jpg similarity index 100% rename from installq/langs/es/img/es-default-large.jpg rename to install/langs/es/img/es-default-large.jpg diff --git a/installq/langs/es/img/es-default-large_scene.jpg b/install/langs/es/img/es-default-large_scene.jpg similarity index 100% rename from installq/langs/es/img/es-default-large_scene.jpg rename to install/langs/es/img/es-default-large_scene.jpg diff --git a/installq/langs/es/img/es-default-medium.jpg b/install/langs/es/img/es-default-medium.jpg similarity index 100% rename from installq/langs/es/img/es-default-medium.jpg rename to install/langs/es/img/es-default-medium.jpg diff --git a/installq/langs/es/img/es-default-small.jpg b/install/langs/es/img/es-default-small.jpg similarity index 100% rename from installq/langs/es/img/es-default-small.jpg rename to install/langs/es/img/es-default-small.jpg diff --git a/installq/langs/es/img/es-default-thickbox.jpg b/install/langs/es/img/es-default-thickbox.jpg similarity index 100% rename from installq/langs/es/img/es-default-thickbox.jpg rename to install/langs/es/img/es-default-thickbox.jpg diff --git a/installq/langs/es/img/es-default-thumb_scene.jpg b/install/langs/es/img/es-default-thumb_scene.jpg similarity index 100% rename from installq/langs/es/img/es-default-thumb_scene.jpg rename to install/langs/es/img/es-default-thumb_scene.jpg diff --git a/installq/langs/es/img/es.jpg b/install/langs/es/img/es.jpg similarity index 100% rename from installq/langs/es/img/es.jpg rename to install/langs/es/img/es.jpg diff --git a/installq/langs/es/img/index.php b/install/langs/es/img/index.php similarity index 100% rename from installq/langs/es/img/index.php rename to install/langs/es/img/index.php diff --git a/installq/langs/es/index.php b/install/langs/es/index.php similarity index 100% rename from installq/langs/es/index.php rename to install/langs/es/index.php diff --git a/installq/langs/es/install.php b/install/langs/es/install.php similarity index 100% rename from installq/langs/es/install.php rename to install/langs/es/install.php diff --git a/installq/langs/es/language.xml b/install/langs/es/language.xml similarity index 100% rename from installq/langs/es/language.xml rename to install/langs/es/language.xml diff --git a/installq/langs/es/mail_identifiers.txt b/install/langs/es/mail_identifiers.txt similarity index 100% rename from installq/langs/es/mail_identifiers.txt rename to install/langs/es/mail_identifiers.txt diff --git a/installq/langs/fa/Flag_of_Iran.svg b/install/langs/fa/Flag_of_Iran.svg similarity index 100% rename from installq/langs/fa/Flag_of_Iran.svg rename to install/langs/fa/Flag_of_Iran.svg diff --git a/installq/langs/fa/data/carrier.xml b/install/langs/fa/data/carrier.xml similarity index 100% rename from installq/langs/fa/data/carrier.xml rename to install/langs/fa/data/carrier.xml diff --git a/installq/langs/fa/data/category.xml b/install/langs/fa/data/category.xml similarity index 100% rename from installq/langs/fa/data/category.xml rename to install/langs/fa/data/category.xml diff --git a/installq/langs/fa/data/cms.xml b/install/langs/fa/data/cms.xml similarity index 100% rename from installq/langs/fa/data/cms.xml rename to install/langs/fa/data/cms.xml diff --git a/installq/langs/fa/data/cms_category.xml b/install/langs/fa/data/cms_category.xml similarity index 100% rename from installq/langs/fa/data/cms_category.xml rename to install/langs/fa/data/cms_category.xml diff --git a/installq/langs/fa/data/configuration.xml b/install/langs/fa/data/configuration.xml similarity index 100% rename from installq/langs/fa/data/configuration.xml rename to install/langs/fa/data/configuration.xml diff --git a/installq/langs/fa/data/contact.xml b/install/langs/fa/data/contact.xml similarity index 100% rename from installq/langs/fa/data/contact.xml rename to install/langs/fa/data/contact.xml diff --git a/installq/langs/fa/data/country.xml b/install/langs/fa/data/country.xml similarity index 100% rename from installq/langs/fa/data/country.xml rename to install/langs/fa/data/country.xml diff --git a/installq/langs/fa/data/gender.xml b/install/langs/fa/data/gender.xml similarity index 100% rename from installq/langs/fa/data/gender.xml rename to install/langs/fa/data/gender.xml diff --git a/installq/langs/fa/data/group.xml b/install/langs/fa/data/group.xml similarity index 100% rename from installq/langs/fa/data/group.xml rename to install/langs/fa/data/group.xml diff --git a/installq/langs/fa/data/index.php b/install/langs/fa/data/index.php similarity index 100% rename from installq/langs/fa/data/index.php rename to install/langs/fa/data/index.php diff --git a/installq/langs/fa/data/meta.xml b/install/langs/fa/data/meta.xml similarity index 100% rename from installq/langs/fa/data/meta.xml rename to install/langs/fa/data/meta.xml diff --git a/installq/langs/fa/data/order_return_state.xml b/install/langs/fa/data/order_return_state.xml similarity index 100% rename from installq/langs/fa/data/order_return_state.xml rename to install/langs/fa/data/order_return_state.xml diff --git a/installq/langs/fa/data/order_state.xml b/install/langs/fa/data/order_state.xml similarity index 100% rename from installq/langs/fa/data/order_state.xml rename to install/langs/fa/data/order_state.xml diff --git a/installq/langs/fa/data/profile.xml b/install/langs/fa/data/profile.xml similarity index 100% rename from installq/langs/fa/data/profile.xml rename to install/langs/fa/data/profile.xml diff --git a/installq/langs/fa/data/quick_access.xml b/install/langs/fa/data/quick_access.xml similarity index 100% rename from installq/langs/fa/data/quick_access.xml rename to install/langs/fa/data/quick_access.xml diff --git a/installq/langs/fa/data/risk.xml b/install/langs/fa/data/risk.xml similarity index 100% rename from installq/langs/fa/data/risk.xml rename to install/langs/fa/data/risk.xml diff --git a/installq/langs/fa/data/stock_mvt_reason.xml b/install/langs/fa/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/fa/data/stock_mvt_reason.xml rename to install/langs/fa/data/stock_mvt_reason.xml diff --git a/installq/langs/fa/data/supplier_order_state.xml b/install/langs/fa/data/supplier_order_state.xml similarity index 100% rename from installq/langs/fa/data/supplier_order_state.xml rename to install/langs/fa/data/supplier_order_state.xml diff --git a/installq/langs/fa/data/supply_order_state.xml b/install/langs/fa/data/supply_order_state.xml similarity index 100% rename from installq/langs/fa/data/supply_order_state.xml rename to install/langs/fa/data/supply_order_state.xml diff --git a/installq/langs/fa/data/tab.xml b/install/langs/fa/data/tab.xml similarity index 100% rename from installq/langs/fa/data/tab.xml rename to install/langs/fa/data/tab.xml diff --git a/installq/langs/fa/flag.jpg b/install/langs/fa/flag.jpg similarity index 100% rename from installq/langs/fa/flag.jpg rename to install/langs/fa/flag.jpg diff --git a/installq/langs/fa/img/fa-default-category.jpg b/install/langs/fa/img/fa-default-category.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-category.jpg rename to install/langs/fa/img/fa-default-category.jpg diff --git a/installq/langs/fa/img/fa-default-home.jpg b/install/langs/fa/img/fa-default-home.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-home.jpg rename to install/langs/fa/img/fa-default-home.jpg diff --git a/installq/langs/fa/img/fa-default-large.jpg b/install/langs/fa/img/fa-default-large.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-large.jpg rename to install/langs/fa/img/fa-default-large.jpg diff --git a/installq/langs/fa/img/fa-default-large_scene.jpg b/install/langs/fa/img/fa-default-large_scene.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-large_scene.jpg rename to install/langs/fa/img/fa-default-large_scene.jpg diff --git a/installq/langs/fa/img/fa-default-medium.jpg b/install/langs/fa/img/fa-default-medium.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-medium.jpg rename to install/langs/fa/img/fa-default-medium.jpg diff --git a/installq/langs/fa/img/fa-default-small.jpg b/install/langs/fa/img/fa-default-small.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-small.jpg rename to install/langs/fa/img/fa-default-small.jpg diff --git a/installq/langs/fa/img/fa-default-thickbox.jpg b/install/langs/fa/img/fa-default-thickbox.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-thickbox.jpg rename to install/langs/fa/img/fa-default-thickbox.jpg diff --git a/installq/langs/fa/img/fa-default-thumb_scene.jpg b/install/langs/fa/img/fa-default-thumb_scene.jpg similarity index 100% rename from installq/langs/fa/img/fa-default-thumb_scene.jpg rename to install/langs/fa/img/fa-default-thumb_scene.jpg diff --git a/installq/langs/fa/img/fa.jpg b/install/langs/fa/img/fa.jpg similarity index 100% rename from installq/langs/fa/img/fa.jpg rename to install/langs/fa/img/fa.jpg diff --git a/installq/langs/fa/img/index.php b/install/langs/fa/img/index.php similarity index 100% rename from installq/langs/fa/img/index.php rename to install/langs/fa/img/index.php diff --git a/installq/langs/fa/index.php b/install/langs/fa/index.php similarity index 100% rename from installq/langs/fa/index.php rename to install/langs/fa/index.php diff --git a/installq/langs/fa/install.php b/install/langs/fa/install.php similarity index 100% rename from installq/langs/fa/install.php rename to install/langs/fa/install.php diff --git a/installq/langs/fa/language.xml b/install/langs/fa/language.xml similarity index 100% rename from installq/langs/fa/language.xml rename to install/langs/fa/language.xml diff --git a/installq/langs/fa/mail_identifiers.txt b/install/langs/fa/mail_identifiers.txt similarity index 100% rename from installq/langs/fa/mail_identifiers.txt rename to install/langs/fa/mail_identifiers.txt diff --git a/installq/langs/fr/data/carrier.xml b/install/langs/fr/data/carrier.xml similarity index 100% rename from installq/langs/fr/data/carrier.xml rename to install/langs/fr/data/carrier.xml diff --git a/installq/langs/fr/data/category.xml b/install/langs/fr/data/category.xml similarity index 100% rename from installq/langs/fr/data/category.xml rename to install/langs/fr/data/category.xml diff --git a/installq/langs/fr/data/cms.xml b/install/langs/fr/data/cms.xml similarity index 100% rename from installq/langs/fr/data/cms.xml rename to install/langs/fr/data/cms.xml diff --git a/installq/langs/fr/data/cms_category.xml b/install/langs/fr/data/cms_category.xml similarity index 100% rename from installq/langs/fr/data/cms_category.xml rename to install/langs/fr/data/cms_category.xml diff --git a/installq/langs/fr/data/configuration.xml b/install/langs/fr/data/configuration.xml similarity index 100% rename from installq/langs/fr/data/configuration.xml rename to install/langs/fr/data/configuration.xml diff --git a/installq/langs/fr/data/contact.xml b/install/langs/fr/data/contact.xml similarity index 100% rename from installq/langs/fr/data/contact.xml rename to install/langs/fr/data/contact.xml diff --git a/installq/langs/fr/data/country.xml b/install/langs/fr/data/country.xml similarity index 100% rename from installq/langs/fr/data/country.xml rename to install/langs/fr/data/country.xml diff --git a/installq/langs/fr/data/gender.xml b/install/langs/fr/data/gender.xml similarity index 100% rename from installq/langs/fr/data/gender.xml rename to install/langs/fr/data/gender.xml diff --git a/installq/langs/fr/data/group.xml b/install/langs/fr/data/group.xml similarity index 100% rename from installq/langs/fr/data/group.xml rename to install/langs/fr/data/group.xml diff --git a/installq/langs/fr/data/index.php b/install/langs/fr/data/index.php similarity index 100% rename from installq/langs/fr/data/index.php rename to install/langs/fr/data/index.php diff --git a/installq/langs/fr/data/meta.xml b/install/langs/fr/data/meta.xml similarity index 100% rename from installq/langs/fr/data/meta.xml rename to install/langs/fr/data/meta.xml diff --git a/installq/langs/fr/data/order_return_state.xml b/install/langs/fr/data/order_return_state.xml similarity index 100% rename from installq/langs/fr/data/order_return_state.xml rename to install/langs/fr/data/order_return_state.xml diff --git a/installq/langs/fr/data/order_state.xml b/install/langs/fr/data/order_state.xml similarity index 100% rename from installq/langs/fr/data/order_state.xml rename to install/langs/fr/data/order_state.xml diff --git a/installq/langs/fr/data/profile.xml b/install/langs/fr/data/profile.xml similarity index 100% rename from installq/langs/fr/data/profile.xml rename to install/langs/fr/data/profile.xml diff --git a/installq/langs/fr/data/quick_access.xml b/install/langs/fr/data/quick_access.xml similarity index 100% rename from installq/langs/fr/data/quick_access.xml rename to install/langs/fr/data/quick_access.xml diff --git a/installq/langs/fr/data/risk.xml b/install/langs/fr/data/risk.xml similarity index 100% rename from installq/langs/fr/data/risk.xml rename to install/langs/fr/data/risk.xml diff --git a/installq/langs/fr/data/stock_mvt_reason.xml b/install/langs/fr/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/fr/data/stock_mvt_reason.xml rename to install/langs/fr/data/stock_mvt_reason.xml diff --git a/installq/langs/fr/data/supplier_order_state.xml b/install/langs/fr/data/supplier_order_state.xml similarity index 100% rename from installq/langs/fr/data/supplier_order_state.xml rename to install/langs/fr/data/supplier_order_state.xml diff --git a/installq/langs/fr/data/supply_order_state.xml b/install/langs/fr/data/supply_order_state.xml similarity index 100% rename from installq/langs/fr/data/supply_order_state.xml rename to install/langs/fr/data/supply_order_state.xml diff --git a/installq/langs/fr/data/tab.xml b/install/langs/fr/data/tab.xml similarity index 100% rename from installq/langs/fr/data/tab.xml rename to install/langs/fr/data/tab.xml diff --git a/installq/langs/fr/flag.jpg b/install/langs/fr/flag.jpg similarity index 100% rename from installq/langs/fr/flag.jpg rename to install/langs/fr/flag.jpg diff --git a/installq/langs/fr/img/fr-default-category.jpg b/install/langs/fr/img/fr-default-category.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-category.jpg rename to install/langs/fr/img/fr-default-category.jpg diff --git a/installq/langs/fr/img/fr-default-home.jpg b/install/langs/fr/img/fr-default-home.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-home.jpg rename to install/langs/fr/img/fr-default-home.jpg diff --git a/installq/langs/fr/img/fr-default-large.jpg b/install/langs/fr/img/fr-default-large.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-large.jpg rename to install/langs/fr/img/fr-default-large.jpg diff --git a/installq/langs/fr/img/fr-default-large_scene.jpg b/install/langs/fr/img/fr-default-large_scene.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-large_scene.jpg rename to install/langs/fr/img/fr-default-large_scene.jpg diff --git a/installq/langs/fr/img/fr-default-medium.jpg b/install/langs/fr/img/fr-default-medium.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-medium.jpg rename to install/langs/fr/img/fr-default-medium.jpg diff --git a/installq/langs/fr/img/fr-default-small.jpg b/install/langs/fr/img/fr-default-small.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-small.jpg rename to install/langs/fr/img/fr-default-small.jpg diff --git a/installq/langs/fr/img/fr-default-thickbox.jpg b/install/langs/fr/img/fr-default-thickbox.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-thickbox.jpg rename to install/langs/fr/img/fr-default-thickbox.jpg diff --git a/installq/langs/fr/img/fr-default-thumb_scene.jpg b/install/langs/fr/img/fr-default-thumb_scene.jpg similarity index 100% rename from installq/langs/fr/img/fr-default-thumb_scene.jpg rename to install/langs/fr/img/fr-default-thumb_scene.jpg diff --git a/installq/langs/fr/img/fr.jpg b/install/langs/fr/img/fr.jpg similarity index 100% rename from installq/langs/fr/img/fr.jpg rename to install/langs/fr/img/fr.jpg diff --git a/installq/langs/fr/img/index.php b/install/langs/fr/img/index.php similarity index 100% rename from installq/langs/fr/img/index.php rename to install/langs/fr/img/index.php diff --git a/installq/langs/fr/index.php b/install/langs/fr/index.php similarity index 100% rename from installq/langs/fr/index.php rename to install/langs/fr/index.php diff --git a/installq/langs/fr/install.php b/install/langs/fr/install.php similarity index 100% rename from installq/langs/fr/install.php rename to install/langs/fr/install.php diff --git a/installq/langs/fr/language.xml b/install/langs/fr/language.xml similarity index 100% rename from installq/langs/fr/language.xml rename to install/langs/fr/language.xml diff --git a/installq/langs/fr/mail_identifiers.txt b/install/langs/fr/mail_identifiers.txt similarity index 100% rename from installq/langs/fr/mail_identifiers.txt rename to install/langs/fr/mail_identifiers.txt diff --git a/installq/langs/he/data/carrier.xml b/install/langs/he/data/carrier.xml similarity index 100% rename from installq/langs/he/data/carrier.xml rename to install/langs/he/data/carrier.xml diff --git a/installq/langs/he/data/category.xml b/install/langs/he/data/category.xml similarity index 100% rename from installq/langs/he/data/category.xml rename to install/langs/he/data/category.xml diff --git a/installq/langs/he/data/cms.xml b/install/langs/he/data/cms.xml similarity index 100% rename from installq/langs/he/data/cms.xml rename to install/langs/he/data/cms.xml diff --git a/installq/langs/he/data/cms_category.xml b/install/langs/he/data/cms_category.xml similarity index 100% rename from installq/langs/he/data/cms_category.xml rename to install/langs/he/data/cms_category.xml diff --git a/installq/langs/he/data/configuration.xml b/install/langs/he/data/configuration.xml similarity index 100% rename from installq/langs/he/data/configuration.xml rename to install/langs/he/data/configuration.xml diff --git a/installq/langs/he/data/contact.xml b/install/langs/he/data/contact.xml similarity index 100% rename from installq/langs/he/data/contact.xml rename to install/langs/he/data/contact.xml diff --git a/installq/langs/he/data/country.xml b/install/langs/he/data/country.xml similarity index 100% rename from installq/langs/he/data/country.xml rename to install/langs/he/data/country.xml diff --git a/installq/langs/he/data/gender.xml b/install/langs/he/data/gender.xml similarity index 100% rename from installq/langs/he/data/gender.xml rename to install/langs/he/data/gender.xml diff --git a/installq/langs/he/data/group.xml b/install/langs/he/data/group.xml similarity index 100% rename from installq/langs/he/data/group.xml rename to install/langs/he/data/group.xml diff --git a/installq/langs/he/data/index.php b/install/langs/he/data/index.php similarity index 100% rename from installq/langs/he/data/index.php rename to install/langs/he/data/index.php diff --git a/installq/langs/he/data/meta.xml b/install/langs/he/data/meta.xml similarity index 100% rename from installq/langs/he/data/meta.xml rename to install/langs/he/data/meta.xml diff --git a/installq/langs/he/data/order_return_state.xml b/install/langs/he/data/order_return_state.xml similarity index 100% rename from installq/langs/he/data/order_return_state.xml rename to install/langs/he/data/order_return_state.xml diff --git a/installq/langs/he/data/order_state.xml b/install/langs/he/data/order_state.xml similarity index 100% rename from installq/langs/he/data/order_state.xml rename to install/langs/he/data/order_state.xml diff --git a/installq/langs/he/data/profile.xml b/install/langs/he/data/profile.xml similarity index 100% rename from installq/langs/he/data/profile.xml rename to install/langs/he/data/profile.xml diff --git a/installq/langs/he/data/quick_access.xml b/install/langs/he/data/quick_access.xml similarity index 100% rename from installq/langs/he/data/quick_access.xml rename to install/langs/he/data/quick_access.xml diff --git a/installq/langs/he/data/risk.xml b/install/langs/he/data/risk.xml similarity index 100% rename from installq/langs/he/data/risk.xml rename to install/langs/he/data/risk.xml diff --git a/installq/langs/he/data/stock_mvt_reason.xml b/install/langs/he/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/he/data/stock_mvt_reason.xml rename to install/langs/he/data/stock_mvt_reason.xml diff --git a/installq/langs/he/data/supplier_order_state.xml b/install/langs/he/data/supplier_order_state.xml similarity index 100% rename from installq/langs/he/data/supplier_order_state.xml rename to install/langs/he/data/supplier_order_state.xml diff --git a/installq/langs/he/data/supply_order_state.xml b/install/langs/he/data/supply_order_state.xml similarity index 100% rename from installq/langs/he/data/supply_order_state.xml rename to install/langs/he/data/supply_order_state.xml diff --git a/installq/langs/he/data/tab.xml b/install/langs/he/data/tab.xml similarity index 100% rename from installq/langs/he/data/tab.xml rename to install/langs/he/data/tab.xml diff --git a/installq/langs/he/flag.jpg b/install/langs/he/flag.jpg similarity index 100% rename from installq/langs/he/flag.jpg rename to install/langs/he/flag.jpg diff --git a/installq/langs/he/img/he-default-category.jpg b/install/langs/he/img/he-default-category.jpg similarity index 100% rename from installq/langs/he/img/he-default-category.jpg rename to install/langs/he/img/he-default-category.jpg diff --git a/installq/langs/he/img/he-default-home.jpg b/install/langs/he/img/he-default-home.jpg similarity index 100% rename from installq/langs/he/img/he-default-home.jpg rename to install/langs/he/img/he-default-home.jpg diff --git a/installq/langs/he/img/he-default-large.jpg b/install/langs/he/img/he-default-large.jpg similarity index 100% rename from installq/langs/he/img/he-default-large.jpg rename to install/langs/he/img/he-default-large.jpg diff --git a/installq/langs/he/img/he-default-large_scene.jpg b/install/langs/he/img/he-default-large_scene.jpg similarity index 100% rename from installq/langs/he/img/he-default-large_scene.jpg rename to install/langs/he/img/he-default-large_scene.jpg diff --git a/installq/langs/he/img/he-default-medium.jpg b/install/langs/he/img/he-default-medium.jpg similarity index 100% rename from installq/langs/he/img/he-default-medium.jpg rename to install/langs/he/img/he-default-medium.jpg diff --git a/installq/langs/he/img/he-default-small.jpg b/install/langs/he/img/he-default-small.jpg similarity index 100% rename from installq/langs/he/img/he-default-small.jpg rename to install/langs/he/img/he-default-small.jpg diff --git a/installq/langs/he/img/he-default-thickbox.jpg b/install/langs/he/img/he-default-thickbox.jpg similarity index 100% rename from installq/langs/he/img/he-default-thickbox.jpg rename to install/langs/he/img/he-default-thickbox.jpg diff --git a/installq/langs/he/img/he-default-thumb_scene.jpg b/install/langs/he/img/he-default-thumb_scene.jpg similarity index 100% rename from installq/langs/he/img/he-default-thumb_scene.jpg rename to install/langs/he/img/he-default-thumb_scene.jpg diff --git a/installq/langs/he/img/he.jpg b/install/langs/he/img/he.jpg similarity index 100% rename from installq/langs/he/img/he.jpg rename to install/langs/he/img/he.jpg diff --git a/installq/langs/he/img/index.php b/install/langs/he/img/index.php similarity index 100% rename from installq/langs/he/img/index.php rename to install/langs/he/img/index.php diff --git a/installq/langs/he/index.php b/install/langs/he/index.php similarity index 100% rename from installq/langs/he/index.php rename to install/langs/he/index.php diff --git a/installq/langs/he/install.php b/install/langs/he/install.php similarity index 100% rename from installq/langs/he/install.php rename to install/langs/he/install.php diff --git a/installq/langs/he/language.xml b/install/langs/he/language.xml similarity index 100% rename from installq/langs/he/language.xml rename to install/langs/he/language.xml diff --git a/installq/langs/he/mail_identifiers.txt b/install/langs/he/mail_identifiers.txt similarity index 100% rename from installq/langs/he/mail_identifiers.txt rename to install/langs/he/mail_identifiers.txt diff --git a/installq/langs/hr/data/carrier.xml b/install/langs/hr/data/carrier.xml similarity index 100% rename from installq/langs/hr/data/carrier.xml rename to install/langs/hr/data/carrier.xml diff --git a/installq/langs/hr/data/category.xml b/install/langs/hr/data/category.xml similarity index 100% rename from installq/langs/hr/data/category.xml rename to install/langs/hr/data/category.xml diff --git a/installq/langs/hr/data/cms.xml b/install/langs/hr/data/cms.xml similarity index 100% rename from installq/langs/hr/data/cms.xml rename to install/langs/hr/data/cms.xml diff --git a/installq/langs/hr/data/cms_category.xml b/install/langs/hr/data/cms_category.xml similarity index 100% rename from installq/langs/hr/data/cms_category.xml rename to install/langs/hr/data/cms_category.xml diff --git a/installq/langs/hr/data/configuration.xml b/install/langs/hr/data/configuration.xml similarity index 100% rename from installq/langs/hr/data/configuration.xml rename to install/langs/hr/data/configuration.xml diff --git a/installq/langs/hr/data/contact.xml b/install/langs/hr/data/contact.xml similarity index 100% rename from installq/langs/hr/data/contact.xml rename to install/langs/hr/data/contact.xml diff --git a/installq/langs/hr/data/country.xml b/install/langs/hr/data/country.xml similarity index 100% rename from installq/langs/hr/data/country.xml rename to install/langs/hr/data/country.xml diff --git a/installq/langs/hr/data/gender.xml b/install/langs/hr/data/gender.xml similarity index 100% rename from installq/langs/hr/data/gender.xml rename to install/langs/hr/data/gender.xml diff --git a/installq/langs/hr/data/group.xml b/install/langs/hr/data/group.xml similarity index 100% rename from installq/langs/hr/data/group.xml rename to install/langs/hr/data/group.xml diff --git a/installq/langs/hr/data/index.php b/install/langs/hr/data/index.php similarity index 100% rename from installq/langs/hr/data/index.php rename to install/langs/hr/data/index.php diff --git a/installq/langs/hr/data/meta.xml b/install/langs/hr/data/meta.xml similarity index 100% rename from installq/langs/hr/data/meta.xml rename to install/langs/hr/data/meta.xml diff --git a/installq/langs/hr/data/order_return_state.xml b/install/langs/hr/data/order_return_state.xml similarity index 100% rename from installq/langs/hr/data/order_return_state.xml rename to install/langs/hr/data/order_return_state.xml diff --git a/installq/langs/hr/data/order_state.xml b/install/langs/hr/data/order_state.xml similarity index 100% rename from installq/langs/hr/data/order_state.xml rename to install/langs/hr/data/order_state.xml diff --git a/installq/langs/hr/data/profile.xml b/install/langs/hr/data/profile.xml similarity index 100% rename from installq/langs/hr/data/profile.xml rename to install/langs/hr/data/profile.xml diff --git a/installq/langs/hr/data/quick_access.xml b/install/langs/hr/data/quick_access.xml similarity index 100% rename from installq/langs/hr/data/quick_access.xml rename to install/langs/hr/data/quick_access.xml diff --git a/installq/langs/hr/data/risk.xml b/install/langs/hr/data/risk.xml similarity index 100% rename from installq/langs/hr/data/risk.xml rename to install/langs/hr/data/risk.xml diff --git a/installq/langs/hr/data/stock_mvt_reason.xml b/install/langs/hr/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/hr/data/stock_mvt_reason.xml rename to install/langs/hr/data/stock_mvt_reason.xml diff --git a/installq/langs/hr/data/supplier_order_state.xml b/install/langs/hr/data/supplier_order_state.xml similarity index 100% rename from installq/langs/hr/data/supplier_order_state.xml rename to install/langs/hr/data/supplier_order_state.xml diff --git a/installq/langs/hr/data/supply_order_state.xml b/install/langs/hr/data/supply_order_state.xml similarity index 100% rename from installq/langs/hr/data/supply_order_state.xml rename to install/langs/hr/data/supply_order_state.xml diff --git a/installq/langs/hr/data/tab.xml b/install/langs/hr/data/tab.xml similarity index 100% rename from installq/langs/hr/data/tab.xml rename to install/langs/hr/data/tab.xml diff --git a/installq/langs/hr/flag.jpg b/install/langs/hr/flag.jpg similarity index 100% rename from installq/langs/hr/flag.jpg rename to install/langs/hr/flag.jpg diff --git a/installq/langs/hr/img/hr-default-category.jpg b/install/langs/hr/img/hr-default-category.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-category.jpg rename to install/langs/hr/img/hr-default-category.jpg diff --git a/installq/langs/hr/img/hr-default-home.jpg b/install/langs/hr/img/hr-default-home.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-home.jpg rename to install/langs/hr/img/hr-default-home.jpg diff --git a/installq/langs/hr/img/hr-default-large.jpg b/install/langs/hr/img/hr-default-large.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-large.jpg rename to install/langs/hr/img/hr-default-large.jpg diff --git a/installq/langs/hr/img/hr-default-large_scene.jpg b/install/langs/hr/img/hr-default-large_scene.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-large_scene.jpg rename to install/langs/hr/img/hr-default-large_scene.jpg diff --git a/installq/langs/hr/img/hr-default-medium.jpg b/install/langs/hr/img/hr-default-medium.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-medium.jpg rename to install/langs/hr/img/hr-default-medium.jpg diff --git a/installq/langs/hr/img/hr-default-small.jpg b/install/langs/hr/img/hr-default-small.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-small.jpg rename to install/langs/hr/img/hr-default-small.jpg diff --git a/installq/langs/hr/img/hr-default-thickbox.jpg b/install/langs/hr/img/hr-default-thickbox.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-thickbox.jpg rename to install/langs/hr/img/hr-default-thickbox.jpg diff --git a/installq/langs/hr/img/hr-default-thumb_scene.jpg b/install/langs/hr/img/hr-default-thumb_scene.jpg similarity index 100% rename from installq/langs/hr/img/hr-default-thumb_scene.jpg rename to install/langs/hr/img/hr-default-thumb_scene.jpg diff --git a/installq/langs/hr/img/hr.jpg b/install/langs/hr/img/hr.jpg similarity index 100% rename from installq/langs/hr/img/hr.jpg rename to install/langs/hr/img/hr.jpg diff --git a/installq/langs/hr/img/index.php b/install/langs/hr/img/index.php similarity index 100% rename from installq/langs/hr/img/index.php rename to install/langs/hr/img/index.php diff --git a/installq/langs/hr/index.php b/install/langs/hr/index.php similarity index 100% rename from installq/langs/hr/index.php rename to install/langs/hr/index.php diff --git a/installq/langs/hr/install.php b/install/langs/hr/install.php similarity index 100% rename from installq/langs/hr/install.php rename to install/langs/hr/install.php diff --git a/installq/langs/hr/language.xml b/install/langs/hr/language.xml similarity index 100% rename from installq/langs/hr/language.xml rename to install/langs/hr/language.xml diff --git a/installq/langs/hr/mail_identifiers.txt b/install/langs/hr/mail_identifiers.txt similarity index 100% rename from installq/langs/hr/mail_identifiers.txt rename to install/langs/hr/mail_identifiers.txt diff --git a/installq/langs/hu/data/carrier.xml b/install/langs/hu/data/carrier.xml similarity index 100% rename from installq/langs/hu/data/carrier.xml rename to install/langs/hu/data/carrier.xml diff --git a/installq/langs/hu/data/category.xml b/install/langs/hu/data/category.xml similarity index 100% rename from installq/langs/hu/data/category.xml rename to install/langs/hu/data/category.xml diff --git a/installq/langs/hu/data/cms.xml b/install/langs/hu/data/cms.xml similarity index 100% rename from installq/langs/hu/data/cms.xml rename to install/langs/hu/data/cms.xml diff --git a/installq/langs/hu/data/cms_category.xml b/install/langs/hu/data/cms_category.xml similarity index 100% rename from installq/langs/hu/data/cms_category.xml rename to install/langs/hu/data/cms_category.xml diff --git a/installq/langs/hu/data/configuration.xml b/install/langs/hu/data/configuration.xml similarity index 100% rename from installq/langs/hu/data/configuration.xml rename to install/langs/hu/data/configuration.xml diff --git a/installq/langs/hu/data/contact.xml b/install/langs/hu/data/contact.xml similarity index 100% rename from installq/langs/hu/data/contact.xml rename to install/langs/hu/data/contact.xml diff --git a/installq/langs/hu/data/country.xml b/install/langs/hu/data/country.xml similarity index 100% rename from installq/langs/hu/data/country.xml rename to install/langs/hu/data/country.xml diff --git a/installq/langs/hu/data/gender.xml b/install/langs/hu/data/gender.xml similarity index 100% rename from installq/langs/hu/data/gender.xml rename to install/langs/hu/data/gender.xml diff --git a/installq/langs/hu/data/group.xml b/install/langs/hu/data/group.xml similarity index 100% rename from installq/langs/hu/data/group.xml rename to install/langs/hu/data/group.xml diff --git a/installq/langs/hu/data/index.php b/install/langs/hu/data/index.php similarity index 100% rename from installq/langs/hu/data/index.php rename to install/langs/hu/data/index.php diff --git a/installq/langs/hu/data/meta.xml b/install/langs/hu/data/meta.xml similarity index 100% rename from installq/langs/hu/data/meta.xml rename to install/langs/hu/data/meta.xml diff --git a/installq/langs/hu/data/order_return_state.xml b/install/langs/hu/data/order_return_state.xml similarity index 100% rename from installq/langs/hu/data/order_return_state.xml rename to install/langs/hu/data/order_return_state.xml diff --git a/installq/langs/hu/data/order_state.xml b/install/langs/hu/data/order_state.xml similarity index 100% rename from installq/langs/hu/data/order_state.xml rename to install/langs/hu/data/order_state.xml diff --git a/installq/langs/hu/data/profile.xml b/install/langs/hu/data/profile.xml similarity index 100% rename from installq/langs/hu/data/profile.xml rename to install/langs/hu/data/profile.xml diff --git a/installq/langs/hu/data/quick_access.xml b/install/langs/hu/data/quick_access.xml similarity index 100% rename from installq/langs/hu/data/quick_access.xml rename to install/langs/hu/data/quick_access.xml diff --git a/installq/langs/hu/data/risk.xml b/install/langs/hu/data/risk.xml similarity index 100% rename from installq/langs/hu/data/risk.xml rename to install/langs/hu/data/risk.xml diff --git a/installq/langs/hu/data/stock_mvt_reason.xml b/install/langs/hu/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/hu/data/stock_mvt_reason.xml rename to install/langs/hu/data/stock_mvt_reason.xml diff --git a/installq/langs/hu/data/supplier_order_state.xml b/install/langs/hu/data/supplier_order_state.xml similarity index 100% rename from installq/langs/hu/data/supplier_order_state.xml rename to install/langs/hu/data/supplier_order_state.xml diff --git a/installq/langs/hu/data/supply_order_state.xml b/install/langs/hu/data/supply_order_state.xml similarity index 100% rename from installq/langs/hu/data/supply_order_state.xml rename to install/langs/hu/data/supply_order_state.xml diff --git a/installq/langs/hu/data/tab.xml b/install/langs/hu/data/tab.xml similarity index 100% rename from installq/langs/hu/data/tab.xml rename to install/langs/hu/data/tab.xml diff --git a/installq/langs/hu/flag.jpg b/install/langs/hu/flag.jpg similarity index 100% rename from installq/langs/hu/flag.jpg rename to install/langs/hu/flag.jpg diff --git a/installq/langs/hu/img/hu-default-category.jpg b/install/langs/hu/img/hu-default-category.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-category.jpg rename to install/langs/hu/img/hu-default-category.jpg diff --git a/installq/langs/hu/img/hu-default-home.jpg b/install/langs/hu/img/hu-default-home.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-home.jpg rename to install/langs/hu/img/hu-default-home.jpg diff --git a/installq/langs/hu/img/hu-default-large.jpg b/install/langs/hu/img/hu-default-large.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-large.jpg rename to install/langs/hu/img/hu-default-large.jpg diff --git a/installq/langs/hu/img/hu-default-large_scene.jpg b/install/langs/hu/img/hu-default-large_scene.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-large_scene.jpg rename to install/langs/hu/img/hu-default-large_scene.jpg diff --git a/installq/langs/hu/img/hu-default-medium.jpg b/install/langs/hu/img/hu-default-medium.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-medium.jpg rename to install/langs/hu/img/hu-default-medium.jpg diff --git a/installq/langs/hu/img/hu-default-small.jpg b/install/langs/hu/img/hu-default-small.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-small.jpg rename to install/langs/hu/img/hu-default-small.jpg diff --git a/installq/langs/hu/img/hu-default-thickbox.jpg b/install/langs/hu/img/hu-default-thickbox.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-thickbox.jpg rename to install/langs/hu/img/hu-default-thickbox.jpg diff --git a/installq/langs/hu/img/hu-default-thumb_scene.jpg b/install/langs/hu/img/hu-default-thumb_scene.jpg similarity index 100% rename from installq/langs/hu/img/hu-default-thumb_scene.jpg rename to install/langs/hu/img/hu-default-thumb_scene.jpg diff --git a/installq/langs/hu/img/hu.jpg b/install/langs/hu/img/hu.jpg similarity index 100% rename from installq/langs/hu/img/hu.jpg rename to install/langs/hu/img/hu.jpg diff --git a/installq/langs/hu/img/index.php b/install/langs/hu/img/index.php similarity index 100% rename from installq/langs/hu/img/index.php rename to install/langs/hu/img/index.php diff --git a/installq/langs/hu/index.php b/install/langs/hu/index.php similarity index 100% rename from installq/langs/hu/index.php rename to install/langs/hu/index.php diff --git a/installq/langs/hu/install.php b/install/langs/hu/install.php similarity index 100% rename from installq/langs/hu/install.php rename to install/langs/hu/install.php diff --git a/installq/langs/hu/language.xml b/install/langs/hu/language.xml similarity index 100% rename from installq/langs/hu/language.xml rename to install/langs/hu/language.xml diff --git a/installq/langs/hu/mail_identifiers.txt b/install/langs/hu/mail_identifiers.txt similarity index 100% rename from installq/langs/hu/mail_identifiers.txt rename to install/langs/hu/mail_identifiers.txt diff --git a/installq/langs/id/data/carrier.xml b/install/langs/id/data/carrier.xml similarity index 100% rename from installq/langs/id/data/carrier.xml rename to install/langs/id/data/carrier.xml diff --git a/installq/langs/id/data/category.xml b/install/langs/id/data/category.xml similarity index 100% rename from installq/langs/id/data/category.xml rename to install/langs/id/data/category.xml diff --git a/installq/langs/id/data/cms.xml b/install/langs/id/data/cms.xml similarity index 100% rename from installq/langs/id/data/cms.xml rename to install/langs/id/data/cms.xml diff --git a/installq/langs/id/data/cms_category.xml b/install/langs/id/data/cms_category.xml similarity index 100% rename from installq/langs/id/data/cms_category.xml rename to install/langs/id/data/cms_category.xml diff --git a/installq/langs/id/data/configuration.xml b/install/langs/id/data/configuration.xml similarity index 100% rename from installq/langs/id/data/configuration.xml rename to install/langs/id/data/configuration.xml diff --git a/installq/langs/id/data/contact.xml b/install/langs/id/data/contact.xml similarity index 100% rename from installq/langs/id/data/contact.xml rename to install/langs/id/data/contact.xml diff --git a/installq/langs/id/data/country.xml b/install/langs/id/data/country.xml similarity index 100% rename from installq/langs/id/data/country.xml rename to install/langs/id/data/country.xml diff --git a/installq/langs/id/data/gender.xml b/install/langs/id/data/gender.xml similarity index 100% rename from installq/langs/id/data/gender.xml rename to install/langs/id/data/gender.xml diff --git a/installq/langs/id/data/group.xml b/install/langs/id/data/group.xml similarity index 100% rename from installq/langs/id/data/group.xml rename to install/langs/id/data/group.xml diff --git a/installq/langs/id/data/index.php b/install/langs/id/data/index.php similarity index 100% rename from installq/langs/id/data/index.php rename to install/langs/id/data/index.php diff --git a/installq/langs/id/data/meta.xml b/install/langs/id/data/meta.xml similarity index 100% rename from installq/langs/id/data/meta.xml rename to install/langs/id/data/meta.xml diff --git a/installq/langs/id/data/order_return_state.xml b/install/langs/id/data/order_return_state.xml similarity index 100% rename from installq/langs/id/data/order_return_state.xml rename to install/langs/id/data/order_return_state.xml diff --git a/installq/langs/id/data/order_state.xml b/install/langs/id/data/order_state.xml similarity index 100% rename from installq/langs/id/data/order_state.xml rename to install/langs/id/data/order_state.xml diff --git a/installq/langs/id/data/profile.xml b/install/langs/id/data/profile.xml similarity index 100% rename from installq/langs/id/data/profile.xml rename to install/langs/id/data/profile.xml diff --git a/installq/langs/id/data/quick_access.xml b/install/langs/id/data/quick_access.xml similarity index 100% rename from installq/langs/id/data/quick_access.xml rename to install/langs/id/data/quick_access.xml diff --git a/installq/langs/id/data/risk.xml b/install/langs/id/data/risk.xml similarity index 100% rename from installq/langs/id/data/risk.xml rename to install/langs/id/data/risk.xml diff --git a/installq/langs/id/data/stock_mvt_reason.xml b/install/langs/id/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/id/data/stock_mvt_reason.xml rename to install/langs/id/data/stock_mvt_reason.xml diff --git a/installq/langs/id/data/supplier_order_state.xml b/install/langs/id/data/supplier_order_state.xml similarity index 100% rename from installq/langs/id/data/supplier_order_state.xml rename to install/langs/id/data/supplier_order_state.xml diff --git a/installq/langs/id/data/supply_order_state.xml b/install/langs/id/data/supply_order_state.xml similarity index 100% rename from installq/langs/id/data/supply_order_state.xml rename to install/langs/id/data/supply_order_state.xml diff --git a/installq/langs/id/data/tab.xml b/install/langs/id/data/tab.xml similarity index 100% rename from installq/langs/id/data/tab.xml rename to install/langs/id/data/tab.xml diff --git a/installq/langs/id/flag.jpg b/install/langs/id/flag.jpg similarity index 100% rename from installq/langs/id/flag.jpg rename to install/langs/id/flag.jpg diff --git a/installq/langs/id/img/id-default-category.jpg b/install/langs/id/img/id-default-category.jpg similarity index 100% rename from installq/langs/id/img/id-default-category.jpg rename to install/langs/id/img/id-default-category.jpg diff --git a/installq/langs/id/img/id-default-home.jpg b/install/langs/id/img/id-default-home.jpg similarity index 100% rename from installq/langs/id/img/id-default-home.jpg rename to install/langs/id/img/id-default-home.jpg diff --git a/installq/langs/id/img/id-default-large.jpg b/install/langs/id/img/id-default-large.jpg similarity index 100% rename from installq/langs/id/img/id-default-large.jpg rename to install/langs/id/img/id-default-large.jpg diff --git a/installq/langs/id/img/id-default-large_scene.jpg b/install/langs/id/img/id-default-large_scene.jpg similarity index 100% rename from installq/langs/id/img/id-default-large_scene.jpg rename to install/langs/id/img/id-default-large_scene.jpg diff --git a/installq/langs/id/img/id-default-medium.jpg b/install/langs/id/img/id-default-medium.jpg similarity index 100% rename from installq/langs/id/img/id-default-medium.jpg rename to install/langs/id/img/id-default-medium.jpg diff --git a/installq/langs/id/img/id-default-small.jpg b/install/langs/id/img/id-default-small.jpg similarity index 100% rename from installq/langs/id/img/id-default-small.jpg rename to install/langs/id/img/id-default-small.jpg diff --git a/installq/langs/id/img/id-default-thickbox.jpg b/install/langs/id/img/id-default-thickbox.jpg similarity index 100% rename from installq/langs/id/img/id-default-thickbox.jpg rename to install/langs/id/img/id-default-thickbox.jpg diff --git a/installq/langs/id/img/id-default-thumb_scene.jpg b/install/langs/id/img/id-default-thumb_scene.jpg similarity index 100% rename from installq/langs/id/img/id-default-thumb_scene.jpg rename to install/langs/id/img/id-default-thumb_scene.jpg diff --git a/installq/langs/id/img/id.jpg b/install/langs/id/img/id.jpg similarity index 100% rename from installq/langs/id/img/id.jpg rename to install/langs/id/img/id.jpg diff --git a/installq/langs/id/img/index.php b/install/langs/id/img/index.php similarity index 100% rename from installq/langs/id/img/index.php rename to install/langs/id/img/index.php diff --git a/installq/langs/id/index.php b/install/langs/id/index.php similarity index 100% rename from installq/langs/id/index.php rename to install/langs/id/index.php diff --git a/installq/langs/id/install.php b/install/langs/id/install.php similarity index 100% rename from installq/langs/id/install.php rename to install/langs/id/install.php diff --git a/installq/langs/id/language.xml b/install/langs/id/language.xml similarity index 100% rename from installq/langs/id/language.xml rename to install/langs/id/language.xml diff --git a/installq/langs/id/mail_identifiers.txt b/install/langs/id/mail_identifiers.txt similarity index 100% rename from installq/langs/id/mail_identifiers.txt rename to install/langs/id/mail_identifiers.txt diff --git a/installq/langs/index.php b/install/langs/index.php similarity index 100% rename from installq/langs/index.php rename to install/langs/index.php diff --git a/installq/langs/it/data/carrier.xml b/install/langs/it/data/carrier.xml similarity index 100% rename from installq/langs/it/data/carrier.xml rename to install/langs/it/data/carrier.xml diff --git a/installq/langs/it/data/category.xml b/install/langs/it/data/category.xml similarity index 100% rename from installq/langs/it/data/category.xml rename to install/langs/it/data/category.xml diff --git a/installq/langs/it/data/cms.xml b/install/langs/it/data/cms.xml similarity index 100% rename from installq/langs/it/data/cms.xml rename to install/langs/it/data/cms.xml diff --git a/installq/langs/it/data/cms_category.xml b/install/langs/it/data/cms_category.xml similarity index 100% rename from installq/langs/it/data/cms_category.xml rename to install/langs/it/data/cms_category.xml diff --git a/installq/langs/it/data/configuration.xml b/install/langs/it/data/configuration.xml similarity index 100% rename from installq/langs/it/data/configuration.xml rename to install/langs/it/data/configuration.xml diff --git a/installq/langs/it/data/contact.xml b/install/langs/it/data/contact.xml similarity index 100% rename from installq/langs/it/data/contact.xml rename to install/langs/it/data/contact.xml diff --git a/installq/langs/it/data/country.xml b/install/langs/it/data/country.xml similarity index 100% rename from installq/langs/it/data/country.xml rename to install/langs/it/data/country.xml diff --git a/installq/langs/it/data/gender.xml b/install/langs/it/data/gender.xml similarity index 100% rename from installq/langs/it/data/gender.xml rename to install/langs/it/data/gender.xml diff --git a/installq/langs/it/data/group.xml b/install/langs/it/data/group.xml similarity index 100% rename from installq/langs/it/data/group.xml rename to install/langs/it/data/group.xml diff --git a/installq/langs/it/data/index.php b/install/langs/it/data/index.php similarity index 100% rename from installq/langs/it/data/index.php rename to install/langs/it/data/index.php diff --git a/installq/langs/it/data/meta.xml b/install/langs/it/data/meta.xml similarity index 100% rename from installq/langs/it/data/meta.xml rename to install/langs/it/data/meta.xml diff --git a/installq/langs/it/data/order_return_state.xml b/install/langs/it/data/order_return_state.xml similarity index 100% rename from installq/langs/it/data/order_return_state.xml rename to install/langs/it/data/order_return_state.xml diff --git a/installq/langs/it/data/order_state.xml b/install/langs/it/data/order_state.xml similarity index 100% rename from installq/langs/it/data/order_state.xml rename to install/langs/it/data/order_state.xml diff --git a/installq/langs/it/data/profile.xml b/install/langs/it/data/profile.xml similarity index 100% rename from installq/langs/it/data/profile.xml rename to install/langs/it/data/profile.xml diff --git a/installq/langs/it/data/quick_access.xml b/install/langs/it/data/quick_access.xml similarity index 100% rename from installq/langs/it/data/quick_access.xml rename to install/langs/it/data/quick_access.xml diff --git a/installq/langs/it/data/risk.xml b/install/langs/it/data/risk.xml similarity index 100% rename from installq/langs/it/data/risk.xml rename to install/langs/it/data/risk.xml diff --git a/installq/langs/it/data/stock_mvt_reason.xml b/install/langs/it/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/it/data/stock_mvt_reason.xml rename to install/langs/it/data/stock_mvt_reason.xml diff --git a/installq/langs/it/data/supplier_order_state.xml b/install/langs/it/data/supplier_order_state.xml similarity index 100% rename from installq/langs/it/data/supplier_order_state.xml rename to install/langs/it/data/supplier_order_state.xml diff --git a/installq/langs/it/data/supply_order_state.xml b/install/langs/it/data/supply_order_state.xml similarity index 100% rename from installq/langs/it/data/supply_order_state.xml rename to install/langs/it/data/supply_order_state.xml diff --git a/installq/langs/it/data/tab.xml b/install/langs/it/data/tab.xml similarity index 100% rename from installq/langs/it/data/tab.xml rename to install/langs/it/data/tab.xml diff --git a/installq/langs/it/flag.jpg b/install/langs/it/flag.jpg similarity index 100% rename from installq/langs/it/flag.jpg rename to install/langs/it/flag.jpg diff --git a/installq/langs/it/img/index.php b/install/langs/it/img/index.php similarity index 100% rename from installq/langs/it/img/index.php rename to install/langs/it/img/index.php diff --git a/installq/langs/it/img/it-default-category.jpg b/install/langs/it/img/it-default-category.jpg similarity index 100% rename from installq/langs/it/img/it-default-category.jpg rename to install/langs/it/img/it-default-category.jpg diff --git a/installq/langs/it/img/it-default-home.jpg b/install/langs/it/img/it-default-home.jpg similarity index 100% rename from installq/langs/it/img/it-default-home.jpg rename to install/langs/it/img/it-default-home.jpg diff --git a/installq/langs/it/img/it-default-large.jpg b/install/langs/it/img/it-default-large.jpg similarity index 100% rename from installq/langs/it/img/it-default-large.jpg rename to install/langs/it/img/it-default-large.jpg diff --git a/installq/langs/it/img/it-default-large_scene.jpg b/install/langs/it/img/it-default-large_scene.jpg similarity index 100% rename from installq/langs/it/img/it-default-large_scene.jpg rename to install/langs/it/img/it-default-large_scene.jpg diff --git a/installq/langs/it/img/it-default-medium.jpg b/install/langs/it/img/it-default-medium.jpg similarity index 100% rename from installq/langs/it/img/it-default-medium.jpg rename to install/langs/it/img/it-default-medium.jpg diff --git a/installq/langs/it/img/it-default-small.jpg b/install/langs/it/img/it-default-small.jpg similarity index 100% rename from installq/langs/it/img/it-default-small.jpg rename to install/langs/it/img/it-default-small.jpg diff --git a/installq/langs/it/img/it-default-thickbox.jpg b/install/langs/it/img/it-default-thickbox.jpg similarity index 100% rename from installq/langs/it/img/it-default-thickbox.jpg rename to install/langs/it/img/it-default-thickbox.jpg diff --git a/installq/langs/it/img/it-default-thumb_scene.jpg b/install/langs/it/img/it-default-thumb_scene.jpg similarity index 100% rename from installq/langs/it/img/it-default-thumb_scene.jpg rename to install/langs/it/img/it-default-thumb_scene.jpg diff --git a/installq/langs/it/img/it.jpg b/install/langs/it/img/it.jpg similarity index 100% rename from installq/langs/it/img/it.jpg rename to install/langs/it/img/it.jpg diff --git a/installq/langs/it/index.php b/install/langs/it/index.php similarity index 100% rename from installq/langs/it/index.php rename to install/langs/it/index.php diff --git a/installq/langs/it/install.php b/install/langs/it/install.php similarity index 100% rename from installq/langs/it/install.php rename to install/langs/it/install.php diff --git a/installq/langs/it/language.xml b/install/langs/it/language.xml similarity index 100% rename from installq/langs/it/language.xml rename to install/langs/it/language.xml diff --git a/installq/langs/it/mail_identifiers.txt b/install/langs/it/mail_identifiers.txt similarity index 100% rename from installq/langs/it/mail_identifiers.txt rename to install/langs/it/mail_identifiers.txt diff --git a/installq/langs/lt/data/carrier.xml b/install/langs/lt/data/carrier.xml similarity index 100% rename from installq/langs/lt/data/carrier.xml rename to install/langs/lt/data/carrier.xml diff --git a/installq/langs/lt/data/category.xml b/install/langs/lt/data/category.xml similarity index 100% rename from installq/langs/lt/data/category.xml rename to install/langs/lt/data/category.xml diff --git a/installq/langs/lt/data/cms.xml b/install/langs/lt/data/cms.xml similarity index 100% rename from installq/langs/lt/data/cms.xml rename to install/langs/lt/data/cms.xml diff --git a/installq/langs/lt/data/cms_category.xml b/install/langs/lt/data/cms_category.xml similarity index 100% rename from installq/langs/lt/data/cms_category.xml rename to install/langs/lt/data/cms_category.xml diff --git a/installq/langs/lt/data/configuration.xml b/install/langs/lt/data/configuration.xml similarity index 100% rename from installq/langs/lt/data/configuration.xml rename to install/langs/lt/data/configuration.xml diff --git a/installq/langs/lt/data/contact.xml b/install/langs/lt/data/contact.xml similarity index 100% rename from installq/langs/lt/data/contact.xml rename to install/langs/lt/data/contact.xml diff --git a/installq/langs/lt/data/country.xml b/install/langs/lt/data/country.xml similarity index 100% rename from installq/langs/lt/data/country.xml rename to install/langs/lt/data/country.xml diff --git a/installq/langs/lt/data/gender.xml b/install/langs/lt/data/gender.xml similarity index 100% rename from installq/langs/lt/data/gender.xml rename to install/langs/lt/data/gender.xml diff --git a/installq/langs/lt/data/group.xml b/install/langs/lt/data/group.xml similarity index 100% rename from installq/langs/lt/data/group.xml rename to install/langs/lt/data/group.xml diff --git a/installq/langs/lt/data/index.php b/install/langs/lt/data/index.php similarity index 100% rename from installq/langs/lt/data/index.php rename to install/langs/lt/data/index.php diff --git a/installq/langs/lt/data/meta.xml b/install/langs/lt/data/meta.xml similarity index 100% rename from installq/langs/lt/data/meta.xml rename to install/langs/lt/data/meta.xml diff --git a/installq/langs/lt/data/order_return_state.xml b/install/langs/lt/data/order_return_state.xml similarity index 100% rename from installq/langs/lt/data/order_return_state.xml rename to install/langs/lt/data/order_return_state.xml diff --git a/installq/langs/lt/data/order_state.xml b/install/langs/lt/data/order_state.xml similarity index 100% rename from installq/langs/lt/data/order_state.xml rename to install/langs/lt/data/order_state.xml diff --git a/installq/langs/lt/data/profile.xml b/install/langs/lt/data/profile.xml similarity index 100% rename from installq/langs/lt/data/profile.xml rename to install/langs/lt/data/profile.xml diff --git a/installq/langs/lt/data/quick_access.xml b/install/langs/lt/data/quick_access.xml similarity index 100% rename from installq/langs/lt/data/quick_access.xml rename to install/langs/lt/data/quick_access.xml diff --git a/installq/langs/lt/data/risk.xml b/install/langs/lt/data/risk.xml similarity index 100% rename from installq/langs/lt/data/risk.xml rename to install/langs/lt/data/risk.xml diff --git a/installq/langs/lt/data/stock_mvt_reason.xml b/install/langs/lt/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/lt/data/stock_mvt_reason.xml rename to install/langs/lt/data/stock_mvt_reason.xml diff --git a/installq/langs/lt/data/supplier_order_state.xml b/install/langs/lt/data/supplier_order_state.xml similarity index 100% rename from installq/langs/lt/data/supplier_order_state.xml rename to install/langs/lt/data/supplier_order_state.xml diff --git a/installq/langs/lt/data/supply_order_state.xml b/install/langs/lt/data/supply_order_state.xml similarity index 100% rename from installq/langs/lt/data/supply_order_state.xml rename to install/langs/lt/data/supply_order_state.xml diff --git a/installq/langs/lt/data/tab.xml b/install/langs/lt/data/tab.xml similarity index 100% rename from installq/langs/lt/data/tab.xml rename to install/langs/lt/data/tab.xml diff --git a/installq/langs/lt/flag.jpg b/install/langs/lt/flag.jpg similarity index 100% rename from installq/langs/lt/flag.jpg rename to install/langs/lt/flag.jpg diff --git a/installq/langs/lt/img/index.php b/install/langs/lt/img/index.php similarity index 100% rename from installq/langs/lt/img/index.php rename to install/langs/lt/img/index.php diff --git a/installq/langs/lt/img/lt-default-category.jpg b/install/langs/lt/img/lt-default-category.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-category.jpg rename to install/langs/lt/img/lt-default-category.jpg diff --git a/installq/langs/lt/img/lt-default-home.jpg b/install/langs/lt/img/lt-default-home.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-home.jpg rename to install/langs/lt/img/lt-default-home.jpg diff --git a/installq/langs/lt/img/lt-default-large.jpg b/install/langs/lt/img/lt-default-large.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-large.jpg rename to install/langs/lt/img/lt-default-large.jpg diff --git a/installq/langs/lt/img/lt-default-large_scene.jpg b/install/langs/lt/img/lt-default-large_scene.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-large_scene.jpg rename to install/langs/lt/img/lt-default-large_scene.jpg diff --git a/installq/langs/lt/img/lt-default-medium.jpg b/install/langs/lt/img/lt-default-medium.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-medium.jpg rename to install/langs/lt/img/lt-default-medium.jpg diff --git a/installq/langs/lt/img/lt-default-small.jpg b/install/langs/lt/img/lt-default-small.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-small.jpg rename to install/langs/lt/img/lt-default-small.jpg diff --git a/installq/langs/lt/img/lt-default-thickbox.jpg b/install/langs/lt/img/lt-default-thickbox.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-thickbox.jpg rename to install/langs/lt/img/lt-default-thickbox.jpg diff --git a/installq/langs/lt/img/lt-default-thumb_scene.jpg b/install/langs/lt/img/lt-default-thumb_scene.jpg similarity index 100% rename from installq/langs/lt/img/lt-default-thumb_scene.jpg rename to install/langs/lt/img/lt-default-thumb_scene.jpg diff --git a/installq/langs/lt/img/lt.jpg b/install/langs/lt/img/lt.jpg similarity index 100% rename from installq/langs/lt/img/lt.jpg rename to install/langs/lt/img/lt.jpg diff --git a/installq/langs/lt/index.php b/install/langs/lt/index.php similarity index 100% rename from installq/langs/lt/index.php rename to install/langs/lt/index.php diff --git a/installq/langs/lt/install.php b/install/langs/lt/install.php similarity index 100% rename from installq/langs/lt/install.php rename to install/langs/lt/install.php diff --git a/installq/langs/lt/language.xml b/install/langs/lt/language.xml similarity index 100% rename from installq/langs/lt/language.xml rename to install/langs/lt/language.xml diff --git a/installq/langs/lt/mail_identifiers.txt b/install/langs/lt/mail_identifiers.txt similarity index 100% rename from installq/langs/lt/mail_identifiers.txt rename to install/langs/lt/mail_identifiers.txt diff --git a/installq/langs/mk/data/carrier.xml b/install/langs/mk/data/carrier.xml similarity index 100% rename from installq/langs/mk/data/carrier.xml rename to install/langs/mk/data/carrier.xml diff --git a/installq/langs/mk/data/category.xml b/install/langs/mk/data/category.xml similarity index 100% rename from installq/langs/mk/data/category.xml rename to install/langs/mk/data/category.xml diff --git a/installq/langs/mk/data/cms.xml b/install/langs/mk/data/cms.xml similarity index 100% rename from installq/langs/mk/data/cms.xml rename to install/langs/mk/data/cms.xml diff --git a/installq/langs/mk/data/cms_category.xml b/install/langs/mk/data/cms_category.xml similarity index 100% rename from installq/langs/mk/data/cms_category.xml rename to install/langs/mk/data/cms_category.xml diff --git a/installq/langs/mk/data/configuration.xml b/install/langs/mk/data/configuration.xml similarity index 100% rename from installq/langs/mk/data/configuration.xml rename to install/langs/mk/data/configuration.xml diff --git a/installq/langs/mk/data/contact.xml b/install/langs/mk/data/contact.xml similarity index 100% rename from installq/langs/mk/data/contact.xml rename to install/langs/mk/data/contact.xml diff --git a/installq/langs/mk/data/country.xml b/install/langs/mk/data/country.xml similarity index 100% rename from installq/langs/mk/data/country.xml rename to install/langs/mk/data/country.xml diff --git a/installq/langs/mk/data/gender.xml b/install/langs/mk/data/gender.xml similarity index 100% rename from installq/langs/mk/data/gender.xml rename to install/langs/mk/data/gender.xml diff --git a/installq/langs/mk/data/group.xml b/install/langs/mk/data/group.xml similarity index 100% rename from installq/langs/mk/data/group.xml rename to install/langs/mk/data/group.xml diff --git a/installq/langs/mk/data/index.php b/install/langs/mk/data/index.php similarity index 100% rename from installq/langs/mk/data/index.php rename to install/langs/mk/data/index.php diff --git a/installq/langs/mk/data/meta.xml b/install/langs/mk/data/meta.xml similarity index 100% rename from installq/langs/mk/data/meta.xml rename to install/langs/mk/data/meta.xml diff --git a/installq/langs/mk/data/order_return_state.xml b/install/langs/mk/data/order_return_state.xml similarity index 100% rename from installq/langs/mk/data/order_return_state.xml rename to install/langs/mk/data/order_return_state.xml diff --git a/installq/langs/mk/data/order_state.xml b/install/langs/mk/data/order_state.xml similarity index 100% rename from installq/langs/mk/data/order_state.xml rename to install/langs/mk/data/order_state.xml diff --git a/installq/langs/mk/data/profile.xml b/install/langs/mk/data/profile.xml similarity index 100% rename from installq/langs/mk/data/profile.xml rename to install/langs/mk/data/profile.xml diff --git a/installq/langs/mk/data/quick_access.xml b/install/langs/mk/data/quick_access.xml similarity index 100% rename from installq/langs/mk/data/quick_access.xml rename to install/langs/mk/data/quick_access.xml diff --git a/installq/langs/mk/data/risk.xml b/install/langs/mk/data/risk.xml similarity index 100% rename from installq/langs/mk/data/risk.xml rename to install/langs/mk/data/risk.xml diff --git a/installq/langs/mk/data/stock_mvt_reason.xml b/install/langs/mk/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/mk/data/stock_mvt_reason.xml rename to install/langs/mk/data/stock_mvt_reason.xml diff --git a/installq/langs/mk/data/supplier_order_state.xml b/install/langs/mk/data/supplier_order_state.xml similarity index 100% rename from installq/langs/mk/data/supplier_order_state.xml rename to install/langs/mk/data/supplier_order_state.xml diff --git a/installq/langs/mk/data/supply_order_state.xml b/install/langs/mk/data/supply_order_state.xml similarity index 100% rename from installq/langs/mk/data/supply_order_state.xml rename to install/langs/mk/data/supply_order_state.xml diff --git a/installq/langs/mk/data/tab.xml b/install/langs/mk/data/tab.xml similarity index 100% rename from installq/langs/mk/data/tab.xml rename to install/langs/mk/data/tab.xml diff --git a/installq/langs/mk/flag.jpg b/install/langs/mk/flag.jpg similarity index 100% rename from installq/langs/mk/flag.jpg rename to install/langs/mk/flag.jpg diff --git a/installq/langs/mk/img/index.php b/install/langs/mk/img/index.php similarity index 100% rename from installq/langs/mk/img/index.php rename to install/langs/mk/img/index.php diff --git a/installq/langs/mk/img/mk-default-category.jpg b/install/langs/mk/img/mk-default-category.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-category.jpg rename to install/langs/mk/img/mk-default-category.jpg diff --git a/installq/langs/mk/img/mk-default-home.jpg b/install/langs/mk/img/mk-default-home.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-home.jpg rename to install/langs/mk/img/mk-default-home.jpg diff --git a/installq/langs/mk/img/mk-default-large.jpg b/install/langs/mk/img/mk-default-large.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-large.jpg rename to install/langs/mk/img/mk-default-large.jpg diff --git a/installq/langs/mk/img/mk-default-large_scene.jpg b/install/langs/mk/img/mk-default-large_scene.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-large_scene.jpg rename to install/langs/mk/img/mk-default-large_scene.jpg diff --git a/installq/langs/mk/img/mk-default-medium.jpg b/install/langs/mk/img/mk-default-medium.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-medium.jpg rename to install/langs/mk/img/mk-default-medium.jpg diff --git a/installq/langs/mk/img/mk-default-small.jpg b/install/langs/mk/img/mk-default-small.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-small.jpg rename to install/langs/mk/img/mk-default-small.jpg diff --git a/installq/langs/mk/img/mk-default-thickbox.jpg b/install/langs/mk/img/mk-default-thickbox.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-thickbox.jpg rename to install/langs/mk/img/mk-default-thickbox.jpg diff --git a/installq/langs/mk/img/mk-default-thumb_scene.jpg b/install/langs/mk/img/mk-default-thumb_scene.jpg similarity index 100% rename from installq/langs/mk/img/mk-default-thumb_scene.jpg rename to install/langs/mk/img/mk-default-thumb_scene.jpg diff --git a/installq/langs/mk/img/mk.jpg b/install/langs/mk/img/mk.jpg similarity index 100% rename from installq/langs/mk/img/mk.jpg rename to install/langs/mk/img/mk.jpg diff --git a/installq/langs/mk/index.php b/install/langs/mk/index.php similarity index 100% rename from installq/langs/mk/index.php rename to install/langs/mk/index.php diff --git a/installq/langs/mk/install.php b/install/langs/mk/install.php similarity index 100% rename from installq/langs/mk/install.php rename to install/langs/mk/install.php diff --git a/installq/langs/mk/language.xml b/install/langs/mk/language.xml similarity index 100% rename from installq/langs/mk/language.xml rename to install/langs/mk/language.xml diff --git a/installq/langs/mk/mail_identifiers.txt b/install/langs/mk/mail_identifiers.txt similarity index 100% rename from installq/langs/mk/mail_identifiers.txt rename to install/langs/mk/mail_identifiers.txt diff --git a/installq/langs/nl/data/carrier.xml b/install/langs/nl/data/carrier.xml similarity index 100% rename from installq/langs/nl/data/carrier.xml rename to install/langs/nl/data/carrier.xml diff --git a/installq/langs/nl/data/category.xml b/install/langs/nl/data/category.xml similarity index 100% rename from installq/langs/nl/data/category.xml rename to install/langs/nl/data/category.xml diff --git a/installq/langs/nl/data/cms.xml b/install/langs/nl/data/cms.xml similarity index 100% rename from installq/langs/nl/data/cms.xml rename to install/langs/nl/data/cms.xml diff --git a/installq/langs/nl/data/cms_category.xml b/install/langs/nl/data/cms_category.xml similarity index 100% rename from installq/langs/nl/data/cms_category.xml rename to install/langs/nl/data/cms_category.xml diff --git a/installq/langs/nl/data/configuration.xml b/install/langs/nl/data/configuration.xml similarity index 100% rename from installq/langs/nl/data/configuration.xml rename to install/langs/nl/data/configuration.xml diff --git a/installq/langs/nl/data/contact.xml b/install/langs/nl/data/contact.xml similarity index 100% rename from installq/langs/nl/data/contact.xml rename to install/langs/nl/data/contact.xml diff --git a/installq/langs/nl/data/country.xml b/install/langs/nl/data/country.xml similarity index 100% rename from installq/langs/nl/data/country.xml rename to install/langs/nl/data/country.xml diff --git a/installq/langs/nl/data/gender.xml b/install/langs/nl/data/gender.xml similarity index 100% rename from installq/langs/nl/data/gender.xml rename to install/langs/nl/data/gender.xml diff --git a/installq/langs/nl/data/group.xml b/install/langs/nl/data/group.xml similarity index 100% rename from installq/langs/nl/data/group.xml rename to install/langs/nl/data/group.xml diff --git a/installq/langs/nl/data/index.php b/install/langs/nl/data/index.php similarity index 100% rename from installq/langs/nl/data/index.php rename to install/langs/nl/data/index.php diff --git a/installq/langs/nl/data/meta.xml b/install/langs/nl/data/meta.xml similarity index 100% rename from installq/langs/nl/data/meta.xml rename to install/langs/nl/data/meta.xml diff --git a/installq/langs/nl/data/order_return_state.xml b/install/langs/nl/data/order_return_state.xml similarity index 100% rename from installq/langs/nl/data/order_return_state.xml rename to install/langs/nl/data/order_return_state.xml diff --git a/installq/langs/nl/data/order_state.xml b/install/langs/nl/data/order_state.xml similarity index 100% rename from installq/langs/nl/data/order_state.xml rename to install/langs/nl/data/order_state.xml diff --git a/installq/langs/nl/data/profile.xml b/install/langs/nl/data/profile.xml similarity index 100% rename from installq/langs/nl/data/profile.xml rename to install/langs/nl/data/profile.xml diff --git a/installq/langs/nl/data/quick_access.xml b/install/langs/nl/data/quick_access.xml similarity index 100% rename from installq/langs/nl/data/quick_access.xml rename to install/langs/nl/data/quick_access.xml diff --git a/installq/langs/nl/data/risk.xml b/install/langs/nl/data/risk.xml similarity index 100% rename from installq/langs/nl/data/risk.xml rename to install/langs/nl/data/risk.xml diff --git a/installq/langs/nl/data/stock_mvt_reason.xml b/install/langs/nl/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/nl/data/stock_mvt_reason.xml rename to install/langs/nl/data/stock_mvt_reason.xml diff --git a/installq/langs/nl/data/supplier_order_state.xml b/install/langs/nl/data/supplier_order_state.xml similarity index 100% rename from installq/langs/nl/data/supplier_order_state.xml rename to install/langs/nl/data/supplier_order_state.xml diff --git a/installq/langs/nl/data/supply_order_state.xml b/install/langs/nl/data/supply_order_state.xml similarity index 100% rename from installq/langs/nl/data/supply_order_state.xml rename to install/langs/nl/data/supply_order_state.xml diff --git a/installq/langs/nl/data/tab.xml b/install/langs/nl/data/tab.xml similarity index 100% rename from installq/langs/nl/data/tab.xml rename to install/langs/nl/data/tab.xml diff --git a/installq/langs/nl/flag.jpg b/install/langs/nl/flag.jpg similarity index 100% rename from installq/langs/nl/flag.jpg rename to install/langs/nl/flag.jpg diff --git a/installq/langs/nl/img/index.php b/install/langs/nl/img/index.php similarity index 100% rename from installq/langs/nl/img/index.php rename to install/langs/nl/img/index.php diff --git a/installq/langs/nl/img/nl-default-category.jpg b/install/langs/nl/img/nl-default-category.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-category.jpg rename to install/langs/nl/img/nl-default-category.jpg diff --git a/installq/langs/nl/img/nl-default-home.jpg b/install/langs/nl/img/nl-default-home.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-home.jpg rename to install/langs/nl/img/nl-default-home.jpg diff --git a/installq/langs/nl/img/nl-default-large.jpg b/install/langs/nl/img/nl-default-large.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-large.jpg rename to install/langs/nl/img/nl-default-large.jpg diff --git a/installq/langs/nl/img/nl-default-large_scene.jpg b/install/langs/nl/img/nl-default-large_scene.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-large_scene.jpg rename to install/langs/nl/img/nl-default-large_scene.jpg diff --git a/installq/langs/nl/img/nl-default-medium.jpg b/install/langs/nl/img/nl-default-medium.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-medium.jpg rename to install/langs/nl/img/nl-default-medium.jpg diff --git a/installq/langs/nl/img/nl-default-small.jpg b/install/langs/nl/img/nl-default-small.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-small.jpg rename to install/langs/nl/img/nl-default-small.jpg diff --git a/installq/langs/nl/img/nl-default-thickbox.jpg b/install/langs/nl/img/nl-default-thickbox.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-thickbox.jpg rename to install/langs/nl/img/nl-default-thickbox.jpg diff --git a/installq/langs/nl/img/nl-default-thumb_scene.jpg b/install/langs/nl/img/nl-default-thumb_scene.jpg similarity index 100% rename from installq/langs/nl/img/nl-default-thumb_scene.jpg rename to install/langs/nl/img/nl-default-thumb_scene.jpg diff --git a/installq/langs/nl/img/nl.jpg b/install/langs/nl/img/nl.jpg similarity index 100% rename from installq/langs/nl/img/nl.jpg rename to install/langs/nl/img/nl.jpg diff --git a/installq/langs/nl/index.php b/install/langs/nl/index.php similarity index 100% rename from installq/langs/nl/index.php rename to install/langs/nl/index.php diff --git a/installq/langs/nl/install.php b/install/langs/nl/install.php similarity index 100% rename from installq/langs/nl/install.php rename to install/langs/nl/install.php diff --git a/installq/langs/nl/language.xml b/install/langs/nl/language.xml similarity index 100% rename from installq/langs/nl/language.xml rename to install/langs/nl/language.xml diff --git a/installq/langs/nl/mail_identifiers.txt b/install/langs/nl/mail_identifiers.txt similarity index 100% rename from installq/langs/nl/mail_identifiers.txt rename to install/langs/nl/mail_identifiers.txt diff --git a/installq/langs/no/data/carrier.xml b/install/langs/no/data/carrier.xml similarity index 100% rename from installq/langs/no/data/carrier.xml rename to install/langs/no/data/carrier.xml diff --git a/installq/langs/no/data/category.xml b/install/langs/no/data/category.xml similarity index 100% rename from installq/langs/no/data/category.xml rename to install/langs/no/data/category.xml diff --git a/installq/langs/no/data/cms.xml b/install/langs/no/data/cms.xml similarity index 100% rename from installq/langs/no/data/cms.xml rename to install/langs/no/data/cms.xml diff --git a/installq/langs/no/data/cms_category.xml b/install/langs/no/data/cms_category.xml similarity index 100% rename from installq/langs/no/data/cms_category.xml rename to install/langs/no/data/cms_category.xml diff --git a/installq/langs/no/data/configuration.xml b/install/langs/no/data/configuration.xml similarity index 100% rename from installq/langs/no/data/configuration.xml rename to install/langs/no/data/configuration.xml diff --git a/installq/langs/no/data/contact.xml b/install/langs/no/data/contact.xml similarity index 100% rename from installq/langs/no/data/contact.xml rename to install/langs/no/data/contact.xml diff --git a/installq/langs/no/data/country.xml b/install/langs/no/data/country.xml similarity index 100% rename from installq/langs/no/data/country.xml rename to install/langs/no/data/country.xml diff --git a/installq/langs/no/data/gender.xml b/install/langs/no/data/gender.xml similarity index 100% rename from installq/langs/no/data/gender.xml rename to install/langs/no/data/gender.xml diff --git a/installq/langs/no/data/group.xml b/install/langs/no/data/group.xml similarity index 100% rename from installq/langs/no/data/group.xml rename to install/langs/no/data/group.xml diff --git a/installq/langs/no/data/index.php b/install/langs/no/data/index.php similarity index 100% rename from installq/langs/no/data/index.php rename to install/langs/no/data/index.php diff --git a/installq/langs/no/data/meta.xml b/install/langs/no/data/meta.xml similarity index 100% rename from installq/langs/no/data/meta.xml rename to install/langs/no/data/meta.xml diff --git a/installq/langs/no/data/order_return_state.xml b/install/langs/no/data/order_return_state.xml similarity index 100% rename from installq/langs/no/data/order_return_state.xml rename to install/langs/no/data/order_return_state.xml diff --git a/installq/langs/no/data/order_state.xml b/install/langs/no/data/order_state.xml similarity index 100% rename from installq/langs/no/data/order_state.xml rename to install/langs/no/data/order_state.xml diff --git a/installq/langs/no/data/profile.xml b/install/langs/no/data/profile.xml similarity index 100% rename from installq/langs/no/data/profile.xml rename to install/langs/no/data/profile.xml diff --git a/installq/langs/no/data/quick_access.xml b/install/langs/no/data/quick_access.xml similarity index 100% rename from installq/langs/no/data/quick_access.xml rename to install/langs/no/data/quick_access.xml diff --git a/installq/langs/no/data/risk.xml b/install/langs/no/data/risk.xml similarity index 100% rename from installq/langs/no/data/risk.xml rename to install/langs/no/data/risk.xml diff --git a/installq/langs/no/data/stock_mvt_reason.xml b/install/langs/no/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/no/data/stock_mvt_reason.xml rename to install/langs/no/data/stock_mvt_reason.xml diff --git a/installq/langs/no/data/supplier_order_state.xml b/install/langs/no/data/supplier_order_state.xml similarity index 100% rename from installq/langs/no/data/supplier_order_state.xml rename to install/langs/no/data/supplier_order_state.xml diff --git a/installq/langs/no/data/supply_order_state.xml b/install/langs/no/data/supply_order_state.xml similarity index 100% rename from installq/langs/no/data/supply_order_state.xml rename to install/langs/no/data/supply_order_state.xml diff --git a/installq/langs/no/data/tab.xml b/install/langs/no/data/tab.xml similarity index 100% rename from installq/langs/no/data/tab.xml rename to install/langs/no/data/tab.xml diff --git a/installq/langs/no/flag.jpg b/install/langs/no/flag.jpg similarity index 100% rename from installq/langs/no/flag.jpg rename to install/langs/no/flag.jpg diff --git a/installq/langs/no/img/index.php b/install/langs/no/img/index.php similarity index 100% rename from installq/langs/no/img/index.php rename to install/langs/no/img/index.php diff --git a/installq/langs/no/img/no-default-category.jpg b/install/langs/no/img/no-default-category.jpg similarity index 100% rename from installq/langs/no/img/no-default-category.jpg rename to install/langs/no/img/no-default-category.jpg diff --git a/installq/langs/no/img/no-default-home.jpg b/install/langs/no/img/no-default-home.jpg similarity index 100% rename from installq/langs/no/img/no-default-home.jpg rename to install/langs/no/img/no-default-home.jpg diff --git a/installq/langs/no/img/no-default-large.jpg b/install/langs/no/img/no-default-large.jpg similarity index 100% rename from installq/langs/no/img/no-default-large.jpg rename to install/langs/no/img/no-default-large.jpg diff --git a/installq/langs/no/img/no-default-large_scene.jpg b/install/langs/no/img/no-default-large_scene.jpg similarity index 100% rename from installq/langs/no/img/no-default-large_scene.jpg rename to install/langs/no/img/no-default-large_scene.jpg diff --git a/installq/langs/no/img/no-default-medium.jpg b/install/langs/no/img/no-default-medium.jpg similarity index 100% rename from installq/langs/no/img/no-default-medium.jpg rename to install/langs/no/img/no-default-medium.jpg diff --git a/installq/langs/no/img/no-default-small.jpg b/install/langs/no/img/no-default-small.jpg similarity index 100% rename from installq/langs/no/img/no-default-small.jpg rename to install/langs/no/img/no-default-small.jpg diff --git a/installq/langs/no/img/no-default-thickbox.jpg b/install/langs/no/img/no-default-thickbox.jpg similarity index 100% rename from installq/langs/no/img/no-default-thickbox.jpg rename to install/langs/no/img/no-default-thickbox.jpg diff --git a/installq/langs/no/img/no-default-thumb_scene.jpg b/install/langs/no/img/no-default-thumb_scene.jpg similarity index 100% rename from installq/langs/no/img/no-default-thumb_scene.jpg rename to install/langs/no/img/no-default-thumb_scene.jpg diff --git a/installq/langs/no/img/no.jpg b/install/langs/no/img/no.jpg similarity index 100% rename from installq/langs/no/img/no.jpg rename to install/langs/no/img/no.jpg diff --git a/installq/langs/no/index.php b/install/langs/no/index.php similarity index 100% rename from installq/langs/no/index.php rename to install/langs/no/index.php diff --git a/installq/langs/no/install.php b/install/langs/no/install.php similarity index 100% rename from installq/langs/no/install.php rename to install/langs/no/install.php diff --git a/installq/langs/no/language.xml b/install/langs/no/language.xml similarity index 100% rename from installq/langs/no/language.xml rename to install/langs/no/language.xml diff --git a/installq/langs/no/mail_identifiers.txt b/install/langs/no/mail_identifiers.txt similarity index 100% rename from installq/langs/no/mail_identifiers.txt rename to install/langs/no/mail_identifiers.txt diff --git a/installq/langs/pl/data/carrier.xml b/install/langs/pl/data/carrier.xml similarity index 100% rename from installq/langs/pl/data/carrier.xml rename to install/langs/pl/data/carrier.xml diff --git a/installq/langs/pl/data/category.xml b/install/langs/pl/data/category.xml similarity index 100% rename from installq/langs/pl/data/category.xml rename to install/langs/pl/data/category.xml diff --git a/installq/langs/pl/data/cms.xml b/install/langs/pl/data/cms.xml similarity index 100% rename from installq/langs/pl/data/cms.xml rename to install/langs/pl/data/cms.xml diff --git a/installq/langs/pl/data/cms_category.xml b/install/langs/pl/data/cms_category.xml similarity index 100% rename from installq/langs/pl/data/cms_category.xml rename to install/langs/pl/data/cms_category.xml diff --git a/installq/langs/pl/data/configuration.xml b/install/langs/pl/data/configuration.xml similarity index 100% rename from installq/langs/pl/data/configuration.xml rename to install/langs/pl/data/configuration.xml diff --git a/installq/langs/pl/data/contact.xml b/install/langs/pl/data/contact.xml similarity index 100% rename from installq/langs/pl/data/contact.xml rename to install/langs/pl/data/contact.xml diff --git a/installq/langs/pl/data/country.xml b/install/langs/pl/data/country.xml similarity index 100% rename from installq/langs/pl/data/country.xml rename to install/langs/pl/data/country.xml diff --git a/installq/langs/pl/data/gender.xml b/install/langs/pl/data/gender.xml similarity index 100% rename from installq/langs/pl/data/gender.xml rename to install/langs/pl/data/gender.xml diff --git a/installq/langs/pl/data/group.xml b/install/langs/pl/data/group.xml similarity index 100% rename from installq/langs/pl/data/group.xml rename to install/langs/pl/data/group.xml diff --git a/installq/langs/pl/data/index.php b/install/langs/pl/data/index.php similarity index 100% rename from installq/langs/pl/data/index.php rename to install/langs/pl/data/index.php diff --git a/installq/langs/pl/data/meta.xml b/install/langs/pl/data/meta.xml similarity index 100% rename from installq/langs/pl/data/meta.xml rename to install/langs/pl/data/meta.xml diff --git a/installq/langs/pl/data/order_return_state.xml b/install/langs/pl/data/order_return_state.xml similarity index 100% rename from installq/langs/pl/data/order_return_state.xml rename to install/langs/pl/data/order_return_state.xml diff --git a/installq/langs/pl/data/order_state.xml b/install/langs/pl/data/order_state.xml similarity index 100% rename from installq/langs/pl/data/order_state.xml rename to install/langs/pl/data/order_state.xml diff --git a/installq/langs/pl/data/profile.xml b/install/langs/pl/data/profile.xml similarity index 100% rename from installq/langs/pl/data/profile.xml rename to install/langs/pl/data/profile.xml diff --git a/installq/langs/pl/data/quick_access.xml b/install/langs/pl/data/quick_access.xml similarity index 100% rename from installq/langs/pl/data/quick_access.xml rename to install/langs/pl/data/quick_access.xml diff --git a/installq/langs/pl/data/risk.xml b/install/langs/pl/data/risk.xml similarity index 100% rename from installq/langs/pl/data/risk.xml rename to install/langs/pl/data/risk.xml diff --git a/installq/langs/pl/data/stock_mvt_reason.xml b/install/langs/pl/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/pl/data/stock_mvt_reason.xml rename to install/langs/pl/data/stock_mvt_reason.xml diff --git a/installq/langs/pl/data/supplier_order_state.xml b/install/langs/pl/data/supplier_order_state.xml similarity index 100% rename from installq/langs/pl/data/supplier_order_state.xml rename to install/langs/pl/data/supplier_order_state.xml diff --git a/installq/langs/pl/data/supply_order_state.xml b/install/langs/pl/data/supply_order_state.xml similarity index 100% rename from installq/langs/pl/data/supply_order_state.xml rename to install/langs/pl/data/supply_order_state.xml diff --git a/installq/langs/pl/data/tab.xml b/install/langs/pl/data/tab.xml similarity index 100% rename from installq/langs/pl/data/tab.xml rename to install/langs/pl/data/tab.xml diff --git a/installq/langs/pl/flag.jpg b/install/langs/pl/flag.jpg similarity index 100% rename from installq/langs/pl/flag.jpg rename to install/langs/pl/flag.jpg diff --git a/installq/langs/pl/img/flag.jpg b/install/langs/pl/img/flag.jpg similarity index 100% rename from installq/langs/pl/img/flag.jpg rename to install/langs/pl/img/flag.jpg diff --git a/installq/langs/pl/img/index.php b/install/langs/pl/img/index.php similarity index 100% rename from installq/langs/pl/img/index.php rename to install/langs/pl/img/index.php diff --git a/installq/langs/pl/img/pl-default-category.jpg b/install/langs/pl/img/pl-default-category.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-category.jpg rename to install/langs/pl/img/pl-default-category.jpg diff --git a/installq/langs/pl/img/pl-default-home.jpg b/install/langs/pl/img/pl-default-home.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-home.jpg rename to install/langs/pl/img/pl-default-home.jpg diff --git a/installq/langs/pl/img/pl-default-large.jpg b/install/langs/pl/img/pl-default-large.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-large.jpg rename to install/langs/pl/img/pl-default-large.jpg diff --git a/installq/langs/pl/img/pl-default-large_scene.jpg b/install/langs/pl/img/pl-default-large_scene.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-large_scene.jpg rename to install/langs/pl/img/pl-default-large_scene.jpg diff --git a/installq/langs/pl/img/pl-default-medium.jpg b/install/langs/pl/img/pl-default-medium.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-medium.jpg rename to install/langs/pl/img/pl-default-medium.jpg diff --git a/installq/langs/pl/img/pl-default-small.jpg b/install/langs/pl/img/pl-default-small.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-small.jpg rename to install/langs/pl/img/pl-default-small.jpg diff --git a/installq/langs/pl/img/pl-default-thickbox.jpg b/install/langs/pl/img/pl-default-thickbox.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-thickbox.jpg rename to install/langs/pl/img/pl-default-thickbox.jpg diff --git a/installq/langs/pl/img/pl-default-thumb_scene.jpg b/install/langs/pl/img/pl-default-thumb_scene.jpg similarity index 100% rename from installq/langs/pl/img/pl-default-thumb_scene.jpg rename to install/langs/pl/img/pl-default-thumb_scene.jpg diff --git a/installq/langs/pl/img/pl.jpg b/install/langs/pl/img/pl.jpg similarity index 100% rename from installq/langs/pl/img/pl.jpg rename to install/langs/pl/img/pl.jpg diff --git a/installq/langs/pl/index.php b/install/langs/pl/index.php similarity index 100% rename from installq/langs/pl/index.php rename to install/langs/pl/index.php diff --git a/installq/langs/pl/install.php b/install/langs/pl/install.php similarity index 100% rename from installq/langs/pl/install.php rename to install/langs/pl/install.php diff --git a/installq/langs/pl/language.xml b/install/langs/pl/language.xml similarity index 100% rename from installq/langs/pl/language.xml rename to install/langs/pl/language.xml diff --git a/installq/langs/pl/mail_identifiers.txt b/install/langs/pl/mail_identifiers.txt similarity index 100% rename from installq/langs/pl/mail_identifiers.txt rename to install/langs/pl/mail_identifiers.txt diff --git a/installq/langs/pt/data/carrier.xml b/install/langs/pt/data/carrier.xml similarity index 100% rename from installq/langs/pt/data/carrier.xml rename to install/langs/pt/data/carrier.xml diff --git a/installq/langs/pt/data/category.xml b/install/langs/pt/data/category.xml similarity index 100% rename from installq/langs/pt/data/category.xml rename to install/langs/pt/data/category.xml diff --git a/installq/langs/pt/data/cms.xml b/install/langs/pt/data/cms.xml similarity index 100% rename from installq/langs/pt/data/cms.xml rename to install/langs/pt/data/cms.xml diff --git a/installq/langs/pt/data/cms_category.xml b/install/langs/pt/data/cms_category.xml similarity index 100% rename from installq/langs/pt/data/cms_category.xml rename to install/langs/pt/data/cms_category.xml diff --git a/installq/langs/pt/data/configuration.xml b/install/langs/pt/data/configuration.xml similarity index 100% rename from installq/langs/pt/data/configuration.xml rename to install/langs/pt/data/configuration.xml diff --git a/installq/langs/pt/data/contact.xml b/install/langs/pt/data/contact.xml similarity index 100% rename from installq/langs/pt/data/contact.xml rename to install/langs/pt/data/contact.xml diff --git a/installq/langs/pt/data/country.xml b/install/langs/pt/data/country.xml similarity index 100% rename from installq/langs/pt/data/country.xml rename to install/langs/pt/data/country.xml diff --git a/installq/langs/pt/data/gender.xml b/install/langs/pt/data/gender.xml similarity index 100% rename from installq/langs/pt/data/gender.xml rename to install/langs/pt/data/gender.xml diff --git a/installq/langs/pt/data/group.xml b/install/langs/pt/data/group.xml similarity index 100% rename from installq/langs/pt/data/group.xml rename to install/langs/pt/data/group.xml diff --git a/installq/langs/pt/data/index.php b/install/langs/pt/data/index.php similarity index 100% rename from installq/langs/pt/data/index.php rename to install/langs/pt/data/index.php diff --git a/installq/langs/pt/data/meta.xml b/install/langs/pt/data/meta.xml similarity index 100% rename from installq/langs/pt/data/meta.xml rename to install/langs/pt/data/meta.xml diff --git a/installq/langs/pt/data/order_return_state.xml b/install/langs/pt/data/order_return_state.xml similarity index 100% rename from installq/langs/pt/data/order_return_state.xml rename to install/langs/pt/data/order_return_state.xml diff --git a/installq/langs/pt/data/order_state.xml b/install/langs/pt/data/order_state.xml similarity index 100% rename from installq/langs/pt/data/order_state.xml rename to install/langs/pt/data/order_state.xml diff --git a/installq/langs/pt/data/profile.xml b/install/langs/pt/data/profile.xml similarity index 100% rename from installq/langs/pt/data/profile.xml rename to install/langs/pt/data/profile.xml diff --git a/installq/langs/pt/data/quick_access.xml b/install/langs/pt/data/quick_access.xml similarity index 100% rename from installq/langs/pt/data/quick_access.xml rename to install/langs/pt/data/quick_access.xml diff --git a/installq/langs/pt/data/risk.xml b/install/langs/pt/data/risk.xml similarity index 100% rename from installq/langs/pt/data/risk.xml rename to install/langs/pt/data/risk.xml diff --git a/installq/langs/pt/data/stock_mvt_reason.xml b/install/langs/pt/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/pt/data/stock_mvt_reason.xml rename to install/langs/pt/data/stock_mvt_reason.xml diff --git a/installq/langs/pt/data/supplier_order_state.xml b/install/langs/pt/data/supplier_order_state.xml similarity index 100% rename from installq/langs/pt/data/supplier_order_state.xml rename to install/langs/pt/data/supplier_order_state.xml diff --git a/installq/langs/pt/data/supply_order_state.xml b/install/langs/pt/data/supply_order_state.xml similarity index 100% rename from installq/langs/pt/data/supply_order_state.xml rename to install/langs/pt/data/supply_order_state.xml diff --git a/installq/langs/pt/data/tab.xml b/install/langs/pt/data/tab.xml similarity index 100% rename from installq/langs/pt/data/tab.xml rename to install/langs/pt/data/tab.xml diff --git a/installq/langs/pt/flag.jpg b/install/langs/pt/flag.jpg similarity index 100% rename from installq/langs/pt/flag.jpg rename to install/langs/pt/flag.jpg diff --git a/installq/langs/pt/img/index.php b/install/langs/pt/img/index.php similarity index 100% rename from installq/langs/pt/img/index.php rename to install/langs/pt/img/index.php diff --git a/installq/langs/pt/img/pt-default-category.jpg b/install/langs/pt/img/pt-default-category.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-category.jpg rename to install/langs/pt/img/pt-default-category.jpg diff --git a/installq/langs/pt/img/pt-default-home.jpg b/install/langs/pt/img/pt-default-home.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-home.jpg rename to install/langs/pt/img/pt-default-home.jpg diff --git a/installq/langs/pt/img/pt-default-large.jpg b/install/langs/pt/img/pt-default-large.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-large.jpg rename to install/langs/pt/img/pt-default-large.jpg diff --git a/installq/langs/pt/img/pt-default-large_scene.jpg b/install/langs/pt/img/pt-default-large_scene.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-large_scene.jpg rename to install/langs/pt/img/pt-default-large_scene.jpg diff --git a/installq/langs/pt/img/pt-default-medium.jpg b/install/langs/pt/img/pt-default-medium.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-medium.jpg rename to install/langs/pt/img/pt-default-medium.jpg diff --git a/installq/langs/pt/img/pt-default-small.jpg b/install/langs/pt/img/pt-default-small.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-small.jpg rename to install/langs/pt/img/pt-default-small.jpg diff --git a/installq/langs/pt/img/pt-default-thickbox.jpg b/install/langs/pt/img/pt-default-thickbox.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-thickbox.jpg rename to install/langs/pt/img/pt-default-thickbox.jpg diff --git a/installq/langs/pt/img/pt-default-thumb_scene.jpg b/install/langs/pt/img/pt-default-thumb_scene.jpg similarity index 100% rename from installq/langs/pt/img/pt-default-thumb_scene.jpg rename to install/langs/pt/img/pt-default-thumb_scene.jpg diff --git a/installq/langs/pt/img/pt.jpg b/install/langs/pt/img/pt.jpg similarity index 100% rename from installq/langs/pt/img/pt.jpg rename to install/langs/pt/img/pt.jpg diff --git a/installq/langs/pt/index.php b/install/langs/pt/index.php similarity index 100% rename from installq/langs/pt/index.php rename to install/langs/pt/index.php diff --git a/installq/langs/pt/install.php b/install/langs/pt/install.php similarity index 100% rename from installq/langs/pt/install.php rename to install/langs/pt/install.php diff --git a/installq/langs/pt/language.xml b/install/langs/pt/language.xml similarity index 100% rename from installq/langs/pt/language.xml rename to install/langs/pt/language.xml diff --git a/installq/langs/pt/mail_identifiers.txt b/install/langs/pt/mail_identifiers.txt similarity index 100% rename from installq/langs/pt/mail_identifiers.txt rename to install/langs/pt/mail_identifiers.txt diff --git a/installq/langs/qc/data/carrier.xml b/install/langs/qc/data/carrier.xml similarity index 100% rename from installq/langs/qc/data/carrier.xml rename to install/langs/qc/data/carrier.xml diff --git a/installq/langs/qc/data/category.xml b/install/langs/qc/data/category.xml similarity index 100% rename from installq/langs/qc/data/category.xml rename to install/langs/qc/data/category.xml diff --git a/installq/langs/qc/data/cms.xml b/install/langs/qc/data/cms.xml similarity index 100% rename from installq/langs/qc/data/cms.xml rename to install/langs/qc/data/cms.xml diff --git a/installq/langs/qc/data/cms_category.xml b/install/langs/qc/data/cms_category.xml similarity index 100% rename from installq/langs/qc/data/cms_category.xml rename to install/langs/qc/data/cms_category.xml diff --git a/installq/langs/qc/data/configuration.xml b/install/langs/qc/data/configuration.xml similarity index 100% rename from installq/langs/qc/data/configuration.xml rename to install/langs/qc/data/configuration.xml diff --git a/installq/langs/qc/data/contact.xml b/install/langs/qc/data/contact.xml similarity index 100% rename from installq/langs/qc/data/contact.xml rename to install/langs/qc/data/contact.xml diff --git a/installq/langs/qc/data/country.xml b/install/langs/qc/data/country.xml similarity index 100% rename from installq/langs/qc/data/country.xml rename to install/langs/qc/data/country.xml diff --git a/installq/langs/qc/data/gender.xml b/install/langs/qc/data/gender.xml similarity index 100% rename from installq/langs/qc/data/gender.xml rename to install/langs/qc/data/gender.xml diff --git a/installq/langs/qc/data/group.xml b/install/langs/qc/data/group.xml similarity index 100% rename from installq/langs/qc/data/group.xml rename to install/langs/qc/data/group.xml diff --git a/installq/langs/qc/data/index.php b/install/langs/qc/data/index.php similarity index 100% rename from installq/langs/qc/data/index.php rename to install/langs/qc/data/index.php diff --git a/installq/langs/qc/data/meta.xml b/install/langs/qc/data/meta.xml similarity index 100% rename from installq/langs/qc/data/meta.xml rename to install/langs/qc/data/meta.xml diff --git a/installq/langs/qc/data/order_return_state.xml b/install/langs/qc/data/order_return_state.xml similarity index 100% rename from installq/langs/qc/data/order_return_state.xml rename to install/langs/qc/data/order_return_state.xml diff --git a/installq/langs/qc/data/order_state.xml b/install/langs/qc/data/order_state.xml similarity index 100% rename from installq/langs/qc/data/order_state.xml rename to install/langs/qc/data/order_state.xml diff --git a/installq/langs/qc/data/profile.xml b/install/langs/qc/data/profile.xml similarity index 100% rename from installq/langs/qc/data/profile.xml rename to install/langs/qc/data/profile.xml diff --git a/installq/langs/qc/data/quick_access.xml b/install/langs/qc/data/quick_access.xml similarity index 100% rename from installq/langs/qc/data/quick_access.xml rename to install/langs/qc/data/quick_access.xml diff --git a/installq/langs/qc/data/risk.xml b/install/langs/qc/data/risk.xml similarity index 100% rename from installq/langs/qc/data/risk.xml rename to install/langs/qc/data/risk.xml diff --git a/installq/langs/qc/data/stock_mvt_reason.xml b/install/langs/qc/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/qc/data/stock_mvt_reason.xml rename to install/langs/qc/data/stock_mvt_reason.xml diff --git a/installq/langs/qc/data/supplier_order_state.xml b/install/langs/qc/data/supplier_order_state.xml similarity index 100% rename from installq/langs/qc/data/supplier_order_state.xml rename to install/langs/qc/data/supplier_order_state.xml diff --git a/installq/langs/qc/data/supply_order_state.xml b/install/langs/qc/data/supply_order_state.xml similarity index 100% rename from installq/langs/qc/data/supply_order_state.xml rename to install/langs/qc/data/supply_order_state.xml diff --git a/installq/langs/qc/data/tab.xml b/install/langs/qc/data/tab.xml similarity index 100% rename from installq/langs/qc/data/tab.xml rename to install/langs/qc/data/tab.xml diff --git a/installq/langs/qc/flag.jpg b/install/langs/qc/flag.jpg similarity index 100% rename from installq/langs/qc/flag.jpg rename to install/langs/qc/flag.jpg diff --git a/installq/langs/qc/img/index.php b/install/langs/qc/img/index.php similarity index 100% rename from installq/langs/qc/img/index.php rename to install/langs/qc/img/index.php diff --git a/installq/langs/qc/img/qc-default-category.jpg b/install/langs/qc/img/qc-default-category.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-category.jpg rename to install/langs/qc/img/qc-default-category.jpg diff --git a/installq/langs/qc/img/qc-default-home.jpg b/install/langs/qc/img/qc-default-home.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-home.jpg rename to install/langs/qc/img/qc-default-home.jpg diff --git a/installq/langs/qc/img/qc-default-large.jpg b/install/langs/qc/img/qc-default-large.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-large.jpg rename to install/langs/qc/img/qc-default-large.jpg diff --git a/installq/langs/qc/img/qc-default-large_scene.jpg b/install/langs/qc/img/qc-default-large_scene.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-large_scene.jpg rename to install/langs/qc/img/qc-default-large_scene.jpg diff --git a/installq/langs/qc/img/qc-default-medium.jpg b/install/langs/qc/img/qc-default-medium.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-medium.jpg rename to install/langs/qc/img/qc-default-medium.jpg diff --git a/installq/langs/qc/img/qc-default-small.jpg b/install/langs/qc/img/qc-default-small.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-small.jpg rename to install/langs/qc/img/qc-default-small.jpg diff --git a/installq/langs/qc/img/qc-default-thickbox.jpg b/install/langs/qc/img/qc-default-thickbox.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-thickbox.jpg rename to install/langs/qc/img/qc-default-thickbox.jpg diff --git a/installq/langs/qc/img/qc-default-thumb_scene.jpg b/install/langs/qc/img/qc-default-thumb_scene.jpg similarity index 100% rename from installq/langs/qc/img/qc-default-thumb_scene.jpg rename to install/langs/qc/img/qc-default-thumb_scene.jpg diff --git a/installq/langs/qc/img/qc.jpg b/install/langs/qc/img/qc.jpg similarity index 100% rename from installq/langs/qc/img/qc.jpg rename to install/langs/qc/img/qc.jpg diff --git a/installq/langs/qc/index.php b/install/langs/qc/index.php similarity index 100% rename from installq/langs/qc/index.php rename to install/langs/qc/index.php diff --git a/installq/langs/qc/install.php b/install/langs/qc/install.php similarity index 100% rename from installq/langs/qc/install.php rename to install/langs/qc/install.php diff --git a/installq/langs/qc/language.xml b/install/langs/qc/language.xml similarity index 100% rename from installq/langs/qc/language.xml rename to install/langs/qc/language.xml diff --git a/installq/langs/qc/mail_identifiers.txt b/install/langs/qc/mail_identifiers.txt similarity index 100% rename from installq/langs/qc/mail_identifiers.txt rename to install/langs/qc/mail_identifiers.txt diff --git a/installq/langs/ro/data/carrier.xml b/install/langs/ro/data/carrier.xml similarity index 100% rename from installq/langs/ro/data/carrier.xml rename to install/langs/ro/data/carrier.xml diff --git a/installq/langs/ro/data/category.xml b/install/langs/ro/data/category.xml similarity index 100% rename from installq/langs/ro/data/category.xml rename to install/langs/ro/data/category.xml diff --git a/installq/langs/ro/data/cms.xml b/install/langs/ro/data/cms.xml similarity index 100% rename from installq/langs/ro/data/cms.xml rename to install/langs/ro/data/cms.xml diff --git a/installq/langs/ro/data/cms_category.xml b/install/langs/ro/data/cms_category.xml similarity index 100% rename from installq/langs/ro/data/cms_category.xml rename to install/langs/ro/data/cms_category.xml diff --git a/installq/langs/ro/data/configuration.xml b/install/langs/ro/data/configuration.xml similarity index 100% rename from installq/langs/ro/data/configuration.xml rename to install/langs/ro/data/configuration.xml diff --git a/installq/langs/ro/data/contact.xml b/install/langs/ro/data/contact.xml similarity index 100% rename from installq/langs/ro/data/contact.xml rename to install/langs/ro/data/contact.xml diff --git a/installq/langs/ro/data/country.xml b/install/langs/ro/data/country.xml similarity index 100% rename from installq/langs/ro/data/country.xml rename to install/langs/ro/data/country.xml diff --git a/installq/langs/ro/data/gender.xml b/install/langs/ro/data/gender.xml similarity index 100% rename from installq/langs/ro/data/gender.xml rename to install/langs/ro/data/gender.xml diff --git a/installq/langs/ro/data/group.xml b/install/langs/ro/data/group.xml similarity index 100% rename from installq/langs/ro/data/group.xml rename to install/langs/ro/data/group.xml diff --git a/installq/langs/ro/data/index.php b/install/langs/ro/data/index.php similarity index 100% rename from installq/langs/ro/data/index.php rename to install/langs/ro/data/index.php diff --git a/installq/langs/ro/data/meta.xml b/install/langs/ro/data/meta.xml similarity index 100% rename from installq/langs/ro/data/meta.xml rename to install/langs/ro/data/meta.xml diff --git a/installq/langs/ro/data/order_return_state.xml b/install/langs/ro/data/order_return_state.xml similarity index 100% rename from installq/langs/ro/data/order_return_state.xml rename to install/langs/ro/data/order_return_state.xml diff --git a/installq/langs/ro/data/order_state.xml b/install/langs/ro/data/order_state.xml similarity index 100% rename from installq/langs/ro/data/order_state.xml rename to install/langs/ro/data/order_state.xml diff --git a/installq/langs/ro/data/profile.xml b/install/langs/ro/data/profile.xml similarity index 100% rename from installq/langs/ro/data/profile.xml rename to install/langs/ro/data/profile.xml diff --git a/installq/langs/ro/data/quick_access.xml b/install/langs/ro/data/quick_access.xml similarity index 100% rename from installq/langs/ro/data/quick_access.xml rename to install/langs/ro/data/quick_access.xml diff --git a/installq/langs/ro/data/risk.xml b/install/langs/ro/data/risk.xml similarity index 100% rename from installq/langs/ro/data/risk.xml rename to install/langs/ro/data/risk.xml diff --git a/installq/langs/ro/data/stock_mvt_reason.xml b/install/langs/ro/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/ro/data/stock_mvt_reason.xml rename to install/langs/ro/data/stock_mvt_reason.xml diff --git a/installq/langs/ro/data/supplier_order_state.xml b/install/langs/ro/data/supplier_order_state.xml similarity index 100% rename from installq/langs/ro/data/supplier_order_state.xml rename to install/langs/ro/data/supplier_order_state.xml diff --git a/installq/langs/ro/data/supply_order_state.xml b/install/langs/ro/data/supply_order_state.xml similarity index 100% rename from installq/langs/ro/data/supply_order_state.xml rename to install/langs/ro/data/supply_order_state.xml diff --git a/installq/langs/ro/data/tab.xml b/install/langs/ro/data/tab.xml similarity index 100% rename from installq/langs/ro/data/tab.xml rename to install/langs/ro/data/tab.xml diff --git a/installq/langs/ro/flag.jpg b/install/langs/ro/flag.jpg similarity index 100% rename from installq/langs/ro/flag.jpg rename to install/langs/ro/flag.jpg diff --git a/installq/langs/ro/img/index.php b/install/langs/ro/img/index.php similarity index 100% rename from installq/langs/ro/img/index.php rename to install/langs/ro/img/index.php diff --git a/installq/langs/ro/img/ro-default-category.jpg b/install/langs/ro/img/ro-default-category.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-category.jpg rename to install/langs/ro/img/ro-default-category.jpg diff --git a/installq/langs/ro/img/ro-default-home.jpg b/install/langs/ro/img/ro-default-home.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-home.jpg rename to install/langs/ro/img/ro-default-home.jpg diff --git a/installq/langs/ro/img/ro-default-large.jpg b/install/langs/ro/img/ro-default-large.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-large.jpg rename to install/langs/ro/img/ro-default-large.jpg diff --git a/installq/langs/ro/img/ro-default-large_scene.jpg b/install/langs/ro/img/ro-default-large_scene.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-large_scene.jpg rename to install/langs/ro/img/ro-default-large_scene.jpg diff --git a/installq/langs/ro/img/ro-default-medium.jpg b/install/langs/ro/img/ro-default-medium.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-medium.jpg rename to install/langs/ro/img/ro-default-medium.jpg diff --git a/installq/langs/ro/img/ro-default-small.jpg b/install/langs/ro/img/ro-default-small.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-small.jpg rename to install/langs/ro/img/ro-default-small.jpg diff --git a/installq/langs/ro/img/ro-default-thickbox.jpg b/install/langs/ro/img/ro-default-thickbox.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-thickbox.jpg rename to install/langs/ro/img/ro-default-thickbox.jpg diff --git a/installq/langs/ro/img/ro-default-thumb_scene.jpg b/install/langs/ro/img/ro-default-thumb_scene.jpg similarity index 100% rename from installq/langs/ro/img/ro-default-thumb_scene.jpg rename to install/langs/ro/img/ro-default-thumb_scene.jpg diff --git a/installq/langs/ro/img/ro.jpg b/install/langs/ro/img/ro.jpg similarity index 100% rename from installq/langs/ro/img/ro.jpg rename to install/langs/ro/img/ro.jpg diff --git a/installq/langs/ro/index.php b/install/langs/ro/index.php similarity index 100% rename from installq/langs/ro/index.php rename to install/langs/ro/index.php diff --git a/installq/langs/ro/install.php b/install/langs/ro/install.php similarity index 100% rename from installq/langs/ro/install.php rename to install/langs/ro/install.php diff --git a/installq/langs/ro/language.xml b/install/langs/ro/language.xml similarity index 100% rename from installq/langs/ro/language.xml rename to install/langs/ro/language.xml diff --git a/installq/langs/ro/mail_identifiers.txt b/install/langs/ro/mail_identifiers.txt similarity index 100% rename from installq/langs/ro/mail_identifiers.txt rename to install/langs/ro/mail_identifiers.txt diff --git a/installq/langs/ru/data/carrier.xml b/install/langs/ru/data/carrier.xml similarity index 100% rename from installq/langs/ru/data/carrier.xml rename to install/langs/ru/data/carrier.xml diff --git a/installq/langs/ru/data/category.xml b/install/langs/ru/data/category.xml similarity index 100% rename from installq/langs/ru/data/category.xml rename to install/langs/ru/data/category.xml diff --git a/installq/langs/ru/data/cms.xml b/install/langs/ru/data/cms.xml similarity index 100% rename from installq/langs/ru/data/cms.xml rename to install/langs/ru/data/cms.xml diff --git a/installq/langs/ru/data/cms_category.xml b/install/langs/ru/data/cms_category.xml similarity index 100% rename from installq/langs/ru/data/cms_category.xml rename to install/langs/ru/data/cms_category.xml diff --git a/installq/langs/ru/data/configuration.xml b/install/langs/ru/data/configuration.xml similarity index 100% rename from installq/langs/ru/data/configuration.xml rename to install/langs/ru/data/configuration.xml diff --git a/installq/langs/ru/data/contact.xml b/install/langs/ru/data/contact.xml similarity index 100% rename from installq/langs/ru/data/contact.xml rename to install/langs/ru/data/contact.xml diff --git a/installq/langs/ru/data/country.xml b/install/langs/ru/data/country.xml similarity index 100% rename from installq/langs/ru/data/country.xml rename to install/langs/ru/data/country.xml diff --git a/installq/langs/ru/data/gender.xml b/install/langs/ru/data/gender.xml similarity index 100% rename from installq/langs/ru/data/gender.xml rename to install/langs/ru/data/gender.xml diff --git a/installq/langs/ru/data/group.xml b/install/langs/ru/data/group.xml similarity index 100% rename from installq/langs/ru/data/group.xml rename to install/langs/ru/data/group.xml diff --git a/installq/langs/ru/data/index.php b/install/langs/ru/data/index.php similarity index 100% rename from installq/langs/ru/data/index.php rename to install/langs/ru/data/index.php diff --git a/installq/langs/ru/data/meta.xml b/install/langs/ru/data/meta.xml similarity index 100% rename from installq/langs/ru/data/meta.xml rename to install/langs/ru/data/meta.xml diff --git a/installq/langs/ru/data/order_return_state.xml b/install/langs/ru/data/order_return_state.xml similarity index 100% rename from installq/langs/ru/data/order_return_state.xml rename to install/langs/ru/data/order_return_state.xml diff --git a/installq/langs/ru/data/order_state.xml b/install/langs/ru/data/order_state.xml similarity index 100% rename from installq/langs/ru/data/order_state.xml rename to install/langs/ru/data/order_state.xml diff --git a/installq/langs/ru/data/profile.xml b/install/langs/ru/data/profile.xml similarity index 100% rename from installq/langs/ru/data/profile.xml rename to install/langs/ru/data/profile.xml diff --git a/installq/langs/ru/data/quick_access.xml b/install/langs/ru/data/quick_access.xml similarity index 100% rename from installq/langs/ru/data/quick_access.xml rename to install/langs/ru/data/quick_access.xml diff --git a/installq/langs/ru/data/risk.xml b/install/langs/ru/data/risk.xml similarity index 100% rename from installq/langs/ru/data/risk.xml rename to install/langs/ru/data/risk.xml diff --git a/installq/langs/ru/data/stock_mvt_reason.xml b/install/langs/ru/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/ru/data/stock_mvt_reason.xml rename to install/langs/ru/data/stock_mvt_reason.xml diff --git a/installq/langs/ru/data/supplier_order_state.xml b/install/langs/ru/data/supplier_order_state.xml similarity index 100% rename from installq/langs/ru/data/supplier_order_state.xml rename to install/langs/ru/data/supplier_order_state.xml diff --git a/installq/langs/ru/data/supply_order_state.xml b/install/langs/ru/data/supply_order_state.xml similarity index 100% rename from installq/langs/ru/data/supply_order_state.xml rename to install/langs/ru/data/supply_order_state.xml diff --git a/installq/langs/ru/data/tab.xml b/install/langs/ru/data/tab.xml similarity index 100% rename from installq/langs/ru/data/tab.xml rename to install/langs/ru/data/tab.xml diff --git a/installq/langs/ru/flag.jpg b/install/langs/ru/flag.jpg similarity index 100% rename from installq/langs/ru/flag.jpg rename to install/langs/ru/flag.jpg diff --git a/installq/langs/ru/img/flag.jpg b/install/langs/ru/img/flag.jpg similarity index 100% rename from installq/langs/ru/img/flag.jpg rename to install/langs/ru/img/flag.jpg diff --git a/installq/langs/ru/img/index.php b/install/langs/ru/img/index.php similarity index 100% rename from installq/langs/ru/img/index.php rename to install/langs/ru/img/index.php diff --git a/installq/langs/ru/img/ru-default-category.jpg b/install/langs/ru/img/ru-default-category.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-category.jpg rename to install/langs/ru/img/ru-default-category.jpg diff --git a/installq/langs/ru/img/ru-default-home.jpg b/install/langs/ru/img/ru-default-home.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-home.jpg rename to install/langs/ru/img/ru-default-home.jpg diff --git a/installq/langs/ru/img/ru-default-large.jpg b/install/langs/ru/img/ru-default-large.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-large.jpg rename to install/langs/ru/img/ru-default-large.jpg diff --git a/installq/langs/ru/img/ru-default-large_scene.jpg b/install/langs/ru/img/ru-default-large_scene.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-large_scene.jpg rename to install/langs/ru/img/ru-default-large_scene.jpg diff --git a/installq/langs/ru/img/ru-default-medium.jpg b/install/langs/ru/img/ru-default-medium.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-medium.jpg rename to install/langs/ru/img/ru-default-medium.jpg diff --git a/installq/langs/ru/img/ru-default-small.jpg b/install/langs/ru/img/ru-default-small.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-small.jpg rename to install/langs/ru/img/ru-default-small.jpg diff --git a/installq/langs/ru/img/ru-default-thickbox.jpg b/install/langs/ru/img/ru-default-thickbox.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-thickbox.jpg rename to install/langs/ru/img/ru-default-thickbox.jpg diff --git a/installq/langs/ru/img/ru-default-thumb_scene.jpg b/install/langs/ru/img/ru-default-thumb_scene.jpg similarity index 100% rename from installq/langs/ru/img/ru-default-thumb_scene.jpg rename to install/langs/ru/img/ru-default-thumb_scene.jpg diff --git a/installq/langs/ru/img/ru.jpg b/install/langs/ru/img/ru.jpg similarity index 100% rename from installq/langs/ru/img/ru.jpg rename to install/langs/ru/img/ru.jpg diff --git a/installq/langs/ru/index.php b/install/langs/ru/index.php similarity index 100% rename from installq/langs/ru/index.php rename to install/langs/ru/index.php diff --git a/installq/langs/ru/install.php b/install/langs/ru/install.php similarity index 100% rename from installq/langs/ru/install.php rename to install/langs/ru/install.php diff --git a/installq/langs/ru/language.xml b/install/langs/ru/language.xml similarity index 100% rename from installq/langs/ru/language.xml rename to install/langs/ru/language.xml diff --git a/installq/langs/ru/mail_identifiers.txt b/install/langs/ru/mail_identifiers.txt similarity index 100% rename from installq/langs/ru/mail_identifiers.txt rename to install/langs/ru/mail_identifiers.txt diff --git a/installq/langs/si/data/carrier.xml b/install/langs/si/data/carrier.xml similarity index 100% rename from installq/langs/si/data/carrier.xml rename to install/langs/si/data/carrier.xml diff --git a/installq/langs/si/data/category.xml b/install/langs/si/data/category.xml similarity index 100% rename from installq/langs/si/data/category.xml rename to install/langs/si/data/category.xml diff --git a/installq/langs/si/data/cms.xml b/install/langs/si/data/cms.xml similarity index 100% rename from installq/langs/si/data/cms.xml rename to install/langs/si/data/cms.xml diff --git a/installq/langs/si/data/cms_category.xml b/install/langs/si/data/cms_category.xml similarity index 100% rename from installq/langs/si/data/cms_category.xml rename to install/langs/si/data/cms_category.xml diff --git a/installq/langs/si/data/configuration.xml b/install/langs/si/data/configuration.xml similarity index 100% rename from installq/langs/si/data/configuration.xml rename to install/langs/si/data/configuration.xml diff --git a/installq/langs/si/data/contact.xml b/install/langs/si/data/contact.xml similarity index 100% rename from installq/langs/si/data/contact.xml rename to install/langs/si/data/contact.xml diff --git a/installq/langs/si/data/country.xml b/install/langs/si/data/country.xml similarity index 100% rename from installq/langs/si/data/country.xml rename to install/langs/si/data/country.xml diff --git a/installq/langs/si/data/gender.xml b/install/langs/si/data/gender.xml similarity index 100% rename from installq/langs/si/data/gender.xml rename to install/langs/si/data/gender.xml diff --git a/installq/langs/si/data/group.xml b/install/langs/si/data/group.xml similarity index 100% rename from installq/langs/si/data/group.xml rename to install/langs/si/data/group.xml diff --git a/installq/langs/si/data/index.php b/install/langs/si/data/index.php similarity index 100% rename from installq/langs/si/data/index.php rename to install/langs/si/data/index.php diff --git a/installq/langs/si/data/meta.xml b/install/langs/si/data/meta.xml similarity index 100% rename from installq/langs/si/data/meta.xml rename to install/langs/si/data/meta.xml diff --git a/installq/langs/si/data/order_return_state.xml b/install/langs/si/data/order_return_state.xml similarity index 100% rename from installq/langs/si/data/order_return_state.xml rename to install/langs/si/data/order_return_state.xml diff --git a/installq/langs/si/data/order_state.xml b/install/langs/si/data/order_state.xml similarity index 100% rename from installq/langs/si/data/order_state.xml rename to install/langs/si/data/order_state.xml diff --git a/installq/langs/si/data/profile.xml b/install/langs/si/data/profile.xml similarity index 100% rename from installq/langs/si/data/profile.xml rename to install/langs/si/data/profile.xml diff --git a/installq/langs/si/data/quick_access.xml b/install/langs/si/data/quick_access.xml similarity index 100% rename from installq/langs/si/data/quick_access.xml rename to install/langs/si/data/quick_access.xml diff --git a/installq/langs/si/data/risk.xml b/install/langs/si/data/risk.xml similarity index 100% rename from installq/langs/si/data/risk.xml rename to install/langs/si/data/risk.xml diff --git a/installq/langs/si/data/stock_mvt_reason.xml b/install/langs/si/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/si/data/stock_mvt_reason.xml rename to install/langs/si/data/stock_mvt_reason.xml diff --git a/installq/langs/si/data/supplier_order_state.xml b/install/langs/si/data/supplier_order_state.xml similarity index 100% rename from installq/langs/si/data/supplier_order_state.xml rename to install/langs/si/data/supplier_order_state.xml diff --git a/installq/langs/si/data/supply_order_state.xml b/install/langs/si/data/supply_order_state.xml similarity index 100% rename from installq/langs/si/data/supply_order_state.xml rename to install/langs/si/data/supply_order_state.xml diff --git a/installq/langs/si/data/tab.xml b/install/langs/si/data/tab.xml similarity index 100% rename from installq/langs/si/data/tab.xml rename to install/langs/si/data/tab.xml diff --git a/installq/langs/si/flag.jpg b/install/langs/si/flag.jpg similarity index 100% rename from installq/langs/si/flag.jpg rename to install/langs/si/flag.jpg diff --git a/installq/langs/si/img/index.php b/install/langs/si/img/index.php similarity index 100% rename from installq/langs/si/img/index.php rename to install/langs/si/img/index.php diff --git a/installq/langs/si/img/si-default-category.jpg b/install/langs/si/img/si-default-category.jpg similarity index 100% rename from installq/langs/si/img/si-default-category.jpg rename to install/langs/si/img/si-default-category.jpg diff --git a/installq/langs/si/img/si-default-home.jpg b/install/langs/si/img/si-default-home.jpg similarity index 100% rename from installq/langs/si/img/si-default-home.jpg rename to install/langs/si/img/si-default-home.jpg diff --git a/installq/langs/si/img/si-default-large.jpg b/install/langs/si/img/si-default-large.jpg similarity index 100% rename from installq/langs/si/img/si-default-large.jpg rename to install/langs/si/img/si-default-large.jpg diff --git a/installq/langs/si/img/si-default-large_scene.jpg b/install/langs/si/img/si-default-large_scene.jpg similarity index 100% rename from installq/langs/si/img/si-default-large_scene.jpg rename to install/langs/si/img/si-default-large_scene.jpg diff --git a/installq/langs/si/img/si-default-medium.jpg b/install/langs/si/img/si-default-medium.jpg similarity index 100% rename from installq/langs/si/img/si-default-medium.jpg rename to install/langs/si/img/si-default-medium.jpg diff --git a/installq/langs/si/img/si-default-small.jpg b/install/langs/si/img/si-default-small.jpg similarity index 100% rename from installq/langs/si/img/si-default-small.jpg rename to install/langs/si/img/si-default-small.jpg diff --git a/installq/langs/si/img/si-default-thickbox.jpg b/install/langs/si/img/si-default-thickbox.jpg similarity index 100% rename from installq/langs/si/img/si-default-thickbox.jpg rename to install/langs/si/img/si-default-thickbox.jpg diff --git a/installq/langs/si/img/si-default-thumb_scene.jpg b/install/langs/si/img/si-default-thumb_scene.jpg similarity index 100% rename from installq/langs/si/img/si-default-thumb_scene.jpg rename to install/langs/si/img/si-default-thumb_scene.jpg diff --git a/installq/langs/si/img/si.jpg b/install/langs/si/img/si.jpg similarity index 100% rename from installq/langs/si/img/si.jpg rename to install/langs/si/img/si.jpg diff --git a/installq/langs/si/index.php b/install/langs/si/index.php similarity index 100% rename from installq/langs/si/index.php rename to install/langs/si/index.php diff --git a/installq/langs/si/install.php b/install/langs/si/install.php similarity index 100% rename from installq/langs/si/install.php rename to install/langs/si/install.php diff --git a/installq/langs/si/language.xml b/install/langs/si/language.xml similarity index 100% rename from installq/langs/si/language.xml rename to install/langs/si/language.xml diff --git a/installq/langs/si/mail_identifiers.txt b/install/langs/si/mail_identifiers.txt similarity index 100% rename from installq/langs/si/mail_identifiers.txt rename to install/langs/si/mail_identifiers.txt diff --git a/installq/langs/sr/data/carrier.xml b/install/langs/sr/data/carrier.xml similarity index 100% rename from installq/langs/sr/data/carrier.xml rename to install/langs/sr/data/carrier.xml diff --git a/installq/langs/sr/data/category.xml b/install/langs/sr/data/category.xml similarity index 100% rename from installq/langs/sr/data/category.xml rename to install/langs/sr/data/category.xml diff --git a/installq/langs/sr/data/cms.xml b/install/langs/sr/data/cms.xml similarity index 100% rename from installq/langs/sr/data/cms.xml rename to install/langs/sr/data/cms.xml diff --git a/installq/langs/sr/data/cms_category.xml b/install/langs/sr/data/cms_category.xml similarity index 100% rename from installq/langs/sr/data/cms_category.xml rename to install/langs/sr/data/cms_category.xml diff --git a/installq/langs/sr/data/configuration.xml b/install/langs/sr/data/configuration.xml similarity index 100% rename from installq/langs/sr/data/configuration.xml rename to install/langs/sr/data/configuration.xml diff --git a/installq/langs/sr/data/contact.xml b/install/langs/sr/data/contact.xml similarity index 100% rename from installq/langs/sr/data/contact.xml rename to install/langs/sr/data/contact.xml diff --git a/installq/langs/sr/data/country.xml b/install/langs/sr/data/country.xml similarity index 100% rename from installq/langs/sr/data/country.xml rename to install/langs/sr/data/country.xml diff --git a/installq/langs/sr/data/gender.xml b/install/langs/sr/data/gender.xml similarity index 100% rename from installq/langs/sr/data/gender.xml rename to install/langs/sr/data/gender.xml diff --git a/installq/langs/sr/data/group.xml b/install/langs/sr/data/group.xml similarity index 100% rename from installq/langs/sr/data/group.xml rename to install/langs/sr/data/group.xml diff --git a/installq/langs/sr/data/index.php b/install/langs/sr/data/index.php similarity index 100% rename from installq/langs/sr/data/index.php rename to install/langs/sr/data/index.php diff --git a/installq/langs/sr/data/meta.xml b/install/langs/sr/data/meta.xml similarity index 100% rename from installq/langs/sr/data/meta.xml rename to install/langs/sr/data/meta.xml diff --git a/installq/langs/sr/data/order_return_state.xml b/install/langs/sr/data/order_return_state.xml similarity index 100% rename from installq/langs/sr/data/order_return_state.xml rename to install/langs/sr/data/order_return_state.xml diff --git a/installq/langs/sr/data/order_state.xml b/install/langs/sr/data/order_state.xml similarity index 100% rename from installq/langs/sr/data/order_state.xml rename to install/langs/sr/data/order_state.xml diff --git a/installq/langs/sr/data/profile.xml b/install/langs/sr/data/profile.xml similarity index 100% rename from installq/langs/sr/data/profile.xml rename to install/langs/sr/data/profile.xml diff --git a/installq/langs/sr/data/quick_access.xml b/install/langs/sr/data/quick_access.xml similarity index 100% rename from installq/langs/sr/data/quick_access.xml rename to install/langs/sr/data/quick_access.xml diff --git a/installq/langs/sr/data/risk.xml b/install/langs/sr/data/risk.xml similarity index 100% rename from installq/langs/sr/data/risk.xml rename to install/langs/sr/data/risk.xml diff --git a/installq/langs/sr/data/stock_mvt_reason.xml b/install/langs/sr/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/sr/data/stock_mvt_reason.xml rename to install/langs/sr/data/stock_mvt_reason.xml diff --git a/installq/langs/sr/data/supplier_order_state.xml b/install/langs/sr/data/supplier_order_state.xml similarity index 100% rename from installq/langs/sr/data/supplier_order_state.xml rename to install/langs/sr/data/supplier_order_state.xml diff --git a/installq/langs/sr/data/supply_order_state.xml b/install/langs/sr/data/supply_order_state.xml similarity index 100% rename from installq/langs/sr/data/supply_order_state.xml rename to install/langs/sr/data/supply_order_state.xml diff --git a/installq/langs/sr/data/tab.xml b/install/langs/sr/data/tab.xml similarity index 100% rename from installq/langs/sr/data/tab.xml rename to install/langs/sr/data/tab.xml diff --git a/installq/langs/sr/flag.jpg b/install/langs/sr/flag.jpg similarity index 100% rename from installq/langs/sr/flag.jpg rename to install/langs/sr/flag.jpg diff --git a/installq/langs/sr/img/index.php b/install/langs/sr/img/index.php similarity index 100% rename from installq/langs/sr/img/index.php rename to install/langs/sr/img/index.php diff --git a/installq/langs/sr/img/sr-default-category.jpg b/install/langs/sr/img/sr-default-category.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-category.jpg rename to install/langs/sr/img/sr-default-category.jpg diff --git a/installq/langs/sr/img/sr-default-home.jpg b/install/langs/sr/img/sr-default-home.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-home.jpg rename to install/langs/sr/img/sr-default-home.jpg diff --git a/installq/langs/sr/img/sr-default-large.jpg b/install/langs/sr/img/sr-default-large.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-large.jpg rename to install/langs/sr/img/sr-default-large.jpg diff --git a/installq/langs/sr/img/sr-default-large_scene.jpg b/install/langs/sr/img/sr-default-large_scene.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-large_scene.jpg rename to install/langs/sr/img/sr-default-large_scene.jpg diff --git a/installq/langs/sr/img/sr-default-medium.jpg b/install/langs/sr/img/sr-default-medium.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-medium.jpg rename to install/langs/sr/img/sr-default-medium.jpg diff --git a/installq/langs/sr/img/sr-default-small.jpg b/install/langs/sr/img/sr-default-small.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-small.jpg rename to install/langs/sr/img/sr-default-small.jpg diff --git a/installq/langs/sr/img/sr-default-thickbox.jpg b/install/langs/sr/img/sr-default-thickbox.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-thickbox.jpg rename to install/langs/sr/img/sr-default-thickbox.jpg diff --git a/installq/langs/sr/img/sr-default-thumb_scene.jpg b/install/langs/sr/img/sr-default-thumb_scene.jpg similarity index 100% rename from installq/langs/sr/img/sr-default-thumb_scene.jpg rename to install/langs/sr/img/sr-default-thumb_scene.jpg diff --git a/installq/langs/sr/img/sr.jpg b/install/langs/sr/img/sr.jpg similarity index 100% rename from installq/langs/sr/img/sr.jpg rename to install/langs/sr/img/sr.jpg diff --git a/installq/langs/sr/index.php b/install/langs/sr/index.php similarity index 100% rename from installq/langs/sr/index.php rename to install/langs/sr/index.php diff --git a/installq/langs/sr/install.php b/install/langs/sr/install.php similarity index 100% rename from installq/langs/sr/install.php rename to install/langs/sr/install.php diff --git a/installq/langs/sr/language.xml b/install/langs/sr/language.xml similarity index 100% rename from installq/langs/sr/language.xml rename to install/langs/sr/language.xml diff --git a/installq/langs/sr/mail_identifiers.txt b/install/langs/sr/mail_identifiers.txt similarity index 100% rename from installq/langs/sr/mail_identifiers.txt rename to install/langs/sr/mail_identifiers.txt diff --git a/installq/langs/sv/data/carrier.xml b/install/langs/sv/data/carrier.xml similarity index 100% rename from installq/langs/sv/data/carrier.xml rename to install/langs/sv/data/carrier.xml diff --git a/installq/langs/sv/data/category.xml b/install/langs/sv/data/category.xml similarity index 100% rename from installq/langs/sv/data/category.xml rename to install/langs/sv/data/category.xml diff --git a/installq/langs/sv/data/cms.xml b/install/langs/sv/data/cms.xml similarity index 100% rename from installq/langs/sv/data/cms.xml rename to install/langs/sv/data/cms.xml diff --git a/installq/langs/sv/data/cms_category.xml b/install/langs/sv/data/cms_category.xml similarity index 100% rename from installq/langs/sv/data/cms_category.xml rename to install/langs/sv/data/cms_category.xml diff --git a/installq/langs/sv/data/configuration.xml b/install/langs/sv/data/configuration.xml similarity index 100% rename from installq/langs/sv/data/configuration.xml rename to install/langs/sv/data/configuration.xml diff --git a/installq/langs/sv/data/contact.xml b/install/langs/sv/data/contact.xml similarity index 100% rename from installq/langs/sv/data/contact.xml rename to install/langs/sv/data/contact.xml diff --git a/installq/langs/sv/data/country.xml b/install/langs/sv/data/country.xml similarity index 100% rename from installq/langs/sv/data/country.xml rename to install/langs/sv/data/country.xml diff --git a/installq/langs/sv/data/gender.xml b/install/langs/sv/data/gender.xml similarity index 100% rename from installq/langs/sv/data/gender.xml rename to install/langs/sv/data/gender.xml diff --git a/installq/langs/sv/data/group.xml b/install/langs/sv/data/group.xml similarity index 100% rename from installq/langs/sv/data/group.xml rename to install/langs/sv/data/group.xml diff --git a/installq/langs/sv/data/index.php b/install/langs/sv/data/index.php similarity index 100% rename from installq/langs/sv/data/index.php rename to install/langs/sv/data/index.php diff --git a/installq/langs/sv/data/meta.xml b/install/langs/sv/data/meta.xml similarity index 100% rename from installq/langs/sv/data/meta.xml rename to install/langs/sv/data/meta.xml diff --git a/installq/langs/sv/data/order_return_state.xml b/install/langs/sv/data/order_return_state.xml similarity index 100% rename from installq/langs/sv/data/order_return_state.xml rename to install/langs/sv/data/order_return_state.xml diff --git a/installq/langs/sv/data/order_state.xml b/install/langs/sv/data/order_state.xml similarity index 100% rename from installq/langs/sv/data/order_state.xml rename to install/langs/sv/data/order_state.xml diff --git a/installq/langs/sv/data/profile.xml b/install/langs/sv/data/profile.xml similarity index 100% rename from installq/langs/sv/data/profile.xml rename to install/langs/sv/data/profile.xml diff --git a/installq/langs/sv/data/quick_access.xml b/install/langs/sv/data/quick_access.xml similarity index 100% rename from installq/langs/sv/data/quick_access.xml rename to install/langs/sv/data/quick_access.xml diff --git a/installq/langs/sv/data/risk.xml b/install/langs/sv/data/risk.xml similarity index 100% rename from installq/langs/sv/data/risk.xml rename to install/langs/sv/data/risk.xml diff --git a/installq/langs/sv/data/stock_mvt_reason.xml b/install/langs/sv/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/sv/data/stock_mvt_reason.xml rename to install/langs/sv/data/stock_mvt_reason.xml diff --git a/installq/langs/sv/data/supplier_order_state.xml b/install/langs/sv/data/supplier_order_state.xml similarity index 100% rename from installq/langs/sv/data/supplier_order_state.xml rename to install/langs/sv/data/supplier_order_state.xml diff --git a/installq/langs/sv/data/supply_order_state.xml b/install/langs/sv/data/supply_order_state.xml similarity index 100% rename from installq/langs/sv/data/supply_order_state.xml rename to install/langs/sv/data/supply_order_state.xml diff --git a/installq/langs/sv/data/tab.xml b/install/langs/sv/data/tab.xml similarity index 100% rename from installq/langs/sv/data/tab.xml rename to install/langs/sv/data/tab.xml diff --git a/installq/langs/sv/flag.jpg b/install/langs/sv/flag.jpg similarity index 100% rename from installq/langs/sv/flag.jpg rename to install/langs/sv/flag.jpg diff --git a/installq/langs/sv/img/index.php b/install/langs/sv/img/index.php similarity index 100% rename from installq/langs/sv/img/index.php rename to install/langs/sv/img/index.php diff --git a/installq/langs/sv/img/sv-default-category.jpg b/install/langs/sv/img/sv-default-category.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-category.jpg rename to install/langs/sv/img/sv-default-category.jpg diff --git a/installq/langs/sv/img/sv-default-home.jpg b/install/langs/sv/img/sv-default-home.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-home.jpg rename to install/langs/sv/img/sv-default-home.jpg diff --git a/installq/langs/sv/img/sv-default-large.jpg b/install/langs/sv/img/sv-default-large.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-large.jpg rename to install/langs/sv/img/sv-default-large.jpg diff --git a/installq/langs/sv/img/sv-default-large_scene.jpg b/install/langs/sv/img/sv-default-large_scene.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-large_scene.jpg rename to install/langs/sv/img/sv-default-large_scene.jpg diff --git a/installq/langs/sv/img/sv-default-medium.jpg b/install/langs/sv/img/sv-default-medium.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-medium.jpg rename to install/langs/sv/img/sv-default-medium.jpg diff --git a/installq/langs/sv/img/sv-default-small.jpg b/install/langs/sv/img/sv-default-small.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-small.jpg rename to install/langs/sv/img/sv-default-small.jpg diff --git a/installq/langs/sv/img/sv-default-thickbox.jpg b/install/langs/sv/img/sv-default-thickbox.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-thickbox.jpg rename to install/langs/sv/img/sv-default-thickbox.jpg diff --git a/installq/langs/sv/img/sv-default-thumb_scene.jpg b/install/langs/sv/img/sv-default-thumb_scene.jpg similarity index 100% rename from installq/langs/sv/img/sv-default-thumb_scene.jpg rename to install/langs/sv/img/sv-default-thumb_scene.jpg diff --git a/installq/langs/sv/img/sv.jpg b/install/langs/sv/img/sv.jpg similarity index 100% rename from installq/langs/sv/img/sv.jpg rename to install/langs/sv/img/sv.jpg diff --git a/installq/langs/sv/index.php b/install/langs/sv/index.php similarity index 100% rename from installq/langs/sv/index.php rename to install/langs/sv/index.php diff --git a/installq/langs/sv/install.php b/install/langs/sv/install.php similarity index 100% rename from installq/langs/sv/install.php rename to install/langs/sv/install.php diff --git a/installq/langs/sv/language.xml b/install/langs/sv/language.xml similarity index 100% rename from installq/langs/sv/language.xml rename to install/langs/sv/language.xml diff --git a/installq/langs/sv/mail_identifiers.txt b/install/langs/sv/mail_identifiers.txt similarity index 100% rename from installq/langs/sv/mail_identifiers.txt rename to install/langs/sv/mail_identifiers.txt diff --git a/installq/langs/tr/flag.jpg b/install/langs/tr/flag.jpg similarity index 100% rename from installq/langs/tr/flag.jpg rename to install/langs/tr/flag.jpg diff --git a/installq/langs/tr/img/index.php b/install/langs/tr/img/index.php similarity index 100% rename from installq/langs/tr/img/index.php rename to install/langs/tr/img/index.php diff --git a/installq/langs/tr/img/tr-default-category.jpg b/install/langs/tr/img/tr-default-category.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-category.jpg rename to install/langs/tr/img/tr-default-category.jpg diff --git a/installq/langs/tr/img/tr-default-home.jpg b/install/langs/tr/img/tr-default-home.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-home.jpg rename to install/langs/tr/img/tr-default-home.jpg diff --git a/installq/langs/tr/img/tr-default-large.jpg b/install/langs/tr/img/tr-default-large.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-large.jpg rename to install/langs/tr/img/tr-default-large.jpg diff --git a/installq/langs/tr/img/tr-default-large_scene.jpg b/install/langs/tr/img/tr-default-large_scene.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-large_scene.jpg rename to install/langs/tr/img/tr-default-large_scene.jpg diff --git a/installq/langs/tr/img/tr-default-medium.jpg b/install/langs/tr/img/tr-default-medium.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-medium.jpg rename to install/langs/tr/img/tr-default-medium.jpg diff --git a/installq/langs/tr/img/tr-default-small.jpg b/install/langs/tr/img/tr-default-small.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-small.jpg rename to install/langs/tr/img/tr-default-small.jpg diff --git a/installq/langs/tr/img/tr-default-thickbox.jpg b/install/langs/tr/img/tr-default-thickbox.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-thickbox.jpg rename to install/langs/tr/img/tr-default-thickbox.jpg diff --git a/installq/langs/tr/img/tr-default-thumb_scene.jpg b/install/langs/tr/img/tr-default-thumb_scene.jpg similarity index 100% rename from installq/langs/tr/img/tr-default-thumb_scene.jpg rename to install/langs/tr/img/tr-default-thumb_scene.jpg diff --git a/installq/langs/tr/img/tr.jpg b/install/langs/tr/img/tr.jpg similarity index 100% rename from installq/langs/tr/img/tr.jpg rename to install/langs/tr/img/tr.jpg diff --git a/installq/langs/tr/index.php b/install/langs/tr/index.php similarity index 100% rename from installq/langs/tr/index.php rename to install/langs/tr/index.php diff --git a/installq/langs/tr/install.php b/install/langs/tr/install.php similarity index 100% rename from installq/langs/tr/install.php rename to install/langs/tr/install.php diff --git a/installq/langs/tr/language.xml b/install/langs/tr/language.xml similarity index 100% rename from installq/langs/tr/language.xml rename to install/langs/tr/language.xml diff --git a/installq/langs/tr/mail_identifiers.txt b/install/langs/tr/mail_identifiers.txt similarity index 100% rename from installq/langs/tr/mail_identifiers.txt rename to install/langs/tr/mail_identifiers.txt diff --git a/installq/langs/tw/data/carrier.xml b/install/langs/tw/data/carrier.xml similarity index 100% rename from installq/langs/tw/data/carrier.xml rename to install/langs/tw/data/carrier.xml diff --git a/installq/langs/tw/data/category.xml b/install/langs/tw/data/category.xml similarity index 100% rename from installq/langs/tw/data/category.xml rename to install/langs/tw/data/category.xml diff --git a/installq/langs/tw/data/cms.xml b/install/langs/tw/data/cms.xml similarity index 100% rename from installq/langs/tw/data/cms.xml rename to install/langs/tw/data/cms.xml diff --git a/installq/langs/tw/data/cms_category.xml b/install/langs/tw/data/cms_category.xml similarity index 100% rename from installq/langs/tw/data/cms_category.xml rename to install/langs/tw/data/cms_category.xml diff --git a/installq/langs/tw/data/configuration.xml b/install/langs/tw/data/configuration.xml similarity index 100% rename from installq/langs/tw/data/configuration.xml rename to install/langs/tw/data/configuration.xml diff --git a/installq/langs/tw/data/contact.xml b/install/langs/tw/data/contact.xml similarity index 100% rename from installq/langs/tw/data/contact.xml rename to install/langs/tw/data/contact.xml diff --git a/installq/langs/tw/data/country.xml b/install/langs/tw/data/country.xml similarity index 100% rename from installq/langs/tw/data/country.xml rename to install/langs/tw/data/country.xml diff --git a/installq/langs/tw/data/gender.xml b/install/langs/tw/data/gender.xml similarity index 100% rename from installq/langs/tw/data/gender.xml rename to install/langs/tw/data/gender.xml diff --git a/installq/langs/tw/data/group.xml b/install/langs/tw/data/group.xml similarity index 100% rename from installq/langs/tw/data/group.xml rename to install/langs/tw/data/group.xml diff --git a/installq/langs/tw/data/index.php b/install/langs/tw/data/index.php similarity index 100% rename from installq/langs/tw/data/index.php rename to install/langs/tw/data/index.php diff --git a/installq/langs/tw/data/meta.xml b/install/langs/tw/data/meta.xml similarity index 100% rename from installq/langs/tw/data/meta.xml rename to install/langs/tw/data/meta.xml diff --git a/installq/langs/tw/data/order_return_state.xml b/install/langs/tw/data/order_return_state.xml similarity index 100% rename from installq/langs/tw/data/order_return_state.xml rename to install/langs/tw/data/order_return_state.xml diff --git a/installq/langs/tw/data/order_state.xml b/install/langs/tw/data/order_state.xml similarity index 100% rename from installq/langs/tw/data/order_state.xml rename to install/langs/tw/data/order_state.xml diff --git a/installq/langs/tw/data/profile.xml b/install/langs/tw/data/profile.xml similarity index 100% rename from installq/langs/tw/data/profile.xml rename to install/langs/tw/data/profile.xml diff --git a/installq/langs/tw/data/quick_access.xml b/install/langs/tw/data/quick_access.xml similarity index 100% rename from installq/langs/tw/data/quick_access.xml rename to install/langs/tw/data/quick_access.xml diff --git a/installq/langs/tw/data/risk.xml b/install/langs/tw/data/risk.xml similarity index 100% rename from installq/langs/tw/data/risk.xml rename to install/langs/tw/data/risk.xml diff --git a/installq/langs/tw/data/stock_mvt_reason.xml b/install/langs/tw/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/tw/data/stock_mvt_reason.xml rename to install/langs/tw/data/stock_mvt_reason.xml diff --git a/installq/langs/tw/data/supplier_order_state.xml b/install/langs/tw/data/supplier_order_state.xml similarity index 100% rename from installq/langs/tw/data/supplier_order_state.xml rename to install/langs/tw/data/supplier_order_state.xml diff --git a/installq/langs/tw/data/supply_order_state.xml b/install/langs/tw/data/supply_order_state.xml similarity index 100% rename from installq/langs/tw/data/supply_order_state.xml rename to install/langs/tw/data/supply_order_state.xml diff --git a/installq/langs/tw/data/tab.xml b/install/langs/tw/data/tab.xml similarity index 100% rename from installq/langs/tw/data/tab.xml rename to install/langs/tw/data/tab.xml diff --git a/installq/langs/tw/flag.jpg b/install/langs/tw/flag.jpg similarity index 100% rename from installq/langs/tw/flag.jpg rename to install/langs/tw/flag.jpg diff --git a/installq/langs/tw/img/index.php b/install/langs/tw/img/index.php similarity index 100% rename from installq/langs/tw/img/index.php rename to install/langs/tw/img/index.php diff --git a/installq/langs/tw/img/tw-default-category.jpg b/install/langs/tw/img/tw-default-category.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-category.jpg rename to install/langs/tw/img/tw-default-category.jpg diff --git a/installq/langs/tw/img/tw-default-home.jpg b/install/langs/tw/img/tw-default-home.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-home.jpg rename to install/langs/tw/img/tw-default-home.jpg diff --git a/installq/langs/tw/img/tw-default-large.jpg b/install/langs/tw/img/tw-default-large.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-large.jpg rename to install/langs/tw/img/tw-default-large.jpg diff --git a/installq/langs/tw/img/tw-default-large_scene.jpg b/install/langs/tw/img/tw-default-large_scene.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-large_scene.jpg rename to install/langs/tw/img/tw-default-large_scene.jpg diff --git a/installq/langs/tw/img/tw-default-medium.jpg b/install/langs/tw/img/tw-default-medium.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-medium.jpg rename to install/langs/tw/img/tw-default-medium.jpg diff --git a/installq/langs/tw/img/tw-default-small.jpg b/install/langs/tw/img/tw-default-small.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-small.jpg rename to install/langs/tw/img/tw-default-small.jpg diff --git a/installq/langs/tw/img/tw-default-thickbox.jpg b/install/langs/tw/img/tw-default-thickbox.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-thickbox.jpg rename to install/langs/tw/img/tw-default-thickbox.jpg diff --git a/installq/langs/tw/img/tw-default-thumb_scene.jpg b/install/langs/tw/img/tw-default-thumb_scene.jpg similarity index 100% rename from installq/langs/tw/img/tw-default-thumb_scene.jpg rename to install/langs/tw/img/tw-default-thumb_scene.jpg diff --git a/installq/langs/tw/img/tw.jpg b/install/langs/tw/img/tw.jpg similarity index 100% rename from installq/langs/tw/img/tw.jpg rename to install/langs/tw/img/tw.jpg diff --git a/installq/langs/tw/index.php b/install/langs/tw/index.php similarity index 100% rename from installq/langs/tw/index.php rename to install/langs/tw/index.php diff --git a/installq/langs/tw/install.php b/install/langs/tw/install.php similarity index 100% rename from installq/langs/tw/install.php rename to install/langs/tw/install.php diff --git a/installq/langs/tw/language.xml b/install/langs/tw/language.xml similarity index 100% rename from installq/langs/tw/language.xml rename to install/langs/tw/language.xml diff --git a/installq/langs/tw/mail_identifiers.txt b/install/langs/tw/mail_identifiers.txt similarity index 100% rename from installq/langs/tw/mail_identifiers.txt rename to install/langs/tw/mail_identifiers.txt diff --git a/installq/langs/vn/data/carrier.xml b/install/langs/vn/data/carrier.xml similarity index 100% rename from installq/langs/vn/data/carrier.xml rename to install/langs/vn/data/carrier.xml diff --git a/installq/langs/vn/data/category.xml b/install/langs/vn/data/category.xml similarity index 100% rename from installq/langs/vn/data/category.xml rename to install/langs/vn/data/category.xml diff --git a/installq/langs/vn/data/cms.xml b/install/langs/vn/data/cms.xml similarity index 100% rename from installq/langs/vn/data/cms.xml rename to install/langs/vn/data/cms.xml diff --git a/installq/langs/vn/data/cms_category.xml b/install/langs/vn/data/cms_category.xml similarity index 100% rename from installq/langs/vn/data/cms_category.xml rename to install/langs/vn/data/cms_category.xml diff --git a/installq/langs/vn/data/configuration.xml b/install/langs/vn/data/configuration.xml similarity index 100% rename from installq/langs/vn/data/configuration.xml rename to install/langs/vn/data/configuration.xml diff --git a/installq/langs/vn/data/contact.xml b/install/langs/vn/data/contact.xml similarity index 100% rename from installq/langs/vn/data/contact.xml rename to install/langs/vn/data/contact.xml diff --git a/installq/langs/vn/data/country.xml b/install/langs/vn/data/country.xml similarity index 100% rename from installq/langs/vn/data/country.xml rename to install/langs/vn/data/country.xml diff --git a/installq/langs/vn/data/gender.xml b/install/langs/vn/data/gender.xml similarity index 100% rename from installq/langs/vn/data/gender.xml rename to install/langs/vn/data/gender.xml diff --git a/installq/langs/vn/data/group.xml b/install/langs/vn/data/group.xml similarity index 100% rename from installq/langs/vn/data/group.xml rename to install/langs/vn/data/group.xml diff --git a/installq/langs/vn/data/index.php b/install/langs/vn/data/index.php similarity index 100% rename from installq/langs/vn/data/index.php rename to install/langs/vn/data/index.php diff --git a/installq/langs/vn/data/meta.xml b/install/langs/vn/data/meta.xml similarity index 100% rename from installq/langs/vn/data/meta.xml rename to install/langs/vn/data/meta.xml diff --git a/installq/langs/vn/data/order_return_state.xml b/install/langs/vn/data/order_return_state.xml similarity index 100% rename from installq/langs/vn/data/order_return_state.xml rename to install/langs/vn/data/order_return_state.xml diff --git a/installq/langs/vn/data/order_state.xml b/install/langs/vn/data/order_state.xml similarity index 100% rename from installq/langs/vn/data/order_state.xml rename to install/langs/vn/data/order_state.xml diff --git a/installq/langs/vn/data/profile.xml b/install/langs/vn/data/profile.xml similarity index 100% rename from installq/langs/vn/data/profile.xml rename to install/langs/vn/data/profile.xml diff --git a/installq/langs/vn/data/quick_access.xml b/install/langs/vn/data/quick_access.xml similarity index 100% rename from installq/langs/vn/data/quick_access.xml rename to install/langs/vn/data/quick_access.xml diff --git a/installq/langs/vn/data/risk.xml b/install/langs/vn/data/risk.xml similarity index 100% rename from installq/langs/vn/data/risk.xml rename to install/langs/vn/data/risk.xml diff --git a/installq/langs/vn/data/stock_mvt_reason.xml b/install/langs/vn/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/vn/data/stock_mvt_reason.xml rename to install/langs/vn/data/stock_mvt_reason.xml diff --git a/installq/langs/vn/data/supplier_order_state.xml b/install/langs/vn/data/supplier_order_state.xml similarity index 100% rename from installq/langs/vn/data/supplier_order_state.xml rename to install/langs/vn/data/supplier_order_state.xml diff --git a/installq/langs/vn/data/supply_order_state.xml b/install/langs/vn/data/supply_order_state.xml similarity index 100% rename from installq/langs/vn/data/supply_order_state.xml rename to install/langs/vn/data/supply_order_state.xml diff --git a/installq/langs/vn/data/tab.xml b/install/langs/vn/data/tab.xml similarity index 100% rename from installq/langs/vn/data/tab.xml rename to install/langs/vn/data/tab.xml diff --git a/installq/langs/vn/flag.jpg b/install/langs/vn/flag.jpg similarity index 100% rename from installq/langs/vn/flag.jpg rename to install/langs/vn/flag.jpg diff --git a/installq/langs/vn/img/index.php b/install/langs/vn/img/index.php similarity index 100% rename from installq/langs/vn/img/index.php rename to install/langs/vn/img/index.php diff --git a/installq/langs/vn/img/vn-default-category.jpg b/install/langs/vn/img/vn-default-category.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-category.jpg rename to install/langs/vn/img/vn-default-category.jpg diff --git a/installq/langs/vn/img/vn-default-home.jpg b/install/langs/vn/img/vn-default-home.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-home.jpg rename to install/langs/vn/img/vn-default-home.jpg diff --git a/installq/langs/vn/img/vn-default-large.jpg b/install/langs/vn/img/vn-default-large.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-large.jpg rename to install/langs/vn/img/vn-default-large.jpg diff --git a/installq/langs/vn/img/vn-default-large_scene.jpg b/install/langs/vn/img/vn-default-large_scene.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-large_scene.jpg rename to install/langs/vn/img/vn-default-large_scene.jpg diff --git a/installq/langs/vn/img/vn-default-medium.jpg b/install/langs/vn/img/vn-default-medium.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-medium.jpg rename to install/langs/vn/img/vn-default-medium.jpg diff --git a/installq/langs/vn/img/vn-default-small.jpg b/install/langs/vn/img/vn-default-small.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-small.jpg rename to install/langs/vn/img/vn-default-small.jpg diff --git a/installq/langs/vn/img/vn-default-thickbox.jpg b/install/langs/vn/img/vn-default-thickbox.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-thickbox.jpg rename to install/langs/vn/img/vn-default-thickbox.jpg diff --git a/installq/langs/vn/img/vn-default-thumb_scene.jpg b/install/langs/vn/img/vn-default-thumb_scene.jpg similarity index 100% rename from installq/langs/vn/img/vn-default-thumb_scene.jpg rename to install/langs/vn/img/vn-default-thumb_scene.jpg diff --git a/installq/langs/vn/img/vn.jpg b/install/langs/vn/img/vn.jpg similarity index 100% rename from installq/langs/vn/img/vn.jpg rename to install/langs/vn/img/vn.jpg diff --git a/installq/langs/vn/index.php b/install/langs/vn/index.php similarity index 100% rename from installq/langs/vn/index.php rename to install/langs/vn/index.php diff --git a/installq/langs/vn/install.php b/install/langs/vn/install.php similarity index 100% rename from installq/langs/vn/install.php rename to install/langs/vn/install.php diff --git a/installq/langs/vn/language.xml b/install/langs/vn/language.xml similarity index 100% rename from installq/langs/vn/language.xml rename to install/langs/vn/language.xml diff --git a/installq/langs/vn/mail_identifiers.txt b/install/langs/vn/mail_identifiers.txt similarity index 100% rename from installq/langs/vn/mail_identifiers.txt rename to install/langs/vn/mail_identifiers.txt diff --git a/installq/langs/zh/data/carrier.xml b/install/langs/zh/data/carrier.xml similarity index 100% rename from installq/langs/zh/data/carrier.xml rename to install/langs/zh/data/carrier.xml diff --git a/installq/langs/zh/data/category.xml b/install/langs/zh/data/category.xml similarity index 100% rename from installq/langs/zh/data/category.xml rename to install/langs/zh/data/category.xml diff --git a/installq/langs/zh/data/cms.xml b/install/langs/zh/data/cms.xml similarity index 100% rename from installq/langs/zh/data/cms.xml rename to install/langs/zh/data/cms.xml diff --git a/installq/langs/zh/data/cms_category.xml b/install/langs/zh/data/cms_category.xml similarity index 100% rename from installq/langs/zh/data/cms_category.xml rename to install/langs/zh/data/cms_category.xml diff --git a/installq/langs/zh/data/configuration.xml b/install/langs/zh/data/configuration.xml similarity index 100% rename from installq/langs/zh/data/configuration.xml rename to install/langs/zh/data/configuration.xml diff --git a/installq/langs/zh/data/contact.xml b/install/langs/zh/data/contact.xml similarity index 100% rename from installq/langs/zh/data/contact.xml rename to install/langs/zh/data/contact.xml diff --git a/installq/langs/zh/data/country.xml b/install/langs/zh/data/country.xml similarity index 100% rename from installq/langs/zh/data/country.xml rename to install/langs/zh/data/country.xml diff --git a/installq/langs/zh/data/gender.xml b/install/langs/zh/data/gender.xml similarity index 100% rename from installq/langs/zh/data/gender.xml rename to install/langs/zh/data/gender.xml diff --git a/installq/langs/zh/data/group.xml b/install/langs/zh/data/group.xml similarity index 100% rename from installq/langs/zh/data/group.xml rename to install/langs/zh/data/group.xml diff --git a/installq/langs/zh/data/index.php b/install/langs/zh/data/index.php similarity index 100% rename from installq/langs/zh/data/index.php rename to install/langs/zh/data/index.php diff --git a/installq/langs/zh/data/meta.xml b/install/langs/zh/data/meta.xml similarity index 100% rename from installq/langs/zh/data/meta.xml rename to install/langs/zh/data/meta.xml diff --git a/installq/langs/zh/data/order_return_state.xml b/install/langs/zh/data/order_return_state.xml similarity index 100% rename from installq/langs/zh/data/order_return_state.xml rename to install/langs/zh/data/order_return_state.xml diff --git a/installq/langs/zh/data/order_state.xml b/install/langs/zh/data/order_state.xml similarity index 100% rename from installq/langs/zh/data/order_state.xml rename to install/langs/zh/data/order_state.xml diff --git a/installq/langs/zh/data/profile.xml b/install/langs/zh/data/profile.xml similarity index 100% rename from installq/langs/zh/data/profile.xml rename to install/langs/zh/data/profile.xml diff --git a/installq/langs/zh/data/quick_access.xml b/install/langs/zh/data/quick_access.xml similarity index 100% rename from installq/langs/zh/data/quick_access.xml rename to install/langs/zh/data/quick_access.xml diff --git a/installq/langs/zh/data/risk.xml b/install/langs/zh/data/risk.xml similarity index 100% rename from installq/langs/zh/data/risk.xml rename to install/langs/zh/data/risk.xml diff --git a/installq/langs/zh/data/stock_mvt_reason.xml b/install/langs/zh/data/stock_mvt_reason.xml similarity index 100% rename from installq/langs/zh/data/stock_mvt_reason.xml rename to install/langs/zh/data/stock_mvt_reason.xml diff --git a/installq/langs/zh/data/supplier_order_state.xml b/install/langs/zh/data/supplier_order_state.xml similarity index 100% rename from installq/langs/zh/data/supplier_order_state.xml rename to install/langs/zh/data/supplier_order_state.xml diff --git a/installq/langs/zh/data/supply_order_state.xml b/install/langs/zh/data/supply_order_state.xml similarity index 100% rename from installq/langs/zh/data/supply_order_state.xml rename to install/langs/zh/data/supply_order_state.xml diff --git a/installq/langs/zh/data/tab.xml b/install/langs/zh/data/tab.xml similarity index 100% rename from installq/langs/zh/data/tab.xml rename to install/langs/zh/data/tab.xml diff --git a/installq/langs/zh/flag.jpg b/install/langs/zh/flag.jpg similarity index 100% rename from installq/langs/zh/flag.jpg rename to install/langs/zh/flag.jpg diff --git a/installq/langs/zh/img/index.php b/install/langs/zh/img/index.php similarity index 100% rename from installq/langs/zh/img/index.php rename to install/langs/zh/img/index.php diff --git a/installq/langs/zh/img/zh-default-category.jpg b/install/langs/zh/img/zh-default-category.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-category.jpg rename to install/langs/zh/img/zh-default-category.jpg diff --git a/installq/langs/zh/img/zh-default-home.jpg b/install/langs/zh/img/zh-default-home.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-home.jpg rename to install/langs/zh/img/zh-default-home.jpg diff --git a/installq/langs/zh/img/zh-default-large.jpg b/install/langs/zh/img/zh-default-large.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-large.jpg rename to install/langs/zh/img/zh-default-large.jpg diff --git a/installq/langs/zh/img/zh-default-large_scene.jpg b/install/langs/zh/img/zh-default-large_scene.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-large_scene.jpg rename to install/langs/zh/img/zh-default-large_scene.jpg diff --git a/installq/langs/zh/img/zh-default-medium.jpg b/install/langs/zh/img/zh-default-medium.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-medium.jpg rename to install/langs/zh/img/zh-default-medium.jpg diff --git a/installq/langs/zh/img/zh-default-small.jpg b/install/langs/zh/img/zh-default-small.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-small.jpg rename to install/langs/zh/img/zh-default-small.jpg diff --git a/installq/langs/zh/img/zh-default-thickbox.jpg b/install/langs/zh/img/zh-default-thickbox.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-thickbox.jpg rename to install/langs/zh/img/zh-default-thickbox.jpg diff --git a/installq/langs/zh/img/zh-default-thumb_scene.jpg b/install/langs/zh/img/zh-default-thumb_scene.jpg similarity index 100% rename from installq/langs/zh/img/zh-default-thumb_scene.jpg rename to install/langs/zh/img/zh-default-thumb_scene.jpg diff --git a/installq/langs/zh/img/zh.jpg b/install/langs/zh/img/zh.jpg similarity index 100% rename from installq/langs/zh/img/zh.jpg rename to install/langs/zh/img/zh.jpg diff --git a/installq/langs/zh/index.php b/install/langs/zh/index.php similarity index 100% rename from installq/langs/zh/index.php rename to install/langs/zh/index.php diff --git a/installq/langs/zh/install.php b/install/langs/zh/install.php similarity index 100% rename from installq/langs/zh/install.php rename to install/langs/zh/install.php diff --git a/installq/langs/zh/language.xml b/install/langs/zh/language.xml similarity index 100% rename from installq/langs/zh/language.xml rename to install/langs/zh/language.xml diff --git a/installq/langs/zh/mail_identifiers.txt b/install/langs/zh/mail_identifiers.txt similarity index 100% rename from installq/langs/zh/mail_identifiers.txt rename to install/langs/zh/mail_identifiers.txt diff --git a/installq/models/database.php b/install/models/database.php similarity index 100% rename from installq/models/database.php rename to install/models/database.php diff --git a/installq/models/index.php b/install/models/index.php similarity index 100% rename from installq/models/index.php rename to install/models/index.php diff --git a/installq/models/install.php b/install/models/install.php similarity index 100% rename from installq/models/install.php rename to install/models/install.php diff --git a/installq/models/mail.php b/install/models/mail.php similarity index 100% rename from installq/models/mail.php rename to install/models/mail.php diff --git a/installq/models/system.php b/install/models/system.php similarity index 100% rename from installq/models/system.php rename to install/models/system.php diff --git a/installq/sandbox/.htaccess b/install/sandbox/.htaccess similarity index 100% rename from installq/sandbox/.htaccess rename to install/sandbox/.htaccess diff --git a/installq/sandbox/index.php b/install/sandbox/index.php similarity index 100% rename from installq/sandbox/index.php rename to install/sandbox/index.php diff --git a/installq/sandbox/test.php b/install/sandbox/test.php similarity index 100% rename from installq/sandbox/test.php rename to install/sandbox/test.php diff --git a/installq/theme/img/01-gd100.png b/install/theme/img/01-gd100.png similarity index 100% rename from installq/theme/img/01-gd100.png rename to install/theme/img/01-gd100.png diff --git a/installq/theme/img/01-pt100.png b/install/theme/img/01-pt100.png similarity index 100% rename from installq/theme/img/01-pt100.png rename to install/theme/img/01-pt100.png diff --git a/installq/theme/img/01-pt70.png b/install/theme/img/01-pt70.png similarity index 100% rename from installq/theme/img/01-pt70.png rename to install/theme/img/01-pt70.png diff --git a/installq/theme/img/02-gd100.png b/install/theme/img/02-gd100.png similarity index 100% rename from installq/theme/img/02-gd100.png rename to install/theme/img/02-gd100.png diff --git a/installq/theme/img/02-pt100.png b/install/theme/img/02-pt100.png similarity index 100% rename from installq/theme/img/02-pt100.png rename to install/theme/img/02-pt100.png diff --git a/installq/theme/img/02-pt70.png b/install/theme/img/02-pt70.png similarity index 100% rename from installq/theme/img/02-pt70.png rename to install/theme/img/02-pt70.png diff --git a/installq/theme/img/03-gd100.png b/install/theme/img/03-gd100.png similarity index 100% rename from installq/theme/img/03-gd100.png rename to install/theme/img/03-gd100.png diff --git a/installq/theme/img/03-pt100.png b/install/theme/img/03-pt100.png similarity index 100% rename from installq/theme/img/03-pt100.png rename to install/theme/img/03-pt100.png diff --git a/installq/theme/img/03-pt70.png b/install/theme/img/03-pt70.png similarity index 100% rename from installq/theme/img/03-pt70.png rename to install/theme/img/03-pt70.png diff --git a/installq/theme/img/04-gd100.png b/install/theme/img/04-gd100.png similarity index 100% rename from installq/theme/img/04-gd100.png rename to install/theme/img/04-gd100.png diff --git a/installq/theme/img/04-pt100.png b/install/theme/img/04-pt100.png similarity index 100% rename from installq/theme/img/04-pt100.png rename to install/theme/img/04-pt100.png diff --git a/installq/theme/img/04-pt70.png b/install/theme/img/04-pt70.png similarity index 100% rename from installq/theme/img/04-pt70.png rename to install/theme/img/04-pt70.png diff --git a/installq/theme/img/05-gd100.png b/install/theme/img/05-gd100.png similarity index 100% rename from installq/theme/img/05-gd100.png rename to install/theme/img/05-gd100.png diff --git a/installq/theme/img/05-pt100.png b/install/theme/img/05-pt100.png similarity index 100% rename from installq/theme/img/05-pt100.png rename to install/theme/img/05-pt100.png diff --git a/installq/theme/img/05-pt70.png b/install/theme/img/05-pt70.png similarity index 100% rename from installq/theme/img/05-pt70.png rename to install/theme/img/05-pt70.png diff --git a/installq/theme/img/ajax-loader-small.gif b/install/theme/img/ajax-loader-small.gif similarity index 100% rename from installq/theme/img/ajax-loader-small.gif rename to install/theme/img/ajax-loader-small.gif diff --git a/installq/theme/img/ajax-loader.gif b/install/theme/img/ajax-loader.gif similarity index 100% rename from installq/theme/img/ajax-loader.gif rename to install/theme/img/ajax-loader.gif diff --git a/installq/theme/img/bad.gif b/install/theme/img/bad.gif similarity index 100% rename from installq/theme/img/bad.gif rename to install/theme/img/bad.gif diff --git a/installq/theme/img/bg-body.png b/install/theme/img/bg-body.png similarity index 100% rename from installq/theme/img/bg-body.png rename to install/theme/img/bg-body.png diff --git a/installq/theme/img/bg-contentTitle.png b/install/theme/img/bg-contentTitle.png similarity index 100% rename from installq/theme/img/bg-contentTitle.png rename to install/theme/img/bg-contentTitle.png diff --git a/installq/theme/img/bg-ctnr.png b/install/theme/img/bg-ctnr.png similarity index 100% rename from installq/theme/img/bg-ctnr.png rename to install/theme/img/bg-ctnr.png diff --git a/installq/theme/img/bg-input-text.png b/install/theme/img/bg-input-text.png similarity index 100% rename from installq/theme/img/bg-input-text.png rename to install/theme/img/bg-input-text.png diff --git a/installq/theme/img/bg-li-headerLinks.png b/install/theme/img/bg-li-headerLinks.png similarity index 100% rename from installq/theme/img/bg-li-headerLinks.png rename to install/theme/img/bg-li-headerLinks.png diff --git a/installq/theme/img/bg-li-tabs-finished.png b/install/theme/img/bg-li-tabs-finished.png similarity index 100% rename from installq/theme/img/bg-li-tabs-finished.png rename to install/theme/img/bg-li-tabs-finished.png diff --git a/installq/theme/img/bg-li-tabs-rtl.png b/install/theme/img/bg-li-tabs-rtl.png similarity index 100% rename from installq/theme/img/bg-li-tabs-rtl.png rename to install/theme/img/bg-li-tabs-rtl.png diff --git a/installq/theme/img/bg-li-tabs.png b/install/theme/img/bg-li-tabs.png similarity index 100% rename from installq/theme/img/bg-li-tabs.png rename to install/theme/img/bg-li-tabs.png diff --git a/installq/theme/img/bg-phone_block.png b/install/theme/img/bg-phone_block.png similarity index 100% rename from installq/theme/img/bg-phone_block.png rename to install/theme/img/bg-phone_block.png diff --git a/installq/theme/img/bg-tab.png b/install/theme/img/bg-tab.png similarity index 100% rename from installq/theme/img/bg-tab.png rename to install/theme/img/bg-tab.png diff --git a/installq/theme/img/bg_blockInfoEnd.png b/install/theme/img/bg_blockInfoEnd.png similarity index 100% rename from installq/theme/img/bg_blockInfoEnd.png rename to install/theme/img/bg_blockInfoEnd.png diff --git a/installq/theme/img/bg_bt_blockInfoEnd.png b/install/theme/img/bg_bt_blockInfoEnd.png similarity index 100% rename from installq/theme/img/bg_bt_blockInfoEnd.png rename to install/theme/img/bg_bt_blockInfoEnd.png diff --git a/installq/theme/img/bg_field.png b/install/theme/img/bg_field.png similarity index 100% rename from installq/theme/img/bg_field.png rename to install/theme/img/bg_field.png diff --git a/installq/theme/img/bg_help.png b/install/theme/img/bg_help.png similarity index 100% rename from installq/theme/img/bg_help.png rename to install/theme/img/bg_help.png diff --git a/installq/theme/img/bg_input_button.png b/install/theme/img/bg_input_button.png similarity index 100% rename from installq/theme/img/bg_input_button.png rename to install/theme/img/bg_input_button.png diff --git a/installq/theme/img/bg_li_stepList.png b/install/theme/img/bg_li_stepList.png similarity index 100% rename from installq/theme/img/bg_li_stepList.png rename to install/theme/img/bg_li_stepList.png diff --git a/installq/theme/img/bg_li_title.png b/install/theme/img/bg_li_title.png similarity index 100% rename from installq/theme/img/bg_li_title.png rename to install/theme/img/bg_li_title.png diff --git a/installq/theme/img/bg_loaderSpace.png b/install/theme/img/bg_loaderSpace.png similarity index 100% rename from installq/theme/img/bg_loaderSpace.png rename to install/theme/img/bg_loaderSpace.png diff --git a/installq/theme/img/bg_moduleTable_th.png b/install/theme/img/bg_moduleTable_th.png similarity index 100% rename from installq/theme/img/bg_moduleTable_th.png rename to install/theme/img/bg_moduleTable_th.png diff --git a/installq/theme/img/boutonpt-disabled.png b/install/theme/img/boutonpt-disabled.png similarity index 100% rename from installq/theme/img/boutonpt-disabled.png rename to install/theme/img/boutonpt-disabled.png diff --git a/installq/theme/img/boutonpt-on.png b/install/theme/img/boutonpt-on.png similarity index 100% rename from installq/theme/img/boutonpt-on.png rename to install/theme/img/boutonpt-on.png diff --git a/installq/theme/img/boutonpt-over.png b/install/theme/img/boutonpt-over.png similarity index 100% rename from installq/theme/img/boutonpt-over.png rename to install/theme/img/boutonpt-over.png diff --git a/installq/theme/img/bt - Copie.png b/install/theme/img/bt - Copie.png similarity index 100% rename from installq/theme/img/bt - Copie.png rename to install/theme/img/bt - Copie.png diff --git a/installq/theme/img/bt-dsbl - Copie.png b/install/theme/img/bt-dsbl - Copie.png similarity index 100% rename from installq/theme/img/bt-dsbl - Copie.png rename to install/theme/img/bt-dsbl - Copie.png diff --git a/installq/theme/img/bt-dsbl.png b/install/theme/img/bt-dsbl.png similarity index 100% rename from installq/theme/img/bt-dsbl.png rename to install/theme/img/bt-dsbl.png diff --git a/installq/theme/img/bt-hover.png b/install/theme/img/bt-hover.png similarity index 100% rename from installq/theme/img/bt-hover.png rename to install/theme/img/bt-hover.png diff --git a/installq/theme/img/bt.png b/install/theme/img/bt.png similarity index 100% rename from installq/theme/img/bt.png rename to install/theme/img/bt.png diff --git a/installq/theme/img/bt_off.png b/install/theme/img/bt_off.png similarity index 100% rename from installq/theme/img/bt_off.png rename to install/theme/img/bt_off.png diff --git a/installq/theme/img/bt_off_hover.png b/install/theme/img/bt_off_hover.png similarity index 100% rename from installq/theme/img/bt_off_hover.png rename to install/theme/img/bt_off_hover.png diff --git a/installq/theme/img/btn-installeur.png b/install/theme/img/btn-installeur.png similarity index 100% rename from installq/theme/img/btn-installeur.png rename to install/theme/img/btn-installeur.png diff --git a/installq/theme/img/bullet.png b/install/theme/img/bullet.png similarity index 100% rename from installq/theme/img/bullet.png rename to install/theme/img/bullet.png diff --git a/installq/theme/img/chosen-sprite.png b/install/theme/img/chosen-sprite.png similarity index 100% rename from installq/theme/img/chosen-sprite.png rename to install/theme/img/chosen-sprite.png diff --git a/installq/theme/img/chosen-sprite@2x.png b/install/theme/img/chosen-sprite@2x.png similarity index 100% rename from installq/theme/img/chosen-sprite@2x.png rename to install/theme/img/chosen-sprite@2x.png diff --git a/installq/theme/img/favicon.ico b/install/theme/img/favicon.ico similarity index 100% rename from installq/theme/img/favicon.ico rename to install/theme/img/favicon.ico diff --git a/installq/theme/img/help.png b/install/theme/img/help.png similarity index 100% rename from installq/theme/img/help.png rename to install/theme/img/help.png diff --git a/installq/theme/img/ico_help.gif b/install/theme/img/ico_help.gif similarity index 100% rename from installq/theme/img/ico_help.gif rename to install/theme/img/ico_help.gif diff --git a/installq/theme/img/icon-bulb.png b/install/theme/img/icon-bulb.png similarity index 100% rename from installq/theme/img/icon-bulb.png rename to install/theme/img/icon-bulb.png diff --git a/installq/theme/img/icon-installation-guide.png b/install/theme/img/icon-installation-guide.png similarity index 100% rename from installq/theme/img/icon-installation-guide.png rename to install/theme/img/icon-installation-guide.png diff --git a/installq/theme/img/icon-services.png b/install/theme/img/icon-services.png similarity index 100% rename from installq/theme/img/icon-services.png rename to install/theme/img/icon-services.png diff --git a/installq/theme/img/icon-tutorials.png b/install/theme/img/icon-tutorials.png similarity index 100% rename from installq/theme/img/icon-tutorials.png rename to install/theme/img/icon-tutorials.png diff --git a/installq/theme/img/index.php b/install/theme/img/index.php similarity index 100% rename from installq/theme/img/index.php rename to install/theme/img/index.php diff --git a/installq/theme/img/logo.png b/install/theme/img/logo.png similarity index 100% rename from installq/theme/img/logo.png rename to install/theme/img/logo.png diff --git a/installq/theme/img/noflag.jpg b/install/theme/img/noflag.jpg similarity index 100% rename from installq/theme/img/noflag.jpg rename to install/theme/img/noflag.jpg diff --git a/installq/theme/img/ok.gif b/install/theme/img/ok.gif similarity index 100% rename from installq/theme/img/ok.gif rename to install/theme/img/ok.gif diff --git a/installq/theme/img/ombrage-bas.png b/install/theme/img/ombrage-bas.png similarity index 100% rename from installq/theme/img/ombrage-bas.png rename to install/theme/img/ombrage-bas.png diff --git a/installq/theme/img/ombrage-droit.png b/install/theme/img/ombrage-droit.png similarity index 100% rename from installq/theme/img/ombrage-droit.png rename to install/theme/img/ombrage-droit.png diff --git a/installq/theme/img/phone.png b/install/theme/img/phone.png similarity index 100% rename from installq/theme/img/phone.png rename to install/theme/img/phone.png diff --git a/installq/theme/img/pict_error.png b/install/theme/img/pict_error.png similarity index 100% rename from installq/theme/img/pict_error.png rename to install/theme/img/pict_error.png diff --git a/installq/theme/img/pict_h3_infos.png b/install/theme/img/pict_h3_infos.png similarity index 100% rename from installq/theme/img/pict_h3_infos.png rename to install/theme/img/pict_h3_infos.png diff --git a/installq/theme/img/pict_info.png b/install/theme/img/pict_info.png similarity index 100% rename from installq/theme/img/pict_info.png rename to install/theme/img/pict_info.png diff --git a/installq/theme/img/print.png b/install/theme/img/print.png similarity index 100% rename from installq/theme/img/print.png rename to install/theme/img/print.png diff --git a/installq/theme/img/puce.gif b/install/theme/img/puce.gif similarity index 100% rename from installq/theme/img/puce.gif rename to install/theme/img/puce.gif diff --git a/installq/theme/img/shadow-left.png b/install/theme/img/shadow-left.png similarity index 100% rename from installq/theme/img/shadow-left.png rename to install/theme/img/shadow-left.png diff --git a/installq/theme/img/suggested-modules.png b/install/theme/img/suggested-modules.png similarity index 100% rename from installq/theme/img/suggested-modules.png rename to install/theme/img/suggested-modules.png diff --git a/installq/theme/img/suggested-themes.png b/install/theme/img/suggested-themes.png similarity index 100% rename from installq/theme/img/suggested-themes.png rename to install/theme/img/suggested-themes.png diff --git a/installq/theme/img/visu_boBlock.png b/install/theme/img/visu_boBlock.png similarity index 100% rename from installq/theme/img/visu_boBlock.png rename to install/theme/img/visu_boBlock.png diff --git a/installq/theme/img/visu_foBlock.png b/install/theme/img/visu_foBlock.png similarity index 100% rename from installq/theme/img/visu_foBlock.png rename to install/theme/img/visu_foBlock.png diff --git a/installq/theme/index.php b/install/theme/index.php similarity index 100% rename from installq/theme/index.php rename to install/theme/index.php diff --git a/installq/theme/js/configure.js b/install/theme/js/configure.js similarity index 100% rename from installq/theme/js/configure.js rename to install/theme/js/configure.js diff --git a/installq/theme/js/database.js b/install/theme/js/database.js similarity index 100% rename from installq/theme/js/database.js rename to install/theme/js/database.js diff --git a/installq/theme/js/index.php b/install/theme/js/index.php similarity index 100% rename from installq/theme/js/index.php rename to install/theme/js/index.php diff --git a/installq/theme/js/install.js b/install/theme/js/install.js similarity index 100% rename from installq/theme/js/install.js rename to install/theme/js/install.js diff --git a/installq/theme/js/license.js b/install/theme/js/license.js similarity index 100% rename from installq/theme/js/license.js rename to install/theme/js/license.js diff --git a/installq/theme/js/process.js b/install/theme/js/process.js similarity index 100% rename from installq/theme/js/process.js rename to install/theme/js/process.js diff --git a/installq/theme/js/welcome.js b/install/theme/js/welcome.js similarity index 100% rename from installq/theme/js/welcome.js rename to install/theme/js/welcome.js diff --git a/installq/theme/rtl.css b/install/theme/rtl.css similarity index 100% rename from installq/theme/rtl.css rename to install/theme/rtl.css diff --git a/installq/theme/view.css b/install/theme/view.css similarity index 100% rename from installq/theme/view.css rename to install/theme/view.css diff --git a/installq/theme/views/configure.phtml b/install/theme/views/configure.phtml similarity index 100% rename from installq/theme/views/configure.phtml rename to install/theme/views/configure.phtml diff --git a/installq/theme/views/database.phtml b/install/theme/views/database.phtml similarity index 100% rename from installq/theme/views/database.phtml rename to install/theme/views/database.phtml diff --git a/installq/theme/views/footer.phtml b/install/theme/views/footer.phtml similarity index 100% rename from installq/theme/views/footer.phtml rename to install/theme/views/footer.phtml diff --git a/installq/theme/views/header.phtml b/install/theme/views/header.phtml similarity index 100% rename from installq/theme/views/header.phtml rename to install/theme/views/header.phtml diff --git a/installq/theme/views/index.php b/install/theme/views/index.php similarity index 100% rename from installq/theme/views/index.php rename to install/theme/views/index.php diff --git a/installq/theme/views/license.phtml b/install/theme/views/license.phtml similarity index 100% rename from installq/theme/views/license.phtml rename to install/theme/views/license.phtml diff --git a/installq/theme/views/license_content.phtml b/install/theme/views/license_content.phtml similarity index 100% rename from installq/theme/views/license_content.phtml rename to install/theme/views/license_content.phtml diff --git a/installq/theme/views/process.phtml b/install/theme/views/process.phtml similarity index 100% rename from installq/theme/views/process.phtml rename to install/theme/views/process.phtml diff --git a/installq/theme/views/system.phtml b/install/theme/views/system.phtml similarity index 100% rename from installq/theme/views/system.phtml rename to install/theme/views/system.phtml diff --git a/installq/theme/views/welcome.phtml b/install/theme/views/welcome.phtml similarity index 100% rename from installq/theme/views/welcome.phtml rename to install/theme/views/welcome.phtml diff --git a/installq/upgrade/classes/AbstractLogger.php b/install/upgrade/classes/AbstractLogger.php similarity index 100% rename from installq/upgrade/classes/AbstractLogger.php rename to install/upgrade/classes/AbstractLogger.php diff --git a/installq/upgrade/classes/AddConfToFile.php b/install/upgrade/classes/AddConfToFile.php similarity index 100% rename from installq/upgrade/classes/AddConfToFile.php rename to install/upgrade/classes/AddConfToFile.php diff --git a/installq/upgrade/classes/FileLogger.php b/install/upgrade/classes/FileLogger.php similarity index 100% rename from installq/upgrade/classes/FileLogger.php rename to install/upgrade/classes/FileLogger.php diff --git a/installq/upgrade/classes/ToolsInstall.php b/install/upgrade/classes/ToolsInstall.php similarity index 100% rename from installq/upgrade/classes/ToolsInstall.php rename to install/upgrade/classes/ToolsInstall.php diff --git a/installq/upgrade/classes/index.php b/install/upgrade/classes/index.php similarity index 100% rename from installq/upgrade/classes/index.php rename to install/upgrade/classes/index.php diff --git a/installq/upgrade/index.php b/install/upgrade/index.php similarity index 100% rename from installq/upgrade/index.php rename to install/upgrade/index.php diff --git a/installq/upgrade/php/add_accounting_tab.php b/install/upgrade/php/add_accounting_tab.php similarity index 100% rename from installq/upgrade/php/add_accounting_tab.php rename to install/upgrade/php/add_accounting_tab.php diff --git a/installq/upgrade/php/add_attribute_position.php b/install/upgrade/php/add_attribute_position.php similarity index 100% rename from installq/upgrade/php/add_attribute_position.php rename to install/upgrade/php/add_attribute_position.php diff --git a/installq/upgrade/php/add_carrier_position.php b/install/upgrade/php/add_carrier_position.php similarity index 100% rename from installq/upgrade/php/add_carrier_position.php rename to install/upgrade/php/add_carrier_position.php diff --git a/installq/upgrade/php/add_column_order_state_deleted_if_not_exists.php b/install/upgrade/php/add_column_order_state_deleted_if_not_exists.php similarity index 100% rename from installq/upgrade/php/add_column_order_state_deleted_if_not_exists.php rename to install/upgrade/php/add_column_order_state_deleted_if_not_exists.php diff --git a/installq/upgrade/php/add_column_orders_reference_if_not_exists.php b/install/upgrade/php/add_column_orders_reference_if_not_exists.php similarity index 100% rename from installq/upgrade/php/add_column_orders_reference_if_not_exists.php rename to install/upgrade/php/add_column_orders_reference_if_not_exists.php diff --git a/installq/upgrade/php/add_default_restrictions_modules_groups.php b/install/upgrade/php/add_default_restrictions_modules_groups.php similarity index 100% rename from installq/upgrade/php/add_default_restrictions_modules_groups.php rename to install/upgrade/php/add_default_restrictions_modules_groups.php diff --git a/installq/upgrade/php/add_feature_position.php b/install/upgrade/php/add_feature_position.php similarity index 100% rename from installq/upgrade/php/add_feature_position.php rename to install/upgrade/php/add_feature_position.php diff --git a/installq/upgrade/php/add_group_attribute_position.php b/install/upgrade/php/add_group_attribute_position.php similarity index 100% rename from installq/upgrade/php/add_group_attribute_position.php rename to install/upgrade/php/add_group_attribute_position.php diff --git a/installq/upgrade/php/add_id_shop_to_shipper_lang_index.php b/install/upgrade/php/add_id_shop_to_shipper_lang_index.php similarity index 100% rename from installq/upgrade/php/add_id_shop_to_shipper_lang_index.php rename to install/upgrade/php/add_id_shop_to_shipper_lang_index.php diff --git a/installq/upgrade/php/add_missing_columns_customer.php b/install/upgrade/php/add_missing_columns_customer.php similarity index 100% rename from installq/upgrade/php/add_missing_columns_customer.php rename to install/upgrade/php/add_missing_columns_customer.php diff --git a/installq/upgrade/php/add_missing_image_key.php b/install/upgrade/php/add_missing_image_key.php similarity index 100% rename from installq/upgrade/php/add_missing_image_key.php rename to install/upgrade/php/add_missing_image_key.php diff --git a/installq/upgrade/php/add_missing_rewrite_value.php b/install/upgrade/php/add_missing_rewrite_value.php similarity index 100% rename from installq/upgrade/php/add_missing_rewrite_value.php rename to install/upgrade/php/add_missing_rewrite_value.php diff --git a/installq/upgrade/php/add_missing_shop_column_pagenotfound.php b/install/upgrade/php/add_missing_shop_column_pagenotfound.php similarity index 100% rename from installq/upgrade/php/add_missing_shop_column_pagenotfound.php rename to install/upgrade/php/add_missing_shop_column_pagenotfound.php diff --git a/installq/upgrade/php/add_module_to_hook.php b/install/upgrade/php/add_module_to_hook.php similarity index 100% rename from installq/upgrade/php/add_module_to_hook.php rename to install/upgrade/php/add_module_to_hook.php diff --git a/installq/upgrade/php/add_new_groups.php b/install/upgrade/php/add_new_groups.php similarity index 100% rename from installq/upgrade/php/add_new_groups.php rename to install/upgrade/php/add_new_groups.php diff --git a/installq/upgrade/php/add_new_tab.php b/install/upgrade/php/add_new_tab.php similarity index 100% rename from installq/upgrade/php/add_new_tab.php rename to install/upgrade/php/add_new_tab.php diff --git a/installq/upgrade/php/add_order_reference_in_order_payment.php b/install/upgrade/php/add_order_reference_in_order_payment.php similarity index 100% rename from installq/upgrade/php/add_order_reference_in_order_payment.php rename to install/upgrade/php/add_order_reference_in_order_payment.php diff --git a/installq/upgrade/php/add_order_state.php b/install/upgrade/php/add_order_state.php similarity index 100% rename from installq/upgrade/php/add_order_state.php rename to install/upgrade/php/add_order_state.php diff --git a/installq/upgrade/php/add_required_customization_field_flag.php b/install/upgrade/php/add_required_customization_field_flag.php similarity index 100% rename from installq/upgrade/php/add_required_customization_field_flag.php rename to install/upgrade/php/add_required_customization_field_flag.php diff --git a/installq/upgrade/php/add_stock_tab.php b/install/upgrade/php/add_stock_tab.php similarity index 100% rename from installq/upgrade/php/add_stock_tab.php rename to install/upgrade/php/add_stock_tab.php diff --git a/installq/upgrade/php/add_unknown_gender.php b/install/upgrade/php/add_unknown_gender.php similarity index 100% rename from installq/upgrade/php/add_unknown_gender.php rename to install/upgrade/php/add_unknown_gender.php diff --git a/installq/upgrade/php/alter_blocklink.php b/install/upgrade/php/alter_blocklink.php similarity index 100% rename from installq/upgrade/php/alter_blocklink.php rename to install/upgrade/php/alter_blocklink.php diff --git a/installq/upgrade/php/alter_cms_block.php b/install/upgrade/php/alter_cms_block.php similarity index 100% rename from installq/upgrade/php/alter_cms_block.php rename to install/upgrade/php/alter_cms_block.php diff --git a/installq/upgrade/php/alter_productcomments_guest_index.php b/install/upgrade/php/alter_productcomments_guest_index.php similarity index 100% rename from installq/upgrade/php/alter_productcomments_guest_index.php rename to install/upgrade/php/alter_productcomments_guest_index.php diff --git a/installq/upgrade/php/attribute_group_clean_combinations.php b/install/upgrade/php/attribute_group_clean_combinations.php similarity index 100% rename from installq/upgrade/php/attribute_group_clean_combinations.php rename to install/upgrade/php/attribute_group_clean_combinations.php diff --git a/installq/upgrade/php/block_category_1521.php b/install/upgrade/php/block_category_1521.php similarity index 100% rename from installq/upgrade/php/block_category_1521.php rename to install/upgrade/php/block_category_1521.php diff --git a/installq/upgrade/php/blocknewsletter.php b/install/upgrade/php/blocknewsletter.php similarity index 100% rename from installq/upgrade/php/blocknewsletter.php rename to install/upgrade/php/blocknewsletter.php diff --git a/installq/upgrade/php/blocknewsletter1530.php b/install/upgrade/php/blocknewsletter1530.php similarity index 100% rename from installq/upgrade/php/blocknewsletter1530.php rename to install/upgrade/php/blocknewsletter1530.php diff --git a/installq/upgrade/php/category_product_index_unique.php b/install/upgrade/php/category_product_index_unique.php similarity index 100% rename from installq/upgrade/php/category_product_index_unique.php rename to install/upgrade/php/category_product_index_unique.php diff --git a/installq/upgrade/php/change_feature_image_to_jpg.php b/install/upgrade/php/change_feature_image_to_jpg.php similarity index 100% rename from installq/upgrade/php/change_feature_image_to_jpg.php rename to install/upgrade/php/change_feature_image_to_jpg.php diff --git a/installq/upgrade/php/check_webservice_account_table.php b/install/upgrade/php/check_webservice_account_table.php similarity index 100% rename from installq/upgrade/php/check_webservice_account_table.php rename to install/upgrade/php/check_webservice_account_table.php diff --git a/installq/upgrade/php/clean_category_product.php b/install/upgrade/php/clean_category_product.php similarity index 100% rename from installq/upgrade/php/clean_category_product.php rename to install/upgrade/php/clean_category_product.php diff --git a/installq/upgrade/php/clean_tabs_15.php b/install/upgrade/php/clean_tabs_15.php similarity index 100% rename from installq/upgrade/php/clean_tabs_15.php rename to install/upgrade/php/clean_tabs_15.php diff --git a/installq/upgrade/php/cms_block.php b/install/upgrade/php/cms_block.php similarity index 100% rename from installq/upgrade/php/cms_block.php rename to install/upgrade/php/cms_block.php diff --git a/installq/upgrade/php/cms_multishop.php b/install/upgrade/php/cms_multishop.php similarity index 100% rename from installq/upgrade/php/cms_multishop.php rename to install/upgrade/php/cms_multishop.php diff --git a/installq/upgrade/php/configuration_double_cleaner.php b/install/upgrade/php/configuration_double_cleaner.php similarity index 100% rename from installq/upgrade/php/configuration_double_cleaner.php rename to install/upgrade/php/configuration_double_cleaner.php diff --git a/installq/upgrade/php/convert_product_price.php b/install/upgrade/php/convert_product_price.php similarity index 100% rename from installq/upgrade/php/convert_product_price.php rename to install/upgrade/php/convert_product_price.php diff --git a/installq/upgrade/php/country_to_timezone.php b/install/upgrade/php/country_to_timezone.php similarity index 100% rename from installq/upgrade/php/country_to_timezone.php rename to install/upgrade/php/country_to_timezone.php diff --git a/installq/upgrade/php/create_multistore.php b/install/upgrade/php/create_multistore.php similarity index 100% rename from installq/upgrade/php/create_multistore.php rename to install/upgrade/php/create_multistore.php diff --git a/installq/upgrade/php/customization_field_multishop_lang.php b/install/upgrade/php/customization_field_multishop_lang.php similarity index 100% rename from installq/upgrade/php/customization_field_multishop_lang.php rename to install/upgrade/php/customization_field_multishop_lang.php diff --git a/installq/upgrade/php/deactivate_custom_modules.php b/install/upgrade/php/deactivate_custom_modules.php similarity index 100% rename from installq/upgrade/php/deactivate_custom_modules.php rename to install/upgrade/php/deactivate_custom_modules.php diff --git a/installq/upgrade/php/delivery_number_set.php b/install/upgrade/php/delivery_number_set.php similarity index 100% rename from installq/upgrade/php/delivery_number_set.php rename to install/upgrade/php/delivery_number_set.php diff --git a/installq/upgrade/php/drop_image_type_non_unique_index.php b/install/upgrade/php/drop_image_type_non_unique_index.php similarity index 100% rename from installq/upgrade/php/drop_image_type_non_unique_index.php rename to install/upgrade/php/drop_image_type_non_unique_index.php diff --git a/installq/upgrade/php/drop_module_non_unique_index.php b/install/upgrade/php/drop_module_non_unique_index.php similarity index 100% rename from installq/upgrade/php/drop_module_non_unique_index.php rename to install/upgrade/php/drop_module_non_unique_index.php diff --git a/installq/upgrade/php/ecotax_tax_application_fix.php b/install/upgrade/php/ecotax_tax_application_fix.php similarity index 100% rename from installq/upgrade/php/ecotax_tax_application_fix.php rename to install/upgrade/php/ecotax_tax_application_fix.php diff --git a/installq/upgrade/php/editorial_update.php b/install/upgrade/php/editorial_update.php similarity index 100% rename from installq/upgrade/php/editorial_update.php rename to install/upgrade/php/editorial_update.php diff --git a/installq/upgrade/php/editorial_update_multishop.php b/install/upgrade/php/editorial_update_multishop.php similarity index 100% rename from installq/upgrade/php/editorial_update_multishop.php rename to install/upgrade/php/editorial_update_multishop.php diff --git a/installq/upgrade/php/fix_cms_shop_1520.php b/install/upgrade/php/fix_cms_shop_1520.php similarity index 100% rename from installq/upgrade/php/fix_cms_shop_1520.php rename to install/upgrade/php/fix_cms_shop_1520.php diff --git a/installq/upgrade/php/fix_download_product_feature_active.php b/install/upgrade/php/fix_download_product_feature_active.php similarity index 100% rename from installq/upgrade/php/fix_download_product_feature_active.php rename to install/upgrade/php/fix_download_product_feature_active.php diff --git a/installq/upgrade/php/fix_unique_specific_price.php b/install/upgrade/php/fix_unique_specific_price.php similarity index 100% rename from installq/upgrade/php/fix_unique_specific_price.php rename to install/upgrade/php/fix_unique_specific_price.php diff --git a/installq/upgrade/php/generate_new_cookie_key.php b/install/upgrade/php/generate_new_cookie_key.php similarity index 100% rename from installq/upgrade/php/generate_new_cookie_key.php rename to install/upgrade/php/generate_new_cookie_key.php diff --git a/installq/upgrade/php/generate_ntree.php b/install/upgrade/php/generate_ntree.php similarity index 100% rename from installq/upgrade/php/generate_ntree.php rename to install/upgrade/php/generate_ntree.php diff --git a/installq/upgrade/php/generate_root_category_for_multishop.php b/install/upgrade/php/generate_root_category_for_multishop.php similarity index 100% rename from installq/upgrade/php/generate_root_category_for_multishop.php rename to install/upgrade/php/generate_root_category_for_multishop.php diff --git a/installq/upgrade/php/generate_tax_rules.php b/install/upgrade/php/generate_tax_rules.php similarity index 100% rename from installq/upgrade/php/generate_tax_rules.php rename to install/upgrade/php/generate_tax_rules.php diff --git a/installq/upgrade/php/generic_add_missing_column.php b/install/upgrade/php/generic_add_missing_column.php similarity index 100% rename from installq/upgrade/php/generic_add_missing_column.php rename to install/upgrade/php/generic_add_missing_column.php diff --git a/installq/upgrade/php/gridextjs_deprecated.php b/install/upgrade/php/gridextjs_deprecated.php similarity index 100% rename from installq/upgrade/php/gridextjs_deprecated.php rename to install/upgrade/php/gridextjs_deprecated.php diff --git a/installq/upgrade/php/group_reduction_column_fix.php b/install/upgrade/php/group_reduction_column_fix.php similarity index 100% rename from installq/upgrade/php/group_reduction_column_fix.php rename to install/upgrade/php/group_reduction_column_fix.php diff --git a/installq/upgrade/php/hook_blocksearch_on_header.php b/install/upgrade/php/hook_blocksearch_on_header.php similarity index 100% rename from installq/upgrade/php/hook_blocksearch_on_header.php rename to install/upgrade/php/hook_blocksearch_on_header.php diff --git a/installq/upgrade/php/id_currency_country_fix.php b/install/upgrade/php/id_currency_country_fix.php similarity index 100% rename from installq/upgrade/php/id_currency_country_fix.php rename to install/upgrade/php/id_currency_country_fix.php diff --git a/installq/upgrade/php/image_shop1510.php b/install/upgrade/php/image_shop1510.php similarity index 100% rename from installq/upgrade/php/image_shop1510.php rename to install/upgrade/php/image_shop1510.php diff --git a/installq/upgrade/php/index.php b/install/upgrade/php/index.php similarity index 100% rename from installq/upgrade/php/index.php rename to install/upgrade/php/index.php diff --git a/installq/upgrade/php/invoice_number_set.php b/install/upgrade/php/invoice_number_set.php similarity index 100% rename from installq/upgrade/php/invoice_number_set.php rename to install/upgrade/php/invoice_number_set.php diff --git a/installq/upgrade/php/latin1_database_to_utf8.php b/install/upgrade/php/latin1_database_to_utf8.php similarity index 100% rename from installq/upgrade/php/latin1_database_to_utf8.php rename to install/upgrade/php/latin1_database_to_utf8.php diff --git a/installq/upgrade/php/migrate_block_info_to_cms_block.php b/install/upgrade/php/migrate_block_info_to_cms_block.php similarity index 100% rename from installq/upgrade/php/migrate_block_info_to_cms_block.php rename to install/upgrade/php/migrate_block_info_to_cms_block.php diff --git a/installq/upgrade/php/migrate_orders.php b/install/upgrade/php/migrate_orders.php similarity index 100% rename from installq/upgrade/php/migrate_orders.php rename to install/upgrade/php/migrate_orders.php diff --git a/installq/upgrade/php/migrate_tabs_15.php b/install/upgrade/php/migrate_tabs_15.php similarity index 100% rename from installq/upgrade/php/migrate_tabs_15.php rename to install/upgrade/php/migrate_tabs_15.php diff --git a/installq/upgrade/php/migrate_tabs_multi_shop.php b/install/upgrade/php/migrate_tabs_multi_shop.php similarity index 100% rename from installq/upgrade/php/migrate_tabs_multi_shop.php rename to install/upgrade/php/migrate_tabs_multi_shop.php diff --git a/installq/upgrade/php/module_blockwishlist_multishop.php b/install/upgrade/php/module_blockwishlist_multishop.php similarity index 100% rename from installq/upgrade/php/module_blockwishlist_multishop.php rename to install/upgrade/php/module_blockwishlist_multishop.php diff --git a/installq/upgrade/php/module_reinstall_blockmyaccount.php b/install/upgrade/php/module_reinstall_blockmyaccount.php similarity index 100% rename from installq/upgrade/php/module_reinstall_blockmyaccount.php rename to install/upgrade/php/module_reinstall_blockmyaccount.php diff --git a/installq/upgrade/php/module_reinstall_blocksearch.php b/install/upgrade/php/module_reinstall_blocksearch.php similarity index 100% rename from installq/upgrade/php/module_reinstall_blocksearch.php rename to install/upgrade/php/module_reinstall_blocksearch.php diff --git a/installq/upgrade/php/move_crossselling.php b/install/upgrade/php/move_crossselling.php similarity index 100% rename from installq/upgrade/php/move_crossselling.php rename to install/upgrade/php/move_crossselling.php diff --git a/installq/upgrade/php/move_translations_module_file.php b/install/upgrade/php/move_translations_module_file.php similarity index 100% rename from installq/upgrade/php/move_translations_module_file.php rename to install/upgrade/php/move_translations_module_file.php diff --git a/installq/upgrade/php/outstanding_allow_amount1530.php b/install/upgrade/php/outstanding_allow_amount1530.php similarity index 100% rename from installq/upgrade/php/outstanding_allow_amount1530.php rename to install/upgrade/php/outstanding_allow_amount1530.php diff --git a/installq/upgrade/php/p15010_drop_column_id_address_if_exists.php b/install/upgrade/php/p15010_drop_column_id_address_if_exists.php similarity index 100% rename from installq/upgrade/php/p15010_drop_column_id_address_if_exists.php rename to install/upgrade/php/p15010_drop_column_id_address_if_exists.php diff --git a/installq/upgrade/php/p15012_add_missing_columns.php b/install/upgrade/php/p15012_add_missing_columns.php similarity index 100% rename from installq/upgrade/php/p15012_add_missing_columns.php rename to install/upgrade/php/p15012_add_missing_columns.php diff --git a/installq/upgrade/php/p15013_add_missing_columns.php b/install/upgrade/php/p15013_add_missing_columns.php similarity index 100% rename from installq/upgrade/php/p15013_add_missing_columns.php rename to install/upgrade/php/p15013_add_missing_columns.php diff --git a/installq/upgrade/php/p15014_add_missing_columns.php b/install/upgrade/php/p15014_add_missing_columns.php similarity index 100% rename from installq/upgrade/php/p15014_add_missing_columns.php rename to install/upgrade/php/p15014_add_missing_columns.php diff --git a/installq/upgrade/php/p15014_copy_missing_images_tab_from_installer.php b/install/upgrade/php/p15014_copy_missing_images_tab_from_installer.php similarity index 100% rename from installq/upgrade/php/p15014_copy_missing_images_tab_from_installer.php rename to install/upgrade/php/p15014_copy_missing_images_tab_from_installer.php diff --git a/installq/upgrade/php/p15014_upgrade_sekeywords.php b/install/upgrade/php/p15014_upgrade_sekeywords.php similarity index 100% rename from installq/upgrade/php/p15014_upgrade_sekeywords.php rename to install/upgrade/php/p15014_upgrade_sekeywords.php diff --git a/installq/upgrade/php/p15015_blockadvertising_extension.php b/install/upgrade/php/p15015_blockadvertising_extension.php similarity index 100% rename from installq/upgrade/php/p15015_blockadvertising_extension.php rename to install/upgrade/php/p15015_blockadvertising_extension.php diff --git a/installq/upgrade/php/p15016_add_missing_columns.php b/install/upgrade/php/p15016_add_missing_columns.php similarity index 100% rename from installq/upgrade/php/p15016_add_missing_columns.php rename to install/upgrade/php/p15016_add_missing_columns.php diff --git a/installq/upgrade/php/p15017_add_id_shop_to_primary_key.php b/install/upgrade/php/p15017_add_id_shop_to_primary_key.php similarity index 100% rename from installq/upgrade/php/p15017_add_id_shop_to_primary_key.php rename to install/upgrade/php/p15017_add_id_shop_to_primary_key.php diff --git a/installq/upgrade/php/p15018_change_image_types.php b/install/upgrade/php/p15018_change_image_types.php similarity index 100% rename from installq/upgrade/php/p15018_change_image_types.php rename to install/upgrade/php/p15018_change_image_types.php diff --git a/installq/upgrade/php/p1531_redirect_type.php b/install/upgrade/php/p1531_redirect_type.php similarity index 100% rename from installq/upgrade/php/p1531_redirect_type.php rename to install/upgrade/php/p1531_redirect_type.php diff --git a/installq/upgrade/php/p1540_add_missing_columns.php b/install/upgrade/php/p1540_add_missing_columns.php similarity index 100% rename from installq/upgrade/php/p1540_add_missing_columns.php rename to install/upgrade/php/p1540_add_missing_columns.php diff --git a/installq/upgrade/php/p16011_media_server.php b/install/upgrade/php/p16011_media_server.php similarity index 100% rename from installq/upgrade/php/p16011_media_server.php rename to install/upgrade/php/p16011_media_server.php diff --git a/installq/upgrade/php/p16012_pack_rework.php b/install/upgrade/php/p16012_pack_rework.php similarity index 100% rename from installq/upgrade/php/p16012_pack_rework.php rename to install/upgrade/php/p16012_pack_rework.php diff --git a/installq/upgrade/php/p1603_add_attachment_size.php b/install/upgrade/php/p1603_add_attachment_size.php similarity index 100% rename from installq/upgrade/php/p1603_add_attachment_size.php rename to install/upgrade/php/p1603_add_attachment_size.php diff --git a/installq/upgrade/php/p1606module_exceptions.php b/install/upgrade/php/p1606module_exceptions.php similarity index 100% rename from installq/upgrade/php/p1606module_exceptions.php rename to install/upgrade/php/p1606module_exceptions.php diff --git a/installq/upgrade/php/p1607_drop_primary_key_if_exists.php b/install/upgrade/php/p1607_drop_primary_key_if_exists.php similarity index 100% rename from installq/upgrade/php/p1607_drop_primary_key_if_exists.php rename to install/upgrade/php/p1607_drop_primary_key_if_exists.php diff --git a/installq/upgrade/php/ps1600_add_missing_index.php b/install/upgrade/php/ps1600_add_missing_index.php similarity index 100% rename from installq/upgrade/php/ps1600_add_missing_index.php rename to install/upgrade/php/ps1600_add_missing_index.php diff --git a/installq/upgrade/php/ps16012_update_alias.php b/install/upgrade/php/ps16012_update_alias.php similarity index 100% rename from installq/upgrade/php/ps16012_update_alias.php rename to install/upgrade/php/ps16012_update_alias.php diff --git a/installq/upgrade/php/ps1604_update_employee_date.php b/install/upgrade/php/ps1604_update_employee_date.php similarity index 100% rename from installq/upgrade/php/ps1604_update_employee_date.php rename to install/upgrade/php/ps1604_update_employee_date.php diff --git a/installq/upgrade/php/ps1605_change_index.php b/install/upgrade/php/ps1605_change_index.php similarity index 100% rename from installq/upgrade/php/ps1605_change_index.php rename to install/upgrade/php/ps1605_change_index.php diff --git a/installq/upgrade/php/ps1607_language_code_update.php b/install/upgrade/php/ps1607_language_code_update.php similarity index 100% rename from installq/upgrade/php/ps1607_language_code_update.php rename to install/upgrade/php/ps1607_language_code_update.php diff --git a/installq/upgrade/php/ps1610_safe_remove_indexes.php b/install/upgrade/php/ps1610_safe_remove_indexes.php similarity index 100% rename from installq/upgrade/php/ps1610_safe_remove_indexes.php rename to install/upgrade/php/ps1610_safe_remove_indexes.php diff --git a/installq/upgrade/php/regenerate_level_depth.php b/install/upgrade/php/regenerate_level_depth.php similarity index 100% rename from installq/upgrade/php/regenerate_level_depth.php rename to install/upgrade/php/regenerate_level_depth.php diff --git a/installq/upgrade/php/remove_duplicate_category_groups.php b/install/upgrade/php/remove_duplicate_category_groups.php similarity index 100% rename from installq/upgrade/php/remove_duplicate_category_groups.php rename to install/upgrade/php/remove_duplicate_category_groups.php diff --git a/installq/upgrade/php/remove_module_from_hook.php b/install/upgrade/php/remove_module_from_hook.php similarity index 100% rename from installq/upgrade/php/remove_module_from_hook.php rename to install/upgrade/php/remove_module_from_hook.php diff --git a/installq/upgrade/php/remove_tab.php b/install/upgrade/php/remove_tab.php similarity index 100% rename from installq/upgrade/php/remove_tab.php rename to install/upgrade/php/remove_tab.php diff --git a/installq/upgrade/php/reorderpositions.php b/install/upgrade/php/reorderpositions.php similarity index 100% rename from installq/upgrade/php/reorderpositions.php rename to install/upgrade/php/reorderpositions.php diff --git a/installq/upgrade/php/set_discount_category.php b/install/upgrade/php/set_discount_category.php similarity index 100% rename from installq/upgrade/php/set_discount_category.php rename to install/upgrade/php/set_discount_category.php diff --git a/installq/upgrade/php/set_payment_module.php b/install/upgrade/php/set_payment_module.php similarity index 100% rename from installq/upgrade/php/set_payment_module.php rename to install/upgrade/php/set_payment_module.php diff --git a/installq/upgrade/php/set_payment_module_group.php b/install/upgrade/php/set_payment_module_group.php similarity index 100% rename from installq/upgrade/php/set_payment_module_group.php rename to install/upgrade/php/set_payment_module_group.php diff --git a/installq/upgrade/php/set_product_suppliers.php b/install/upgrade/php/set_product_suppliers.php similarity index 100% rename from installq/upgrade/php/set_product_suppliers.php rename to install/upgrade/php/set_product_suppliers.php diff --git a/installq/upgrade/php/set_stock_available.php b/install/upgrade/php/set_stock_available.php similarity index 100% rename from installq/upgrade/php/set_stock_available.php rename to install/upgrade/php/set_stock_available.php diff --git a/installq/upgrade/php/setallgroupsonhomecategory.php b/install/upgrade/php/setallgroupsonhomecategory.php similarity index 100% rename from installq/upgrade/php/setallgroupsonhomecategory.php rename to install/upgrade/php/setallgroupsonhomecategory.php diff --git a/installq/upgrade/php/shop_url.php b/install/upgrade/php/shop_url.php similarity index 100% rename from installq/upgrade/php/shop_url.php rename to install/upgrade/php/shop_url.php diff --git a/installq/upgrade/php/update_carrier_url.php b/install/upgrade/php/update_carrier_url.php similarity index 100% rename from installq/upgrade/php/update_carrier_url.php rename to install/upgrade/php/update_carrier_url.php diff --git a/installq/upgrade/php/update_customer_default_group.php b/install/upgrade/php/update_customer_default_group.php similarity index 100% rename from installq/upgrade/php/update_customer_default_group.php rename to install/upgrade/php/update_customer_default_group.php diff --git a/installq/upgrade/php/update_feature_detachable_cache.php b/install/upgrade/php/update_feature_detachable_cache.php similarity index 100% rename from installq/upgrade/php/update_feature_detachable_cache.php rename to install/upgrade/php/update_feature_detachable_cache.php diff --git a/installq/upgrade/php/update_for_13version.php b/install/upgrade/php/update_for_13version.php similarity index 100% rename from installq/upgrade/php/update_for_13version.php rename to install/upgrade/php/update_for_13version.php diff --git a/installq/upgrade/php/update_genders_images.php b/install/upgrade/php/update_genders_images.php similarity index 100% rename from installq/upgrade/php/update_genders_images.php rename to install/upgrade/php/update_genders_images.php diff --git a/installq/upgrade/php/update_image_size_in_db.php b/install/upgrade/php/update_image_size_in_db.php similarity index 100% rename from installq/upgrade/php/update_image_size_in_db.php rename to install/upgrade/php/update_image_size_in_db.php diff --git a/installq/upgrade/php/update_mailalerts_add_column_idshop.php b/install/upgrade/php/update_mailalerts_add_column_idshop.php similarity index 100% rename from installq/upgrade/php/update_mailalerts_add_column_idshop.php rename to install/upgrade/php/update_mailalerts_add_column_idshop.php diff --git a/installq/upgrade/php/update_module_blocklayered.php b/install/upgrade/php/update_module_blocklayered.php similarity index 100% rename from installq/upgrade/php/update_module_blocklayered.php rename to install/upgrade/php/update_module_blocklayered.php diff --git a/installq/upgrade/php/update_module_followup.php b/install/upgrade/php/update_module_followup.php similarity index 100% rename from installq/upgrade/php/update_module_followup.php rename to install/upgrade/php/update_module_followup.php diff --git a/installq/upgrade/php/update_module_loyalty.php b/install/upgrade/php/update_module_loyalty.php similarity index 100% rename from installq/upgrade/php/update_module_loyalty.php rename to install/upgrade/php/update_module_loyalty.php diff --git a/installq/upgrade/php/update_module_pagesnotfound.php b/install/upgrade/php/update_module_pagesnotfound.php similarity index 100% rename from installq/upgrade/php/update_module_pagesnotfound.php rename to install/upgrade/php/update_module_pagesnotfound.php diff --git a/installq/upgrade/php/update_module_product_comments.php b/install/upgrade/php/update_module_product_comments.php similarity index 100% rename from installq/upgrade/php/update_module_product_comments.php rename to install/upgrade/php/update_module_product_comments.php diff --git a/installq/upgrade/php/update_modules_multishop.php b/install/upgrade/php/update_modules_multishop.php similarity index 100% rename from installq/upgrade/php/update_modules_multishop.php rename to install/upgrade/php/update_modules_multishop.php diff --git a/installq/upgrade/php/update_modules_sql.php b/install/upgrade/php/update_modules_sql.php similarity index 100% rename from installq/upgrade/php/update_modules_sql.php rename to install/upgrade/php/update_modules_sql.php diff --git a/installq/upgrade/php/update_order_canada.php b/install/upgrade/php/update_order_canada.php similarity index 100% rename from installq/upgrade/php/update_order_canada.php rename to install/upgrade/php/update_order_canada.php diff --git a/installq/upgrade/php/update_order_detail_taxes.php b/install/upgrade/php/update_order_detail_taxes.php similarity index 100% rename from installq/upgrade/php/update_order_detail_taxes.php rename to install/upgrade/php/update_order_detail_taxes.php diff --git a/installq/upgrade/php/update_order_details.php b/install/upgrade/php/update_order_details.php similarity index 100% rename from installq/upgrade/php/update_order_details.php rename to install/upgrade/php/update_order_details.php diff --git a/installq/upgrade/php/update_order_messages.php b/install/upgrade/php/update_order_messages.php similarity index 100% rename from installq/upgrade/php/update_order_messages.php rename to install/upgrade/php/update_order_messages.php diff --git a/installq/upgrade/php/update_products_ecotax_v133.php b/install/upgrade/php/update_products_ecotax_v133.php similarity index 100% rename from installq/upgrade/php/update_products_ecotax_v133.php rename to install/upgrade/php/update_products_ecotax_v133.php diff --git a/installq/upgrade/php/update_stock_mvt_reason.php b/install/upgrade/php/update_stock_mvt_reason.php similarity index 100% rename from installq/upgrade/php/update_stock_mvt_reason.php rename to install/upgrade/php/update_stock_mvt_reason.php diff --git a/installq/upgrade/php/updateproductcomments.php b/install/upgrade/php/updateproductcomments.php similarity index 100% rename from installq/upgrade/php/updateproductcomments.php rename to install/upgrade/php/updateproductcomments.php diff --git a/installq/upgrade/php/updatetabicon_from_11version.php b/install/upgrade/php/updatetabicon_from_11version.php similarity index 100% rename from installq/upgrade/php/updatetabicon_from_11version.php rename to install/upgrade/php/updatetabicon_from_11version.php diff --git a/installq/upgrade/php/upgrade_cms_15.php b/install/upgrade/php/upgrade_cms_15.php similarity index 100% rename from installq/upgrade/php/upgrade_cms_15.php rename to install/upgrade/php/upgrade_cms_15.php diff --git a/installq/upgrade/php/upgrade_cms_15_rename.php b/install/upgrade/php/upgrade_cms_15_rename.php similarity index 100% rename from installq/upgrade/php/upgrade_cms_15_rename.php rename to install/upgrade/php/upgrade_cms_15_rename.php diff --git a/installq/upgrade/sql/1.4.1.sql b/install/upgrade/sql/1.4.1.sql similarity index 100% rename from installq/upgrade/sql/1.4.1.sql rename to install/upgrade/sql/1.4.1.sql diff --git a/installq/upgrade/sql/1.5.0.sql b/install/upgrade/sql/1.5.0.sql similarity index 100% rename from installq/upgrade/sql/1.5.0.sql rename to install/upgrade/sql/1.5.0.sql diff --git a/installq/upgrade/sql/1.5.1.0.sql b/install/upgrade/sql/1.5.1.0.sql similarity index 100% rename from installq/upgrade/sql/1.5.1.0.sql rename to install/upgrade/sql/1.5.1.0.sql diff --git a/installq/upgrade/sql/1.5.2.0.sql b/install/upgrade/sql/1.5.2.0.sql similarity index 100% rename from installq/upgrade/sql/1.5.2.0.sql rename to install/upgrade/sql/1.5.2.0.sql diff --git a/installq/upgrade/sql/index.php b/install/upgrade/sql/index.php similarity index 100% rename from installq/upgrade/sql/index.php rename to install/upgrade/sql/index.php diff --git a/installq/upgrade/upgrade.php b/install/upgrade/upgrade.php similarity index 100% rename from installq/upgrade/upgrade.php rename to install/upgrade/upgrade.php From b1ad38e72d668955a30f36595954f5fbb703e080 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sun, 9 Jun 2024 15:34:01 +0530 Subject: [PATCH 082/106] Dev mode _PS_MODE_DEV_ is set to false --- config/defines.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/defines.inc.php b/config/defines.inc.php index 3e319225f..4a86b1930 100644 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -26,7 +26,7 @@ /* Debug only */ if (!defined('_PS_MODE_DEV_')) { - define('_PS_MODE_DEV_', true); + define('_PS_MODE_DEV_', false); } /* Compatibility warning */ define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false); From 54b8cbc04cfbf49a32686dd633a298607fd4df5b Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 10 Jun 2024 17:02:22 +0530 Subject: [PATCH 083/106] Fixed: Issues while reallocation with different room type --- classes/order/OrderDetail.php | 99 ++++ controllers/admin/AdminOrdersController.php | 129 +----- js/admin/orders.js | 10 +- .../classes/HotelBookingDetail.php | 423 ++++++++++++++---- .../classes/HotelRoomTypeFeaturePricing.php | 27 ++ 5 files changed, 477 insertions(+), 211 deletions(-) diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php index cfda5704a..60898f126 100644 --- a/classes/order/OrderDetail.php +++ b/classes/order/OrderDetail.php @@ -857,4 +857,103 @@ class OrderDetailCore extends ObjectModel return $wholesale_price; } + + /** + * @param OrderDetail $order_detail + * @param int $qty_cancel_product + * @param bool $delete + */ + public function reinjectQuantity($order_detail, $qty_cancel_product, $delete = false) + { + $errors = array(); + $context = Context::getContext(); + // Reinject product + $reinjectable_quantity = (int)$order_detail->product_quantity - (int)$order_detail->product_quantity_reinjected; + $quantity_to_reinject = $qty_cancel_product > $reinjectable_quantity ? $reinjectable_quantity : $qty_cancel_product; + // @since 1.5.0 : Advanced Stock Management + $product_to_inject = new Product($order_detail->product_id, false, (int)$context->language->id, (int)$order_detail->id_shop); + + $product = new Product($order_detail->product_id, false, (int)$context->language->id, (int)$order_detail->id_shop); + + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && $order_detail->id_warehouse != 0) { + $manager = StockManagerFactory::getManager(); + $movements = StockMvt::getNegativeStockMvts( + $order_detail->id_order, + $order_detail->product_id, + $order_detail->product_attribute_id, + $quantity_to_reinject + ); + $left_to_reinject = $quantity_to_reinject; + foreach ($movements as $movement) { + if ($left_to_reinject > $movement['physical_quantity']) { + $quantity_to_reinject = $movement['physical_quantity']; + } + + $left_to_reinject -= $quantity_to_reinject; + if (Pack::isPack((int)$product->id)) { + // Gets items + if ($product->pack_stock_type == 1 || $product->pack_stock_type == 2 || ($product->pack_stock_type == 3 && Configuration::get('PS_PACK_STOCK_TYPE') > 0)) { + $products_pack = Pack::getItems((int)$product->id, (int)Configuration::get('PS_LANG_DEFAULT')); + // Foreach item + foreach ($products_pack as $product_pack) { + if ($product_pack->advanced_stock_management == 1) { + $manager->addProduct( + $product_pack->id, + $product_pack->id_pack_product_attribute, + new Warehouse($movement['id_warehouse']), + $product_pack->pack_quantity * $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } + } + if ($product->pack_stock_type == 0 || $product->pack_stock_type == 2 || + ($product->pack_stock_type == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 0 || Configuration::get('PS_PACK_STOCK_TYPE') == 2))) { + $manager->addProduct( + $order_detail->product_id, + $order_detail->product_attribute_id, + new Warehouse($movement['id_warehouse']), + $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } else { + $manager->addProduct( + $order_detail->product_id, + $order_detail->product_attribute_id, + new Warehouse($movement['id_warehouse']), + $quantity_to_reinject, + null, + $movement['price_te'], + true + ); + } + } + + $id_product = $order_detail->product_id; + if ($delete) { + $order_detail->delete(); + } + StockAvailable::synchronize($id_product); + } elseif ($order_detail->id_warehouse == 0) { + StockAvailable::updateQuantity( + $order_detail->product_id, + $order_detail->product_attribute_id, + $quantity_to_reinject, + $order_detail->id_shop + ); + + if ($delete) { + $order_detail->delete(); + } + } else { + $errors[] = Tools::displayError('This product cannot be re-stocked.'); + } + + return $errors; + } } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 5a0a344b0..35aa5d3a5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -3953,7 +3953,7 @@ class AdminOrdersControllerCore extends AdminController if ($createFeaturePrice) { $featurePriceParams['id_room'] = $room_info['id_room']; $featurePriceParams = array_merge($featurePriceParams, array('date_from' => $date_from, 'date_to' => $date_to)); - $this->createFeaturePrice($featurePriceParams); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($featurePriceParams); } } else { break; @@ -4407,32 +4407,6 @@ class AdminOrdersControllerCore extends AdminController ))); } - protected function createFeaturePrice($params) - { - $feature_price_name = array(); - foreach (Language::getIDs(true) as $id_lang) { - $feature_price_name[$id_lang] = 'Auto-generated'; - } - - $hrt_feature_price = new HotelRoomTypeFeaturePricing(); - $hrt_feature_price->id_product = (int) $params['id_product']; - $hrt_feature_price->id_cart = (int) $params['id_cart']; - $hrt_feature_price->id_guest = (int) $params['id_guest']; - $hrt_feature_price->id_room = (int) $params['id_room']; - $hrt_feature_price->feature_price_name = $feature_price_name; - $hrt_feature_price->date_selection_type = HotelRoomTypeFeaturePricing::DATE_SELECTION_TYPE_RANGE; - $hrt_feature_price->date_from = date('Y-m-d', strtotime($params['date_from'])); - $hrt_feature_price->date_to = date('Y-m-d', strtotime($params['date_to'])); - $hrt_feature_price->is_special_days_exists = 0; - $hrt_feature_price->special_days = json_encode(false); - $hrt_feature_price->impact_way = HotelRoomTypeFeaturePricing::IMPACT_WAY_FIX_PRICE; - $hrt_feature_price->impact_type = HotelRoomTypeFeaturePricing::IMPACT_TYPE_FIXED_PRICE; - $hrt_feature_price->impact_value = $params['price']; - $hrt_feature_price->active = 1; - $hrt_feature_price->groupBox = array_column(Group::getGroups($this->context->language->id), 'id_group'); - $hrt_feature_price->add(); - } - public function ajaxProcessEditRoomOnOrder() { // Return value @@ -4494,7 +4468,7 @@ class AdminOrdersControllerCore extends AdminController if (Validate::isLoadedObject($objProduct = new Product($roomInfo['id_product']))) { // If room type is NOT DELETED then use current room type price calculation $params = array_merge($params, array('date_from' => $new_date_from, 'date_to' => $new_date_to)); - $this->createFeaturePrice($params); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($params); $roomTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $roomInfo['id_product'], @@ -5247,7 +5221,7 @@ class AdminOrdersControllerCore extends AdminController $res &= $order->update(); // Reinject quantity in stock - $this->reinjectQuantity($order_detail, $order_detail->product_quantity, $delete); + $order_detail->reinjectQuantity($order_detail, $order_detail->product_quantity, $delete); // Update weight SUM $order_carrier = new OrderCarrier((int) $order->getIdOrderCarrier()); @@ -5337,7 +5311,7 @@ class AdminOrdersControllerCore extends AdminController $res &= $order->update(); // Reinject quantity in stock - $this->reinjectQuantity($order_detail, $order_detail->product_quantity, true); + $order_detail->reinjectQuantity($order_detail, $order_detail->product_quantity, true); // Update weight SUM $order_carrier = new OrderCarrier((int)$order->getIdOrderCarrier()); @@ -5737,101 +5711,6 @@ class AdminOrdersControllerCore extends AdminController ); } - /** - * @param OrderDetail $order_detail - * @param int $qty_cancel_product - * @param bool $delete - */ - protected function reinjectQuantity($order_detail, $qty_cancel_product, $delete = false) - { - // Reinject product - $reinjectable_quantity = (int)$order_detail->product_quantity - (int)$order_detail->product_quantity_reinjected; - $quantity_to_reinject = $qty_cancel_product > $reinjectable_quantity ? $reinjectable_quantity : $qty_cancel_product; - // @since 1.5.0 : Advanced Stock Management - $product_to_inject = new Product($order_detail->product_id, false, (int)$this->context->language->id, (int)$order_detail->id_shop); - - $product = new Product($order_detail->product_id, false, (int)$this->context->language->id, (int)$order_detail->id_shop); - - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && $order_detail->id_warehouse != 0) { - $manager = StockManagerFactory::getManager(); - $movements = StockMvt::getNegativeStockMvts( - $order_detail->id_order, - $order_detail->product_id, - $order_detail->product_attribute_id, - $quantity_to_reinject - ); - $left_to_reinject = $quantity_to_reinject; - foreach ($movements as $movement) { - if ($left_to_reinject > $movement['physical_quantity']) { - $quantity_to_reinject = $movement['physical_quantity']; - } - - $left_to_reinject -= $quantity_to_reinject; - if (Pack::isPack((int)$product->id)) { - // Gets items - if ($product->pack_stock_type == 1 || $product->pack_stock_type == 2 || ($product->pack_stock_type == 3 && Configuration::get('PS_PACK_STOCK_TYPE') > 0)) { - $products_pack = Pack::getItems((int)$product->id, (int)Configuration::get('PS_LANG_DEFAULT')); - // Foreach item - foreach ($products_pack as $product_pack) { - if ($product_pack->advanced_stock_management == 1) { - $manager->addProduct( - $product_pack->id, - $product_pack->id_pack_product_attribute, - new Warehouse($movement['id_warehouse']), - $product_pack->pack_quantity * $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } - } - if ($product->pack_stock_type == 0 || $product->pack_stock_type == 2 || - ($product->pack_stock_type == 3 && (Configuration::get('PS_PACK_STOCK_TYPE') == 0 || Configuration::get('PS_PACK_STOCK_TYPE') == 2))) { - $manager->addProduct( - $order_detail->product_id, - $order_detail->product_attribute_id, - new Warehouse($movement['id_warehouse']), - $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } else { - $manager->addProduct( - $order_detail->product_id, - $order_detail->product_attribute_id, - new Warehouse($movement['id_warehouse']), - $quantity_to_reinject, - null, - $movement['price_te'], - true - ); - } - } - - $id_product = $order_detail->product_id; - if ($delete) { - $order_detail->delete(); - } - StockAvailable::synchronize($id_product); - } elseif ($order_detail->id_warehouse == 0) { - StockAvailable::updateQuantity( - $order_detail->product_id, - $order_detail->product_attribute_id, - $quantity_to_reinject, - $order_detail->id_shop - ); - - if ($delete) { - $order_detail->delete(); - } - } else { - $this->errors[] = Tools::displayError('This product cannot be re-stocked.'); - } - } - /** * @param OrderInvoice $order_invoice * @param float $value_tax_incl diff --git a/js/admin/orders.js b/js/admin/orders.js index 328e06985..759a696bf 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1099,7 +1099,7 @@ function initRoomEvents() { if (data.refresh) { - location.reload(); + window.location.href = admin_order_tab_link + '&conf=3&vieworder&id_order=' + id_order; return; } go = false; @@ -1111,8 +1111,7 @@ function initRoomEvents() // Initialize all events init(); - //Added by webkul - location.reload(); + window.location.href = admin_order_tab_link + '&conf=3&vieworder&id_order=' + id_order; //End // $('.partial_refund_fields').hide(); } @@ -1162,7 +1161,8 @@ function initRoomEvents() updateAmounts(data.order); updateInvoice(data.invoices); updateDocuments(data.documents_html); - location.reload(); + + window.location.href = admin_order_tab_link + '&conf=1&vieworder&id_order=' + data.order.id; } else jAlert(data.error); @@ -1787,7 +1787,7 @@ $(document).ready(function() { success : function(data) { if (data.result) { init(); - location.reload(); + window.location.href = admin_order_tab_link + '&conf=4&vieworder&id_order=' + data.order.id; } else { jAlert(data.error); } diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index ee21e0d4e..f6be27470 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1761,98 +1761,359 @@ class HotelBookingDetail extends ObjectModel { $result = true; // get the cart booking data for the given booking - if (Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHotelBooking))) { - $objHotelCartBooking = new HotelCartBookingData(); - if ($cartBookingInfo = $objHotelCartBooking->getRoomRowByIdProductIdRoomInDateRange( - $objHotelBooking->id_cart, - $objHotelBooking->id_product, - $objHotelBooking->date_from, - $objHotelBooking->date_to, - $objHotelBooking->id_room - )) { - // Reallocate the rooms in the room cart booking table - if (Validate::isLoadedObject($objHotelCartBooking = new HotelCartBookingData($cartBookingInfo['id']))) { - $objHotelCartBooking->id_room = $idRoom; - $result &= $objHotelCartBooking->save(); - } - } - - // Reallocate the rooms in the room booking table + if (Validate::isLoadedObject($objOldHotelBooking = new HotelBookingDetail($idHotelBooking))) { $objHotelRoomInfo = new HotelRoomInformation($idRoom); $idNewRoomType = $objHotelRoomInfo->id_product; - if ($objHotelBooking->id_product != $idNewRoomType) { - $objHotelBooking->id_product = $idNewRoomType; - $objProduct = new Product($idNewRoomType, false, Configuration::get('PS_LANG_DEFAULT')); - $objHotelBooking->room_type_name = $objProduct->name; + if ($objOldHotelBooking->id_product != $idNewRoomType) { + $objOrder = new Order($objOldHotelBooking->id_order); + $objOldOrderDetail = new OrderDetail($objOldHotelBooking->id_order_detail); - // change product name in order detail table - $objOrderDetail = new OrderDetail((int) $objHotelBooking->id_order_detail); - $objOrderDetail->product_name = $objProduct->name; - $objOrderDetail->product_id = $idNewRoomType; + $productQty = (int)$objOldHotelBooking->getNumberOfDays($objOldHotelBooking->date_from, $objOldHotelBooking->date_to); + $oldRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl / $productQty; + $newRoomPriceTaxExcl = $oldRoomPriceTaxExcl + $priceDiffTaxExcl; - // manage the prices in the order tables for the price diffrence - if ($priceDiffTaxExcl != 0) { - $taxCalculator = $objOrderDetail->getTaxCalculator(); - $priceDiffTaxIncl = Tools::ps_round($taxCalculator->addTaxes($priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_); + $totalRoomPriceTaxIncl = $objOldHotelBooking->total_price_tax_incl; + $totalRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl; - // set price changes in htl_booking_detail table - $objHotelBooking->total_price_tax_excl += (float)$priceDiffTaxExcl; - $objHotelBooking->total_price_tax_excl = $objHotelBooking->total_price_tax_excl > 0 ? $objHotelBooking->total_price_tax_excl : 0; + // =============================================================== + // Start: Add Process of the old booking + // =============================================================== + // Total method + $totalMethod = Cart::BOTH_WITHOUT_SHIPPING; + // Create new cart + $cart = new Cart(); + $cart->id_shop_group = $objOrder->id_shop_group; + $cart->id_shop = $objOrder->id_shop; + $cart->id_customer = $objOrder->id_customer; + $cart->id_carrier = $objOrder->id_carrier; + $cart->id_address_delivery = $objOrder->id_address_delivery; + $cart->id_address_invoice = $objOrder->id_address_invoice; + $cart->id_currency = $objOrder->id_currency; + $cart->id_lang = $objOrder->id_lang; + $cart->secure_key = $objOrder->secure_key; + $cart->add(); - $objHotelBooking->total_price_tax_incl += (float)$priceDiffTaxIncl; - $objHotelBooking->total_price_tax_incl = $objHotelBooking->total_price_tax_incl > 0 ? $objHotelBooking->total_price_tax_incl : 0; + // Save context (in order to apply cart rule) + $this->context->cart = $cart; + $this->context->customer = new Customer($objOrder->id_customer); + $this->context->currency = new Currency($objOrder->id_currency); - // set price changes in order_detail table - $roomTypeTotalPrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $idNewRoomType, - $objHotelBooking->date_from, - $objHotelBooking->date_to + // always add taxes even if not displayed to the customer + $useTaxes = true; + + $initialProductPriceTE = Product::getPriceStatic( + $idNewRoomType, + $useTaxes, + null, + 2, + null, + false, + true, + 1, + false, + $objOrder->id_customer, + $cart->id, + $objOrder->id_address_tax + ); + + // create feature price if needed + $createFeaturePrice = $newRoomPriceTaxExcl != $initialProductPriceTE; + if ($createFeaturePrice) { + $featurePriceParams = array(); + $featurePriceParams = array( + 'id_cart' => $this->context->cart->id, + 'id_guest' => $this->context->cookie->id_guest, + 'price' => $newRoomPriceTaxExcl, + 'id_product' => $idNewRoomType, ); - - $objOrderDetail->unit_price_tax_excl = Product::getPriceStatic($idNewRoomType, false, null, _PS_PRICE_COMPUTE_PRECISION_); - $objOrderDetail->unit_price_tax_incl = Tools::ps_round( - $taxCalculator->addTaxes($objOrderDetail->unit_price_tax_excl), - _PS_PRICE_COMPUTE_PRECISION_ - ); - - $objOrderDetail->total_price_tax_excl += (float)$priceDiffTaxExcl; - $objOrderDetail->total_price_tax_excl = $objOrderDetail->total_price_tax_excl > 0 ? $objOrderDetail->total_price_tax_excl : 0; - - $objOrderDetail->total_price_tax_incl += (float)$priceDiffTaxIncl; - $objOrderDetail->total_price_tax_incl = $objOrderDetail->total_price_tax_incl > 0 ? $objOrderDetail->total_price_tax_incl : 0; - - // set price changes in orders table - $objOrder = new Order($objOrderDetail->id_order); - $objOrder->total_products += (float)$priceDiffTaxExcl; - $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0; - - $objOrder->total_products_wt += (float)$priceDiffTaxIncl; - $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0; - - $objOrder->total_paid += (float)$priceDiffTaxIncl; - $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0; - - $objOrder->total_paid_tax_excl += (float)$priceDiffTaxExcl; - $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0; - - $objOrder->total_paid_tax_incl += (float)$priceDiffTaxIncl; - $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0; - - - $result &= $objOrder->update(); - - // update taxes in order detail - $result &= $objOrderDetail->updateTaxAmount($objOrder); } - $result &= $objOrderDetail->update(); - } + $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail(); - $objHotelBooking->id_room = $idRoom; - $objHotelBooking->room_num = $objHotelRoomInfo->room_num; - // set backorder to 0 as available reallocate rooms will always be free - $objHotelBooking->is_back_order = 0; - $result &= $objHotelBooking->save(); + $bookingParams = array( + 'date_from' => $objOldHotelBooking->date_from, + 'date_to' => $objOldHotelBooking->date_to, + 'hotel_id' => $objOldHotelBooking->id_hotel, + 'id_room_type' => $idNewRoomType, + 'only_search_data' => 1, + ); + + if ($roomAvailabilityInfo = $objOldHotelBooking->dataForFrontSearch($bookingParams)) { + if ($availableRooms = $roomAvailabilityInfo['rm_data'][$idNewRoomType]['data']['available']) { + $roomInfo = reset($availableRooms); + $objCartBookingData = new HotelCartBookingData(); + $objCartBookingData->id_cart = $this->context->cart->id; + $objCartBookingData->id_guest = $this->context->cookie->id_guest; + $objCartBookingData->id_customer = $objOrder->id_customer; + $objCartBookingData->id_currency = $objOrder->id_currency; + $objCartBookingData->id_product = $roomInfo['id_product']; + $objCartBookingData->id_room = $roomInfo['id_room']; + $objCartBookingData->id_hotel = $roomInfo['id_hotel']; + $objCartBookingData->booking_type = 1; + $objCartBookingData->quantity = $productQty; + $objCartBookingData->date_from = $objOldHotelBooking->date_from; + $objCartBookingData->date_to = $objOldHotelBooking->date_to; + $objCartBookingData->adults = $objOldHotelBooking->adults; + $objCartBookingData->children = $objOldHotelBooking->children; + $objCartBookingData->child_ages = $objOldHotelBooking->child_ages; + $objCartBookingData->save(); + + // create feature price if needed + if ($createFeaturePrice) { + $featurePriceParams['id_room'] = $roomInfo['id_room']; + $featurePriceParams = array_merge( + $featurePriceParams, + array('date_from' => $objOldHotelBooking->date_from, 'date_to' => $objOldHotelBooking->date_to) + ); + HotelRoomTypeFeaturePricing::createAutoFeaturePrice($featurePriceParams); + } + } else { + return false; + } + } else { + return false; + } + + $totalRoomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $idNewRoomType, + $objCartBookingData->date_from, + $objCartBookingData->date_to, + 0, + Group::getCurrent()->id, + $this->context->cart->id, + $this->context->cookie->id_guest, + $objCartBookingData->id_room, + 0 + ); + + // Add product to cart + $updateQuantity = $cart->updateQty( + $productQty, + $idNewRoomType, + null, + null, + 'up', + 0, + new Shop($cart->id_shop) + ); + + // If order is valid, we can create a new invoice or edit an existing invoice + if ($objOrder->hasInvoice()) { + $objOrderInvoice = new OrderInvoice($objOldOrderDetail->id_order_invoice); + $objOrderInvoice->total_paid_tax_excl += (float)($cart->getOrderTotal(false, $totalMethod)); + $objOrderInvoice->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod)); + $objOrderInvoice->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); + $objOrderInvoice->total_products_wt += (float)$cart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS); + $objOrderInvoice->update(); + } + + // Create Order detail information + $objOrderDetail = new OrderDetail(); + $objOrderDetail->createList($objOrder, $cart, $objOrder->getCurrentOrderState(), $cart->getProducts(), (isset($objOrderInvoice->id) ? $objOrderInvoice->id : 0), $useTaxes, (int)Tools::getValue('add_product_warehouse')); + + // update totals amount of order + $objOrder->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); + $objOrder->total_products_wt += (float)$cart->getOrderTotal($useTaxes, Cart::ONLY_PRODUCTS); + + $objOrder->total_paid += (float)($cart->getOrderTotal(true, $totalMethod)); + $objOrder->total_paid_tax_excl += (float)($cart->getOrderTotal(false, $totalMethod)); + $objOrder->total_paid_tax_incl += (float)($cart->getOrderTotal($useTaxes, $totalMethod)); + + // Save changes of order + $objOrder->update(); + + // Update Tax lines + $objOrderDetail->updateTaxAmount($objOrder); + + $objRoomType = new HotelRoomType(); + $objBookingDetail = new HotelBookingDetail(); + $idNewOrderDetail = $objBookingDetail->getLastInsertedRoomIdOrderDetail($objOrder->id); + $objCartBookingData = new HotelCartBookingData(); + if ($cartBookingsData = $objCartBookingData->getOnlyCartBookingData( + $this->context->cart->id, + $this->context->cart->id_guest, + $idNewRoomType + )) { + foreach ($cartBookingsData as $cartBookingInfo) { + $objCartBookingData = new HotelCartBookingData($cartBookingInfo['id']); + $objCartBookingData->id_order = $objOrder->id; + $objCartBookingData->save(); + + $objBookingDetail = new HotelBookingDetail(); + $objBookingDetail->id_product = $idNewRoomType; + $objBookingDetail->id_order = $objOrder->id; + $objBookingDetail->id_order_detail = $idNewOrderDetail; + $objBookingDetail->id_cart = $this->context->cart->id; + $objBookingDetail->id_room = $objCartBookingData->id_room; + $objBookingDetail->id_hotel = $objCartBookingData->id_hotel; + $objBookingDetail->id_customer = $objOrder->id_customer; + $objBookingDetail->booking_type = $objCartBookingData->booking_type; + $objBookingDetail->id_status = 1; + $objBookingDetail->comment = $objCartBookingData->comment; + $objBookingDetail->room_type_name = Product::getProductName($idNewRoomType, null, $objOrder->id_lang); + + $objBookingDetail->date_from = $objCartBookingData->date_from; + $objBookingDetail->date_to = $objCartBookingData->date_to; + $objBookingDetail->adults = $objCartBookingData->adults; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; + + $totalRoomTypePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $idNewRoomType, + $objCartBookingData->date_from, + $objCartBookingData->date_to, + 0, + Group::getCurrent()->id, + $this->context->cart->id, + $this->context->cookie->id_guest, + $objCartBookingData->id_room, + 0 + ); + $objBookingDetail->total_price_tax_excl = $totalRoomTypePrice['total_price_tax_excl']; + $objBookingDetail->total_price_tax_incl = $totalRoomTypePrice['total_price_tax_incl']; + $objBookingDetail->total_paid_amount = $totalRoomTypePrice['total_price_tax_incl']; + + // Save hotel information/location/contact + if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { + $objBookingDetail->room_num = $objRoom->room_num; + } + if (Validate::isLoadedObject($objHotelBranch = new HotelBranchInformation( + $objCartBookingData->id_hotel, + $this->context->cart->id_lang + ))) { + $addressInfo = $objHotelBranch->getAddress($objCartBookingData->id_hotel); + $objBookingDetail->hotel_name = $objHotelBranch->hotel_name; + $objBookingDetail->city = $addressInfo['city']; + $objBookingDetail->state = State::getNameById($addressInfo['id_state']); + $objBookingDetail->country = Country::getNameById($this->context->cart->id_lang, $addressInfo['id_country']); + $objBookingDetail->zipcode = $addressInfo['postcode'];; + $objBookingDetail->phone = $addressInfo['phone']; + $objBookingDetail->email = $objHotelBranch->email; + $objBookingDetail->check_in_time = $objHotelBranch->check_in; + $objBookingDetail->check_out_time = $objHotelBranch->check_out; + } + + if ($objBookingDetail->save()) { + // Get Booking Demands of the old booking to add in the new booking creation + $objBookingDemand = new HotelBookingDemands(); + if ($oldBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + $objOldHotelBooking->id_order, + $objOldHotelBooking->id_product, + $objOldHotelBooking->id_room, + $objOldHotelBooking->date_from, + $objOldHotelBooking->date_to + )) { + if (isset($oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands']) && $oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands']) { + foreach ($oldBookingDemands[$objOldHotelBooking->id_room]['extra_demands'] as $bookingDemand) { + $objBookingDemand = new HotelBookingDemands($bookingDemand['id_booking_demand']); + $objBookingDemand->id_htl_booking = $objBookingDetail->id; + $objBookingDemand->save(); + } + } + } + + // Get Booking services of the old booking to add in the new booking creation + $objServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($oldAdditonalServices = $objServiceProductOrderDetail->getSelectedServicesForRoom($idHotelBooking)) { + if (isset($oldAdditonalServices['additional_services']) && $oldAdditonalServices['additional_services']) { + foreach ($oldAdditonalServices['additional_services'] as $service) { + $objServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail($service['id_room_type_service_product_order_detail']); + $objServiceProductOrderDetail->id_htl_booking_detail = $objBookingDetail->id; + $objServiceProductOrderDetail->save(); + } + } + } + } + } + } + + // delete cart feature prices after room addition success + HotelRoomTypeFeaturePricing::deleteByIdCart($this->context->cart->id); + + // =============================================================== + // END: Add Process of the old booking + // =============================================================== + + // =============================================================== + // Start: Delete Process of the old booking + // =============================================================== + $deleteQty = false; + if ($productQty >= $objOldOrderDetail->product_quantity) { + $deleteQty = true; + } else { + // Calculate differences of price (Before / After) + + $objOldOrderDetail->total_price_tax_incl -= $totalRoomPriceTaxIncl; + $objOldOrderDetail->total_price_tax_excl -= $totalRoomPriceTaxExcl; + + $old_quantity = $objOldOrderDetail->product_quantity; + + $objOldOrderDetail->product_quantity = $old_quantity - $product_quantity; + $objOldOrderDetail->reduction_percent = 0; + + // update taxes + $res &= $objOldOrderDetail->updateTaxAmount($objOrder); + + // Save order detail + $res &= $objOldOrderDetail->update(); + } + + // Update OrderInvoice of this OrderDetail + if ($objOldOrderDetail->id_order_invoice != 0) { + // values changes as values are calculated accoding to the quantity of the product by webkul + $objOrderInvoice = new OrderInvoice($objOldOrderDetail->id_order_invoice); + $objOrderInvoice->total_paid_tax_excl -= $totalRoomPriceTaxExcl; + $objOrderInvoice->total_paid_tax_excl = $objOrderInvoice->total_paid_tax_excl > 0 ? $objOrderInvoice->total_paid_tax_excl : 0; + + $objOrderInvoice->total_paid_tax_incl -= $totalRoomPriceTaxIncl; + $objOrderInvoice->total_paid_tax_incl = $objOrderInvoice->total_paid_tax_incl > 0 ? $objOrderInvoice->total_paid_tax_incl : 0; + + $objOrderInvoice->total_products -= $totalRoomPriceTaxExcl; + $objOrderInvoice->total_products = $objOrderInvoice->total_products > 0 ? $objOrderInvoice->total_products : 0; + + $objOrderInvoice->total_products_wt -= $totalRoomPriceTaxIncl; + $objOrderInvoice->total_products_wt = $objOrderInvoice->total_products_wt > 0 ? $objOrderInvoice->total_products_wt : 0; + + $res &= $objOrderInvoice->update(); + } + + // values changes as values are calculated accoding to the quantity of the product by webkul + $objOrder->total_paid -= $totalRoomPriceTaxIncl; + $objOrder->total_paid = $objOrder->total_paid > 0 ? $objOrder->total_paid : 0; + + $objOrder->total_paid_tax_incl -= $totalRoomPriceTaxIncl; + $objOrder->total_paid_tax_incl = $objOrder->total_paid_tax_incl > 0 ? $objOrder->total_paid_tax_incl : 0; + + $objOrder->total_paid_tax_excl -= $totalRoomPriceTaxExcl; + $objOrder->total_paid_tax_excl = $objOrder->total_paid_tax_excl > 0 ? $objOrder->total_paid_tax_excl : 0; + + $objOrder->total_products -= $totalRoomPriceTaxExcl; + $objOrder->total_products = $objOrder->total_products > 0 ? $objOrder->total_products : 0; + + $objOrder->total_products_wt -= $totalRoomPriceTaxIncl; + $objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0; + + $objOrder->update(); + + // Reinject quantity in stock + $objOldOrderDetail->reinjectQuantity($objOldOrderDetail, $objOldOrderDetail->product_quantity, $deleteQty); + + // delete the booking detail + $objOldHotelBooking = new HotelBookingDetail($idHotelBooking); + $objOldHotelBooking->delete(); + + // =============================================================== + // END Delete Process of the old booking + // =============================================================== + } else { + // If we are reallocating to the same room type then we need to update only the room details + $objOldHotelBooking->id_room = $idRoom; + $objOldHotelBooking->room_num = $objHotelRoomInfo->room_num; + // set backorder to 0 as available reallocate rooms will always be free + $objOldHotelBooking->is_back_order = 0; + + $result &= $objOldHotelBooking->save(); + } if ($result) { Hook::exec( diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index 5dbfbd1db..d15d10641 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -972,4 +972,31 @@ class HotelRoomTypeFeaturePricing extends ObjectModel return $this->update($null_values); } + + public static function createAutoFeaturePrice($params) + { + $context = Context::getContext(); + $featurePriceName = array(); + foreach (Language::getIDs(true) as $idLang) { + $featurePriceName[$idLang] = 'Auto-generated'; + } + + $objFeaturePricing = new HotelRoomTypeFeaturePricing(); + $objFeaturePricing->id_product = (int) $params['id_product']; + $objFeaturePricing->id_cart = (int) $params['id_cart']; + $objFeaturePricing->id_guest = (int) $params['id_guest']; + $objFeaturePricing->id_room = (int) $params['id_room']; + $objFeaturePricing->feature_price_name = $featurePriceName; + $objFeaturePricing->date_selection_type = HotelRoomTypeFeaturePricing::DATE_SELECTION_TYPE_RANGE; + $objFeaturePricing->date_from = date('Y-m-d', strtotime($params['date_from'])); + $objFeaturePricing->date_to = date('Y-m-d', strtotime($params['date_to'])); + $objFeaturePricing->is_special_days_exists = 0; + $objFeaturePricing->special_days = json_encode(false); + $objFeaturePricing->impact_way = HotelRoomTypeFeaturePricing::IMPACT_WAY_FIX_PRICE; + $objFeaturePricing->impact_type = HotelRoomTypeFeaturePricing::IMPACT_TYPE_FIXED_PRICE; + $objFeaturePricing->impact_value = $params['price']; + $objFeaturePricing->active = 1; + $objFeaturePricing->groupBox = array_column(Group::getGroups($context->language->id), 'id_group'); + $objFeaturePricing->add(); + } } From b923172439ab52b11b3648b22a6a7436f68cf46c Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 10 Jun 2024 19:37:59 +0530 Subject: [PATCH 084/106] Updated: Reallocation process from Book now must be as done in the Admin Order detail page --- .../controllers/orders/_product_line.tpl | 2 +- .../controllers/orders/helpers/view/view.tpl | 1 + .../orders/modals/_room_reallocation.tpl | 4 +- controllers/admin/AdminOrdersController.php | 4 +- js/admin/orders.js | 229 ---------------- js/admin/reallocation.js | 248 ++++++++++++++++++ .../AdminHotelRoomsBookingController.php | 170 +++++++----- .../views/css/HotelReservationAdmin.css | 8 + .../views/js/admin/hotel_rooms_booking.js | 176 ------------- .../helpers/view/_partials/booking-rooms.tpl | 2 +- .../hotel_rooms_booking/helpers/view/view.tpl | 130 --------- 11 files changed, 374 insertions(+), 600 deletions(-) create mode 100644 js/admin/reallocation.js diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 18ceebacc..165bd52cd 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -242,7 +242,7 @@