From 16d716230ba5014f8ac2eaea882a24a364a62de8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 24 Sep 2024 09:08:47 +1000
Subject: [PATCH] Fixes for cba

---
 app/Http/Controllers/SearchController.php              |  2 +-
 app/Models/CompanyGateway.php                          |  1 -
 app/PaymentDrivers/CBAPowerBoard/CreditCard.php        |  1 -
 app/PaymentDrivers/CBAPowerBoard/Settings.php          |  6 ++++--
 .../migrations/2024_09_06_042040_cba_powerboard.php    | 10 ++++++++--
 database/seeders/PaymentLibrariesSeeder.php            |  2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 73e13f70d68d..46b949844400 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -96,13 +96,13 @@ class SearchController extends Controller
 
     private function mapResults(array $results)
     {
+
         foreach($results as $result) {
             switch($result['_index']) {
                 case 'clients':
 
                     if($result['_source']['is_deleted']) //do not return deleted results
                         break;
-                    
 
                     $this->clients[] = [
                         'name' => $result['_source']['name'],
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index e2d939db2515..adfaad5f00f1 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -489,7 +489,6 @@ class CompanyGateway extends BaseModel
 
     public function getSettings()
     {
-        // return $this->settings;
         return $this->settings ?? new \stdClass;
     }
 
diff --git a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
index f7b924862012..50008d983f7b 100644
--- a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
+++ b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
@@ -39,7 +39,6 @@ class CreditCard implements LivewireMethodInterface
     public function authorizeView(array $data)
     {
         $data['payment_method_id'] = GatewayType::CREDIT_CARD;
-        $data['threeds'] = $this->powerboard->company_gateway->getConfigField('threeds');
 
         return render('gateways.powerboard.credit_card.authorize', $this->paymentData($data));
     }
diff --git a/app/PaymentDrivers/CBAPowerBoard/Settings.php b/app/PaymentDrivers/CBAPowerBoard/Settings.php
index 945a72f48ea7..8cbd307b60ea 100644
--- a/app/PaymentDrivers/CBAPowerBoard/Settings.php
+++ b/app/PaymentDrivers/CBAPowerBoard/Settings.php
@@ -35,8 +35,6 @@ class Settings
 
         if($r->failed())
             $r->throw();
-
-        nlog($r->object());
         
         return (new \App\PaymentDrivers\CBAPowerBoard\Models\Parse())->encode(Gateway::class."[]", $r->object()->resource->data);
 
@@ -68,7 +66,11 @@ class Settings
             default => $type = self::GATEWAY_CBA,
         };
 
+        if($type == self::GATEWAY_CBA)
+            return $this->powerboard->company_gateway->getConfigField('gatewayId') ?? $this->getGatewayByType($type);
+
         return $this->getGatewayByType($type);
+
     }
 
     private function getGatewayByType(string $gateway_type_const): mixed
diff --git a/database/migrations/2024_09_06_042040_cba_powerboard.php b/database/migrations/2024_09_06_042040_cba_powerboard.php
index 7c993e310d54..255438b06481 100644
--- a/database/migrations/2024_09_06_042040_cba_powerboard.php
+++ b/database/migrations/2024_09_06_042040_cba_powerboard.php
@@ -21,8 +21,13 @@ return new class extends Migration
         $fields->publicKey = '';
         $fields->secretKey = '';
         $fields->testMode = false;
-        $fields->threeds = false;
+        $fields->gatewayId = '';
 
+        if($gateway = Gateway::find(64)){
+            $gateway->fields = json_encode($fields);
+            $gateway->save();
+        }else{
+            
         $powerboard = new Gateway();
         $powerboard->id = 64;
         $powerboard->name = 'CBA PowerBoard';
@@ -34,7 +39,8 @@ return new class extends Migration
         $powerboard->fields = json_encode($fields);
         $powerboard->save();
 
-
+        }
+        
         Schema::table("company_gateways", function (\Illuminate\Database\Schema\Blueprint $table){
             $table->text('settings')->nullable();
         });
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index 970ad5cecb2e..d4cf01d6966d 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -89,7 +89,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 61, 'name' => 'PayPal Platform', 'provider' => 'PayPal_PPCP', 'key' => '80af24a6a691230bbec33e930ab40666', 'fields' => '{"testMode":false}'],
             ['id' => 62, 'name' => 'BTCPay', 'provider' => 'BTCPay', 'key' => 'vpyfbmdrkqcicpkjqdusgjfluebftuva', 'fields' => '{"btcpayUrl":"", "apiKey":"", "storeId":"", "webhookSecret":""}'],
             ['id' => 63, 'name' => 'Rotessa', 'is_offsite' => false, 'sort_order' => 22, 'provider' => 'Rotessa', 'key' => '91be24c7b792230bced33e930ac61676', 'fields' => '{"apiKey":"", "testMode":false}'],
-            ['id' => 64, 'name' => 'CBA PowerBoard', 'is_offsite' => false, 'sort_order' => 26, 'provider' => 'CBAPowerBoard', 'key' => 'b67581d804dbad1743b61c57285142ad', 'fields' => '{"publicKey":"", "secretKey":"", "testMode":false, "Threeds":true}'],
+            ['id' => 64, 'name' => 'CBA PowerBoard', 'is_offsite' => false, 'sort_order' => 26, 'provider' => 'CBAPowerBoard', 'key' => 'b67581d804dbad1743b61c57285142ad', 'fields' => '{"publicKey":"", "secretKey":"", "testMode":false, "gatewayId":""}'],
             ['id' => 65, 'name' => 'Blockonomics', 'is_offsite' => false, 'sort_order' => 27, 'provider' => 'Blockonomics', 'key' => 'wbhf02us6owgo7p4nfjd0ymssdshks4d', 'fields' => '{"apiKey":"", "callbackSecret":""}'],
         ];