fix: tax rates serialization

coopcycle · Feb 7, 2025 · d8c6985 · d8c6985
1 parent a599b7a
commit d8c6985
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/cypress/e2e/local-commerce/@admin/create_delivery_as_admin.cy.js b/cypress/e2e/local-commerce/@admin/create_delivery_as_admin.cy.js
@@ -1,15 +1,6 @@
 context('Delivery (role: admin)', () => {
   beforeEach(() => {
     const prefix = Cypress.env('COMMAND_PREFIX')
-
-    let cmd =
-    'bin/console coopcycle:setup --env=test'
-    if (prefix) {
-      cmd = `${prefix} ${cmd}`
-    }
-
-    cy.exec(cmd)
-
     cmd =
       'bin/console coopcycle:fixtures:load -f cypress/fixtures/stores.yml --env test'
     if (prefix) {
@@ -560,10 +551,10 @@ context('Delivery (role: admin)', () => {
       'match',
       /\/admin\/orders\/[0-9]+$/,
     )
-    cy.get('[name="variantName"]')
+    cy.get('[data-testid="name"]')
       .contains('Test product')
 
-    cy.get('#variantPriceVAT')
+    cy.get('[data-testid="total"]')
       .contains('€72.00')
   })
 })
diff --git a/cypress/fixtures/sylius_taxation.yml b/cypress/fixtures/sylius_taxation.yml
@@ -1,27 +1,27 @@
 AppBundle\Entity\Sylius\TaxRate:
   tva_10:
-    name: "TVA 10%"
-    code: tva_10
+    name: tax_rate.intermediary
+    code: FR_BASE_INTERMEDIARY_INTERMEDIARY
     amount: 0.1
     includedInPrice: true
     calculator: default
   tva_20:
-    name: "TVA 20%"
-    code: tva_20
+    name: tax_rate.standard
+    code: FR_BASE_STANDARD_STANDARD
     amount: 0.2
     includedInPrice: true
     calculator: default
     country: fr
   tva_standard:
-    name: "TVA 0%"
-    code: tax_rate.standard
+    name: tax_rate.standard
+    code: FR_SERVICE_STANDARD
     amount: 0.2
     includedInPrice: true
     calculator: default
     country: fr
   tva_zero:
-    name: "TVA 0%"
-    code: tax_rate.zero
+    name: tax_rate.zero
+    code: FR_SERVICE_TAX_EXEMPT_ZERO
     amount: 0.0
     includedInPrice: true
     calculator: default

diff --git a/js/app/i18n/locales/fr.json b/js/app/i18n/locales/fr.json
@@ -619,7 +619,7 @@
         "DELIVERY_FORM_ERROR_HOUR": "Le retrait doit être avant le dépôt",
         "DELIVERY_FORM_CONTACT_PLACEHOLDER": "Contact",
         "DELIVERY_FORM_REMEMBER_ADDRESS": "Se souvenir de cette adresse",
-        "DELIVERY_FORM_TOTAL_PRICE": "Prix total",
+        "DELIVERY_FORM_TOTAL_PRICE": "Prix",
         "DELIVERY_FORM_TOTAL_VAT": "TTC",
         "DELIVERY_FORM_TOTAL_EX_VAT": "HT",
         "DELIVERY_FORM_REMOVE_DROPOFF": "Retirer ce dépôt", 

diff --git a/src/Api/Resource/TaxRate.php b/src/Api/Resource/TaxRate.php
@@ -60,4 +60,9 @@ public function __construct(BaseTaxRate $taxRate, string $name, array $alternati
     public function getId() {
         return $this->id;
     }
+
+    public function setId(int $id) {
+        $this->id = $id;
+        return $this;
+    }
 }
diff --git a/src/Entity/Sylius/Order.php b/src/Entity/Sylius/Order.php
@@ -2052,6 +2052,11 @@ public function getDeliveryPrice(): PriceInterface
         }
     }
 
+    public function hasArbitraryPrice(): bool
+    {
+        return $this->getDeliveryPrice() instanceof ArbitraryPrice;
+    }
+
     public function getExports(): Collection
     {
         return $this->exports;