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

8169 Commits

Author SHA1 Message Date
Jitendra Singh fa8f3e6d4e
Merge pull request #6617 from akathuria289/issue_5584 
FIxed issue #5584
 2022-08-02 10:48:29 +05:30
Jitendra Singh df17c0e2de
Merge pull request #6619 from devansh-webkul/issues/6429 
Handled Cart Quantity #6429
 2022-08-02 10:47:05 +05:30
Jitendra Singh 6dc80b8642
Merge pull request #6620 from papnoisanjeev/active-inactive-filter-meaningful 
Showing Active/Inactive in case status filter applied instead of 0/1 also dependent translation (from admin) added into UI package itself.
 2022-08-02 10:46:04 +05:30
Jitendra Singh d4b02c370d
Merge pull request #6614 from akathuria289/issue_6331 
Fixed issue #6331
 2022-08-02 10:45:39 +05:30
Abhishek Kathuria 48138036f7 fixed formatting 2022-08-01 17:36:00 +05:30
Abhishek Kathuria be80f0eb6a fixed formatting 2022-08-01 17:34:40 +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
sanjeev e017630ccb Showing Active/Inactive in case status filter applied instead of 0/1 also dependent translation (from admin) added into UI package itself 2022-08-01 15:35:12 +05:30
Devansh Bawari 1b9e4953ee Block Issue Fixed In Default Theme 2022-08-01 15:20:40 +05:30
Devansh Bawari 0b8efd84dd Handled Cart Quantity 2022-08-01 15:12:13 +05:30
Devansh Bawari 46fdea42cf Merge branch 'master' into issues/6453 2022-08-01 13:06:47 +05:30
sanjeev e979f6f2e7 Removed space after bracket and added and added a line after block 2022-08-01 12:34:14 +05:30
Abhishek Kathuria baa44c0e93 fixed issue 2022-08-01 12:00:54 +05:30
sanjeev 5014686b01 Added css updates into scss files 2022-08-01 10:21:56 +05:30
sanjeev cef68ce115 Showing profile image when customer login 2022-07-30 18:22:58 +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
Abhishek Kathuria 079e3112ae Fixed issue #6331 2022-07-30 16:09:58 +05:30
Poghos Boyajyan b0541afb3c
Fixed issue with coupon usage limit 2022-07-29 17:27:54 +04:00
sanjeev af47d0a0f3 wishlist not showing if removed all items from last page 2022-07-28 17:07:26 +05:30
sanjeev fe8b1959b9 Product image upload and remove issue 2022-07-27 17:46:19 +05:30
sanjeev 5c899f36d9 Applied condition showing during filtering 2022-07-27 14:55:24 +05:30
Devansh a1046c734e
Update wishlist.blade.php 2022-07-26 17:51:03 +05:30
Devansh 8296500db1
Update wishlist.blade.php 2022-07-26 17:50:36 +05:30
Abhishek Kathuria efd64f4819 resolved conflict 2022-07-26 17:46:51 +05:30
Abhishek Kathuria 10c6779f5e added compiled file 2022-07-26 17:44:23 +05:30
Abhishek Kathuria 46476e3426 Fixed issue #6366 2022-07-26 17:41:16 +05:30
Devansh Bawari 9386475dec Removed auth guard middleware dependency from constructor. 2022-07-26 15:28:45 +05:30
Devansh Bawari 43909fab06 Removed intended method. No need of intended as it is holding admin one. If someone wants to intend page can customize and request a fresh route. 2022-07-26 15:27:48 +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
sanjeev ae8b71a93e repository class added 2022-07-25 15:56:28 +05:30
sanjeev 011cd38481 prevant multiple clicks on cross icon for default and velocity theme 2022-07-25 15:32:36 +05:30
sanjeev 1398fee916 disabling multiple click on element till respose get back 2022-07-25 15:01:29 +05:30
sanjay bhatt 3a75c545c1 Issue ##6547 fixed 2022-07-25 10:30:16 +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 d28d1a693b
Merge pull request #6598 from Sanjaybhattwebkul/product-image-height 
Isse ##6384 fixed
 2022-07-23 19:28:48 +05:30
sanjay bhatt d09057e166 Isse ##6384 fixed 2022-07-23 19:15:10 +05:30
Jitendra Singh 093469e7a5
Merge pull request #6597 from papnoisanjeev/update-cart-button-invisible-issue 
Invisible update cart button issue in case downloadable product added into cart.
 2022-07-23 19:11:32 +05:30
