From dc3eb37a4d2a7ecd5e48318d3441a5f441c65493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <cihansenturk96@gmail.com>
Date: Tue, 19 Jan 2021 14:55:55 +0300
Subject: [PATCH 1/2] payment method redirectForm not working

---
 resources/assets/js/views/portal/invoices.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/views/portal/invoices.js b/resources/assets/js/views/portal/invoices.js
index 96763b4de..fb5905be7 100644
--- a/resources/assets/js/views/portal/invoices.js
+++ b/resources/assets/js/views/portal/invoices.js
@@ -85,7 +85,7 @@ const app = new Vue({
                             },
 
                             created: function() {
-                                this.form = new Form('redirect-form ');
+                                this.form = new Form('redirect-form');
                             },
 
                             data: function () {
@@ -176,7 +176,7 @@ const app = new Vue({
                             },
 
                             created: function() {
-                                this.form = new Form('redirect-form ');
+                                this.form = new Form('redirect-form');
                             },
 
                             data: function () {

From a38c8f96a4d939214cacaaf426b2ce9b5cc99af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <cihansenturk96@gmail.com>
Date: Tue, 19 Jan 2021 14:57:54 +0300
Subject: [PATCH 2/2] offline-payment portal not working confirm button

---
 modules/OfflinePayments/Http/Controllers/Payment.php     | 4 ++--
 modules/OfflinePayments/Resources/views/show.blade.php   | 5 +++--
 modules/OfflinePayments/Resources/views/signed.blade.php | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/OfflinePayments/Http/Controllers/Payment.php b/modules/OfflinePayments/Http/Controllers/Payment.php
index 06c50c194..317b60637 100644
--- a/modules/OfflinePayments/Http/Controllers/Payment.php
+++ b/modules/OfflinePayments/Http/Controllers/Payment.php
@@ -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([
             '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')]);
 
-        $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([
             'code' => $setting['code'],
diff --git a/modules/OfflinePayments/Resources/views/show.blade.php b/modules/OfflinePayments/Resources/views/show.blade.php
index 02f5aa6cb..cea70fa0a 100644
--- a/modules/OfflinePayments/Resources/views/show.blade.php
+++ b/modules/OfflinePayments/Resources/views/show.blade.php
@@ -22,8 +22,9 @@
                 <button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
                     {{ trans('general.confirm') }}
                 </button>
-                {!! Form::hidden('payment_method', $setting['code'], ['v-model' => 'form.payment_method']) !!}
-                {!! Form::hidden('type', 'income', ['v-model' => 'form.type']) !!}
+                {!! Form::hidden('payment_method', $setting['code']) !!}
+                {!! Form::hidden('type', 'income') !!}
+                
             {!! Form::close() !!}
         </div>
     </div>
diff --git a/modules/OfflinePayments/Resources/views/signed.blade.php b/modules/OfflinePayments/Resources/views/signed.blade.php
index da5ec4cbb..722b45daf 100644
--- a/modules/OfflinePayments/Resources/views/signed.blade.php
+++ b/modules/OfflinePayments/Resources/views/signed.blade.php
@@ -22,8 +22,10 @@
                 <button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
                     {{ trans('general.confirm') }}
                 </button>
-                {!! Form::hidden('payment_method', $setting['code'], ['v-model' => 'form.payment_method']) !!}
-            {!! Form::close() !!}
+                {!! Form::hidden('payment_method', $setting['code']) !!}
+                {!! Form::hidden('type', 'income') !!}
+
+                {!! Form::close() !!}
         </div>
     </div>
 </div>