From 9551b106e7d87657c459647d6decb46ba4a7097e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 17 Dec 2020 15:26:51 +0300
Subject: [PATCH] Offline payment portal issue solved..

---
 .../Resources/views/show.blade.php            | 45 ++++++-------------
 .../Resources/views/signed.blade.php          | 30 +++++++++++++
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/modules/OfflinePayments/Resources/views/show.blade.php b/modules/OfflinePayments/Resources/views/show.blade.php
index 316b3c3d4..0abba7b55 100644
--- a/modules/OfflinePayments/Resources/views/show.blade.php
+++ b/modules/OfflinePayments/Resources/views/show.blade.php
@@ -5,44 +5,25 @@
         @endif
 
         @if (!empty($setting['description']))
-            <div class="well well-sm">
-                {{ $setting['description'] }}
-            </div>
+            <div class="well well-sm">{{ $setting['description'] }}</div>
         @endif
     </div>
     <br>
 
     <div class="buttons">
         <div class="pull-right">
-            <input type="button" value="{{ trans('offline-payments::general.confirm') }}" id="button-confirm" class="btn btn-success" data-loading-text="{{ trans('offline-payments::general.loading') }}" />
+            {!! Form::open([
+                'url' => route("portal.invoices.offline-payments.confirm", $document->id),
+                'id' => 'redirect-form',
+                'role' => 'form',
+                'autocomplete' => "off",
+                'novalidate' => 'true'
+            ]) !!}
+                <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() !!}
         </div>
     </div>
 </div>
-
-<script type="text/javascript"><!--
-    $('#button-confirm').on('click', function() {
-        $.ajax({
-            url: '{{ route("portal.invoices.offline-payments.confirm", $invoice->id) }}',
-            type: 'POST',
-            dataType: 'JSON',
-            data: {payment_method: '{{ $setting['code'] }}'},
-            cache: false,
-            headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' },
-            beforeSend: function() {
-                $('#button-confirm').button('loading');
-            },
-            complete: function() {
-                $('#button-confirm').button('reset');
-            },
-            success: function(data) {
-                if (data['error']) {
-                    alert(data['error']);
-                }
-
-                if (data['success']) {
-                    location.reload();
-                }
-            }
-        });
-    });
-//--></script>
diff --git a/modules/OfflinePayments/Resources/views/signed.blade.php b/modules/OfflinePayments/Resources/views/signed.blade.php
index 5587f1f11..79f8fea92 100644
--- a/modules/OfflinePayments/Resources/views/signed.blade.php
+++ b/modules/OfflinePayments/Resources/views/signed.blade.php
@@ -38,3 +38,33 @@
         });
     });
     //--></script>
+
+<div>
+    <div class="d-none">
+        @if (!empty($setting['name']))
+            <h2>{{ $setting['name'] }}</h2>
+        @endif
+
+        @if (!empty($setting['description']))
+            <div class="well well-sm">{{ $setting['description'] }}</div>
+        @endif
+    </div>
+    <br>
+
+    <div class="buttons">
+        <div class="pull-right">
+            {!! Form::open([
+                'url' => urldecode($confirm_url),
+                'id' => 'redirect-form',
+                'role' => 'form',
+                'autocomplete' => "off",
+                'novalidate' => 'true'
+            ]) !!}
+                <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() !!}
+        </div>
+    </div>
+</div>