Commit Graph

771 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
401595beef Fixed: issue occurs while deleting booking line. If there is no refund requests in the booking is created. 2024-08-15 12:21:51 +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
1bfe33216a remove rounding of amount in refund request 2024-08-12 16:55:59 +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
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
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
5f7bd4410d Merge branch 'develop' into gli-2202 2024-08-07 12:48:53 +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
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
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
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
44b4ab465b Merge pull request #1109 from sumitwebkul/gli-1768
Updated: Decimal digits maximum limit is removed from price validation by Validate::isPrice()
2024-07-23 15:02:49 +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
Sumit Panwar
62f35618ce Merge branch 'develop' into gli-1768 2024-07-23 11:29:55 +05:30
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
89f1a38e25 Merge branch 'develop' into gli-1868 2024-07-22 13:18:16 +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
a66b446726 fixed voucher amount is not converted when changing currency while creating booking from back office 2024-07-18 19:57:52 +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
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
28746f296a Merge branch 'develop' into gli-2046 2024-07-15 15:12:47 +05:30
Sumit Panwar
0ca6d6bf75 Merge branch 'develop' into bo_order_design 2024-07-12 14:32:06 +05:30
Rohit Jain
10bb208106 Merge pull request #1152 from shreesh-webkul/gli-2204
Removed: Incompatible null coalescing operator used in cache
2024-07-11 19:56:37 +05:30
vishalsingh.qlo325
f43aae5f28 Merge branch 'develop' into gli-1868 2024-07-11 19:40:37 +05:30
Rohit Jain
7849875043 Merge pull request #1141 from shreesh-webkul/gli-764
Updated: Default invoice will be shown even in case of b2b invoice
2024-07-11 18:19:07 +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
vishalsingh.qlo325
2c84f09821 Optimized function getCustomers() for easy understanding 2024-07-10 15:29:40 +05:30
vishalsingh.qlo325
69056e4ed8 optimized the function getCustomers() to get the customers list for address creation 2024-07-10 12:07:41 +05:30
vishalsingh.qlo325
38568afb0b Added validateOrderAmount variable in the payment module class 2024-07-10 10:27:05 +05:30
Sumit Panwar
d14173cbd0 Conflicts Resolved 2024-07-09 13:18:13 +05:30
vishalsingh.qlo325
9eee80ad59 Merge branch 'develop' into gli-2133 2024-07-08 16:08:50 +05:30
Sumit Panwar
ec1a691f35 Merge branch 'develop' into gli-1768 2024-07-08 15:44:42 +05:30
Sumit Panwar
da0d704ced Merge branch 'develop' into gli-2058 2024-07-08 15:43:21 +05:30
vishalsingh.qlo325
6a40033b4f Merge branch 'develop' into gli-1868 2024-07-08 15:37:14 +05:30