Merge ce500d4 into b30b744

jomweb · May 30, 2021 · e496c10 · e496c10
2 parents b30b744 + ce500d4
commit e496c10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "moneyphp/money": "^3.3"
+        "moneyphp/money": "^3.3 || ^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.4 || ^9.0"

diff --git a/src/Taxable.php b/src/Taxable.php
@@ -30,7 +30,7 @@ abstract class Taxable implements Contracts\Taxable
      */
     public function getAmountWithoutTax(Money $money): string
     {
-        return $money->divide(1 + $this->taxRate())->getAmount();
+        return $money->divide((string) (1 + $this->taxRate()))->getAmount();
     }
 
     /**
@@ -42,7 +42,7 @@ public function getAmountWithoutTax(Money $money): string
      */
     public function getAmountWithTax(Money $money): string
     {
-        return $money->multiply(1 + $this->taxRate())->getAmount();
+        return $money->multiply((string) (1 + $this->taxRate()))->getAmount();
     }
 
     /**
@@ -54,7 +54,7 @@ public function getAmountWithTax(Money $money): string
      */
     public function getTaxAmount(Money $money): string
     {
-        return $money->multiply($this->taxRate())->getAmount();
+        return $money->multiply((string) $this->taxRate())->getAmount();
     }
 
     /**