remove child items from Xendit invoice (#172)

* remove child items from Xendit invoice

* add version

* update

Author: andykim

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 11.0.1 (2023-10-26)
+- Fix wrong subtotal in Xendit invoice (Remove Order child items)
+
 ## 11.0.0 (2023-10-17)
 Improvements:
 - Raise AstraPay limit to 20M IDR

Controller/Checkout/Invoice.php

@@ -85,6 +85,10 @@ private function getApiRequestData(Order $order)
         $items = [];
         /** @var OrderItemInterface $orderItem */
         foreach ($orderItems as $orderItem) {
+            if (!empty($orderItem->getParentItem())) {
+                continue;
+            }
+
             $product = $orderItem->getProduct();
             $item = [
                 'reference_id' => $product->getId(),

Controller/Checkout/InvoiceMultishipping.php

@@ -76,6 +76,10 @@ public function execute()
                 /** @var OrderItemInterface $orderItem */
                 foreach ($orderItems as $orderItem) {
                     $product = $orderItem->getProduct();
+                    if (!empty($orderItem->getParentItem())) {
+                        continue;
+                    }
+
                     $item = [
                         'reference_id' => $product->getId(),
                         'name' => $orderItem->getName(),

Helper/Data.php

@@ -30,7 +30,7 @@
  */
 class Data extends AbstractHelper
 {
-    const XENDIT_M2INVOICE_VERSION = '11.0.0';
+    const XENDIT_M2INVOICE_VERSION = '11.0.1';
 
     /**
      * @var StoreManagerInterface

Helper/PhoneNumberFormat.php

@@ -267,10 +267,14 @@ protected function cleanUp(string $phoneNumber)
     public function formatNumber(string $phoneNumber, string $countryCode)
     {
         if (empty($phoneNumber)) {
-            return '';
+            return $phoneNumber;
         }
 
         $countryPhoneCode = $this->getCountryPhoneCode($countryCode);
+        if (empty($countryPhoneCode)) {
+            return $phoneNumber;
+        }
+
         return preg_replace('/^(?:\+?' . $countryPhoneCode . '|0)?/', '+' . $countryPhoneCode, $this->cleanUp($phoneNumber));
     }
 }

Test/Unit/Helper/PhoneNumberFormatTest.php

@@ -35,7 +35,9 @@ public function testFormatPhoneNumber()
         $this->assertEquals('+6319876543219', $this->helper->formatNumber('198.765.432-19', 'PH'));
         $this->assertEquals('+6319876543219', $this->helper->formatNumber('+63198.765.432-19', 'PH'));
         $this->assertEquals('+6319876543219', $this->helper->formatNumber('63198.765.432-19 ', 'PH'));
-        $this->assertEquals('+6319876543219', $this->helper->formatNumber('63198.765.432-19 ', ''));
+
+        // in case country code is empty, we should respond the same phone number
+        $this->assertEquals('019876543219', $this->helper->formatNumber('019876543219', ''));
         $this->assertEquals('', $this->helper->formatNumber('', ''));
     }
 }

composer.json

@@ -2,7 +2,7 @@
   "name": "xendit/m2invoice",
   "description": "Xendit Payment Gateway Module",
   "type": "magento2-module",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "license": [
     "GPL-3.0"
   ],

etc/module.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Xendit_M2Invoice" setup_version="11.0.0" active="true"></module>
+    <module name="Xendit_M2Invoice" setup_version="11.0.1" active="true"></module>
 </config>