v1.0.2

Fix separators in the given amount (expected format, e.g. 1000.00 instead of 1,000.00 or 1.000,00)
dotpay · Jan 12, 2018 · 27e7df6 · yrdus · Jan 15, 2018 · 27e7df6
1 parent 2782c6f
commit 27e7df6
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/Tool/AmountFormatter.php b/src/Tool/AmountFormatter.php
@@ -73,6 +73,20 @@ public static function format($amount, $currency, $rounded = true)
             $amount = round($amount, $precision);
         }
 
-        return number_format($amount, $precision);
+		$amount1 = number_format($amount, $precision);
+        return self::fixAmountSeparator($amount1);
+    }
+
+	/**
+     * Fix separators in the given amount (expected format, e.g. 1000.00 instead of 1,000.00 or 1.000,00)
+     * @param string $inputAmount Input amount
+     * @param string $separator Separator which should be removed besides the last one
+     * @return type
+     */
+    protected function fixAmountSeparator($inputAmount, $separator = '.') {
+        $amount = preg_replace('/[^0-9.]/', '', str_replace(',', '.', $inputAmount));
+        $part1 = str_replace($separator, '', substr($amount, 0, strrpos($amount, $separator)));
+        $part2 = substr($amount, strrpos($amount, $separator));
+        return $part1.$part2;
     }
 }