From e9500278cdb25a30c19943d2f67ba8ab6a090f27 Mon Sep 17 00:00:00 2001
From: dibakor <dibakor@celimited.com>
Date: Mon, 27 Jul 2026 16:09:14 +0600
Subject: [PATCH] make optional some properties in MaterialFOCs for Integration

---
 .../Integrations/IntegrationMaterialFreeGoodsRequest.cs     | 3 ---
 .../Integrations/IntegrationMaterialPriceRequest.cs         | 6 ++----
 .../Responses/MobileApp/MobileMasterDataResponse.cs         | 3 ++-
 .../Services/MobileApp/MobileMasterDataService.cs           | 3 ++-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs
index 775803b..9715ef1 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
@@ -11,11 +10,9 @@ public class IntegrationMaterialFreeGoodsRequest
     {
         Slabs = new List<IntegrationMaterialFreeGoodItemRequest>();
     }
-    [Required(ErrorMessage = "SalesOrg is required.")]
     [StringLength(10, MinimumLength = 1, ErrorMessage = "SalesOrg must be between 1 and 10 characters.")]
     public string SalesOrg { get; set; }
 
-    [Required(ErrorMessage = "DistributionChannel is required.")]
     [StringLength(5, MinimumLength = 1, ErrorMessage = "DistributionChannel must be between 1 and 5 characters.")]
     public string DistributionChannel { get; set; }
 
diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialPriceRequest.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialPriceRequest.cs
index be4acf9..9343e6b 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialPriceRequest.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialPriceRequest.cs
@@ -12,13 +12,11 @@ public class IntegrationMaterialPriceRequest
         Slabs = new List<IntegrationMaterialPriceItemRequest>();
     }
 
-    [Required(ErrorMessage = "Sales Org is required.")]
     [StringLength(4, ErrorMessage = "Sales Org cannot exceed 4 characters.")]
-    public string SalesOrg { get; set; }
+    public string? SalesOrg { get; set; }
 
-    [Required(ErrorMessage = "Distribution Channel is required.")]
     [StringLength(2, ErrorMessage = "Distribution Channel cannot exceed 2 characters.")]
-    public string DistributionChannel { get; set; }
+    public string? DistributionChannel { get; set; }
 
     [StringLength(13, ErrorMessage = "Customer Number cannot exceed 13 characters.")]
     public string? CustomerNumber { get; set; }
diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
index 9c21f30..d073b1f 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
@@ -113,7 +113,8 @@ public class GetMaterialPriceResponse
     public string CustomerCode { get; set; }
     public string MaterialCode { get; set; }
     public decimal BasePrice { get; set; }
-    public decimal? VatPercentage { get; set; }
+    public decimal? VatValue { get; set; }
+    public string? VatCalculationType { get; set; }
 }
 
 public class GetCustomerResponse
diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
index 85907da..6f4d49c 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
@@ -239,7 +239,8 @@ public class MobileMasterDataService : IMobileMasterDataService
                             CustomerCode = dr.GetString(1),
                             MaterialCode = dr.GetString(2),
                             BasePrice = dr.GetDecimal(3),
-                            VatPercentage =dr.IsDBNull(4) ? null: dr.GetDecimal(4),
+                            VatValue =dr.IsDBNull(4) ? null: dr.GetDecimal(4),
+                            VatCalculationType =dr.IsDBNull(5) ? null: dr.GetString(5),
                         });
                     }
                     dr.Close();