sanjeev 557332c4a3 removed method from product types 2022-07-23 19:03:21 +05:30
sanjeev 504e1d781d added show quantity method 2022-07-23 18:56:58 +05:30
Jitendra Singh 4cbed4a4db
Merge pull request #6573 from akathuria289/issue_fixed_6371 
Fixed issue #6371
 2022-07-23 18:26:22 +05:30
Abhishek Kathuria 7fb76c507e fixed formatting 2022-07-23 18:13:37 +05:30
Jitendra Singh 95e284e0d7
Merge pull request #6595 from akathuria289/issue_6558 
Fixed issue #6558
 2022-07-23 18:04:19 +05:30
sanjeev 57083e0c0c placed variable outside loop 2022-07-23 17:47:46 +05:30
sanjeev b191962ee3 Update variable position 2022-07-23 17:24:11 +05:30
Abhishek Kathuria f9f7b37933 Fixed issue #6371 2022-07-23 17:17:10 +05:30
sanjeev bc2b86c131 Invisible update cart button issue in case downloadable product added with other into cart 2022-07-23 17:16:10 +05:30
Jitendra Singh 4f7b3c5760
Merge pull request #6580 from papnoisanjeev/validation-amt-cart-catalog-rule-for-percentage 
Validation for percentage amt for Cart and Catalog Rule.
 2022-07-23 16:56:47 +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
Abhishek Kathuria 5a44016ef9 Fixed issue 2022-07-23 16:30:38 +05:30
Abhishek Kathuria cdbf345285 Fixed issue 2022-07-23 15:39:00 +05:30
Abhishek Kathuria 64bcb5dde5 Fixed issue #6558 2022-07-23 15:03:32 +05:30
Jitendra Singh 2c28a9b439
Merge pull request #6593 from papnoisanjeev/quick-view-bullets-invisible-product-view 
Quick view bullets invisible issue.
 2022-07-23 13:53:31 +05:30
Jitendra Singh 260a9b53d0
Merge pull request #6574 from akathuria289/issue_6386 
Fixed issue #6386
 2022-07-23 13:48:39 +05:30
sanjeev 27ed7c9ed1 coupon code status check method updated 2022-07-23 13:38:38 +05:30
Abhishek Kathuria 844e9c3387 recompile and ous 2022-07-23 13:37:19 +05:30
Jitendra Singh c8fbef538e
Merge pull request #6563 from papnoisanjeev/wishlist-share-link-issue 
Wish-list sharing link issue resolved #6441
 2022-07-23 13:34:12 +05:30
Abhishek Kathuria 41ba735f05 Resolved conflict 2022-07-23 13:25:58 +05:30
sanjeev f75dcd55e6 quick view bullets invisible issue 2022-07-23 13:05:54 +05:30
Jitendra Singh 6528c1b3f7
Merge pull request #6591 from Sanjaybhattwebkul/share-wishlist 
Issue ##6389 Fixed
 2022-07-23 12:41:36 +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
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 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
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
sanjeev 13ddda7674 Added PHPDOc 2022-07-20 14:06:46 +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
Seyed AmirHossein Adhami MirHosseini 7a7e9888f8
Update CartRule.php 2022-07-20 11:30:32 +04:30
sanjeev 3bb39a0228 validation for percentage amt for cart and catalog rule & handle validate request using FormRequest 2022-07-20 12:22:35 +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
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 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
Abhishek Kathuria 73d04b0fe3 Fixed issue #6359 2022-07-19 17:27:26 +05:30
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
Abhishek Kathuria 5d3f6745a4 Fixed issue #6371 2022-07-19 15:14:42 +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
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
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 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 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 df6809e676 Replaced ; from link 2022-07-14 11:38:20 +05:30
sanjeev dc70f694b4 Wishlist sharing link issue resolved #6441 2022-07-14 10:57:38 +05:30
sanjeev 05ca3a554d cart rule numeric validation for uses_per_coupon & uses_per_customer fields 2022-07-13 13:51:01 +05:30
sanjeev 818d56e80f coupon status check before apply 2022-07-13 13:06:02 +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
jitendra e1a0c0b8c6 Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30
Devansh f66981a0c9
Update Cart.php 2022-07-12 16:17:19 +05:30
sanjeev 8e96b65fba show warning in case coupon already applied 2022-07-12 14:52:13 +05:30
jitendra f2df720bec Changed else if to elseif (Followed PSR-2 standard) 2022-07-12 13:48:04 +05:30
jitendra 1b8e383461 Added variable caching in product flat listener 2022-07-12 13:19:25 +05:30
jitendra 0321dbb700 Resolved conflicts 2022-07-12 11:47:14 +05:30
jitendra adf8c6e9eb Remove unneccesarry functions from cart facades 2022-07-12 11:46:06 +05:30
jitendra 5deb1ddc76 Fixed duplicate query issue for cart 2022-07-12 11:18:58 +05:30
jitendra 8927614686 Fixed configurable child item issue in place order 2022-07-12 10:55:00 +05:30
jitendra 7e14ba1b1e Removed commented code 2022-07-11 18:22:41 +05:30
jitendra dbe690fe93 Fixed deactivate car issue 2022-07-11 18:15:58 +05:30
jitendra e833fbca28 Removed unneccesary eager login 2022-07-11 18:05:12 +05:30
jitendra 5ca30fa664 Optimized cart 2022-07-11 17:51:33 +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
Glenn Hermans b3fcde21d4
Merge pull request #6526 from TheIceMagmaCube/patch-1 
Update French translations
 2022-07-09 11:46:25 +02:00
