dev

skeeks-cms · Jul 26, 2022 · b5f6b4a · b5f6b4a
1 parent 868b8f0
commit b5f6b4a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Currency.php b/src/Currency.php
@@ -21,6 +21,7 @@
  * @property integer       subUnit
  *
  * @property float         baseCourse
+ * @property string        symbol
  *
  * new Currency('RUB');
  *
@@ -1262,7 +1263,7 @@ public function getSubUnit()
             //return (integer)$this->model->sub_unit;
         }
 
-        return (integer) ArrayHelper::getValue($this->_baseData, 'sub_unit');
+        return (integer)ArrayHelper::getValue($this->_baseData, 'sub_unit');
     }
 
     /**
@@ -1307,4 +1308,18 @@ public function getCurrencyCode()
     {
         return $this->code;
     }
+
+    /**
+     * @param $locale
+     * @return false|string
+     */
+    function getSymbol($locale = '')
+    {
+        if (!$locale) {
+            $locale = \Yii::$app->formatter->locale;
+        }
+
+        $formatter = new \NumberFormatter($locale.'@currency='.$this->code, \NumberFormatter::CURRENCY);
+        return $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
+    }
 }
diff --git a/src/Money.php b/src/Money.php
@@ -211,7 +211,13 @@ public function jsonSerialize()
     {
         return [
             'amount' => (float) $this->amount,
+            'amountFormat' => \Yii::$app->formatter->asDecimal($this->amount),
+
+            'amountRound' => (float) round($this->amount, 2),
+            'amountRoundFormat' => \Yii::$app->formatter->asDecimal((float) round($this->amount, 2)),
+
             'currency' => $this->currency->code,
+            'convertSymbol' => $this->currency->symbol,
             'convertAndFormat' => \Yii::$app->money->convertAndFormat($this),
         ];
     }