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

Fixed portal payment method path

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-19 12:52:57 +03:00
parent 7837f1d1a1
commit 6d92e045a3
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Abstracts/Http/PaymentController.php
View File

@ -41,15 +41,15 @@ abstract class PaymentController extends BaseController
}); });
} }
public function show(Document $document, PaymentRequest $request) public function show(Document $invoice, PaymentRequest $request)
{ {
$this->setContactFirstLastName($document); $this->setContactFirstLastName($invoice);
$confirm_url = $this->getConfirmUrl($document); $confirm_url = $this->getConfirmUrl($invoice);
$html = view('partials.portal.payment_method.' . $this->type, [ $html = view('partials.portal.payment_method.' . $this->type, [
'setting' => $this->setting, 'setting' => $this->setting,
'invoice' => $document, 'invoice' => $invoice,
'confirm_url' => $confirm_url, 'confirm_url' => $confirm_url,
])->render(); ])->render();
@ -62,9 +62,9 @@ abstract class PaymentController extends BaseController
]); ]);
} }
public function signed(Document $document, PaymentRequest $request) public function signed(Document $invoice, PaymentRequest $request)
{ {
return $this->show($document, $request); return $this->show($invoice, $request);
} }
public function cancel(Document $invoice, $force_redirect = false) public function cancel(Document $invoice, $force_redirect = false)

4
app/Http/Controllers/Portal/Invoices.php
View File

@ -111,10 +111,10 @@ class Invoices extends Controller
redirect()->route('login'); redirect()->route('login');
} }
$payment_methods = Modules::getPaymentMethods();
$payment_actions = []; $payment_actions = [];
$payment_methods = Modules::getPaymentMethods();
foreach ($payment_methods as $payment_method_key => $payment_method_value) { foreach ($payment_methods as $payment_method_key => $payment_method_value) {
$codes = explode('.', $payment_method_key); $codes = explode('.', $payment_method_key);

2
resources/views/portal/invoices/show.blade.php
View File

@ -60,7 +60,7 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
@php $is_active = true; @endphp @php $is_active = true; @endphp
@foreach ($payment_methods as $key => $name) @foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start') @stack('invoice_{{ $key }}_content_start')
<div class="tab-pane fade{{ ($is_active) ? ' show active': '' }}" id="tabs-payment-method-{{ $key }}" role="tabpanel" aria-labelledby="tabs-payment-method-{{ $key }}-tab"> <div class="tab-pane fade{{ ($is_active) ? ' show active': '' }}" id="tabs-payment-method-{{ $key }}" role="tabpanel" aria-labelledby="tabs-payment-method-{{ $key }}-tab">

13
resources/views/portal/invoices/signed.blade.php
View File

@ -66,9 +66,16 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
@php $is_active = true; @endphp @php $is_active = true; @endphp
<div class="tab-pane fade{{ ($is_active) ? ' show active': '' }}" id="tabs-payment-method" role="tabpanel" aria-labelledby="tabs-payment-method">
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component> @foreach ($payment_methods as $key => $name)
</div> @stack('invoice_{{ $key }}_content_start')
<div class="tab-pane fade{{ ($is_active) ? ' show active': '' }}" id="tabs-payment-method-{{ $key }}" role="tabpanel" aria-labelledby="tabs-payment-method-{{ $key }}-tab">
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp
@endforeach
</div> </div>
</div> </div>
</div> </div>