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

8527 Commits

Author SHA1 Message Date
merdan 81162c415f menu Controller 2022-09-21 15:26:41 +05:00
merdan bab4a72a2a menu Controller 2022-09-21 15:15:46 +05:00
merdan 1157232ff4 menu Controller 2022-09-21 15:08:42 +05:00
merdan e693eda135 menu Controller 2022-09-20 17:05:13 +05:00
merdan a6026df462 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-09-20 16:43:54 +05:00
sanjeev ce9c14aef0 update 2022-09-19 16:08:30 +05:30
sanjeev 38e92cb153 category slug update for requested locale #6725 2022-09-19 15:36:44 +05:30
sanjeev fcb99aebba alignment updates 2022-09-16 18:40:40 +05:30
sanjeev 94db9a8407 updates 2022-09-16 15:48:24 +05:30
sanjeev b0b77cf6da updates 2022-09-16 13:20:18 +05:30
sanjeev 834791adeb updates for regular price 2022-09-16 12:47:30 +05:30
sanjeev a442bc8f9e offer price updates 2022-09-15 18:16:51 +05:30
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 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 9005f26c50 Fixed coding style 2022-09-14 17:16:34 +05:30
jitendra f4198b2ad7 Remove dd 2022-09-14 17:16:09 +05:30
jitendra d5c812d6eb Added eager load to attribute options translation 2022-09-14 17:15:20 +05:30
jitendra f08e883b08 Optimized getting category filterable attributes 2022-09-14 17:14:28 +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
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
Abhishek Kathuria 3a9465d79c removed multiple space 2022-09-13 17:29:25 +05:30
sanjeev 63e2f96717 Showing active/inactive instead of 0/1 in case status filter applied 2022-09-13 11:47:50 +05:30
Jitendra Singh 12389dc64c
Merge pull request #6700 from papnoisanjeev/suspended-filter-for-customer 
Added suspend filter for customers #6685
 2022-09-12 12:01:58 +05:30
sanjeev 47d36a06a2 removed filter type un-necessary key 2022-09-12 11:53:34 +05:30
Jitendra Singh 949e787428
Merge pull request #6698 from papnoisanjeev/permission-check-on-add-button-admin-panel 
Permission check for add button on different views on admin panel #6697
 2022-09-12 11:07:20 +05:30
Jitendra Singh e493d9f22d
Merge pull request #6674 from papnoisanjeev/refactoring 
Some refactoring on admin package.
 2022-09-10 13:49:43 +05:30
Jitendra Singh 482f2ed971
Merge pull request #6683 from akathuria289/6377_issue 
Fixed issue #6377
 2022-09-09 13:53:32 +05:30
Jitendra Singh 0b013f2926
Merge pull request #6695 from papnoisanjeev/category-mass-action-update-added 
Category mass update action added #6690
 2022-09-09 13:50:18 +05:30
sanjeev 3514a1d3a2 recompiled 2022-09-09 10:01:41 +05:30
sanjeev c1dd18f7bd merged two if condition in single if condition 2022-09-09 09:59:39 +05:30
sanjeev e303ba6f35 updates 2022-09-08 16:42:40 +05:30
sanjeev 526131e2ed Added suspend filter for customers 2022-09-08 16:31:43 +05:30
sanjeev c6b1dee163 permission check for add button on different views on admin panel #6697 2022-09-07 18:39:30 +05:30
Abhishek Kathuria 5b4a603ebd change the UI 2022-09-07 18:22:30 +05:30
sanjeev a5940d458b update condition 2022-09-07 15:04:18 +05:30
Jitendra Singh e475245a5d
Merge pull request #6693 from papnoisanjeev/pending-payment-status-notification-issue 
"Pending Payment" notification issue on admin panel  #6686
 2022-09-07 13:37:32 +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
sanjeev 85d516d0ab acl updated 2022-09-07 13:25:28 +05:30
sanjeev 8e3e92a1e1 updates 2022-09-07 12:52:31 +05:30
sanjeev f3875f31b0 updates 2022-09-07 12:44: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
sanjeev bfcf83c4cc Fetch status instead of status label 2022-09-07 11:02:27 +05:30
sanjeev ae43d57fc7 updates 2022-09-06 19:07:33 +05:30
Jitendra Singh a8858141e6
Merge pull request #6676 from akathuria289/issue_#6345 
Fixed issue #6345
 2022-09-06 19:07:23 +05:30
