remove useless required bundle_cost_float_ttc

CETEN-OpenBar · Apr 27, 2024 · aa66232 · aa66232
1 parent 739d503
commit aa66232
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 108 deletions.
diff --git a/backend/autogen/bar.gen.go b/backend/autogen/bar.gen.go
diff --git a/bar.openapi.yml b/bar.openapi.yml
@@ -5440,7 +5440,6 @@ components:
         - amount_per_bundle
         - bundle_cost_ht
         - bundle_cost_ttc
-        - bundle_cost_float_ttc
         - tva
     NewRestock:
       type: object
@@ -5484,7 +5483,7 @@ components:
         bundle_cost_ht:
           type: integer
           format: uint64
-        bundle_cost_ttc:
+        bundle_cost_ttc:  
           type: integer
           format: uint64
         tva:

diff --git a/frontend/src/lib/api/api.ts b/frontend/src/lib/api/api.ts
@@ -1502,7 +1502,7 @@ export interface NewRestockItem {
      * @type {number}
      * @memberof NewRestockItem
      */
-    'bundle_cost_float_ttc': number;
+    'bundle_cost_float_ttc'?: number;
     /**
      * 
      * @type {number}

diff --git a/frontend/src/routes/panel/products/reappro/+page.svelte b/frontend/src/routes/panel/products/reappro/+page.svelte
@@ -52,7 +52,7 @@
 		amount_of_bundle: 'Nombre de lots',
 		amount_per_bundle: 'Nombre de produits par lots',
 		bundle_cost_ht: "Prix d'un lot HT",
-		tva: "0",
+		tva: '0',
 		bundle_cost_ttc: "Prix d'un lot TTC"
 	};
 
@@ -90,7 +90,7 @@
 			if (item.bundle_cost_float_ttc === 0.0) {
 				newRestock.total_cost_ttc += item.amount_of_bundle * item.bundle_cost_ttc;
 			} else {
-				newRestock.total_cost_ttc += item.amount_of_bundle * item.bundle_cost_float_ttc;
+				newRestock.total_cost_ttc += item.amount_of_bundle * (item.bundle_cost_float_ttc ?? item.bundle_cost_ttc);
 			}
 		});
 	}
@@ -119,7 +119,7 @@
 					amount_of_bundle: 'Nombre de lots',
 					amount_per_bundle: 'Nombre de produits par lots',
 					bundle_cost_ht: "Prix d'un lot HT",
-					tva: "0",
+					tva: '0',
 					bundle_cost_ttc: "Prix d'un lot TTC"
 				};
 				newItem = {
@@ -438,9 +438,9 @@
 									amount_of_bundle: 'Nombre de lots',
 									amount_per_bundle: 'Nombre de produits par lots',
 									bundle_cost_ht: "Prix d'un lot HT",
-									tva: "0",
+									tva: '0',
 									bundle_cost_ttc: "Prix d'un lot TTC"
-								};	
+								};
 								newItem = {
 									item_id: '',
 									amount_of_bundle: 0,