From 8a3c8ef9fb139627d6b38722451dc6f437bd97ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 15 Jun 2020 13:27:14 +0200 Subject: [PATCH] fix payment status --- app/PaymentDrivers/CheckoutComPaymentDriver.php | 14 ++++++++++---- .../views/portal/ninja2020/payments/show.blade.php | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php index 3bb1b2edfd35..c238dd2d0f7a 100644 --- a/app/PaymentDrivers/CheckoutComPaymentDriver.php +++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php @@ -62,7 +62,7 @@ class CheckoutComPaymentDriver extends BasePaymentDriver 'public' => $this->company_gateway->getConfigField('publicApiKey'), 'sandbox' => $this->company_gateway->getConfigField('testMode'), ]; - + $this->gateway = new CheckoutApi($config['secret'], $config['sandbox'], $config['public']); } @@ -86,6 +86,12 @@ class CheckoutComPaymentDriver extends BasePaymentDriver $data['raw_value'] = $data['amount_with_fee']; $data['customer_email'] = $this->client->present()->email; + // dd($data['token']); + + // if (isset($data['token'])) { + // $data['raw_token'] = $data['token']; + // } + return render($this->viewForType($data['payment_method_id']), $data); } @@ -148,7 +154,7 @@ class CheckoutComPaymentDriver extends BasePaymentDriver $data = [ 'payment_method' => $state['charge_id'], - 'payment_type' => PaymentType::CREDIT_CARD_OTHER, // @todo: needs proper status + 'payment_type' => PaymentType::parseCardType($state['server_response']->card->paymentMethod), 'amount' => $state['raw_value'], ]; @@ -173,14 +179,14 @@ class CheckoutComPaymentDriver extends BasePaymentDriver public function processPendingPayment($state) { $state['charge_id'] = $state['payment_response']->id; - + if (isset($state['store_card'])) { $this->saveCard($state); } $data = [ 'payment_method' => $state['charge_id'], - 'payment_type' => PaymentType::CREDIT_CARD_OTHER, // @todo: needs proper status + 'payment_type' => PaymentType::parseCardType($state['server_response']->card->paymentMethod), 'amount' => $state['raw_value'], ]; diff --git a/resources/views/portal/ninja2020/payments/show.blade.php b/resources/views/portal/ninja2020/payments/show.blade.php index 4891729a408b..494189757277 100644 --- a/resources/views/portal/ninja2020/payments/show.blade.php +++ b/resources/views/portal/ninja2020/payments/show.blade.php @@ -35,7 +35,7 @@ {{ ctrans('texts.method') }}
- {{ $payment->type->name }} + {{ optional($payment->type)->name }}
@@ -62,7 +62,7 @@

{{ ctrans('texts.invoices') }}

-

+

{{ ctrans('texts.list_of_payment_invoices') }}