close #272 Enhancement: Newest Expenses - Payments: Recent payments not showing on the top
This commit is contained in:
@ -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,
|
||||
'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,
|
||||
];
|
||||
}
|
||||
|
42
app/Http/Middleware/BillDateFormat.php
Normal file
42
app/Http/Middleware/BillDateFormat.php
Normal file
@ -0,0 +1,42 @@
|
||||
<?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
Normal file
42
app/Http/Middleware/InvoiceDateFormat.php
Normal file
@ -0,0 +1,42 @@
|
||||
<?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
Normal file
36
app/Http/Middleware/PaymentDateFormat.php
Normal file
@ -0,0 +1,36 @@
|
||||
<?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
Normal file
36
app/Http/Middleware/RevenueDateFormat.php
Normal file
@ -0,0 +1,36 @@
|
||||
<?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);
|
||||
}
|
||||
}
|
30
app/Listeners/Updates/Version1211.php
Normal file
30
app/Listeners/Updates/Version1211.php
Normal file
@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Listeners\Updates;
|
||||
|
||||
use App\Events\UpdateFinished;
|
||||
use Artisan;
|
||||
|
||||
class Version1211 extends Listener
|
||||
{
|
||||
const ALIAS = 'core';
|
||||
|
||||
const VERSION = '1.2.11';
|
||||
|
||||
/**
|
||||
* Handle the event.
|
||||
*
|
||||
* @param $event
|
||||
* @return void
|
||||
*/
|
||||
public function handle(UpdateFinished $event)
|
||||
{
|
||||
// Check if should listen
|
||||
if (!$this->check($event)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Update database
|
||||
Artisan::call('migrate', ['--force' => true]);
|
||||
}
|
||||
}
|
@ -26,6 +26,8 @@ class EventServiceProvider extends ServiceProvider
|
||||
'App\Listeners\Updates\Version126',
|
||||
'App\Listeners\Updates\Version127',
|
||||
'App\Listeners\Updates\Version129',
|
||||
'App\Listeners\Updates\Version1210',
|
||||
'App\Listeners\Updates\Version1211',
|
||||
],
|
||||
'Illuminate\Auth\Events\Login' => [
|
||||
'App\Listeners\Auth\Login',
|
||||
|
Reference in New Issue
Block a user