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')])
     <!-- Your JS includes go here -->
 <script src="https://secure.ewaypayments.com/scripts/eWAY.min.js" data-init="false"></script>
 
+@include('portal.ninja2020.gateways.eway.includes.credt_card')
+
 <script type="text/javascript">
 
 window.onload = function() {
     eWAY.setupSecureField(groupFieldConfig, securePanelCallback);
 };
 
-var labelStyles = "padding-right: 20px; float: right;";
-var publicApiKey = "{{ $public_api_key }}";
-var cardStyles = "padding: 2px; border: 1px solid #AAA; border-radius: 3px; height: 34px; width: 100%;";
-var rowStyles = "";
-var groupStyles = "";
-
-var groupFieldConfig = {
-        publicApiKey: publicApiKey,
-        fieldDivId: "eway-secure-panel",
-        fieldType: "group",
-        styles: groupStyles,
-        layout : {
-            fonts: [ 
-                "Lobster"
-             ],
-            rows : [ 
-                {
-                    styles: rowStyles,
-                    cells: [
-                        {
-                            colSpan: 12,
-                            styles: "margin-top: 15px;",
-                            label: {
-                                fieldColSpan: 4,
-                                text: "Card Name:",
-                                styles: "",
-                            },
-                            field: {
-                                fieldColSpan: 8,
-                                fieldType: "name",
-                                styles: cardStyles,
-                                divStyles: "padding-left: 10px;"
-                            }
-                        },
-                        {
-                            colSpan: 12,
-                            styles: "margin-top: 15px;",
-                            label: {
-                                fieldColSpan: 4,
-                                text: "Expiry:",
-                                styles: "",
-                            },
-                            field: {
-                                fieldColSpan: 8,
-                                fieldType: "expirytext",
-                                styles: cardStyles,
-                                divStyles: "padding-left: 10px;"
-                            }
-                        }
-                    ]
-                },
-                {
-                    styles: rowStyles,
-                    cells: [
-                        {
-                            colSpan: 12,
-                            styles: "margin-top: 15px;",
-                            label: {
-                                fieldColSpan: 4,
-                                text: "Card Number:",
-                                styles: "",
-                            },
-                            field: {
-                                fieldColSpan: 8,
-                                fieldType: "card",
-                                styles: cardStyles,
-                            }
-                        },
-                        {
-                            colSpan: 12,
-                            styles: "margin-top: 15px;",
-                            label: {
-                                fieldColSpan: 4,
-                                text: "CVV Number:",
-                                styles: "",
-                            },
-                            field: {
-                                fieldColSpan: 8,
-                                fieldType: "cvn",
-                                styles: cardStyles,
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    };
-
-function securePanelCallback(event) {
-    if (!event.fieldValid) {
-        console.log(event.errors);
-        alert(getError(event.errors));
-    } else {
-        // set the hidden Secure Field Code field
-        var s = document.getElementById("securefieldcode");
-        s.value = event.secureFieldCode
-        console.log(s.value);
-    }
-}
-
-function doneCallback() {
-    console.log("done callback");
-    var form = document.getElementById("payment_form");
-    form.submit();
-}
-
-function saveAndSubmit() {
-    eWAY.saveAllFields(doneCallback, 2000); 
-    return false;
-}
 
 document
 .getElementById('authorize-card')
@@ -161,183 +53,5 @@ document
 
 });
 
-function getError(k){
-    myArr = k.split(" ");
-
-    var str = "";
-    
-    for(error in myArr){
-        str = str.concat(map.get(myArr[error])) + '\n';
-    }
-
-    return str;
-}
-
-const map = new Map();
-map.set('V6000',  'Validation error');
-map.set('V6001',  'Invalid CustomerIP');
-map.set('V6002',  'Invalid DeviceID');
-map.set('V6003',  'Invalid Request PartnerID');
-map.set('V6004',  'Invalid Request Method');
-map.set('V6010',  'Invalid TransactionType, account not certified for eCome only MOTO or Recurring available');
-map.set('V6011',   'Invalid Payment TotalAmount');
-map.set('V6012',   'Invalid Payment InvoiceDescription');
-map.set('V6013',   'Invalid Payment InvoiceNumber');
-map.set('V6014',   'Invalid Payment InvoiceReference');
-map.set('V6015',   'Invalid Payment CurrencyCode');
-map.set('V6016',   'Payment Required');
-map.set('V6017',   'Payment CurrencyCode Required');
-map.set('V6018',   'Unknown Payment CurrencyCode');
-map.set('V6019',   'Cardholder identity authentication required');
-map.set('V6020',   'Cardholder Input Required');
-map.set('V6021',   'EWAY_CARDHOLDERNAME Required');
-map.set('V6022',   'EWAY_CARDNUMBER Required');
-map.set('V6023',   'EWAY_CARDCVN Required');
-map.set('V6024',   'Cardholder Identity Authentication One Time Password Not Active Yet');
-map.set('V6025',   'PIN Required');
-map.set('V6033',   'Invalid Expiry Date');
-map.set('V6034',   'Invalid Issue Number');
-map.set('V6035',   'Invalid Valid From Date');
-map.set('V6039',   'Invalid Network Token Status');
-map.set('V6040',   'Invalid TokenCustomerID');
-map.set('V6041',  'Customer Required');
-map.set('V6042',  'Customer FirstName Required');
-map.set('V6043',  'Customer LastName Required');
-map.set('V6044',  'Customer CountryCode Required');
-map.set('V6045',  'Customer Title Required');
-map.set('V6046',  'TokenCustomerID Required');
-map.set('V6047',  'RedirectURL Required');
-map.set('V6048',  'CheckoutURL Required when CheckoutPayment specified');
-map.set('V6049',  'nvalid Checkout URL');
-map.set('V6051',  'Invalid Customer FirstName');
-map.set('V6052',  'Invalid Customer LastName');
-map.set('V6053',  'Invalid Customer CountryCode');
-map.set('V6058',  'Invalid Customer Title');
-map.set('V6059',  'Invalid RedirectURL');
-map.set('V6060',  'Invalid TokenCustomerID');
-map.set('V6061',  'Invalid Customer Reference');
-map.set('V6062',  'Invalid Customer CompanyName');
-map.set('V6063',  'Invalid Customer JobDescription');
-map.set('V6064',  'Invalid Customer Street1');
-map.set('V6065',  'Invalid Customer Street2');
-map.set('V6066',  'Invalid Customer City');
-map.set('V6067',  'Invalid Customer State');
-map.set('V6068',  'Invalid Customer PostalCode');
-map.set('V6069',  'Invalid Customer Email');
-map.set('V6070',  'Invalid Customer Phone');
-map.set('V6071',  'Invalid Customer Mobile');
-map.set('V6072',  'Invalid Customer Comments');
-map.set('V6073',  'Invalid Customer Fax');
-map.set('V6074',  'Invalid Customer URL');
-map.set('V6075',  'Invalid ShippingAddress FirstName');
-map.set('V6076',  'Invalid ShippingAddress LastName');
-map.set('V6077',  'Invalid ShippingAddress Street1');
-map.set('V6078',  'Invalid ShippingAddress Street2');
-map.set('V6079',  'Invalid ShippingAddress City');
-map.set('V6080',  'Invalid ShippingAddress State');
-map.set('V6081',  'Invalid ShippingAddress PostalCode');
-map.set('V6082',  'Invalid ShippingAddress Email');
-map.set('V6083',  'Invalid ShippingAddress Phone');
-map.set('V6084',  'Invalid ShippingAddress Country');
-map.set('V6085',  'Invalid ShippingAddress ShippingMethod');
-map.set('V6086',  'Invalid ShippingAddress Fax');
-map.set('V6091',  'Unknown Customer CountryCode');
-map.set('V6092',  'Unknown ShippingAddress CountryCode');
-map.set('V6093',  'Insufficient Address Information');
-map.set('V6100',  'Invalid EWAY_CARDNAME');
-map.set('V6101',  'Invalid EWAY_CARDEXPIRYMONTH');
-map.set('V6102',  'Invalid EWAY_CARDEXPIRYYEAR');
-map.set('V6103',  'Invalid EWAY_CARDSTARTMONTH');
-map.set('V6104',  'Invalid EWAY_CARDSTARTYEAR');
-map.set('V6105',  'Invalid EWAY_CARDISSUENUMBER');
-map.set('V6106',  'Invalid EWAY_CARDCVN');
-map.set('V6107',  'Invalid EWAY_ACCESSCODE');
-map.set('V6108',  'Invalid CustomerHostAddress');
-map.set('V6109',  'Invalid UserAgent');
-map.set('V6110',  'Invalid EWAY_CARDNUMBER');
-map.set('V6111',  'Unauthorised API Access, Account Not PCI Certified');
-map.set('V6112',  'Redundant card details other than expiry year and month');
-map.set('V6113',  'Invalid transaction for refund');
-map.set('V6114',  'Gateway validation error');
-map.set('V6115',  'Invalid DirectRefundRequest, Transaction ID');
-map.set('V6116',  'Invalid card data on original TransactionID');
-map.set('V6117',  'Invalid CreateAccessCodeSharedRequest, FooterText');
-map.set('V6118',  'Invalid CreateAccessCodeSharedRequest, HeaderText');
-map.set('V6119',  'Invalid CreateAccessCodeSharedRequest, Language');
-map.set('V6120',  'Invalid CreateAccessCodeSharedRequest, LogoUrl');
-map.set('V6121',  'Invalid TransactionSearch, Filter Match Type');
-map.set('V6122',  'Invalid TransactionSearch, Non numeric Transaction ID');
-map.set('V6123',  'Invalid TransactionSearch,no TransactionID or AccessCode specified');
-map.set('V6124',  'Invalid Line Items. The line items have been provided however the totals do not match the TotalAmount field');
-map.set('V6125',  'Selected Payment Type not enabled');
-map.set('V6126',  'Invalid encrypted card number, decryption failed');
-map.set('V6127',  'Invalid encrypted cvn, decryption failed');
-map.set('V6128',  'Invalid Method for Payment Type');
-map.set('V6129',  'Transaction has not been authorised for Capture/Cancellation');
-map.set('V6130',  'Generic customer information error');
-map.set('V6131',  'Generic shipping information error');
-map.set('V6132',  'Transaction has already been completed or voided, operation not permitted');
-map.set('V6133',  'Checkout not available for Payment Type');
-map.set('V6134',  'Invalid Auth Transaction ID for Capture/Void');
-map.set('V6135',  'PayPal Error Processing Refund');
-map.set('V6136',  'Original transaction does not exist or state is incorrect');
-map.set('V6140',  'Merchant account is suspended');
-map.set('V6141',  'Invalid PayPal account details or API signature');
-map.set('V6142',  'Authorise not available for Bank/Branch');
-map.set('V6143',  'Invalid Public Key');
-map.set('V6144',  'Method not available with Public API Key Authentication');
-map.set('V6145',  'Credit Card not allow if Token Customer ID is provided with Public API Key Authentication');
-map.set('V6146',  'Client Side Encryption Key Missing or Invalid');
-map.set('V6147',  'Unable to Create One Time Code for Secure Field');
-map.set('V6148',  'Secure Field has Expired');
-map.set('V6149',  'Invalid Secure Field One Time Code');
-map.set('V6150',  'Invalid Refund Amount');
-map.set('V6151',  'Refund amount greater than original transaction');
-map.set('V6152',  'Original transaction already refunded for total amount');
-map.set('V6153',  'Card type not support by merchant');
-map.set('V6154',  'Insufficent Funds Available For Refund');
-map.set('V6155',  'Missing one or more fields in request');
-map.set('V6160',  'Encryption Method Not Supported');
-map.set('V6161',  'Encryption failed, missing or invalid key');
-map.set('V6165',  'Invalid Click-to-Pay (Visa Checkout) data or decryption failed');
-map.set('V6170',  'Invalid TransactionSearch, Invoice Number is not unique');
-map.set('V6171',  'Invalid TransactionSearch, Invoice Number not found');
-map.set('V6220',  'Three domain secure XID invalid');
-map.set('V6221',  'Three domain secure ECI invalid');
-map.set('V6222',  'Three domain secure AVV invalid');
-map.set('V6223',  'Three domain secure XID is required');
-map.set('V6224',  'Three Domain Secure ECI is required');
-map.set('V6225',  'Three Domain Secure AVV is required');
-map.set('V6226',  'Three Domain Secure AuthStatus is required');
-map.set('V6227',  'Three Domain Secure AuthStatus invalid');
-map.set('V6228',  'Three domain secure Version is required');
-map.set('V6230',  'Three domain secure Directory Server Txn ID invalid');
-map.set('V6231',  'Three domain secure Directory Server Txn ID is required');
-map.set('V6232',  'Three domain secure Version is invalid');
-map.set('V6501',  'Invalid Amex InstallementPlan');
-map.set('V6502',  'Invalid Number Of Installements for Amex. Valid values are from 0 to 99 inclusive');
-map.set('V6503',  'Merchant Amex ID required');
-map.set('V6504',  'Invalid Merchant Amex ID');
-map.set('V6505',  'Merchant Terminal ID required');
-map.set('V6506',  'Merchant category code required');
-map.set('V6507',  'Invalid merchant category code');
-map.set('V6508',  'Amex 3D ECI required');
-map.set('V6509',  'Invalid Amex 3D ECI');
-map.set('V6510',  'Invalid Amex 3D verification value');
-map.set('V6511',  'Invalid merchant location data');
-map.set('V6512',  'Invalid merchant street address');
-map.set('V6513',  'Invalid merchant city');
-map.set('V6514',  'Invalid merchant country');
-map.set('V6515',  'Invalid merchant phone');
-map.set('V6516',  'Invalid merchant postcode');
-map.set('V6517',  'Amex connection error');
-map.set('V6518',  'Amex EC Card Details API returned invalid data');
-map.set('V6520',  'Invalid or missing Amex Point Of Sale Data');
-map.set('V6521',  'Invalid or missing Amex transaction date time');
-map.set('V6522',  'Invalid or missing Amex Original transaction date time');
-map.set('V6530',  'Credit Card Number in non Credit Card Field');
-
-
-
 </script>
 @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 @@
-<div class="flex grid grid-rows-1" id="eway--credit-card-container">
-    <div class="h-12">
-        <div id="eway-secure-field-name"></div>
-    </div>
-    <div class="h-12">
-        <div id="eway-secure-field-card"></div>
-    </div>
-    <div class="h-12">
-        <div id="eway-secure-field-expiry"></div>
-    </div>
-    <div class="h-12">
-        <div id="eway-secure-field-cvn"></div>
-    </div>
-    <div id="errors"></div>
-</div>
+<script type="text/javascript">
+
+
+var labelStyles = "padding-right: 20px; float: right;";
+var publicApiKey = "{{ $public_api_key }}";
+var cardStyles = "padding: 2px; border: 1px solid #AAA; border-radius: 3px; height: 34px; width: 100%;";
+var rowStyles = "";
+var groupStyles = "";
+
+var groupFieldConfig = {
+        publicApiKey: publicApiKey,
+        fieldDivId: "eway-secure-panel",
+        fieldType: "group",
+        styles: groupStyles,
+        layout : {
+            fonts: [ 
+                "Lobster"
+             ],
+            rows : [ 
+                {
+                    styles: rowStyles,
+                    cells: [
+                        {
+                            colSpan: 12,
+                            styles: "margin-top: 15px;",
+                            label: {
+                                fieldColSpan: 4,
+                                text: "Card Name:",
+                                styles: "",
+                            },
+                            field: {
+                                fieldColSpan: 8,
+                                fieldType: "name",
+                                styles: cardStyles,
+                                divStyles: "padding-left: 10px;"
+                            }
+                        },
+                        {
+                            colSpan: 12,
+                            styles: "margin-top: 15px;",
+                            label: {
+                                fieldColSpan: 4,
+                                text: "Expiry:",
+                                styles: "",
+                            },
+                            field: {
+                                fieldColSpan: 8,
+                                fieldType: "expirytext",
+                                styles: cardStyles,
+                                divStyles: "padding-left: 10px;"
+                            }
+                        }
+                    ]
+                },
+                {
+                    styles: rowStyles,
+                    cells: [
+                        {
+                            colSpan: 12,
+                            styles: "margin-top: 15px;",
+                            label: {
+                                fieldColSpan: 4,
+                                text: "Card Number:",
+                                styles: "",
+                            },
+                            field: {
+                                fieldColSpan: 8,
+                                fieldType: "card",
+                                styles: cardStyles,
+                            }
+                        },
+                        {
+                            colSpan: 12,
+                            styles: "margin-top: 15px;",
+                            label: {
+                                fieldColSpan: 4,
+                                text: "CVV Number:",
+                                styles: "",
+                            },
+                            field: {
+                                fieldColSpan: 8,
+                                fieldType: "cvn",
+                                styles: cardStyles,
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    };
+
+function securePanelCallback(event) {
+    if (!event.fieldValid) {
+        alert(getError(event.errors));
+    } else {
+        var s = document.getElementById("securefieldcode");
+        s.value = event.secureFieldCode
+    }
+}
+
+function doneCallback() {
+    var form = document.getElementById("payment_form");
+    form.submit();
+}
+
+function saveAndSubmit() {
+    eWAY.saveAllFields(doneCallback, 2000); 
+    return false;
+}
+
+
+function getError(k){
+    myArr = k.split(" ");
+
+    var str = "";
+    
+    for(error in myArr){
+        str = str.concat(map.get(myArr[error])) + '\n';
+    }
+
+    return str;
+}
+
+const map = new Map();
+map.set('V6000',  'Validation error');
+map.set('V6001',  'Invalid CustomerIP');
+map.set('V6002',  'Invalid DeviceID');
+map.set('V6003',  'Invalid Request PartnerID');
+map.set('V6004',  'Invalid Request Method');
+map.set('V6010',  'Invalid TransactionType, account not certified for eCome only MOTO or Recurring available');
+map.set('V6011',   'Invalid Payment TotalAmount');
+map.set('V6012',   'Invalid Payment InvoiceDescription');
+map.set('V6013',   'Invalid Payment InvoiceNumber');
+map.set('V6014',   'Invalid Payment InvoiceReference');
+map.set('V6015',   'Invalid Payment CurrencyCode');
+map.set('V6016',   'Payment Required');
+map.set('V6017',   'Payment CurrencyCode Required');
+map.set('V6018',   'Unknown Payment CurrencyCode');
+map.set('V6019',   'Cardholder identity authentication required');
+map.set('V6020',   'Cardholder Input Required');
+map.set('V6021',   'EWAY_CARDHOLDERNAME Required');
+map.set('V6022',   'EWAY_CARDNUMBER Required');
+map.set('V6023',   'EWAY_CARDCVN Required');
+map.set('V6024',   'Cardholder Identity Authentication One Time Password Not Active Yet');
+map.set('V6025',   'PIN Required');
+map.set('V6033',   'Invalid Expiry Date');
+map.set('V6034',   'Invalid Issue Number');
+map.set('V6035',   'Invalid Valid From Date');
+map.set('V6039',   'Invalid Network Token Status');
+map.set('V6040',   'Invalid TokenCustomerID');
+map.set('V6041',  'Customer Required');
+map.set('V6042',  'Customer FirstName Required');
+map.set('V6043',  'Customer LastName Required');
+map.set('V6044',  'Customer CountryCode Required');
+map.set('V6045',  'Customer Title Required');
+map.set('V6046',  'TokenCustomerID Required');
+map.set('V6047',  'RedirectURL Required');
+map.set('V6048',  'CheckoutURL Required when CheckoutPayment specified');
+map.set('V6049',  'nvalid Checkout URL');
+map.set('V6051',  'Invalid Customer FirstName');
+map.set('V6052',  'Invalid Customer LastName');
+map.set('V6053',  'Invalid Customer CountryCode');
+map.set('V6058',  'Invalid Customer Title');
+map.set('V6059',  'Invalid RedirectURL');
+map.set('V6060',  'Invalid TokenCustomerID');
+map.set('V6061',  'Invalid Customer Reference');
+map.set('V6062',  'Invalid Customer CompanyName');
+map.set('V6063',  'Invalid Customer JobDescription');
+map.set('V6064',  'Invalid Customer Street1');
+map.set('V6065',  'Invalid Customer Street2');
+map.set('V6066',  'Invalid Customer City');
+map.set('V6067',  'Invalid Customer State');
+map.set('V6068',  'Invalid Customer PostalCode');
+map.set('V6069',  'Invalid Customer Email');
+map.set('V6070',  'Invalid Customer Phone');
+map.set('V6071',  'Invalid Customer Mobile');
+map.set('V6072',  'Invalid Customer Comments');
+map.set('V6073',  'Invalid Customer Fax');
+map.set('V6074',  'Invalid Customer URL');
+map.set('V6075',  'Invalid ShippingAddress FirstName');
+map.set('V6076',  'Invalid ShippingAddress LastName');
+map.set('V6077',  'Invalid ShippingAddress Street1');
+map.set('V6078',  'Invalid ShippingAddress Street2');
+map.set('V6079',  'Invalid ShippingAddress City');
+map.set('V6080',  'Invalid ShippingAddress State');
+map.set('V6081',  'Invalid ShippingAddress PostalCode');
+map.set('V6082',  'Invalid ShippingAddress Email');
+map.set('V6083',  'Invalid ShippingAddress Phone');
+map.set('V6084',  'Invalid ShippingAddress Country');
+map.set('V6085',  'Invalid ShippingAddress ShippingMethod');
+map.set('V6086',  'Invalid ShippingAddress Fax');
+map.set('V6091',  'Unknown Customer CountryCode');
+map.set('V6092',  'Unknown ShippingAddress CountryCode');
+map.set('V6093',  'Insufficient Address Information');
+map.set('V6100',  'Invalid EWAY_CARDNAME');
+map.set('V6101',  'Invalid EWAY_CARDEXPIRYMONTH');
+map.set('V6102',  'Invalid EWAY_CARDEXPIRYYEAR');
+map.set('V6103',  'Invalid EWAY_CARDSTARTMONTH');
+map.set('V6104',  'Invalid EWAY_CARDSTARTYEAR');
+map.set('V6105',  'Invalid EWAY_CARDISSUENUMBER');
+map.set('V6106',  'Invalid EWAY_CARDCVN');
+map.set('V6107',  'Invalid EWAY_ACCESSCODE');
+map.set('V6108',  'Invalid CustomerHostAddress');
+map.set('V6109',  'Invalid UserAgent');
+map.set('V6110',  'Invalid EWAY_CARDNUMBER');
+map.set('V6111',  'Unauthorised API Access, Account Not PCI Certified');
+map.set('V6112',  'Redundant card details other than expiry year and month');
+map.set('V6113',  'Invalid transaction for refund');
+map.set('V6114',  'Gateway validation error');
+map.set('V6115',  'Invalid DirectRefundRequest, Transaction ID');
+map.set('V6116',  'Invalid card data on original TransactionID');
+map.set('V6117',  'Invalid CreateAccessCodeSharedRequest, FooterText');
+map.set('V6118',  'Invalid CreateAccessCodeSharedRequest, HeaderText');
+map.set('V6119',  'Invalid CreateAccessCodeSharedRequest, Language');
+map.set('V6120',  'Invalid CreateAccessCodeSharedRequest, LogoUrl');
+map.set('V6121',  'Invalid TransactionSearch, Filter Match Type');
+map.set('V6122',  'Invalid TransactionSearch, Non numeric Transaction ID');
+map.set('V6123',  'Invalid TransactionSearch,no TransactionID or AccessCode specified');
+map.set('V6124',  'Invalid Line Items. The line items have been provided however the totals do not match the TotalAmount field');
+map.set('V6125',  'Selected Payment Type not enabled');
+map.set('V6126',  'Invalid encrypted card number, decryption failed');
+map.set('V6127',  'Invalid encrypted cvn, decryption failed');
+map.set('V6128',  'Invalid Method for Payment Type');
+map.set('V6129',  'Transaction has not been authorised for Capture/Cancellation');
+map.set('V6130',  'Generic customer information error');
+map.set('V6131',  'Generic shipping information error');
+map.set('V6132',  'Transaction has already been completed or voided, operation not permitted');
+map.set('V6133',  'Checkout not available for Payment Type');
+map.set('V6134',  'Invalid Auth Transaction ID for Capture/Void');
+map.set('V6135',  'PayPal Error Processing Refund');
+map.set('V6136',  'Original transaction does not exist or state is incorrect');
+map.set('V6140',  'Merchant account is suspended');
+map.set('V6141',  'Invalid PayPal account details or API signature');
+map.set('V6142',  'Authorise not available for Bank/Branch');
+map.set('V6143',  'Invalid Public Key');
+map.set('V6144',  'Method not available with Public API Key Authentication');
+map.set('V6145',  'Credit Card not allow if Token Customer ID is provided with Public API Key Authentication');
+map.set('V6146',  'Client Side Encryption Key Missing or Invalid');
+map.set('V6147',  'Unable to Create One Time Code for Secure Field');
+map.set('V6148',  'Secure Field has Expired');
+map.set('V6149',  'Invalid Secure Field One Time Code');
+map.set('V6150',  'Invalid Refund Amount');
+map.set('V6151',  'Refund amount greater than original transaction');
+map.set('V6152',  'Original transaction already refunded for total amount');
+map.set('V6153',  'Card type not support by merchant');
+map.set('V6154',  'Insufficent Funds Available For Refund');
+map.set('V6155',  'Missing one or more fields in request');
+map.set('V6160',  'Encryption Method Not Supported');
+map.set('V6161',  'Encryption failed, missing or invalid key');
+map.set('V6165',  'Invalid Click-to-Pay (Visa Checkout) data or decryption failed');
+map.set('V6170',  'Invalid TransactionSearch, Invoice Number is not unique');
+map.set('V6171',  'Invalid TransactionSearch, Invoice Number not found');
+map.set('V6220',  'Three domain secure XID invalid');
+map.set('V6221',  'Three domain secure ECI invalid');
+map.set('V6222',  'Three domain secure AVV invalid');
+map.set('V6223',  'Three domain secure XID is required');
+map.set('V6224',  'Three Domain Secure ECI is required');
+map.set('V6225',  'Three Domain Secure AVV is required');
+map.set('V6226',  'Three Domain Secure AuthStatus is required');
+map.set('V6227',  'Three Domain Secure AuthStatus invalid');
+map.set('V6228',  'Three domain secure Version is required');
+map.set('V6230',  'Three domain secure Directory Server Txn ID invalid');
+map.set('V6231',  'Three domain secure Directory Server Txn ID is required');
+map.set('V6232',  'Three domain secure Version is invalid');
+map.set('V6501',  'Invalid Amex InstallementPlan');
+map.set('V6502',  'Invalid Number Of Installements for Amex. Valid values are from 0 to 99 inclusive');
+map.set('V6503',  'Merchant Amex ID required');
+map.set('V6504',  'Invalid Merchant Amex ID');
+map.set('V6505',  'Merchant Terminal ID required');
+map.set('V6506',  'Merchant category code required');
+map.set('V6507',  'Invalid merchant category code');
+map.set('V6508',  'Amex 3D ECI required');
+map.set('V6509',  'Invalid Amex 3D ECI');
+map.set('V6510',  'Invalid Amex 3D verification value');
+map.set('V6511',  'Invalid merchant location data');
+map.set('V6512',  'Invalid merchant street address');
+map.set('V6513',  'Invalid merchant city');
+map.set('V6514',  'Invalid merchant country');
+map.set('V6515',  'Invalid merchant phone');
+map.set('V6516',  'Invalid merchant postcode');
+map.set('V6517',  'Amex connection error');
+map.set('V6518',  'Amex EC Card Details API returned invalid data');
+map.set('V6520',  'Invalid or missing Amex Point Of Sale Data');
+map.set('V6521',  'Invalid or missing Amex transaction date time');
+map.set('V6522',  'Invalid or missing Amex Original transaction date time');
+map.set('V6530',  'Credit Card Number in non Credit Card Field');
+
+
+</script>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/eway/pay.blade.php b/resources/views/portal/ninja2020/gateways/eway/pay.blade.php
new file mode 100644
index 000000000000..e58ffcabc759
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/eway/pay.blade.php
@@ -0,0 +1,94 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => ctrans('texts.credit_card'), 'card_title' => ctrans('texts.credit_card')])
+
+@section('gateway_head')
+@endsection
+
+@section('gateway_content')
+    <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
+        @csrf
+        <input type="hidden" name="gateway_response">
+        <input type="hidden" name="store_card" id="store_card">
+        <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
+        <input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}">
+        <input type="hidden" name="payment_method_id" value="1">
+        <input type="hidden" name="token" id="token" value="">
+    </form>
+
+    <div class="alert alert-failure mb-4" hidden id="errors"></div>
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+        {{ ctrans('texts.credit_card') }}
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.payment_details')
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
+        @if(count($tokens) > 0)
+            @foreach($tokens as $token)
+                <label class="mr-4">
+                    <input
+                        type="radio"
+                        data-token="{{ $token->token }}"
+                        name="payment-type"
+                        class="form-radio cursor-pointer toggle-payment-with-token"/>
+                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                </label>
+            @endforeach
+        @endisset
+
+        <label>
+            <input
+                type="radio"
+                id="toggle-payment-with-credit-card"
+                class="form-radio cursor-pointer"
+                name="payment-type"
+                checked/>
+            <span class="ml-1 cursor-pointer">{{ __('texts.new_card') }}</span>
+        </label>
+    @endcomponent
+
+    <div id="eway-secure-panel">
+        
+        
+    @include('portal.ninja2020.gateways.includes.save_card')
+    </div>
+
+<!-- -->
+
+    @include('portal.ninja2020.gateways.includes.pay_now')
+@endsection
+
+@section('gateway_footer')
+
+    @include('portal.ninja2020.gateways.eway.includes.credit_card')
+<script src="https://secure.ewaypayments.com/scripts/eWAY.min.js" data-init="false"></script>
+
+
+<script type="text/javascript">
+
+    window.onload = function() {
+        eWAY.setupSecureField(groupFieldConfig, securePanelCallback);
+    };
+
+    document.getElementById('eway-secure-panel').hidden = true;
+
+
+
+            Array
+                .from(document.getElementsByClassName('toggle-payment-with-token'))
+                .forEach((element) => element.addEventListener('click', (e) => {
+                    document.getElementById('save-card--container').style.display = 'none';
+                    document.getElementById('eway-secure-panel').style.display = 'none';
+                    document.getElementById('token').value = e.target.dataset.token;
+                }));
+
+            document
+                .getElementById('toggle-payment-with-credit-card')
+                .addEventListener('click', (e) => {
+                    document.getElementById('save-card--container').style.display = 'grid';
+                    document.getElementById('eway-secure-panel').style.display = 'flex';
+                    document.getElementById('token').value = null;
+                });
+</script>
+
+@endsection