Commit Graph

2181 Commits

Author SHA1 Message Date
Shreesh Arora
d6ff995aaa fix id_cart_booking not available in cart popup in admin 2024-03-18 18:55:00 +05:30
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
Rohit Jain
6a8d4e843c Merge pull request #830 from shreesh-webkul/gli-1396
Added: Option to disable backdate order from superadmin and employees
2024-03-17 15:13:47 +05:30
Shreesh Arora
06ad8ea0b4 Merge branch 'develop' into gli-1396 2024-03-17 14:56:41 +05:30
Rohit Jain
9bdcf7bef2 Merge pull request #876 from shreesh-webkul/gli-1606
Fixed: Currency conversion in admin stats page
2024-03-17 14:46:36 +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
2909966c29 Merge pull request #866 from shreesh-webkul/gli-943
Fixed: Arrangement of row and column in csv file is wrong
2024-03-17 14:44:35 +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
e850534e93 Merge branch 'origin/develop' into gli-943 2024-03-17 10:58:47 +05:30
Shreesh Arora
ff84c472e8 Merge branch 'origin/develop' into gli-1659 2024-03-17 10:51:58 +05:30
Shreesh Arora
d271727afe Merge branch 'origin/develop' into gli-1606 2024-03-17 10:35:12 +05:30
Rohit Jain
e398e69a77 Merge pull request #924 from shreesh-webkul/gli-1775
Fixed: Incorrect room price and final price when admin remove service product or update room price from admin end and proceed for payment at front office
2024-03-15 18:29:33 +05:30
Rohit Jain
303f01fd74 Merge pull request #916 from shreesh-webkul/gli-1767
Fixed: Auto added services price not showing in cart summary in admin book now page
2024-03-15 18:23:26 +05:30
Rohit Jain
7477563b35 Merge pull request #909 from vishal-singh-webkul/gli-1751
Fixed : Missing translation from the templates of the modules.
2024-03-15 18:22:26 +05:30
Rohit Jain
4a9d396445 Merge pull request #934 from vishal-singh-webkul/gli-1779
Fixed: If advance price rule discount is applied on a room type having auto add service with "Add price in room price", discounted price is not displayed on room block section in front office.
2024-03-15 18:22:13 +05:30
vishalsingh.qlo325
a59482235b Merge branch 'origin/develop' into gli-1751 2024-03-15 17:58:26 +05:30
Shreesh Arora
dd9e013d01 updated occupancy error msg and added velidation in backoffice 2024-03-15 17:15:01 +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
54f929a35c Merge pull request #885 from abhishek-webkul/gli-1608
Updated: Address country of demo customer 'pub@qloapps.com' changed to website default country
2024-03-15 16:30: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
vishalsingh.qlo325
118404f0dc Merge branch 'origin/develop' into gli-1751 2024-03-15 15:19:23 +05:30
vishalsingh.qlo325
8233009047 Merge branch 'origin/develop' into gli-1751 2024-03-15 15:13:22 +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
9ee2ce3637 Merge pull request #882 from abhishek-webkul/gli-1356
Added: Links of Suggested Modules and Themes during installation
2024-03-15 13:04:50 +05:30
Rohit Jain
befe40af1b Merge pull request #860 from abhishek-webkul/gli-981
Fixed: Front office 'hotel-reservation-theme' RTL compatibility
2024-03-15 13:04:00 +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
c3f5371b87 Merge pull request #728 from abhishek-webkul/gli-1507
Removed: Unused module folders from themes/hotel-reservation-theme/
2024-03-15 12:48:50 +05:30
Rohit Jain
89518b578f Merge pull request #891 from abhishek-webkul/gli-1637
Updated: Design of back office page toolbar
2024-03-15 12:46:17 +05:30
Rohit Jain
59d6876c02 Merge pull request #810 from abhishek-webkul/gli-927
Use datepicker plugin to format dates using $.datepicker.parseDate() wherever applicable
2024-03-15 12:43:48 +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
ff7229b48d Merge pull request #894 from abhishek-webkul/gli-1660
Added: Allow modules to override module admin and front controllers
2024-03-15 12:28:02 +05:30