Transfer added created by and show page account link
This commit is contained in:
parent
ef00815557
commit
06d0ac18f6
@ -101,6 +101,12 @@ abstract class TransferShow extends Component
|
|||||||
/** @var string */
|
/** @var string */
|
||||||
public $routeButtonDelete;
|
public $routeButtonDelete;
|
||||||
|
|
||||||
|
/** @var string */
|
||||||
|
public $routeFromAccountShow;
|
||||||
|
|
||||||
|
/** @var string */
|
||||||
|
public $routeToAccountShow;
|
||||||
|
|
||||||
/** @var string */
|
/** @var string */
|
||||||
public $textDeleteModal;
|
public $textDeleteModal;
|
||||||
|
|
||||||
@ -267,7 +273,7 @@ abstract class TransferShow extends Component
|
|||||||
bool $hideButtonGroupDivider1 = false, bool $hideButtonGroupDivider2 = false, bool $hideButtonGroupDivider3 = false,
|
bool $hideButtonGroupDivider1 = false, bool $hideButtonGroupDivider2 = false, bool $hideButtonGroupDivider3 = false,
|
||||||
string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '',
|
string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '',
|
||||||
string $routeButtonAddNew = '', string $routeButtonEdit = '', string $routeButtonDuplicate = '', string $routeButtonPrint = '', string $signedUrl = '',
|
string $routeButtonAddNew = '', string $routeButtonEdit = '', string $routeButtonDuplicate = '', string $routeButtonPrint = '', string $signedUrl = '',
|
||||||
string $routeButtonEmail = '', string $routeButtonPdf = '', string $routeButtonDelete = '',
|
string $routeButtonEmail = '', string $routeButtonPdf = '', string $routeButtonDelete = '', string $routeFromAccountShow = '', string $routeToAccountShow = '',
|
||||||
string $textDeleteModal = '',
|
string $textDeleteModal = '',
|
||||||
bool $hideHeader = false, bool $hideHeaderFromAccount = false, bool $hideHeaderToAccount = false, bool $hideHeaderAmount = false, bool $hideHeaderPaidAt = false,
|
bool $hideHeader = false, bool $hideHeaderFromAccount = false, bool $hideHeaderToAccount = false, bool $hideHeaderAmount = false, bool $hideHeaderPaidAt = false,
|
||||||
string $textHeaderFromAccount = '', string $textHeaderToAccount = '', string $textHeaderAmount = '', string $textHeaderPaidAt = '',
|
string $textHeaderFromAccount = '', string $textHeaderToAccount = '', string $textHeaderAmount = '', string $textHeaderPaidAt = '',
|
||||||
@ -324,6 +330,8 @@ abstract class TransferShow extends Component
|
|||||||
$this->routeButtonEmail = $this->getRouteButtonEmail($routeButtonEmail);
|
$this->routeButtonEmail = $this->getRouteButtonEmail($routeButtonEmail);
|
||||||
$this->routeButtonPdf = $this->getRouteButtonPdf($routeButtonPdf);
|
$this->routeButtonPdf = $this->getRouteButtonPdf($routeButtonPdf);
|
||||||
$this->routeButtonDelete = $this->getRouteButtonDelete($routeButtonDelete);
|
$this->routeButtonDelete = $this->getRouteButtonDelete($routeButtonDelete);
|
||||||
|
$this->routeFromAccountShow = $this->getRouteFromAccountShow($routeFromAccountShow);
|
||||||
|
$this->routeToAccountShow = $this->getRouteToAccountShow($routeToAccountShow);
|
||||||
|
|
||||||
// Navbar Text
|
// Navbar Text
|
||||||
$this->textDeleteModal = $textDeleteModal;
|
$this->textDeleteModal = $textDeleteModal;
|
||||||
@ -501,6 +509,24 @@ abstract class TransferShow extends Component
|
|||||||
return 'transfers.destroy';
|
return 'transfers.destroy';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getRouteFromAccountShow($routeFromAccountShow)
|
||||||
|
{
|
||||||
|
if (!empty($routeFromAccountShow)) {
|
||||||
|
return $routeFromAccountShow;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'accounts.show';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRouteToAccountShow($routeToAccountShow)
|
||||||
|
{
|
||||||
|
if (!empty($routeToAccountShow)) {
|
||||||
|
return $routeToAccountShow;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'accounts.show';
|
||||||
|
}
|
||||||
|
|
||||||
protected function getPermissionCreate($permissionCreate)
|
protected function getPermissionCreate($permissionCreate)
|
||||||
{
|
{
|
||||||
if (!empty($permissionCreate)) {
|
if (!empty($permissionCreate)) {
|
||||||
|
@ -55,6 +55,7 @@ class CreateTransfer extends Job
|
|||||||
'category_id' => Category::transfer(), // Transfer Category ID
|
'category_id' => Category::transfer(), // Transfer Category ID
|
||||||
'payment_method' => $this->request->get('payment_method'),
|
'payment_method' => $this->request->get('payment_method'),
|
||||||
'reference' => $this->request->get('reference'),
|
'reference' => $this->request->get('reference'),
|
||||||
|
'created_by' => $this->request->get('created_by'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$amount = $this->request->get('amount');
|
$amount = $this->request->get('amount');
|
||||||
@ -77,12 +78,14 @@ class CreateTransfer extends Job
|
|||||||
'category_id' => Category::transfer(), // Transfer Category ID
|
'category_id' => Category::transfer(), // Transfer Category ID
|
||||||
'payment_method' => $this->request->get('payment_method'),
|
'payment_method' => $this->request->get('payment_method'),
|
||||||
'reference' => $this->request->get('reference'),
|
'reference' => $this->request->get('reference'),
|
||||||
|
'created_by' => $this->request->get('created_by'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->transfer = Transfer::create([
|
$this->transfer = Transfer::create([
|
||||||
'company_id' => $this->request['company_id'],
|
'company_id' => $this->request['company_id'],
|
||||||
'expense_transaction_id' => $expense_transaction->id,
|
'expense_transaction_id' => $expense_transaction->id,
|
||||||
'income_transaction_id' => $income_transaction->id,
|
'income_transaction_id' => $income_transaction->id,
|
||||||
|
'created_by' => $this->request->get('created_by'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// Upload attachment
|
// Upload attachment
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
hide-header-to-account="{{ $hideHeaderToAccount }}"
|
hide-header-to-account="{{ $hideHeaderToAccount }}"
|
||||||
text-header-to-account="{{ $textHeaderToAccount }}"
|
text-header-to-account="{{ $textHeaderToAccount }}"
|
||||||
class-header-to-account="{{ $classHeaderToAccount }}"
|
class-header-to-account="{{ $classHeaderToAccount }}"
|
||||||
|
route-from-account-show="{{ $routeFromAccountShow }}"
|
||||||
|
route-to-account-show="{{ $routeToAccountShow }}"
|
||||||
hide-header-amount="{{ $hideHeaderAmount }}"
|
hide-header-amount="{{ $hideHeaderAmount }}"
|
||||||
text-header-amount="{{ $textHeaderAmount }}"
|
text-header-amount="{{ $textHeaderAmount }}"
|
||||||
class-header-amount="{{ $classHeaderAmount }}"
|
class-header-amount="{{ $classHeaderAmount }}"
|
||||||
|
@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
<strong>
|
<strong>
|
||||||
<span class="float-left long-texts mwpx-200 transaction-head-text">
|
<span class="float-left long-texts mwpx-200 transaction-head-text">
|
||||||
{{ $transfer->expense_transaction->account->name }}
|
<a href="{{ route($routeFromAccountShow, $transfer->expense_transaction->account->id) }}">
|
||||||
|
{{ $transfer->expense_transaction->account->name }}
|
||||||
|
</a>
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
</strong>
|
||||||
<br><br>
|
<br><br>
|
||||||
@ -23,7 +25,9 @@
|
|||||||
|
|
||||||
<strong>
|
<strong>
|
||||||
<span class="float-left long-texts mwpx-300 transaction-head-text">
|
<span class="float-left long-texts mwpx-300 transaction-head-text">
|
||||||
{{ $transfer->income_transaction->account->name }}
|
<a href="{{ route($routeToAccountShow, $transfer->income_transaction->account->id) }}">
|
||||||
|
{{ $transfer->income_transaction->account->name }}
|
||||||
|
</a>
|
||||||
</span>
|
</span>
|
||||||
</strong>
|
</strong>
|
||||||
<br><br>
|
<br><br>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user