Update
parent
7d3aa6881f
commit
78b2c8ed5f
|
|
@ -22,7 +22,7 @@ class ManageSubsidyLogController extends Controller
|
||||||
|
|
||||||
$perPage = Paginator::resolvePerPage('per_page', 20, 50);
|
$perPage = Paginator::resolvePerPage('per_page', 20, 50);
|
||||||
|
|
||||||
$manageSubsidyLogs = DealerManageSubsidyLog::with(['product'])
|
$manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order'])
|
||||||
->when($isComplted, function ($query) {
|
->when($isComplted, function ($query) {
|
||||||
$tz = now();
|
$tz = now();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ class DealerManageSubsidyLogResource extends JsonResource
|
||||||
public function toArray($request)
|
public function toArray($request)
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'order' => OrderSimpleResource::make($this->whenLoaded('order')),
|
||||||
'product' => ProductSimpleResource::make($this->whenLoaded('product')),
|
'product' => ProductSimpleResource::make($this->whenLoaded('product')),
|
||||||
'sales_volume' => $this->sales_volume,
|
'sales_volume' => $this->sales_volume,
|
||||||
'total_amount' => $this->total_amount,
|
'total_amount' => $this->total_amount,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue