diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs index 979feced..bc2478b3 100644 --- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs +++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs @@ -19,22 +19,45 @@ public class ReviewAndPaymentViewModel - - + /// + /// مبلغ پرداخت بدون مالیات + /// Double + /// + public double WithoutTaxPaymentDouble { get; set; } /// - /// مبلغ پرداخت یکجا + /// مبلغ پرداخت بدون مالیات + /// string + /// + public string WithoutTaxPaymentStr { get; set; } + + + /// + /// مبلغ پرداخت کامل /// Double /// public double TotalPaymentDouble { get; set; } /// - /// مبلغ پرداخت یکجا + /// مبلغ پرداخت کامل /// string /// public string TotalPaymentStr { get; set; } + /// + /// مالیات بر ارزش افزوده + /// Double + /// + public double ValueAddedTaxDouble { get; set; } + + /// + /// مالیات بر ارزش افزوده + /// string + /// + public string ValueAddedTaxSt { get; set; } + + /// diff --git a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs index b774eed6..941e283f 100644 --- a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs +++ b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs @@ -389,17 +389,34 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati result.PeriodModel = periodModel; result.PaymentModel = paymentModel; + + var tenPercent = result.SumOfWorkshopsPaymentDouble * 10 / 100; + //مالیات + result.ValueAddedTaxDouble = tenPercent; + result.ValueAddedTaxSt = tenPercent.ToMoney(); if (paymentModel == "OneTime")//تخفیف 10 درصدی درصورت پرداخت یکجا { - var tenPercent = result.SumOfWorkshopsPaymentDouble * 10 / 100; + double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent; - result.TotalPaymentDouble = discountOneTimePeyment; - result.TotalPaymentStr = discountOneTimePeyment.ToMoney(); + + + //مبلغ بدون مالیات و با تخفیف + result.WithoutTaxPaymentDouble = discountOneTimePeyment; + result.WithoutTaxPaymentStr = discountOneTimePeyment.ToMoney(); + + //مبلغ با مالیات + result.TotalPaymentDouble = discountOneTimePeyment + tenPercent; + result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney(); } else { - result.TotalPaymentDouble = result.SumOfWorkshopsPaymentDouble; - result.TotalPaymentStr = result.SumOfWorkshopsPaymentPaymentStr; + //مبلغ بدون مالیات + result.WithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble; + result.WithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney(); + + // مبلغ با مالیات + result.TotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent; + result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney(); } result.ContractingPartTempId = contractingPartyTempId;