Commit Graph

372 Commits

Author SHA1 Message Date
Rohit Jain
47eec5217c Merge pull request #1105 from shreesh-webkul/gli-2120
Added: Option for modules to manipulate KPI data
2024-09-03 19:02:42 +05:30
Shreesh Arora
6785b6ff39 Fixed: Invalid price update in order table product_price column on editing service price 2024-08-26 16:19:14 +05:30
Shreesh Arora
fa3d470455 Merge branch 'develop' into gli-2120 2024-08-23 14:45:05 +05:30
Sumit Panwar
3510b38a8a Merge branch 'develop' into dashboard_161_issues 2024-08-23 12:09:52 +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
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
Shreesh Arora
9568b5bcfc Merge branch 'develop' into gli-2120 2024-08-22 13:24:17 +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
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
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
f84ffbc620 Added: Add new order button on the admin orders 2024-08-16 11:17:05 +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
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
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
vishalsingh.qlo325
d3702b6e86 Merge branch 'develop' into gli-2232 2024-08-07 10:17:51 +05:30
vishalsingh.qlo325
9601f3acce Fixed: The cart was not updated after a room was updated from the order detail page 2024-08-07 10:16:53 +05:30
vishalsingh.qlo325
b6aee4ba90 Merge branch 'develop' into gli-2219_2 2024-08-05 20:08:28 +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
e8c2b310a0 Merge branch 'develop' into dashboard_161_issues 2024-08-03 11:04:10 +05:30
vishalsingh.qlo325
90590940c4 Fixed: Error on the customer cart page on the back office after admin removes a room from the booking 2024-08-02 16:44:12 +05:30
vishalsingh.qlo325
ca3774c5f8 added collpase for the admin to view all the convenience products and taxes in details 2024-08-01 19:53:29 +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
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
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
ed1251a4a0 Merge branch 'develop' into gli-2046 2024-07-22 12:22:11 +05:30
vishalsingh.qlo325
d8b0367d32 Added validation for the controllers which displays the errors after invalid id is provided in the url 2024-07-16 17:25:58 +05:30
Sumit Panwar
03fcae1932 Fixed: Unused code removed came from merging the conflicts with develop branch 2024-07-13 10:26:17 +05:30
Shreesh Arora
cffab70e11 removed dump added in code 2024-07-11 19:58:12 +05:30
Sumit Panwar
14792dbe66 Added: option to add/edit customer address from order detail page of BO 2024-07-09 14:48:12 +05:30
Sumit Panwar
5e276db6be Revert: Code for - Added: option to add/edit customer address from order detail page of BO 2024-07-09 13:25:19 +05:30
Sumit Panwar
d14173cbd0 Conflicts Resolved 2024-07-09 13:18:13 +05:30
Sumit Panwar
b121898cf2 Merge branch 'develop' into dashboard_161_issues 2024-07-08 15:45:23 +05:30
Sumit Panwar
da0d704ced Merge branch 'develop' into gli-2058 2024-07-08 15:43:21 +05:30
vishalsingh.qlo325
966b142221 Merge branch 'develop' into gli-2046 2024-07-08 15:26:10 +05:30
vishalsingh.qlo325
40529d819f Merge branch 'develop' into gli-2178 2024-07-05 15:11:26 +05:30