From c0287085b5c59f91b53da300f246cfc1a473a757 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 20 Jul 2021 21:26:24 +1000
Subject: [PATCH 01/16] Scaffolding Paytrace

---
 app/Console/Commands/CreateAccount.php        |   1 +
 app/Models/CompanyGateway.php                 |   8 +-
 app/Models/SystemLog.php                      |   2 +-
 app/PaymentDrivers/PayTrace/CreditCard.php    | 121 +++++++++++++
 app/PaymentDrivers/PaytracePaymentDriver.php  | 123 +++++++++++++
 ...95537_activate_paytrace_payment_driver.php |  29 ++++
 database/seeders/PaymentLibrariesSeeder.php   |   4 +-
 .../gateways/paytrace/authorize.blade.php     | 162 ++++++++++++++++++
 .../ninja2020/gateways/paytrace/pay.blade.php |   0
 .../livewire/simple-bootstrap.blade.php       |  29 ++++
 10 files changed, 474 insertions(+), 5 deletions(-)
 create mode 100644 app/PaymentDrivers/PayTrace/CreditCard.php
 create mode 100644 app/PaymentDrivers/PaytracePaymentDriver.php
 create mode 100644 database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
 create mode 100644 resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
 create mode 100644 resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
 create mode 100644 resources/views/vendor/livewire/simple-bootstrap.blade.php

diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php
index 689ba262b0b5..b210981e16ba 100644
--- a/app/Console/Commands/CreateAccount.php
+++ b/app/Console/Commands/CreateAccount.php
@@ -91,6 +91,7 @@ class CreateAccount extends Command
         $account = Account::factory()->create();
         $company = Company::factory()->create([
             'account_id' => $account->id,
+            'domain' => config('ninja.app_url'),
         ]);
 
         $account->default_company_id = $company->id;
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index b9105b566e9e..1204b8e0ea1a 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -69,16 +69,20 @@ class CompanyGateway extends BaseModel
     // const TYPE_CUSTOM = 306;
     // const TYPE_BRAINTREE = 307;
     // const TYPE_WEPAY = 309;
+    // const TYPE_PAYFAST = 310;
+    // const TYPE_PAYTRACE = 311;
 
     public $gateway_consts = [
         '38f2c48af60c7dd69e04248cbb24c36e' => 300,
         'd14dd26a37cecc30fdd65700bfb55b23' => 301,
+        'd14dd26a47cecc30fdd65700bfb67b34' => 301,
         '3758e7f7c6f4cecf0f4f348b9a00f456' => 304,
         '3b6621f970ab18887c4f6dca78d3f8bb' => 305,
         '54faab2ab6e3223dbe848b1686490baa' => 306,
-        'd14dd26a47cecc30fdd65700bfb67b34' => 301,
-        '8fdeed552015b3c7b44ed6c8ebd9e992' => 309,
         'f7ec488676d310683fb51802d076d713' => 307,
+        '8fdeed552015b3c7b44ed6c8ebd9e992' => 309,
+        'd6814fc83f45d2935e7777071e629ef9' => 310,
+        'bbd736b3254b0aabed6ad7fda1298c88' => 311,
     ];
 
     protected $touches = [];
diff --git a/app/Models/SystemLog.php b/app/Models/SystemLog.php
index 7614c01ecccc..5e933edfe8a1 100644
--- a/app/Models/SystemLog.php
+++ b/app/Models/SystemLog.php
@@ -68,7 +68,7 @@ class SystemLog extends Model
     const TYPE_BRAINTREE = 307;
     const TYPE_WEPAY = 309;
     const TYPE_PAYFAST = 310;
-    
+    const TYPE_PAYTRACE = 311;
 
     const TYPE_QUOTA_EXCEEDED = 400;
     const TYPE_UPSTREAM_FAILURE = 401;
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
new file mode 100644
index 000000000000..58937195e553
--- /dev/null
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\PaymentDrivers\PayTrace;
+
+use App\Exceptions\PaymentFailed;
+use App\Jobs\Mail\PaymentFailureMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Models\ClientGatewayToken;
+use App\Models\GatewayType;
+use App\Models\Payment;
+use App\Models\PaymentHash;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+use App\PaymentDrivers\PayFastPaymentDriver;
+use App\PaymentDrivers\PaytracePaymentDriver;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+
+class CreditCard
+{
+
+    public $paytrace_driver;
+
+    public function __construct(PaytracePaymentDriver $paytrace_driver)
+    {
+        $this->paytrace_driver = $paytrace_driver;
+    }
+
+    public function authorizeView($data)
+    {
+        
+        $data['client_key'] = $this->paytrace_driver->getAuthToken();
+
+        return render('gateways.paytrace.authorize', $data);
+    }
+
+
+ 	public function authorizeResponse($request)
+ 	{
+        $data = $request->all();
+
+        return response()->json([], 200);
+
+ 	}  
+
+    public function paymentView($data)
+    {
+
+
+        return render('gateways.paytrace.pay', $data);
+
+    }
+
+
+    public function paymentResponse(Request $request)
+    {
+        $response_array = $request->all();
+
+
+
+        // if($response_array['payment_status'] == 'COMPLETE') {
+
+        //     $this->payfast->logSuccessfulGatewayResponse(['response' => $response_array, 'data' => $this->paytrace_driver->payment_hash], SystemLog::TYPE_PAYFAST);
+
+        //     return $this->processSuccessfulPayment($response_array);
+        // }
+        // else {
+        //     $this->processUnsuccessfulPayment($response_array);
+        // }
+    }
+
+    private function processSuccessfulPayment($response_array)
+    {
+
+
+
+        // $payment = $this->paytrace_driver->createPayment($payment_record, Payment::STATUS_COMPLETED);
+
+
+    }
+
+    private function processUnsuccessfulPayment($server_response)
+    {
+        // PaymentFailureMailer::dispatch($this->paytrace_driver->client, $server_response->cancellation_reason, $this->paytrace_driver->client->company, $server_response->amount);
+
+        // PaymentFailureMailer::dispatch(
+        //     $this->paytrace_driver->client,
+        //     $server_response,
+        //     $this->paytrace_driver->client->company,
+        //     $server_response['amount_gross']
+        // );
+
+        // $message = [
+        //     'server_response' => $server_response,
+        //     'data' => $this->paytrace_driver->payment_hash->data,
+        // ];
+
+        // SystemLogger::dispatch(
+        //     $message,
+        //     SystemLog::CATEGORY_GATEWAY_RESPONSE,
+        //     SystemLog::EVENT_GATEWAY_FAILURE,
+        //     SystemLog::TYPE_PAYFAST,
+        //     $this->payfast->client,
+        //     $this->payfast->client->company,
+        // );
+
+        // throw new PaymentFailed('Failed to process the payment.', 500);
+    }
+
+}
\ No newline at end of file
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
new file mode 100644
index 000000000000..94049366d250
--- /dev/null
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\PaymentDrivers;
+
+use App\Models\ClientGatewayToken;
+use App\Models\GatewayType;
+use App\Models\Payment;
+use App\Models\PaymentHash;
+use App\Models\SystemLog;
+use App\PaymentDrivers\PayTrace\CreditCard;
+use App\Utils\CurlUtils;
+use App\Utils\Traits\MakesHash;
+
+class PaytracePaymentDriver extends BaseDriver
+{
+    use MakesHash;
+    
+    public $refundable = true; 
+
+    public $token_billing = true; 
+
+    public $can_authorise_credit_card = true; 
+
+    public $gateway; 
+
+    public $payment_method; 
+
+    public static $methods = [
+        GatewayType::CREDIT_CARD => CreditCard::class, //maps GatewayType => Implementation class
+    ];
+
+    const SYSTEM_LOG_TYPE = SystemLog::TYPE_PAYTRACE; //define a constant for your gateway ie TYPE_YOUR_CUSTOM_GATEWAY - set the const in the SystemLog model
+
+    public function init()
+    {
+        return $this; /* This is where you boot the gateway with your auth credentials*/
+    }
+
+    /* Returns an array of gateway types for the payment gateway */
+    public function gatewayTypes(): array
+    {
+        $types = [];
+
+            $types[] = GatewayType::CREDIT_CARD;
+
+        return $types;
+    }
+
+    /* Sets the payment method initialized */
+    public function setPaymentMethod($payment_method_id)
+    {
+        $class = self::$methods[$payment_method_id];
+        $this->payment_method = new $class($this);
+        return $this;
+    }
+
+    public function authorizeView(array $data)
+    {
+        return $this->payment_method->authorizeView($data); //this is your custom implementation from here
+    }
+
+    public function authorizeResponse($request)
+    {
+        return $this->payment_method->authorizeResponse($request);  //this is your custom implementation from here
+    }
+
+    public function processPaymentView(array $data)
+    {
+        return $this->payment_method->paymentView($data);  //this is your custom implementation from here
+    }
+
+    public function processPaymentResponse($request)
+    {
+        return $this->payment_method->paymentResponse($request); //this is your custom implementation from here
+    }
+
+    public function refund(Payment $payment, $amount, $return_client_response = false)
+    {
+        return $this->payment_method->yourRefundImplementationHere(); //this is your custom implementation from here
+    }
+
+    public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
+    {
+        return $this->payment_method->yourTokenBillingImplmentation(); //this is your custom implementation from here
+    }
+
+    public function processWebhookRequest(PaymentWebhookRequest $request, Payment $payment = null)
+    {
+    }
+
+    /*Helpers*/
+
+    public function getAuthToken()
+    {
+
+        $url = 'https://api.paytrace.com/oauth/token';
+        $data = [
+            'grant_type' => 'password',
+            'username' => $this->company_gateway->getConfigField('username'),
+            'password' => $this->company_gateway->getConfigField('password')
+        ];
+
+        $response = CurlUtils::post($url, $data, $headers = false);
+
+        if($response)
+        {
+            $auth_data = json_decode($response);
+
+            return $auth_data->access_token;
+        }
+
+        return false;
+    }
+}
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
new file mode 100644
index 000000000000..5d9743c35714
--- /dev/null
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -0,0 +1,29 @@
+<?php
+
+use App\Models\Gateway;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ActivatePaytracePaymentDriver extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Gateway::query()->where('id', 46)->update(['visible' => true, 'provider' => 'Paytrace']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index b9ff0f84146f..e6d31f414fe4 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -70,7 +70,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 43, 'name' => 'Fasapay', 'provider' => 'Fasapay', 'key' => '1b2cef0e8c800204a29f33953aaf3360', 'fields' => ''],
             ['id' => 44, 'name' => 'Komoju', 'provider' => 'Komoju', 'key' => '7ea2d40ecb1eb69ef8c3d03e5019028a', 'fields' => '{"apiKey":"","accountId":"","paymentMethod":"credit_card","testMode":false,"locale":"en"}'],
             ['id' => 45, 'name' => 'Paysafecard', 'provider' => 'Paysafecard', 'key' => '70ab90cd6c5c1ab13208b3cef51c0894', 'fields' => '{"username":"","password":"","testMode":false}'],
