Commit Graph

829 Commits

Author SHA1 Message Date
Rohit Jain
c1962e5b70 Merge pull request #895 from sumitwebkul/overbooking_issues
Fixed: Overbooking issues in QloApps and added new configurations for overbooking handling
2024-03-17 15:43:49 +05:30
amandeepsharma.qlo548
988a190ceb conflict issues resolved 2024-03-17 15:21:57 +05:30
Shreesh Arora
06ad8ea0b4 Merge branch 'develop' into gli-1396 2024-03-17 14:56:41 +05:30
Rohit Jain
0e675bbf31 Merge pull request #871 from shreesh-webkul/gli-1659
Updated: Tax of room type will be applied  to auto add services having "price added to room price"
2024-03-17 14:45:52 +05:30
Rohit Jain
7ca3813910 Merge pull request #851 from shreesh-webkul/gli-1110
Updated: Same day room checkin - checkout and select time along with checkin - checkout
2024-03-17 14:40:22 +05:30
Rohit Jain
54f3f80d59 Merge pull request #881 from shreesh-webkul/gli-1078
Improvement: Address is not required in booking/order flow
2024-03-17 14:37:16 +05:30
Rohit Jain
4bd100bc68 Merge pull request #839 from shreesh-webkul/gli-1374
Added: Error message for maximum occupancy in room occupancy dropdown
2024-03-17 14:35:57 +05:30
Rohit Jain
217122c635 Merge pull request #923 from shreesh-webkul/gli-1774
Fixed: Service product price and quantity was added incorrectly in order on edit/update
2024-03-17 14:34:51 +05:30
Rohit Jain
acafe22b6e Merge pull request #861 from shreesh-webkul/gli-1645
Updated: When translating text in QloApps only update the fields that are changed
2024-03-17 14:33:37 +05:30
Shreesh Arora
2d87f66107 fix service product quantity in order_detail table 2024-03-17 13:53:34 +05:30
Shreesh Arora
d32f9639cc Merge branch 'develop' into gli-1374 2024-03-17 11:51:37 +05:30
Shreesh Arora
bc85f0b6ef Merge branch 'develop' into gli-1396 2024-03-17 11:27:29 +05:30
Shreesh Arora
30a0788c8f Merge branch 'develop' into gli-1110 2024-03-17 11:15:50 +05:30
Shreesh Arora
ff84c472e8 Merge branch 'origin/develop' into gli-1659 2024-03-17 10:51:58 +05:30
Rohit Jain
c6352de17a Merge pull request #835 from abhishek-webkul/gli-1066
Updated: Make Customer Groups inaccessible if option Customer Groups is disabled on Advanced Parameters > Performance page
2024-03-15 16:55:30 +05:30
Rohit Jain
638b94e175 Merge pull request #939 from vishal-singh-webkul/gli-1309_2
Updated: Optimized search results in the admin search page.
2024-03-15 16:42:18 +05:30
Rohit Jain
2e4586bc10 Merge pull request #936 from vishal-singh-webkul/gli-1748
Fixed: Date selection corrections at different places in admin controllers.
2024-03-15 16:42:05 +05:30
Rohit Jain
5c4c20372c Merge pull request #896 from sumitwebkul/gli-1607
Added: Configuration for Showing prices in Order list in (Default currency or Payment Currency)
2024-03-15 16:27:16 +05:30
Rohit Jain
d4a72ac549 Merge pull request #901 from sumitwebkul/gli-963
Added: Upgrade of rooms while reallocation and also fixed reallocation and swapping issues
2024-03-15 16:26:30 +05:30
vishalsingh.qlo325
afdcee9179 Merge branch 'origin/develop' into gli-1748 2024-03-15 15:22:23 +05:30
Sumit Panwar
14d042f37f Conflicts resolved 2024-03-15 14:43:39 +05:30
Rohit Jain
a437cca465 Merge pull request #914 from abhishek-webkul/gli-1737
Fixed: Unable to create new account on checkout page
2024-03-15 13:43:19 +05:30
Sumit Panwar
0c86d0d353 Conflicts resolved 2024-03-15 13:42:48 +05:30
Sumit Panwar
2f14333b16 Merge branch 'develop' into gli-1607 2024-03-15 13:35:06 +05:30
Rohit Jain
5e04fd22e9 Merge pull request #779 from abhishek-webkul/gli-1503
Fixed: Module zip validation on Module upload on Modules and Services page
2024-03-15 13:06:49 +05:30
Rohit Jain
69f3920b1f Merge pull request #833 from abhishek-webkul/gli-1043
Added: 'Show at front office' option to enable/disable booking from front office
2024-03-15 12:58:52 +05:30
Rohit Jain
1f39f2412a Merge pull request #762 from abhishek-webkul/gli-1445
Updated: Search Results Page Filters options have been moved to module wkhotelfilterblock
2024-03-15 12:58:09 +05:30
Rohit Jain
32fcacccdc Merge pull request #798 from abhishek-webkul/gli-1502
Move navbar Customer Support contact settings to Hotel Reservation System > Settings > General Settings page
2024-03-15 12:43:21 +05:30
Rohit Jain
e0828d1ea6 Merge pull request #841 from shreesh-webkul/gli-1332
Updated: Prevent room deletion and room status update to inactive when room has future booking
2024-03-15 12:38:05 +05:30
Rohit Jain
3fb7822329 Merge pull request #815 from abhishek-webkul/gli-1381
Updated: Added Rooms filter and added suggestions for Hotel and Room type filter inputs on admin orders list page
2024-03-15 12:27:01 +05:30
Rohit Jain
0009956058 Merge pull request #826 from abhishek-webkul/gli-1532
Updated: Filter by Places panel removed and added advanced filters and room type positioning on Manage Room Types page at back office
2024-03-15 12:25:27 +05:30
Rohit Jain
c6d066b7ed Merge pull request #913 from vishal-singh-webkul/gli-1736_2
Fixed: Added auto add services to the rooms added to the order by admin on edit order from the admin panel
2024-03-15 12:21:21 +05:30
Rohit Jain
906b432817 Merge pull request #917 from vishal-singh-webkul/gli-1539
Fixed:: Order currency symbol changes on currency change event on order confirmation page.
2024-03-15 12:20:00 +05:30
Rohit Jain
25bb332193 Merge pull request #928 from vishal-singh-webkul/gli-1683
Added: Hooks in the AdminDashDashboardController and in some template files.
2024-03-15 12:16:33 +05:30
Rohit Jain
96783770fc Merge pull request #933 from vishal-singh-webkul/gli-1781
Fixed: Admin is able to add/update the quantity of auto added services from the AdminOrdersController, while updating any order.
2024-03-15 12:16:05 +05:30
Rohit Jain
4ba1c5b172 Merge pull request #930 from vishal-singh-webkul/gli-1752
Removed:: Hotel wise access restriction for the employees on AdminCustomerController
2024-03-15 12:13:01 +05:30
Rohit Jain
e525993331 Merge pull request #932 from vishal-singh-webkul/gli-1756
Removed: Hotel wise access for the employees on the customers addresses
2024-03-15 12:12:43 +05:30
Rohit Jain
47816ea8f8 Merge pull request #926 from abhishek-webkul/gli-1785
Updated: Renamed tab Configure to Rooms on Catalog > Manage Room Types page
2024-03-15 12:00:18 +05:30
Rohit Jain
e8cca562e9 Merge pull request #937 from vishal-singh-webkul/gli-1711
Added: Hotel wise restriction on the customer messages belonging to an order.
2024-03-15 11:58:44 +05:30
Rohit Jain
663a61d579 Merge pull request #931 from abhishek-webkul/gli-1575
Fixed: JS issue due to map if Google Maps API key is set and hotel location is not set
2024-03-15 11:58:11 +05:30
Rohit Jain
252da3840a Merge pull request #935 from vishal-singh-webkul/gli-1743
Added New hooks in AdminProductsController, ObjectModel and in some template files.
2024-03-15 11:57:27 +05:30
Rohit Jain
83604ff7d8 Merge pull request #804 from abhishek-webkul/gli-996
Updated flow of blocknewsletter module
2024-03-15 11:51:23 +05:30
Rohit Jain
973ef4d7bf Merge pull request #940 from shreesh-webkul/gli-1707_2
Fixed: Employee was able to download invoice for all hotels from Admin Invoice controller
2024-03-15 11:32:44 +05:30
Shreesh Arora
cca6697387 Merge branch 'origin/develop' into gli-1078 2024-03-15 10:54:30 +05:30
vishalsingh.qlo325
f9e331838c Fixed the price calculation for same service on multiple rooms in order on order update 2024-03-15 10:45:01 +05:30
Sumit Panwar
a80249e315 conflicts resolved 2024-03-15 10:36:55 +05:30
Shreesh Arora
5f0bc9950c updated order edit restrictions 2024-03-15 10:25:00 +05:30
Sumit Panwar
d3aaf3fdc3 conflicts resolved 2024-03-15 10:23:58 +05:30
Sumit Panwar
bc05eae819 Merge branch 'develop' into overbooking_issues 2024-03-15 09:33:43 +05:30
Rohit Jain
321284e947 Merge pull request #859 from abhishek-webkul/gli-1370
Fixed: Admin login page opens in recommendations popup
2024-03-14 20:44:56 +05:30