From 94cb623d4f3f682f9e72b2185670973b5563ea6a Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Tue, 1 Aug 2023 07:15:48 +0100
Subject: [PATCH] fix: add aggregator while payIn

---
 app/Http/Controllers/CinetpayController.php |  6 ++++--
 app/Http/Controllers/PaymentController.php  | 13 +++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/CinetpayController.php b/app/Http/Controllers/CinetpayController.php
index 7e9bc09..b0e29c2 100644
--- a/app/Http/Controllers/CinetpayController.php
+++ b/app/Http/Controllers/CinetpayController.php
@@ -79,7 +79,7 @@ class CinetpayController extends Controller
     public function pay(Request $request)
     {
         $this->validate($request, [
-            'aggregator_id' => 'required|integer',
+//            'aggregator_id' => 'required|integer',
             'amount' => 'required|numeric|min:5',
             'currency' => 'required|string|size:3',
 //            'payment_method' => 'nullable|string|in:ALL,MOBILE_MONEY,CREDIT_CARD,WALLET',
@@ -96,6 +96,8 @@ class CinetpayController extends Controller
             'reason' => 'required|string'
         ]);
 
+        $aggregator = PaymentAggregator::where('name','like','%cinetpay%')->firstOrFail();
+
         $transaction_id = $this->getTransactionID();
         $payment_method = 'ALL';
         $amount = $request->input('amount');
@@ -140,7 +142,7 @@ class CinetpayController extends Controller
         if ($responseCode == 200) {
 
             PaymentTransaction::create([
-                'aggregator_id' => $request->input('aggregator_id'),
+                'aggregator_id' => $aggregator->id,
                 "currency" => $request->input('currency'),
                 "transaction_id" => $transaction_id,
                 "amount" => $amount,
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 6cf7dd7..3671d4a 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -45,16 +45,17 @@ class PaymentController extends Controller
 
         if($payment_method == PaymentMethod::CARD){
             $aggregator = PaymentAggregator::where('name','like','%stripe%')->firstOrFail();
-            $data = $request->all();
-            $request = new Request();
-            $request->merge(array_merge($data,[
-                'payment_method' => PaymentMethod::CARD,
-                'aggregator_id' => $aggregator->id
-            ]));
         }else{
             $aggregator = PaymentAggregator::where('status',1)->firstOrFail();
+
         }
 
+        $data = $request->all();
+        $request = new Request();
+        $request->merge(array_merge($data,[
+            'aggregator_id' => $aggregator->id
+        ]));
+
         switch (strtolower($aggregator->name)) {
             case 'yoomee':
                 return app(YoomeeController::class)->pay($request);