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
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);
}
}