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

1967 Commits

Author SHA1 Message Date
merdan a6026df462 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-09-20 16:43:54 +05:00
sanjeev c069a80def spacial price option added for configurable product and sale icon show if spacial price exist for configurable product 2022-09-15 18:10:28 +05:30
jitendra 439c1ece44 Added removed code again 2022-09-14 17:52:25 +05:30
jitendra 1e7409c255 Fixed duplicate ajax request for category max-price 2022-09-14 17:37:40 +05:30
jitendra 4832b09ae9 Improved code for category page 2022-09-14 17:35:54 +05:30
Jitendra Singh 181051e343
Merge pull request #6696 from akathuria289/issue_6689 
Fixed issue #6689
 2022-09-14 12:59:53 +05:30
Abhishek Kathuria 5b21c37572 Fixed issue 2022-09-13 18:50:30 +05:30
Jitendra Singh 482f2ed971
Merge pull request #6683 from akathuria289/6377_issue 
Fixed issue #6377
 2022-09-09 13:53:32 +05:30
Abhishek Kathuria 5b4a603ebd change the UI 2022-09-07 18:22:30 +05:30
Abhishek Kathuria 21f3af448c Resolved conflict 2022-09-07 13:29:34 +05:30
Abhishek Kathuria 51866bb1d6 Fixed issue 2022-09-07 13:26:41 +05:30
Abhishek Kathuria ca3e992fd1 Resolved conflict 2022-09-07 12:39:10 +05:30
Jitendra Singh 41fb2837a4
Merge pull request #6673 from akathuria289/scroll_activate 
Fixed issue #6394
 2022-09-07 12:37:34 +05:30
Jitendra Singh 83a43f9b84
Merge pull request #6670 from papnoisanjeev/back-button-issue-on-checkout 
Back button issue on checkout page #6668
 2022-09-06 18:38:08 +05:30
sanjeev 1b719d741a velocity meta data update issue fixed #6687 2022-09-05 12:10:53 +05:30
merdan 6d4bee4e14 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	packages/Webkul/Category/src/Repositories/CategoryRepository.php
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
 2022-09-03 15:51:08 +05:00
Abhishek Kathuria 2f8c66190a Fixed isue 2022-09-02 16:42:11 +05:30
Abhishek Kathuria e4ec1e7161 Resolved conflict 2022-09-02 11:45:23 +05:30
Abhishek Kathuria ad127a9b2d Fixed issue #6377 2022-09-02 11:36:57 +05:30
Abhishek Kathuria d39f37bf24 Fixed issu #6394 2022-08-30 19:00:52 +05:30
sanjeev 0bf0010232 Back button issue on checkout page #6668 2022-08-30 13:05:44 +05:30
Jitendra Singh 7274a47a36
Merge pull request #6608 from papnoisanjeev/config-product-regular-price-show-issue 
Showing discount to variant of config products for which catalog rule applied only.
 2022-08-29 19:18:49 +05:30
sanjeev e2c76b4ca9 checkbox disabled after address save one time #6312 2022-08-29 18:28:42 +05:30
sanjeev c84d296fdf recompiled 2022-08-29 12:22:55 +05:30
sanjeev 15a2266a83 Recompiled 2022-08-25 16:05:23 +05:30
sanjeev 26ef6973b0 Conditions added 2022-08-25 15:56:30 +05:30
Abhishek Kathuria ba10d0a95f Resolved commit 2022-08-24 17:04:43 +05:30
Abhishek Kathuria 17678382ee Fixed issue 2022-08-24 17:03:18 +05:30
Abhishek Kathuria 1c1b303e54 Merge branch 'issue_6366' of github.com:akathuria289/bagisto into issue_6366 2022-08-24 17:00:21 +05:30
sanjeev db2a5266a0 Update after into parent 2022-08-24 15:11:51 +05:30
sanjeev bc59718cd4 Recompiled 2022-08-23 16:17:28 +05:30
sanjeev a752726b54 Updated rtl css 2022-08-23 16:11:40 +05:30
Jitendra Singh 7fae012f08
Merge pull request #6633 from papnoisanjeev/cart-and-wishlist-button-positioning-issue 
Add to cart and other button positioning issue on product view and quick view  #6632
 2022-08-23 14:28:12 +05:30
jitendra 0d073a2ef0 Refactored repositories model method 2022-08-10 20:40:59 +05:30
jitendra 8c61634698 Fixed shipping create issue and refactored models 2022-08-09 17:49:38 +05:30
sanjeev f8cfd1e107 fixes for RTL 2022-08-09 17:14:37 +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
sanjeev fc4e7d0841 fixed for searching and rtl 2022-08-09 11:01:33 +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 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