From e68af3421a56f5b859dc6498dadcb92f62284526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 17 Aug 2020 18:36:11 +0200
Subject: [PATCH 1/3] Fix Checkout payment driver 20087 cvv ctaching

---
 app/PaymentDrivers/CheckoutComPaymentDriver.php     |  6 +++++-
 resources/lang/en/texts.php                         |  4 ++++
 .../ninja2020/gateways/unsuccessful.blade.php       | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/portal/ninja2020/gateways/unsuccessful.blade.php

diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index ff058296e1cb..c865eba9da56 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -229,7 +229,11 @@ class CheckoutComPaymentDriver extends BasePaymentDriver
 
         SystemLogger::dispatch($message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_CHECKOUT, $this->client);
 
-        throw new \Exception('Failed to process the payment: ' . $state['payment_response']->response_summary, 1);
+        // throw new \Exception('Failed to process the payment: ' . $state['payment_response']->response_summary, 1);
+
+        return render('gateways.unsuccessful', [
+            'code' => $state['payment_response']->response_code
+        ]);
     }
 
     public function processInternallyFailedPayment($e, $state)
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 7c8fa0c8ff36..8405755c6cb4 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -3243,4 +3243,8 @@ return [
     'node_status_not_found' => 'I could not find Node anywhere. Is it installed?',
     'npm_status_not_found' => 'I could not find NPM anywhere. Is it installed?',
     'locked_invoice'    => 'This invoice is locked and unable to be modified',
+
+    'common_codes' => 'Common codes and their meanings',
+
+    'payment_error_code_20087' => '20087: Bad Track Data (invalid CVV and/or expiry date)',  
 ];
diff --git a/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php b/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php
new file mode 100644
index 000000000000..5c181dbfb2a3
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php
@@ -0,0 +1,13 @@
+@extends('portal.ninja2020.layout.app')
+@section('meta_title', ctrans('texts.dashboard'))
+
+@section('body')
+    <span class="text-center text-xl text-center">
+        {{ ctrans('texts.payment_error_code', ['code' => isset($code) ? $code : '']) }}
+    </span>
+
+    <span class="mt-6 block">{{ ctrans('texts.common_codes') }}:</span>
+    <ul>
+        <li>{{ ctrans('texts.payment_error_code_20087') }}.</li>
+    </ul>
+@endsection

From d16d6ca916f92921fd5b847f040bf37c0ada981f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 17 Aug 2020 18:37:21 +0200
Subject: [PATCH 2/3] Update title

---
 .../views/portal/ninja2020/gateways/unsuccessful.blade.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php b/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php
index 5c181dbfb2a3..94ae74289b3f 100644
--- a/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php
+++ b/resources/views/portal/ninja2020/gateways/unsuccessful.blade.php
@@ -1,5 +1,5 @@
 @extends('portal.ninja2020.layout.app')
-@section('meta_title', ctrans('texts.dashboard'))
+@section('meta_title', ctrans('texts.error_title'))
 
 @section('body')
     <span class="text-center text-xl text-center">

From b8940d4ccafb295e341e3150c1cbd3c73923c695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 17 Aug 2020 18:38:20 +0200
Subject: [PATCH 3/3] Revert "Fix updating fields on CP profile page"

This reverts commit 0df8cdf4132ea86cc5cea02a6cdee56e19427ae6.
---
 .../views/portal/ninja2020/profile/index.blade.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/portal/ninja2020/profile/index.blade.php b/resources/views/portal/ninja2020/profile/index.blade.php
index 370d67a47682..3a7ce9549df8 100644
--- a/resources/views/portal/ninja2020/profile/index.blade.php
+++ b/resources/views/portal/ninja2020/profile/index.blade.php
@@ -133,7 +133,7 @@
                                 </div>
                                 <div class="col-span-6 sm:col-span-3">
                                     <label for="website" class="input-label">@lang('texts.website')</label>
-                                    <input id="website" class="input w-full" name="website"
+                                    <input id="website" class="input w-full" name="last_name"
                                            value="{{ auth()->user()->client->website }}"/>
                                     @error('website')
                                     <div class="validation validation-fail">
@@ -226,10 +226,10 @@
                                 </div>
                                 <div class="col-span-6 sm:col-span-2">
                                     <label for="country" class="input-label">@lang('texts.country')</label>
-                                    <select id="country" class="input w-full form-select" name="country_id">
+                                    <select id="country" class="input w-full form-select" name="country">
                                         @foreach($countries as $country)
                                             <option
-                                                {{ $country->id == auth()->user()->client->country_id ? 'selected' : null }} value="{{ $country->id }}">
+                                                {{ $country == isset(auth()->user()->client->country->id) ? 'selected' : null }} value="{{ $country->id }}">
                                                 {{ $country->iso_3166_2 }}
                                                 ({{ $country->name }})
                                             </option>
@@ -330,10 +330,10 @@
                                 <div class="col-span-4 sm:col-span-2">
                                     <label for="shipping_country"
                                            class="input-label">@lang('texts.shipping_country')</label>
-                                    <select id="shipping_country" class="input w-full form-select" name="shipping_country_id">
+                                    <select id="shipping_country" class="input w-full form-select" name="shipping_country">
                                         @foreach($countries as $country)
                                             <option
-                                                {{ $country->id == auth()->user()->client->shipping_country_id ? 'selected' : null }} value="{{ $country->id }}">
+                                                {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
                                                 {{ $country->iso_3166_2 }}
                                                 ({{ $country->name }})
                                             </option>