Merge pull request #172 from Adyen/recurring-cse

Fixed notifications received for Recurring contracts, CSE token not sent if the date is not updated.

Controller/Process/Json.php

@@ -287,9 +287,12 @@ class Json extends \Magento\Framework\App\Action\Action
         $pspReference = trim($response['pspReference']);
         $eventCode = trim($response['eventCode']);
         $success = trim($response['success']);
-
+        $originalReference = null;
+        if(isset($response['originalReference'])) {
+            $originalReference = trim($response['originalReference']);
+        }
         $notification = $this->_objectManager->create('Adyen\Payment\Model\Notification');
-        return $notification->isDuplicate($pspReference, $eventCode, $success);
+        return $notification->isDuplicate($pspReference, $eventCode, $success, $originalReference);
     }
 
     /**

Model/Notification.php

@@ -84,11 +84,12 @@ class Notification extends \Magento\Framework\Model\AbstractModel
      * @param $pspReference
      * @param $eventCode
      * @param $success
+     * @param $originalReference
      * @return bool (true if the notification is a duplicate)
      */
-    public function isDuplicate($pspReference, $eventCode, $success)
+    public function isDuplicate($pspReference, $eventCode, $success, $originalReference)
     {
-        $result = $this->getResource()->getNotification($pspReference, $eventCode, $success);
+        $result = $this->getResource()->getNotification($pspReference, $eventCode, $success, $originalReference);
         return (empty($result)) ? false : true;
     }
     

Model/Resource/Notification.php

@@ -40,15 +40,17 @@ class Notification extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param $pspReference
      * @param $eventCode
      * @param $success
+     * @param $originalReference
      * @return array
      */
-    public function getNotification($pspReference, $eventCode, $success)
+    public function getNotification($pspReference, $eventCode, $success, $originalReference)
     {
         $select = $this->getConnection()->select()
             ->from(['notification' => $this->getTable('adyen_notification')])
             ->where('notification.pspreference=?', $pspReference)
             ->where('notification.event_code=?', $eventCode)
-            ->where('notification.success=?', $success);
+            ->where('notification.success=?', $success)
+            ->where('notification.original_reference=?', $originalReference);
         return $this->getConnection()->fetchAll($select);
     }
 }
\ No newline at end of file

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

@@ -37,6 +37,7 @@ define(
     ],
     function (ko, _, $, Component, placeOrderAction, $t, additionalValidators, selectPaymentMethodAction, quote, checkoutData) {
         'use strict';
+        var updatedExpiryDate = false;
         var recurringDetailReference = ko.observable(null);
         var paymentMethod = ko.observable(null);
         return Component.extend({
@@ -90,10 +91,7 @@ define(
 
                 // only use CSE and installments for cards
                 if (self.agreement_data.card) {
-                    var cse_key = this.getCSEKey();
-                    var options = { enableValidations: false};
 
-                    var cseInstance = adyen.encrypt.createEncryption(cse_key, options);
                     var generationtime = self.getGenerationTime();
 
                     var cardData = {
@@ -103,10 +101,17 @@ define(
                         generationtime : generationtime
                     };
 
-                    var encryptedData = cseInstance.encrypt(cardData);
+                    if(updatedExpiryDate || self.hasVerification()){
+
+                        var options = { enableValidations: false};
+                        var cse_key = this.getCSEKey();
+                        var cseInstance = adyen.encrypt.createEncryption(cse_key, options);
+                        var encryptedData = cseInstance.encrypt(cardData);
+                        data.additional_data.encrypted_data = encryptedData;
+                    }
+
 
                     // set payment method to adyen_hpp
-                    data.additional_data.encrypted_data = encryptedData;
                     data.additional_data.number_of_installments = self.installment;
                 }
 
@@ -180,6 +185,9 @@ define(
                         getGenerationTime: function() {
                             return window.checkoutConfig.payment.adyenCc.generationTime;
                         },
+                        hasVerification: function() {
+                            return window.checkoutConfig.payment.adyenOneclick.hasCustomerInteraction;
+                        },
                         validate: function () {
 
                             var code = self.item.method;
@@ -192,13 +200,13 @@ define(
 
                             // if oneclick or recurring is a card do validation on expiration date
                             if(this.agreement_data.card) {
-                                // add extra validation because jqeury validation will not work on non name attributes
+                                // add extra validation because jquery validation will not work on non name attributes
                                 var expiration = Boolean($(form + ' #' + codeValue + '_expiration').valid());
                                 var expiration_yr = Boolean($(form + ' #' + codeValue + '_expiration_yr').valid());
 
                                 // only check if recurring type is set to oneclick
                                 var cid = true;
-                                if(self.hasVerification()) {
+                                if(this.hasVerification()) {
                                     var cid = Boolean($(form + ' #' + codeValue + '_cc_cid').valid());
                                 }
                             } else {
@@ -214,6 +222,7 @@ define(
                             return true;
                         },
                         selectExpiry: function() {
+                            updatedExpiryDate = true;
                             var self = this;
                             self.expiry(true);
                             return true;
@@ -224,6 +233,8 @@ define(
             },
             selectBillingAgreement: function() {
                 var self = this;
+                self.expiry(false);
+                updatedExpiryDate = false;
 
                 // set payment method data
                 var  data = {
@@ -256,9 +267,6 @@ define(
                 }
                 return null;
             }),
-            hasVerification: function() {
-                return window.checkoutConfig.payment.adyenOneclick.hasCustomerInteraction;
-            },
             getPlaceOrderUrl: function() {
                 return window.checkoutConfig.payment.iframe.placeOrderUrl[this.getCode()];
             }

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

@@ -131,7 +131,7 @@
                 </div>
 
 
-                <!-- ko if: ($parent.hasVerification())-->
+                <!-- ko if: hasVerification()-->
                 <div class="field cvv required" data-bind="attr: {id: getCode() + '_' + value + '_cc_type_cvv_div'}">
                     <label data-bind="attr: {for: getCode() + '_' + value + '_cc_cid'}" class="label">
                         <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>