HP-2804: refactor e2e test and presenters for progressive price handling

- Updated `progressive-price.spec.ts` to improve string formatting and enhance price assertions.
- Refined `TemplatePricePresenter` and `CertificatePricePresenter` to utilize `RepresentablePrice` for improved type consistency.
- Added exception annotations (`InvalidConfigException`, `NotInstantiableException`) for better error handling.
- Enhanced overall code clarity and consistency.

Author: tafid

src/grid/presenters/price/CertificatePricePresenter.php

@@ -10,7 +10,8 @@
 
 namespace hipanel\modules\finance\grid\presenters\price;
 
-use hipanel\modules\finance\models\Price;
+use hipanel\modules\finance\models\CertificatePrice;
+use hipanel\modules\finance\models\RepresentablePrice;
 use Money\MoneyFormatter;
 use yii\i18n\Formatter;
 use yii\web\User;
@@ -32,13 +33,13 @@ public function __construct(Formatter $formatter, User $user, MoneyFormatter $mo
     }
 
     /**
-     * @param \hipanel\modules\finance\models\CertificatePrice $price
+     * @param CertificatePrice $price
      * @return string
      */
-    public function renderPrice(Price $price): string
+    public function renderPrice(RepresentablePrice $price): string
     {
         $result = [];
-        foreach ($price->sums as $period => $amount) {
+        foreach ($price->sums as $amount) {
             $result[] = $this->moneyFormatter->format($amount);
         }
 

src/grid/presenters/price/TemplatePricePresenter.php

@@ -11,9 +11,11 @@
 namespace hipanel\modules\finance\grid\presenters\price;
 
 use hipanel\helpers\StringHelper;
-use hipanel\modules\finance\models\Price;
+use hipanel\modules\finance\models\RepresentablePrice;
+use hipanel\modules\finance\models\TemplatePrice;
 use Yii;
 use yii\base\InvalidConfigException;
+use yii\di\NotInstantiableException;
 use yii\helpers\Html;
 
 /**
@@ -24,10 +26,12 @@
 class TemplatePricePresenter extends PricePresenter
 {
     /**
-     * @param \hipanel\modules\finance\models\TemplatePrice $price
+     * @param TemplatePrice $price
      * @return string
+     * @throws InvalidConfigException
+     * @throws NotInstantiableException
      */
-    public function renderPrice(Price $price): string
+    public function renderPrice(RepresentablePrice $price): string
     {
         $formatter = Yii::$app->formatter;
 

tests/playwright/e2e/manager/progressive-price.spec.ts

@@ -4,7 +4,7 @@ import PriceHelper from "@hipanel-module-finance/Helper/PriceHelper";
 import ViewTableHelper from "@hipanel-module-finance/Helper/ViewTableHelper";
 
 test("Test the Progressive Price feature works @hipanel-module-finance @manager", {
-    tag: '@dedicated-server',
+  tag: "@dedicated-server",
 }, async ({ page }) => {
   const planName = "TEST-PROGRESSIVE-PRICE-TEMPLATE" + Math.random().toString(36).substring(7);
   const priceHelper = new PriceHelper(page);
@@ -14,13 +14,18 @@ test("Test the Progressive Price feature works @hipanel-module-finance @manager"
 
   await expect(page.locator("h1")).toContainText(planName);
 
-  await viewTable.assertCellEquals('Name', planName);
-  await viewTable.assertCellEquals('Type', 'template');
-  await viewTable.assertCellEquals('Status', 'ok');
+  await viewTable.assertCellEquals("Name", planName);
+  await viewTable.assertCellEquals("Type", "template");
+  await viewTable.assertCellEquals("Status", "ok");
 
   await priceHelper.createProgressivePrice(planName);
 
-  await expect(page.getByRole("cell", { name: "$30.00 per Item over 0 Item $0.0085 per Item over 1 Item $0.008 per Item over 2 Item $0.0075 per Item over 3 Item" })).toBeVisible();
+  await expect(page.getByRole("cell", {
+    name: "First 1 Item $30.00 "
+      + "Next 1 Item $0.0085 (-100%) "
+      + "Next 1 Item $0.008 (-6%) "
+      + "Over 3 Item $0.0075 (-6%) ",
+  })).toBeVisible();
 
   await expect(page.getByText("Number of IPs")).toBeVisible();
 
@@ -30,9 +35,9 @@ test("Test the Progressive Price feature works @hipanel-module-finance @manager"
 
   await priceHelper.deleteProgressivePriceItems();
 
-  await page.locator('input[name="selection_all"]').check();
+  await page.locator("input[name=\"selection_all\"]").check();
   await page.getByRole("button", { name: "Update" }).click();
-  await expect( page.locator('input#templateprice-0-class')).toBeHidden();
+  await expect(page.locator("input#templateprice-0-class")).toBeHidden();
   await page.getByRole("button", { name: "Cancel" }).click();
 
   await page.getByTestId("delete").click();