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

1991 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 b0570b0f00 Added changes to the Shop package 2022-09-14 17:38:31 +05:30
jitendra 4832b09ae9 Improved code for category page 2022-09-14 17:35:54 +05:30
jitendra c5fabf9c2a Merge with master 2022-09-14 17:04:28 +05:30
jitendra 227ba07223 Issue #6422 fixed 2022-09-14 16:45:16 +05:30
Jitendra Singh 41c725eb22
Merge pull request #6649 from akathuria289/add_image_issue2 
Add edit catalog image issue resolved
 2022-09-14 15:47:40 +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
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
Abhishek Kathuria 4d9b4ff19e Resolved conflict 2022-08-29 13:22:06 +05:30
sanjeev c84d296fdf recompiled 2022-08-29 12:22:55 +05:30
Jitendra Singh 2cbcb04b0e
Merge pull request #6656 from akathuria289/issue_6341 
Fixed issue #6341
 2022-08-29 11:18:10 +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
sanjeev 93c49b1fc7 Slot duration selection message for one hour. 2022-08-25 12:54:07 +05:30
Abhishek Kathuria 90348061a1 Fixed issue #6341 2022-08-24 17:30:16 +05:30
Abhishek Kathuria bace6c267a Add edit catalog image issue resolved 2022-08-19 17:34:26 +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 acf9626219 Optimized and refactored code 2022-08-08 18:40:37 +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
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 c6c27815a1
Merge pull request #6602 from devansh-webkul/issues/6453 
HTTP Kernel Updated #6453
 2022-08-02 18:55:53 +05:30
sanjeev 780fff3a13 removed profile pic for default theme 2022-08-02 13:20:24 +05:30
Devansh Bawari 1fa89eb5ac Merge branch 'master' into issues/6453 2022-08-02 12:21:21 +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
Devansh Bawari 1b9e4953ee Block Issue Fixed In Default Theme 2022-08-01 15:20:40 +05:30
sanjeev e979f6f2e7 Removed space after bracket and added and added a line after block 2022-08-01 12:34:14 +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
sanjeev 749e752163 Showing discount to varient of config products for which catalog rule applied 2022-07-28 12:25:21 +05:30
Devansh Bawari 9386475dec Removed auth guard middleware dependency from constructor. 2022-07-26 15:28:45 +05:30
merdan ae72375120 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	composer.json
	composer.lock
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
 2022-07-25 16:09:17 +05:00
merdan a4b1fe4840 Revert "server-folder-permissions" 
This reverts commit a8c31e1a44.
 2022-07-25 15:49:44 +05:00
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
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
Abhishek Kathuria f9f7b37933 Fixed issue #6371 2022-07-23 17:17:10 +05:30
sanjeev 27ed7c9ed1 coupon code status check method updated 2022-07-23 13:38:38 +05:30
Glenn Hermans bbc29e83b7
Merge pull request #6489 from Sanjaybhattwebkul/Cart-property-default-theme 
Enhancement #6427 done
 2022-07-19 22:12:00 +02:00
Abhishek Kathuria 5d3f6745a4 Fixed issue #6371 2022-07-19 15:14:42 +05:30
sanjeev 818d56e80f coupon status check before apply 2022-07-13 13:06:02 +05:30
jitendra e1a0c0b8c6 Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30