Merge pull request 'dev' (#33) from dev into main

Reviewed-on: #33
This commit is contained in:
mkm 2024-07-06 10:08:14 +08:00
commit 0e91c0cc98

View File

@ -55,7 +55,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
return $item; return $item;
}) })
->toArray(); ->toArray();
$off_activity = Config::where('name', 'off_activity')->value('value'); // $off_activity = Config::where('name', 'off_activity')->value('value');
$off_activity = 0;
$this->off_activity = $off_activity; $this->off_activity = $off_activity;
foreach ($list as $key => &$item) { foreach ($list as $key => &$item) {
$find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']]) $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']])