Added createAdyenBillingAgreement function in helper, calls...

Added createAdyenBillingAgreement function in helper, calls setCcBillingAgreement in billing agreement model

Gateway/Request/RecurringDataBuilder.php

@@ -31,6 +31,11 @@ class RecurringDataBuilder implements BuilderInterface
      */
     private $adyenHelper;
 
+    /**
+     * @var \Adyen\Payment\Logger\AdyenLogger
+     */
+    protected $_adyenLogger;
+
     /**
      * @var \Magento\Framework\App\State
      */
@@ -44,10 +49,12 @@ class RecurringDataBuilder implements BuilderInterface
      */
     public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
-        \Magento\Framework\Model\Context $context
+        \Magento\Framework\Model\Context $context,
+        \Adyen\Payment\Logger\AdyenLogger $adyenLogger
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->appState = $context->getAppState();
+        $this->_adyenLogger = $adyenLogger;
     }
 
     /**
@@ -93,14 +100,17 @@ class RecurringDataBuilder implements BuilderInterface
                 }
             } else {
                 $recurringContractType = $recurringType;
+                $result['paymentMethod']['storeDetails'] = "true";
             }
         }
+//        $this->_adyenLogger->addAdyenDebug("recurring?: ". $recurringContractType);
 
-        // only when recurringContractType is set and when a customer is loggedIn
-        if ($recurringContractType && $customerId > 0) {
-            $recurring = ['contract' => $recurringContractType];
-            $result['recurring'] = $recurring;
-        }
+
+//        // only when recurringContractType is set and when a customer is loggedIn
+//        if ($recurringContractType && $customerId > 0) {
+//            $recurring = ['contract' => $recurringContractType];
+//            $result['recurring'] = $recurring;
+//        }
 
         return $result;
     }

Gateway/Response/CheckoutPaymentsDetailsHandler.php

@@ -27,6 +27,14 @@ use Magento\Payment\Gateway\Response\HandlerInterface;
 
 class CheckoutPaymentsDetailsHandler implements HandlerInterface
 {
+    public function __construct(
+        \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
+        \Adyen\Payment\Helper\Data $adyenHelper
+    ) {
+        $this->_adyenLogger = $adyenLogger;
+        $this->_adyenHelper = $adyenHelper;
+    }
+
 	/**
 	 * @param array $handlingSubject
 	 * @param array $response
@@ -53,6 +61,12 @@ class CheckoutPaymentsDetailsHandler implements HandlerInterface
 			$payment->setTransactionId($response['pspReference']);
 		}
 
+		if (!empty($response['additionalData']) && !empty($response['additionalData']['recurring.recurringDetailReference'])){
+            $order = $payment->getOrder();
+		   
+		    $this->_adyenHelper->createAdyenBillingAgreement($order, $response['additionalData']);
+        }
+
 		// do not close transaction so you can do a cancel() and void
 		$payment->setIsTransactionClosed(false);
 		$payment->setShouldCloseParentTransaction(false);

Helper/Data.php

@@ -109,24 +109,29 @@ class Data extends AbstractHelper
     protected $cache;
 
     /**
-     * Data constructor.
-     *
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-     * @param \Magento\Framework\Config\DataInterface $dataStorage
-     * @param \Magento\Directory\Model\Config\Source\Country $country
-     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @param \Adyen\Payment\Model\ResourceModel\Billing\Agreement\CollectionFactory $billingAgreementCollectionFactory
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\View\Asset\Source $assetSource
-     * @param \Adyen\Payment\Model\ResourceModel\Notification\CollectionFactory $notificationFactory
-     * @param \Magento\Tax\Model\Config $taxConfig
-     * @param \Magento\Tax\Model\Calculation $taxCalculation
-     * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
-     * @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\CacheInterface $cache
+     * @var \Adyen\Payment\Model\Billing\AgreementFactory
      */
+    protected $_billingAgreementFactory;
+
+	/**
+	 * Data constructor.
+	 *
+	 * @param \Magento\Framework\App\Helper\Context $context
+	 * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
+	 * @param \Magento\Framework\Config\DataInterface $dataStorage
+	 * @param \Magento\Directory\Model\Config\Source\Country $country
+	 * @param \Magento\Framework\Module\ModuleListInterface $moduleList
+	 * @param \Adyen\Payment\Model\ResourceModel\Billing\Agreement\CollectionFactory $billingAgreementCollectionFactory
+	 * @param \Magento\Framework\View\Asset\Repository $assetRepo
+	 * @param \Magento\Framework\View\Asset\Source $assetSource
+	 * @param \Adyen\Payment\Model\ResourceModel\Notification\CollectionFactory $notificationFactory
+	 * @param \Magento\Tax\Model\Config $taxConfig
+	 * @param \Magento\Tax\Model\Calculation $taxCalculation
+	 * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
+	 * @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
+	 * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+	 * @param \Magento\Framework\App\CacheInterface $cache
+	 */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
@@ -143,6 +148,11 @@ class Data extends AbstractHelper
         \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\CacheInterface $cache
