From 7e1f964b3471031c982f7ed1642f2bccb4cfd0b5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 23 Sep 2021 13:39:31 +1000
Subject: [PATCH] Turning on token billing for PayFast

---
 app/PaymentDrivers/PayFast/Token.php | 47 ++++------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/app/PaymentDrivers/PayFast/Token.php b/app/PaymentDrivers/PayFast/Token.php
index cebd1811e6c0..53af1b8bd029 100644
--- a/app/PaymentDrivers/PayFast/Token.php
+++ b/app/PaymentDrivers/PayFast/Token.php
@@ -79,18 +79,20 @@ class Token
 
 		$header =[
             'merchant-id' => $this->payfast->company_gateway->getConfigField('merchantId'),
-            'timestamp' => now()->format('c'),
             'version' => 'v1',
+            'timestamp' => now()->format('c'),
 		];
 
         $body = [
             'amount' => $amount,
             'item_name' => 'purchase',
-            'item_description' => 'Purchase',
+            'm_payment_id' => $payment_hash->hash,
+            'item_description' => ctrans('texts.invoices') . ': ' . collect($payment_hash->invoices())->pluck('invoice_number'),
+            'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
         ];        
 
-        $header['signature'] = $this->generate_parameter_string(array_merge($header, $body));
-        //$header['signature'] = $this->genSig($body);
+        $header['signature'] = $this->payfast->generateSignature(array_merge($header, $body));
+        // $header['signature'] = $this->genSig($body);
 
         nlog($this->payfast->company_gateway->getConfigField('merchantId'));
         
@@ -138,43 +140,6 @@ class Token
         // }
     }
 
-
-    protected function generate_parameter_string( $api_data, $sort_data_before_merge = true, $skip_empty_values = true ) {
-
-        // if sorting is required the passphrase should be added in before sort.
-        if ( ! empty( $this->payfast->company_gateway->getConfigField('passPhrase') ) && $sort_data_before_merge ) {
-            $api_data['passphrase'] = $this->payfast->company_gateway->getConfigField('passPhrase');
-        }
-
-        if ( $sort_data_before_merge ) {
-            ksort( $api_data );
-        }
-
-        // concatenate the array key value pairs.
-        $parameter_string = '';
-        foreach ( $api_data as $key => $val ) {
-
-            if ( $skip_empty_values && empty( $val ) ) {
-                continue;
-            }
-
-            if ( 'signature' !== $key ) {
-                $val = urlencode( $val );
-                $parameter_string .= "$key=$val&";
-            }
-        }
-        // when not sorting passphrase should be added to the end before md5
-        if ( $sort_data_before_merge ) {
-            $parameter_string = rtrim( $parameter_string, '&' );
-        } elseif ( ! empty( $this->pass_phrase ) ) {
-            $parameter_string .= 'passphrase=' . urlencode( $this->payfast->company_gateway->getConfigField('passPhrase') );
-        } else {
-            $parameter_string = rtrim( $parameter_string, '&' );
-        }
-
-        return $parameter_string;
-    }
-
     private function genSig($data)
     {
     	$fields = [];