-            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace_CreditCard', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
+            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
             ['id' => 47, 'name' => 'Secure Trading', 'provider' => 'SecureTrading', 'key' => '231cb401487b9f15babe04b1ac4f7a27', 'fields' => '{"siteReference":"","username":"","password":"","applyThreeDSecure":false,"accountType":"ECOM"}'],
             ['id' => 48, 'name' => 'SecPay', 'provider' => 'SecPay', 'key' => 'bad8699d581d9fa040e59c0bb721a76c', 'fields' => '{"mid":"","vpnPswd":"","remotePswd":"","usageType":"","confirmEmail":"","testStatus":"true","mailCustomer":"true","additionalOptions":""}'],
             ['id' => 49, 'name' => 'WePay', 'provider' => 'WePay', 'is_offsite' => false, 'sort_order' => 3, 'key' => '8fdeed552015b3c7b44ed6c8ebd9e992', 'fields' => '{"accountId":"","accessToken":"","type":"goods","testMode":false,"feePayer":"payee"}'],
@@ -96,7 +96,7 @@ class PaymentLibrariesSeeder extends Seeder
 
         Gateway::query()->update(['visible' => 0]);
 
-        Gateway::whereIn('id', [1,15,20,39,55,50])->update(['visible' => 1]);
+        Gateway::whereIn('id', [1,15,20,39,46,55,50])->update(['visible' => 1]);
 
         if (Ninja::isHosted()) {
             Gateway::whereIn('id', [20])->update(['visible' => 0]);
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
new file mode 100644
index 000000000000..061901fb3dd2
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -0,0 +1,162 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => ctrans('texts.credit_card'), 'card_title' => ctrans('texts.credit_card')])
+
+@section('gateway_head')
+@endsection
+
+@section('gateway_content')
+    
+    @if(!Request::isSecure())
+        <p class="alert alert-failure">{{ ctrans('texts.https_required') }}</p>
+    @endif
+
+    <div class="alert alert-failure mb-4" hidden id="errors"></div>
+
+    <div class="w-screen items-center">
+
+        <div id='pt_hpf_form'><!--iframe sensitive data payment fields inserted here--></div>
+
+    </div>
+
+    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::CREDIT_CARD]) }}" id="ProtectForm">
+
+    <div class="bg-white px-4 py-5 flex justify-end">
+        <button
+            type="submit"
+            id="{{ $id ?? 'pay-now' }}"
+            class="button button-primary bg-primary {{ $class ?? '' }}">
+            <span>{{ ctrans('texts.add_payment_method') }}</span>
+        </button>
+    </div>
+
+    </form>
+@endsection
+
+@section('gateway_footer')
+
+<script src='https://protect.paytrace.com/js/protect.min.js'></script>
+
+<script>
+
+  // Minimal Protect.js setup call
+  PTPayment.setup({
+   styles:
+  {
+   'code': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'border_style':'dotted',
+    'font_size':'13pt',
+    'input_border_radius':'10px',
+    'input_border_width':'2px',
+    'input_font':'serif, cursive, fantasy',
+    'input_font_weight':'700',
+    'input_margin':'5px 0px 5px 20px',
+    'input_padding':'0px 5px 0px 5px',
+    'label_color':'#5D99CA',
+    'label_size':'16px',
+    'label_width':'150px',
+    'label_font':'sans-serif, arial, serif',
+    'label_font_weight':'bold',
+    'label_margin':'5px 0px 0px 20px',
+    'label_padding':'2px 5px 2px 5px',
+    'label_border_style':'dotted',
+    'label_border_color':'#EF9F6D',
+    'label_border_radius':'10px',
+    'label_border_width':'2px',
+    'background_color':'white',
+    'height':'25px',
+    'width':'110px',
+    'padding_bottom':'2px'
+   },
+   'cc': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'border_style':'solid',
+    'font_size':'13pt',
+    'input_border_radius':'20px',
+    'input_border_width':'2px',
+    'input_font':'Times New Roman, arial, fantasy',
+    'input_font_weight':'400',
+    'input_margin':'5px 0px 5px 0px',
+    'input_padding':'0px 5px 0px 5px',
+    'label_color':'#5D99CA',
+    'label_size':'16px',
+    'label_width':'150px',
+    'label_font':'Times New Roman, sans-serif, serif',
+    'label_font_weight':'light',
+    'label_margin':'5px 0px 0px 0px',
+    'label_padding':'0px 5px 0px 5px',
+    'label_border_style':'solid',
+    'label_border_color':'#EF9F6D',
+    'label_border_radius':'20px',
+    'label_border_width':'2px',
+    'background_color':'white',
+    'height':'25px',
+    'width':'320px',
+    'padding_bottom':'0px'
+   },
+   'exp': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'border_style':'dashed',
+    'font_size':'12pt',
+    'input_border_radius':'0px',
+    'input_border_width':'2px',
+    'input_font':'arial, cursive, fantasy',
+    'input_font_weight':'400',
+    'input_margin':'5px 0px 5px 0px',
+    'input_padding':'0px 5px 0px 5px',
+    'label_color':'#5D99CA',
+    'label_size':'16px',
+    'label_width':'150px',
+    'label_font':'arial, fantasy, serif',
+    'label_font_weight':'normal',
+    'label_margin':'5px 0px 0px 0px',
+    'label_padding':'2px 5px 2px 5px',
+    'label_border_style':'dashed',
+    'label_border_color':'#EF9F6D',
+    'label_border_radius':'0px',
+    'label_border_width':'2px',
+    'background_color':'white',
+    'height':'25px',
+    'width':'85px',
+    'padding_bottom':'2px',
+    'type':'dropdown'
+   },
+   'body': {
+    'background_color':'white'
+   }
+  },    
+    authorization: { clientKey: "{!! $client_key !!}" }
+  }).then(function(instance){
+      //use instance object to process and tokenize sensitive data payment fields.
+PTPayment.theme('above the line');
+
+  });
+
+
+
+  // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
+document.getElementById("ProtectForm").addEventListener("submit",function(e){
+ e.preventDefault();
+ e.stopPropagation();
+
+// To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
+PTPayment.validate(function(validationErrors) {
+ if (validationErrors.length >= 1) {
+  if (validationErrors[0]['responseCode'] == '35') {
+   // Handle validation Errors here
+   // This is an example of using dynamic styling to show the Credit card number entered is invalid
+   PTPayment.style({'cc': {'border_color': 'red'}});
+  }
+ } else {
+   // no error so tokenize
+   instance.process()
+   .then( (r) => submitPayment(r) )
+   .catch( (err) => handleError(err) );
+ }
+});// end of PTPayment.validate
+});// end of add event listener submit
+</script>
+
+@endsection
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/resources/views/vendor/livewire/simple-bootstrap.blade.php b/resources/views/vendor/livewire/simple-bootstrap.blade.php
new file mode 100644
index 000000000000..dbc374434911
--- /dev/null
+++ b/resources/views/vendor/livewire/simple-bootstrap.blade.php
@@ -0,0 +1,29 @@
+<div>
+    @if ($paginator->hasPages())
+        <nav>
+            <ul class="pagination">
+                {{-- Previous Page Link --}}
+                @if ($paginator->onFirstPage())
+                    <li class="page-item disabled" aria-disabled="true">
+                        <span class="page-link">@lang('pagination.previous')</span>
+                    </li>
+                @else
+                    <li class="page-item">
+                        <button type="button" class="page-link" wire:click="previousPage" wire:loading.attr="disabled" rel="prev">@lang('pagination.previous')</button>
+                    </li>
+                @endif
+
+                {{-- Next Page Link --}}
+                @if ($paginator->hasMorePages())
+                    <li class="page-item">
+                        <button type="button" class="page-link" wire:click="nextPage" wire:loading.attr="disabled" rel="next">@lang('pagination.next')</button>
+                    </li>
+                @else
+                    <li class="page-item disabled" aria-disabled="true">
+                        <span class="page-link">@lang('pagination.next')</span>
+                    </li>
+                @endif
+            </ul>
+        </nav>
+    @endif
+</div>

From df7d20fa76d819eaaf88a5765cc504cd4d53b1a6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 07:53:11 +1000
Subject: [PATCH 02/16] Scaffolding Paytrace

---
 .../gateways/paytrace/authorize.blade.php     | 99 ++-----------------
 1 file changed, 7 insertions(+), 92 deletions(-)

diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
index 061901fb3dd2..794117356a92 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -39,103 +39,12 @@
 
   // Minimal Protect.js setup call
   PTPayment.setup({
-   styles:
-  {
-   'code': {
-    'font_color':'#5D99CA',
-    'border_color':'#EF9F6D',
-    'border_style':'dotted',
-    'font_size':'13pt',
-    'input_border_radius':'10px',
-    'input_border_width':'2px',
-    'input_font':'serif, cursive, fantasy',
-    'input_font_weight':'700',
-    'input_margin':'5px 0px 5px 20px',
-    'input_padding':'0px 5px 0px 5px',
-    'label_color':'#5D99CA',
-    'label_size':'16px',
-    'label_width':'150px',
-    'label_font':'sans-serif, arial, serif',
-    'label_font_weight':'bold',
-    'label_margin':'5px 0px 0px 20px',
-    'label_padding':'2px 5px 2px 5px',
-    'label_border_style':'dotted',
-    'label_border_color':'#EF9F6D',
-    'label_border_radius':'10px',
-    'label_border_width':'2px',
-    'background_color':'white',
-    'height':'25px',
-    'width':'110px',
-    'padding_bottom':'2px'
-   },
-   'cc': {
-    'font_color':'#5D99CA',
-    'border_color':'#EF9F6D',
-    'border_style':'solid',
-    'font_size':'13pt',
-    'input_border_radius':'20px',
-    'input_border_width':'2px',
-    'input_font':'Times New Roman, arial, fantasy',
-    'input_font_weight':'400',
-    'input_margin':'5px 0px 5px 0px',
-    'input_padding':'0px 5px 0px 5px',
-    'label_color':'#5D99CA',
-    'label_size':'16px',
-    'label_width':'150px',
-    'label_font':'Times New Roman, sans-serif, serif',
-    'label_font_weight':'light',
-    'label_margin':'5px 0px 0px 0px',
-    'label_padding':'0px 5px 0px 5px',
-    'label_border_style':'solid',
-    'label_border_color':'#EF9F6D',
-    'label_border_radius':'20px',
-    'label_border_width':'2px',
-    'background_color':'white',
-    'height':'25px',
-    'width':'320px',
-    'padding_bottom':'0px'
-   },
-   'exp': {
-    'font_color':'#5D99CA',
-    'border_color':'#EF9F6D',
-    'border_style':'dashed',
-    'font_size':'12pt',
-    'input_border_radius':'0px',
-    'input_border_width':'2px',
-    'input_font':'arial, cursive, fantasy',
-    'input_font_weight':'400',
-    'input_margin':'5px 0px 5px 0px',
-    'input_padding':'0px 5px 0px 5px',
-    'label_color':'#5D99CA',
-    'label_size':'16px',
-    'label_width':'150px',
-    'label_font':'arial, fantasy, serif',
-    'label_font_weight':'normal',
-    'label_margin':'5px 0px 0px 0px',
-    'label_padding':'2px 5px 2px 5px',
-    'label_border_style':'dashed',
-    'label_border_color':'#EF9F6D',
-    'label_border_radius':'0px',
-    'label_border_width':'2px',
-    'background_color':'white',
-    'height':'25px',
-    'width':'85px',
-    'padding_bottom':'2px',
-    'type':'dropdown'
-   },
-   'body': {
-    'background_color':'white'
-   }
-  },    
+  
     authorization: { clientKey: "{!! $client_key !!}" }
   }).then(function(instance){
       //use instance object to process and tokenize sensitive data payment fields.
 PTPayment.theme('above the line');
 
-  });
-
-
-
   // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
 document.getElementById("ProtectForm").addEventListener("submit",function(e){
  e.preventDefault();
@@ -157,6 +66,12 @@ PTPayment.validate(function(validationErrors) {
  }
 });// end of PTPayment.validate
 });// end of add event listener submit
