From b9f9d100faf71bd9dbe1b3e7decba43c721f4ec4 Mon Sep 17 00:00:00 2001
From: Amr Ahmed <aemaddin@gmail.com>
Date: Thu, 28 Nov 2019 02:53:11 +0200
Subject: [PATCH] fixed controller issues

---
 config/knet.php                         | 5 +++--
 routes/web.php                          | 9 ++-------
 src/HasKnet.php                         | 5 +++++
 src/Http/Controllers/KnetController.php | 7 +------
 src/KnetTransaction.php                 | 4 ++--
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/config/knet.php b/config/knet.php
index cd3ea8d..19789cf 100644
--- a/config/knet.php
+++ b/config/knet.php
@@ -45,7 +45,7 @@
     | The merchant URL where Payment Gateway send the authorization response
     |
     */
-    'response_url' => env('KENT_RESPONSE_URL', '/knet/response'),
+    'response_url' => env('KENT_RESPONSE_URL') ?? url('/knet/response'),
 
     /*
     |--------------------------------------------------------------------------
@@ -56,7 +56,8 @@
     | error while processing the transaction.
     |
     */
-    'error_url' => env('KENT_ERROR_URL', '/knet/error'),
+    'error_url' => env('KENT_ERROR_URL') ?? url('/knet/error'),
+    'success_url' => env('KENT_SUCCESS_URL', '/'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/routes/web.php b/routes/web.php
index 2e6533e..3aa9d0d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,11 +12,6 @@
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('knet')->group(function () {
-    Route::post('/response', 'Asciisd\Knet\Http\Controllers\KnetController@response')->name('knet.response');
-
-    Route::middleware('auth')->group(function() {
-        Route::get('/', 'Asciisd\Knet\Http\Controllers\KnetController@index')->name('knet');
-        Route::post('/', 'Asciisd\Knet\Http\Controllers\KnetController@charge')->name('knet.charge');
-        Route::post('/error', 'Asciisd\Knet\Http\Controllers\KnetController@error')->name('knet.error');
-    });
+    Route::post('/response', 'Asciisd\Knet\Http\Controllers\KnetController@handleKnet')->name('knet.response');
+    Route::post('/error', 'Asciisd\Knet\Http\Controllers\KnetController@error')->name('knet.error');
 });
\ No newline at end of file
diff --git a/src/HasKnet.php b/src/HasKnet.php
index 61cf1e4..f3d2334 100644
--- a/src/HasKnet.php
+++ b/src/HasKnet.php
@@ -29,4 +29,9 @@ public function pay($amount, array $options = [])
 
         return $payment;
     }
+
+    public function knetTransactions()
+    {
+        return $this->hasMany(KnetTransaction::class);
+    }
 }
\ No newline at end of file
diff --git a/src/Http/Controllers/KnetController.php b/src/Http/Controllers/KnetController.php
index d2a219c..def8522 100644
--- a/src/Http/Controllers/KnetController.php
+++ b/src/Http/Controllers/KnetController.php
@@ -50,7 +50,7 @@ public function handleKnet(Request $request)
      */
     protected function successMethod($parameters = [])
     {
-        return Response('knet response handled', 200);
+        return redirect(config('knet.success_url'));
     }
 
     /**
@@ -63,9 +63,4 @@ protected function missingMethod($parameters = [])
     {
         return new Response;
     }
-
-    public function charge(Request $request)
-    {
-        return $request->user()->pay($request->input('amount'));
-    }
 }
\ No newline at end of file
diff --git a/src/KnetTransaction.php b/src/KnetTransaction.php
index 8af6653..0957db7 100644
--- a/src/KnetTransaction.php
+++ b/src/KnetTransaction.php
@@ -22,8 +22,8 @@ class KnetTransaction extends Model
      * @var array
      */
     protected $fillable = [
-        'error_text', 'paymentid', 'paid', 'result', 'auth', 'avr', 'ref', 'tranid', 'postdate', 'trackid',
-        'udf1', 'udf2', 'udf3', 'udf4', 'udf5', 'amt', 'error', 'auth_resp_code', 'livemode', 'trackid'
+        'user_id', 'error_text', 'paymentid', 'paid', 'result', 'auth', 'avr', 'ref', 'tranid', 'postdate', 'trackid',
+        'udf1', 'udf2', 'udf3', 'udf4', 'udf5', 'amt', 'error', 'auth_resp_code', 'livemode', 'trackid', 'url'
     ];
 
     /**