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

fixed download PDF issue.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-27 12:17:41 +03:00
parent 71394f895b
commit 116562ea03
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Purchases/Payments.php
View File

@ -17,11 +17,12 @@ use App\Models\Setting\Category;
use App\Models\Setting\Currency; use App\Models\Setting\Currency;
use App\Traits\Currencies; use App\Traits\Currencies;
use App\Traits\DateTime; use App\Traits\DateTime;
use App\Traits\Transactions;
use App\Utilities\Modules; use App\Utilities\Modules;
class Payments extends Controller class Payments extends Controller
{ {
use Currencies, DateTime; use Currencies, DateTime, Transactions;
/** /**
* Display a listing of the resource. * Display a listing of the resource.
@ -318,7 +319,7 @@ class Payments extends Controller
//$pdf->setPaper('A4', 'portrait'); //$pdf->setPaper('A4', 'portrait');
$file_name = $this->getDocumentFileName($payment); $file_name = $this->getTransactionFileName($payment);
return $pdf->download($file_name); return $pdf->download($file_name);
} }

5
app/Http/Controllers/Sales/Revenues.php
View File

@ -18,11 +18,12 @@ use App\Models\Setting\Currency;
use App\Notifications\Sale\Revenue as Notification; use App\Notifications\Sale\Revenue as Notification;
use App\Traits\Currencies; use App\Traits\Currencies;
use App\Traits\DateTime; use App\Traits\DateTime;
use App\Traits\Transactions;
use App\Utilities\Modules; use App\Utilities\Modules;
class Revenues extends Controller class Revenues extends Controller
{ {
use Currencies, DateTime; use Currencies, DateTime, Transactions;
/** /**
* Display a listing of the resource. * Display a listing of the resource.
@ -319,7 +320,7 @@ class Revenues extends Controller
//$pdf->setPaper('A4', 'portrait'); //$pdf->setPaper('A4', 'portrait');
$file_name = $this->getDocumentFileName($revenue); $file_name = $this->getTransactionFileName($revenue);
return $pdf->download($file_name); return $pdf->download($file_name);
} }

13
app/Traits/Transactions.php
View File

@ -2,6 +2,9 @@
namespace App\Traits; namespace App\Traits;
use App\Models\Banking\Transaction;
use Illuminate\Support\Str;
trait Transactions trait Transactions
{ {
public function isIncome() public function isIncome()
@ -60,6 +63,16 @@ trait Transactions
])->save(); ])->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) protected function getSettingKey($type, $setting_key)
{ {
$key = ''; $key = '';