Commit Graph

706 Commits

Author SHA1 Message Date
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
4b3f85c157 Merge pull request #1136 from shreesh-webkul/gli-1949
Fixed: Cancelled room service is visible when same room is added again in order
2024-08-14 15:24:41 +05:30
Shreesh Arora
cbc2424661 upadte custom price round process 2024-08-14 12:51:29 +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
8f102c7b14 Merge branch 'develop' into gli-1924 2024-08-12 16:44:01 +05:30
Shreesh Arora
efa04cf529 hide messages panel in order print 2024-08-12 16:43:46 +05:30
Shreesh Arora
453f507ad2 Merge branch 'develop' into gli-1949 2024-08-12 15:49:22 +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
Shreesh Arora
d096f93963 Merge branch 'develop' into gli-1798 2024-08-07 13:38:39 +05:30
Shreesh Arora
778a4f54c0 Merge branch 'develop' into gli-1924 2024-08-07 13:34:27 +05:30
Shreesh Arora
1b1f397f2d Merge branch 'develop' into gli-1949 2024-08-07 13:25:49 +05:30
Shreesh Arora
5f7bd4410d Merge branch 'develop' into gli-2202 2024-08-07 12:48:53 +05:30
Shreesh Arora
d61c7b1e38 Fixed issue raised in confirm modal 2024-08-07 12:48:38 +05:30
Sumit Panwar
154a7689c2 Fixed: Issues in customer address update from the order address 2024-08-03 17:41:24 +05:30
Sumit Panwar
5dc069b7c5 Merge branch 'develop' into gli-2183 2024-08-03 11:00:54 +05:30
Shreesh Arora
ea723f4a16 Merge branch 'develop' into gli-1924 2024-08-01 15:15:24 +05:30
Shreesh Arora
a0096f973a Merge branch 'develop' into gli-1949 2024-08-01 15:07:15 +05:30
Shreesh Arora
29701ff236 Merge branch 'develop' into gli-1798 2024-08-01 15:06:03 +05:30
Shreesh Arora
5fdb6ef226 updated always show confirm popup when deleting cart rule 2024-08-01 13:59:27 +05:30
Shreesh Arora
1743ca82f5 Added: Confirmation modal when deleting cart rules and while changes credit slip status 2024-07-31 17:42:02 +05:30
vishalsingh.qlo325
69a0021fa7 Merge branch 'develop' into gli-1933 2024-07-30 10:09:11 +05:30
vishalsingh.qlo325
878c657e41 updated the design for the room types and services on the customer view page for the admin 2024-07-29 16:34:51 +05:30
Sumit Panwar
86b0834b7f resolved conflicts 2024-07-27 15:59:29 +05:30
Sumit Panwar
26703f7770 Added: Panel to add/update customer address from order detail page of Back office 2024-07-27 15:52:21 +05:30
Shreesh Arora
0f29466cd7 Merge branch 'develop' into gli-1798 2024-07-24 13:03:52 +05:30
Shreesh Arora
a3279cd3c6 Merge branch 'develop' into gli-1949 2024-07-24 12:57:37 +05:30
Shreesh Arora
07e7c94d7a Merge branch 'develop' into gli-1924 2024-07-24 12:43:57 +05:30
vishalsingh.qlo325
edb49ae059 Merge branch 'develop' into gli-2107_2 2024-07-23 18:29:15 +05:30
vishalsingh.qlo325
7b4339a40c Merge branch 'develop' into gli-1933 2024-07-23 18:27:46 +05:30
Rohit Jain
310e5008cb Merge pull request #1123 from sumitwebkul/bo_order_design
Fixed: Issues in order detail page design changes in Back-office
2024-07-23 15:03:08 +05:30
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
0411e347c8 Merge branch 'develop' into gli-2107_2 2024-07-22 13:18:51 +05:30
vishalsingh.qlo325
89f1a38e25 Merge branch 'develop' into gli-1868 2024-07-22 13:18:16 +05:30
vishalsingh.qlo325
9d43ef3f9f Merge branch 'develop' into gli-1933 2024-07-22 12:21:47 +05:30
Shreesh Arora
ffc554bf40 fixed kpi pannel height issue 2024-07-18 16:47:02 +05:30
Rohit Jain
d752e30b33 Merge pull request #1045 from vishal-singh-webkul/gli-1910
Fixed: The email selection process while creating new address for the customer and back button for the AdminAddressController.
2024-07-16 19:59:48 +05:30
vishalsingh.qlo325
9fd4d52519 Merge branch 'develop' into gli-2106 2024-07-15 09:46:14 +05:30
Sumit Panwar
4d8affa891 Merge branch 'develop' into gli-2183 2024-07-13 17:11:36 +05:30
Sumit Panwar
91558046dd Removed: Unused file when order edit process 2024-07-13 15:00:58 +05:30
Sumit Panwar
b18f9f3612 Updated:: Admin can edit occupancy after order from backoffice whether order is created with occupancy or with rooms selection by guest 2024-07-13 14:41:33 +05:30
Sumit Panwar
d3d3d05a64 Fixed: Text years is wrong if child age is 1 in bookings list and overbookings list in order details page in back office 2024-07-13 12:01:26 +05:30
Sumit Panwar
60e9437f0f Fixed: Select 1 instead of Select age in the child age when age is already selected while order edit and also while creating booking in backoffice 2024-07-13 11:14:25 +05:30
Sumit Panwar
0ca6d6bf75 Merge branch 'develop' into bo_order_design 2024-07-12 14:32:06 +05:30
vishalsingh.qlo325
f43aae5f28 Merge branch 'develop' into gli-1868 2024-07-11 19:40:37 +05:30
Rohit Jain
9ba78a5bf3 Merge pull request #1062 from shreesh-webkul/gli-2092
Updated: htaccess files comptible with apache 2.2 and 2.4
2024-07-11 18:18:48 +05:30
Rohit Jain
aa4b0859c8 Merge pull request #1145 from vishal-singh-webkul/gli-1823
Added: Empty dropdown will appear if no options are available and empty message is not set.
2024-07-11 18:00:03 +05:30
vishalsingh.qlo325
2c84f09821 Optimized function getCustomers() for easy understanding 2024-07-10 15:29:40 +05:30
vishalsingh.qlo325
5e4cae78e0 Revert the changes made to the ajaxprocess in the admin address controller 2024-07-10 12:37:51 +05:30