Commit Graph

10833 Commits

Author SHA1 Message Date
Abhishek Kathuria 844e9c3387 recompile and ous 2022-07-23 13:37:19 +05:30
Abhishek Kathuria 41ba735f05 Resolved conflict 2022-07-23 13:25:58 +05:30
Jitendra Singh 6528c1b3f7
Merge pull request #6591 from Sanjaybhattwebkul/share-wishlist
Issue ##6389 Fixed
2022-07-23 12:41:36 +05:30
Jitendra Singh 98da43a46c
Merge pull request #6590 from papnoisanjeev/toggle_button_issue
Toggle button issue even working with outside click.
2022-07-23 12:23:17 +05:30
sanjay bhatt 442c47bf20 Issue ##6389 Fixed 2022-07-23 11:50:51 +05:30
sanjeev e783352245 Toggle button issue even working with outside click 2022-07-23 11:30:07 +05:30
Jitendra Singh 4230d6913e
Merge pull request #6565 from papnoisanjeev/price-filer-default-selection
Default selection for price filter resolved  #6340
2022-07-21 17:51:39 +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 bf647845d3
Merge pull request #6586 from akathuria289/issue_6388
Fixed issue #6388
2022-07-21 16:48:26 +05:30
Jitendra Singh a4c4022d45
Merge pull request #6587 from akathuria289/issue_fixed_5392
Added published file
2022-07-21 15:47:34 +05:30
Abhishek Kathuria 22c24c9c37 Added published file 2022-07-21 12:17:48 +05:30
Jitendra Singh aa54169ca3
Merge pull request #6585 from akathuria289/issue_5392
Fixed issue #5392
2022-07-21 11:49:33 +05:30
Abhishek Kathuria 7f6579a18d Fixed issue #6388 2022-07-21 10:41:29 +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
Abhishek Kathuria 01b0b8e4e8 Added translated text 2022-07-20 18:46:04 +05:30
Devansh 8fb656ade5
Update text.blade.php 2022-07-20 18:45:23 +05:30
Abhishek Kathuria 5183cd5c9a added space 2022-07-20 18:11:00 +05:30
Abhishek Kathuria 970a7effbf Fixed issue #5392 2022-07-20 18:09:15 +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
Jitendra Singh 8573ce3380
Merge pull request #6581 from AmooAti/patch-2
fix php docs
2022-07-20 12:49:56 +05:30
Seyed AmirHossein Adhami MirHosseini 7a7e9888f8
Update CartRule.php 2022-07-20 11:30:32 +04:30
Jitendra Singh ebec1db340
Merge pull request #6578 from bagisto/revert-6568-percentage-discount-validation-cart-rule-catalog-rule
Revert "Validation for percentage discount amt  added."
2022-07-20 11:08:15 +05:30
Abhishek Kathuria a776a655e8 added space in v-validate 2022-07-20 10:58:33 +05:30
Jitendra Singh e19b009c97
Revert "Validation for percentage discount amt added." 2022-07-20 10:38:32 +05:30
Glenn Hermans 8c18184758
Merge pull request #6490 from Sanjaybhattwebkul/ApplyCoupan-FlashMessage
Enhancement #6417 done
2022-07-19 22:12:47 +02:00
Glenn Hermans bbc29e83b7
Merge pull request #6489 from Sanjaybhattwebkul/Cart-property-default-theme
Enhancement #6427 done
2022-07-19 22:12:00 +02:00
Glenn Hermans 17c5696532
Merge pull request #6525 from akathuria289/issue_fixed_#6458
Fixed issue #6458
2022-07-19 22:11:20 +02:00
Glenn Hermans 8e42cb47f9
Merge pull request #6568 from papnoisanjeev/percentage-discount-validation-cart-rule-catalog-rule
Validation for percentage discount amt  added.
2022-07-19 22:10:49 +02:00
sanjeev 92990047a9 updated default max value in case of filter not applied 2022-07-19 16:50:58 +05:30
Abhishek Kathuria bcba17f0dc Fixed issue #6386 2022-07-19 16:35:26 +05:30
Abhishek Kathuria d8d57263e2 Changes done 2022-07-19 15:45:40 +05:30
Jitendra Singh 4306ea45a6
Merge pull request #6553 from jitendra-webkul/master
Replace findOneByField function call with find
2022-07-19 13:29:17 +05:30
Jitendra Singh 0d8f26c114
Merge pull request #6569 from AmooAti/patch-1
bug fix - at least one shipping method must be enabled
2022-07-19 11:08:28 +05:30
Seyed AmirHossein Adhami MirHosseini 89f8f277a7
lint - make variable camel case 2022-07-19 09:57:22 +04:30
Seyed AmirHossein Adhami MirHosseini f39dff8d21
Merge branch 'bagisto:master' into patch-1 2022-07-19 09:51:59 +04:30
Devansh 23d5326051
Update ConfigurationController.php 2022-07-19 10:46:13 +05:30
Jitendra Singh 8711ec87ef
Merge pull request #6570 from devansh-webkul/master
Barryvdh Dompdf Updated
2022-07-19 10:36:01 +05:30
Devansh Bawari cc5b143515 PHP Version Updated 2022-07-19 09:52:27 +05:30
Devansh Bawari 062145eed4 DOM PDF Updated 2022-07-19 09:48:49 +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
sanjeev 2d31e6a13d validation for percentage discount amt added 2022-07-18 18:22:34 +05:30
sanjeev 02a10298d7 Set default price to category max price value 2022-07-18 18:06:43 +05:30
Abhishek Kathuria 28e9a3a5fe Fixed spacing and added v-text 2022-07-18 12:04:29 +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 88dc2a93ad default selection price filter #6340 2022-07-15 15:33:55 +05:30
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 9fa2d73a06 Replace findOneByField function call with find 2022-07-12 18:30:59 +05:30
Jitendra Singh 3ab9f443e4
Merge pull request #6552 from jitendra-webkul/master
Convert if else statement to PSR-2 standard
2022-07-12 17:46:50 +05:30