+		\Magento\Framework\App\ProductMetadataInterface $productMetadata,
+		\Adyen\Payment\Logger\AdyenLogger $adyenLogger,
+		\Magento\Store\Model\StoreManagerInterface $storeManager,
+		\Magento\Framework\App\CacheInterface $cache,
+        \Adyen\Payment\Model\Billing\AgreementFactory $billingAgreementFactory
     ) {
         parent::__construct($context);
         $this->_encryptor = $encryptor;
@@ -1440,5 +1450,54 @@ class Data extends AbstractHelper
 		}
 
 		return self::CHECKOUT_COMPONENT_JS_LIVE;
+	}
+
+	public function createAdyenBillingAgreement($order, $additionalData){
+        $storeId = $order->getStoreId();
+        $customerReference = $order->getCustomerId();
+        $listRecurringContracts = null;
+        try {
+            // Get or create billing agreement
+            $billingAgreement = $this->_billingAgreementFactory->create();
+            $billingAgreement->load($additionalData['recurring.recurringDetailReference'], 'reference_id');
+            // check if BA exists
+            if (!($billingAgreement && $billingAgreement->getAgreementId() > 0 && $billingAgreement->isValid())) {
+                // create new
+
+                $this->adyenLogger->addNotificationLog("Creating new Billing Agreement");
+
+                $billingAgreement = $this->_billingAgreementFactory->create();
+                $billingAgreement->setStoreId($order->getStoreId());
+                $billingAgreement->importOrderPayment($order->getPayment());
+                $message = __('Created billing agreement #%1.', $additionalData['recurring.recurringDetailReference']);
+            } else {
+
+                $billingAgreement->setIsObjectChanged(true);
+                $message = __('Updated billing agreement #%1.', $additionalData['recurring.recurringDetailReference']);
+            }
+
+            // Populate billing agreement data
+            $billingAgreement->setCcBillingAgreement($additionalData);
+            if ($billingAgreement->isValid()) {
+
+                // save into sales_billing_agreement_order
+                $billingAgreement->addOrderRelation($order);
+                // add to order to save agreement
+                $order->addRelatedObject($billingAgreement);
+            } else {
+                $message = __('Failed to create billing agreement for this order.');
+                throw new \Exception($message);
+            }
+
+        } catch (\Exception $exception) {
+            $message = $exception->getMessage();
+            $this->adyenLogger->addAdyenDebug("exception: " . $message);
+
+        }
+
+        $comment = $order->addStatusHistoryComment($message);
+
+        $order->addRelatedObject($comment);
+
     }
 }

Model/Billing/Agreement.php

@@ -166,4 +166,58 @@ class Agreement extends \Magento\Paypal\Model\Billing\Agreement
     {
         return json_decode($this->getData('agreement_data'), true);
     }
+
+    public function setCcBillingAgreement($contractDetail)
+    {
+        $this
+            ->setMethodCode('adyen_oneclick')
+            ->setReferenceId($contractDetail['recurring.recurringDetailReference']);
+
+        // Billing agreement is CC
+        /**
+         *   $contractDetail['cardBin'] = $cardBin;
+         * $contractDetail['recurringDetailReference'] = $recurringDetailReference;
+         * $contractDetail['cardHolderName'] = $cardHolderName;
+         * $contractDetail['cardSummary'] = $cardSummary;
+         * $contractDetail['expiryDate'] = $expiryDate;
+         * $contractDetail['paymentMethod'] = $paymentMethod;
+         */
+        if (isset($contractDetail['cardBin']) &&
+            isset($contractDetail['cardHolderName']) &&
+            isset($contractDetail['cardSummary']) &&
+            isset($contractDetail['expiryDate']) &&
+            isset($contractDetail['paymentMethod'])) {
+            $ccType = $contractDetail['paymentMethod'];
+            $ccTypes = $this->_adyenHelper->getCcTypesAltData();
+
+            if (isset($ccTypes[$ccType])) {
+                $ccType = $ccTypes[$ccType]['name'];
+            }
+
+            $label = __('%1, %2, **** %3',
+                $ccType,
+                $contractDetail['cardHolderName'],
+                $contractDetail['cardSummary']
+            );
+            $this->setAgreementLabel($label);
+        }
+        $expiryDate = explode('/', $contractDetail['expiryDate']);
+
+        $recurringType = $this->_adyenHelper->getAdyenAbstractConfigData('recurring_type');
+        $agreementData = [
+            'card' => [
+                'holderName' => $contractDetail['cardHolderName'],
+                'number' => $contractDetail['cardSummary'],
+                'expiryMonth' => $expiryDate[0],
+                'expiryYear' => $expiryDate[1]
+            ],
+            'variant' => $contractDetail['paymentMethod'],
+            'contractTypes' => explode(',', $recurringType)
+        ];
+
+        $this->setAgreementData($agreementData);
+
+        return $this;
+
+    }
 }