diff --git a/app/Classes/Modules/Exports/Services/ExportsOrderSummaryByMarking.php b/app/Classes/Modules/Exports/Services/ExportsOrderSummaryByMarking.php index 9bdb6236..aafcdf3e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsOrderSummaryByMarking.php +++ b/app/Classes/Modules/Exports/Services/ExportsOrderSummaryByMarking.php @@ -59,8 +59,8 @@ class ExportsOrderSummaryByMarking implements FromCollection, WithHeadings, With $orders = Order::where('company_module_id', $company_module_id); if (isset($this->dateFrom) && isset($this->dateTo)) { - $from = date($this->dateFrom); - $to = date($this->dateTo); + $from = Carbon::createFromFormat('d-m-Y', $this->dateFrom); + $to = Carbon::createFromFormat('d-m-Y', $this->dateTo); $orders = $orders->whereBetween('created_at', [$from, $to]); } diff --git a/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php b/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php index eb7fa623..ebed8c45 100644 --- a/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php +++ b/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php @@ -32,7 +32,7 @@ class ExportCompanyModuleSummaryController public function exportOrderSummaryByMarking(Request $request) { $exportsOrderSummaryByMarking = new ExportsOrderSummaryByMarking($request); $customer_marking = $request->route('marking'); - $exportsOrderSummaryByMarking->setParameters($customer_marking, $request->route('dateFrom'), $request->route('dateTo')); + $exportsOrderSummaryByMarking->setParameters($customer_marking, $request->input('dateFrom'), $request->input('dateTo')); $response = $exportsOrderSummaryByMarking->download($customer_marking . '_order_summary.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); ob_end_clean(); return $response; diff --git a/routes/web.php b/routes/web.php index aaf0583e..887bd171 100644 --- a/routes/web.php +++ b/routes/web.php @@ -373,7 +373,7 @@ Route::get('/settings', function () { })->name('settings'); Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export'); -Route::get('/export-customer-order/{marking}/{dateFrom}/{dateTo}', 'Exports\ExportCompanyModuleSummaryController@exportorderSummaryByMarking')->name('customer.orderSummary.export'); +Route::get('/export-customer-order/{marking}', 'Exports\ExportCompanyModuleSummaryController@exportorderSummaryByMarking')->name('customer.orderSummary.export'); Route::get('/customer/summary/monthly', function () { $containers = Container::whereMonth('loading_date', '>=', ((float)Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)Carbon::now()->format('Y'))->get();