Commit Graph

220 Commits

Author SHA1 Message Date
Abhishek Kumar
8aa1641ed2 Merge branch 'develop' into gli-1471 2024-03-18 15:01:03 +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
Shreesh Arora
ed84aabb08 resolve error when order currency is changed 2024-03-17 16:37:37 +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
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
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
Shreesh Arora
2d87f66107 fix service product quantity in order_detail table 2024-03-17 13:53:34 +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
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
90dee65f80 Remove 'Back office order' 2024-03-15 19:14:32 +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
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
Sumit Panwar
14d042f37f Conflicts resolved 2024-03-15 14:43:39 +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
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
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
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
df4046b5d6 Merge pull request #792 from sumitwebkul/gli-1544
Fixed: Warnings displayed after deleting all booked rooms from the orders detail page in back-office
2024-03-14 20:02:06 +05:30
Rohit Jain
21f1a22767 Merge pull request #856 from sumitwebkul/gli-1459
Fixed: Price conversion issues while changing currency in order detail page in back office
2024-03-13 20:34:13 +05:30
Rohit Jain
7a12b26c90 Merge pull request #854 from sumitwebkul/gli-1454-linked
Fixed: Errors shown on order detail page in back office when booked hotel is deleted
2024-03-13 19:33:22 +05:30
Rohit Jain
121da053af Merge pull request #793 from sumitwebkul/gli-1353
Fixed : Order status submitted even on clicking Cancel button while changing status from Bulk actions in orders list
2024-03-13 19:28:04 +05:30
Rohit Jain
49838e18b9 Merge pull request #791 from sumitwebkul/gli-1434
Fixed: Getting PS exception when admin sends <script> in the Message from admin order detail page
2024-03-13 19:22:33 +05:30
vishalsingh.qlo325
4ec665427d Fixed: tax on the services on order date range update 2024-03-13 16:11:11 +05:30
Shreesh Arora
0a1651d6ca update adminorders page min date and updated configuration 2024-03-13 16:05:24 +05:30
vishalsingh.qlo325
1db2d822bd Fixed price of service products with price addition type per day on order dates update 2024-03-12 14:52:10 +05:30
vishalsingh.qlo325
acea792723 Fixed: Price and quantity calculate for services having per night price calculation type 2024-03-12 14:51:59 +05:30
Abhishek Kumar
72bed52379 Add check for 'is_advance_payment' 2024-03-11 13:20:19 +05:30
vishalsingh.qlo325
f057fe4ab7 Fixed: Price calculation for auto added services with price type per night 2024-03-05 18:40:54 +05:30
Abhishek Kumar
2feedba4e2 Fix 0 partial payment issue 2024-03-05 15:37:51 +05:30
Abhishek Kumar
33d742341c Add Order Currency filter 2024-02-28 17:12:50 +05:30
Abhishek Kumar
878fdf9d12 Fix 0 in range filters and date from calendar issues 2024-02-28 11:55:39 +05:30