fix to not store as oneclick if shopper does not want to store it card, don't...

fix to not store as oneclick if shopper does not want to store it card, don't autofill checkbox for storing card and fix new card labels

Helper/Data.php

@@ -1476,7 +1476,8 @@ class Data extends AbstractHelper
                 }
 
                 // Populate billing agreement data
-                $billingAgreement->setCcBillingAgreement($additionalData);
+                $storeOneClick = $order->getPayment()->getAdditionalInformation('store_cc');
+                $billingAgreement->setCcBillingAgreement($additionalData, $storeOneClick);
                 if ($billingAgreement->isValid()) {
 
                     if (!$this->agreementResourceModel->getOrderRelation($billingAgreement->getAgreementId(),

Model/Billing/Agreement.php

@@ -80,6 +80,8 @@ class Agreement extends \Magento\Paypal\Model\Billing\Agreement
     }
 
     /**
+     * for async store of billing agreement through the recurring_contract notification
+     *
      * @param $data
      * @return $this
      */
@@ -165,7 +167,13 @@ class Agreement extends \Magento\Paypal\Model\Billing\Agreement
         return json_decode($this->getData('agreement_data'), true);
     }
 
-    public function setCcBillingAgreement($contractDetail)
+    /**
+     * For sync result to store billing agreement
+     *
+     * @param $contractDetail
+     * @return $this
+     */
+    public function setCcBillingAgreement($contractDetail, $storeOneClick)
     {
         $this
             ->setMethodCode('adyen_oneclick')
@@ -214,6 +222,13 @@ class Agreement extends \Magento\Paypal\Model\Billing\Agreement
             ) {
                 $recurringType = \Adyen\Payment\Model\RecurringType::ONECLICK;
             }
+
+            // if shopper decides to not store the card don't save it as oneclick
+            if (!$storeOneClick &&
+                $recurringType === \Adyen\Payment\Model\RecurringType::ONECLICK_RECURRING
+            ) {
+                $recurringType = \Adyen\Payment\Model\RecurringType::RECURRING;
+            }
         }
 
         $agreementData = [

etc/adyen_payment.xml

@@ -66,15 +66,15 @@
             <code_alt>bcmc</code_alt>
         </type>
         <type id="HIPERCARD" order="80">
-            <label>hipercard</label>
+            <label>Hipercard</label>
             <code_alt>hipercard</code_alt>
         </type>
         <type id="ELO" order="80">
-            <label>elo</label>
+            <label>Elo</label>
             <code_alt>elo</code_alt>
         </type>
         <type id="AURA" order="80">
-            <label>aura</label>
+            <label>Aura</label>
             <code_alt>aura</code_alt>
         </type>
     </adyen_credit_cards>

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

@@ -39,7 +39,7 @@ define(
             defaults: {
                 template: 'Adyen_Payment/payment/cc-form',
                 creditCardOwner: '',
-                setStoreCc: true,
+                setStoreCc: false,
                 installment: '',
                 creditCardDetailsValid: false
             },