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

Merge pull request #2322 from sevannerse/CU-1v0ueh7_Exception-thrown-when-a-recurred-transactiondocument-shown_Sevan-Nerse

Browse Source 
route prefix fixed #1v0ueh7
This commit is contained in:
Cüneyt Şentürk 2021-11-25 17:51:00 +03:00 committed by GitHub
commit 210b28311f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Abstracts/View/Components/DocumentShow.php
View File

@ -41,6 +41,9 @@ abstract class DocumentShow extends Base
public $date_format;
/** @var string */
public $routePrefix;
/** @var string */
public $textRecurringType;
@ -404,6 +407,7 @@ abstract class DocumentShow extends Base
$this->logo = $this->getLogo($logo);
$this->backgroundColor = $backgroundColor;
$this->signedUrl = $this->getSignedUrl($type, $signedUrl);
$this->routePrefix = $this->getRoutePrefix($type);
$this->histories = ($histories) ? $histories : $document->histories;
$this->transactions = ($transactions) ? $transactions : $document->transactions;
@ -1602,4 +1606,12 @@ abstract class DocumentShow extends Base
// @todo what return value invoice or always false??
return setting('invoice.hide_amount', $hideAmount);
}
protected function getRoutePrefix($type) {
if ($prefix = config('type.' . $type . '.route.prefix', false)){
return 'invoices';
}
return $prefix;
}
}

12
app/Abstracts/View/Components/TransactionShow.php
View File

@ -34,6 +34,9 @@ abstract class TransactionShow extends Base
public $date_format;
/** @var string */
public $routePrefix;
/** @var bool */
public $hideButtonAddNew;
@ -362,6 +365,7 @@ abstract class TransactionShow extends Base
$this->date_format = $this->getCompanyDateFormat();
$this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType);
$this->hideRecurringMessage = $hideRecurringMessage;
$this->routePrefix = $this->getRoutePrefix($type);
// Navbar Hide
$this->hideButtonAddNew = $hideButtonAddNew;
@ -1297,4 +1301,12 @@ abstract class TransactionShow extends Base
return 'general.revenues';
}
protected function getRoutePrefix($type) {
if ($prefix = config('type.' . $type . '.route.prefix', false)){
return 'revenues';
}
return $prefix;
}
}

2
resources/views/components/documents/show/recurring-message.blade.php
View File

@ -33,7 +33,7 @@
@stack('recurring_parent_message_body_start')
<p class="text-sm lh-160 mb-0">{!! trans('recurring.message_parent', [
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
'link' => '<a href="' . route(mb_strtolower(trans_choice($textRecurringType, 2)) . '.show', $document->parent->id) . '"><u>' . $document->parent->document_number . '</u></a>'
'link' => '<a href="' . route($routePrefix . '.show', $document->parent->id) . '"><u>' . $document->parent->document_number . '</u></a>'
]) !!}
</p>
@stack('recurring_parent_message_body_end')

2
resources/views/components/transactions/show/recurring-message.blade.php
View File

@ -33,7 +33,7 @@
@stack('recurring_parent_message_body_start')
<p class="text-sm lh-160 mb-0">{!! trans('recurring.message_parent', [
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
'link' => '<a href="' . route(mb_strtolower(trans_choice($textRecurringType, 2)) . '.show', $transaction->parent->id) . '"><u>' . trans_choice($textRecurringType, 1) . '#' . $transaction->parent->id . '</u></a>'
'link' => '<a href="' . route($routePrefix . '.show', $transaction->parent->id) . '"><u>' . trans_choice($textRecurringType, 1) . '#' . $transaction->parent->id . '</u></a>'
]) !!}
</p>
@stack('recurring_parent_message_body_end')