mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Minor fixes for Payfast
This commit is contained in:
parent
94d7e58f30
commit
fdd71166df
@ -21,7 +21,6 @@ use App\PaymentDrivers\PayFast\Token;
|
|||||||
use App\Utils\Traits\MakesHash;
|
use App\Utils\Traits\MakesHash;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Cache;
|
use Illuminate\Support\Facades\Cache;
|
||||||
use PayFastPayment;
|
|
||||||
|
|
||||||
class PayFastPaymentDriver extends BaseDriver
|
class PayFastPaymentDriver extends BaseDriver
|
||||||
{
|
{
|
||||||
@ -38,19 +37,16 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
public $payment_method; //initialized payment method
|
public $payment_method; //initialized payment method
|
||||||
|
|
||||||
public static $methods = [
|
public static $methods = [
|
||||||
GatewayType::CREDIT_CARD => CreditCard::class,
|
GatewayType::CREDIT_CARD => CreditCard::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
const SYSTEM_LOG_TYPE = SystemLog::TYPE_PAYFAST;
|
const SYSTEM_LOG_TYPE = SystemLog::TYPE_PAYFAST;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//developer resources
|
//developer resources
|
||||||
//https://sandbox.payfast.co.za/
|
//https://sandbox.payfast.co.za/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function gatewayTypes(): array
|
public function gatewayTypes(): array
|
||||||
{
|
{
|
||||||
$types = [];
|
$types = [];
|
||||||
@ -59,7 +55,7 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
|
|
||||||
return $types;
|
return $types;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function endpointUrl()
|
public function endpointUrl()
|
||||||
{
|
{
|
||||||
if($this->company_gateway->getConfigField('testMode'))
|
if($this->company_gateway->getConfigField('testMode'))
|
||||||
@ -73,7 +69,7 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
|
|
||||||
try{
|
try{
|
||||||
|
|
||||||
$this->payfast = new PayFastPayment(
|
$this->payfast = new \PayFast\PayFastPayment(
|
||||||
[
|
[
|
||||||
'merchantId' => $this->company_gateway->getConfigField('merchantId'),
|
'merchantId' => $this->company_gateway->getConfigField('merchantId'),
|
||||||
'merchantKey' => $this->company_gateway->getConfigField('merchantKey'),
|
'merchantKey' => $this->company_gateway->getConfigField('merchantKey'),
|
||||||
@ -100,12 +96,12 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
|
|
||||||
public function authorizeView(array $data)
|
public function authorizeView(array $data)
|
||||||
{
|
{
|
||||||
return $this->payment_method->authorizeView($data);
|
return $this->payment_method->authorizeView($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorizeResponse($request)
|
public function authorizeResponse($request)
|
||||||
{
|
{
|
||||||
return $this->payment_method->authorizeResponse($request);
|
return $this->payment_method->authorizeResponse($request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function processPaymentView(array $data)
|
public function processPaymentView(array $data)
|
||||||
@ -130,7 +126,7 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
return (new Token($this))->tokenBilling($cgt, $payment_hash);
|
return (new Token($this))->tokenBilling($cgt, $payment_hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
// public function generateSignature($data, $passPhrase = null)
|
// public function generateSignature($data, $passPhrase = null)
|
||||||
// {
|
// {
|
||||||
// // Create parameter string
|
// // Create parameter string
|
||||||
// $pfOutput = '';
|
// $pfOutput = '';
|
||||||
@ -202,20 +198,20 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
|
|
||||||
$hash = Cache::get($data['m_payment_id']);
|
$hash = Cache::get($data['m_payment_id']);
|
||||||
|
|
||||||
switch ($hash)
|
switch ($hash)
|
||||||
{
|
{
|
||||||
case 'cc_auth':
|
case 'cc_auth':
|
||||||
return $this->setPaymentMethod(GatewayType::CREDIT_CARD)
|
return $this->setPaymentMethod(GatewayType::CREDIT_CARD)
|
||||||
->authorizeResponse($request);
|
->authorizeResponse($request);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
||||||
$payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$data['m_payment_id']])->first();
|
$payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$data['m_payment_id']])->first();
|
||||||
|
|
||||||
return $this->setPaymentMethod(GatewayType::CREDIT_CARD)
|
return $this->setPaymentMethod(GatewayType::CREDIT_CARD)
|
||||||
->setPaymentHash($payment_hash)
|
->setPaymentHash($payment_hash)
|
||||||
->processPaymentResponse($request);
|
->processPaymentResponse($request);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -223,6 +219,6 @@ class PayFastPaymentDriver extends BaseDriver
|
|||||||
}
|
}
|
||||||
|
|
||||||
return response()->json([], 200);
|
return response()->json([], 200);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user