fixed empty page

akaunting · Oct 3, 2023 · 6256f38 · 6256f38
1 parent a3027f0
commit 6256f38
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/app/Abstracts/View/Components/Documents/Index.php b/app/Abstracts/View/Components/Documents/Index.php
@@ -26,6 +26,8 @@ abstract class Index extends Component
 
     public $documents;
 
+    public $totalDocuments;
+
     /** @var string */
     public $group;
 
@@ -223,7 +225,7 @@ abstract class Index extends Component
      * @return void
      */
     public function __construct(
-        string $type, string $alias = '', $documents = [], string $group = '', string $page = '', string $textTabDocument = '', string $textPage = '',
+        string $type, string $alias = '', $documents = [], int $totalDocuments = null, string $group = '', string $page = '', string $textTabDocument = '', string $textPage = '',
         string $routeTabDocument = '', string $routeTabRecurring = '', string $routeParamsTabUnpaid = '', string $routeParamsTabDraft = '',
         string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '',
         bool $hideAcceptPayment = false, bool $checkPermissionCreate = true,
@@ -246,6 +248,7 @@ public function __construct(
         $this->type = $type;
         $this->alias = $this->getAlias($type, $alias);
         $this->documents = ($documents) ? $documents : collect();
+        $this->totalDocuments = $this->getTotalDocuments($totalDocuments);
         $this->group = $this->getGroup($type, $group);
         $this->page = $this->getPage($type, $page);
         $this->textTabDocument = $this->getTextTabDocument($type, $textTabDocument);
@@ -278,7 +281,7 @@ public function __construct(
 
         /* -- Content Start -- */
         /* -- Empty Page Start -- */
-        $this->hideEmptyPage = $hideEmptyPage;
+        $this->hideEmptyPage = $this->getHideEmptyPage($hideEmptyPage);
 
         $this->emptyPageButtons = $this->getEmptyPageButtons($type, $emptyPageButtons);
         $this->imageEmptyPage = $this->getImageEmptyPage($type, $imageEmptyPage);
@@ -351,6 +354,32 @@ public function __construct(
         $this->setParentData();
     }
 
+    protected function getTotalDocuments($totalDocuments)
+    {
+        if (! is_null($totalDocuments)) {
+            return $totalDocuments;
+        }
+
+        return $this->documents->count();
+    }
+
+    protected function getHideEmptyPage($hideEmptyPage): bool
+    {
+        if ($hideEmptyPage) {
+            return $hideEmptyPage;
+        }
+
+        if ($this->totalDocuments > 0) {
+            return true;
+        }
+
+        if (request()->has('search') && ($this->totalDocuments > 0)) {
+            return true;
+        }
+
+        return false;
+    }
+
     protected function getEmptyPageButtons($type, $emptyPageButtons)
     {
         if (! empty($emptyPageButtons)) {

diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
@@ -31,7 +31,9 @@ public function index()
 
         $bills = Document::bill()->with('contact', 'items', 'item_taxes', 'last_history', 'transactions', 'totals', 'histories', 'media')->collect(['issued_at' => 'desc']);
 
-        return $this->response('purchases.bills.index', compact('bills'));
+        $total_bills = Document::bill()->count();
+
+        return $this->response('purchases.bills.index', compact('bills', 'total_bills'));
     }
 
     /**

diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
@@ -32,7 +32,9 @@ public function index()
 
         $invoices = Document::invoice()->with('contact', 'items', 'item_taxes', 'last_history', 'transactions', 'totals', 'histories', 'media')->collect(['document_number'=> 'desc']);
 
-        return $this->response('sales.invoices.index', compact('invoices'));
+        $total_invoices = Document::invoice()->count();
+
+        return $this->response('sales.invoices.index', compact('invoices', 'total_invoices'));
     }
 
     /**

diff --git a/resources/views/components/documents/index/content.blade.php b/resources/views/components/documents/index/content.blade.php
@@ -1,4 +1,4 @@
-@if ($hideEmptyPage || ($documents->count() || (request()->has('search') && ! request()->has('programmatic'))))
+@if ($hideEmptyPage)
     @if (! $hideSummary)
     <x-index.summary :items="$summaryItems" />
     @endif

diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
@@ -18,7 +18,7 @@
     </x-slot>
 
     <x-slot name="content">
-        <x-documents.index.content type="bill" :documents="$bills" />
+        <x-documents.index.content type="bill" :documents="$bills" :total-documents="$total_bills" />
     </x-slot>
 
     <x-documents.script type="bill" />

diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
@@ -18,7 +18,7 @@
     </x-slot>
 
     <x-slot name="content">
-        <x-documents.index.content type="invoice" :documents="$invoices" />
+        <x-documents.index.content type="invoice" :documents="$invoices" :total-documents="$total_invoices" />
     </x-slot>
 
     <x-documents.script type="invoice" />