Commit Graph

1511 Commits

Author SHA1 Message Date
Rohit Jain
22dc9f9f09 Merge pull request #1179 from vishal-singh-webkul/gli-2240
Fixed: The price tooltip and updated the design for the booked services and demands popup on the order confirmation page in front office.
2024-08-27 13:31:20 +05:30
Shreesh Arora
6f51f4e136 Merge branch 'develop' into tree-update-fix 2024-08-23 14:43:35 +05:30
Sumit Panwar
3510b38a8a Merge branch 'develop' into dashboard_161_issues 2024-08-23 12:09:52 +05:30
Shreesh Arora
0c95a32739 Added: Feature in tree select all children node when parent node is selected 2024-08-23 11:55:36 +05:30
vishalsingh.qlo325
c14a61304b Merge branch 'develop' into gli-2240 2024-08-23 09:47:39 +05:30
Rohit Jain
1204cec757 Merge pull request #1071 from shreesh-webkul/gli-1611
Fixed: Sort by price in module catelog page
2024-08-22 20:09:32 +05:30
Rohit Jain
b5134caca2 Merge pull request #1174 from shreesh-webkul/tree-update
Updated: Helper tree | Created a new helper tree class for generating tree
2024-08-22 20:08:30 +05:30
Rohit Jain
65c06ea1ef Merge pull request #1172 from vishal-singh-webkul/gli-2232
Fixed: Errors occurring while updating the order from back office.
2024-08-22 20:07:37 +05:30
Rohit Jain
215a1cc8d9 Merge pull request #1133 from vishal-singh-webkul/gli-2145
Added: original price will now be displayed with discounted amount.
2024-08-22 20:04:26 +05:30
Rohit Jain
3e479a59e8 Merge pull request #1051 from shreesh-webkul/gli-2087
Fixed: Customer phone number not saving during account creation
2024-08-22 19:53:48 +05:30
Rohit Jain
944f9dc7e9 Merge pull request #965 from vishal-singh-webkul/gli-1584
Updated: Admin import controller to handle the csv files required in managing PMS.
2024-08-22 19:53:29 +05:30
Rohit Jain
94c59b8871 Merge pull request #1169 from vishal-singh-webkul/gli-2219_2
Added: Info for convenience fees products and taxes breakup in admin order detail page.
2024-08-22 19:47:48 +05:30
Rohit Jain
edfbfbb837 Merge pull request #1186 from vishal-singh-webkul/gli-2244
Added: Add new order button on the admin orders
2024-08-22 19:30:52 +05:30
Rohit Jain
a07113b9a6 Merge pull request #1161 from shreesh-webkul/gli-2217
Updated: id_address_delivery is now set as 0 by default
2024-08-22 19:29:30 +05:30
vishalsingh.qlo325
bcba5c9cfa Fixed: the service price was not updated on room updation 2024-08-22 09:58:44 +05:30
vishalsingh.qlo325
751d02f0e2 Fixed: undefined error issue for order history and invoice for extra demands, also fixed the wrong price is added while adding service in order if specific price for that service is created 2024-08-21 14:49:49 +05:30
Shreesh Arora
1277b3bf4a fixed phone number not saving issue 2024-08-21 11:47:11 +05:30
vishalsingh.qlo325
7784f69704 removed the extra changes made in the previous commit 2024-08-20 20:06:20 +05:30
vishalsingh.qlo325
5b764fb66c Fixed: issues occured during updation process 2024-08-20 19:28:24 +05:30
Sumit Panwar
2b0ff938fc Merge branch 'develop' into dashboard_161_issues 2024-08-18 09:49:18 +05:30
vishalsingh.qlo325
24282ce645 Fixed: issues caused by incorrect merge, and optimized the code 2024-08-16 18:58:23 +05:30
vishalsingh.qlo325
dd114181f1 Merge branch 'develop' into gli-2244 2024-08-16 16:54:22 +05:30
vishalsingh.qlo325
fb46125dcc Merge branch 'develop' into gli-2240 2024-08-16 16:50:39 +05:30
vishalsingh.qlo325
6c5ddfc8f8 Merge branch 'develop' into gli-2232 2024-08-16 16:48:52 +05:30
vishalsingh.qlo325
f19491765d Merge branch 'develop' into gli-2219_2 2024-08-16 16:48:08 +05:30
vishalsingh.qlo325
449d2e3787 Merge branch 'develop' into gli-2145 2024-08-16 16:44:42 +05:30
vishalsingh.qlo325
264e1524a2 Merge branch 'develop' into gli-1584 2024-08-16 16:40:05 +05:30
vishalsingh.qlo325
898477c76e Update: centralized the room price calculation process, updated function get getRoomTypeTotalPrice() 2024-08-16 15:32:42 +05:30
vishalsingh.qlo325
f84ffbc620 Added: Add new order button on the admin orders 2024-08-16 11:17:05 +05:30
vishalsingh.qlo325
9df3fc3aa8 Merge branch 'develop' into gli-2240 2024-08-16 09:51:33 +05:30
Sumit Panwar
d49d560572 Fixed: Wrong price calculation when a service quantity is updated in an order from back-office 2024-08-15 11:24:13 +05:30
Rohit Jain
175aee90a9 Merge pull request #1082 from shreesh-webkul/gli-1798
Fixed: Room pricing issue in back-office create booking page
2024-08-14 15:44:22 +05:30
Rohit Jain
1588e4dd78 Merge pull request #1167 from shreesh-webkul/gli-2202
Added: Confirmation modal when deleting cart rules and while changes credit slip status
2024-08-14 15:35:37 +05:30
Rohit Jain
114d53a1f9 Merge pull request #1120 from shreesh-webkul/gli-1965
Fixed: Incorrect prices show in admin refund request controller
2024-08-14 15:33:28 +05:30
vishalsingh.qlo325
bc42e57e7d Fixed: The price tooltip at the order confirmation and updated the design for the booked services and demands popup 2024-08-14 14:38:25 +05:30
Shreesh Arora
23a1b5854e Auto fill phone number in address form 2024-08-14 13:36:10 +05:30
Shreesh Arora
81c44e40ec Merge branch 'develop' into gli-2087 2024-08-13 16:42:18 +05:30
Shreesh Arora
ed9cecd792 update phone number save proceess when address is created during registration 2024-08-13 16:39:00 +05:30
vishalsingh.qlo325
d2401490fe Merge branch 'develop' into gli-2232 2024-08-13 10:17:36 +05:30
vishalsingh.qlo325
96b81b3906 Merge branch 'develop' into gli-2219_2 2024-08-13 10:14:50 +05:30
Shreesh Arora
9cb17de063 Merge branch 'develop' into gli-2202 2024-08-12 17:22:11 +05:30
Shreesh Arora
065498d45c added status for used cart rules 2024-08-12 17:21:32 +05:30
Shreesh Arora
1af930a800 Merge branch 'develop' into gli-1965 2024-08-12 16:46:49 +05:30
Shreesh Arora
453f507ad2 Merge branch 'develop' into gli-1949 2024-08-12 15:49:22 +05:30
Shreesh Arora
6a51b2020d Merge branch 'develop' into gli-1611 2024-08-12 15:42:39 +05:30
vishalsingh.qlo325
14e5b11b4a Merge branch 'develop' into gli-2145 2024-08-12 10:05:28 +05:30
vishalsingh.qlo325
addc80366e Merge branch 'develop' of https://github.com/vishal-singh-webkul/QloApps into gli-1584 2024-08-12 10:00:13 +05:30
Rohit Jain
023ad837bd Merge pull request #1147 from shreesh-webkul/gli-1987
Fixed: Unable to find correct files for translating pdf and mail files
2024-08-09 15:45:15 +05:30
Rohit Jain
a184e70e70 Merge pull request #1168 from shreesh-webkul/gli-2223
Added: Hotel description in room type page in front office
2024-08-09 15:42:44 +05:30
Rohit Jain
305ed322b2 Merge pull request #1043 from vishal-singh-webkul/gli-1933
Fixed: The customer page in the back office showing non required information.
2024-08-09 15:42:04 +05:30