diff --git a/app/PaymentDrivers/Eway/CreditCard.php b/app/PaymentDrivers/Eway/CreditCard.php index a04aea1a4cfd..c656ec8b0922 100644 --- a/app/PaymentDrivers/Eway/CreditCard.php +++ b/app/PaymentDrivers/Eway/CreditCard.php @@ -157,7 +157,7 @@ class CreditCard $payment_meta->exp_month = $response->Customer->CardDetails->ExpiryMonth; $payment_meta->exp_year = $response->Customer->CardDetails->ExpiryYear; $payment_meta->brand = 'CC'; - $payment_meta->last4 = $response->Customer->CardDetails->Number; + $payment_meta->last4 = substr($response->Customer->CardDetails->Number, -4);; $payment_meta->type = GatewayType::CREDIT_CARD; $cgt['payment_meta'] = $payment_meta; @@ -171,6 +171,11 @@ class CreditCard public function paymentView($data) { + $data['gateway'] = $this->eway_driver; + $data['public_api_key'] = $this->eway_driver->company_gateway->getConfigField('publicApiKey'); + + return render('gateways.eway.pay', $data); + } public function processPaymentResponse($request) diff --git a/resources/views/portal/ninja2020/gateways/eway/authorize.blade.php b/resources/views/portal/ninja2020/gateways/eway/authorize.blade.php index 1081a9980942..cd41a3b9a283 100644 --- a/resources/views/portal/ninja2020/gateways/eway/authorize.blade.php +++ b/resources/views/portal/ninja2020/gateways/eway/authorize.blade.php @@ -36,122 +36,14 @@ ctrans('texts.credit_card')]) +@include('portal.ninja2020.gateways.eway.includes.credt_card') + @endsection diff --git a/resources/views/portal/ninja2020/gateways/eway/includes/credit_card.blade.php b/resources/views/portal/ninja2020/gateways/eway/includes/credit_card.blade.php index e462c5d42fdf..3d2730fcf759 100644 --- a/resources/views/portal/ninja2020/gateways/eway/includes/credit_card.blade.php +++ b/resources/views/portal/ninja2020/gateways/eway/includes/credit_card.blade.php @@ -1,15 +1,289 @@ -