Jitendra Singh ed0e012ad8
Merge pull request #6682 from akathuria289/issue_#667 
Fixed issue #6679
 2022-09-06 19:05:46 +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 c814a51954 Category mass update action added #6690 2022-09-06 17:53:37 +05:30
Abhishek Kathuria 80065121f7 Fixed issue 2022-09-06 15:58:16 +05:30
sanjeev d2d1128187 Pendening payment notification issue 2022-09-05 16:18:15 +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 e18b6a47c2 Fixed issue #6679 2022-09-01 15:47:05 +05:30
merdan 7a4bb61997 wellknow ss 2022-09-01 15:06:29 +05:00
Abhishek Kathuria 3b1621f1bf fixed isuse 2022-09-01 12:34:22 +05:30
Abhishek Kathuria 023fe72359 Fixed issue 2022-08-31 18:30:04 +05:30
sanjeev 0ed839023e some refrectoring on admin package 2022-08-31 12:18:43 +05:30
Abhishek Kathuria d39f37bf24 Fixed issu #6394 2022-08-30 19:00:52 +05:30
Abhishek Kathuria 60d3ca5465 Fixed issue #6394 2022-08-30 18:56:11 +05:30
sanjeev 0bf0010232 Back button issue on checkout page #6668 2022-08-30 13:05:44 +05:30
jitendra 44c17ef8e4 Merge branch 'master' of https://github.com/bagisto/bagisto 2022-08-30 11:04:08 +05:30
jitendra cd594fae54 Fixed typo 2022-08-30 11:03:45 +05:30
Jitendra Singh 7386016d15
Merge pull request #6546 from papnoisanjeev/transaction-amt-issue 
Transaction amount exceed issue fixed #6545
 2022-08-30 10:32:13 +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
Jitendra Singh 8bc8839cb6
Merge pull request #6665 from papnoisanjeev/multiple-same-address-save-issue 
Checkbox disabled after address save one time #6312
 2022-08-29 18:49:55 +05:30
Abhishek Kathuria a0762b6ca8 Fixed issue 2022-08-29 18:38:26 +05:30
sanjeev e2c76b4ca9 checkbox disabled after address save one time #6312 2022-08-29 18:28:42 +05:30
Sara M. Elsanan 2b043f91ac
Fix ShowModal Call 
Error: admin.js:2 ReferenceError: showModal is not defined
fix add Group in Edit family - it was missing $root
 2022-08-29 14:01:28 +02:00
Abhishek Kathuria a8a95c9dbf added required sign 2022-08-29 15:45:10 +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 d273914769
Merge pull request #6604 from akathuria289/issue_6366 
Fixed issue #6366
 2022-08-29 11:18:48 +05:30
Jitendra Singh 2cbcb04b0e
Merge pull request #6656 from akathuria289/issue_6341 
Fixed issue #6341
 2022-08-29 11:18:10 +05:30
Jitendra Singh 1b7b78cbc2
Merge pull request #6658 from papnoisanjeev/slot-selection-issue-rental-booking-type-product 
Slot duration selection message for one hour #6271
 2022-08-29 11:17:40 +05:30
sanjeev 15a2266a83 Recompiled 2022-08-25 16:05:23 +05:30
Abhishek Kathuria 542e88f3fa Fixed issue 2022-08-25 15:59:36 +05:30
sanjeev 26ef6973b0 Conditions added 2022-08-25 15:56:30 +05:30
Abhishek Kathuria ddf1d5a5f6 Fixed formatting 2022-08-25 15:53:35 +05:30
Abhishek Kathuria 1f55ecb374 Fixed issue #6481 2022-08-25 15:49:33 +05:30
sanjeev fbf9a699be space removed 2022-08-25 14:02:07 +05:30
sanjeev c5c1991e83 Restructure code 2022-08-25 13:18:39 +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 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
Abhishek Kathuria 4efc70496f Done the validation from laravel validation 2022-08-24 16:28:26 +05:30
Jitendra Singh 596b9dcfc6
Merge pull request #6625 from papnoisanjeev/icons-issue-user-profile 
Date and cross icon issue with customer profile.
 2022-08-24 15:37:20 +05:30
sanjeev db2a5266a0 Update after into parent 2022-08-24 15:11:51 +05:30
Jitendra Singh 2907817d21
Merge pull request #6641 from papnoisanjeev/alert-box-issue-during-filter 
Alert box issue during filtering #6640
 2022-08-24 14:28:08 +05:30