Add try/catch on originKeys call, add error message for card methods on frontend and backend

Helper/Data.php

@@ -1395,7 +1395,12 @@ class Data extends AbstractHelper
         $client = $this->initializeAdyenClient($storeId);
 
         $service = $this->createAdyenCheckoutUtilityService($client);
-        $response = $service->originKeys($params);
+        try {
+            $response = $service->originKeys($params);
+        }
+        catch(\Exception $e){
+            $this->adyenLogger->error($e->getMessage());
+        }
 
 		$originKey = "";
 

view/adminhtml/templates/form/cc.phtml

@@ -33,6 +33,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
 
 <fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */
 echo $code; ?>" style="display:none">
+    <span id="noApiKey" class="message message-error error" style="visibility: hidden"><?php echo $block->escapeHtml(__('Please configure an API Key in your Adyen Required Settings'));?></span>
     <div class="field admin__field">
         <label for="<?php /* @noEscape */
         echo $code; ?>_cc_owner">
@@ -96,6 +97,10 @@ echo $code; ?>" style="display:none">
                  */
                 var secureFieldsInitialize = function () {
 
+                    if (!"<?php echo $block->getCheckoutOriginKeys(); ?>") {
+                        document.getElementById('noApiKey').style="visibility: visible; display:inline-block";
+                        return;
+                    }
                     var cardNode = document.getElementById("cardContainer-<?php /* @noEscape */ echo $code; ?>");
 
                     var checkout = new AdyenCheckout({

view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js

@@ -71,6 +71,9 @@ define(
             renderSecureFields: function () {
                 var self = this;
                 self.placeOrderAllowed(false);
+                if (!self.getOriginKey()) {
+                    return;
+                }
 
 
                 installments.setInstallments(0);

view/frontend/web/js/view/payment/method-renderer/adyen-oneclick-method.js

@@ -206,6 +206,9 @@ define(
                         renderSecureCVC: function () {
                             var self = this;
 
+                            if (!self.getOriginKey()) {
+                                return;
+                            }
                             var oneClickCardNode = document.getElementById('cvcContainer-' + self.value);
 
                             var checkout = new AdyenCheckout({

view/frontend/web/template/payment/cc-form.html

@@ -39,6 +39,10 @@
 
     <div class="payment-method-content">
 
+        <!-- ko ifnot: (getOriginKey()) -->
+        <span class="message message-error error"><!-- ko text: $t('Please configure an API Key in your Adyen Required Settings')--><!-- /ko --></span>
+        <!--/ko-->
+
         <div class="payment-method-billing-address">
             <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
             <!-- ko template: getTemplate() --><!-- /ko -->

view/frontend/web/template/payment/oneclick-form.html

@@ -45,6 +45,10 @@
     </div>
     <div class="payment-method-content">
 
+        <!-- ko ifnot: (getOriginKey()) -->
+        <span class="message message-error error"><!-- ko text: $t('Please configure an API Key in your Adyen Required Settings')--><!-- /ko --></span>
+        <!--/ko-->
+
         <!-- ko foreach: $parent.getRegion(getMessageName()) -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->