+
+  });
+
+
+
+
 </script>
 
 @endsection

From 75ac7ec48cbc19f612d5f74be6a8773c0d7e291b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 09:21:32 +1000
Subject: [PATCH 03/16] minor fixes

---
 app/Console/Commands/CreateAccount.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php
index b210981e16ba..b6c51e992858 100644
--- a/app/Console/Commands/CreateAccount.php
+++ b/app/Console/Commands/CreateAccount.php
@@ -91,7 +91,8 @@ class CreateAccount extends Command
         $account = Account::factory()->create();
         $company = Company::factory()->create([
             'account_id' => $account->id,
-            'domain' => config('ninja.app_url'),
+            'portal_domain' => config('ninja.app_url'),
+            'portal_mode' => 'domain',
         ]);
 
         $account->default_company_id = $company->id;

From 0d52d57d411f69a1c6d17e40173face4f0529eb5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 10:43:39 +1000
Subject: [PATCH 04/16] Paytrace

---
 app/PaymentDrivers/PaytracePaymentDriver.php  |  12 +-
 .../gateways/paytrace/authorize.blade.php     | 128 ++++++++++++++----
 2 files changed, 110 insertions(+), 30 deletions(-)

diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 94049366d250..8e95e6f4f701 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -115,7 +115,17 @@ class PaytracePaymentDriver extends BaseDriver
         {
             $auth_data = json_decode($response);
 
-            return $auth_data->access_token;
+            $headers = [];
+            $headers[] = 'Content-type: application/json';
+            $headers[] = 'Authorization: Bearer '.$auth_data->access_token;
+
+            $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
+
+            $response = json_decode($response);
+
+            if($response)
+                return $response->clientKey;
+
         }
 
         return false;
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
index 794117356a92..ac3968e7808a 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -10,6 +10,7 @@
     @endif
 
     <div class="alert alert-failure mb-4" hidden id="errors"></div>
+    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::CREDIT_CARD]) }}" id="ProtectForm">
 
     <div class="w-screen items-center">
 
@@ -17,7 +18,11 @@
 
     </div>
 
-    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::CREDIT_CARD]) }}" id="ProtectForm">
+
+            <input type="txt" id=HPF_Token name= HPF_Token hidden>
+            <input type="txt" id=enc_key name = enc_key hidden>
+            <input type="txt" id=amount name = amount value="Amount"><br><br>
+            <input type="submit" value="Submit" id="SubmitButton"/>
 
     <div class="bg-white px-4 py-5 flex justify-end">
         <button
@@ -38,40 +43,105 @@
 <script>
 
   // Minimal Protect.js setup call
-  PTPayment.setup({
-  
-    authorization: { clientKey: "{!! $client_key !!}" }
-  }).then(function(instance){
-      //use instance object to process and tokenize sensitive data payment fields.
-PTPayment.theme('above the line');
-
-  // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
-document.getElementById("ProtectForm").addEventListener("submit",function(e){
- e.preventDefault();
- e.stopPropagation();
-
-// To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
-PTPayment.validate(function(validationErrors) {
- if (validationErrors.length >= 1) {
-  if (validationErrors[0]['responseCode'] == '35') {
-   // Handle validation Errors here
-   // This is an example of using dynamic styling to show the Credit card number entered is invalid
-   PTPayment.style({'cc': {'border_color': 'red'}});
+PTPayment.setup({
+  styles:
+  {
+   'code': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'dotted',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'100px'
+ },
+   'cc': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'solid',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'300px'
+ },
+   'exp': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'dashed',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'85px',
+    'type':'dropdown'
   }
- } else {
-   // no error so tokenize
-   instance.process()
-   .then( (r) => submitPayment(r) )
-   .catch( (err) => handleError(err) );
- }
-});// end of PTPayment.validate
-});// end of add event listener submit
+ },
+  authorization: { 'clientKey': "{!! $client_key !!}" }
+}).then(function(instance){
 
-  });
+
+ PTPayment.getControl("securityCode").label.text("CSC");
+                  PTPayment.getControl("creditCard").label.text("CC#");
+                  PTPayment.getControl("expiration").label.text("Exp Date");
+                  //PTPayment.style({'cc': {'label_color': 'red'}});
+                  //PTPayment.style({'code': {'label_color': 'red'}});
+                  //PTPayment.style({'exp': {'label_color': 'red'}});
+                  //PTPayment.style({'exp':{'type':'dropdown'}});
+
+                  //PTPayment.theme('horizontal');
+                  // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
+                  document.getElementById("ProtectForm").addEventListener("submit",function(e){
+                   e.preventDefault();
+                   e.stopPropagation();
+
+                  // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
+                  PTPayment.validate(function(validationErrors) {
+                   if (validationErrors.length >= 1) {
+                    if (validationErrors[0]['responseCode'] == '35') {
+                     // Handle validation Errors here
+                     // This is an example of using dynamic styling to show the Credit card number entered is invalid
+                     instance.style({'cc': {'border_color': 'red'}});
+                    }
+                   } else {
+                     // no error so tokenize
+                     instance.process()
+                     .then( (r) => {
+                        submitPayment(r);
+                        }, (err) => {
+                        handleError(err);
+                        });
+                   }
+              });
+
+              });
 
 
 
 
+});
+
+
+function handleError(err){
+
+
+  document.write(JSON.stringify(err));
+}
+
+function submitPayment(r){
+
+  var hpf_token = document.getElementById("HPF_Token");
+  var enc_key = document.getElementById("enc_key");
+  hpf_token.value = r.message.hpf_token;
+  enc_key.value = r.message.enc_key;
+  document.getElementById("ProtectForm").submit();
+
+}
+
 </script>
 
 @endsection

From 87e1ba48e94ac1ebede7fe9a338caa3856aad2d5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 14:23:33 +1000
Subject: [PATCH 05/16] Paytrace integration

---
 .../Payments/PaymentWebhookRequest.php        |  4 +-
 app/PaymentDrivers/PayTrace/CreditCard.php    | 52 +++++++++++-
 app/PaymentDrivers/PaytracePaymentDriver.php  | 32 ++++++--
 .../gateways/paytrace/authorize.blade.php     | 79 +++++++++----------
 4 files changed, 117 insertions(+), 50 deletions(-)

diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php
index ea11d0af2056..50bc276c14ae 100644
--- a/app/Http/Requests/Payments/PaymentWebhookRequest.php
+++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php
@@ -74,9 +74,9 @@ class PaymentWebhookRequest extends Request
     {
         // For testing purposes we'll slow down the webhook processing by 2 seconds
         // to make sure webhook request doesn't came before our processing.
-        if (app()->environment() !== 'production') {
+        //if (app()->environment() !== 'production') {
             sleep(2);
-        }
+        //}
 
         // Some gateways, like Checkout, we can dynamically pass payment hash,
         // which we will resolve here and get payment information from it.
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index 58937195e553..bc80c3a6a508 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -41,6 +41,7 @@ class CreditCard
     {
         
         $data['client_key'] = $this->paytrace_driver->getAuthToken();
+        $data['gateway'] = $this->paytrace_driver;
 
         return render('gateways.paytrace.authorize', $data);
     }
@@ -49,8 +50,57 @@ class CreditCard
  	public function authorizeResponse($request)
  	{
         $data = $request->all();
+        
+        nlog($data);
 
-        return response()->json([], 200);
+        $post_data = [
+            'customer_id' => Str::random(32),
+            'hpf_token' => $data['HPF_Token'],
+            'enc_key' => $data['enc_key'],
+            'integrator_id' => '959195xd1CuC',
+            'billing_address' => [
+                'name' => $this->paytrace_driver->client->present()->name(),
+                'street_address' => $this->paytrace_driver->client->address1,
+                'city' => $this->paytrace_driver->client->city,
+                'state' => $this->paytrace_driver->client->state,
+                'zip' => $this->paytrace_driver->client->postal_code
+            ],
+        ];
+        
+        nlog($post_data);
+
+        //  "_token" => "Vl1xHflBYQt9YFSaNCPTJKlY5x3rwcFE9kvkw71I"
+        //   "company_gateway_id" => "1"
+        //   "HPF_Token" => "e484a92c-90ed-4468-ac4d-da66824c75de"
+        //   "enc_key" => "zqz6HMHCXALWdX5hyBqrIbSwU7TBZ0FTjjLB3Cp0FQY="
+        //   "amount" => "Amount"
+        //   "q" => "/client/payment_methods"
+        //   "method" => "1"
+        // ]
+
+        // "customer_id":"customer789",
+        // "hpf_token":"e369847e-3027-4174-9161-fa0d4e98d318",
+        // "enc_key":"lI785yOBMet4Rt9o4NLXEyV84WBU3tdStExcsfoaOoo=",
+        // "integrator_id":"xxxxxxxxxx",
+        // "billing_address":{
+        //     "name":"Mark Smith",
+        //     "street_address":"8320 E. West St.",
+        //     "city":"Spokane",
+        //     "state":"WA",
+        //     "zip":"85284"
+        // }
+        $response = $this->paytrace_driver->gatewayRequest('/v1/customer/pt_protect_create', $post_data);
+
+        // dd($response);
+
+  // +"success": true
+  // +"response_code": 160
+  // +"status_message": "The customer profile for PLS5U60OoLUfQXzcmtJYNefPA0gTthzT/11 was successfully created."
+  // +"customer_id": "PLS5U60OoLUfQXzcmtJYNefPA0gTthzT"
+
+
+        // make a cc card out of that bra
+        return redirect()->route('client.payment_methods.index');
 
  	}  
 
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 8e95e6f4f701..025ab5d0013f 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -98,8 +98,7 @@ class PaytracePaymentDriver extends BaseDriver
     }
 
     /*Helpers*/
