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

Fixed Portal transaction invoices link path ( #3qec07r )

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-10-31 01:38:04 +03:00
parent 083ea42aa6
commit 94554a463e
2 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
app/Abstracts/View/Components/Transactions/Show.php
View File

@ -459,9 +459,9 @@ abstract class Show extends Component
// Attachment data.. // Attachment data..
$this->attachment = ''; $this->attachment = '';
if (!empty($attachment)) { if (! empty($attachment)) {
$this->attachment = $attachment; $this->attachment = $attachment;
} else if (!empty($transaction)) { } else if (! empty($transaction)) {
$this->attachment = $transaction->attachment; $this->attachment = $transaction->attachment;
} }
@ -475,7 +475,7 @@ abstract class Show extends Component
protected function getTransactionTemplate($type, $transactionTemplate) protected function getTransactionTemplate($type, $transactionTemplate)
{ {
if (!empty($transactionTemplate)) { if (! empty($transactionTemplate)) {
return $transactionTemplate; return $transactionTemplate;
} }
@ -490,7 +490,7 @@ abstract class Show extends Component
protected function getLogo($logo) protected function getLogo($logo)
{ {
if (!empty($logo)) { if (! empty($logo)) {
return $logo; return $logo;
} }
@ -498,7 +498,7 @@ abstract class Show extends Component
$media = Media::find($media_id); $media = Media::find($media_id);
if (!empty($media)) { if (! empty($media)) {
$path = $media->getDiskPath(); $path = $media->getDiskPath();
if (Storage::missing($path)) { if (Storage::missing($path)) {
@ -544,7 +544,7 @@ abstract class Show extends Component
protected function getRouteButtonAddNew($type, $routeButtonAddNew) protected function getRouteButtonAddNew($type, $routeButtonAddNew)
{ {
if (!empty($routeButtonAddNew)) { if (! empty($routeButtonAddNew)) {
return $routeButtonAddNew; return $routeButtonAddNew;
} }
@ -553,7 +553,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'create', $parameter); $route = $this->getRouteFromConfig($type, 'create', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -562,7 +562,7 @@ abstract class Show extends Component
protected function getRouteButtonEdit($type, $routeButtonEdit) protected function getRouteButtonEdit($type, $routeButtonEdit)
{ {
if (!empty($routeButtonEdit)) { if (! empty($routeButtonEdit)) {
return $routeButtonEdit; return $routeButtonEdit;
} }
@ -571,7 +571,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'edit', $parameter); $route = $this->getRouteFromConfig($type, 'edit', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -580,7 +580,7 @@ abstract class Show extends Component
protected function getRouteButtonDuplicate($type, $routeButtonDuplicate) protected function getRouteButtonDuplicate($type, $routeButtonDuplicate)
{ {
if (!empty($routeButtonDuplicate)) { if (! empty($routeButtonDuplicate)) {
return $routeButtonDuplicate; return $routeButtonDuplicate;
} }
@ -589,7 +589,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'duplicate', $parameter); $route = $this->getRouteFromConfig($type, 'duplicate', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -598,7 +598,7 @@ abstract class Show extends Component
protected function getRouteButtonPrint($type, $routeButtonPrint) protected function getRouteButtonPrint($type, $routeButtonPrint)
{ {
if (!empty($routeButtonPrint)) { if (! empty($routeButtonPrint)) {
return $routeButtonPrint; return $routeButtonPrint;
} }
@ -607,7 +607,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'print', $parameter); $route = $this->getRouteFromConfig($type, 'print', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -634,7 +634,7 @@ abstract class Show extends Component
protected function getSignedUrl($type, $signedUrl) protected function getSignedUrl($type, $signedUrl)
{ {
if (!empty($signedUrl)) { if (! empty($signedUrl)) {
return $signedUrl; return $signedUrl;
} }
@ -643,7 +643,7 @@ abstract class Show extends Component
$route = ''; $route = '';
if (!empty($alias)) { if (! empty($alias)) {
$route .= $alias . '.'; $route .= $alias . '.';
} }
@ -680,7 +680,7 @@ abstract class Show extends Component
protected function getRouteButtonPdf($type, $routeButtonPdf) protected function getRouteButtonPdf($type, $routeButtonPdf)
{ {
if (!empty($routeButtonPdf)) { if (! empty($routeButtonPdf)) {
return $routeButtonPdf; return $routeButtonPdf;
} }
@ -689,7 +689,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'pdf', $parameter); $route = $this->getRouteFromConfig($type, 'pdf', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -698,7 +698,7 @@ abstract class Show extends Component
protected function getRouteButtonEnd($type, $routeButtonEnd) protected function getRouteButtonEnd($type, $routeButtonEnd)
{ {
if (!empty($routeButtonEnd)) { if (! empty($routeButtonEnd)) {
return $routeButtonEnd; return $routeButtonEnd;
} }
@ -707,7 +707,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'end', $parameter); $route = $this->getRouteFromConfig($type, 'end', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -716,7 +716,7 @@ abstract class Show extends Component
protected function getRouteButtonDelete($type, $routeButtonDelete) protected function getRouteButtonDelete($type, $routeButtonDelete)
{ {
if (!empty($routeButtonDelete)) { if (! empty($routeButtonDelete)) {
return $routeButtonDelete; return $routeButtonDelete;
} }
@ -725,7 +725,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($type, 'destroy', $parameter); $route = $this->getRouteFromConfig($type, 'destroy', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -734,7 +734,7 @@ abstract class Show extends Component
protected function getRouteContactShow($type, $routeContactShow) protected function getRouteContactShow($type, $routeContactShow)
{ {
if (!empty($routeContactShow)) { if (! empty($routeContactShow)) {
return $routeContactShow; return $routeContactShow;
} }
@ -755,7 +755,7 @@ abstract class Show extends Component
} }
} }
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }
@ -764,13 +764,13 @@ abstract class Show extends Component
protected function getTextButtonAddNew($type, $textButtonAddNew) protected function getTextButtonAddNew($type, $textButtonAddNew)
{ {
if (!empty($textButtonAddNew)) { if (! empty($textButtonAddNew)) {
return $textButtonAddNew; return $textButtonAddNew;
} }
$translation = $this->getTextFromConfig($type, 'transactions'); $translation = $this->getTextFromConfig($type, 'transactions');
if (!empty($translation)) { if (! empty($translation)) {
return trans('general.title.new', ['type' => trans_choice($translation, 1)]); return trans('general.title.new', ['type' => trans_choice($translation, 1)]);
} }
@ -779,7 +779,7 @@ abstract class Show extends Component
protected function getTextContentTitle($type, $textContentTitle) protected function getTextContentTitle($type, $textContentTitle)
{ {
if (!empty($textContentTitle)) { if (! empty($textContentTitle)) {
return $textContentTitle; return $textContentTitle;
} }
@ -796,7 +796,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, $type . '_made', $default_key); $translation = $this->getTextFromConfig($type, $type . '_made', $default_key);
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -805,7 +805,7 @@ abstract class Show extends Component
protected function getTextNumber($type, $textNumber) protected function getTextNumber($type, $textNumber)
{ {
if (!empty($textNumber)) { if (! empty($textNumber)) {
return $textNumber; return $textNumber;
} }
@ -814,13 +814,13 @@ abstract class Show extends Component
protected function getTextPaidAt($type, $textPaidAt) protected function getTextPaidAt($type, $textPaidAt)
{ {
if (!empty($textPaidAt)) { if (! empty($textPaidAt)) {
return $textPaidAt; return $textPaidAt;
} }
$translation = $this->getTextFromConfig($type, 'paid_at', 'date'); $translation = $this->getTextFromConfig($type, 'paid_at', 'date');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -829,13 +829,13 @@ abstract class Show extends Component
protected function getTextAccount($type, $textAccount) protected function getTextAccount($type, $textAccount)
{ {
if (!empty($textAccount)) { if (! empty($textAccount)) {
return $textAccount; return $textAccount;
} }
$translation = $this->getTextFromConfig($type, 'accounts', 'accounts', 'trans_choice'); $translation = $this->getTextFromConfig($type, 'accounts', 'accounts', 'trans_choice');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -844,13 +844,13 @@ abstract class Show extends Component
protected function getTextCategory($type, $textCategory) protected function getTextCategory($type, $textCategory)
{ {
if (!empty($textCategory)) { if (! empty($textCategory)) {
return $textCategory; return $textCategory;
} }
$translation = $this->getTextFromConfig($type, 'categories', 'categories', 'trans_choice'); $translation = $this->getTextFromConfig($type, 'categories', 'categories', 'trans_choice');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -859,13 +859,13 @@ abstract class Show extends Component
protected function getTextPaymentMethods($type, $textPaymentMethods) protected function getTextPaymentMethods($type, $textPaymentMethods)
{ {
if (!empty($textPaymentMethods)) { if (! empty($textPaymentMethods)) {
return $textPaymentMethods; return $textPaymentMethods;
} }
$translation = $this->getTextFromConfig($type, 'payment_methods', 'payment_methods', 'trans_choice'); $translation = $this->getTextFromConfig($type, 'payment_methods', 'payment_methods', 'trans_choice');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -874,13 +874,13 @@ abstract class Show extends Component
protected function getTextReference($type, $textReference) protected function getTextReference($type, $textReference)
{ {
if (!empty($textReference)) { if (! empty($textReference)) {
return $textReference; return $textReference;
} }
$translation = $this->getTextFromConfig($type, 'reference', 'reference'); $translation = $this->getTextFromConfig($type, 'reference', 'reference');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -889,13 +889,13 @@ abstract class Show extends Component
protected function getTextDescription($type, $textDescription) protected function getTextDescription($type, $textDescription)
{ {
if (!empty($textDescription)) { if (! empty($textDescription)) {
return $textDescription; return $textDescription;
} }
$translation = $this->getTextFromConfig($type, 'description', 'description'); $translation = $this->getTextFromConfig($type, 'description', 'description');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -904,13 +904,13 @@ abstract class Show extends Component
protected function getTextAmount($type, $textAmount) protected function getTextAmount($type, $textAmount)
{ {
if (!empty($textAmount)) { if (! empty($textAmount)) {
return $textAmount; return $textAmount;
} }
$translation = $this->getTextFromConfig($type, 'amount', 'amount'); $translation = $this->getTextFromConfig($type, 'amount', 'amount');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -919,7 +919,7 @@ abstract class Show extends Component
protected function getTextPaidBy($type, $textPaidBy) protected function getTextPaidBy($type, $textPaidBy)
{ {
if (!empty($textPaidBy)) { if (! empty($textPaidBy)) {
return $textPaidBy; return $textPaidBy;
} }
@ -936,7 +936,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, 'paid_to_by', $default_key); $translation = $this->getTextFromConfig($type, 'paid_to_by', $default_key);
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -945,7 +945,7 @@ abstract class Show extends Component
protected function getTextRelatedTransansaction($type, $textRelatedTransansaction) protected function getTextRelatedTransansaction($type, $textRelatedTransansaction)
{ {
if (!empty($textRelatedTransansaction)) { if (! empty($textRelatedTransansaction)) {
return $textRelatedTransansaction; return $textRelatedTransansaction;
} }
@ -962,7 +962,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, 'related_type', $default_key); $translation = $this->getTextFromConfig($type, 'related_type', $default_key);
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -971,13 +971,13 @@ abstract class Show extends Component
protected function getTextRelatedDocumentNumber($type, $textRelatedDocumentNumber) protected function getTextRelatedDocumentNumber($type, $textRelatedDocumentNumber)
{ {
if (!empty($textRelatedDocumentNumber)) { if (! empty($textRelatedDocumentNumber)) {
return $textRelatedDocumentNumber; return $textRelatedDocumentNumber;
} }
$translation = $this->getTextFromConfig($type, 'related_document_number', 'numbers'); $translation = $this->getTextFromConfig($type, 'related_document_number', 'numbers');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -986,7 +986,7 @@ abstract class Show extends Component
protected function getTextRelatedContact($type, $textRelatedContact) protected function getTextRelatedContact($type, $textRelatedContact)
{ {
if (!empty($textRelatedContact)) { if (! empty($textRelatedContact)) {
return $textRelatedContact; return $textRelatedContact;
} }
@ -994,7 +994,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, 'related_contact', $default_key, 'trans_choice'); $translation = $this->getTextFromConfig($type, 'related_contact', $default_key, 'trans_choice');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -1003,7 +1003,7 @@ abstract class Show extends Component
protected function getTextRelatedDocumentDate($type, $textRelatedDocumentDate) protected function getTextRelatedDocumentDate($type, $textRelatedDocumentDate)
{ {
if (!empty($textRelatedDocumentDate)) { if (! empty($textRelatedDocumentDate)) {
return $textRelatedDocumentDate; return $textRelatedDocumentDate;
} }
@ -1020,7 +1020,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, 'related_document_date', $default_key); $translation = $this->getTextFromConfig($type, 'related_document_date', $default_key);
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -1029,7 +1029,7 @@ abstract class Show extends Component
protected function getTextRelatedDocumentAmount($type, $textRelatedDocumentAmount) protected function getTextRelatedDocumentAmount($type, $textRelatedDocumentAmount)
{ {
if (!empty($textRelatedDocumentAmount)) { if (! empty($textRelatedDocumentAmount)) {
return $textRelatedDocumentAmount; return $textRelatedDocumentAmount;
} }
@ -1046,7 +1046,7 @@ abstract class Show extends Component
$translation = $this->getTextFromConfig($type, 'related_document_amount', $default_key); $translation = $this->getTextFromConfig($type, 'related_document_amount', $default_key);
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -1055,13 +1055,13 @@ abstract class Show extends Component
protected function getTextRelatedAmount($type, $textRelatedAmount) protected function getTextRelatedAmount($type, $textRelatedAmount)
{ {
if (!empty($textRelatedAmount)) { if (! empty($textRelatedAmount)) {
return $textRelatedAmount; return $textRelatedAmount;
} }
$translation = $this->getTextFromConfig($type, 'related_amount', 'amount'); $translation = $this->getTextFromConfig($type, 'related_amount', 'amount');
if (!empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
@ -1070,11 +1070,11 @@ abstract class Show extends Component
protected function routeDocumentShow($type, $routeDocumentShow) protected function routeDocumentShow($type, $routeDocumentShow)
{ {
if (!empty($routeDocumentShow)) { if (! empty($routeDocumentShow)) {
return $routeDocumentShow; return $routeDocumentShow;
} }
if (!$this->transaction->document) { if (! $this->transaction->document) {
return $routeDocumentShow; return $routeDocumentShow;
} }
@ -1083,7 +1083,7 @@ abstract class Show extends Component
$route = $this->getRouteFromConfig($this->transaction->document->type, 'show', $parameter); $route = $this->getRouteFromConfig($this->transaction->document->type, 'show', $parameter);
if (!empty($route)) { if (! empty($route)) {
return $route; return $route;
} }

1
resources/views/portal/payments/show.blade.php
View File

@ -56,6 +56,7 @@
:transaction="$payment" :transaction="$payment"
transaction-template="{{ setting('payment.template', 'default') }}" transaction-template="{{ setting('payment.template', 'default') }}"
hide-payment-methods hide-payment-methods
route-document-show="portal.invoices.show"
/> />
</div> </div>
</div> </div>