mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mkm:b3dee9c1668dab193220874feed488416cd17e4f
Branches Tags
mkm:main
mkm:dev
mkm:mkm-patch-2
mkm:mkm-patch-1
mkm:update_warehouse_product
mkm:refund
mkm:batch
mkm:updateOrder
mkm:dev3
mkm:bb
mkm:aa
mkm:dev1
mkm:product
mkm:dev_one
mkm:rose
mkm:1.1.4
mkm:1.1.3
mkm:1.1.2
mkm:1.1.1
mkm:1.10.0
mkm:1.0.9
mkm:1.0.8
mkm:1.0.7
mkm:1.0.6
mkm:1.0.5
mkm:1.0.4
mkm:1.0.3
mkm:1.0.2
mkm:1.0.1
mkm:1.0.0
..
compare: mkm:fb4d52807095ca1d8660643ed7cbeb2f55d0812e
Branches Tags
mkm:dev
mkm:main
mkm:mkm-patch-2
mkm:mkm-patch-1
mkm:update_warehouse_product
mkm:refund
mkm:batch
mkm:updateOrder
mkm:dev3
mkm:bb
mkm:aa
mkm:dev1
mkm:product
mkm:dev_one
mkm:rose
mkm:1.1.4
mkm:1.1.3
mkm:1.1.2
mkm:1.1.1
mkm:1.10.0
mkm:1.0.9
mkm:1.0.8
mkm:1.0.7
mkm:1.0.6
mkm:1.0.5
mkm:1.0.4
mkm:1.0.3
mkm:1.0.2
mkm:1.0.1
mkm:1.0.0

No commits in common. "b3dee9c1668dab193220874feed488416cd17e4f" and "fb4d52807095ca1d8660643ed7cbeb2f55d0812e" have entirely different histories.
b3dee9c166 ... fb4d528070

1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
app/admin/lists/store_product/StoreProductLists.php
View File

@ -74,7 +74,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
$class_all = $this->request->get('class_all'); $class_all = $this->request->get('class_all');
if ($class_all) { if ($class_all) {
if (count($class_all) == 1) { if (count($class_all) == 1) {
$query->where('top_cate_id', $class_all[0]); $query->where('top_category_id', $class_all[0]);
} elseif (count($class_all) == 2) { } elseif (count($class_all) == 2) {
$query->where(function ($query) use ($class_all) { $query->where(function ($query) use ($class_all) {
$query->where('two_cate_id', $class_all[1])->whereOr('cate_id', $class_all[1]); $query->where('two_cate_id', $class_all[1])->whereOr('cate_id', $class_all[1]);