shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #import date date time issue solved.

Browse Source
This commit is contained in:
cuneytsenturk 2018-08-06 18:41:58 +03:00
parent dbc4bd7608
commit 56a046b866
19 changed files with 193 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Kernel.php
View File

@ -91,5 +91,9 @@ 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,
];
}

29
app/Http/Middleware/DateFormatBilledAt.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
class DateFormatBilledAt
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($request->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);
}
}

29
app/Http/Middleware/DateFormatDueAt.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
class DateFormatDueAt
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($request->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);
}
}

29
app/Http/Middleware/DateFormatInvoicedAt.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
class DateFormatInvoicedAt
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($request->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);
}
}

29
app/Http/Middleware/DateFormatPaidAt.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
class DateFormatPaidAt
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($request->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);
}
}

1
app/Http/Middleware/LoadCurrencies.php
View File

@ -26,5 +26,4 @@ class LoadCurrencies
return $next($request);
}
}

13
app/Http/Requests/Expense/Bill.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use Date;
class Bill extends Request
{
@ -47,4 +48,16 @@ class Bill extends Request
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
// Set date
$billed_at = Date::parse($this->request->get('billed_at'))->format('Y-m-d');
$due_at = Date::parse($this->request->get('due_at'))->format('Y-m-d');
$this->request->set('billed_at', $billed_at);
$this->request->set('due_at', $due_at);
}
}
}

10
app/Http/Requests/Expense/BillPayment.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use Date;
class BillPayment extends Request
{
@ -32,4 +33,13 @@ class BillPayment extends Request
'attachment' => 'mimes:' . setting('general.file_types', 'pdf,jpeg,jpg,png'),
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

10
app/Http/Requests/Expense/Payment.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use Date;
class Payment extends Request
{
@ -35,4 +36,13 @@ class Payment extends Request
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

13
app/Http/Requests/Income/Invoice.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use Date;
class Invoice extends Request
{
@ -47,4 +48,16 @@ class Invoice extends Request
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
// Set date
$invoiced_at = Date::parse($this->request->get('invoiced_at'))->format('Y-m-d');
$due_at = Date::parse($this->request->get('due_at'))->format('Y-m-d');
$this->request->set('invoiced_at', $invoiced_at);
$this->request->set('due_at', $due_at);
}
}
}

10
app/Http/Requests/Income/InvoicePayment.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use Date;
class InvoicePayment extends Request
{
@ -32,4 +33,13 @@ class InvoicePayment extends Request
'attachment' => 'mimes:jpeg,jpg,png,pdf',
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

10
app/Http/Requests/Income/Revenue.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use Date;
class Revenue extends Request
{
@ -35,4 +36,13 @@ class Revenue extends Request
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

22
app/Models/Expense/Bill.php
View File

@ -159,28 +159,6 @@ 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.
*

11
app/Models/Expense/BillPayment.php
View File

@ -86,17 +86,6 @@ 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.
*

11
app/Models/Expense/Payment.php
View File

@ -132,17 +132,6 @@ 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.
*

22
app/Models/Income/Invoice.php
View File

@ -161,28 +161,6 @@ 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.
*

11
app/Models/Income/InvoicePayment.php
View File

@ -86,17 +86,6 @@ 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.
*

11
app/Models/Income/Revenue.php
View File

@ -133,17 +133,6 @@ 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');

12
routes/web.php
View File

@ -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')->name('invoice.payment');
Route::post('invoices/payment', 'Incomes\Invoices@payment')->middleware(['dateformat.paid_at'])->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');
Route::resource('invoices', 'Incomes\Invoices', ['middleware' => ['dateformat.invoiced_at', 'dateformat.due_at']]);
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');
Route::resource('revenues', 'Incomes\Revenues', ['middleware' => ['dateformat.paid_at']]);
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')->name('bill.payment');
Route::post('bills/payment', 'Expenses\Bills@payment')->middleware(['dateformat.paid_at'])->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');
Route::resource('bills', 'Expenses\Bills', ['middleware' => ['dateformat.billed_at', 'dateformat.due_at']]);
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');
Route::resource('payments', 'Expenses\Payments', ['middleware' => ['dateformat.paid_at']]);
Route::get('vendors/currency', 'Expenses\Vendors@currency');
Route::get('vendors/{vendor}/duplicate', 'Expenses\Vendors@duplicate');
Route::post('vendors/vendor', 'Expenses\Vendors@vendor');