-
-    public function getAuthToken()
+    private function generateAuthHeaders()
     {
 
         $url = 'https://api.paytrace.com/oauth/token';
@@ -111,14 +110,21 @@ class PaytracePaymentDriver extends BaseDriver
 
         $response = CurlUtils::post($url, $data, $headers = false);
 
-        if($response)
-        {
-            $auth_data = json_decode($response);
+        $auth_data = json_decode($response);
 
             $headers = [];
             $headers[] = 'Content-type: application/json';
             $headers[] = 'Authorization: Bearer '.$auth_data->access_token;
 
+        return $headers;
+
+    }
+
+    public function getAuthToken()
+    {
+
+            $headers = $this->generateAuthHeaders();
+
             $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
 
             $response = json_decode($response);
@@ -126,7 +132,21 @@ class PaytracePaymentDriver extends BaseDriver
             if($response)
                 return $response->clientKey;
 
-        }
+        return false;
+    }
+
+    public function gatewayRequest($uri, $data, $headers = false)
+    {
+        $base_url = "https://api.paytrace.com{$uri}";
+
+        $headers = $this->generateAuthHeaders();
+
+        $response = CurlUtils::post($base_url, json_encode($data), $headers);
+
+        $response = json_decode($response);
+
+        if($response)
+            return $response;
 
         return false;
     }
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
index ac3968e7808a..401a35cdb43f 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -10,7 +10,8 @@
     @endif
 
     <div class="alert alert-failure mb-4" hidden id="errors"></div>
-    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::CREDIT_CARD]) }}" id="ProtectForm">
+    <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::CREDIT_CARD]) }}"  method="post" id="server_response">
+        @csrf
 
     <div class="w-screen items-center">
 
@@ -18,11 +19,9 @@
 
     </div>
 
-
-            <input type="txt" id=HPF_Token name= HPF_Token hidden>
-            <input type="txt" id=enc_key name = enc_key hidden>
-            <input type="txt" id=amount name = amount value="Amount"><br><br>
-            <input type="submit" value="Submit" id="SubmitButton"/>
+    <input type="hidden" name="company_gateway_id" value="{{ $gateway->company_gateway->id }}">
+    <input type="txt" id=HPF_Token name= HPF_Token hidden>
+    <input type="txt" id=enc_key name= enc_key hidden>
 
     <div class="bg-white px-4 py-5 flex justify-end">
         <button
@@ -85,43 +84,40 @@ PTPayment.setup({
 }).then(function(instance){
 
 
- PTPayment.getControl("securityCode").label.text("CSC");
-                  PTPayment.getControl("creditCard").label.text("CC#");
-                  PTPayment.getControl("expiration").label.text("Exp Date");
-                  //PTPayment.style({'cc': {'label_color': 'red'}});
-                  //PTPayment.style({'code': {'label_color': 'red'}});
-                  //PTPayment.style({'exp': {'label_color': 'red'}});
-                  //PTPayment.style({'exp':{'type':'dropdown'}});
-
-                  //PTPayment.theme('horizontal');
-                  // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
-                  document.getElementById("ProtectForm").addEventListener("submit",function(e){
-                   e.preventDefault();
-                   e.stopPropagation();
-
-                  // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
-                  PTPayment.validate(function(validationErrors) {
-                   if (validationErrors.length >= 1) {
-                    if (validationErrors[0]['responseCode'] == '35') {
-                     // Handle validation Errors here
-                     // This is an example of using dynamic styling to show the Credit card number entered is invalid
-                     instance.style({'cc': {'border_color': 'red'}});
-                    }
-                   } else {
-                     // no error so tokenize
-                     instance.process()
-                     .then( (r) => {
-                        submitPayment(r);
-                        }, (err) => {
-                        handleError(err);
-                        });
-                   }
-              });
-
-              });
+    PTPayment.getControl("securityCode").label.text("CSC");
+    PTPayment.getControl("creditCard").label.text("CC#");
+    PTPayment.getControl("expiration").label.text("Exp Date");
+    //PTPayment.style({'cc': {'label_color': 'red'}});
+    //PTPayment.style({'code': {'label_color': 'red'}});
+    //PTPayment.style({'exp': {'label_color': 'red'}});
+    //PTPayment.style({'exp':{'type':'dropdown'}});
 
+    //PTPayment.theme('horizontal');
+    // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
+    document.getElementById("server_response").addEventListener("submit",function(e){
+    e.preventDefault();
+    e.stopPropagation();
 
+    // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
+    PTPayment.validate(function(validationErrors) {
+    if (validationErrors.length >= 1) {
+    if (validationErrors[0]['responseCode'] == '35') {
+     // Handle validation Errors here
+     // This is an example of using dynamic styling to show the Credit card number entered is invalid
+     instance.style({'cc': {'border_color': 'red'}});
+    }
+    } else {
+     // no error so tokenize
+     instance.process()
+     .then( (r) => {
+        submitPayment(r);
+        }, (err) => {
+        handleError(err);
+        });
+    }
+    });
 
+    });
 
 });
 
@@ -138,7 +134,8 @@ function submitPayment(r){
   var enc_key = document.getElementById("enc_key");
   hpf_token.value = r.message.hpf_token;
   enc_key.value = r.message.enc_key;
-  document.getElementById("ProtectForm").submit();
+
+  document.getElementById("server_response").submit();
 
 }
 

From f0b232c1a258b28abd915077b636a79d1caa5def Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 15:34:20 +1000
Subject: [PATCH 06/16] Authorize a card with Paytrace

---
 app/PaymentDrivers/PayTrace/CreditCard.php    | 45 +++++++++++++++----
 app/PaymentDrivers/PaytracePaymentDriver.php  | 12 ++---
 .../gateways/paytrace/authorize.blade.php     | 23 +++++-----
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index bc80c3a6a508..4bea3babc8f9 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -51,8 +51,6 @@ class CreditCard
  	{
         $data = $request->all();
         
-        nlog($data);
-
         $post_data = [
             'customer_id' => Str::random(32),
             'hpf_token' => $data['HPF_Token'],
@@ -67,8 +65,6 @@ class CreditCard
             ],
         ];
         
-        nlog($post_data);
-
         //  "_token" => "Vl1xHflBYQt9YFSaNCPTJKlY5x3rwcFE9kvkw71I"
         //   "company_gateway_id" => "1"
         //   "HPF_Token" => "e484a92c-90ed-4468-ac4d-da66824c75de"
@@ -93,10 +89,30 @@ class CreditCard
 
         // dd($response);
 
-  // +"success": true
-  // +"response_code": 160
-  // +"status_message": "The customer profile for PLS5U60OoLUfQXzcmtJYNefPA0gTthzT/11 was successfully created."
-  // +"customer_id": "PLS5U60OoLUfQXzcmtJYNefPA0gTthzT"
+          // +"success": true
+          // +"response_code": 160
+          // +"status_message": "The customer profile for PLS5U60OoLUfQXzcmtJYNefPA0gTthzT/11 was successfully created."
+          // +"customer_id": "PLS5U60OoLUfQXzcmtJYNefPA0gTthzT"
+
+        // if(!$response->success)
+            //handle failure
+            
+        $cgt = [];
+        $cgt['token'] = $response->customer_id;
+        $cgt['payment_method_id'] = GatewayType::CREDIT_CARD;
+
+        $profile = $this->getCustomerProfile($response->customer_id);
+
+        $payment_meta = new \stdClass;
+        $payment_meta->exp_month = $profile->credit_card->expiration_month;
+        $payment_meta->exp_year = $profile->credit_card->expiration_year;
+        $payment_meta->brand = 'CC';
+        $payment_meta->last4 = $profile->credit_card->masked_number;
+        $payment_meta->type = GatewayType::CREDIT_CARD;
+
+        $cgt['payment_meta'] = $payment_meta;
+
+        $token = $this->paytrace_driver->storeGatewayToken($cgt, []);
 
 
         // make a cc card out of that bra
@@ -104,6 +120,19 @@ class CreditCard
 
  	}  
 