Glenn Hermans a8c671b186
Merge pull request #6515 from papnoisanjeev/category-product-search 
Redirection issue during product search from category edit page.
 2022-07-09 11:44:28 +02:00
Glenn Hermans 67fb7cf453
Merge pull request #6516 from papnoisanjeev/product-deleted-exceptions 
Product deleted exceptions in case admin delete a product.
 2022-07-09 11:43:24 +02:00
Glenn Hermans c204e12a69
Merge pull request #6536 from papnoisanjeev/inactive-user-placing-orders 
Inactive user placing order issue fixed #6407
 2022-07-09 11:42:26 +02:00
Glenn Hermans 716d37b3f5
Merge pull request #6531 from akathuria289/issue_fixed_#6426 
Fixed issue #6426
 2022-07-09 11:41:10 +02:00
Glenn Hermans 8d666f784b
Merge pull request #6535 from devansh-webkul/issues/6463 
Fixed there should not be an exception if the admin is trying to add a new variant for the configurable product #6463
 2022-07-09 11:40:34 +02:00
sanjeev c67e316035 After refund, redirect to refund index page #6355 2022-07-08 17:01:40 +05:30
sanjeev f6d2685807 update 2022-07-08 15:44:37 +05:30
sanjeev 8b3624e719 Inactive user place order issue fixed #6407 2022-07-08 11:35:40 +05:30
Devansh Bawari f22499c7b0 Added Inside Creat Variant 2022-07-08 11:17:29 +05:30
Abhishek Kathuria 660a7ba711 Fixed issue #6428 2022-07-07 17:43:32 +05:30
jitendra 22f995475d Cart optimization reverted 2022-07-07 17:35:53 +05:30
sanjeev d72beab56e error message in case user redirecting to review page of deleted product 2022-07-07 17:29:17 +05:30
jitendra 0fee916bf9 Merged 2022-07-07 17:20:10 +05:30
jitendra a5a1111484 Product system performance optimization 2022-07-07 17:19:32 +05:30
Abhishek Kathuria 51634bd32f FIxed issue #6458 2022-07-07 16:53:20 +05:30
Abhishek Kathuria a409d579ca Fixed issue #6426 2022-07-07 16:18:37 +05:30
sanjeev 11eadd3c9c updates 2022-07-07 15:04:10 +05:30
sanjeev 6f0886299d updates 2022-07-07 13:43:03 +05:30
Abhishek Kathuria d7388a86bd Fixed issue #6428 2022-07-07 12:26:58 +05:30
TheIceMagmaCube 748eaaec6f
Update French translations 
Just a bunch of translations updated. It's more fluent.
 2022-07-06 19:19:03 +02:00
sanjeev a8081c870c updates 2022-07-06 19:14:52 +05:30
sanjeev cb8e5a090b updates 2022-07-06 19:04:17 +05:30
Abhishek Kathuria 8c28fdd6df Fixed issue #6458 2022-07-06 17:53:19 +05:30