From 6d7608f8ca0a12fb379560b6a7e4109f5e033f40 Mon Sep 17 00:00:00 2001 From: Sergey Shuchkin Date: Thu, 15 Dec 2022 00:13:39 +0600 Subject: [PATCH] 1.3.10 --- src/SimpleXLSXGen.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SimpleXLSXGen.php b/src/SimpleXLSXGen.php index 40a89a8..524dbb1 100644 --- a/src/SimpleXLSXGen.php +++ b/src/SimpleXLSXGen.php @@ -747,15 +747,16 @@ class SimpleXLSXGen if (strlen($m[2]) < 3) { $N = self::N_DEC; } - } elseif (preg_match('/^(\$)?[-+]?[0-9\.]+( ₽| €)?$/u', $v, $m)) { // currency? - if ($m[1] === '$') { - $N = self::N_DOLLAR; - } elseif ($m[2] === ' ₽') { + } elseif (preg_match('/^\$[-+]?[0-9\.]+$/', $v)) { // currency $? + $N = self::N_DOLLAR; + $cv = ltrim($v, '+$'); + } elseif (preg_match('/^[-+]?[0-9\.]+( ₽| €)$/u', $v, $m)) { // currency ₽ €? + if ($m[1] === ' ₽') { $N = self::N_RUB; - } elseif ($m[2] === ' €') { + } elseif ($m[1] === ' €') { $N = self::N_EURO; } - $cv = trim($v, ' +$₽€'); + $cv = trim($v, ' +₽€'); } elseif (preg_match('/^([-+]?\d+)%$/', $v, $m)) { $cv = round($m[1] / 100, 2); $N = self::N_PERCENT_INT; // [9] 0%