merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,025 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

143 Commits

Author SHA1 Message Date
Sara M. Elsanan 2b043f91ac
Fix ShowModal Call 
Error: admin.js:2 ReferenceError: showModal is not defined
fix add Group in Edit family - it was missing $root
 2022-08-29 14:01:28 +02:00
Abhishek Kathuria ddf1d5a5f6 Fixed formatting 2022-08-25 15:53:35 +05:30
Abhishek Kathuria 1f55ecb374 Fixed issue #6481 2022-08-25 15:49:33 +05:30
Jitendra Singh 35d863da79
Merge pull request #6639 from papnoisanjeev/atleast-one-payment-method-enabled 
At least one payment method should be enabled #6370
 2022-08-23 14:25:35 +05:30
sanjeev e45332b1d7 space before break statement 2022-08-10 11:32:55 +05:30
sanjeev 0f8c39a079 At least one payment should enable #6370 2022-08-10 10:50:28 +05:30
jitendra 8c61634698 Fixed shipping create issue and refactored models 2022-08-09 17:49:38 +05:30
Jitendra Singh b24db87643
Revert "Fixed issue #6359" 2022-08-09 17:33:04 +05:30
Jitendra Singh 6eff4ca165
Merge pull request #6575 from akathuria289/issue_6359 
Fixed issue #6359
 2022-08-09 16:24:32 +05:30
jitendra b4b0c8df2d Boolean condition check code refactored 2022-08-09 12:04:14 +05:30
jitendra acf9626219 Optimized and refactored code 2022-08-08 18:40:37 +05:30
jitendra 809a215730 Optimized and refactored code 2022-08-06 20:41:23 +05:30
Jitendra Singh d9ef6bdd7c
Merge pull request #6528 from akathuria289/issue_fixed_#6428 
Fixed issue #6428
 2022-08-03 12:10:59 +05:30
Jitendra Singh 62699e05f4
Merge pull request #6566 from abhishekkathuria/issue_6484 
Fixed issue #6484
 2022-08-03 11:12:14 +05:30
Jitendra Singh 9d70789844
Merge pull request #6616 from akathuria289/issue_5801 
Fixed issue #5801
 2022-08-02 18:53:05 +05:30
Jitendra Singh 8955477d6e
Merge pull request #6603 from papnoisanjeev/cart-rule-coupon-type-selection-manual-hide-auto-generate-details 
On Selection of manual coupon code, Auto Generate Coupon Code section details should be hide.
 2022-08-02 18:52:03 +05:30
Abhishek Kathuria 06341b28dc Fixed formatting 2022-08-02 10:59:19 +05:30
Abhishek Kathuria 7926656b34 fixed issue 2022-08-01 17:27:47 +05:30
Abhishek Kathuria 479704a70c fixed issue 2022-08-01 17:26:27 +05:30
Abhishek Kathuria baa44c0e93 fixed issue 2022-08-01 12:00:54 +05:30
Abhishek Kathuria 5f6c756d84 FIxed issue #5584 2022-07-30 17:28:50 +05:30
Abhishek Kathuria 749e29ac7f Fixed issue #5801 2022-07-30 16:45:27 +05:30
sanjeev d75ba48386 Selection of manual coupon code, Auto Generate Coupon Code details should hide #6555 2022-07-26 11:43:05 +05:30
Abhishek 0aaf8fd9fd Resolved conflict 2022-07-24 12:05:02 +05:30
Abhishek cf9be22e01 Added compiled file 2022-07-24 11:24:37 +05:30
Jitendra Singh 6808e26963
Merge pull request #6577 from papnoisanjeev/dark-mode-calender-issue-order-filtering 
Calendar icon invisible issue during order filtering using date in dark mode #6344
 2022-07-23 16:39:59 +05:30
Devansh 04d9002386
Revert "Added space in v-validate #6458" 2022-07-23 16:32:11 +05:30
sanjeev 011fd859ec Hide the browser icon for dark mode and added a new cross icon in background & reverted input box as it is for dark mode 2022-07-22 11:28:40 +05:30
Jitendra Singh b2708e42aa
Merge pull request #6559 from papnoisanjeev/cart-rule-create-validation 
Cart rule numeric validation for uses_per_coupon & uses_per_customer.
 2022-07-21 17:28:01 +05:30
Jitendra Singh 0b7a883c6b
Merge pull request #6523 from akathuria289/issue_fixed_#6494 
fixed_issue #6494
 2022-07-20 19:19:11 +05:30
Devansh 9662f095de
Update text.blade.php 2022-07-20 19:11:19 +05:30
Devansh 8fb656ade5
Update text.blade.php 2022-07-20 18:45:23 +05:30
Jitendra Singh fa79727f38
Merge pull request #6579 from akathuria289/issue_fixed_#6458 
Added space in v-validate #6458
 2022-07-20 13:09:27 +05:30
Abhishek Kathuria a776a655e8 added space in v-validate 2022-07-20 10:58:33 +05:30
sanjeev 98ebf97704 calender icon invisible issue during order filtering using date in dark mode #6344 2022-07-20 10:14:07 +05:30
Glenn Hermans 17c5696532
Merge pull request #6525 from akathuria289/issue_fixed_#6458 
Fixed issue #6458
 2022-07-19 22:11:20 +02:00
Abhishek Kathuria 73d04b0fe3 Fixed issue #6359 2022-07-19 17:27:26 +05:30
Abhishek Kathuria d8d57263e2 Changes done 2022-07-19 15:45:40 +05:30
Seyed AmirHossein Adhami MirHosseini 89f8f277a7
lint - make variable camel case 2022-07-19 09:57:22 +04:30
Devansh 23d5326051
Update ConfigurationController.php 2022-07-19 10:46:13 +05:30
Seyed AmirHossein Adhami MirHosseini 74283f1aa2
bug fix - at least one shipping method must be enabled 2022-07-18 21:01:51 +04:30
Abhishek Kathuria 4834a3172b Fixed issue 2022-07-18 17:19:16 +05:30
Abhishek Kathuria 28e9a3a5fe Fixed spacing and added v-text 2022-07-18 12:04:29 +05:30
Abhishek f7f39278c4 Fixed issue #6484 2022-07-17 15:49:21 +05:30
Glenn Hermans ddc3b302ef
Merge pull request #6564 from papnoisanjeev/atleast-one-shipping-method 
At-least one shipping method should select #6370
 2022-07-16 13:11:14 +02:00
sanjeev 84c8a10ba9 alleast one shipping method should select #6370 2022-07-14 16:49:41 +05:30
sanjeev 05ca3a554d cart rule numeric validation for uses_per_coupon & uses_per_customer fields 2022-07-13 13:51:01 +05:30
jitendra e1a0c0b8c6 Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30
jitendra f2df720bec Changed else if to elseif (Followed PSR-2 standard) 2022-07-12 13:48:04 +05:30
Glenn Hermans 6bc6131c2a
Merge pull request #6541 from papnoisanjeev/refund-redirection-update 
After refund, redirect to refund index page #6355
 2022-07-11 10:52:08 +02:00