+
+    private function getCustomerProfile($customer_id)
+    {
+        $profile = $this->paytrace_driver->gatewayRequest('/v1/customer/export', [
+            'integrator_id' => '959195xd1CuC',
+            'customer_id' => $customer_id,
+            // 'include_bin' => true,
+        ]);
+
+        return $profile->customers[0];
+        
+    }
+
     public function paymentView($data)
     {
 
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 025ab5d0013f..ccb2a3d9688e 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -123,20 +123,21 @@ class PaytracePaymentDriver extends BaseDriver
     public function getAuthToken()
     {
 
-            $headers = $this->generateAuthHeaders();
+        $headers = $this->generateAuthHeaders();
 
-            $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
+        $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
 
-            $response = json_decode($response);
+        $response = json_decode($response);
 
-            if($response)
-                return $response->clientKey;
+        if($response)
+            return $response->clientKey;
 
         return false;
     }
 
     public function gatewayRequest($uri, $data, $headers = false)
     {
+        
         $base_url = "https://api.paytrace.com{$uri}";
 
         $headers = $this->generateAuthHeaders();
@@ -149,5 +150,6 @@ class PaytracePaymentDriver extends BaseDriver
             return $response;
 
         return false;
+
     }
 }
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
index 401a35cdb43f..2d8ce5482e6b 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -84,9 +84,9 @@ PTPayment.setup({
 }).then(function(instance){
 
 
-    PTPayment.getControl("securityCode").label.text("CSC");
-    PTPayment.getControl("creditCard").label.text("CC#");
-    PTPayment.getControl("expiration").label.text("Exp Date");
+    PTPayment.getControl("securityCode").label.text("{!! ctrans('texts.cvv')!!}");
+    PTPayment.getControl("creditCard").label.text("{!! ctrans('texts.card_number')!!}");
+    PTPayment.getControl("expiration").label.text("{!! ctrans('texts.expires')!!}");
     //PTPayment.style({'cc': {'label_color': 'red'}});
     //PTPayment.style({'code': {'label_color': 'red'}});
     //PTPayment.style({'exp': {'label_color': 'red'}});
@@ -100,12 +100,15 @@ PTPayment.setup({
 
     // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
     PTPayment.validate(function(validationErrors) {
+
     if (validationErrors.length >= 1) {
-    if (validationErrors[0]['responseCode'] == '35') {
-     // Handle validation Errors here
-     // This is an example of using dynamic styling to show the Credit card number entered is invalid
-     instance.style({'cc': {'border_color': 'red'}});
-    }
+
+        let errors = document.getElementById('errors');
+
+        errors.textContent = '';
+        errors.textContent = validationErrors[0].description;
+        errors.hidden = false;
+
     } else {
      // no error so tokenize
      instance.process()
@@ -123,9 +126,7 @@ PTPayment.setup({
 
 
 function handleError(err){
-
-
-  document.write(JSON.stringify(err));
+    document.write(JSON.stringify(err));
 }
 
 function submitPayment(r){

From 15dd0970d2d9c79bd05ec645af65b23d5130dbfc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 16:27:02 +1000
Subject: [PATCH 07/16] Paytrace

---
 app/PaymentDrivers/PayTrace/CreditCard.php    |  41 +++-
 .../ninja2020/gateways/paytrace/pay.blade.php | 208 ++++++++++++++++++
 2 files changed, 248 insertions(+), 1 deletion(-)

diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index 4bea3babc8f9..6e97b1baa11f 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -23,12 +23,14 @@ use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\PayFastPaymentDriver;
 use App\PaymentDrivers\PaytracePaymentDriver;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
 class CreditCard
 {
+    use MakesHash;
 
     public $paytrace_driver;
 
@@ -135,7 +137,14 @@ class CreditCard
 
     public function paymentView($data)
     {
+        $data['client_key'] = $this->paytrace_driver->getAuthToken();
+        $data['gateway'] = $this->paytrace_driver;
 
+        //do i store the card?
+        //
+        //do i use a token?
+        //
+        //is it a new card?
 
         return render('gateways.paytrace.pay', $data);
 
@@ -146,7 +155,16 @@ class CreditCard
     {
         $response_array = $request->all();
 
+        if($request->token)
+            $this->processTokenPayment($request);
 
+        if ($request->has('store_card') && $request->input('store_card') === true) {
+
+            //create customer
+            
+        }
+
+        // charge CC
 
         // if($response_array['payment_status'] == 'COMPLETE') {
 
@@ -159,12 +177,33 @@ class CreditCard
         // }
     }
 
+
+    public function processTokenPayment($request)
+    {
+
+        $data = [
+            'customer_id' => $request->token,
+            'integrator_id' => '959195xd1CuC',
+            'amount' => $request->input('amount_with_fee'),
+        ];
+
+        $response = $this->paytrace_driver->gatewayRequest('/v1/transactions/sale/by_customer', $data);
+
+        if($response->success){
+            $this->paytrace_driver->logSuccessfulGatewayResponse(['response' => $response, 'data' => $this->paytrace_driver->payment_hash], SystemLog::TYPE_PAYTRACE);
+
+            return $this->processSuccessfulPayment($response);
+        }
+
+        return $this->processUnsuccessfulPayment($response);
+    }
+
     private function processSuccessfulPayment($response_array)
     {
 
 
 
-        // $payment = $this->paytrace_driver->createPayment($payment_record, Payment::STATUS_COMPLETED);
+        $payment = $this->paytrace_driver->createPayment($payment_record, Payment::STATUS_COMPLETED);
 
 
     }
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
index e69de29bb2d1..5217115ad0e5 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
@@ -0,0 +1,208 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => ctrans('texts.payment_type_credit_card'), 'card_title' => ctrans('texts.payment_type_credit_card')])
+
+@section('gateway_head')
+
+@endsection
+
+@section('gateway_content')
+    <form action="{{ route('client.payments.response') }}" method="post" id="server_response">
+        @csrf
+        <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
+        <input type="hidden" name="company_gateway_id" value="{{ $gateway->company_gateway->id }}">
+        <input type="hidden" name="payment_method_id" value="1">
+        <input type="hidden" name="token" id="token"/>
+        <input type="hidden" name="store_card" id="store_card"/>
+        <input type="hidden" name="amount_with_fee" id="amount_with_fee" value="{{ $total['amount_with_fee'] }}"/>
+        <input type="txt" id=HPF_Token name= HPF_Token hidden>
+        <input type="txt" id=enc_key name= enc_key hidden>
+    </form>
+
+    <div class="alert alert-failure mb-4" hidden id="errors"></div>
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+        {{ ctrans('texts.credit_card') }}
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.payment_details')
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
+        @if(count($tokens) > 0)
+            @foreach($tokens as $token)
+                <label class="mr-4">
+                    <input
+                        type="radio"
+                        data-token="{{ $token->hashed_id }}"
+                        name="payment-type"
+                        class="form-radio cursor-pointer toggle-payment-with-token"/>
+                    <span class="ml-1 cursor-pointer">{{ optional($token->meta)->last4 }}</span>
+                </label>
+            @endforeach
+        @endisset
+
+        <label>
+            <input
+                type="radio"
+                id="toggle-payment-with-credit-card"
+                class="form-radio cursor-pointer"
+                name="payment-type"
+                checked/>
+            <span class="ml-1 cursor-pointer">{{ __('texts.new_card') }}</span>
+        </label>
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.save_card')
+
+
+    <div class="w-screen items-center" id="paytrace--credit-card-container">
+
+        <div id='pt_hpf_form'><!--iframe sensitive data payment fields inserted here--></div>
+
+    </div>
+    @include('portal.ninja2020.gateways.includes.pay_now')
+
+@endsection
+
+@section('gateway_footer')
+
+<script src='https://protect.paytrace.com/js/protect.min.js'></script>
+
+<script>
+
+    let token_payment = true;
+
+    Array
+    .from(document.getElementsByClassName('toggle-payment-with-token'))
+    .forEach((element) => element.addEventListener('click', (e) => {
+        document
+            .getElementById('save-card--container').style.display = 'none';
+        document
+            .getElementById('paytrace--credit-card-container').style.display = 'none';
+
+        document
+            .getElementById('token').value = e.target.dataset.token;
+    }));
+
+    var tokens = document.getElementsByClassName('toggle-payment-with-token');
+    tokens[0].click();
+
+    let payWithCreditCardToggle = document.getElementById('toggle-payment-with-credit-card');
+
+    if (payWithCreditCardToggle) {
+        payWithCreditCardToggle
+            .addEventListener('click', () => {
+                document
+                    .getElementById('save-card--container').style.display = 'grid';
+                document
+                    .getElementById('paytrace--credit-card-container').style.display = 'grid';
+
+                document
+                    .getElementById('token').value = null;
+
+                    token_payment = false;
+            });
+    }
+
+
+
+  // Minimal Protect.js setup call
+PTPayment.setup({
+  styles:
+  {
+   'code': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'dotted',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'100px'
+ },
+   'cc': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'solid',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'300px'
+ },
+   'exp': {
+    'font_color':'#5D99CA',
+    'border_color':'#EF9F6D',
+    'label_color':'#EF9F6D',
+    'label_size':'20px',
+    'background_color':'white',
+    'border_style':'dashed',
+    'font_size':'15pt',
+    'height':'30px',
+    'width':'85px',
+    'type':'dropdown'
+  }
+ },
+  authorization: { 'clientKey': "{!! $client_key !!}" }
+}).then(function(instance){
+
+
+    PTPayment.getControl("securityCode").label.text("{!! ctrans('texts.cvv')!!}");
+    PTPayment.getControl("creditCard").label.text("{!! ctrans('texts.card_number')!!}");
+    PTPayment.getControl("expiration").label.text("{!! ctrans('texts.expires')!!}");
+    //PTPayment.style({'cc': {'label_color': 'red'}});
+    //PTPayment.style({'code': {'label_color': 'red'}});
+    //PTPayment.style({'exp': {'label_color': 'red'}});
+    //PTPayment.style({'exp':{'type':'dropdown'}});
+
+    //PTPayment.theme('horizontal');
+    // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
+    document.getElementById("server_response").addEventListener("submit",function(e){
+    e.preventDefault();
+    e.stopPropagation();
+
+    // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
+    PTPayment.validate(function(validationErrors) {
+
+    if (validationErrors.length >= 1 && token_payment == false) {
+
+        let errors = document.getElementById('errors');
+
+        errors.textContent = '';
+        errors.textContent = validationErrors[0].description;
+        errors.hidden = false;
+
+    } else {
+     // no error so tokenize
+     instance.process()
+     .then( (r) => {
+        submitPayment(r);
+        }, (err) => {
+        handleError(err);
+        });
+    }
+    });
+
+    });
+
+});
+
+
+function handleError(err){
+    console.log(err);
+    document.write(JSON.stringify(err));
+}
+
+function submitPayment(r){
+
+  var hpf_token = document.getElementById("HPF_Token");
+  var enc_key = document.getElementById("enc_key");
+  hpf_token.value = r.message.hpf_token;
+  enc_key.value = r.message.enc_key;
+
+  document.getElementById("server_response").submit();
+
+}
+
+</script>
+@endsection

From 211e6560fc8842aeab218e3aaa0ca48580f304c9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 17:04:44 +1000
Subject: [PATCH 08/16] Paytrace payment proces

---
 app/PaymentDrivers/BaseDriver.php          |  53 +++++++
 app/PaymentDrivers/PayTrace/CreditCard.php | 170 ++++++++++-----------
 2 files changed, 138 insertions(+), 85 deletions(-)

diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index ef59a3d0d82c..009fa10c37d3 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -431,6 +431,59 @@ class BaseDriver extends AbstractPaymentDriver
         return false;
     }
 
+    /*Generic Global unsuccessful transaction method*/
+    public function processUnsuccessfulTransaction($response)
+    {
+        $error = $response['error'];
+        $error_code = $response['error_code'];
+
+        $this->unWindGatewayFees($this->payment_hash);
+
+        PaymentFailureMailer::dispatch($this->client, $error, $this->client->company, $this->payment_hash->data->amount_with_fee);
+
+        $nmo = new NinjaMailerObject;
+        $nmo->mailable = new NinjaMailer( (new ClientPaymentFailureObject($this->client, $error, $this->client->company, $this->payment_hash))->build() );
+        $nmo->company = $this->client->company;
+        $nmo->settings = $this->client->company->settings;
+
+        $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
+
+        $invoices->each(function ($invoice){
+
+            $invoice->service()->deletePdf();
+
+        });
+
+        $invoices->first()->invitations->each(function ($invitation) use ($nmo){
+
+            if ($invitation->contact->send_email && $invitation->contact->email) {
+
+                $nmo->to_user = $invitation->contact;
+                NinjaMailerJob::dispatch($nmo);
+
+            }
+
+        });
+
+        $message = [
+            'server_response' => $response,
+            'data' => $this->payment_hash->data,
+        ];
+
+        SystemLogger::dispatch(
+            $message,
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_FAILURE,
+            $this::SYSTEM_LOG_TYPE,
+            $this->client,
+            $this->client->company,
+        );
+
+        throw new PaymentFailed($error, $error_code);
+    }
+
+
+
     public function checkRequirements()
     {
         if ($this->company_gateway->require_billing_address) {
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index 6e97b1baa11f..a2595952d35b 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -48,57 +48,57 @@ class CreditCard
         return render('gateways.paytrace.authorize', $data);
     }
 
+    // +"success": true
+    // +"response_code": 160
+    // +"status_message": "The customer profile for PLS5U60OoLUfQXzcmtJYNefPA0gTthzT/11 was successfully created."
+    // +"customer_id": "PLS5U60OoLUfQXzcmtJYNefPA0gTthzT"
 
+    //if(!$response->success)
+    //handle failure
+        
  	public function authorizeResponse($request)
  	{
         $data = $request->all();
         
+        $response = $this->createCustomer($data);   
+
+        return redirect()->route('client.payment_methods.index');
+
+ 	}  
+    
+    //  "_token" => "Vl1xHflBYQt9YFSaNCPTJKlY5x3rwcFE9kvkw71I"
+    //   "company_gateway_id" => "1"
+    //   "HPF_Token" => "e484a92c-90ed-4468-ac4d-da66824c75de"
+    //   "enc_key" => "zqz6HMHCXALWdX5hyBqrIbSwU7TBZ0FTjjLB3Cp0FQY="
+    //   "amount" => "Amount"
+    //   "q" => "/client/payment_methods"
+    //   "method" => "1"
+    // ]
+
+    // "customer_id":"customer789",
+    // "hpf_token":"e369847e-3027-4174-9161-fa0d4e98d318",
+    // "enc_key":"lI785yOBMet4Rt9o4NLXEyV84WBU3tdStExcsfoaOoo=",
+    // "integrator_id":"xxxxxxxxxx",
+    // "billing_address":{
+    //     "name":"Mark Smith",
+    //     "street_address":"8320 E. West St.",
+    //     "city":"Spokane",
+    //     "state":"WA",
+    //     "zip":"85284"
+    // }
+    
+    private function createCustomer($data)
+    {
         $post_data = [
             'customer_id' => Str::random(32),
             'hpf_token' => $data['HPF_Token'],
             'enc_key' => $data['enc_key'],
             'integrator_id' => '959195xd1CuC',
-            'billing_address' => [
-                'name' => $this->paytrace_driver->client->present()->name(),
-                'street_address' => $this->paytrace_driver->client->address1,
-                'city' => $this->paytrace_driver->client->city,
-                'state' => $this->paytrace_driver->client->state,
-                'zip' => $this->paytrace_driver->client->postal_code
-            ],
+            'billing_address' => $this->buildBillingAddress(),
         ];
-        
-        //  "_token" => "Vl1xHflBYQt9YFSaNCPTJKlY5x3rwcFE9kvkw71I"
-        //   "company_gateway_id" => "1"
-        //   "HPF_Token" => "e484a92c-90ed-4468-ac4d-da66824c75de"
-        //   "enc_key" => "zqz6HMHCXALWdX5hyBqrIbSwU7TBZ0FTjjLB3Cp0FQY="
-        //   "amount" => "Amount"
-        //   "q" => "/client/payment_methods"
-        //   "method" => "1"
-        // ]
 
-        // "customer_id":"customer789",
-        // "hpf_token":"e369847e-3027-4174-9161-fa0d4e98d318",
-        // "enc_key":"lI785yOBMet4Rt9o4NLXEyV84WBU3tdStExcsfoaOoo=",
-        // "integrator_id":"xxxxxxxxxx",
-        // "billing_address":{
-        //     "name":"Mark Smith",
-        //     "street_address":"8320 E. West St.",
-        //     "city":"Spokane",
-        //     "state":"WA",
-        //     "zip":"85284"
-        // }
         $response = $this->paytrace_driver->gatewayRequest('/v1/customer/pt_protect_create', $post_data);
 
-        // dd($response);
-
-          // +"success": true
-          // +"response_code": 160
-          // +"status_message": "The customer profile for PLS5U60OoLUfQXzcmtJYNefPA0gTthzT/11 was successfully created."
-          // +"customer_id": "PLS5U60OoLUfQXzcmtJYNefPA0gTthzT"
-
-        // if(!$response->success)
-            //handle failure
-            
         $cgt = [];
         $cgt['token'] = $response->customer_id;
         $cgt['payment_method_id'] = GatewayType::CREDIT_CARD;
@@ -116,12 +116,8 @@ class CreditCard
 
         $token = $this->paytrace_driver->storeGatewayToken($cgt, []);
 
-
-        // make a cc card out of that bra
-        return redirect()->route('client.payment_methods.index');
-
- 	}  
-
+        return $response;
+    }
 
     private function getCustomerProfile($customer_id)
     {
@@ -135,50 +131,59 @@ class CreditCard
         
     }
 
+    private function buildBillingAddress()
+    {
+        return [
+                'name' => $this->paytrace_driver->client->present()->name(),
+                'street_address' => $this->paytrace_driver->client->address1,
+                'city' => $this->paytrace_driver->client->city,
+                'state' => $this->paytrace_driver->client->state,
+                'zip' => $this->paytrace_driver->client->postal_code
+            ];
+    }
+
     public function paymentView($data)
     {
+
         $data['client_key'] = $this->paytrace_driver->getAuthToken();
         $data['gateway'] = $this->paytrace_driver;
 
-        //do i store the card?
-        //
-        //do i use a token?
-        //
-        //is it a new card?
-
         return render('gateways.paytrace.pay', $data);
 
     }
 
-
     public function paymentResponse(Request $request)
     {
         $response_array = $request->all();
 
         if($request->token)
-            $this->processTokenPayment($request);
+            $this->processTokenPayment($request->token, $request);
 
         if ($request->has('store_card') && $request->input('store_card') === true) {
 
-            //create customer
+            $response = $this->createCustomer($request->all());
             
+            $this->processTokenPayment($response->customer_id, $request);
         }
 
-        // charge CC
+        //process a regular charge here:
+        $data = [
+            'hpf_token' => $data['HPF_Token'],
+            'enc_key' => $data['enc_key'],
+            'integrator_id' => '959195xd1CuC',
+            'billing_address' => $this->buildBillingAddress(),
+        ];        
 
-        // if($response_array['payment_status'] == 'COMPLETE') {
+        $response = $this->paytrace_driver->gatewayRequest('/v1/transactions/sale/pt_protect', $data);
 
-        //     $this->payfast->logSuccessfulGatewayResponse(['response' => $response_array, 'data' => $this->paytrace_driver->payment_hash], SystemLog::TYPE_PAYFAST);
+        if($response->success)
+            return $this->processSuccessfulPayment($response);
+
+        return $this->processUnsuccessfulPayment($response);
 
-        //     return $this->processSuccessfulPayment($response_array);
-        // }
-        // else {
-        //     $this->processUnsuccessfulPayment($response_array);
-        // }
     }
 
-
-    public function processTokenPayment($request)
+    public function processTokenPayment($token, $request)
     {
 
         $data = [
@@ -198,42 +203,37 @@ class CreditCard
         return $this->processUnsuccessfulPayment($response);
     }
 
-    private function processSuccessfulPayment($response_array)
+    private function processSuccessfulPayment($response)
     {
+        $amount = array_sum(array_column($this->paytrace_driver->payment_hash->invoices(), 'amount')) + $this->paytrace_driver->payment_hash->fee_total;
 
+        $response = $response_array;
 
+        $payment_record = [];
+        $payment_record['amount'] = $amount;
+        $payment_record['payment_type'] = PaymentType::CREDIT_CARD_OTHER;
+        $payment_record['gateway_type_id'] = GatewayType::CREDIT_CARD;
+        $payment_record['transaction_reference'] = $response->transaction_id;
 
         $payment = $this->paytrace_driver->createPayment($payment_record, Payment::STATUS_COMPLETED);
 
+        return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
 
     }
 
-    private function processUnsuccessfulPayment($server_response)
+    private function processUnsuccessfulPayment($response)
     {
-        // PaymentFailureMailer::dispatch($this->paytrace_driver->client, $server_response->cancellation_reason, $this->paytrace_driver->client->company, $server_response->amount);
 
-        // PaymentFailureMailer::dispatch(
-        //     $this->paytrace_driver->client,
-        //     $server_response,
-        //     $this->paytrace_driver->client->company,
-        //     $server_response['amount_gross']
-        // );
+        $error = $response->status_message;
+        $error_code = property_exists($response, 'approval_message') ? $response->approval_message : 'Undefined code';
 
-        // $message = [
-        //     'server_response' => $server_response,
-        //     'data' => $this->paytrace_driver->payment_hash->data,
-        // ];
+        $data = [
+            'response' => $response,
+            'error' => $error,
+            'error_code' => $error_code,
+        ];
 
-        // SystemLogger::dispatch(
-        //     $message,
-        //     SystemLog::CATEGORY_GATEWAY_RESPONSE,
-        //     SystemLog::EVENT_GATEWAY_FAILURE,
-        //     SystemLog::TYPE_PAYFAST,
-        //     $this->payfast->client,
-        //     $this->payfast->client->company,
-        // );
-
-        // throw new PaymentFailed('Failed to process the payment.', 500);
+        return $this->paytrace_driver->processUnsuccessfulTransaction($data);
     }
 
 }
\ No newline at end of file

From 1affdd77542e915150a9b9f648a5dafe1ac96cd4 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 17:44:35 +1000
Subject: [PATCH 09/16] Pay with CC paytrace

---
 app/PaymentDrivers/BaseDriver.php             |  2 +-
 app/PaymentDrivers/PayTrace/CreditCard.php    | 27 +++++++++++++++----
 .../ninja2020/gateways/paytrace/pay.blade.php | 14 ++++------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 009fa10c37d3..57613fcb8872 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -479,7 +479,7 @@ class BaseDriver extends AbstractPaymentDriver
             $this->client->company,
         );
 
-        throw new PaymentFailed($error, $error_code);
+        throw new PaymentFailed($error, 500);
     }
 
 
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index a2595952d35b..adde39177b15 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -17,6 +17,7 @@ use App\Jobs\Mail\PaymentFailureMailer;
 use App\Jobs\Util\SystemLogger;
 use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
+use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
@@ -168,10 +169,12 @@ class CreditCard
 
         //process a regular charge here:
         $data = [
-            'hpf_token' => $data['HPF_Token'],
-            'enc_key' => $data['enc_key'],
+            'hpf_token' => $response_array['HPF_Token'],
+            'enc_key' => $response_array['enc_key'],
             'integrator_id' => '959195xd1CuC',
             'billing_address' => $this->buildBillingAddress(),
+            'amount' => $request->input('amount_with_fee'),
+            'invoice_id' => $this->harvestInvoiceId(),
         ];        
 
         $response = $this->paytrace_driver->gatewayRequest('/v1/transactions/sale/pt_protect', $data);
@@ -202,13 +205,22 @@ class CreditCard
 
         return $this->processUnsuccessfulPayment($response);
     }
+    
+    private function harvestInvoiceId()
+    {
+        $_invoice = collect($this->paytrace_driver->payment_hash->data->invoices)->first();
+        $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
+
+        if($invoice)
+            return ctrans('texts.invoice_number') . "# " . $invoice->number;
+
+        return ctrans('texts.invoice_number') . "####";
+    }
 
     private function processSuccessfulPayment($response)
     {
         $amount = array_sum(array_column($this->paytrace_driver->payment_hash->invoices(), 'amount')) + $this->paytrace_driver->payment_hash->fee_total;
 
-        $response = $response_array;
-
         $payment_record = [];
         $payment_record['amount'] = $amount;
         $payment_record['payment_type'] = PaymentType::CREDIT_CARD_OTHER;
@@ -223,8 +235,12 @@ class CreditCard
 
     private function processUnsuccessfulPayment($response)
     {
-
+        
         $error = $response->status_message;
+
+        if(property_exists($response, 'approval_message') && $response->approval_message)
+            $error .= " - {$response->approval_message}";
+
         $error_code = property_exists($response, 'approval_message') ? $response->approval_message : 'Undefined code';
 
         $data = [
@@ -234,6 +250,7 @@ class CreditCard
         ];
 
         return $this->paytrace_driver->processUnsuccessfulTransaction($data);
+
     }
 
 }
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
index 5217115ad0e5..aa9eb9162e29 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
@@ -15,7 +15,7 @@
         <input type="hidden" name="amount_with_fee" id="amount_with_fee" value="{{ $total['amount_with_fee'] }}"/>
         <input type="txt" id=HPF_Token name= HPF_Token hidden>
         <input type="txt" id=enc_key name= enc_key hidden>
-    </form>
+
 
     <div class="alert alert-failure mb-4" hidden id="errors"></div>
 
@@ -52,14 +52,13 @@
 
     @include('portal.ninja2020.gateways.includes.save_card')
 
-
     <div class="w-screen items-center" id="paytrace--credit-card-container">
 
         <div id='pt_hpf_form'><!--iframe sensitive data payment fields inserted here--></div>
 
     </div>
-    @include('portal.ninja2020.gateways.includes.pay_now')
-
+    @include('portal.ninja2020.gateways.includes.pay_now', ['type' => 'submit'])
+    </form>
 @endsection
 
 @section('gateway_footer')
@@ -82,9 +81,6 @@
             .getElementById('token').value = e.target.dataset.token;
     }));
 
-    var tokens = document.getElementsByClassName('toggle-payment-with-token');
-    tokens[0].click();
-
     let payWithCreditCardToggle = document.getElementById('toggle-payment-with-credit-card');
 
     if (payWithCreditCardToggle) {
@@ -97,12 +93,12 @@
 
                 document
                     .getElementById('token').value = null;
-
                     token_payment = false;
             });
     }
 
