Merge pull request #1 from mbouchottbd/fixes/201811

Fixes/201811
PaylineByMonext · Nov 8, 2018 · 08aecf0 · 08aecf0
2 parents a2907b3 + 60b104a
commit 08aecf0
Show file tree

Hide file tree

Showing 12 changed files with 418 additions and 104 deletions.
diff --git a/Helper/Constants.php b/Helper/Constants.php
@@ -5,15 +5,15 @@
 class Constants
 {
     const CACHE_KEY_MERCHANT_CONTRACT_IMPORT_FLAG = 'payline_merchant_contract_import_flag';
-    
+
     const WEB_PAYMENT_CPT = 'payline_web_payment_cpt';
-    
+
     const CONFIG_PATH_PAYLINE_GENERAL_ENVIRONMENT = 'payline/general/environment';
     const CONFIG_PATH_PAYLINE_GENERAL_MERCHANT_ID = 'payline/general/merchant_id';
     const CONFIG_PATH_PAYLINE_GENERAL_ACCESS_KEY = 'payline/general/access_key';
     const CONFIG_PATH_PAYLINE_GENERAL_DEBUG = 'payline/general/debug';
     const CONFIG_PATH_PAYLINE_GENERAL_CONTRACTS = 'payline/general/contracts';
-    
+
     const ORDER_STATUS_PAYLINE_PENDING = 'payline_pending';
     const ORDER_STATUS_PAYLINE_WAITING_CAPTURE = 'payline_waiting_capture';
     const ORDER_STATUS_PAYLINE_CAPTURED = 'payline_captured';
@@ -22,4 +22,8 @@ class Constants
     const ORDER_STATUS_PAYLINE_REFUSED = 'payline_refused';
     const ORDER_STATUS_PAYLINE_FRAUD = 'payline_fraud';
     const ORDER_STATUS_PAYLINE_WAITING_ACCEPTANCE = 'payline_waiting_acceptance';
+
+    const PAYLINE_API_USED_BY_PREFIX = 'MGT2';
+
+    const MODULE_NAME = 'Monext_Payline';
 }
diff --git a/Model/CartManagement.php b/Model/CartManagement.php
@@ -2,6 +2,8 @@
 
 namespace Monext\Payline\Model;
 
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Checkout\Model\Cart as CheckoutCart;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -12,17 +14,17 @@
 class CartManagement
 {
     /**
-     * @var CartRepositoryInterface 
+     * @var CartRepositoryInterface
      */
     protected $cartRepository;
 
     /**
-     * @var CartManagementInterface 
+     * @var CartManagementInterface
      */
     protected $cartManagement;
 
     /**
-     * @var QuoteFactory 
+     * @var QuoteFactory
      */
     protected $quoteFactory;
 
@@ -32,23 +34,37 @@ class CartManagement
     protected $orderIncrementIdTokenFactory;
 
     /**
-     * @var CheckoutCart 
+     * @var CheckoutCart
      */
     protected $checkoutCart;
 
+    /**
+     * @var ProductCollectionFactory
+     */
+    protected $productCollectionFactory;
+
+    /**
+     * @var CategoryCollectionFactory
+     */
+    protected $categoryCollectionFactory;
+
     public function __construct(
         CartRepositoryInterface $cartRepository,
         CartManagementInterface $cartManagement,
         OrderIncrementIdTokenFactory $orderIncrementIdTokenFactory,
         QuoteFactory $quoteFactory,
-        CheckoutCart $checkoutCart
+        CheckoutCart $checkoutCart,
+        ProductCollectionFactory $productCollectionFactory,
+        CategoryCollectionFactory $categoryCollectionFactory
     )
     {
         $this->cartRepository = $cartRepository;
         $this->cartManagement = $cartManagement;
         $this->quoteFactory = $quoteFactory;
         $this->orderIncrementIdTokenFactory = $orderIncrementIdTokenFactory;
         $this->checkoutCart = $checkoutCart;
+        $this->productCollectionFactory = $productCollectionFactory;
+        $this->categoryCollectionFactory = $categoryCollectionFactory;
     }
 
     public function handleReserveCartOrderId($cartId, $forceReserve = false)
@@ -92,5 +108,54 @@ public function getCartByToken($token)
         // TODO Use QuoteRepository instead of quote::load
         return $this->quoteFactory->create()->load($orderIncrementId, 'reserved_order_id');
     }
