Commit Graph

1112 Commits

Author SHA1 Message Date
Shreesh Arora
6b8da7e2af removed undefined function 2024-08-22 15:45:40 +05:30
Shreesh Arora
9568b5bcfc Merge branch 'develop' into gli-2120 2024-08-22 13:24:17 +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
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
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
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
99efe6f791 Merge branch 'develop' into gli-1987 2024-08-07 13:39:17 +05:30
Shreesh Arora
d096f93963 Merge branch 'develop' into gli-1798 2024-08-07 13:38:39 +05:30
Shreesh Arora
277255d3cf Merge branch 'develop' into gli-1965 2024-08-07 13:27:48 +05:30
Shreesh Arora
1b1f397f2d Merge branch 'develop' into gli-1949 2024-08-07 13:25:49 +05:30
Shreesh Arora
83e6e66f9a updated check file method 2024-08-07 13:10:11 +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
Rohit Jain
588d76e3e2 Merge pull request #1065 from shreesh-webkul/gli-2071
Added: option to view frequent customer in backoffice customer page
2024-08-05 12:48:31 +05:30
Rohit Jain
15bcc9172e Merge pull request #1164 from sumitwebkul/gli-2183
Added: Option to add/edit customer address from order detail page of Back office
2024-08-05 12:48:14 +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
026d7cdb27 Fixed:After making fields as required and clicking on save and stay, customer eamail is not showing on customer detail page. 2024-08-03 10:58:41 +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
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
a2f188b917 Merge branch 'develop' into gli-2058 2024-07-28 10:00:27 +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
a3c4e8c7ac Merge branch 'develop' into gli-2071 2024-07-24 13:06:18 +05:30
Shreesh Arora
0f29466cd7 Merge branch 'develop' into gli-1798 2024-07-24 13:03:52 +05:30
Shreesh Arora
14b5f5b4dd Merge branch 'develop' into gli-1965 2024-07-24 13:03:18 +05:30
Shreesh Arora
a3279cd3c6 Merge branch 'develop' into gli-1949 2024-07-24 12:57:37 +05:30
Shreesh Arora
e531e8001e Merge branch 'develop' into gli-1987 2024-07-24 12:45:03 +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
Rohit Jain
5524b79400 Merge pull request #1046 from vishal-singh-webkul/gli-2046
Fixed: Getting errors in the back office if the id in the URL is updated manually to an invalid one.
2024-07-23 15:02:29 +05:30
Rohit Jain
b3dbfd7459 Merge pull request #1084 from vishal-singh-webkul/gli-982
Updated: The google maps will now display the map icon for the hotel locations.
2024-07-23 15:01:52 +05:30
Rohit Jain
4e754e7ca3 Merge pull request #1088 from vishal-singh-webkul/gli-1868
Updated: Customer deletion and ban process and added filters for the admin to view the banned customers.
2024-07-23 15:01:17 +05:30
Rohit Jain
8371a0996f Merge pull request #1143 from vishal-singh-webkul/gli-2185
Fixed: Error on AdminTranslationController while translating modules, also optimized the translation process for the modules.
2024-07-23 15:00:48 +05:30
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
4564d52107 optimized code for admin translation and removed non required variables 2024-07-23 11:29:00 +05:30
vishalsingh.qlo325
ffc404e90b Merge branch 'develop' into gli-2185 2024-07-22 13:19:26 +05:30
vishalsingh.qlo325
89f1a38e25 Merge branch 'develop' into gli-1868 2024-07-22 13:18:16 +05:30
vishalsingh.qlo325
73fd3d7322 Merge branch 'develop' into gli-982 2024-07-22 13:17:40 +05:30
vishalsingh.qlo325
ed1251a4a0 Merge branch 'develop' into gli-2046 2024-07-22 12:22:11 +05:30
vishalsingh.qlo325
9d43ef3f9f Merge branch 'develop' into gli-1933 2024-07-22 12:21:47 +05:30
Shreesh Arora
c39b97d408 fix num orders for frequent customers can be set to 0 2024-07-19 15:40:41 +05:30
vishalsingh.qlo325
509382929f Fixed the total count of the service products for the list in the back office 2024-07-17 11:46:26 +05:30
Rohit Jain
05964925a9 Merge pull request #1138 from vishal-singh-webkul/gli-2178
Added: Variable in validateOrder function call of the payment module to prevent the emails on the order validation process.
2024-07-16 20:07:26 +05:30