Merge pull request #61 from mollie/1.3.2b

Fixed currency value format
mollie · May 16, 2018 · 516bc08 · 516bc08
2 parents 34841cd + 56e7376
commit 516bc08
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 18 deletions.
diff --git a/Helper/General.php b/Helper/General.php
@@ -26,6 +26,7 @@ class General extends AbstractHelper
 
     const MODULE_CODE = 'Mollie_Payment';
     const SUPPORTED_LOCAL = ['en_US', 'de_AT', 'de_CH', 'de_DE', 'es_ES', 'fr_BE', 'fr_FR', 'nl_BE', 'nl_NL'];
+    const CURRENCIES_WITHOUT_DECIMAL = ['JPY'];
 
     const XML_PATH_MODULE_ACTIVE = 'payment/mollie_general/enabled';
     const XML_PATH_API_MODUS = 'payment/mollie_general/type';
@@ -366,22 +367,48 @@ public function getOrderAmountByOrder($order)
         if ($baseCurrency) {
             $orderAmount = [
                 "currency" => $order->getBaseCurrencyCode(),
-                "value"    => number_format($order->getBaseGrandTotal(), 2)
+                "value"    => $this->formatCurrencyValue($order->getBaseGrandTotal(), $order->getBaseCurrencyCode())
             ];
         } else {
             $orderAmount = [
                 "currency" => $order->getOrderCurrencyCode(),
-                "value"    => number_format($order->getGrandTotal(), 2)
+                "value"    => $this->formatCurrencyValue($order->getGrandTotal(), $order->getOrderCurrencyCode())
             ];
         }
 
         return $orderAmount;
     }
 
+    /**
+     * @param int $storeId
+     *
+     * @return int
+     */
+    public function useBaseCurrency($storeId = 0)
+    {
+        return (int)$this->getStoreConfig(self::XML_PATH_USE_BASE_CURRENCY, $storeId);
+    }
+
+    /**
+     * @param $value
+     * @param $currency
+     *
+     * @return string
+     */
+    public function formatCurrencyValue($value, $currency)
+    {
+        $decimalPrecision = 2;
+        if (in_array($currency, self::CURRENCIES_WITHOUT_DECIMAL)) {
+            $decimalPrecision = 0;
+        }
+
+        return number_format($value, $decimalPrecision, '.', '');
+    }
+
     /**
      * Order Currency and Value array for payment request
      *
-     * @param \Magento|Quote $quote
+     * @param \Magento\Quote\Model\Quote $quote
      *
      * @return array
      */
@@ -392,28 +419,18 @@ public function getOrderAmountByQuote($quote)
         if ($baseCurrency) {
             $orderAmount = [
                 "currency" => $quote->getBaseCurrencyCode(),
-                "value"    => number_format($quote->getBaseGrandTotal(), 2)
+                "value"    => $this->formatCurrencyValue($quote->getBaseGrandTotal(), $quote->getBaseCurrencyCode())
             ];
         } else {
             $orderAmount = [
                 "currency" => $quote->getQuoteCurrencyCode(),
-                "value"    => number_format($quote->getGrandTotal(), 2)
+                "value"    => $this->formatCurrencyValue($quote->getGrandTotal(), $quote->getQuoteCurrencyCode())
             ];
         }
 
         return $orderAmount;
     }
 
-    /**
-     * @param int $storeId
-     *
-     * @return int
-     */
-    public function useBaseCurrency($storeId = 0)
-    {
-        return (int)$this->getStoreConfig(self::XML_PATH_USE_BASE_CURRENCY, $storeId);
-    }
-
     /**
      * Determine Locale
      *

diff --git a/Model/Mollie.php b/Model/Mollie.php
@@ -554,7 +554,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $payment->refund([
                 "amount" => [
                     "currency" => $order->getOrderCurrencyCode(),
-                    "value"    => number_format($amount, 2)
+                    "value"    => $this->mollieHelper->formatCurrencyValue($amount, $order->getOrderCurrencyCode())
                 ]
             ]);
         } catch (\Exception $e) {

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "require": {
     "php": "~5.6.5|7.0.2|7.0.4|~7.0.6|~7.1.0",
     "mollie/mollie-api-php": "^2.0"

diff --git a/etc/module.xml b/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="Mollie_Payment" setup_version="1.3.1" />
+    <module name="Mollie_Payment" setup_version="1.3.2" />
 </config>