-
+    var tokens = document.getElementsByClassName('toggle-payment-with-token');
+    tokens[0].click();
 
   // Minimal Protect.js setup call
 PTPayment.setup({

From 78270a9147116e4f1aa233b3a23b2fabc5dd23ce Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 18:18:14 +1000
Subject: [PATCH 10/16] token billing and refunds with paytrace

---
 app/PaymentDrivers/BaseDriver.php             |  8 +-
 app/PaymentDrivers/PaytracePaymentDriver.php  | 83 ++++++++++++++++++-
 app/PaymentDrivers/Stripe/Charge.php          |  2 +-
 ...95537_activate_paytrace_payment_driver.php | 14 +++-
 database/seeders/PaymentLibrariesSeeder.php   |  2 +-
 5 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 57613fcb8872..2ad64c1ae8c3 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -431,8 +431,8 @@ class BaseDriver extends AbstractPaymentDriver
         return false;
     }
 
-    /*Generic Global unsuccessful transaction method*/
-    public function processUnsuccessfulTransaction($response)
+    /*Generic Global unsuccessful transaction method when the client is present*/
+    public function processUnsuccessfulTransaction($response, $client_present = true)
     {
         $error = $response['error'];
         $error_code = $response['error_code'];
@@ -479,7 +479,9 @@ class BaseDriver extends AbstractPaymentDriver
             $this->client->company,
         );
 
-        throw new PaymentFailed($error, 500);
+        if($client_present)
+            throw new PaymentFailed($error, 500);
+
     }
 
 
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index ccb2a3d9688e..ca865da581cf 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -15,6 +15,7 @@ use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentHash;
+use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\PayTrace\CreditCard;
 use App\Utils\CurlUtils;
