diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index 958aaee36..f3e3d3464 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -123,9 +123,9 @@ class Transfers extends Controller 'company_id' => $request['company_id'], 'account_id' => $request['from_account_id'], 'paid_at' => $request['transferred_at'], - 'amount' => $request['amount'], 'currency_code' => $payment_currency_code, 'currency_rate' => $currencies[$payment_currency_code], + 'amount' => $request['amount'], 'vendor_id' => 0, 'description' => $request['description'], 'category_id' => Category::transfer(), // Transfer Category ID @@ -153,9 +153,9 @@ class Transfers extends Controller 'company_id' => $request['company_id'], 'account_id' => $request['to_account_id'], 'paid_at' => $request['transferred_at'], - 'amount' => $amount, 'currency_code' => $revenue_currency_code, 'currency_rate' => $currencies[$revenue_currency_code], + 'amount' => $amount, 'customer_id' => 0, 'description' => $request['description'], 'category_id' => Category::transfer(), // Transfer Category ID @@ -229,9 +229,9 @@ class Transfers extends Controller 'company_id' => $request['company_id'], 'account_id' => $request['from_account_id'], 'paid_at' => $request['transferred_at'], - 'amount' => $request['amount'], 'currency_code' => $payment_currency_code, 'currency_rate' => $currencies[$payment_currency_code], + 'amount' => $request['amount'], 'vendor_id' => 0, 'description' => $request['description'], 'category_id' => Category::transfer(), // Transfer Category ID @@ -259,9 +259,9 @@ class Transfers extends Controller 'company_id' => $request['company_id'], 'account_id' => $request['to_account_id'], 'paid_at' => $request['transferred_at'], - 'amount' => $amount, 'currency_code' => $revenue_currency_code, 'currency_rate' => $currencies[$revenue_currency_code], + 'amount' => $amount, 'customer_id' => 0, 'description' => $request['description'], 'category_id' => Category::transfer(), // Transfer Category ID diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a5a177e71..bd958e4b6 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -91,10 +91,5 @@ class Kernel extends HttpKernel 'install' => \App\Http\Middleware\CanInstall::class, 'company.settings' => \App\Http\Middleware\LoadSettings::class, 'company.currencies' => \App\Http\Middleware\LoadCurrencies::class, - 'bill.dateformat' => \App\Http\Middleware\BillDateFormat::class, - 'invoice.dateformat' => \App\Http\Middleware\InvoiceDateFormat::class, - 'payment.dateformat' => \App\Http\Middleware\PaymentDateFormat::class, - 'revenue.dateformat' => \App\Http\Middleware\RevenueDateFormat::class, - 'transfer.dateformat' => \App\Http\Middleware\TransferDateFormat::class, ]; } diff --git a/app/Http/Middleware/BillDateFormat.php b/app/Http/Middleware/BillDateFormat.php deleted file mode 100644 index 959410ddf..000000000 --- a/app/Http/Middleware/BillDateFormat.php +++ /dev/null @@ -1,42 +0,0 @@ -path(); - $method = Request::method(); - - if (($method == 'POST') || ($method == 'PATCH')) { - $time = Date::now()->format('H:i:s'); - - if (basename($uri) == 'payment') { - $request['paid_at'] = $request['paid_at'] . ' ' . $time; - } else { - $request['billed_at'] = $request['billed_at'] . ' ' . $time; - $request['due_at'] = $request['due_at'] . ' ' . $time; - } - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/InvoiceDateFormat.php b/app/Http/Middleware/InvoiceDateFormat.php deleted file mode 100644 index 4f3e2b436..000000000 --- a/app/Http/Middleware/InvoiceDateFormat.php +++ /dev/null @@ -1,42 +0,0 @@ -path(); - $method = Request::method(); - - if (($method == 'POST') || ($method == 'PATCH')) { - $time = Date::now()->format('H:i:s'); - - if (basename($uri) == 'payment') { - $request['paid_at'] = $request['paid_at'] . ' ' . $time; - } else { - $request['invoiced_at'] = $request['invoiced_at'] . ' ' . $time; - $request['due_at'] = $request['due_at'] . ' ' . $time; - } - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/PaymentDateFormat.php b/app/Http/Middleware/PaymentDateFormat.php deleted file mode 100644 index 20ac67278..000000000 --- a/app/Http/Middleware/PaymentDateFormat.php +++ /dev/null @@ -1,36 +0,0 @@ -format('H:i:s'); - - $request['paid_at'] = $request['paid_at'] . ' ' . $time; - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/RevenueDateFormat.php b/app/Http/Middleware/RevenueDateFormat.php deleted file mode 100644 index ca63e4680..000000000 --- a/app/Http/Middleware/RevenueDateFormat.php +++ /dev/null @@ -1,36 +0,0 @@ -format('H:i:s'); - - $request['paid_at'] = $request['paid_at'] . ' ' . $time; - } - - return $next($request); - } -} diff --git a/app/Http/Middleware/TransferDateFormat.php b/app/Http/Middleware/TransferDateFormat.php deleted file mode 100644 index 4295942b6..000000000 --- a/app/Http/Middleware/TransferDateFormat.php +++ /dev/null @@ -1,36 +0,0 @@ -format('H:i:s'); - - $request['transferred_at'] = $request['transferred_at'] . ' ' . $time; - } - - return $next($request); - } -} diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index d17e2f3ee..98f90272d 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -158,6 +158,28 @@ class Bill extends Model $this->attributes['currency_rate'] = (double) $value; } + /** + * Convert billed_at to datetime. + * + * @param string $value + * @return void + */ + public function setBilledAtAttribute($value) + { + $this->attributes['billed_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + + /** + * Convert due_at to datetime. + * + * @param string $value + * @return void + */ + public function setDueAtAttribute($value) + { + $this->attributes['due_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + /** * Get the current balance. * diff --git a/app/Models/Expense/BillPayment.php b/app/Models/Expense/BillPayment.php index af4e85b96..6bdfab8af 100644 --- a/app/Models/Expense/BillPayment.php +++ b/app/Models/Expense/BillPayment.php @@ -85,6 +85,17 @@ class BillPayment extends Model return $query->sum('amount'); } + /** + * Convert paid_at to datetime. + * + * @param string $value + * @return void + */ + public function setPaidAtAttribute($value) + { + $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + /** * Get the current balance. * diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index 2b13dfda1..7d9371a0f 100644 --- a/app/Models/Expense/Payment.php +++ b/app/Models/Expense/Payment.php @@ -131,6 +131,17 @@ class Payment extends Model return $query->orderBy('paid_at', 'desc'); } + /** + * Convert paid_at to datetime. + * + * @param string $value + * @return void + */ + public function setPaidAtAttribute($value) + { + $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + /** * Get the current balance. * diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 576b1c1ca..1f92622b3 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -160,6 +160,28 @@ class Invoice extends Model $this->attributes['currency_rate'] = (double) $value; } + /** + * Convert invoiced_at to datetime. + * + * @param string $value + * @return void + */ + public function setInvoicedAtAttribute($value) + { + $this->attributes['invoiced_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + + /** + * Convert due_at to datetime. + * + * @param string $value + * @return void + */ + public function setDueAtAttribute($value) + { + $this->attributes['due_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + /** * Get the current balance. * diff --git a/app/Models/Income/InvoicePayment.php b/app/Models/Income/InvoicePayment.php index 6d0e42cb5..70124c2e8 100644 --- a/app/Models/Income/InvoicePayment.php +++ b/app/Models/Income/InvoicePayment.php @@ -85,6 +85,17 @@ class InvoicePayment extends Model return $query->sum('amount'); } + /** + * Convert paid_at to datetime. + * + * @param string $value + * @return void + */ + public function setPaidAtAttribute($value) + { + $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + /** * Get the current balance. * diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index e8156334c..acc28f0f5 100644 --- a/app/Models/Income/Revenue.php +++ b/app/Models/Income/Revenue.php @@ -132,6 +132,17 @@ class Revenue extends Model $this->attributes['currency_rate'] = (double) $value; } + /** + * Convert paid_at to datetime. + * + * @param string $value + * @return void + */ + public function setPaidAtAttribute($value) + { + $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s'); + } + public function scopeLatest($query) { return $query->orderBy('paid_at', 'desc'); diff --git a/routes/web.php b/routes/web.php index 3b3cd4cce..c2cba9697 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('invoice.dateformat')->name('invoice.payment'); + Route::post('invoices/payment', 'Incomes\Invoices@payment')->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' => ['invoice.dateformat']]); + Route::resource('invoices', 'Incomes\Invoices'); 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' => ['revenue.dateformat']]); + Route::resource('revenues', 'Incomes\Revenues'); 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('bill.dateformat')->name('bill.payment'); + Route::post('bills/payment', 'Expenses\Bills@payment')->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' => ['bill.dateformat']]); + Route::resource('bills', 'Expenses\Bills'); 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' => ['payment.dateformat']]); + Route::resource('payments', 'Expenses\Payments'); Route::get('vendors/currency', 'Expenses\Vendors@currency'); Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate'); Route::post('vendors/vendor', 'Expenses\Vendors@vendor'); @@ -103,7 +103,7 @@ Route::group(['middleware' => 'language'], function () { Route::get('accounts/{account}/disable', 'Banking\Accounts@disable')->name('accounts.disable'); Route::resource('accounts', 'Banking\Accounts'); Route::resource('transactions', 'Banking\Transactions'); - Route::resource('transfers', 'Banking\Transfers', ['middleware' => ['transfer.dateformat']]); + Route::resource('transfers', 'Banking\Transfers'); }); Route::group(['prefix' => 'reports'], function () {