diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs index e8f83e4..b975121 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs @@ -105,6 +105,7 @@ public class GetMaterialResponse public string BrandCode { get; set; } public string BrandName { get; set; } public string SalesOrg { get; set; } + public bool IsSealable { get; set; } = true; } public class GetMaterialPriceResponse diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs index 9b35d28..6eea576 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs @@ -313,6 +313,10 @@ public class IntegrationService : IIntegrationService var materialPriceType = await GetMaterialPriceTypeAsync(tc, request.ConditionType) ; var validationMessages = Validate(request, materialPriceType.PriceType); + if(materialPriceType.PriceType == MaterialPriceTypeEnum.SlabBasedDiscount && request.CalculationType != "A") + { + throw new Exception("Calculation type is not correct for this Invoice Value based discount"); + } if(validationMessages.Any()) { diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs index 902534d..d2e2b1b 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs @@ -156,7 +156,8 @@ public class MobileMasterDataService : IMobileMasterDataService UnitConversionValue = dr.GetDecimal(8), BrandCode = dr.GetString(9), BrandName = dr.GetString(10), - SalesOrg = dr.GetString(11) + SalesOrg = dr.GetString(11), + IsSealable = dr.IsDBNull(12) ? false : dr.GetInt32(12) > 0 }); } diff --git a/Api/OnlineSalesAutoCrop.CoreAPI/Controllers/Web/UserController.cs b/Api/OnlineSalesAutoCrop.CoreAPI/Controllers/Web/UserController.cs index 26f5f05..8428dd5 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI/Controllers/Web/UserController.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI/Controllers/Web/UserController.cs @@ -657,7 +657,7 @@ namespace OnlineSalesAutoCrop.CoreAPI.Controllers.Web return StatusCode(StatusCodes.Status417ExpectationFailed, response); } - bool permitted = await HttpContext.IsPermitted("ELIT.1.2.3_2"); + bool permitted = await HttpContext.IsPermitted("ELIT.1.2.5_2"); if (!permitted) { response.ReturnStatus = StatusCodes.Status403Forbidden; diff --git a/App/ClientApp/src/app/app.routes.module.ts b/App/ClientApp/src/app/app.routes.module.ts index 4628249..09173df 100644 --- a/App/ClientApp/src/app/app.routes.module.ts +++ b/App/ClientApp/src/app/app.routes.module.ts @@ -21,6 +21,7 @@ const routes: Routes = [ { path: 'resetPwd', loadComponent: () => import('./users/resetpwd.component').then(m => m.ResetPwdComponent), canActivate: [AuthGuard], data: { permissionKey: 'ELIT.1.2.3,ELIT.1.2.3_1,ELIT.1.2.3_2' } }, { path: 'uploadPwd', loadComponent: () => import('./users/uploadpwd.component').then(m => m.UploadPwdComponent), canActivate: [AuthGuard], data: { permissionKey: 'ELIT.1.2.3,ELIT.1.2.3_2' } }, { path: 'forcelogout', loadComponent: () => import('./forcelogout/forcelogout.component').then(m => m.ForceLogoutComponent), canActivate: [AuthGuard], data: { permissionKey: 'ELIT.1.2.4,ELIT.1.2.4_1,ELIT.1.2.4_2,ELIT.1.2.4_3' } }, + { path: 'uploadPassword', loadComponent: () => import('./users/uploadpwd.component').then(m => m.UploadPwdComponent), canActivate: [AuthGuard], data: { permissionKey: 'ELIT.1.2.5,ELIT.1.2.5_1,ELIT.1.2.5_2,ELIT.1.2.5_3' } }, //Landing Page { path: 'home', loadComponent: () => import('./home/home.component').then(m => m.HomeComponent), canActivate: [AuthGuard]},