Commit Graph

730 Commits

Author SHA1 Message Date
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
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
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
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
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
vishalsingh.qlo325
7e21d1d0dd optmized the code for email prevention, created seprate class for BoOrder 2024-07-05 15:10:41 +05:30
Shreesh Arora
13aa486726 Merge branch 'develop' into gli-2092 2024-07-05 13:13:48 +05:30
Shreesh Arora
f066f71cf9 Merge branch 'develop' into gli-764 2024-07-05 12:58:20 +05:30
Shreesh Arora
f2573c5265 Merge branch 'develop' into gli-2204 2024-07-05 12:54:17 +05:30
vishalsingh.qlo325
75b89ca27c Merge branch 'develop' into gli-1910 2024-07-05 12:09:25 +05:30
Rohit Jain
649a8b9fe3 Merge pull request #987 from shreesh-webkul/gli-2036
Improved: Statstics data in admin stats page
2024-07-04 19:57:33 +05:30
Rohit Jain
bacb67d27e Merge pull request #1107 from shreesh-webkul/gli-2017
Fixed: Cookie not saving in browser when '+', '&', ')', '(' characters exists in Base URL
2024-07-04 19:56:18 +05:30
Rohit Jain
fee18dd1f9 Merge pull request #1081 from shreesh-webkul/gli-1749
Fixed:  Render list filter values are saved without validation
2024-07-04 19:55:30 +05:30
Rohit Jain
c6d1715421 Merge pull request #1119 from vishal-singh-webkul/gli-1944
Added: check-all and uncheck-all option in the tree for normal products and scroll bar for the rendered tree.
2024-07-04 19:44:10 +05:30
Rohit Jain
e91893862d Merge pull request #1086 from vishal-singh-webkul/gli-2085
Fixed: The customer messages sent from the contact page updates the previous message even if the subject (contact) selected is different.
2024-07-04 19:43:08 +05:30
vishalsingh.qlo325
066ff42c29 Merge branch 'develop' into gli-2133 2024-07-04 16:02:53 +05:30
Shreesh Arora
cc0fc2e9e0 added additional characted that are allowd in URL 2024-07-03 17:45:09 +05:30
Shreesh Arora
7eb08f5dfb merger multiple foreach loop in a single loop 2024-07-03 17:34:24 +05:30
vishalsingh.qlo325
33a68bf0fc Merge branch 'develop' into gli-1944 2024-07-03 10:06:52 +05:30
Sumit Panwar
d8758dd6af Fixed: Services are not showing in the invoices 2024-07-02 19:07:06 +05:30
vishalsingh.qlo325
3e55030b61 Merge branch 'develop' into gli-2085 2024-07-02 18:43:25 +05:30
vishalsingh.qlo325
d5c3bdf9f3 Merge branch 'develop' into gli-2046 2024-07-02 17:45:54 +05:30
vishalsingh.qlo325
495e2caf95 Merge branch 'develop' into gli-1910 2024-07-02 17:44:02 +05:30
Shreesh Arora
79ba48a5c9 Merge branch 'develop' into gli-1930 2024-07-02 17:11:06 +05:30
Shreesh Arora
6d28a9c336 Merge branch 'develop' into gli-2017 2024-07-02 17:10:43 +05:30
Shreesh Arora
a4e80383f4 Merge branch 'develop' into gli-1749 2024-07-02 16:52:15 +05:30