feat: add financial transaction handling during institution contract verification

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,10 +98,8 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
+    public double ContractAmountWithTax => !IsOldContract && IsInstallment ? ContractAmount + (ContractAmount * 0.10)
         : ContractAmount;
-    
-    public double ContractAmountTax => ContractAmount*0.10;
 
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,10 +316,7 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-    public void AddContractingPartyId(long contractingPartyId)
-    {
-        ContractingPartyId = contractingPartyId;
-    }
+
     public void Active(string archiveCode)
     {
         this.IsActive = true;

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -23,6 +23,4 @@ public class InstitutionContractPrintViewModel
     public string VerifierPhoneNumber { get; set; }
     public LawViewModel LawViewModel { get; set; }
     public string Obligation { get; set; }
-    public string OneMonthWithoutTax { get; set; }
-    public string OneMonthTax { get; set; }
 }

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1611,9 +1611,23 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var transaction = await _institutionContractRepository.BeginTransactionAsync();
         await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
         
+        var financialStatement = await _financialStatmentRepository
+            .GetByContractingPartyId(institutionContract.ContractingPartyId);
+        
+        DateTime today = DateTime.Today;
+        var description = institutionContract.IsInstallment
+            ? "قسط اول سرویس"
+            : "پرداخت کل سرویس";
+        var debtorAmount = institutionContract.IsInstallment
+            ? institutionContract.Installments.First().Amount
+            : institutionContract.TotalAmount;
+        
+        var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+            description, "debt", "بابت خدمات", debtorAmount, 0, 0);
+        financialStatement.AddFinancialTransaction(financialTransaction);
         
-        await transaction.CommitAsync();
         await _institutionContractRepository.SaveChangesAsync();
+        await transaction.CommitAsync();
         return op.Succcedded();
     }
 

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -52,7 +52,5 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
 
         builder.Ignore(x => x.ContractAmountWithTax);
-        builder.Ignore(x => x.ContractAmountTax);
-        builder.Ignore(x => x.ContractAmountTax);
     }
 }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -3199,8 +3199,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
                 TaxPrice = institution.ValueAddedTax.ToMoney(),
                 OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
-                OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
-                OneMonthTax = institution.ContractAmountTax.ToMoney(),
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,

CompanyManagment.EFCore/Repository/RollCallRepository.cs

@@ -1425,7 +1425,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 
     public string CheckRepeat(long employeeId, long workshopId)
     {
-        var validSpan = new TimeSpan(0, 0, 5, 0);
+        var validSpan = new TimeSpan(0, 0, 2, 0);
         var checkDate = DateTime.Now.AddDays(-3);
         var query = _context.RollCalls
             .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.CreationDate >= checkDate);

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -809,7 +809,7 @@ public class institutionContractController : AdminBaseController
     }
 
     [HttpPost("mannual-verify/{id}")]
