Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
554ca5fa6d
@ -692,10 +692,6 @@ class BeforehandOrderLogic extends BaseLogic
|
|||||||
{
|
{
|
||||||
$order_info = new OrderInfo();
|
$order_info = new OrderInfo();
|
||||||
$order = BeforehandOrder::where('id', $params['id'])->find();
|
$order = BeforehandOrder::where('id', $params['id'])->find();
|
||||||
if ($order['order_type'] == 7 && isset($params['print']) && $params['print'] == 1) {
|
|
||||||
$order->is_buying = 1;
|
|
||||||
$order->save();
|
|
||||||
}
|
|
||||||
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
|
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
|
||||||
$data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) {
|
$data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) {
|
||||||
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find();
|
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user