From 98bbd41288266dc82cb2fbc59cb428efac95f326 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sun, 8 Dec 2024 18:45:33 +0330 Subject: [PATCH] RotateShift compute basicyearsPay on checkout fixed bug --- CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs | 4 ++++ ServiceHost/appsettings.Development.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs index dad62a73..f74a6b83 100644 --- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs @@ -157,8 +157,12 @@ public class YearlySalaryRepository : RepositoryBase, IYearl } else { + + + daylyWage = basicDouble > 0 ? (daylyWage + basicDouble) : daylyWage; montlyResult = daylyWage * TotalDays;// مزد ماهانه با پایه سنوات bacicMontlyResult = BasicDayliFee * TotalDays;// مزد ماهانه بدون پایه سنوات + Console.WriteLine($"basicWage : {bacicMontlyResult} - realWage : {montlyResult}"); if (montlyResult > bacicMontlyResult) { diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json index 0be9bb1d..00051e19 100644 --- a/ServiceHost/appsettings.Development.json +++ b/ServiceHost/appsettings.Development.json @@ -12,10 +12,10 @@ //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True" //server - "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" + //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" //local - //"MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" + "MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" }, "GoogleRecaptchaV3": { "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",