Commit Graph

2188 Commits

Author SHA1 Message Date
vishalsingh.qlo325
5aa7b92c69 added max quantity validation on bookings import 2024-07-29 10:50:03 +05:30
Sumit Panwar
a2f188b917 Merge branch 'develop' into gli-2058 2024-07-28 10:00:27 +05:30
vishalsingh.qlo325
7b545d26fc updated the validate order for the adminimport 2024-07-27 18:59:23 +05:30
vishalsingh.qlo325
22d5d7fe5f removed the non required commented code from admin Import, updated the hotel import, and booking import process 2024-07-27 18:57:07 +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
38a90b6d64 Merge branch 'develop' into gli-2087 2024-07-24 13:10:50 +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
Shreesh Arora
3bac634af5 Merge branch 'develop' into gli-2217 2024-07-24 12:16:09 +05:30
vishalsingh.qlo325
5df3925128 Merge branch 'develop' into gli-1916 2024-07-23 18:28:20 +05:30
vishalsingh.qlo325
7b4339a40c Merge branch 'develop' into gli-1933 2024-07-23 18:27:46 +05:30
vishalsingh.qlo325
555f096b05 Merge branch 'develop' into gli-1584 2024-07-23 18:27:10 +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
Shreesh Arora
28996df417 Updated: id_address_delivery is now set as 0 by default 2024-07-23 14:58:20 +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
1e4f369e55 Merge branch 'develop' into gli-1916 2024-07-22 12:23:07 +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
vishalsingh.qlo325
0b1862c948 Removed the address from the csv bookings import process 2024-07-17 11:14:34 +05:30
vishalsingh.qlo325
568cb2483a Merge branch 'develop' into gli-1584 2024-07-17 10:12:42 +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
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
vishalsingh.qlo325
28746f296a Merge branch 'develop' into gli-2046 2024-07-15 15:12:47 +05:30
vishalsingh.qlo325
d7f764c331 Fixed: fatal error on admin products and admin normal products caused when the id in url in not unsigned int 2024-07-15 15:12:24 +05:30
Sumit Panwar
4d8affa891 Merge branch 'develop' into gli-2183 2024-07-13 17:11:36 +05:30
Sumit Panwar
6c0622af23 Fixed: The net profit amount should decrease if an admin issues a refund by creating a voucher or credit slip 2024-07-13 13:24:05 +05:30
Sumit Panwar
67cfddede5 Merge branch 'develop' into dashboard_161_issues 2024-07-13 12:06:54 +05:30
vishalsingh.qlo325
3b9a1b13ee Merge branch 'develop' into gli-1699 2024-07-13 10:28:58 +05:30
vishalsingh.qlo325
881d21437f added header_order_conf email templates to ignore while selecting the template for the order status 2024-07-13 10:28:53 +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
vishalsingh.qlo325
fc8882ea9c Merge branch 'develop' into gli-982 2024-07-13 10:24:24 +05:30
vishalsingh.qlo325
2cac5680d8 Updated the defination lable of the store icon to map icon 2024-07-13 10:24:21 +05:30
Shreesh Arora
4f179c2773 Merge branch 'develop' into gli-1987 2024-07-12 14:59:09 +05:30
Sumit Panwar
0ca6d6bf75 Merge branch 'develop' into bo_order_design 2024-07-12 14:32:06 +05:30
Shreesh Arora
f965bf50a8 Merge branch 'develop' into gli-2071 2024-07-12 13:23:33 +05:30