From c17a596c3342ba9f1151635d4e0c3e58b5bfb68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 12 Feb 2021 17:51:46 +0300 Subject: [PATCH] Empty page change method.. --- app/View/Components/EmptyPage.php | 33 +++++++++++++++---- .../banking/reconciliations/index.blade.php | 2 +- .../views/banking/transfers/index.blade.php | 2 +- resources/views/common/items/index.blade.php | 2 +- .../views/purchases/payments/index.blade.php | 2 +- .../views/purchases/vendors/index.blade.php | 2 +- .../views/sales/customers/index.blade.php | 2 +- .../views/sales/revenues/index.blade.php | 2 +- .../views/settings/taxes/index.blade.php | 2 +- 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/app/View/Components/EmptyPage.php b/app/View/Components/EmptyPage.php index 863f8c3d5..afd846c04 100644 --- a/app/View/Components/EmptyPage.php +++ b/app/View/Components/EmptyPage.php @@ -11,6 +11,9 @@ class EmptyPage extends Component /** @var string */ public $page; + /** @var string */ + public $group; + /** @var string */ public $imageEmptyPage; @@ -38,16 +41,17 @@ class EmptyPage extends Component * @return void */ public function __construct( - string $page, string $imageEmptyPage = '', string $textEmptyPage = '', string $textPage = '', + string $page, string $group = '', string $imageEmptyPage = '', string $textEmptyPage = '', string $textPage = '', string $urlDocsPath = '', bool $checkPermissionCreate = true, string $permissionCreate = '', string $routeCreate = '' ) { $this->page = $page; + $this->group = $group; $this->imageEmptyPage = $this->getImageEmptyPage($page, $imageEmptyPage); $this->textEmptyPage = $this->getTextEmptyPage($page, $textEmptyPage); $this->textPage = $this->getTextPage($page, $textPage); - $this->urlDocsPath = $this->getUrlDocsPath($page, $urlDocsPath); + $this->urlDocsPath = $this->getUrlDocsPath($page, $group, $urlDocsPath); $this->checkPermissionCreate = $checkPermissionCreate; - $this->permissionCreate = $this->getPermissionCreate($page, $permissionCreate); + $this->permissionCreate = $this->getPermissionCreate($page, $group, $permissionCreate); $this->routeCreate = $this->getRouteCreate($page, $routeCreate); } @@ -88,29 +92,46 @@ class EmptyPage extends Component return 'general.' . $page; } - protected function getUrlDocsPath($page, $urlDocsPath) + protected function getUrlDocsPath($page, $group, $urlDocsPath) { if ($urlDocsPath) { return $urlDocsPath; } + $docs_path = $page; + + if (!empty($group)) { + $docs_path = $group . '/' . $page; + } + return 'https://akaunting.com/docs/user-manual/' . $page; } - protected function getPermissionCreate($page, $permissionCreate) + protected function getPermissionCreate($page, $group, $permissionCreate) { if ($permissionCreate) { return $permissionCreate; } $pages = [ - 'items' => 'create-commen-items', + 'reconciliations' => 'create-banking-reconciliations', + 'transfers' => 'create-banking-transfers', + 'payments' => 'create-purchases-payments', + 'vendors' => 'create-purchases-vendors', + 'customers' => 'create-sales-customers', + 'revenues' => 'create-sales-revenues', + 'taxes' => 'create-settings-taxes', + 'items' => 'create-common-items', ]; if (array_key_exists($page, $pages)) { $permissionCreate = $pages[$page]; } + if (empty($permissionCreate) && !empty($group)) { + $permissionCreate = 'create-' . $group . '-' . $page; + } + return $permissionCreate; } diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index 237fbaf17..e9e3e494f 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -82,7 +82,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'reconciliations', 'docs_path' => 'banking/reconciliations']) + @endif @endsection diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index 794e085c3..de69651de 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -83,7 +83,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'transfers', 'docs_path' => 'banking/transfers']) + @endif @endsection diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php index edd35a1ff..52bbe5b4f 100644 --- a/resources/views/common/items/index.blade.php +++ b/resources/views/common/items/index.blade.php @@ -103,7 +103,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'items', 'docs_path' => 'items']) + @endif @endsection diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index f70f89c6b..7d0b2556d 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -116,7 +116,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'purchases/payments']) + @endif @endsection diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php index c1c57206c..8eb8cdb15 100644 --- a/resources/views/purchases/vendors/index.blade.php +++ b/resources/views/purchases/vendors/index.blade.php @@ -103,7 +103,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'purchases/vendors']) + @endif @endsection diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php index ccf02c789..097ef6b45 100644 --- a/resources/views/sales/customers/index.blade.php +++ b/resources/views/sales/customers/index.blade.php @@ -105,7 +105,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'sales/customers']) + @endif @endsection diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 264b2af3e..428b99b60 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -116,7 +116,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'sales/revenues']) + @endif @endsection diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php index 13739ec12..bf46b3054 100644 --- a/resources/views/settings/taxes/index.blade.php +++ b/resources/views/settings/taxes/index.blade.php @@ -86,7 +86,7 @@ @else - @include('partials.admin.empty_page', ['page' => 'taxes', 'docs_path' => 'settings/taxes']) + @endif @endsection