Commit Graph

481 Commits

Author SHA1 Message Date
Abhishek Kumar
8aa1641ed2 Merge branch 'develop' into gli-1471 2024-03-18 15:01:03 +05:30
Rohit Jain
38bc04101a Merge pull request #823 from abhishek-webkul/text-changes-2
Text changes
2024-03-18 13:41:52 +05:30
Rohit Jain
2db6340b54 Merge pull request #785 from abhishek-webkul/gli-1466
Fixed: Custom price set for a room type in an order at back office is also reflected at front office for same customer
2024-03-18 13:40:48 +05:30
Rohit Jain
9f176b8446 Merge pull request #870 from abhishek-webkul/gli-1528
Updated: Updated KPI design and added new KPIs at back office
2024-03-18 13:34:10 +05:30
Rohit Jain
8cd1d2974a Merge pull request #941 from shreesh-webkul/gli-1753
Added: Admin can add custom price for facilities and services while editing order
2024-03-18 13:32:13 +05:30
abhishek-webkul
d278fbef6e Merge branch 'develop' into gli-1528 2024-03-17 16:15:37 +05:30
Abhishek Kumar
7c0c851b16 Merge branch 'develop' into gli-1528 2024-03-17 16:12:42 +05:30
Shreesh Arora
612b21ad39 Merge branch 'develop' into gli-1753 2024-03-17 15:49:02 +05:30
Abhishek Kumar
690524ba48 Merge branch 'develop' into gli-1471 2024-03-17 15:46:22 +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
Shreesh Arora
a1274458d2 fixed invalid price when 0 price is added 2024-03-17 15:33:44 +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
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
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
abhishek-webkul
f1e9a243b8 Merge branch 'develop' into gli-1528 2024-03-15 20:52:51 +05:30
Abhishek Kumar
170ad2b2a0 Merge branch 'develop' into gli-1466 2024-03-15 20:28:34 +05:30
Abhishek Kumar
410ed6ceed Merge branch 'develop' into text-changes-2 2024-03-15 19:38:46 +05:30
Abhishek Kumar
90dee65f80 Remove 'Back office order' 2024-03-15 19:14:32 +05:30
Shreesh Arora
dd9e013d01 updated occupancy error msg and added velidation in backoffice 2024-03-15 17:15:01 +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
Shreesh Arora
491af40f09 Merge remote-tracking branch 'origin/develop' into gli-1753 2024-03-15 16:20:12 +05:30
Shreesh Arora
8ce12fbfa9 Added: Admin can add custom price for facilities and service while editing order 2024-03-15 16:13:46 +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
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
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
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
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
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
Shreesh Arora
cca6697387 Merge branch 'origin/develop' into gli-1078 2024-03-15 10:54:30 +05:30
Sumit Panwar
a80249e315 conflicts resolved 2024-03-15 10:36:55 +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
Rohit Jain
ee3d7831bc Merge pull request #807 from abhishek-webkul/gli-1327
Added: Warning for maximum quantity of service products in Extra Services popup when creating or editing a booking at back office
2024-03-14 20:35:10 +05:30
Rohit Jain
61c1a4c26b Merge pull request #890 from abhishek-webkul/gli-1652
Added: Service products can now be assigned to a room type from room type edit page at back office
2024-03-14 20:30:09 +05:30
Rohit Jain
ed2da143fd Merge pull request #774 from abhishek-webkul/gli-832
Fixed: HelperForm input type 'group' submit name can not be changed
2024-03-14 20:26:02 +05:30
Rohit Jain
b9731bbfb1 Merge pull request #900 from sumitwebkul/dashboard_issues_final
Fixed: Dashboard stats issues and also improved the view of the dashboard
2024-03-14 20:04:59 +05:30