Commit Graph

11871 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
Jitendra Singh 8fa224bb9b
Merge pull request #6728 from papnoisanjeev/category-slug-local-based
category slug update for requested locale #6725
2022-09-19 17:00:28 +05:30
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
Jitendra Singh 21f2d81862
Merge pull request #6720 from papnoisanjeev/sale-icon-config-product-for-spacial-price
Special price option added product  if spacial price exist for configurable product. #6699
2022-09-16 19:03:17 +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
Jitendra Singh f129207348
Merge pull request #6721 from Sanjaybhattwebkul/changeLog-updated-v1.4.5
ChangeLog-updated V1.4.5
2022-09-15 19:09:13 +05:30
Sanjaybhattwebkul 909770b4a6 version-updated 2022-09-15 18:39:34 +05:30
Sanjaybhattwebkul 3636b49bb6 ChangeLog-updated V1.2.5 2022-09-15 18:36:09 +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 Singh 5b068e47db
Merge pull request #6715 from jitendra-webkul/master
Optimized performance and code
2022-09-14 17:59:40 +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 Singh f54172734e
Merge pull request #6714 from jitendra-webkul/master
Optimized getting category filterable attributes
2022-09-14 17:16: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 Singh edfd0932e3
Merge pull request #6713 from jitendra-webkul/master
Optimized
2022-09-14 17:05:43 +05:30
jitendra c5fabf9c2a Merge with master 2022-09-14 17:04:28 +05:30
Jitendra Singh 96ac7e832f
Merge pull request #6712 from jitendra-webkul/master
Issue #6422 fixed
2022-09-14 16:57:46 +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
Jitendra Singh d6d137fdd9
Merge pull request #6710 from papnoisanjeev/status-filter-enhancement
Showing Active/Inactive instead of 0/1 in case status filter applied.  #6705
2022-09-13 15:21:39 +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 ce26e4835e
Merge pull request #6677 from devansh-webkul/trust-hosts-class-added
Trust Hosts Class Middleware Added
2022-09-10 13:50:11 +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