admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add seprate tax for institutionContractController create

Browse Source
This commit is contained in:
mahan
2025-09-27 11:22:52 +03:30
parent 81d78affa0
commit 0ebca7c613
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
View File

@@ -46,7 +46,9 @@ public class ReviewAndPaymentViewModel
/// مالیات بر ارزش افزوده
/// string
/// </summary>
public string ValueAddedTaxStr { get; set; }
public string MonthlyValueAddedTaxStr { get; set; }
public string OneTimeValueAddedTaxStr { get; set; }
/// <summary>
/// لیست اقساط ماهیانه

9
CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
View File

@@ -561,7 +561,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
{
var tenPercent = sumOfWorkshopsPaymentDouble * 10 / 100;
//مالیات
result.ValueAddedTaxStr = tenPercent.ToMoney();
//پرداخت یکجا
#region OneTimePaymentResult
@@ -571,11 +570,14 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
//مبلغ بدون مالیات و با تخفیف
result.OneTimeWithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
var oneTimeValueAddedTax = (discountOneTimePeyment * 10) / 100;
result.OneTimeValueAddedTaxStr = oneTimeValueAddedTax.ToMoney();
//مبلغ با مالیات
var oneTimePayment = discountOneTimePeyment + tenPercent;
var oneTimePayment = discountOneTimePeyment + oneTimeValueAddedTax;
result.OneTimeTotalPaymentStr = oneTimePayment.ToMoney();
result.DiscountedAmountForOneMonth = roundAmount2.ToMoney();
#endregion
@@ -589,6 +591,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
result.MonthlyWithoutTaxPaymentStr = sumOfWorkshopsPaymentDouble.ToMoney();
// مبلغ با مالیات
result.MonthlyValueAddedTaxStr= tenPercent.ToMoney();
var monthlyTotalPaymentDouble = sumOfWorkshopsPaymentDouble + tenPercent;
result.MonthlyTotalPaymentStr = monthlyTotalPaymentDouble.ToMoney();
var installmentList = new List<MonthlyInstallment>();
@@ -669,7 +672,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
result.Discount = oneMonthDiscountAmount.ToMoney();
result.DiscountedAmountForOneMonth = (roundAmount2 - oneMonthDiscountAmount).ToMoney();
var taxDouble = (discountedPayment * 10)/100;
result.ValueAddedTaxStr =taxDouble.ToMoney();
result.OneTimeValueAddedTaxStr =taxDouble.ToMoney();
result.OneTimeWithoutTaxPaymentStr = discountedPayment.ToMoney();
result.OneTimeTotalPaymentStr =( discountedPayment + taxDouble).ToMoney();
}

8
ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
View File

@@ -633,7 +633,7 @@ public class institutionContractController : AdminBaseController
{
TotalAmountWithTax = res.OneTimeTotalPaymentStr,
OneTimeTotalAmountWithoutTax = res.OneTimeWithoutTaxPaymentStr,
TotalTax = res.ValueAddedTaxStr,
OneTimeValueAddedTaxStr = res.OneTimeValueAddedTaxStr,
Installments = res.MonthlyInstallments,
OneTimeTotalAmount = res.OneTimeTotalPaymentStr,
MonthlyTotalAmount = res.MonthlyTotalPaymentStr,
@@ -641,7 +641,7 @@ public class institutionContractController : AdminBaseController
ContractStart = res.ContractStartFa,
ContractEnd = res.ContractEndFa,
Discount = res.Discount,
ValueAddedTax = res.ValueAddedTaxStr,
MonthlyValueAddedTaxStr = res.MonthlyValueAddedTaxStr,
DailyCompensation = res.DailyCompensation,
Obligation = res.OneTimeTotalPaymentStr,
PaymentForOneMonth = res.SumOfWorkshopsPayment,
@@ -729,12 +729,12 @@ public class InstitutionPlanCalculatorResponse
public string TotalAmountWithTax { get; set; }
public string OneTimeTotalAmountWithoutTax { get; set; }
public string OneTimeTotalAmount { get; set; }
public string TotalTax { get; set; }
public string OneTimeValueAddedTaxStr { get; set; }
public string MonthlyTotalAmount { get; set; }
public string MonthlyTotalAmountWithoutTax { get; set; }
public string ContractStart { get; set; }
public string ContractEnd { get; set; }
public string ValueAddedTax { get; set; }
public string MonthlyValueAddedTaxStr { get; set; }
public string DailyCompensation { get; set; }
public string Obligation { get; set; }
public string PaymentForOneMonth { get; set; }