From 86ca60afa781e3114c755eeb2f5033013b71dc25 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 23 Jul 2021 14:15:51 +1000
Subject: [PATCH] Fixes for pay trace integration

---
 app/PaymentDrivers/PayTrace/CreditCard.php   | 8 ++++----
 app/PaymentDrivers/PaytracePaymentDriver.php | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index adde39177b15..692469c86d48 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -94,7 +94,7 @@ class CreditCard
             'customer_id' => Str::random(32),
             'hpf_token' => $data['HPF_Token'],
             'enc_key' => $data['enc_key'],
-            'integrator_id' => '959195xd1CuC',
+            'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'billing_address' => $this->buildBillingAddress(),
         ];
 
@@ -123,7 +123,7 @@ class CreditCard
     private function getCustomerProfile($customer_id)
     {
         $profile = $this->paytrace_driver->gatewayRequest('/v1/customer/export', [
-            'integrator_id' => '959195xd1CuC',
+            'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'customer_id' => $customer_id,
             // 'include_bin' => true,
         ]);
@@ -171,7 +171,7 @@ class CreditCard
         $data = [
             'hpf_token' => $response_array['HPF_Token'],
             'enc_key' => $response_array['enc_key'],
-            'integrator_id' => '959195xd1CuC',
+            'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'billing_address' => $this->buildBillingAddress(),
             'amount' => $request->input('amount_with_fee'),
             'invoice_id' => $this->harvestInvoiceId(),
@@ -191,7 +191,7 @@ class CreditCard
 
         $data = [
             'customer_id' => $request->token,
-            'integrator_id' => '959195xd1CuC',
+            'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'amount' => $request->input('amount_with_fee'),
         ];
 
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 58a0dedd5b54..9b103ca28eb9 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -133,7 +133,7 @@ class PaytracePaymentDriver extends BaseDriver
 
         $data = [
             'customer_id' => $cgt->token,
-            'integrator_id' => '959195xd1CuC',
+            'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'amount' => $amount,
         ];
 
@@ -183,10 +183,8 @@ class PaytracePaymentDriver extends BaseDriver
         $url = 'https://api.paytrace.com/oauth/token';
         $data = [
             'grant_type' => 'password',
-            'username' => config('ninja.testvars.paytrace.username'),
-            'password' => config('ninja.testvars.paytrace.password'),
-            //'username' => $this->company_gateway->getConfigField('username'),
-            //'password' => $this->company_gateway->getConfigField('password')
+            'username' => $this->company_gateway->getConfigField('username'),
+            'password' => $this->company_gateway->getConfigField('password')
         ];
 
         $response = CurlUtils::post($url, $data, $headers = false);