pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整后台bug

release
vine_liutk 2022-01-21 10:53:25 +08:00
parent 758972213b
commit ac751ecb3f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/Admin/Forms/DealerOrderAllocate.php → app/Admin/Actions/Grid/DealerOrderAllocate.php
View File

6
app/Admin/Controllers/DealerEarningController.php
View File

@ -81,9 +81,9 @@ class DealerEarningController extends AdminController
$grid->column('created_at')->sortable(); $grid->column('created_at')->sortable();
$grid->actions(function (Grid\Displayers\Actions $actions) { $grid->actions(function (Grid\Displayers\Actions $actions) {
//如果不是渠道补贴添加详情显示 //如果不是渠道补贴添加详情显示
if ($actions->row->earningable_type != (new DealerChannelSubsidyLog())->getMorphClass()) { // if ($actions->row->earningable_type != (new DealerChannelSubsidyLog())->getMorphClass()) {
$actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('dealer_earnings.show', ['dealer_earning'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 &nbsp;&nbsp;</a>'); $actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('dealer_earnings.show', ['dealer_earning'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 &nbsp;&nbsp;</a>');
} // }
}); });
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {

13
app/Admin/Controllers/DealerOrderController.php
View File

@ -74,11 +74,14 @@ class DealerOrderController extends AdminController
if (!(empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Pending && Admin::user()->can('dcat.admin.dealer_orders.allocate')) { if (!(empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Pending && Admin::user()->can('dcat.admin.dealer_orders.allocate')) {
$actions->append(new DealerOrderAllocate()); $actions->append(new DealerOrderAllocate());
} }
if ($actions->row->status == DealerOrderStatus::Confirming && Admin::user()->can('dcat.admin.dealer_orders.paid')) {
$actions->append(new DealerOrderPaid()); if ((empty($actions->row->consignor) || $actions->row->consignor_id == 1)) {
} if ($actions->row->status == DealerOrderStatus::Confirming && Admin::user()->can('dcat.admin.dealer_orders.paid')) {
if ((empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealer_orders.shipping')) { $actions->append(new DealerOrderPaid());
$actions->append(new DealerOrderShipping()); }
if ($actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealer_orders.shipping')) {
$actions->append(new DealerOrderShipping());
}
} }
}); });
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {