Merge branch 'develop' into 1.x
commit
2d2b843175
|
|
@ -106,8 +106,8 @@ class DealerOrderController extends AdminController
|
|||
}
|
||||
if ((
|
||||
$actions->row->isPending() //待确认
|
||||
|| $actions->row->isPay() //待付款
|
||||
|| $actions->row->isPaid() //待收款
|
||||
|| $actions->row->isPendinged() //待付款
|
||||
|| $actions->row->isPay()//待收款
|
||||
) && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
|
||||
$actions->append(new DealerOrderCancel());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue