From 58dccc91e4c26c579cb3d71fba75770aaca07280 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Thu, 4 Mar 2021 19:11:42 +0530 Subject: [PATCH 1/3] updated blockcart and hotelreservation system --- modules/blockcart/CHANGELOG.txt | 10 ++++++++++ modules/blockcart/blockcart.php | 2 +- modules/hotelreservationsystem/CHANGELOG.txt | 15 +++++++++++++++ .../hotelreservationsystem.php | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/modules/blockcart/CHANGELOG.txt b/modules/blockcart/CHANGELOG.txt index a589d360e..31cfc3a4b 100644 --- a/modules/blockcart/CHANGELOG.txt +++ b/modules/blockcart/CHANGELOG.txt @@ -1,3 +1,13 @@ +----------------------------- +# V1.6.2 to V1.6.3 +----------------------------- + +## Improved/Changed Features: + +* [CO] : Removed unused hooks displayLeftColumn and displayrightColumn +* [CO] : 'getHotelCartBookingData' function from blockcart.php is removed and called from HotelCartBookingData::getHotelCartBookingData() + + ----------------------------- # V1.6.1 to V1.6.2 ----------------------------- diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index fd5847434..2ec384629 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -34,7 +34,7 @@ class blockcart extends Module { $this->name = 'blockcart'; $this->tab = 'front_office_features'; - $this->version = '1.6.2'; + $this->version = '1.6.3'; $this->author = 'PrestaShop'; $this->need_instance = 0; diff --git a/modules/hotelreservationsystem/CHANGELOG.txt b/modules/hotelreservationsystem/CHANGELOG.txt index af84d7de1..15543cb66 100644 --- a/modules/hotelreservationsystem/CHANGELOG.txt +++ b/modules/hotelreservationsystem/CHANGELOG.txt @@ -4,6 +4,21 @@ ## Added Features: +## Improved/changed features: + +## Bug/Issues Resolved: +[-] CO : #162 Fix additional facility price changes for room type after saving +[-] CO : #168 Fix room number is not getting updated in the view After reallocation. +[-] CO : #169 Fix showing discount when feature price or discount are applied. +[-] CO : #173 Resolved warning notice in order refund request controller. + + +------------------------- +# V1.4.0 to V1.4.1 +------------------------- + +## Added Features: + [+] CO : Columns `active_refund` are added in 'htl_branch_info' table. [+] CO : Columns `total_paid_amount`, `available_for_order`, `hotel_name`, `room_type_name`, `city`, `state`, `country`, `zipcode`, `phone`, `email`, `check_in_time`, `check_out_time`, `room_num`, `adult`, `children` in 'htl_booking_detail' table. [+] CO : tables 'htl_room_type_feature_pricing_group', 'htl_branch_refund_rules', 'htl_order_refund_rules' added. diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 70fa33c49..b616d8b2f 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -29,7 +29,7 @@ class hotelreservationsystem extends Module public function __construct() { $this->name = 'hotelreservationsystem'; - $this->version = '1.4.1'; + $this->version = '1.4.2'; $this->author = 'Webkul'; $this->need_instance = 0; $this->bootstrap = true; From 4d2ea8327f75c2aae53e9534b5fa640f6b545452 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Tue, 23 Mar 2021 14:01:23 +0530 Subject: [PATCH 2/3] Module version bump --- modules/hotelreservationsystem/CHANGELOG.txt | 29 +++++++++++++++---- modules/productcomments/CHANGELOG.txt | 9 ++++++ modules/productcomments/productcomments.php | 2 +- modules/wkabouthotelblock/CHANGELOG.txt | 10 ++++++- .../wkabouthotelblock/wkabouthotelblock.php | 2 +- modules/wkhotelfeaturesblock/CHANGELOG.txt | 6 ++++ .../wkhotelfeaturesblock.php | 2 +- modules/wkhotelfilterblock/CHANGELOG.txt | 10 +++++++ .../wkhotelfilterblock/wkhotelfilterblock.php | 2 +- modules/wkhotelroom/CHANGELOG.txt | 12 ++++++++ modules/wkhotelroom/wkhotelroom.php | 2 +- modules/wkroomsearchblock/CHANGELOG.txt | 13 +++++++++ .../wkroomsearchblock/wkroomsearchblock.php | 2 +- 13 files changed, 89 insertions(+), 12 deletions(-) diff --git a/modules/hotelreservationsystem/CHANGELOG.txt b/modules/hotelreservationsystem/CHANGELOG.txt index 15543cb66..cd07dd669 100644 --- a/modules/hotelreservationsystem/CHANGELOG.txt +++ b/modules/hotelreservationsystem/CHANGELOG.txt @@ -1,16 +1,35 @@ ------------------------- -# V1.4.0 to V1.4.1 +# V1.4.1 to V1.4.2 ------------------------- ## Added Features: +[+] CO : [#198] Multiple hooks are added in the different QloApps core files + ## Improved/changed features: +[*] BO : [110, #111] Code Optimization +[*] BO : [#179] Added hotel column in room type feature pricing list +[*] BO : [#204, #196, #182] Text Changes +[*] BO : [#193] Removed Payment Modules setting from admin Hotel Reservation System -> Settings +[*] BO : [#206] Removed Other Modules setting from admin Hotel Reservation System -> Settings + +[*] CO : [#215] "hotelreservationsystem.php" code optimization in hook "actionValidateOrder" +[*] CO : [#221] dataforfrontsearch() function now calculate and provide "feature_price_diff" value in response +[*] CO : [#223] getHotelCartBookingData() : function multiplication optimized +[*] CO : [#225] HotelRoomTypeFeaturePricing.php optimized (Removed unused variables, removed static values assigned) + ## Bug/Issues Resolved: -[-] CO : #162 Fix additional facility price changes for room type after saving -[-] CO : #168 Fix room number is not getting updated in the view After reallocation. -[-] CO : #169 Fix showing discount when feature price or discount are applied. -[-] CO : #173 Resolved warning notice in order refund request controller. + +[-] FO : Fixed : [#169] Wrong price displayed when booking from 1 march to 30 march +[*] FO : [#215] "ajax-cart.js" add validation + +[-] BO : Fixed : [#162] Additional facility price changes for room type after saving +[-] BO : Fixed : [#168] Room number not updating after room reallocation and swap +[-] BO : Fixed : [#173] Undefined varaible issue Manage Order Refund Request Controller +[-] BO : Fixed : [#211] Errors on cart rule page when add room type, which is not assigned to hotel, selected in room type condition +[-] BO : Fixed : [#229] Resolved undefined variable error in Manage Order Refund Request Controller + ------------------------- diff --git a/modules/productcomments/CHANGELOG.txt b/modules/productcomments/CHANGELOG.txt index 182de589f..8bc631883 100644 --- a/modules/productcomments/CHANGELOG.txt +++ b/modules/productcomments/CHANGELOG.txt @@ -1,3 +1,12 @@ +------------------------- +# V3.5.3 to V3.6.0 +------------------------- + +## Improved/changed features: + +[*] FO : [#185] Replaced star rating plugin with jquery Raty in Product Comments module + +[*] CO : [#178] Text Changes ------------------------- # V3.5.2 to V3.5.3 diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php index 0ca003205..0275166eb 100644 --- a/modules/productcomments/productcomments.php +++ b/modules/productcomments/productcomments.php @@ -42,7 +42,7 @@ class ProductComments extends Module { $this->name = 'productcomments'; $this->tab = 'front_office_features'; - $this->version = '3.5.3'; + $this->version = '3.6.0'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->bootstrap = true; diff --git a/modules/wkabouthotelblock/CHANGELOG.txt b/modules/wkabouthotelblock/CHANGELOG.txt index b3ec3ae84..b07c057ea 100644 --- a/modules/wkabouthotelblock/CHANGELOG.txt +++ b/modules/wkabouthotelblock/CHANGELOG.txt @@ -1,5 +1,13 @@ ------------------------------ -# V1.1.4 to V1.1.1.5 +# V1.1.5 to V1.1.6 +------------------------------ + +## Added Features: + +[+] FO : [#198] display hook added after the interior block description "displayInteriorExtraContent" + +------------------------------ +# V1.1.4 to V1.1.5 ------------------------------ ## Improved/Changed Features: diff --git a/modules/wkabouthotelblock/wkabouthotelblock.php b/modules/wkabouthotelblock/wkabouthotelblock.php index 3413ccd59..9d7336249 100644 --- a/modules/wkabouthotelblock/wkabouthotelblock.php +++ b/modules/wkabouthotelblock/wkabouthotelblock.php @@ -31,7 +31,7 @@ class WkAboutHotelBlock extends Module { $this->name = 'wkabouthotelblock'; $this->tab = 'front_office_features'; - $this->version = '1.1.5'; + $this->version = '1.1.6'; $this->author = 'webkul'; $this->need_instance = 0; diff --git a/modules/wkhotelfeaturesblock/CHANGELOG.txt b/modules/wkhotelfeaturesblock/CHANGELOG.txt index 6a8431db8..335a78c70 100644 --- a/modules/wkhotelfeaturesblock/CHANGELOG.txt +++ b/modules/wkhotelfeaturesblock/CHANGELOG.txt @@ -1,3 +1,9 @@ +----------------------------- +# V2.0.3 to V2.0.4 +----------------------------- + +[*] BO : [#178] Text Changes + ----------------------------- # V2.0.2 to V2.0.3 ----------------------------- diff --git a/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php b/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php index 625f44a01..bf4ae78da 100644 --- a/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php +++ b/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php @@ -32,7 +32,7 @@ class WkHotelFeaturesBlock extends Module { $this->name = 'wkhotelfeaturesblock'; $this->tab = 'front_office_features'; - $this->version = '2.0.3'; + $this->version = '2.0.4'; $this->author = 'webkul'; $this->bootstrap = true; parent::__construct(); diff --git a/modules/wkhotelfilterblock/CHANGELOG.txt b/modules/wkhotelfilterblock/CHANGELOG.txt index 8197c7ed0..bae8bd5ba 100644 --- a/modules/wkhotelfilterblock/CHANGELOG.txt +++ b/modules/wkhotelfilterblock/CHANGELOG.txt @@ -1,3 +1,13 @@ +----------------------------- +# V1.0.2 to V1.0.3 +----------------------------- + +## Improved/changed features: + +[*] BO : [#206] Removed filter settings from Other Modules setting from admin Hotel Reservation System -> Settings and added in module configuration. + +[*] FO : [#208] Room type listing on search result page moved to different template "room_type_listing.tpl" updated filter result. + ----------------------------- # V1.0.1 to V1.0.2 ----------------------------- diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php index 46d8dc296..997cfe8f7 100644 --- a/modules/wkhotelfilterblock/wkhotelfilterblock.php +++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php @@ -31,7 +31,7 @@ class wkhotelfilterblock extends Module $this->name = 'wkhotelfilterblock'; $this->author = 'webkul'; $this->tab = 'front_office_features'; - $this->version = '1.0.2'; + $this->version = '1.0.3'; $this->context = Context::getContext(); $this->bootstrap = true; diff --git a/modules/wkhotelroom/CHANGELOG.txt b/modules/wkhotelroom/CHANGELOG.txt index f6e4cb2e4..fa624f69d 100644 --- a/modules/wkhotelroom/CHANGELOG.txt +++ b/modules/wkhotelroom/CHANGELOG.txt @@ -1,3 +1,15 @@ +----------------------------- +# V1.1.5 to V1.1.6 +----------------------------- + +## Added Features: + +[+] FO : [#226] display hook added after the hotel rooms block image "displayHotelRoomsBlockImageAfter" + +## Improved/changed features: + +[*] CO : [#208] Updated changes for "Catalog Mode" option. + ----------------------------- # V1.1.4 to V1.1.5 ----------------------------- diff --git a/modules/wkhotelroom/wkhotelroom.php b/modules/wkhotelroom/wkhotelroom.php index f0ca6aee3..34c9b38f5 100644 --- a/modules/wkhotelroom/wkhotelroom.php +++ b/modules/wkhotelroom/wkhotelroom.php @@ -31,7 +31,7 @@ class WkHotelRoom extends Module { $this->name = 'wkhotelroom'; $this->tab = 'front_office_features'; - $this->version = '1.1.5'; + $this->version = '1.1.6'; $this->author = 'webkul'; $this->bootstrap = true; parent::__construct(); diff --git a/modules/wkroomsearchblock/CHANGELOG.txt b/modules/wkroomsearchblock/CHANGELOG.txt index 8d2230f4d..e69024cda 100644 --- a/modules/wkroomsearchblock/CHANGELOG.txt +++ b/modules/wkroomsearchblock/CHANGELOG.txt @@ -1,3 +1,16 @@ +----------------------------- +# V1.1.0 to V1.1.1 +----------------------------- + +## Improved/changed features: + +[*] FO : [#222] Disabled mobile keyboard pop up when using date-picker in home search + +## Bug/Issues Resolved: + +[-] FO : Fixed : [#151] Room search check-in && check-out don't change when friendly URL is disabled. +[-] FO : Fixed : [#158] Hotel selection in search panel for mobile devices + ----------------------------- # V1.0.3 to V1.1.0 ----------------------------- diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php index eb836f00b..13b9bf0a5 100644 --- a/modules/wkroomsearchblock/wkroomsearchblock.php +++ b/modules/wkroomsearchblock/wkroomsearchblock.php @@ -31,7 +31,7 @@ class WkRoomSearchBlock extends Module { $this->name = 'wkroomsearchblock'; $this->tab = 'front_office_features'; - $this->version = '1.1.0'; + $this->version = '1.1.1'; $this->author = 'webkul'; $this->need_instance = 0; From 8df18674c80e54daee37cab44299a2ad3e30eaa2 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Tue, 23 Mar 2021 15:53:00 +0530 Subject: [PATCH 3/3] update changelog and QloApps version --- CHANGELOG.txt | 80 +++++++++++++++++++++++++++++++++++++ install/install_version.php | 2 +- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 49472163a..73dc05933 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,83 @@ +#################################### +# V1.5.1 +#################################### + +## Added Features: + +[+] CO : [#217] `auto_generated` column in `address` table added to track address creation source +[+] CO : [#207] New order states 'Partial payment accepted' and 'Awaiting partial payment' added for the partial payment +[+] CO : [#208] "Catalog Mode" option to disable all booking options, customer can only view Rooms +[+] CO : [#198, #226] Multiple hooks are added in the different QloApps core files + +[+] FO : [#187] Display voucher name along with voucher code on order page + +## Improved/changed features: + +[*] BO : [#206] Removed Other Modules setting from admin Hotel Reservation System -> Settings +[*] BO : [#200] Removed shipping option from car rule condition. +[*] BO : [#199] Removed "Display suppliers and manufacturers" and "Display best sellers" options from Admin Preferences controller +[*] BO : [#193] Removed Payment Modules setting from admin Hotel Reservation System -> Settings +[*] BO : [#189] Moved hotel selection from configuration tab to information tab +[*] BO : [#179] Added hotel column in room type feature pricing list +[*] BO : [#177] Removed multishop option +[*] BO : [#149] Removed carrier column from Booking Carts Controller +[*] BO : [#183] Added hotel name along with room name when adding filter of room type for cart rule +[*] BO : [#204, #196, #182] Text Changes +[*] BO : [#110, #111] Code Optimization + +[*] CO : [#223] getHotelCartBookingData() : function multiplication optimized +[*] CO : [#225] HotelRoomTypeFeaturePricing.php optimized (Removed unused variables, removed static values assigned) +[*] CO : [#218] Added hotel name column in order confirmation mail and invoice. +[*] CO : [#210] CMS page Delivery is not valid for hotel industry. So changed it to Policies page +[*] CO : [#205] Prevent deleting profile which is used by at least one employee +[*] CO : [#214] blockcart module :: Removed unused hooks displayLeftColumn and displayrightColumn +[*] CO : [#180] license file name changed from LICENSES to LICENSE +[*] CO : [#181] Readme file improvements with more information and links +[*] CO : [#221] dataforfrontsearch() function now calculate and provide "feature_price_diff" value in response +[*] CO : [#175] Changed QloApps versioning system (now 1.5.0.0 please check) +[*] CO : [#175] Updated module compatibility check with QloApps version +[*] CO : [#215] "hotelreservationsystem.php" code optimization in hook "actionValidateOrder" +[*] CO : [#117, #118, #119, #120, #121, #122, #134, #137, #138, #139] Changes for PHP7 compatibility +[*] CO : [#178] Text Changes + +[*] FO : [#222] Disabled mobile keyboard pop up when using date-picker in home search +[*] FO : [#208] Room type listing on search result page moved to different template "room_type_listing.tpl" +[*] FO : [#185] Replaced star rating plugin with jquery Raty in Product Comments module +[*] FO : [#156] "product.js" code multiplication optimized +[*] FO : [#215] "ajax-cart.js" add validation +[*] FO : [#125, #127, #141, #142] Changes for PHP7 compatibility + + +## Bug/Issues Resolved: + +[-] BO : Fixed : [#211] Errors on cart rule page when add room type, which is not assigned to hotel, selected in room type condition +[-] BO : Fixed : [#197] wrong theme information is displayed at Preferences -> Themes admin controller +[-] BO : Fixed : [#195] Filter by position in the render lists of admin controllers +[-] BO : Fixed : [#194] Entering wrong discount while Group creation, page redirects to list page +[-] BO : Fixed : [#192] Using filter in customer Group list, page redirects to previous list +[-] BO : Fixed : [#189] Room Type associations with its hotel parent category +[-] BO : Fixed : [#176] Birthday input field width in Helper Form +[-] BO : Fixed : [#173] Undefined varaible issue Manage Order Refund Request Controller +[-] BO : Fixed : [#171] Multiple request on single click in Helper List +[-] BO : Fixed : [#160] "Access Denied" issue when an employee other than super admin create a new room. +[-] BO : Fixed : [#168] Room number not updating after room reallocation and swap +[-] BO : Fixed : [#162] Additional facility price changes for room type after saving +[-] BO : Fixed : [#147] Creating order status without entering "status name", page redirects to blank page +[-] BO : Fixed : [#148] Creating order refund status without entering "status name", page redirects to list page +[-] BO : Fixed : [#229] Resolved undefined variable error in Manage Order Refund Request Controller + +[-] FO : Fixed : [#212] Design issue of select in the ADDITIONAL FACILITIES if text exceeds from block in the product detail page +[-] FO : Fixed : [#209] Errors on the search result page: If new group is created and only this group is assigned to the customer +[-] FO : Fixed : [#203] Guest is unable to submit Refund Request again after entering invalid Refund Reason once +[-] FO : Fixed : [#158] Hotel selection in search panel for mobile devices +[-] FO : Fixed : [#169] Wrong price displayed when booking from 1 march to 30 march +[-] FO : Fixed : [#151] Room search check-in && check-out don't change when friendly URL is disabled. + +[-] CO : Fixed : [#186] Links in mail for my-account, guest tracking and my orders pages are now localized to customer language. +[-] CO : Fixed : [#109] updated invalid varaible "pshone_mobile" to "phone_mobile" +[-] CO : Fixed : [#202] "global.css" added missing class for aligning images left and right in discription + + #################################### # V1.5.0 #################################### diff --git a/install/install_version.php b/install/install_version.php index 3623b0fd3..b5333e005 100644 --- a/install/install_version.php +++ b/install/install_version.php @@ -25,4 +25,4 @@ */ define('_PS_INSTALL_VERSION_', '1.6.1.23'); -define('_QLO_INSTALL_VERSION_', '1.5.0.0'); \ No newline at end of file +define('_QLO_INSTALL_VERSION_', '1.5.1.0'); \ No newline at end of file