diff --git a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php index 75b3e923907c..3207497f3c8c 100644 --- a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php +++ b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php @@ -55,7 +55,9 @@ class CreditCard implements LivewireMethodInterface public function paymentData(array $data): array { // $description = $this->stripe->getDescription(false); - + $merge = [ + 'publicKey' => $this->powerboard->company_gateway->getConfigField('publicKey'), + ]; // $payment_intent_data = [ // 'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()), // 'currency' => $this->stripe->client->getCurrencyCode(), @@ -72,7 +74,7 @@ class CreditCard implements LivewireMethodInterface // $data['intent'] = $this->stripe->createPaymentIntent($payment_intent_data); // $data['gateway'] = $this->stripe; - // return $data; + return array_merge($data, $merge); } public function paymentView(array $data) diff --git a/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php b/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php index e419d33bb5f9..27583f6a69ed 100644 --- a/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php +++ b/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php @@ -12,16 +12,17 @@ namespace App\PaymentDrivers; -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; use App\Models\SystemLog; use App\Utils\HtmlEngine; +use App\Models\GatewayType; +use App\Models\PaymentHash; +use App\Models\PaymentType; +use App\Jobs\Util\SystemLogger; use App\Utils\Traits\MakesHash; +use App\Models\ClientGatewayToken; +use App\PaymentDrivers\CBAPowerBoard\CreditCard; /** * Class CBAPowerBoardPaymentDriver. @@ -36,9 +37,13 @@ class CBAPowerBoardPaymentDriver extends BaseDriver public $refundable = true; - protected $api_endpoint = ''; + protected $api_endpoint = 'https://api.powerboard.commbank.com.au/'; - protected $widget_endpoint = ''; + protected $widget_endpoint = 'https://widget.powerboard.commbank.com.au/sdk/latest/widget.umd.min.js'; + + public static $methods = [ + GatewayType::CREDIT_CARD => CreditCard::class, + ]; /** * Returns the gateway types. */ @@ -51,9 +56,11 @@ class CBAPowerBoardPaymentDriver extends BaseDriver return $types; } - public function init() + public function init(): self { -// $this->company_gateway->getConfigField('account_id') + if($this->company_gateway->getConfigField('testMode')) { + $this->widget_endpoint = 'https://widget.preproduction.powerboard.commbank.com.au/sdk/latest/widget.umd.min.js'; + $this->api_endpoint = 'https://api.preproduction.powerboard.commbank.com.au/'; } return $this; } @@ -113,7 +120,6 @@ class CBAPowerBoardPaymentDriver extends BaseDriver public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash) { - return (new Charge($this))->tokenBilling($cgt, $payment_hash); } public function importCustomers() @@ -124,6 +130,8 @@ class CBAPowerBoardPaymentDriver extends BaseDriver { $this->init(); + + return true; // try { // $this->verifyConnect(); // return true; diff --git a/resources/views/portal/ninja2020/gateways/powerboard/pay.blade.php b/resources/views/portal/ninja2020/gateways/powerboard/pay.blade.php new file mode 100644 index 000000000000..b41083273dc0 --- /dev/null +++ b/resources/views/portal/ninja2020/gateways/powerboard/pay.blade.php @@ -0,0 +1,10 @@ + + + + + +
\ No newline at end of file