From c9bb97f4d00da3a75e3d79904f851e51a320bc1a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 23 Sep 2021 12:03:49 +1000
Subject: [PATCH] Turning on token billing for PayFast

---
 app/PaymentDrivers/PayFast/Token.php        | 4 ++--
 app/PaymentDrivers/PayFastPaymentDriver.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/PaymentDrivers/PayFast/Token.php b/app/PaymentDrivers/PayFast/Token.php
index a4e624b78271..38fcd88466e1 100644
--- a/app/PaymentDrivers/PayFast/Token.php
+++ b/app/PaymentDrivers/PayFast/Token.php
@@ -87,11 +87,11 @@ class Token
             'amount' => $amount,
             'item_name' => 'purchase',
             'm_payment_id' => $payment_hash->hash,
-            'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
             'item_description' => ctrans('texts.invoices') . ': ' . collect($payment_hash->invoices())->pluck('invoice_number'),
+            'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
         ];        
 
-        $header['signature'] = $this->payfast->generateSignature(array_merge($header, $body));
+        $header['signature'] = $this->payfast->generateSignature($body);
         // $header['signature'] = $this->genSig($body);
 
         nlog($this->payfast->company_gateway->getConfigField('merchantId'));
diff --git a/app/PaymentDrivers/PayFastPaymentDriver.php b/app/PaymentDrivers/PayFastPaymentDriver.php
index 342442b6f7dc..d644a87dab41 100644
--- a/app/PaymentDrivers/PayFastPaymentDriver.php
+++ b/app/PaymentDrivers/PayFastPaymentDriver.php
@@ -134,7 +134,7 @@ class PayFastPaymentDriver extends BaseDriver
                     /**
                      * Transaction Details
                      */
-                    'm_payment_id', 'amount', 'item_name', 'item_description',
+                    'amount', 'item_name', 'm_payment_id', 'item_description',
                     /**
                      * Custom return data
                      */