+
+    public function getProductCollectionFromCart($cartId)
+    {
+        $cart = $this->cartRepository->getActive($cartId);
+
+        $productIds = [];
+        $categoryIds = [];
+        $productCollection = $this->productCollectionFactory->create();
+        $categoryCollection = $this->categoryCollectionFactory->create();
+
+        foreach ($cart->getItems() as $item) {
+            $productIds[] = $item->getProductId();
+        }
+
+        $productCollection
+            ->addAttributeToFilter('entity_id', ['in' => $productIds])
+            ->addAttributeToSelect('*')
+            ->addCategoryIds();
+
+        foreach ($productCollection as $product) {
+            $categoryIds = array_merge($categoryIds, $product->getCategoryIds());
+        }
+
+        $categoryCollection
+            ->addAttributeToFilter('entity_id', ['in' => $categoryIds])
+            ->addAttributeToSelect(['name', 'payline_category_mapping', 'level']);
+
+        foreach ($productCollection as $product) {
+            $categoryCandidate = null;
+
+            foreach ($product->getCategoryIds() as $categoryId) {
+                $tmpCategory = $categoryCollection->getItemById($categoryId);
+
+                if (!$tmpCategory) {
+                    continue;
+                }
+
+                if (!$categoryCandidate || $tmpCategory->getLevel() > $categoryCandidate->getLevel()) {
+                    $categoryCandidate = $tmpCategory;
+                }
+            }
+
+            $product->setPaylineCategoryMapping(
+                $categoryCandidate->getPaylineCategoryMapping() ? $categoryCandidate->getPaylineCategoryMapping() : $categoryCandidate->getName()
+            );
+        }
+
+        return $productCollection;
+    }
 }
 
diff --git a/Model/Category/Attribute/Source/CategoryMapping.php b/Model/Category/Attribute/Source/CategoryMapping.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Monext\Payline\Model\Category\Attribute\Source;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\File\Csv;
+use Monext\Payline\Helper\Constants as HelperConstants;
+
+/**
+ * This class serve to map Magento Categories to Payline Categories : https://payline.atlassian.net/wiki/spaces/DT/pages/28901389/Codes+Category
+ */
+class CategoryMapping extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
+{
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar
+     */
+    protected $componentRegistrar;
+
+    /**
+     * @var \Magento\Framework\File\Csv
+     */
+    protected $csvReader;
+
+    public function __construct(
+        ComponentRegistrar $componentRegistrar,
+        Csv $csvReader
+    )
+    {
+        $this->componentRegistrar = $componentRegistrar;
+        $this->csvReader = $csvReader;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function getAllOptions()
+    {
+        if (!$this->_options) {
+            $this->_options = [];
+
+            $csvFile = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, HelperConstants::MODULE_NAME) . '/fixtures/category_mapping.csv';
+            $rows = $this->csvReader->getData($csvFile);
+
+            foreach ($rows as $row) {
+                $this->_options[] = ['value' => $row[0], 'label' => __($row[1])];
+            }
+
+            array_unshift($this->_options, ['value' => '', 'label' => __('Please select a category mapping...')]);
+        }
+        return $this->_options;
+    }
+}
diff --git a/Model/PaymentManagement.php b/Model/PaymentManagement.php
@@ -7,6 +7,7 @@
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Data\Collection;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Checkout\Api\PaymentInformationManagementInterface as CheckoutPaymentInformationManagementInterface;
 use Magento\Quote\Api\BillingAddressManagementInterface as QuoteBillingAddressManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -205,6 +206,7 @@ public function wrapCallPaylineApiDoWebPaymentFacade($cartId)
     {
         $response = $this->callPaylineApiDoWebPaymentFacade(
             $this->cartRepository->getActive($cartId), 
+            $this->paylineCartManagement->getProductCollectionFromCart($cartId),
             $this->cartTotalRepository->get($cartId),
             $this->quotePaymentMethodManagement->get($cartId),
             $this->quoteBillingAddressManagement->get($cartId),
@@ -219,6 +221,7 @@ public function wrapCallPaylineApiDoWebPaymentFacade($cartId)
 
     protected function callPaylineApiDoWebPaymentFacade(
         CartInterface $cart,
+        ProductCollection $productCollection,
         TotalsInterface $totals,
         PaymentInterface $payment,
         AddressInterface $billingAddress,
@@ -231,7 +234,7 @@ protected function callPaylineApiDoWebPaymentFacade(
             $shippingAddress = null;
         }
 
-        $response = $this->callPaylineApiDoWebPayment($cart, $totals, $payment, $billingAddress, $shippingAddress);
+        $response = $this->callPaylineApiDoWebPayment($cart, $productCollection, $totals, $payment, $billingAddress, $shippingAddress);
 
         if(!$response->isSuccess()) {
             // TODO log
@@ -248,6 +251,7 @@ protected function callPaylineApiDoWebPaymentFacade(
 
     protected function callPaylineApiDoWebPayment(
         CartInterface $cart,
+        ProductCollection $productCollection,
         TotalsInterface $totals,
         PaymentInterface $payment,
         AddressInterface $billingAddress,
@@ -257,6 +261,7 @@ protected function callPaylineApiDoWebPayment(
         $request = $this->requestDoWebPaymentFactory->create();
         $request
             ->setCart($cart)
+            ->setProductCollection($productCollection)
             ->setBillingAddress($billingAddress)
             ->setShippingAddress($shippingAddress)
             ->setTotals($totals)