Merge branch 'master' into HP-1751_create_configurations_for_billing_types

VadymHrechukha · VadymHrechukha · commit 48f501df153e · 2025-04-16T20:06:38.000+03:00
diff --git a/behat.yml b/behat.yml
@@ -1,4 +1,18 @@
 default:
+    formatters:
+        pretty:
+            output_styles:
+                passed: [ white, green ]
+                passed_param: [ white, green, [ bold ] ]
+                undefined: [ yellow, null, [ underscore, bold ] ]
+                pending: [ yellow, null, [ underscore ] ]
+                pending_param: [ yellow, null, [ underscore, bold ] ]
+                failed: [ white, red ]
+                failed_param: [ white, red, [ bold ] ]
+                skipped: [ cyan ]
+                skipped_param: [ cyan, null, [ bold ] ]
+                comment: [ cyan ]
+                tag: [ cyan ]
     suites:
         php-billing:
             paths:
diff --git a/src/price/ProgressivePrice.php b/src/price/ProgressivePrice.php
@@ -49,10 +49,10 @@ public function getThresholds(): ProgressivePriceThresholdList
      */
     public function calculateUsage(QuantityInterface $quantity): ?QuantityInterface
     {
-        $usage = $quantity->convert($this->prepaid->getUnit())->subtract($this->prepaid);
+        $usage = $quantity->subtract($this->prepaid);
 
         if ($usage->isPositive()) {
-            return $usage;
+            return $quantity->convert($this->prepaid->getUnit());
         }
 
         return Quantity::create($this->prepaid->getUnit()->getName(), 0);
diff --git a/tests/behat/Combination.feature b/tests/behat/Combination.feature
@@ -83,7 +83,7 @@ Feature: Combination
         | date       | qty      | first                                  | second                    | third            |
         | 2022-01-01 | 1        | monthly 100 USD for 672 hour           | monthly 0 USD for 72 hour |                  |
         | 2022-04-01 | 1        | monthly 100 USD for 672 hour           | monthly 0 USD for 48 hour |                  |
-        | 2022-05-15 | 0.5      | monthly 55.36 USD for 372 hour         |                           |                  |
+        | 2022-05-15 | 0.5      | monthly 55.36 USD for 408 hour         |                           |                  |
 
       Scenario Outline: discount, then monthly cap
       Given formula is discount.fixed('10 USD').since('04.2022')
@@ -98,5 +98,5 @@ Feature: Combination
         | date       | qty      | first                                  | second                    | third            |
         | 2022-01-01 | 1        | monthly 100 USD for 672 hour           | monthly 0 USD for 72 hour |                  |
         | 2022-04-01 | 1        | monthly 90 USD for 672 hour            | monthly 0 USD for 48 hour |                  |
-        | 2022-05-15 | 0.5      | monthly 49.82 USD for 372 hour         |                           |                  |
+        | 2022-05-15 | 0.5      | monthly 49.82 USD for 408 hour         |                           |                  |
 

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ public function getThresholds(): ProgressivePriceThresholdList`
`49`	`49`	`*/`
`50`	`50`	`public function calculateUsage(QuantityInterface $quantity): ?QuantityInterface`
`51`	`51`	`{`
`52`		`- $usage = $quantity->convert($this->prepaid->getUnit())->subtract($this->prepaid);`
	`52`	`+ $usage = $quantity->subtract($this->prepaid);`
`53`	`53`
`54`	`54`	`if ($usage->isPositive()) {`
`55`		`- return $usage;`
	`55`	`+ return $quantity->convert($this->prepaid->getUnit());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return Quantity::create($this->prepaid->getUnit()->getName(), 0);`