diff --git a/.vs/OSS/v16/.suo b/.vs/OSS/v16/.suo index d261b3e..fd0ad83 100644 Binary files a/.vs/OSS/v16/.suo and b/.vs/OSS/v16/.suo differ diff --git a/Controllers/NewCOIController.cs b/Controllers/NewCOIController.cs index 6125dd0..dd7fbb7 100644 --- a/Controllers/NewCOIController.cs +++ b/Controllers/NewCOIController.cs @@ -138,38 +138,38 @@ namespace OSS.Controllers } public ActionResult ValidateAttachments() { - // var ProjectCode = Session["ProjectCode"].ToString(); - // var checkApplicationForm = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Application Form"); - // if (checkApplicationForm == null) - // { - // TempData["error"] = " Please upload Application form"; - // return RedirectToAction("AttachmentsNew"); - // } - // var checkAttachmentBank = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Bank Statement"); - // if (checkAttachmentBank == null) - // { - // TempData["error"] = " Please upload Bank Statement"; - // return RedirectToAction("AttachmentsNew"); - // } + var ProjectCode = Session["ProjectCode"].ToString(); + var checkApplicationForm = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Application Form"); + if (checkApplicationForm == null) + { + TempData["error"] = " Please upload Application form"; + return RedirectToAction("AttachmentsNew"); + } + var checkAttachmentBank = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Bank Statement"); + if (checkAttachmentBank == null) + { + TempData["error"] = " Please upload Bank Statement"; + return RedirectToAction("AttachmentsNew"); + } - // var checkAttachmentBoard = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Board Resolution"); - // if (checkAttachmentBoard == null) - // { - // TempData["error"] = " Please upload Board Resolution"; - // return RedirectToAction("AttachmentsNew"); - // } - // var checkAttachmentBusinesP = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Business Plan"); - // if (checkAttachmentBusinesP == null) - // { - // TempData["error"] = " Please upload Business Plan"; - // return RedirectToAction("AttachmentsNew"); - // } - // var checkAttachmentInc = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "INCORPORATION"); - // if (checkAttachmentInc == null) - // { - // TempData["error"] = " Please upload Certificate of Incorporation"; - // return RedirectToAction("AttachmentsNew"); - // } + var checkAttachmentBoard = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Board Resolution"); + if (checkAttachmentBoard == null) + { + TempData["error"] = " Please upload Board Resolution"; + return RedirectToAction("AttachmentsNew"); + } + var checkAttachmentBusinesP = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "Business Plan"); + if (checkAttachmentBusinesP == null) + { + TempData["error"] = " Please upload Business Plan"; + return RedirectToAction("AttachmentsNew"); + } + var checkAttachmentInc = myContext.AttachmentsList.SingleOrDefault(t => t.ProjectCode == ProjectCode && t.AttachmentName == "INCORPORATION"); + if (checkAttachmentInc == null) + { + TempData["error"] = " Please upload Certificate of Incorporation"; + return RedirectToAction("AttachmentsNew"); + } return RedirectToAction("PickUpOfficeNew"); } diff --git a/Views/NewCOI/ApplicationStatus.cshtml b/Views/NewCOI/ApplicationStatus.cshtml index ed61bed..0b783da 100644 --- a/Views/NewCOI/ApplicationStatus.cshtml +++ b/Views/NewCOI/ApplicationStatus.cshtml @@ -219,7 +219,7 @@ <% if(data.PaymentStatus == true) {%> " target="_blank" class="btn btn-outline-success btn-sm"> - Download + Receipt <% } else diff --git a/Views/NewCOI/AttachmentsNew.cshtml b/Views/NewCOI/AttachmentsNew.cshtml index 7e58e13..ffd74e1 100644 --- a/Views/NewCOI/AttachmentsNew.cshtml +++ b/Views/NewCOI/AttachmentsNew.cshtml @@ -67,7 +67,7 @@
Preview your application form for signature and upload to the system
- Print Application Form + Print Application Form

diff --git a/Views/NewCOI/Payment.cshtml b/Views/NewCOI/Payment.cshtml index 99ba31a..0417040 100644 --- a/Views/NewCOI/Payment.cshtml +++ b/Views/NewCOI/Payment.cshtml @@ -51,7 +51,10 @@
- Print invoice +@if (Session["ProjectCode"] != null) +{ + Print invoice +}
diff --git a/Views/NewCOI/PickUpOfficeNew.cshtml b/Views/NewCOI/PickUpOfficeNew.cshtml index 660c83d..ae9609c 100644 --- a/Views/NewCOI/PickUpOfficeNew.cshtml +++ b/Views/NewCOI/PickUpOfficeNew.cshtml @@ -185,6 +185,7 @@ @Html.DropDownListFor(m => m.Currency, new List { //new SelectListItem{ Text="List of allowed currency", Value = "", Selected= true}, + new SelectListItem{ Text="TZS", Value = "TZS" }, // new SelectListItem{ Text="USD", Value = "USD" }, }, new { @class = "selectpicker form-control", @id = "Currency", @required = "true" }) diff --git a/bin/OSS.dll b/bin/OSS.dll index d7de638..dd3684a 100644 Binary files a/bin/OSS.dll and b/bin/OSS.dll differ diff --git a/bin/OSS.pdb b/bin/OSS.pdb index 2d37334..4509168 100644 Binary files a/bin/OSS.pdb and b/bin/OSS.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index f5e894a..9cc9493 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/OSS.csproj.AssemblyReference.cache b/obj/Debug/OSS.csproj.AssemblyReference.cache index f5e894a..33280fc 100644 Binary files a/obj/Debug/OSS.csproj.AssemblyReference.cache and b/obj/Debug/OSS.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/OSS.dll b/obj/Debug/OSS.dll index d7de638..dd3684a 100644 Binary files a/obj/Debug/OSS.dll and b/obj/Debug/OSS.dll differ diff --git a/obj/Debug/OSS.pdb b/obj/Debug/OSS.pdb index 2d37334..4509168 100644 Binary files a/obj/Debug/OSS.pdb and b/obj/Debug/OSS.pdb differ