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

Compare commits

base: mkm:848dbf2c805c81a921c62b113ea9634e7341a0d3
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:58b70c53f870d308b365722f9367ad185eb6c002
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. "848dbf2c805c81a921c62b113ea9634e7341a0d3" and "58b70c53f870d308b365722f9367ad185eb6c002" have entirely different histories.
848dbf2c80 ... 58b70c53f8

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

8
app/admin/logic/store_product_price/StoreProductPriceLogic.php
View File

@ -128,14 +128,14 @@ class StoreProductPriceLogic extends BaseLogic
'purchase' => $find['purchase'], 'purchase' => $find['purchase'],
'cost' => $find['cost'], 'cost' => $find['cost'],
'vip_price' => $find['vip_price'], 'vip_price' => $find['vip_price'],
'price' => $find['price'], 'price' => $find['vip_price'],
'ot_price' => $find['price'] 'ot_price' => $find['price']
]); ]);
StoreBranchProduct::where('product_id', $find['product_id'])->update([ StoreBranchProduct::where('product_id', $find['product_id'])->update([
'purchase' => $find['purchase'], 'purchase' => $find['purchase'],
'cost' => $find['cost'], 'cost' => $find['cost'],
'vip_price' => $find['vip_price'], 'vip_price' => $find['vip_price'],
'price' => $find['price'], 'price' => $find['vip_price'],
'ot_price' => $find['price'] 'ot_price' => $find['price']
]); ]);
@ -209,14 +209,14 @@ class StoreProductPriceLogic extends BaseLogic
'purchase' => $find['purchase'] ?? 0, 'purchase' => $find['purchase'] ?? 0,
'cost' => $find['cost'] ?? 0, 'cost' => $find['cost'] ?? 0,
'vip_price' => $find['vip_price'] ?? 0, 'vip_price' => $find['vip_price'] ?? 0,
'price' => $find['price'] ?? 0, 'price' => $find['vip_price'] ?? 0,
'ot_price' => $find['price'] ?? 0, 'ot_price' => $find['price'] ?? 0,
]); ]);
StoreBranchProduct::where('product_id', $find['product_id'])->update([ StoreBranchProduct::where('product_id', $find['product_id'])->update([
'purchase' => $find['purchase'] ?? 0, 'purchase' => $find['purchase'] ?? 0,
'cost' => $find['cost'] ?? 0, 'cost' => $find['cost'] ?? 0,
'vip_price' => $find['vip_price'] ?? 0, 'vip_price' => $find['vip_price'] ?? 0,
'price' => $find['price'] ?? 0, 'price' => $find['vip_price'] ?? 0,
'ot_price' => $find['price'] ?? 0, 'ot_price' => $find['price'] ?? 0,
]); ]);
} }