diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 50399c5..5a7f434 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -770,18 +770,25 @@ namespace NP.BO.Controllers } public ActionResult taxdetail(VMCRoom vm) { - if (vm.longval < 1) + if (vm.longval < 1 && vm.intval < 0 ) { return Redirect("/croom/tax"); } - vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval } }); + if (vm.intval > 0) + vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "payno", vm.intval } }); + else + vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval }}); vm.FileList = new List() { }; if (vm.PayTaxes.First().fgno != null) { vm.FileList = GetFiles(vm.PayTaxes.First().fgno.Value); } vm.PayTaxes2 = Dao.Get("cr.paytaxes2", vm.PayTaxes.First().payno); - vm.PayTaxItem = Dao.Get("cr.paytaxitem", vm.longval); + if (vm.intval > 0) + vm.PayTaxItem = Dao.Get("cr.paytaxitem2", new System.Collections.Hashtable() { { "payno", vm.intval } }); + else + vm.PayTaxItem = Dao.Get("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", vm.longval } }); + return View(vm); } public ActionResult taxsmart(VMCRoom vm) diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml index 121de7c..88d8aa6 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -149,6 +149,9 @@
@Html.Partial("./Partial/dform", Model, new ViewDataDictionary { { "preform", 1 } })
+
+ +
@section styles{