From b355cc17c90727ee41f166f4bb5996f483048a71 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 7 Aug 2018 11:59:09 +0300 Subject: [PATCH] refs #434 dateformat files combining. --- app/Http/Kernel.php | 5 +- app/Http/Middleware/DateFormat.php | 60 ++++++++++++++++++++ app/Http/Middleware/DateFormatBilledAt.php | 29 ---------- app/Http/Middleware/DateFormatDueAt.php | 29 ---------- app/Http/Middleware/DateFormatInvoicedAt.php | 29 ---------- app/Http/Middleware/DateFormatPaidAt.php | 29 ---------- routes/web.php | 12 ++-- 7 files changed, 67 insertions(+), 126 deletions(-) create mode 100644 app/Http/Middleware/DateFormat.php delete mode 100644 app/Http/Middleware/DateFormatBilledAt.php delete mode 100644 app/Http/Middleware/DateFormatDueAt.php delete mode 100644 app/Http/Middleware/DateFormatInvoicedAt.php delete mode 100644 app/Http/Middleware/DateFormatPaidAt.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 591a4db20..2d8a9e4ba 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -91,10 +91,7 @@ class Kernel extends HttpKernel 'install' => \App\Http\Middleware\CanInstall::class, 'company.settings' => \App\Http\Middleware\LoadSettings::class, 'company.currencies' => \App\Http\Middleware\LoadCurrencies::class, - 'dateformat.paid_at' => \App\Http\Middleware\DateFormatPaidAt::class, - 'dateformat.due_at' => \App\Http\Middleware\DateFormatDueAt::class, - 'dateformat.billed_at' => \App\Http\Middleware\DateFormatBilledAt::class, - 'dateformat.invoiced_at' => \App\Http\Middleware\DateFormatInvoicedAt::class, + 'dateformat' => \App\Http\Middleware\DateFormat::class, 'money.amount' => \App\Http\Middleware\MoneyAmount::class, 'money.price' => \App\Http\Middleware\MoneyPrice::class, 'money.total' => \App\Http\Middleware\MoneyTax::class, diff --git a/app/Http/Middleware/DateFormat.php b/app/Http/Middleware/DateFormat.php new file mode 100644 index 000000000..15c5c2d9a --- /dev/null +++ b/app/Http/Middleware/DateFormat.php @@ -0,0 +1,60 @@ +method() == 'POST' || $request->method() == 'PATCH') { + $paid_at = $request->get('paid_at'); + $due_at = $request->get('due_at'); + $billed_at = $request->get('billed_at'); + $invoiced_at = $request->get('invoiced_at'); + + if (!empty($paid_at)) { + $paid_at = Date::parse($paid_at)->format('Y-m-d'); + + $date_time = $paid_at . ' ' . Date::now()->format('H:i:s'); + + $request->request->set('paid_at', $date_time); + } + + if (!empty($due_at)) { + $due_at = Date::parse($due_at)->format('Y-m-d'); + + $date_time = $due_at . ' ' . Date::now()->format('H:i:s'); + + $request->request->set('due_at', $date_time); + } + + if (!empty($billed_at)) { + $billed_at = Date::parse($billed_at)->format('Y-m-d'); + + $date_time = $billed_at . ' ' . Date::now()->format('H:i:s'); + + $request->request->set('billed_at', $date_time); + } + + if (!empty($invoiced_at)) { + $invoiced_at = Date::parse($invoiced_at)->format('Y-m-d'); + + $date_time = $invoiced_at . ' ' . Date::now()->format('H:i:s'); + + $request->request->set('invoiced_at', $date_time); + } + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/DateFormatBilledAt.php b/app/Http/Middleware/DateFormatBilledAt.php deleted file mode 100644 index d85efed4f..000000000 --- a/app/Http/Middleware/DateFormatBilledAt.php +++ /dev/null @@ -1,29 +0,0 @@ -method() == 'POST' || $request->method() == 'PATCH') { - $date = Date::parse($request->get('billed_at'))->format('Y-m-d'); - - $date_time = $date . ' ' . Date::now()->format('H:i:s'); - - $request->request->set('billed_at', $date_time); - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/DateFormatDueAt.php b/app/Http/Middleware/DateFormatDueAt.php deleted file mode 100644 index c90ba5f78..000000000 --- a/app/Http/Middleware/DateFormatDueAt.php +++ /dev/null @@ -1,29 +0,0 @@ -method() == 'POST' || $request->method() == 'PATCH') { - $date = Date::parse($request->get('due_at'))->format('Y-m-d'); - - $date_time = $date . ' ' . Date::now()->format('H:i:s'); - - $request->request->set('due_at', $date_time); - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/DateFormatInvoicedAt.php b/app/Http/Middleware/DateFormatInvoicedAt.php deleted file mode 100644 index 6bc08d653..000000000 --- a/app/Http/Middleware/DateFormatInvoicedAt.php +++ /dev/null @@ -1,29 +0,0 @@ -method() == 'POST' || $request->method() == 'PATCH') { - $date = Date::parse($request->get('invoiced_at'))->format('Y-m-d'); - - $date_time = $date . ' ' . Date::now()->format('H:i:s'); - - $request->request->set('invoiced_at', $date_time); - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/DateFormatPaidAt.php b/app/Http/Middleware/DateFormatPaidAt.php deleted file mode 100644 index 8b8e59fe1..000000000 --- a/app/Http/Middleware/DateFormatPaidAt.php +++ /dev/null @@ -1,29 +0,0 @@ -method() == 'POST' || $request->method() == 'PATCH') { - $date = Date::parse($request->get('paid_at'))->format('Y-m-d'); - - $date_time = $date . ' ' . Date::now()->format('H:i:s'); - - $request->request->set('paid_at', $date_time); - } - - return $next($request); - } -} diff --git a/routes/web.php b/routes/web.php index d3643d7ef..a22ce34c9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -53,15 +53,15 @@ Route::group(['middleware' => 'language'], function () { Route::get('invoices/{invoice}/print', 'Incomes\Invoices@printInvoice'); Route::get('invoices/{invoice}/pdf', 'Incomes\Invoices@pdfInvoice'); Route::get('invoices/{invoice}/duplicate', 'Incomes\Invoices@duplicate'); - Route::post('invoices/payment', 'Incomes\Invoices@payment')->middleware(['dateformat.paid_at', 'money.amount'])->name('invoice.payment'); + Route::post('invoices/payment', 'Incomes\Invoices@payment')->middleware(['dateformat', 'money.amount'])->name('invoice.payment'); Route::delete('invoices/payment/{payment}', 'Incomes\Invoices@paymentDestroy'); Route::post('invoices/import', 'Incomes\Invoices@import')->name('invoices.import'); Route::get('invoices/export', 'Incomes\Invoices@export')->name('invoices.export'); - Route::resource('invoices', 'Incomes\Invoices', ['middleware' => ['dateformat.invoiced_at', 'dateformat.due_at']]); + Route::resource('invoices', 'Incomes\Invoices', ['middleware' => ['dateformat']]); Route::get('revenues/{revenue}/duplicate', 'Incomes\Revenues@duplicate'); Route::post('revenues/import', 'Incomes\Revenues@import')->name('revenues.import'); Route::get('revenues/export', 'Incomes\Revenues@export')->name('revenues.export'); - Route::resource('revenues', 'Incomes\Revenues', ['middleware' => ['dateformat.paid_at', 'money.amount']]); + Route::resource('revenues', 'Incomes\Revenues', ['middleware' => ['dateformat', 'money.amount']]); Route::get('customers/currency', 'Incomes\Customers@currency'); Route::get('customers/{customer}/duplicate', 'Incomes\Customers@duplicate'); Route::post('customers/customer', 'Incomes\Customers@customer'); @@ -78,15 +78,15 @@ Route::group(['middleware' => 'language'], function () { Route::get('bills/{bill}/print', 'Expenses\Bills@printBill'); Route::get('bills/{bill}/pdf', 'Expenses\Bills@pdfBill'); Route::get('bills/{bill}/duplicate', 'Expenses\Bills@duplicate'); - Route::post('bills/payment', 'Expenses\Bills@payment')->middleware(['dateformat.paid_at', 'money.amount'])->name('bill.payment'); + Route::post('bills/payment', 'Expenses\Bills@payment')->middleware(['dateformat', 'money.amount'])->name('bill.payment'); Route::delete('bills/payment/{payment}', 'Expenses\Bills@paymentDestroy'); Route::post('bills/import', 'Expenses\Bills@import')->name('bills.import'); Route::get('bills/export', 'Expenses\Bills@export')->name('bills.export'); - Route::resource('bills', 'Expenses\Bills', ['middleware' => ['dateformat.billed_at', 'dateformat.due_at', 'money.price', 'money.tax', 'money.total']]); + Route::resource('bills', 'Expenses\Bills', ['middleware' => ['dateformat', 'money.price', 'money.tax', 'money.total']]); Route::get('payments/{payment}/duplicate', 'Expenses\Payments@duplicate'); Route::post('payments/import', 'Expenses\Payments@import')->name('payments.import'); Route::get('payments/export', 'Expenses\Payments@export')->name('payments.export'); - Route::resource('payments', 'Expenses\Payments', ['middleware' => ['dateformat.paid_at', 'money.amount']]); + Route::resource('payments', 'Expenses\Payments', ['middleware' => ['dateformat', 'money.amount']]); Route::get('vendors/currency', 'Expenses\Vendors@currency'); Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate'); Route::post('vendors/vendor', 'Expenses\Vendors@vendor');