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

refs #273 change solution system

Browse Source
This commit is contained in:
cuneytsenturk 2018-07-11 14:05:42 +03:00
parent da091525b0
commit 5503e546c1
14 changed files with 99 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Banking/Transfers.php
View File

@ -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

5
app/Http/Kernel.php
View File

@ -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,
];
}

42
app/Http/Middleware/BillDateFormat.php
View File

@ -1,42 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class BillDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$uri = $request->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);
}
}

42
app/Http/Middleware/InvoiceDateFormat.php
View File

@ -1,42 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class InvoiceDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$uri = $request->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);
}
}

36
app/Http/Middleware/PaymentDateFormat.php
View File

@ -1,36 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class PaymentDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$method = Request::method();
if (($method == 'POST') || ($method == 'PATCH')) {
$time = Date::now()->format('H:i:s');
$request['paid_at'] = $request['paid_at'] . ' ' . $time;
}
return $next($request);
}
}

36
app/Http/Middleware/RevenueDateFormat.php
View File

@ -1,36 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class RevenueDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$method = Request::method();
if (($method == 'POST') || ($method == 'PATCH')) {
$time = Date::now()->format('H:i:s');
$request['paid_at'] = $request['paid_at'] . ' ' . $time;
}
return $next($request);
}
}

36
app/Http/Middleware/TransferDateFormat.php
View File

@ -1,36 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Date;
use Illuminate\Support\Facades\Request;
class TransferDateFormat
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$company_id = session('company_id');
if (empty($company_id)) {
return $next($request);
}
$method = Request::method();
if (($method == 'POST') || ($method == 'PATCH')) {
$time = Date::now()->format('H:i:s');
$request['transferred_at'] = $request['transferred_at'] . ' ' . $time;
}
return $next($request);
}
}

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

@ -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.
*

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

@ -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.
*

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

@ -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.
*

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

@ -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.
*

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

@ -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.
*

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

@ -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');

14
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')->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 () {