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

Merge pull request #1780 from CihanSenturk/master

Browse Source 
portal payment method issues
This commit is contained in:
Cüneyt Şentürk 2021-01-19 15:11:53 +03:00 committed by GitHub
commit ac7662cae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/OfflinePayments/Http/Controllers/Payment.php
View File

@ -29,7 +29,7 @@ class Payment extends PaymentController
} }
} }
$html = view('offline-payments::show', compact('setting', 'document'))->render(); $html = view('offline-payments::show', compact('setting', 'invoice'))->render();
return response()->json([ return response()->json([
'code' => $setting['code'], 'code' => $setting['code'],
@ -56,7 +56,7 @@ class Payment extends PaymentController
$confirm_url = URL::signedRoute('signed.invoices.offline-payments.confirm', [$invoice->id, 'company_id' => session('company_id')]); $confirm_url = URL::signedRoute('signed.invoices.offline-payments.confirm', [$invoice->id, 'company_id' => session('company_id')]);
$html = view('offline-payments::signed', compact('setting', 'document', 'confirm_url'))->render(); $html = view('offline-payments::signed', compact('setting', 'invoice', 'confirm_url'))->render();
return response()->json([ return response()->json([
'code' => $setting['code'], 'code' => $setting['code'],

5
modules/OfflinePayments/Resources/views/show.blade.php
View File

@ -22,8 +22,9 @@
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success"> <button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
{{ trans('general.confirm') }} {{ trans('general.confirm') }}
</button> </button>
{!! Form::hidden('payment_method', $setting['code'], ['v-model' => 'form.payment_method']) !!} {!! Form::hidden('payment_method', $setting['code']) !!}
{!! Form::hidden('type', 'income', ['v-model' => 'form.type']) !!} {!! Form::hidden('type', 'income') !!}
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>
</div> </div>

6
modules/OfflinePayments/Resources/views/signed.blade.php
View File

@ -22,8 +22,10 @@
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success"> <button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
{{ trans('general.confirm') }} {{ trans('general.confirm') }}
</button> </button>
{!! Form::hidden('payment_method', $setting['code'], ['v-model' => 'form.payment_method']) !!} {!! Form::hidden('payment_method', $setting['code']) !!}
{!! Form::close() !!} {!! Form::hidden('type', 'income') !!}
{!! Form::close() !!}
</div> </div>
</div> </div>
</div> </div>

4
resources/assets/js/views/portal/invoices.js vendored
View File

@ -85,7 +85,7 @@ const app = new Vue({
}, },
created: function() { created: function() {
this.form = new Form('redirect-form '); this.form = new Form('redirect-form');
}, },
data: function () { data: function () {
@ -176,7 +176,7 @@ const app = new Vue({
}, },
created: function() { created: function() {
this.form = new Form('redirect-form '); this.form = new Form('redirect-form');
}, },
data: function () { data: function () {