pushed from bitbucket

RapydPayments · Feb 3, 2021 · 3f92505 · 3f92505
1 parent e414fd3
commit 3f92505
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 8 deletions.
diff --git a/Block/Main.php b/Block/Main.php
@@ -18,14 +18,16 @@ class Main extends \Magento\Framework\View\Element\Template
     protected $transactionBuilder;
     protected $customerSession;
     protected $toolkit_url;
+    protected $_productRepositoryFactory;
 
     public function __construct(
         Context $context,
         Session $checkoutSession,
         OrderFactory $orderFactory,
         \Magento\Customer\Model\Session $customerSession,
         TransactionBuilder $tb,
-        \Magento\Framework\Message\ManagerInterface $messageManager
+        \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Magento\Catalog\Api\ProductRepositoryInterfaceFactory $productRepositoryFactory
     ) {
         $this->toolkit_url = '';
         $this->checkoutSession = $checkoutSession;
@@ -34,6 +36,7 @@ public function __construct(
         $this->customerSession = $customerSession;
         $this->transactionBuilder = $tb;
         $this->_messageManager = $messageManager;
+        $this->_productRepositoryFactory = $productRepositoryFactory;
 
         $this->urlBuilder = \Magento\Framework\App\ObjectManager::getInstance()
             ->get('Magento\Framework\UrlInterface');
@@ -82,7 +85,8 @@ protected function _prepareLayout()
                     'country' => $this->encode_string($billing->getCountryId()),
                     'zip' => $this->encode_string($billing->getPostcode())
                 ],
-                'category' => $this->encode_string($order->getPayment()->getMethodInstance()->getCode())
+                'category' => $this->encode_string($order->getPayment()->getMethodInstance()->getCode()),
+                'cart' => $this->encode_string($this->getCartItems($order))
             ];
 
                 $order->save();
@@ -130,6 +134,57 @@ protected function _prepareLayout()
         }
     }
 
+    public function getCartItems($order)
+    {
+        try {
+            $items = $order->getAllVisibleItems();
+            $cart=[];
+            foreach ($items as $item) {
+                $cart[] = $this->buildCartItem($item->getName(), $item->getPriceInclTax(), $item->getData('qty_ordered'), $this->getProductImage($item));//getQtyToShip()
+            }
+            $cart = $this->addShippingItem($order, $cart);
+            return json_encode($cart, JSON_UNESCAPED_SLASHES);
+        } catch (\Exception $e) {
+            return '';
+        }
+    }
+
+    public function addShippingItem($order, $cart)
+    {
+        $shipping_amount=$order->getShippingAmount();
+        if ($shipping_amount>0) {
+            $cart[]=$this->buildCartItem('shipping', $shipping_amount, 1, '');
+        }
+        return $cart;
+    }
+
+    public function getProductImage($item)
+    {
+        try {
+            $product = $this->_productRepositoryFactory->create()
+                ->getById($item->getProductId());
+            $objectManager =\Magento\Framework\App\ObjectManager::getInstance();
+            $helperImport = $objectManager->get('\Magento\Catalog\Helper\Image');
+
+            return $helperImport->init($product, 'product_page_image_small')
+                ->setImageFile($product->getSmallImage()) // image,small_image,thumbnail
+                ->resize(380)
+                ->getUrl();
+        } catch (\Exception $e) {
+            return '';
+        }
+    }
+
+    public function buildCartItem($name, $amount, $quantity, $image)
+    {
+        return [
+            'name' => $name,
+            'amount' => $amount,
+            'quantity' => $quantity,
+            'image' => $image
+        ];
+    }
+
     public function getLine2($object)
     {
         try {

diff --git a/Model/RapydPaymentMethodAbstract.php b/Model/RapydPaymentMethodAbstract.php
@@ -9,7 +9,6 @@ abstract class RapydPaymentMethodAbstract extends \Magento\Payment\Model\Method\
     protected $_canOrder = true;
     protected $_isGateway = true;
     protected $_canUseInternal = false;
-    protected $categories;
 
     abstract public function getCategory();
 
@@ -23,14 +22,15 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         try {
             $api = $this->getRapydObject();
-            if (empty($this->categories)) {
-                $this->categories = $api->make_request_to_rapyd('get', \Rapyd\Rapydmagento2\lib\RapydConsts::RAPYD_CATEGORIES_PATH);
+            $instance = \Rapyd\Rapydmagento2\lib\RapydCategories::getInstance();
+            if (empty($instance->getCategories())) {
+                $instance->setCategories($api->make_request_to_rapyd('get', \Rapyd\Rapydmagento2\lib\RapydConsts::RAPYD_CATEGORIES_PATH));
             }
 
-            if (!($this->categories) || (!empty($this->categories['status']) &&  'ERROR' == $this->categories['status']['status'])) {
+            if (!($instance->getCategories()) || (!empty($instance->getCategories()['status']) &&  'ERROR' == $instance->getCategories()['status']['status'])) {
                 return false;
             }
-            foreach ($this->categories as $value) {
+            foreach ($instance->getCategories() as $value) {
                 if ($value == $this->getCategory()) {
                     return true;
                 }

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "rapyd/rapydmagento2",
     "description": "Rapyd Payments Plugin for Magento",
     "type": "magento2-module",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": [
         "Apache-2.0"
     ],

diff --git a/lib/RapydCategories.php b/lib/RapydCategories.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rapyd\Rapydmagento2\lib;
+
+class RapydCategories
+{
+    private static $instance = null;
+    private $categories;
+
+    private function __construct()
+    {
+    }
+
+    public static function getInstance()
+    {
+        if (self::$instance == null) {
+            self::$instance = new RapydCategories();
+        }
+        return self::$instance;
+    }
+
+    public function getCategories()
+    {
+        return $this->categories;
+    }
+
+    public function setCategories($categories)
+    {
+        $this->categories = $categories;
+    }
+}
diff --git a/view/frontend/web/js/rapyd-public.js b/view/frontend/web/js/rapyd-public.js
@@ -162,6 +162,9 @@ require(['jquery','domReady!'], function ($) {
     }
 
     function createInstructions(instructions) {
+        if(!instructions[0] || !instructions[0]["steps"] || instructions[0]["steps"].length==0){
+            return;
+        }
         createHeadlineForInstructions();
         var ul = document.createElement('ul');
         ul.style.marginLeft = "unset";