Merge pull request #89 from xendit/TPI-5400/TPI-5413/invoice-qris

Tpi 5400/tpi 5413/invoice qris
xendit · Nov 15, 2021 · 6d0cfb2 · 6d0cfb2
2 parents 1cec783 + 9098f4d
commit 6d0cfb2
Show file tree

Hide file tree

Showing 39 changed files with 159 additions and 1,311 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 3.3.0 (2021-11-11)
+Improvements:
+- Migrate QRIS (QR Codes) to XenInvoice
+- Add category on create invoice
+
 ## 3.2.0 (2021-11-02)
 Improvements:
 - Migrate Kredivo to XenInvoice

diff --git a/Xendit/M2Invoice/Block/Checkout/Qrcode.php b/Xendit/M2Invoice/Block/Checkout/Qrcode.php
diff --git a/Xendit/M2Invoice/Controller/Checkout/AbstractAction.php b/Xendit/M2Invoice/Controller/Checkout/AbstractAction.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Category;
+use Magento\Catalog\Model\CategoryFactory;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\OrderFactory;
 use Magento\Store\Model\StoreManagerInterface;
@@ -44,6 +46,11 @@ abstract class AbstractAction extends Action
      */
     private $context;
 
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
     /**
      * @var OrderFactory
      */
@@ -143,6 +150,7 @@ abstract class AbstractAction extends Action
      * AbstractAction constructor.
      * @param Session $checkoutSession
      * @param Context $context
+     * @param CategoryFactory $categoryFactory
      * @param OrderFactory $orderFactory
      * @param LoggerInterface $logger
      * @param Data $dataHelper
@@ -164,6 +172,7 @@ abstract class AbstractAction extends Action
     public function __construct(
         Session $checkoutSession,
         Context $context,
+        CategoryFactory $categoryFactory,
         OrderFactory $orderFactory,
         LoggerInterface $logger,
         Data $dataHelper,
@@ -187,6 +196,7 @@ public function __construct(
 
         $this->checkoutSession = $checkoutSession;
         $this->context = $context;
+        $this->categoryFactory = $categoryFactory;
         $this->orderFactory = $orderFactory;
         $this->logger = $logger;
         $this->dataHelper = $dataHelper;
@@ -224,6 +234,14 @@ protected function getCheckoutSession()
         return $this->checkoutSession;
     }
 
+    /**
+     * @return CategoryFactory
+     */
+    protected function getCategoryFactory()
+    {
+        return $this->categoryFactory;
+    }
+
     /**
      * @return OrderFactory
      */
@@ -278,6 +296,21 @@ protected function getOrder()
         return $this->getOrderById($orderId);
     }
 
+    /**
+     * @param $categoryId
+     * @return Category|null
+     */
+    protected function getCategoryById($categoryId)
+    {
+        $category = $this->categoryFactory->create()->loadByIncrementId($categoryId);
+
+        if (!$category->getId()) {
+            return null;
+        }
+
+        return $category;
+    }
+
     /**
      * @param $orderId
      * @return Order|null

diff --git a/Xendit/M2Invoice/Controller/Checkout/Invoice.php b/Xendit/M2Invoice/Controller/Checkout/Invoice.php
@@ -77,8 +77,17 @@ private function getApiRequestData($order)
         foreach ($orderItems as $orderItem) {
             $item = [];
             $product = $orderItem->getProduct();
+            $categoryIds = $product->getCategoryIds();
+            $categories = [];
+            foreach ($categoryIds as $categoryId) {
+                $category = $this->getCategoryFactory()->create();
+                $category->load($categoryId);
+                $categories[] = (string) $category->getName();
+            }
+            $categoryName = implode(', ', $categories);
             $item['reference_id'] = $product->getId();
             $item['name'] = $product->getName();
+            $item['category'] = $categoryName ?: 'Uncategorized';
             $item['price'] = $product->getPrice();
             $item['type'] = 'PRODUCT';
             $item['url'] = $product->getProductUrl();

diff --git a/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php b/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php
@@ -5,6 +5,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Phrase;
 use Magento\Sales\Model\Order;
+use Magento\Catalog\Model\Category;
 use Magento\Framework\Exception\LocalizedException;
 use Zend\Http\Request;
 
@@ -17,6 +18,7 @@ class InvoiceMultishipping extends AbstractAction
     /**
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\Result\Redirect|\Magento\Framework\Controller\ResultInterface
      */
+
     public function execute()
     {
         try {
@@ -67,13 +69,21 @@ public function execute()
                     'country'       => $shippingAddress->getData('country_id') ?: 'ID'
                 ];
                 $addresses[] = (object) $address;
-
                 $orderItems = $order->getAllItems();
                 foreach ($orderItems as $orderItem) {
                     $item = [];
                     $product = $orderItem->getProduct();
+                    $categoryIds = $product->getCategoryIds();
+                    $categories = [];
+                    foreach ($categoryIds as $categoryId) {
+                        $category = $this->getCategoryFactory()->create();
+                        $category->load($categoryId);
+                        $categories[] = (string) $category->getName();
+                    }
+                    $categoryName = implode(', ', $categories);
                     $item['reference_id'] = $product->getId();
                     $item['name'] = $product->getName();
+                    $item['category'] = $categoryName ?: 'Uncategorized';
                     $item['price'] = $product->getPrice();
                     $item['type'] = 'PRODUCT';
                     $item['url'] = $product->getProductUrl();