-    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
+    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractManually(long id)
     {
         var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
         return res;

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/DeployLog.cshtml

@@ -1,15 +0,0 @@
-@page
-
-
-<h4>Deploy Log</h4>
-
-<pre style="
-    background:#111;
-    color:#0f0;
-    padding:15px;
-    max-height:600px;
-    overflow:auto;
-    font-size:13px;
-    border-radius:6px;">
-
-</pre>

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml

@@ -2,14 +2,6 @@
 @model ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel
 @{
     ViewData["Title"] = "File Upload";
-    <style>
-        .lineDiv {
-            width: 100%;
-            height: 2px;
-            background-image: linear-gradient(to right, #ffffff, #e5e5e5, #cbcbcb, #b2b2b2, #9a9a9a, #9a9a9a, #9a9a9a, #9a9a9a, #b2b2b2, #cbcbcb, #e5e5e5, #ffffff);
-            margin: 10px;
-        }
-    </style>
 }
 
 <h1>Upload APK File</h1>
@@ -68,85 +60,23 @@
 </form>
 
 
-<form style="margin:30px" asp-page-handler="PaymentGateWay" id="11" method="post">
+<form style="margin:50px" asp-page-handler="PaymentGateWay" id="11" method="post">
 
     <button type="submit">درگاه پرداخت تستی  </button>
 </form>
-<div class="lineDiv"></div>
-<div class="row m-t-20">
-    <div class="col-4"></div>
-    <div class="col-2">
-        <form asp-page-handler="UploadFrontEnd" id="12" method="post">
-            <button type="submit"
-                    class="btn btn-danger"
-                    onclick="return confirm('آیا از انتشار نسخه جدید فرانت مطمئن هستید؟');">
-                🚀 Deploy Next UI
-            </button>
-        </form>
-    </div>
-    <div class="col-2">
-        <button type="button" class="btn btn-outline-secondary"
-                data-bs-toggle="modal"
-                data-bs-target="#logModal">
-            مشاهده لاگ Deploy
-        </button>
-    </div>
-    <div class="col-4"></div>
-</div>
-<div class="lineDiv"></div>
 
-
-
-
-<div class="modal fade" id="logModal" tabindex="-1">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-        <div class="modal-content">
-
-            <div class="modal-header">
-                <h5 class="modal-title">Deploy Log</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-            </div>
-
-            <div class="modal-body">
-                <pre id="logContent"
-                     style="background: #111;
-                            color: #0f0;
-                            padding: 15px;
-                            font-size: 13px;
-                            text-align: left;
-                            direction: ltr;">
-
-                </pre>
-
-            </div>
-
-        </div>
-    </div>
-</div>
-
-<form style="margin:20px" asp-page-handler="ContractingPartyToWorkshop" id="13" method="post">
-
-    <button class="btn btn-outline-secondary" type="submit">  افزودن آی دی طرف حساب به کارگاه </button>
+<form style="margin:50px" asp-page-handler="UploadFrontEnd" id="12">
+    <button type="submit"
+            class="btn btn-danger"
+            onclick="return confirm('آیا از انتشار نسخه جدید فرانت مطمئن هستید؟');">
+        🚀 Deploy Next UI
+    </button>
 </form>
 
-
-
-
 @if (ViewData["message"] != null)
 {
     <p>@ViewData["message"]</p>
 }
-<script>
-    document.getElementById('logModal')
-        .addEventListener('show.bs.modal', function () {
-
-            fetch('?handler=Log')
-                .then(r => r.text())
-                .then(t => {
-                    document.getElementById('logContent').textContent = t;
-                });
-        });
-</script>
 
 @* <script>
 

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs

@@ -19,7 +19,6 @@ using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.EFCore;
-using Hangfire;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -32,9 +31,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Net.Http;
 using System.Security.Cryptography.Xml;
-using System.Text;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Authentication;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -51,7 +48,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IOnlinePayment _onlinePayment;
         private readonly IFaceEmbeddingService _faceEmbeddingService;
-        private readonly IAuthHelper _authHelper;
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -66,18 +62,13 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         [Display(Name = "کد ورژن")]
         public string VersionCode { get; set; }
 
-        /// <summary>
-        /// لاگ آپلود فرانت
-        /// </summary>
-        public string LogContent { get; set; }
-
         [BindProperty] public ApkType SelectedApkType { get; set; }
         [BindProperty] public bool IsForce { get; set; }
 
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -87,7 +78,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _clientRegistrationApplication = clientRegistrationApplication;
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
-            _authHelper = authHelper;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -326,106 +316,26 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //TranslateCode(result?.ErrorCode);
             return Page();
         }
-        [DisableConcurrentExecution(timeoutInSeconds: 120)]
+
         public async Task<IActionResult> OnPostUploadFrontEnd(CancellationToken cancellationToken)
         {
-            var validAccountId = _authHelper.CurrentAccountId();
-            if (validAccountId == 2 || validAccountId == 322)
+            var batPath = @"C:\next-ui\deploy-next-ui.bat";
+
+            var psi = new ProcessStartInfo
             {
-                var batPath = @"C:\next-ui\deploy-next-ui.bat";
+                FileName = batPath,
+                UseShellExecute = true,   // خیلی مهم
+                Verb = "runas",           // اجرای Administrator
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Normal
+            };
 
-                var psi = new ProcessStartInfo
-                {
-                    FileName = batPath,
-                    UseShellExecute = true,   // خیلی مهم
-                    Verb = "runas",           // اجرای Administrator
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden
-                };
-
-                Process.Start(psi);
-
-                TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
-                return RedirectToPage();
-            }
-            return Forbid();
+            Process.Start(psi);
 
+            TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
+            return RedirectToPage();
         }
 
