fixed download PDF issue.

akaunting · Jun 27, 2021 · 116562e · 116562e
1 parent 71394f8
commit 116562e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php
@@ -17,11 +17,12 @@
 use App\Models\Setting\Currency;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
+use App\Traits\Transactions;
 use App\Utilities\Modules;
 
 class Payments extends Controller
 {
-    use Currencies, DateTime;
+    use Currencies, DateTime, Transactions;
 
     /**
      * Display a listing of the resource.
@@ -318,7 +319,7 @@ public function pdfPayment(Transaction $payment)
 
         //$pdf->setPaper('A4', 'portrait');
 
-        $file_name = $this->getDocumentFileName($payment);
+        $file_name = $this->getTransactionFileName($payment);
 
         return $pdf->download($file_name);
     }

diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
@@ -18,11 +18,12 @@
 use App\Notifications\Sale\Revenue as Notification;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
+use App\Traits\Transactions;
 use App\Utilities\Modules;
 
 class Revenues extends Controller
 {
-    use Currencies, DateTime;
+    use Currencies, DateTime, Transactions;
 
     /**
      * Display a listing of the resource.
@@ -319,7 +320,7 @@ public function pdfRevenue(Transaction $revenue)
 
         //$pdf->setPaper('A4', 'portrait');
 
-        $file_name = $this->getDocumentFileName($revenue);
+        $file_name = $this->getTransactionFileName($revenue);
 
         return $pdf->download($file_name);
     }

diff --git a/app/Traits/Transactions.php b/app/Traits/Transactions.php
@@ -2,6 +2,9 @@
 
 namespace App\Traits;
 
+use App\Models\Banking\Transaction;
+use Illuminate\Support\Str;
+
 trait Transactions
 {
     public function isIncome()
@@ -60,6 +63,16 @@ public function addTransactionType($new_type, $index)
         ])->save();
     }
 
+    public function getTransactionFileName(Transaction $transaction, string $separator = '-', string $extension = 'pdf'): string
+    {
+        return $this->getSafeTransactionNumber($transaction, $separator) . $separator . time() . '.' . $extension;
+    }
+
+    public function getSafeTransactionNumber(Transaction $transaction, string $separator = '-'): string
+    {
+        return Str::slug($transaction->id, $separator, language()->getShortCode());
+    }
+
     protected function getSettingKey($type, $setting_key)
     {
         $key = '';