From f00834f2a562a4d6d0bf72eab957c1e6ac0a53a1 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 5 Mar 2021 15:42:29 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/EnumListController.cs | 11 +++++++++++
 server/AyaNova/resource/de.json                  |  5 ++++-
 server/AyaNova/resource/en.json                  |  5 ++++-
 server/AyaNova/resource/es.json                  |  5 ++++-
 server/AyaNova/resource/fr.json                  |  5 ++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs
index 4f83e925..55e8c12c 100644
--- a/server/AyaNova/Controllers/EnumListController.cs
+++ b/server/AyaNova/Controllers/EnumListController.cs
@@ -89,6 +89,7 @@ namespace AyaNova.Api.Controllers
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(CustomerServiceRequestPriority).ToString()), "csr priorities"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(CustomerServiceRequestStatus).ToString()), "csr status"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(PurchaseOrderStatus).ToString()), "PO Status"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(ContractOverrideType).ToString()), "Contract price adjustment type"));
             return Ok(ApiOkResponse.Response(ret));
         }
 
@@ -449,6 +450,16 @@ namespace AyaNova.Api.Controllers
                 ReturnList.Add(new NameIdItem() { Name = LT["PurchaseOrderStatusClosedNoneReceived"], Id = (long)PurchaseOrderStatus.ClosedNoneReceived });
                 ReturnList.Add(new NameIdItem() { Name = LT["PurchaseOrderStatusClosedPartialReceived"], Id = (long)PurchaseOrderStatus.ClosedPartialReceived });
             }
+            else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(ContractOverrideType).ToString()).ToLowerInvariant())
+            {
+                TranslationKeysToFetch.Add("ContractOverrideTypePriceDiscount");
+                TranslationKeysToFetch.Add("ContractOverrideTypeMarkup");
+
+                var LT = await TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, translationId);
+
+                ReturnList.Add(new NameIdItem() { Name = LT["ContractOverrideTypePriceDiscount"], Id = (long)ContractOverrideType.PriceDiscount });
+                ReturnList.Add(new NameIdItem() { Name = LT["ContractOverrideTypeMarkup"], Id = (long)ContractOverrideType.CostMarkup });
+            }
             //#################################################################################################################
             //################### NEW HERE DO NOT FORGET TO ADD TO LISTS AVAILABLE ABOVE AS WELL ##############################
             //#################################################################################################################
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 9e5838d8..afbb9d85 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -2154,5 +2154,8 @@
   "PartStockingLevels": "Mindestbestand an Teilen",
   "Columns": "Spalten",
   "SaveACopy": "Kopie speichern",
-  "ConfirmUpdatePartCost":"Teilekosten von erhaltenen Kosten aktualisieren?"
+  "ConfirmUpdatePartCost":"Teilekosten von erhaltenen Kosten aktualisieren?",
+  "ContractOverrideType":"Preisanpassungsart",
+  "ContractOverrideTypePriceDiscount":"Preis minus Prozentsatz",
+  "ContractOverrideTypeMarkup":"Kosten plus Prozentsatz"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index 6a52c9ef..3b4a84a5 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -2154,5 +2154,8 @@
   "PartStockingLevels": "Part stocking levels",
   "Columns": "Columns",
   "SaveACopy": "Save a copy",
-  "ConfirmUpdatePartCost":"Update part cost from received cost?"
+  "ConfirmUpdatePartCost":"Update part cost from received cost?",
+  "ContractOverrideType":"Price adjustment type",
+  "ContractOverrideTypePriceDiscount":"Price minus percentage",
+  "ContractOverrideTypeMarkup":"Cost plus percentage"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index 042597ab..597b169c 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -2154,5 +2154,8 @@
   "PartStockingLevels": "Niveles de existencias de piezas",
   "Columns": "Columnas",
   "SaveACopy": "Guardar una copia",
-  "ConfirmUpdatePartCost":"¿Actualizar el costo de la pieza del costo recibido?"
+  "ConfirmUpdatePartCost":"¿Actualizar el costo de la pieza del costo recibido?",
+  "ContractOverrideType":"Tipo de ajuste de precio",
+  "ContractOverrideTypePriceDiscount":"Precio menos porcentaje",
+  "ContractOverrideTypeMarkup":"Costo más porcentaje"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index 42b1ced7..db415a59 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -2154,5 +2154,8 @@
   "PartStockingLevels": "Niveaux de stockage des pièces",
   "Columns": "Colonnes",
   "SaveACopy": "Enregistrer une copie",
-  "ConfirmUpdatePartCost":"Mettre à jour le coût de la pièce à partir du coût reçu?"
+  "ConfirmUpdatePartCost":"Mettre à jour le coût de la pièce à partir du coût reçu?",
+  "ContractOverrideType":"Type d'ajustement de prix",
+  "ContractOverrideTypePriceDiscount":"Prix moins pourcentage",
+  "ContractOverrideTypeMarkup":"Coût plus pourcentage"
 }
\ No newline at end of file