-        /// <summary>
-        /// افزودن آی دی طرف حساب  به  کارگاه
-        /// </summary>
-        /// <returns></returns>
-        [DisableConcurrentExecution(timeoutInSeconds: 120)]
-        public async Task<IActionResult> OnPostContractingPartyToWorkshop()
-        {
-            var workshops = await _context.Workshops.Where(x => x.ContractingPartyId == 0).ToListAsync();
-
-            var worskhopEmployeer = await _context.WorkshopEmployers.Include(x => x.Employer).ToListAsync();
-
-            var contractingParties = await _context.PersonalContractingParties.ToListAsync();
-
-            foreach (var workshop in workshops)
-            {
-                var employers = worskhopEmployeer.Where(x => x.WorkshopId == workshop.id);
-                var contractingPartyIdList = new List<long>();
-                foreach (var employer in employers)
-                {
-                    if (contractingParties.Any(x => x.id == employer.Employer.ContractingPartyId))
-                    {
-                        contractingPartyIdList.Add(employer.Employer.ContractingPartyId);
-                    }
-
-                }
-
-                if (contractingPartyIdList.Count > 0)
-                {
-
-
-                    if (contractingPartyIdList.Count == 1)
-                    {
-                        workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                        await _context.SaveChangesAsync();
-                    }
-                    else
-                    {
-                        var idDistinct = contractingPartyIdList.Distinct().ToList();
-                        if (idDistinct.Count == 1)
-                        {
-                            workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                            await _context.SaveChangesAsync();
-                        }
-                    }
-                }
-            }
-
-
-            ViewData["message"] = "آی دی های طرف حساب اضافه شد";
-            return Page();
-
-        }
-
-        /// <summary>
-        /// دریافت لاگ آپلود فرانت
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult OnGetLog()
-        {
-            var validAccountId = _authHelper.CurrentAccountId();
-            if (validAccountId == 2 || validAccountId == 322)
-            {
-                var logPath = @"C:\next-ui\log.txt";
-                if (!System.IO.File.Exists(logPath))
-                    return Content("Log file not found.");
-
-                var content = System.IO.File.ReadAllText(logPath, Encoding.UTF8);
-                return Content(content);
-            }
-            return Content("شما مجاز به دیدن لاگ نیستید");
-
-        }
-
-
         public async System.Threading.Tasks.Task OnGetCallback(string? transid, string? cardnumber,
             string? tracking_number, string status)
         {
@@ -973,8 +883,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     contract => contract.ContractingPartyId,
                     contractingParty => contractingParty.id,
                     (contract, contractingParty) => new { contract, contractingParty });
-
-
+        
+        
             var remoteContractsQuery = query
                 .Where(x => x.contractingParty.Employers
                     .Any(e => e.WorkshopEmployers

ServiceHost/Areas/Camera/Controllers/CameraController.cs

@@ -145,10 +145,10 @@ public class CameraController : CameraBaseController
         switch (repeatStatus)
         {
             case "IncomRegistred-InvalidOut":
-            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید");
+            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
             
             case "outRegistred-InvalidIncom":
-            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید");
+            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
             
         }
         
@@ -201,10 +201,10 @@ public class CameraController : CameraBaseController
         switch (repeatStatus)
         {
             case "IncomRegistred-InvalidOut":
-                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید");
+                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
             
             case "outRegistred-InvalidIncom":
-                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید");
+                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
             
         }
         
@@ -302,13 +302,13 @@ public class CameraController : CameraBaseController
                 return new JsonResult(new
                 {
                     isSuccess = false,
-                    message = "شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید",
+                    message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
                 });
             case "outRegistred-InvalidIncom":
                 return new JsonResult(new
                 {
                     isSuccess = false,
-                    message = "شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید",
+                    message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
                 });
         }
 
@@ -412,32 +412,6 @@ public class CameraController : CameraBaseController
             });
         }
     }
-    
-    
-    [HttpPost("check-password")]
-    public IActionResult OnPostCheckPassword([FromBody]string password)
-    {
-        var cameraAccount = _authHelper.CameraAccountInfo();
-        var cameraPassword = _cameraAccountApplication.GetDetails(cameraAccount.Id).Password;
-        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraPassword, password);
-        if (result.Verified)
-        {
-            _accountApplication.Logout();
-            return new JsonResult(new
-            {
-                isSuccess = true,
-      
-            });
-        }
-        
-        return new JsonResult(new
-        {
-            isSuccess = false,
-            errorMessage = "گذرواژه اشتباه است",
-        });
-      
-        
-    }
 }
 
 public class RollCallExitRequest:RollCallEnterRequest

ServiceHost/Areas/Camera/Pages/Index.cshtml.cs

@@ -139,13 +139,13 @@ public class IndexModel : PageModel
                     return new JsonResult(new
                     {
                         isSuccess = false,
-                        message = "شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید",
+                        message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
                     });
                 case "outRegistred-InvalidIncom":
                     return new JsonResult(new
                     {
                         isSuccess = false,
-                        message = "شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید",
+                        message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
                     });
             }
 

ServiceHost/Conventions/ParameterBindingConvention.cs

@@ -70,8 +70,7 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
-                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }
@@ -81,8 +80,7 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
-                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }

ServiceHost/Properties/launchSettings.json

@@ -19,7 +19,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },