CEL_DMS/OnlineSalesAutoCrop
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change upload password forntend

Browse Source
This commit is contained in:
dibakor 2026-08-13 17:42:16 +06:00
parent 458b7b6976
commit 0ef4818b42
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
View File

@ -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

4
Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs
View File

@ -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())
{

3
Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
View File

@ -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
});
}

2
Api/OnlineSalesAutoCrop.CoreAPI/Controllers/Web/UserController.cs
View File

@ -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;

1
App/ClientApp/src/app/app.routes.module.ts
View File

@ -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]},