From 371ec3084ff182772e5d81097c8ab22ff9d8757f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 6 May 2023 00:24:18 +0300 Subject: [PATCH 1/5] cache the info --- app/Utilities/Info.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index 47bcbcde7..d6d0f3dd6 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -13,7 +13,13 @@ class Info { public static function all() { - return array_merge(static::versions(), [ + static $info = []; + + if (! empty($info)) { + return $info; + } + + $info = array_merge(static::versions(), [ 'api_key' => setting('apps.api_key'), 'ip' => static::ip(), 'companies' => Company::count(), @@ -22,11 +28,19 @@ class Info 'customers' => Contact::customer()->count(), 'php_extensions' => static::phpExtensions(), ]); + + return $info; } public static function versions() { - return [ + static $versions = []; + + if (! empty($versions)) { + return $versions; + } + + $versions = [ 'akaunting' => version('short'), 'laravel' => InstalledVersions::getPrettyVersion('laravel/framework'), 'php' => static::phpVersion(), @@ -35,6 +49,8 @@ class Info 'livewire' => InstalledVersions::getPrettyVersion('livewire/livewire'), 'omnipay' => InstalledVersions::getPrettyVersion('league/omnipay'), ]; + + return $versions; } public static function phpVersion() From ab1b754a2eea6f10cdc300f4619e1a9d332576a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 6 May 2023 00:33:50 +0300 Subject: [PATCH 2/5] duplicate query --- app/View/Components/Documents/Form/Company.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/View/Components/Documents/Form/Company.php b/app/View/Components/Documents/Form/Company.php index 5c48de171..02e03b457 100644 --- a/app/View/Components/Documents/Form/Company.php +++ b/app/View/Components/Documents/Form/Company.php @@ -3,7 +3,6 @@ namespace App\View\Components\Documents\Form; use App\Abstracts\View\Components\Documents\Form as Component; -use App\Models\Common\Company as Model; class Company extends Component { @@ -14,7 +13,7 @@ class Company extends Component */ public function render() { - $company = Model::find(company_id()); + $company = company(); $inputNameType = config('type.document.' . $this->type . '.route.parameter'); From 3da665dfaa8dfc2e2b66f29ef4917940b80786dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 6 May 2023 00:35:40 +0300 Subject: [PATCH 3/5] n+1 --- app/Http/Controllers/Purchases/Bills.php | 2 +- app/Http/Controllers/Sales/Invoices.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php index a11de6368..53d47dce1 100644 --- a/app/Http/Controllers/Purchases/Bills.php +++ b/app/Http/Controllers/Purchases/Bills.php @@ -31,7 +31,7 @@ class Bills extends Controller */ public function index() { - $bills = Document::bill()->with('contact', 'items', 'last_history', 'transactions')->collect(['issued_at' => 'desc']); + $bills = Document::bill()->with('contact', 'items', 'item_taxes', 'last_history', 'transactions')->collect(['issued_at' => 'desc']); return $this->response('purchases.bills.index', compact('bills')); } diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index b5c279640..2bca766ec 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/app/Http/Controllers/Sales/Invoices.php @@ -32,7 +32,7 @@ class Invoices extends Controller */ public function index() { - $invoices = Document::invoice()->with('contact', 'items', 'last_history', 'transactions')->collect(['document_number'=> 'desc']); + $invoices = Document::invoice()->with('contact', 'items', 'item_taxes', 'last_history', 'transactions')->collect(['document_number'=> 'desc']); return $this->response('sales.invoices.index', compact('invoices')); } From bcf292346895c8e28ddc3c3b2523ace404262bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 6 May 2023 00:36:12 +0300 Subject: [PATCH 4/5] redundant imports --- app/Http/Controllers/Purchases/Bills.php | 1 - app/Http/Controllers/Sales/Invoices.php | 1 - 2 files changed, 2 deletions(-) diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php index 53d47dce1..a49807b6e 100644 --- a/app/Http/Controllers/Purchases/Bills.php +++ b/app/Http/Controllers/Purchases/Bills.php @@ -7,7 +7,6 @@ use App\Exports\Purchases\Bills as Export; use App\Http\Requests\Common\Import as ImportRequest; use App\Http\Requests\Document\Document as Request; use App\Imports\Purchases\Bills as Import; -use App\Jobs\Banking\CreateBankingDocumentTransaction; use App\Jobs\Document\CreateDocument; use App\Jobs\Document\DeleteDocument; use App\Jobs\Document\DuplicateDocument; diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index 2bca766ec..6bf3c69f8 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/app/Http/Controllers/Sales/Invoices.php @@ -13,7 +13,6 @@ use App\Jobs\Document\DuplicateDocument; use App\Jobs\Document\SendDocument; use App\Jobs\Document\UpdateDocument; use App\Models\Document\Document; -use App\Notifications\Sale\Invoice as Notification; use App\Traits\Documents; class Invoices extends Controller From 537c45e8e691a2dac4dd3ecacf8211058d14cd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 6 May 2023 16:34:49 +0300 Subject: [PATCH 5/5] skip info for cloud --- app/Utilities/Info.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index d6d0f3dd6..c4b582791 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -6,6 +6,7 @@ use App\Models\Auth\User; use App\Models\Common\Company; use App\Models\Common\Contact; use App\Models\Document\Document; +use App\Traits\Cloud; use Composer\InstalledVersions; use Illuminate\Support\Facades\DB; @@ -15,7 +16,9 @@ class Info { static $info = []; - if (! empty($info)) { + $is_cloud = (new class { use Cloud; })->isCloud(); + + if (! empty($info) || $is_cloud) { return $info; }