Commit Graph

9385 Commits

Author SHA1 Message Date
merdan 2e3ed5a544 vendor categories fx1 2022-11-18 12:15:53 +05:00
merdan aefd6a8eca vendor categories fx1 2022-11-18 12:11:38 +05:00
merdan a2732678da vendor categories fx1 2022-11-18 12:03:30 +05:00
merdan 6dc26409e8 vendor categories 2022-11-18 12:01:21 +05:00
merdan 2135fdbdcd discount cart rules 2022-11-17 16:14:38 +05:00
merdan 30eea44d48 discount cart rules 2022-11-17 16:08:28 +05:00
merdan d3a47e0949 discount cart rules 2022-11-17 15:53:03 +05:00
merdan 585605f431 discount cart rules 2022-11-17 15:51:39 +05:00
merdan 2e5ab35b1c invoice fx 2022-11-17 15:03:57 +05:00
merdan 79c1183612 invoice fx 2022-11-17 12:29:01 +05:00
merdan 0adc050a14 invoice fx 2022-11-13 16:38:24 +05:00
merdan cff62c6005 invoice fx 2022-11-13 15:38:54 +05:00
merdan cd290dc2cf invoice fx 2022-11-13 15:37:40 +05:00
merdan a75cb5a528 invoice fx 2022-11-13 15:35:50 +05:00
merdan e14e1a6d9c invoice fx 2022-11-13 15:34:29 +05:00
merdan 4f34c8c080 invoice fx 2022-11-13 15:33:11 +05:00
merdan 78c988052d invoice fx 2022-11-13 15:30:39 +05:00
merdan 6bfa344381 invoice fx 2022-11-13 15:09:00 +05:00
merdan e4f6272a7e invoice fx 2022-11-13 14:47:49 +05:00
merdan ce5bd8dd1c invoice fx 2022-11-11 19:25:33 +05:00
merdan 235e36a76c invoice fx 2022-11-11 19:07:40 +05:00
merdan dfd9137205 invoice fx 2022-11-05 12:17:00 +05:00
merdan e809fb05fd invoice fx 2022-11-05 12:16:19 +05:00
merdan 5c103966fa invoice fx 2022-11-05 12:14:49 +05:00
merdan 4d811c802b invoice fx 2022-11-05 12:10:43 +05:00
merdan c25a576ac5 invoice fx 2022-11-05 12:09:24 +05:00
merdan d886bac338 invoice fx 2022-11-05 12:05:18 +05:00
merdan ea742cba6d invoice fx 2022-11-05 11:27:15 +05:00
merdan e2d1833d6b invoice fx 2022-11-04 17:19:12 +05:00
merdan 69bdd3397d filter options 2022-11-04 17:16:44 +05:00
merdan d197eb9867 filter options 2022-11-04 16:16:36 +05:00
merdan 36a62c0d70 filter options 2022-11-04 15:50:25 +05:00
merdan cc6cf1ac94 filter options 2022-11-04 15:30:39 +05:00
merdan 3e2ffdf4d6 filter options 2022-11-04 15:19:51 +05:00
merdan fa3be435ff filter options 2022-11-04 15:18:21 +05:00
merdan 976b110c42 filter options 2022-11-04 15:08:33 +05:00
merdan 19d3e647b3 filter options 2022-11-04 14:56:52 +05:00
merdan 9dc63ca5d9 filter options 2022-11-04 14:54:23 +05:00
merdan e4b3031354 filter options 2022-11-02 16:24:26 +05:00
merdan 6c50b24554 filter options 2022-11-02 13:53:40 +05:00
merdan 785cc33f31 filter options 2022-11-02 11:29:18 +05:00
merdan 0fd4bfb670 filter options 2022-11-02 11:13:30 +05:00
merdan 8344a123f8 filter options 2022-11-01 15:55:00 +05:00
merdan e377c64e43 filter options 2022-11-01 15:15:39 +05:00
merdan 2c38d18522 filter options 2022-11-01 14:44:07 +05:00
merdan c578b03d23 filter options 2022-11-01 14:26:08 +05:00
merdan eb7f465913 filter options 2022-11-01 14:19:03 +05:00
merdan bdec2dedd4 filter options 2022-11-01 14:09:57 +05:00
merdan 511d69367f colorvariant size variant changes 2022-10-15 15:44:15 +05:00
merdan 5ae22decdd colorvariant size variant changes 2022-10-15 15:27:03 +05:00
merdan 0e71aee1f1 colorvariant size variant changes 2022-10-14 17:06:19 +05:00
merdan d38625c74c colorvariant size variant changes 2022-10-14 11:32:28 +05:00
merdan 9ed5f1f75d colorvariant size variant changes 2022-10-13 15:44:14 +05:00
merdan 5a127be54c colorvariant size variant changes 2022-10-13 15:21:03 +05:00
merdan 5d59cf5d52 colorvariant size variant changes 2022-10-13 15:16:34 +05:00
merdan ab345dd15b colorvariant size variant changes 2022-10-11 12:26:34 +05:00
merdan bc4c69727f çategory searç 2022-10-08 17:24:19 +05:00
merdan 4db7ae8345 çategory searç 2022-10-08 17:16:45 +05:00
merdan 26df5dd8d1 çategory searç 2022-09-30 12:56:55 +05:00
merdan 59e3289532 seach test 2022-09-29 19:37:49 +05:00
merdan dab2fbc760 seach test 2022-09-29 19:21:22 +05:00
merdan e8cc285fa2 sources api 2022-09-29 19:18:29 +05:00
merdan 40fe48d1a3 sources api 2022-09-29 19:13:48 +05:00
merdan ff196eb5cd sources api 2022-09-29 19:12:27 +05:00
merdan 7bea612e41 sources api 2022-09-29 19:08:03 +05:00
merdan 1c090d9293 sources api 2022-09-29 18:55:51 +05:00
merdan f87c68fbcf sources api 2022-09-29 18:20:02 +05:00
merdan 7c733df020 sources api 2022-09-29 18:18:13 +05:00
merdan 2cd62243fa sources api 2022-09-29 18:15:57 +05:00
merdan 868602b580 sources api 2022-09-29 18:09:44 +05:00
merdan 0516a4e4d3 sources api 2022-09-29 18:00:31 +05:00
merdan 3f973daa2e sources api 2022-09-29 17:56:06 +05:00
merdan 6e62cccfae sources api 2022-09-29 17:53:24 +05:00
merdan bf72fa9f31 sources api 2022-09-29 17:50:40 +05:00
merdan 4cae1be1a2 sources api 2022-09-29 17:47:03 +05:00
merdan afe4f858b8 sources api 2022-09-29 17:41:14 +05:00
merdan a504746c0f sources api 2022-09-27 19:54:31 +05:00
merdan 00a3b5809c sources api 2022-09-27 19:53:10 +05:00
merdan 7393fb609f sources api 2022-09-27 19:49:11 +05:00
merdan b7a2dc52e1 sources api 2022-09-27 17:30:06 +05:00
merdan e1de6887a3 sources api 2022-09-27 16:53:08 +05:00
merdan a2e0ec42a5 sources api 2022-09-27 16:52:21 +05:00
merdan 48c74a41e0 sources api 2022-09-27 16:50:57 +05:00
merdan eb83b9f586 sources api 2022-09-27 15:11:11 +05:00
merdan 204c02d316 sources api 2022-09-27 15:08:36 +05:00
merdan 8b0581d7f8 filter lang 2022-09-27 15:02:47 +05:00
merdan 6e04f05e2f filter lang 2022-09-27 15:01:11 +05:00
merdan 30dd6c109c admin menu filter and seller 2022-09-27 14:57:02 +05:00
merdan bd3e0d5b4d admin menu filter and seller 2022-09-27 14:45:55 +05:00
merdan 6d3e9bf0ed admin menu filter and seller 2022-09-27 14:44:10 +05:00
merdan 91b4cc0ca3 admin menu filter and seller 2022-09-27 14:41:47 +05:00
merdan 7aa355b594 admin menu filter and seller 2022-09-27 14:37:11 +05:00
merdan b3d3d6ff9a admin menu filter and seller 2022-09-27 14:33:49 +05:00
merdan 062099e6f2 admin menu filter and seller 2022-09-27 14:32:24 +05:00
merdan 2e1a607b6f admin menu filter and seller 2022-09-27 14:30:05 +05:00
merdan 1fcc2e0572 admin menu filter and seller 2022-09-27 14:26:15 +05:00
merdan 8f9a5687ed admin menu filter and seller 2022-09-27 14:23:17 +05:00
merdan 0a92c9cf6d admin menu filter and seller 2022-09-25 21:06:53 +05:00
merdan de321d9b5a admin menu filter and seller 2022-09-25 20:56:43 +05:00
merdan bc69acaec7 menu brand links test ready 2022-09-23 17:48:10 +05:00
merdan 9a2eacac5c menu brand links test ready 2022-09-23 17:47:03 +05:00
merdan 4f22f110cd menu brand links test ready 2022-09-23 17:45:24 +05:00
merdan e4ea020645 menu brand links test ready 2022-09-23 17:35:00 +05:00
merdan ffd42780c0 menu brand links test ready 2022-09-23 17:30:13 +05:00
merdan 63499f7a35 menu brand links test ready 2022-09-23 17:28:41 +05:00
merdan f575db156f menu brand links test ready 2022-09-23 17:25:07 +05:00
merdan 35f91d0448 menu brand links test ready 2022-09-23 17:15:41 +05:00
merdan 2b6b27318b menu brand links test ready 2022-09-23 17:07:24 +05:00
merdan 29621dc85f menu brand links test ready 2022-09-23 17:05:39 +05:00
merdan 2f9aee82fb menu brand links test ready 2022-09-23 17:04:13 +05:00
merdan 16d2011359 menu brand links test ready 2022-09-23 16:49:46 +05:00
merdan 2ed229e2c4 menu brand links test ready 2022-09-23 16:41:31 +05:00
merdan 555a214aa8 menu brand links test ready 2022-09-23 16:40:26 +05:00
merdan 8b116f70e0 menu brand links test ready 2022-09-23 16:38:51 +05:00
merdan c0496e65ec menu brand links test ready 2022-09-23 16:38:09 +05:00
merdan 037113d968 menu brand links test ready 2022-09-23 16:37:20 +05:00
merdan 317a24efd5 menu brand links test ready 2022-09-23 16:36:20 +05:00
merdan b29f44ac0a menu brand links test ready 2022-09-23 16:35:25 +05:00
merdan 3b9b0515fc menu brand links test ready 2022-09-23 16:34:14 +05:00
merdan 2d951b9d26 menu brand links test ready 2022-09-23 16:27:39 +05:00
merdan e36259c7ed menu brand links test ready 2022-09-23 16:02:56 +05:00
merdan 511dbd24f7 menu brand links test ready 2022-09-23 16:01:45 +05:00
merdan aaff314fb3 menu brand links test ready 2022-09-23 16:00:12 +05:00
merdan a7ad32190d menu Controller 2022-09-23 15:04:07 +05:00
merdan d1118300a8 menu Controller 2022-09-23 14:52:22 +05:00
merdan f0474e5784 menu Controller 2022-09-23 14:49:42 +05:00
merdan 604c710092 menu Controller 2022-09-23 14:36:31 +05:00
merdan b32c538b29 menu Controller 2022-09-23 14:33:55 +05:00
merdan 481bcbdea3 menu Controller 2022-09-23 14:23:10 +05:00
merdan 31cd5c7e9e menu Controller 2022-09-23 14:20:33 +05:00
merdan e7ed843b48 menu Controller 2022-09-22 13:51:17 +05:00
merdan 0602a88727 menu Controller 2022-09-22 13:46:31 +05:00
merdan c9126ec5cd menu Controller 2022-09-22 13:44:53 +05:00
merdan a176efe6e5 menu Controller 2022-09-22 13:37:07 +05:00
merdan b80dab368f menu Controller 2022-09-22 13:32:35 +05:00
merdan b3268d162e menu Controller 2022-09-22 13:31:38 +05:00
merdan 31e61f0417 menu Controller 2022-09-22 13:28:53 +05:00
merdan acaaf6f873 menu Controller 2022-09-22 13:21:31 +05:00
merdan 47a7c80a32 menu Controller 2022-09-22 13:20:35 +05:00
merdan 8b88036727 menu Controller 2022-09-22 13:16:32 +05:00
merdan cd5052d7b4 menu Controller 2022-09-21 18:50:30 +05:00
merdan 9756ebebed menu Controller 2022-09-21 17:32:41 +05:00
merdan 2354c31a54 menu Controller 2022-09-21 17:20:54 +05:00
merdan bfb8a8fa80 menu Controller 2022-09-21 17:20:02 +05:00
merdan 6d66f245ad menu Controller 2022-09-21 17:18:29 +05:00
merdan 0e5b272256 menu Controller 2022-09-21 17:11:32 +05:00
merdan 56c03ac660 menu Controller 2022-09-21 17:07:21 +05:00
merdan 59ebe6b804 menu Controller 2022-09-21 17:04:34 +05:00
merdan e7d7ad32ee menu Controller 2022-09-21 15:43:19 +05:00
merdan c4e61396d1 menu Controller 2022-09-21 15:41:14 +05:00
merdan ddd5dc432f menu Controller 2022-09-21 15:35:49 +05:00
merdan c311049359 menu Controller 2022-09-21 15:30:28 +05:00
merdan 7e8a1b5f55 menu Controller 2022-09-21 15:28:33 +05:00
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 572222e988 menu Controller 2022-09-20 16:51:27 +05:00
merdan a673f83a67 menu Controller 2022-09-20 16:50:11 +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
merdan bcac3e967d menu Controller 2022-09-07 11:43:34 +05:00
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
merdan e85c388ff6 flush scout products 2022-09-06 16:51:56 +05:00
Abhishek Kathuria 80065121f7 Fixed issue 2022-09-06 15:58:16 +05:30
merdan 797d5dafc2 flush scout products 2022-09-05 17:03:32 +05:00
merdan c72a04d1c1 flush scout products 2022-09-05 16:26:18 +05:00
merdan 298950610c flush scout products 2022-09-05 16:21:29 +05:00
merdan 7ef14705c8 flush scout products 2022-09-05 16:18:09 +05:00
merdan 065cb1854f flush scout products 2022-09-05 16:03:26 +05:00
sanjeev d2d1128187 Pendening payment notification issue 2022-09-05 16:18:15 +05:30
merdan f85ce15e94 menus fx12 2022-09-05 14:42:49 +05:00
merdan 3e5dd50d45 menus fx8 2022-09-05 14:40:57 +05:00
merdan 37a3df8159 menus fx8 2022-09-05 14:38:06 +05:00
merdan 4bd184ebb0 menus fx8 2022-09-05 14:36:24 +05:00
merdan 4607f6779d menus fx7 2022-09-05 14:03:23 +05:00
merdan 015ac647ae menus fx5 2022-09-05 14:01:28 +05:00
sanjeev 1b719d741a velocity meta data update issue fixed #6687 2022-09-05 12:10:53 +05:30
merdan 6ad228c22f menus fx5 2022-09-03 18:26:40 +05:00
merdan 6214f3b28e menus fx4 2022-09-03 18:19:18 +05:00
merdan b34f375fc5 menus fx4 2022-09-03 18:16:56 +05:00
merdan e4218ac519 menus fx3 2022-09-03 18:12:01 +05:00
merdan 72ee95706b menus fx3 2022-09-03 18:10:47 +05:00
merdan 6eb242ca34 menus fx 2022-09-03 18:08:15 +05:00
merdan d5694f7208 menus start 2022-09-03 18:06:35 +05:00
merdan 3f18632efc menus start 2022-09-03 18:04:28 +05:00
merdan 7bb73ebef5 menus start 2022-09-03 18:02:41 +05:00
merdan 975a68f988 order total weight fx 2022-09-03 17:19:08 +05:00
merdan 206a7befe2 order total weight 2022-09-03 17:13:58 +05:00
merdan 34db696c08 order item count red 2022-09-03 17:02:26 +05:00
merdan a07f1f7170 order item count red 2022-09-03 16:58:30 +05:00
merdan 3c9bbbb392 menus & translations ready 2022-09-03 16:48:04 +05:00
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
merdan 4b447bf6c5 order item kilogram price 2022-09-03 15:37:17 +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 a518c1c783 wellknow ss 2022-09-01 15:15:15 +05:00
merdan e3a2cc3c12 wellknow ss 2022-09-01 15:10:22 +05:00
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