Commit Graph

8244 Commits

Author SHA1 Message Date
jitendra 0d073a2ef0 Refactored repositories model method 2022-08-10 20:40:59 +05:30
sanjeev 6c54317445 Alert box issue during filtering 2022-08-10 13:46:39 +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 11efdc68b2 Fixed typo in comments and remove unnecessary cart load in CartRepository 2022-08-09 20:02:40 +05:30
sanjeev 9d0dceb0e1 wishlist redirection issue #6635 2022-08-09 20:00:16 +05:30
jitendra 759d360b2b Changed variable to camel case in CategoryController 2022-08-09 19:39:02 +05:30
jitendra e56ec9ffd9 Changed varibale name in CategoryController 2022-08-09 19:38:05 +05:30
jitendra 1a23814e2f Removed directly model usage in CategoryController 2022-08-09 19:35:19 +05:30
jitendra dc5404c33d Booking package refactored 2022-08-09 18:07:35 +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
sanjeev f8cfd1e107 fixes for RTL 2022-08-09 17:14:37 +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 057c873342 Fixed cart dailing test issue 2022-08-09 12:51:13 +05:30
jitendra 3a29907463 Refactored cart controller 2022-08-09 12:40:51 +05:30
jitendra b4b0c8df2d Boolean condition check code refactored 2022-08-09 12:04:14 +05:30
jitendra 2e23a17257 Cast getConfigData in velocity helper 2022-08-09 11:45:20 +05:30
jitendra e15fe96499 Refactored haveSufficientQuantity function in product type class 2022-08-09 11:33:11 +05:30
jitendra 9498348ac1 Wishlist add flash message issue fixed 2022-08-09 11:21:40 +05:30
jitendra 0d24c7f379 Customer verification issue fixed 2022-08-09 11:17:13 +05:30
sanjeev fc4e7d0841 fixed for searching and rtl 2022-08-09 11:01:33 +05:30
jitendra 078c7a760a Fixed product mass update issue 2022-08-08 20:21:38 +05:30
jitendra efded99220 Optimized product queries on category page 2022-08-08 20:05:38 +05:30
sanjeev 2033be4809 move after into parent selector and used % instead of px 2022-08-08 19:58:10 +05:30
Abhishek Kathuria 1443b8fa5c Resolved conflict 2022-08-08 19:52:42 +05:30
jitendra acf9626219 Optimized and refactored code 2022-08-08 18:40:37 +05:30
sanjeev 3b4688a659 Updated for RTL 2022-08-08 18:20:39 +05:30
sanjeev 06e0c01e2f Add to cart and other button positioning issue on product view and quick view #6632 2022-08-08 17:45:24 +05:30
sanjeev 684973b064 Recompiled 2022-08-08 15:48:16 +05:30
jitendra 809a215730 Optimized and refactored code 2022-08-06 20:41:23 +05:30
Jitendra Singh b41368a410
Merge pull request #6601 from papnoisanjeev/multipe-message-issue-coupon-remove
Multiple flash messages issue while removing a coupon, if clicked multiple time.
2022-08-06 12:12:29 +05:30
sanjeev 8bbf42d6b0 css updates 2022-08-05 17:10:29 +05:30
sanjeev cd1c3e4e48 css updates 2022-08-05 16:56:15 +05:30
sanjeev 15eec62eb3 Added Css into RTL 2022-08-04 12:34:48 +05:30
sanjeev 330c7bffad Css updates for rtl 2022-08-03 18:48:10 +05:30
Abhishek Kathuria 8b37d39c9c Resolved conflict 2022-08-03 18:04:32 +05:30
Abhishek Kathuria c2de509e7a Merge branch 'issue_6366' of github.com:akathuria289/bagisto into issue_6366 2022-08-03 18:03:07 +05:30
sanjeev d1b20764a6 Update date icon position at right corner 2022-08-03 18:01:26 +05:30
sanjeev 14947097cd Delete icon position issue for arabic locale 2022-08-03 16:43:58 +05:30
sanjeev 595a1214e3 Delete icon issue in arabic locale 2022-08-03 16:33:24 +05:30
sanjeev 0c3790e305 date and cross icon issue with customer profile 2022-08-03 15:53:45 +05:30
sanjeev dcbae7a391 updated all variable to camel case 2022-08-03 13:45:21 +05:30
sanjeev b361d548e6 camel case disable button 2022-08-03 13:30:13 +05:30
sanjeev 801d97b2fa Merge remote-tracking branch 'upstream/master' into multipe-message-issue-coupon-remove 2022-08-03 12:45:16 +05:30
sanjeev d83ea3edc3 recompiled 2022-08-03 12:18:14 +05:30
Jitendra Singh 08d70457cf
Merge pull request #6599 from Sanjaybhattwebkul/video-issue
Issue ##6547 fixed
2022-08-03 12:12:17 +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
sanjay bhatt 5e94865e31 Recompiled 2022-08-03 11:47:14 +05:30
sanjay bhatt ce7bed2155 Merge remote-tracking branch 'Upstream/master' into video-issue 2022-08-03 11:45:33 +05:30
Jitendra Singh 346cb7e93a
Merge pull request #6550 from papnoisanjeev/coupon-issue-cart
Showing warning in case coupon already applied.
2022-08-03 11:17:35 +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 8c0ff81050
Merge pull request #6504 from Sanjaybhattwebkul/guest-wishlist
Issue #6444 fixed
2022-08-03 11:11:15 +05:30
Abhishek Kathuria dd7cc8cfb2 Clear All Filter Added 2022-08-02 19:20:56 +05:30
sanjeev 24e2275434 recompiled 2022-08-02 19:14:36 +05:30
Jitendra Singh c6c27815a1
Merge pull request #6602 from devansh-webkul/issues/6453
HTTP Kernel Updated #6453
2022-08-02 18:55:53 +05:30
Jitendra Singh 53fe41fdaf
Merge pull request #6610 from papnoisanjeev/wishlist-item-show-issue-if-removed-last-page-items
Wishlist not showing if removed all items from last page.
2022-08-02 18:55:24 +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 b2c357f103
Merge pull request #6618 from papnoisanjeev/customer-profile-image-show-when-login
Showing profile image when customer login.
2022-08-02 18:52:56 +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
sanjeev e469eda82f customer profile pic remove issue resolved for velocity theme 2022-08-02 17:19:31 +05:30
sanjeev f4fec28478 Recompile 2022-08-02 16:00:20 +05:30
sanjeev 2f56948dd7 Profile image remove issue fixed if updating profile using default theme. 2022-08-02 15:52:53 +05:30
sanjeev 780fff3a13 removed profile pic for default theme 2022-08-02 13:20:24 +05:30
sanjeev 70131e9e24 recompile and fix 2022-08-02 12:33:12 +05:30
Devansh Bawari 1fa89eb5ac Merge branch 'master' into issues/6453 2022-08-02 12:21:21 +05:30
sanjeev c5dea84899 recompiled 2022-08-02 11:50:05 +05:30
Devansh Bawari 063e929b34 Changes Done 2022-08-02 11:37:54 +05:30
Devansh Bawari 8af7989cac Last Page Issue Fixed 2022-08-02 11:26:56 +05:30
sanjeev 434137b280 Recompiled 2022-08-02 11:10:52 +05:30
sanjeev 4d3b541d5e Merge remote-tracking branch 'upstream/master' into customer-profile-image-show-when-login 2022-08-02 11:09:53 +05:30
Abhishek Kathuria 95947c862d resolved conflict 2022-08-02 11:02:31 +05:30
Abhishek Kathuria 06341b28dc Fixed formatting 2022-08-02 10:59:19 +05:30
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 749e752163 Showing discount to varient of config products for which catalog rule applied 2022-07-28 12:25:21 +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