HP-2392 Do not subtract prepaid amount from a total quantity, being processed

SilverFire · SilverFire · commit 6c3b060fdd83 · 2025-03-12T17:08:31.000+02:00
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);

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);`