@@ -85,12 +86,90 @@ class PaytracePaymentDriver extends BaseDriver
 
     public function refund(Payment $payment, $amount, $return_client_response = false)
     {
-        return $this->payment_method->yourRefundImplementationHere(); //this is your custom implementation from here
+        $cgt = ClientGatewayToken::where('company_gateway_id', $payment->company_gateway_id)
+                                 ->where('gateway_type_id', $payment->gateway_type_id)
+                                 ->first();
+
+        $data = [
+            'amount' => $amount,
+            'customer_id' => $cgt->token,
+            'integrator_id' => '959195xd1CuC'
+        ];
+
+        $response = $this->gatewayRequest('/v1/transactions/refund/to_customer', $data);
+
+
+        if($response && $response->success)
+        {
+
+            SystemLogger::dispatch(['server_response' => $response, 'data' => $data], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_PAYTRACE, $this->client, $this->client->company);
+
+                return [
+                    'transaction_reference' => $response->transaction_id,
+                    'transaction_response' => json_encode($response),
+                    'success' => true,
+                    'description' => $response->status_message,
+                    'code' => $response->response_code,
+                ];
+
+        }
+
+
+        SystemLogger::dispatch(['server_response' => $response, 'data' => $data], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYTRACE, $this->client, $this->client->company);
+
+        return [
+            'transaction_reference' => null,
+            'transaction_response' => json_encode($response),
+            'success' => false,
+            'description' => $response->status_message,
+            'code' => 422,
+        ];
+
     }
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
-        return $this->payment_method->yourTokenBillingImplmentation(); //this is your custom implementation from here
+        $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
+
+        $data = [
+            'customer_id' => $cgt->token,
+            'integrator_id' => '959195xd1CuC',
+            'amount' => $amount,
+        ];
+
+        $response = $this->gatewayRequest('/v1/transactions/sale/by_customer', $data);
+
+        if($response && $response->success)
+        {
+            $data = [
+                'gateway_type_id' => $cgt->gateway_type_id,
+                'payment_type' => PaymentType::CREDIT_CARD_OTHER,
+                'transaction_reference' => $response->transaction_id,
+                'amount' => $amount,
+            ];
+
+            $payment = $this->createPayment($data);
+            $payment->meta = $cgt->meta;
+            $payment->save();
+
+            $payment_hash->payment_id = $payment->id;
+            $payment_hash->save();
+
+            return $payment;
+        }
+
+        $error = $response->status_message;
+
+        if(property_exists($response, 'approval_message') && $response->approval_message)
+            $error .= " - {$response->approval_message}";
+
+        $data = [
+            'response' => $response,
+            'error' => $error,
+            'error_code' => 500,
+        ];
+
+        $this->processUnsuccessfulTransaction($data, false);
     }
 
     public function processWebhookRequest(PaymentWebhookRequest $request, Payment $payment = null)
diff --git a/app/PaymentDrivers/Stripe/Charge.php b/app/PaymentDrivers/Stripe/Charge.php
index 2e8c06d7d1bc..2ae298a335e2 100644
--- a/app/PaymentDrivers/Stripe/Charge.php
+++ b/app/PaymentDrivers/Stripe/Charge.php
@@ -74,7 +74,7 @@ class Charge
               'confirm' => true,
               'description' => $description,
             ];
