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

refactored report and update abstracts

Browse Source
This commit is contained in:
denisdulici 2019-11-23 21:47:20 +03:00
parent eef7eaa12f
commit 51a7fa86fc
37 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Abstracts/Reports/Listener.php → app/Abstracts/Listeners/Report.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Abstracts\Reports;
namespace App\Abstracts\Listeners;
use App\Events\Common\ReportFilterApplying;
use App\Events\Common\ReportFilterShowing;
@ -12,7 +12,7 @@ use App\Models\Setting\Category;
use App\Traits\Contacts;
use Date;
abstract class Listener
abstract class Report
{
use Contacts;

22
app/Listeners/Update/Listener.php → app/Abstracts/Listeners/Update.php
View File

@ -1,31 +1,39 @@
<?php
namespace App\Listeners\Update;
namespace App\Abstracts\Listeners;
class Listener
abstract class Update
{
const ALIAS = '';
const VERSION = '';
/**
* Check if should listen.
* Check the fired update based on alias and version.
*
* @param $event
* @return boolean
*/
protected function check($event)
public function skipThisUpdate($event)
{
// Apply only to the specified alias
if ($event->alias != static::ALIAS) {
return false;
return true;
}
// Do not apply to the same or newer versions
if (version_compare($event->old, static::VERSION, '>=')) {
return false;
return true;
}
return true;
return false;
}
/**
* @deprecated since 2.0
*/
public function check($event)
{
return !$this->skipThisUpdate($event);
}
}

2
app/Abstracts/Reports/Report.php → app/Abstracts/Report.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Abstracts\Reports;
namespace App\Abstracts;
use App\Exports\Common\Reports as Export;
use App\Models\Common\Report as Model;

2
app/Listeners/Common/ExpenseSummaryReport.php
View File

@ -2,7 +2,7 @@
namespace App\Listeners\Common;
use App\Abstracts\Reports\Listener;
use App\Abstracts\Listeners\Report as Listener;
use App\Events\Common\ReportFilterApplying;
use App\Events\Common\ReportFilterShowing;
use App\Events\Common\ReportGroupApplying;

2
app/Listeners/Common/IncomeExpenseSummaryReport.php
View File

@ -2,7 +2,7 @@
namespace App\Listeners\Common;
use App\Abstracts\Reports\Listener;
use App\Abstracts\Listeners\Report as Listener;
use App\Events\Common\ReportFilterApplying;
use App\Events\Common\ReportFilterShowing;
use App\Events\Common\ReportGroupApplying;

2
app/Listeners/Common/IncomeSummaryReport.php
View File

@ -2,7 +2,7 @@
namespace App\Listeners\Common;
use App\Abstracts\Reports\Listener;
use App\Abstracts\Listeners\Report as Listener;
use App\Events\Common\ReportFilterApplying;
use App\Events\Common\ReportFilterShowing;
use App\Events\Common\ReportGroupApplying;

2
app/Listeners/Common/ProfitLossReport.php
View File

@ -2,7 +2,7 @@
namespace App\Listeners\Common;
use App\Abstracts\Reports\Listener;
use App\Abstracts\Listeners\Report as Listener;
class ProfitLossReport extends Listener
{

2
app/Listeners/Common/TaxSummaryReport.php
View File

@ -2,7 +2,7 @@
namespace App\Listeners\Common;
use App\Abstracts\Reports\Listener;
use App\Abstracts\Listeners\Report as Listener;
class TaxSummaryReport extends Listener
{

2
app/Listeners/Update/V10/Version106.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V10;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use File;
class Version106 extends Listener

2
app/Listeners/Update/V10/Version107.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V10;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use DB;
class Version107 extends Listener

2
app/Listeners/Update/V10/Version108.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V10;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Common\Company;
use App\Models\Expense\Bill;
use App\Models\Expense\BillStatus;

2
app/Listeners/Update/V10/Version109.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V10;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Common\Company;
use Artisan;

2
app/Listeners/Update/V11/Version110.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V11;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;

2
app/Listeners/Update/V11/Version112.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V11;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Common\Company;
use App\Utilities\Installer;

2
app/Listeners/Update/V11/Version113.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V11;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Setting\Currency;
use Artisan;

2
app/Listeners/Update/V11/Version119.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V11;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
use Illuminate\Support\Facades\Schema;

2
app/Listeners/Update/V12/Version120.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
use App\Models\Common\Company;

2
app/Listeners/Update/V12/Version1210.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Artisan;
class Version1210 extends Listener

2
app/Listeners/Update/V12/Version1211.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Artisan;
class Version1211 extends Listener

2
app/Listeners/Update/V12/Version126.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;

2
app/Listeners/Update/V12/Version127.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Permission;
use File;
use Illuminate\Support\Str;

2
app/Listeners/Update/V12/Version129.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V12;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Artisan;
class Version129 extends Listener

2
app/Listeners/Update/V13/Version130.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
use Artisan;

2
app/Listeners/Update/V13/Version1311.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
use Artisan;

2
app/Listeners/Update/V13/Version1313.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Common\Company;
use App\Utilities\Installer;
use Artisan;

2
app/Listeners/Update/V13/Version1316.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Common\Company;
use App\Utilities\Overrider;
use App\Models\Banking\Account;

2
app/Listeners/Update/V13/Version132.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
use Artisan;

2
app/Listeners/Update/V13/Version135.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Date;
class Version135 extends Listener

2
app/Listeners/Update/V13/Version138.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Date;
class Version138 extends Listener

2
app/Listeners/Update/V13/Version139.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Income\InvoiceItem;
use App\Models\Income\InvoiceItemTax;
use App\Models\Setting\Tax;

5
app/Listeners/Update/V20/Version200.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V20;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use App\Models\Auth\User;
use App\Models\Auth\Role;
use App\Models\Auth\Permission;
@ -32,8 +32,7 @@ class Version200 extends Listener
*/
public function handle(Event $event)
{
// Check if should listen
if (!$this->check($event)) {
if ($this->skipThisUpdate($event)) {
return;
}

5
app/Listeners/Update/V20/Version201.php
View File

@ -2,8 +2,8 @@
namespace App\Listeners\Update\V13;
use App\Abstracts\Listeners\Update as Listener;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Artisan;
class Version201 extends Listener
@ -20,8 +20,7 @@ class Version201 extends Listener
*/
public function handle(Event $event)
{
// Check if should listen
if (!$this->check($event)) {
if ($this->skipThisUpdate($event)) {
return;
}

2
app/Reports/ExpenseSummary.php
View File

@ -2,7 +2,7 @@
namespace App\Reports;
use App\Abstracts\Reports\Report;
use App\Abstracts\Report;
use App\Models\Banking\Transaction;
use App\Models\Expense\Bill;
use App\Utilities\Recurring;

2
app/Reports/IncomeExpenseSummary.php
View File

@ -2,7 +2,7 @@
namespace App\Reports;
use App\Abstracts\Reports\Report;
use App\Abstracts\Report;
use App\Models\Banking\Transaction;
use App\Models\Expense\Bill;
use App\Models\Income\Invoice;

2
app/Reports/IncomeSummary.php
View File

@ -2,7 +2,7 @@
namespace App\Reports;
use App\Abstracts\Reports\Report;
use App\Abstracts\Report;
use App\Models\Banking\Transaction;
use App\Models\Income\Invoice;
use App\Utilities\Recurring;

2
app/Reports/ProfitLoss.php
View File

@ -2,7 +2,7 @@
namespace App\Reports;
use App\Abstracts\Reports\Report;
use App\Abstracts\Report;
use App\Models\Banking\Transaction;
use App\Models\Expense\Bill;
use App\Models\Income\Invoice;

2
app/Reports/TaxSummary.php
View File

@ -2,7 +2,7 @@
namespace App\Reports;
use App\Abstracts\Reports\Report;
use App\Abstracts\Report;
use App\Models\Banking\Transaction;
use App\Models\Expense\Bill;
use App\Models\Income\Invoice;