-nlog($data);
+
             $response = $this->stripe->createPaymentIntent($data, $this->stripe->stripe_connect_auth);
             // $response = $local_stripe->paymentIntents->create($data);
 
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index 5d9743c35714..6751e988edac 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -14,7 +14,19 @@ class ActivatePaytracePaymentDriver extends Migration
      */
     public function up()
     {
-        Gateway::query()->where('id', 46)->update(['visible' => true, 'provider' => 'Paytrace']);
+
+        $paytrace = Gateway::find(46);
+
+        if($paytrace)
+        {
+            $fields = $paytrace->fields;
+            $fields->integratorId = "";
+
+            $paytrace->fields = $fields;
+            $paytrace->provider = 'Paytrace';
+            $paytrace->visible = true;
+            $paytrace->save();
+        }
     }
 
     /**
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index e6d31f414fe4..e851317a05f2 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -70,7 +70,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 43, 'name' => 'Fasapay', 'provider' => 'Fasapay', 'key' => '1b2cef0e8c800204a29f33953aaf3360', 'fields' => ''],
             ['id' => 44, 'name' => 'Komoju', 'provider' => 'Komoju', 'key' => '7ea2d40ecb1eb69ef8c3d03e5019028a', 'fields' => '{"apiKey":"","accountId":"","paymentMethod":"credit_card","testMode":false,"locale":"en"}'],
             ['id' => 45, 'name' => 'Paysafecard', 'provider' => 'Paysafecard', 'key' => '70ab90cd6c5c1ab13208b3cef51c0894', 'fields' => '{"username":"","password":"","testMode":false}'],
-            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
+            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","integratorId":"",testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
             ['id' => 47, 'name' => 'Secure Trading', 'provider' => 'SecureTrading', 'key' => '231cb401487b9f15babe04b1ac4f7a27', 'fields' => '{"siteReference":"","username":"","password":"","applyThreeDSecure":false,"accountType":"ECOM"}'],
             ['id' => 48, 'name' => 'SecPay', 'provider' => 'SecPay', 'key' => 'bad8699d581d9fa040e59c0bb721a76c', 'fields' => '{"mid":"","vpnPswd":"","remotePswd":"","usageType":"","confirmEmail":"","testStatus":"true","mailCustomer":"true","additionalOptions":""}'],
             ['id' => 49, 'name' => 'WePay', 'provider' => 'WePay', 'is_offsite' => false, 'sort_order' => 3, 'key' => '8fdeed552015b3c7b44ed6c8ebd9e992', 'fields' => '{"accountId":"","accessToken":"","type":"goods","testMode":false,"feePayer":"payee"}'],

From 40bbad8ecaefc6e423faf07a6b99551d6bb0c173 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 20:30:21 +1000
Subject: [PATCH 11/16] Minor fixes

---
 app/PaymentDrivers/PaytracePaymentDriver.php                    | 2 --
 .../2021_07_20_095537_activate_paytrace_payment_driver.php      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index ca865da581cf..752030201c68 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -98,7 +98,6 @@ class PaytracePaymentDriver extends BaseDriver
 
         $response = $this->gatewayRequest('/v1/transactions/refund/to_customer', $data);
 
-
         if($response && $response->success)
         {
 
@@ -114,7 +113,6 @@ class PaytracePaymentDriver extends BaseDriver
 
         }
 
-
         SystemLogger::dispatch(['server_response' => $response, 'data' => $data], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYTRACE, $this->client, $this->client->company);
 
         return [
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index 6751e988edac..51b15fa032bc 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -19,7 +19,7 @@ class ActivatePaytracePaymentDriver extends Migration
 
         if($paytrace)
         {
-            $fields = $paytrace->fields;
+            $fields = json_decode($paytrace->fields);
             $fields->integratorId = "";
 
             $paytrace->fields = $fields;

From 00d1273bd9fe9bc006f373171911e0e7042a73c6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 21 Jul 2021 20:35:22 +1000
Subject: [PATCH 12/16] Fixes for gateway abilities

---
 app/Models/Gateway.php                                       | 5 +++++
 .../2021_07_20_095537_activate_paytrace_payment_driver.php   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index fa95888fb63d..af8ba30d8e6b 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -81,6 +81,9 @@ class Gateway extends StaticModel
             case 1:
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true]];//Authorize.net
                 break;
+            case 1:
+                return [GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => false]];//Payfast
+                break;
             case 15:
                 return [GatewayType::PAYPAL => ['refund' => true, 'token_billing' => false]]; //Paypal
                 break;
@@ -95,6 +98,8 @@ class Gateway extends StaticModel
             case 39:
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true]]; //Checkout
                 break;
+            case 46:
+                return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true]]; //Paytrace
             case 49:
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
                     GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true]]; //WePay
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index 51b15fa032bc..5fdcec6f96fd 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -22,7 +22,7 @@ class ActivatePaytracePaymentDriver extends Migration
             $fields = json_decode($paytrace->fields);
             $fields->integratorId = "";
 
-            $paytrace->fields = $fields;
+            $paytrace->fields = json_encode($fields);
             $paytrace->provider = 'Paytrace';
             $paytrace->visible = true;
             $paytrace->save();

From 572957892623cac4f213d005c8e88b98f466e982 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 23 Jul 2021 11:25:33 +1000
Subject: [PATCH 13/16] minor fixes

---
 app/Mail/Engine/PaymentEmailEngine.php                       | 1 +
 app/Mail/SupportMessageSent.php                              | 5 +++--
 .../2021_07_20_095537_activate_paytrace_payment_driver.php   | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index d008f38f0bd1..93cb4d6cfbb7 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -133,6 +133,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
         $data['$client_name'] = ['value' => $this->client->present()->name() ?: '&nbsp;', 'label' => ctrans('texts.client_name')];
         $data['$client.name'] = &$data['$client_name'];
+        $data['$client'] = &$data['client_name'];
         $data['$client.address1'] = &$data['$address1'];
         $data['$client.address2'] = &$data['$address2'];
         $data['$client_address'] = ['value' => $this->client->present()->address() ?: '&nbsp;', 'label' => ctrans('texts.address')];
diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index 429202661a17..5e513c9eb015 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -60,11 +60,12 @@ class SupportMessageSent extends Mailable
 
         $company = auth()->user()->company();
         $user = auth()->user();
+        $db = str_replace("db-ninja-", "", $company->db);
 
         if(Ninja::isHosted())
-            $subject = "{$priority}Hosted-{$company->db} :: Customer Support - {$plan} ".date('M jS, g:ia');
+            $subject = "{$priority}Hosted-{$company->db} :: {$plan} :: ".date('M jS, g:ia');
         else
-            $subject = "{$priority}Self Hosted :: Customer Support - [{$plan}] ".date('M jS, g:ia');
+            $subject = "{$priority}Self Hosted :: {$plan} :: ".date('M jS, g:ia');
 
         return $this->from(config('mail.from.address'), $user->present()->name()) 
                 ->replyTo($user->email, $user->present()->name())
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index 5fdcec6f96fd..e690af365e3c 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -15,9 +15,7 @@ class ActivatePaytracePaymentDriver extends Migration
     public function up()
     {
 
-        $paytrace = Gateway::find(46);
-
-        if($paytrace)
+        if($paytrace = Gateway::find(46))
         {
             $fields = json_decode($paytrace->fields);
             $fields->integratorId = "";

From 429570227da26eadd41db03f6b958eff3bb8d05f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 23 Jul 2021 12:12:42 +1000
Subject: [PATCH 14/16] Confirmed paytrace working EXCEPT pay page

---
 app/Mail/Engine/PaymentEmailEngine.php        |  2 +-
 app/PaymentDrivers/PaytracePaymentDriver.php  | 18 +++++++++-------
 config/ninja.php                              |  4 ++++
 .../ninja2020/gateways/paytrace/pay.blade.php | 21 +++++++++++--------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 93cb4d6cfbb7..137be2392677 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -133,7 +133,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
         $data['$client_name'] = ['value' => $this->client->present()->name() ?: '&nbsp;', 'label' => ctrans('texts.client_name')];
         $data['$client.name'] = &$data['$client_name'];
-        $data['$client'] = &$data['client_name'];
+        $data['$client'] = &$data['$client_name'];
         $data['$client.address1'] = &$data['$address1'];
         $data['$client.address2'] = &$data['$address2'];
         $data['$client_address'] = ['value' => $this->client->present()->address() ?: '&nbsp;', 'label' => ctrans('texts.address')];
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 752030201c68..58a0dedd5b54 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -11,6 +11,7 @@
 
 namespace App\PaymentDrivers;
 
+use App\Jobs\Util\SystemLogger;
 use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -86,17 +87,18 @@ class PaytracePaymentDriver extends BaseDriver
 
     public function refund(Payment $payment, $amount, $return_client_response = false)
     {
-        $cgt = ClientGatewayToken::where('company_gateway_id', $payment->company_gateway_id)
-                                 ->where('gateway_type_id', $payment->gateway_type_id)
-                                 ->first();
+        // $cgt = ClientGatewayToken::where('company_gateway_id', $payment->company_gateway_id)
+        //                          ->where('gateway_type_id', $payment->gateway_type_id)
+        //                          ->first();
 
         $data = [
             'amount' => $amount,
-            'customer_id' => $cgt->token,
+            //'customer_id' => $cgt->token,
+            'transaction_id' => $payment->transaction_reference,
             'integrator_id' => '959195xd1CuC'
         ];
 
-        $response = $this->gatewayRequest('/v1/transactions/refund/to_customer', $data);
+        $response = $this->gatewayRequest('/v1/transactions/refund/for_transaction', $data);
 
         if($response && $response->success)
         {
@@ -181,8 +183,10 @@ class PaytracePaymentDriver extends BaseDriver
         $url = 'https://api.paytrace.com/oauth/token';
         $data = [
             'grant_type' => 'password',
-            'username' => $this->company_gateway->getConfigField('username'),
-            'password' => $this->company_gateway->getConfigField('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')
         ];
 
         $response = CurlUtils::post($url, $data, $headers = false);
diff --git a/config/ninja.php b/config/ninja.php
index 878174e2f07a..ac835e3624f5 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -84,6 +84,10 @@ return [
         'test_email' => env('TEST_EMAIL', 'test@example.com'),
         'wepay' => env('WEPAY_KEYS', ''),
         'braintree' => env('BRAINTREE_KEYS', ''),
+        'paytrace' => [
+            'username' => env('PAYTRACE_U', ''),
+            'password' => env('PAYTRACE_P','')
+        ],
     ],
     'contact' => [
         'email' => env('MAIL_FROM_ADDRESS'),
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
index aa9eb9162e29..4535639e43d4 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
@@ -146,22 +146,14 @@ PTPayment.setup({
     PTPayment.getControl("securityCode").label.text("{!! ctrans('texts.cvv')!!}");
     PTPayment.getControl("creditCard").label.text("{!! ctrans('texts.card_number')!!}");
     PTPayment.getControl("expiration").label.text("{!! ctrans('texts.expires')!!}");
-    //PTPayment.style({'cc': {'label_color': 'red'}});
-    //PTPayment.style({'code': {'label_color': 'red'}});
-    //PTPayment.style({'exp': {'label_color': 'red'}});
-    //PTPayment.style({'exp':{'type':'dropdown'}});
 
-    //PTPayment.theme('horizontal');
-    // this can be any event we chose. We will use the submit event and stop any default event handling and prevent event handling bubbling.
     document.getElementById("server_response").addEventListener("submit",function(e){
     e.preventDefault();
     e.stopPropagation();
 
-    // To trigger the validation of sensitive data payment fields within the iframe before calling the tokenization process:
     PTPayment.validate(function(validationErrors) {
 
-    if (validationErrors.length >= 1 && token_payment == false) {
-
+    if (validationErrors.length >= 1 && !token_payment) {
         let errors = document.getElementById('errors');
 
         errors.textContent = '';
@@ -170,6 +162,11 @@ PTPayment.setup({
 
     } else {
      // no error so tokenize
+     if(token_payment){
+
+        tokenPayment();
+     } 
+     
      instance.process()
      .then( (r) => {
         submitPayment(r);
@@ -200,5 +197,11 @@ function submitPayment(r){
 
 }
 
+
+function tokenPayment(){
+
+      document.getElementById("server_response").submit();
+      return false;
+}
 </script>
 @endsection

From 043f0816f12e6d4531b36b47114481e50d24caf5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 23 Jul 2021 14:13:33 +1000
Subject: [PATCH 15/16] Fixes for PayTrace

---
 database/seeders/PaymentLibrariesSeeder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index e851317a05f2..328282dee23c 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -70,7 +70,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 43, 'name' => 'Fasapay', 'provider' => 'Fasapay', 'key' => '1b2cef0e8c800204a29f33953aaf3360', 'fields' => ''],
             ['id' => 44, 'name' => 'Komoju', 'provider' => 'Komoju', 'key' => '7ea2d40ecb1eb69ef8c3d03e5019028a', 'fields' => '{"apiKey":"","accountId":"","paymentMethod":"credit_card","testMode":false,"locale":"en"}'],
             ['id' => 45, 'name' => 'Paysafecard', 'provider' => 'Paysafecard', 'key' => '70ab90cd6c5c1ab13208b3cef51c0894', 'fields' => '{"username":"","password":"","testMode":false}'],
-            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","integratorId":"",testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
+            ['id' => 46, 'name' => 'Paytrace', 'provider' => 'Paytrace', 'key' => 'bbd736b3254b0aabed6ad7fda1298c88', 'fields' => '{"username":"","password":"","integratorId":"","testMode":false,"endpoint":"https:\/\/paytrace.com\/api\/default.pay"}'],
             ['id' => 47, 'name' => 'Secure Trading', 'provider' => 'SecureTrading', 'key' => '231cb401487b9f15babe04b1ac4f7a27', 'fields' => '{"siteReference":"","username":"","password":"","applyThreeDSecure":false,"accountType":"ECOM"}'],
             ['id' => 48, 'name' => 'SecPay', 'provider' => 'SecPay', 'key' => 'bad8699d581d9fa040e59c0bb721a76c', 'fields' => '{"mid":"","vpnPswd":"","remotePswd":"","usageType":"","confirmEmail":"","testStatus":"true","mailCustomer":"true","additionalOptions":""}'],
             ['id' => 49, 'name' => 'WePay', 'provider' => 'WePay', 'is_offsite' => false, 'sort_order' => 3, 'key' => '8fdeed552015b3c7b44ed6c8ebd9e992', 'fields' => '{"accountId":"","accessToken":"","type":"goods","testMode":false,"feePayer":"payee"}'],

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 16/16] 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);