From aad06cecfa0ea500fe445b2f7cf50719b8955d03 Mon Sep 17 00:00:00 2001 From: Daniel Covington Date: Wed, 5 Aug 2026 12:30:35 -0400 Subject: [PATCH] Apply revised order-form PDFs, tester feedback, and color picker Order form revision (docs/lucid "(1)" PDFs): - Purple Envelope: reordered stock/permit questions, renamed postage-only to state-permit-only, added colors question and blue-envelope-provider cross-sell - Blue Envelope: reworked permit flow with KCI-vs-own-organization ownership and nonprofit-status branching - Mailing Service: real per-piece pricing, new Presort Standard tier, estimated-quantity question, fixed pickup-date list, removed the ballot-sorting question - Additional Items: added a special-requests field - Added db/migrations/20260804153857_revise_order_details_columns.asp (additive only - columns retired by the revision are left in place, not dropped, since the table has real test data) Tester feedback: - Fixed "Spectrom" typo to "Spectrum" (value code + label + validation) - Corrected First Class postage rate to $0.721/pc. - Marked nearly every survey question required so SurveyJS blocks page navigation on missing answers Color picker for envelope colors: - Replaced free-text color entry with a modal image picker sourced from public/images/Purple_ballot_envelopes colors/*.bmp, converted to PNG in public/images/purple-envelope-colors/ (23MB -> 245KB) Cleanup pass: - Removed the redundant "KCI's blue envelopes or another provider's" question (redundant with the preceding yes/no) - Removed the purple-envelope delivery-date picker in favor of a static lead-time note - Trimmed the Mailing Service page title - Fixed the post-submission message to stop showing SurveyJS's default "survey" wording --- app/controllers/OrderApiController.asp | 117 ++++--- app/models/OrderDetailsRepository.asp | 18 +- app/models/POBO_OrderDetails.asp | 162 +++++++++- app/views/Order/continue.asp | 298 ++++++++++++++---- ...804153857_revise_order_details_columns.asp | 59 ++++ .../Election Materials Order Form #1 (1).pdf | Bin 0 -> 65653 bytes .../Election Materials Request #3 (1).pdf | Bin 0 -> 52852 bytes ...Election Materials Request Form #2 (1).pdf | Bin 0 -> 33450 bytes public/images/purple-envelope-colors/Aqua.png | Bin 0 -> 772 bytes .../images/purple-envelope-colors/Black.png | Bin 0 -> 522 bytes public/images/purple-envelope-colors/Blue.png | Bin 0 -> 773 bytes .../images/purple-envelope-colors/Brown.png | Bin 0 -> 850 bytes .../purple-envelope-colors/BurlyWood.png | Bin 0 -> 851 bytes .../purple-envelope-colors/Chocolate.png | Bin 0 -> 851 bytes public/images/purple-envelope-colors/Clay.png | Bin 0 -> 852 bytes .../images/purple-envelope-colors/Coral.png | Bin 0 -> 850 bytes .../purple-envelope-colors/CornflowerBlue.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Crimson.png | Bin 0 -> 852 bytes .../purple-envelope-colors/DarkOrange.png | Bin 0 -> 773 bytes .../purple-envelope-colors/DeepPink.png | Bin 0 -> 850 bytes .../purple-envelope-colors/DeepSkyBlue.png | Bin 0 -> 774 bytes .../images/purple-envelope-colors/DimGray.png | Bin 0 -> 847 bytes .../purple-envelope-colors/DodgerBlue.png | Bin 0 -> 850 bytes .../purple-envelope-colors/FireBrick.png | Bin 0 -> 851 bytes .../purple-envelope-colors/ForestGreen.png | Bin 0 -> 850 bytes .../images/purple-envelope-colors/Fuchsia.png | Bin 0 -> 844 bytes public/images/purple-envelope-colors/Gold.png | Bin 0 -> 851 bytes .../purple-envelope-colors/Goldenrod.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Green.png | Bin 0 -> 773 bytes .../images/purple-envelope-colors/HotPink.png | Bin 0 -> 850 bytes .../images/purple-envelope-colors/Indigo.png | Bin 0 -> 850 bytes .../purple-envelope-colors/LightSeaGreen.png | Bin 0 -> 851 bytes public/images/purple-envelope-colors/Lime.png | Bin 0 -> 773 bytes .../purple-envelope-colors/LimeGreen.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/LtGreen.png | Bin 0 -> 851 bytes .../purple-envelope-colors/MediumOrchid.png | Bin 0 -> 851 bytes .../purple-envelope-colors/MediumPurple.png | Bin 0 -> 851 bytes .../MediumTurquoise.png | Bin 0 -> 851 bytes .../purple-envelope-colors/MintGreen.png | Bin 0 -> 851 bytes public/images/purple-envelope-colors/Navy.png | Bin 0 -> 775 bytes .../images/purple-envelope-colors/Olive.png | Bin 0 -> 772 bytes .../purple-envelope-colors/OliveDrab.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Orange.png | Bin 0 -> 774 bytes .../purple-envelope-colors/OrangeRed.png | Bin 0 -> 774 bytes .../images/purple-envelope-colors/Orchid.png | Bin 0 -> 851 bytes .../purple-envelope-colors/PastelBlue.png | Bin 0 -> 851 bytes .../purple-envelope-colors/PastelPink.png | Bin 0 -> 852 bytes .../purple-envelope-colors/PastelPurple.png | Bin 0 -> 851 bytes .../purple-envelope-colors/PastelYellow.png | Bin 0 -> 850 bytes public/images/purple-envelope-colors/Peru.png | Bin 0 -> 851 bytes public/images/purple-envelope-colors/Pink.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Purple.png | Bin 0 -> 844 bytes public/images/purple-envelope-colors/Red.png | Bin 0 -> 773 bytes .../purple-envelope-colors/RoyalBlue.png | Bin 0 -> 851 bytes .../purple-envelope-colors/SaddleBrown.png | Bin 0 -> 851 bytes .../purple-envelope-colors/SeaGreen.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Sienna.png | Bin 0 -> 851 bytes .../images/purple-envelope-colors/Silver.png | Bin 0 -> 847 bytes .../images/purple-envelope-colors/SkyBlue.png | Bin 0 -> 851 bytes .../purple-envelope-colors/SteelBlue.png | Bin 0 -> 851 bytes public/images/purple-envelope-colors/Tan.png | Bin 0 -> 852 bytes public/images/purple-envelope-colors/Teal.png | Bin 0 -> 772 bytes .../images/purple-envelope-colors/Tomato.png | Bin 0 -> 851 bytes .../purple-envelope-colors/Turquoise.png | Bin 0 -> 852 bytes .../images/purple-envelope-colors/Violet.png | Bin 0 -> 850 bytes .../images/purple-envelope-colors/White.png | Bin 0 -> 846 bytes .../images/purple-envelope-colors/Yellow.png | Bin 0 -> 772 bytes 67 files changed, 524 insertions(+), 130 deletions(-) create mode 100644 db/migrations/20260804153857_revise_order_details_columns.asp create mode 100644 docs/lucid/Election Materials Order Form #1 (1).pdf create mode 100644 docs/lucid/Election Materials Request #3 (1).pdf create mode 100644 docs/lucid/Election Materials Request Form #2 (1).pdf create mode 100644 public/images/purple-envelope-colors/Aqua.png create mode 100644 public/images/purple-envelope-colors/Black.png create mode 100644 public/images/purple-envelope-colors/Blue.png create mode 100644 public/images/purple-envelope-colors/Brown.png create mode 100644 public/images/purple-envelope-colors/BurlyWood.png create mode 100644 public/images/purple-envelope-colors/Chocolate.png create mode 100644 public/images/purple-envelope-colors/Clay.png create mode 100644 public/images/purple-envelope-colors/Coral.png create mode 100644 public/images/purple-envelope-colors/CornflowerBlue.png create mode 100644 public/images/purple-envelope-colors/Crimson.png create mode 100644 public/images/purple-envelope-colors/DarkOrange.png create mode 100644 public/images/purple-envelope-colors/DeepPink.png create mode 100644 public/images/purple-envelope-colors/DeepSkyBlue.png create mode 100644 public/images/purple-envelope-colors/DimGray.png create mode 100644 public/images/purple-envelope-colors/DodgerBlue.png create mode 100644 public/images/purple-envelope-colors/FireBrick.png create mode 100644 public/images/purple-envelope-colors/ForestGreen.png create mode 100644 public/images/purple-envelope-colors/Fuchsia.png create mode 100644 public/images/purple-envelope-colors/Gold.png create mode 100644 public/images/purple-envelope-colors/Goldenrod.png create mode 100644 public/images/purple-envelope-colors/Green.png create mode 100644 public/images/purple-envelope-colors/HotPink.png create mode 100644 public/images/purple-envelope-colors/Indigo.png create mode 100644 public/images/purple-envelope-colors/LightSeaGreen.png create mode 100644 public/images/purple-envelope-colors/Lime.png create mode 100644 public/images/purple-envelope-colors/LimeGreen.png create mode 100644 public/images/purple-envelope-colors/LtGreen.png create mode 100644 public/images/purple-envelope-colors/MediumOrchid.png create mode 100644 public/images/purple-envelope-colors/MediumPurple.png create mode 100644 public/images/purple-envelope-colors/MediumTurquoise.png create mode 100644 public/images/purple-envelope-colors/MintGreen.png create mode 100644 public/images/purple-envelope-colors/Navy.png create mode 100644 public/images/purple-envelope-colors/Olive.png create mode 100644 public/images/purple-envelope-colors/OliveDrab.png create mode 100644 public/images/purple-envelope-colors/Orange.png create mode 100644 public/images/purple-envelope-colors/OrangeRed.png create mode 100644 public/images/purple-envelope-colors/Orchid.png create mode 100644 public/images/purple-envelope-colors/PastelBlue.png create mode 100644 public/images/purple-envelope-colors/PastelPink.png create mode 100644 public/images/purple-envelope-colors/PastelPurple.png create mode 100644 public/images/purple-envelope-colors/PastelYellow.png create mode 100644 public/images/purple-envelope-colors/Peru.png create mode 100644 public/images/purple-envelope-colors/Pink.png create mode 100644 public/images/purple-envelope-colors/Purple.png create mode 100644 public/images/purple-envelope-colors/Red.png create mode 100644 public/images/purple-envelope-colors/RoyalBlue.png create mode 100644 public/images/purple-envelope-colors/SaddleBrown.png create mode 100644 public/images/purple-envelope-colors/SeaGreen.png create mode 100644 public/images/purple-envelope-colors/Sienna.png create mode 100644 public/images/purple-envelope-colors/Silver.png create mode 100644 public/images/purple-envelope-colors/SkyBlue.png create mode 100644 public/images/purple-envelope-colors/SteelBlue.png create mode 100644 public/images/purple-envelope-colors/Tan.png create mode 100644 public/images/purple-envelope-colors/Teal.png create mode 100644 public/images/purple-envelope-colors/Tomato.png create mode 100644 public/images/purple-envelope-colors/Turquoise.png create mode 100644 public/images/purple-envelope-colors/Violet.png create mode 100644 public/images/purple-envelope-colors/White.png create mode 100644 public/images/purple-envelope-colors/Yellow.png diff --git a/app/controllers/OrderApiController.asp b/app/controllers/OrderApiController.asp index 7314819..3b2b7fa 100644 --- a/app/controllers/OrderApiController.asp +++ b/app/controllers/OrderApiController.asp @@ -162,43 +162,58 @@ Class OrderApiController_Class EmailRow("Phone", model.Phone)) If IsTrue(model.PurpleWantsQuote) Then + Dim purpleBlueProviderLine + purpleBlueProviderLine = LabelPurpleBlueProvider(model.PurpleBlueProvider) + If purpleBlueProviderLine = "Other" And Len(Trim(model.PurpleBlueProviderOther & "")) > 0 Then + purpleBlueProviderLine = model.PurpleBlueProviderOther + End If + html = html & EmailSection("Purple Ballot Envelopes", _ - EmailRow("Print option", LabelPrintOption(model.PurplePrintOption)) & _ EmailRow("Envelope stock", LabelEnvelopeStock(model.PurpleEnvelopeStock)) & _ - EmailRow("Envelope provider", model.PurpleEnvelopeProvider) & _ + EmailRow("Print option", LabelPrintOption(model.PurplePrintOption)) & _ EmailRow("Also wants KCI blue envelopes", EmailYesNo(model.PurpleWantsBlueEnvelopes)) & _ + EmailRow("Blue envelope provider", purpleBlueProviderLine) & _ EmailRow("Print style", LabelPrintStyle(model.PurplePrintStyle)) & _ EmailRow("Color coding by", LabelColorCodingBy(model.PurpleColorCodingBy)) & _ EmailRow("Number of precincts", model.PurplePrecinctCount) & _ + EmailRow("Colors requested", model.PurpleColorNames) & _ EmailRow("Track with TrackMI Ballot", EmailYesNo(model.PurpleTrackMIBallot)) & _ - EmailRow("Extra envelopes requested", model.PurpleExtraEnvelopeQty) & _ - EmailRow("Requested delivery date", EmailDate(model.PurpleDeliveryDate))) + EmailRow("Extra envelopes requested", model.PurpleExtraEnvelopeQty)) End If If IsTrue(model.BlueWantsQuote) Then + Dim bluePermitLine + bluePermitLine = "" + If LabelPermitOwnership(model.BluePermitOwnership) = "My organization's permit" Then + If IsTrue(model.BlueHasNonprofitStatus) Then + bluePermitLine = EmailRow("Nonprofit authorization code", model.BlueNonprofitAuthCode) + Else + bluePermitLine = EmailRow("City of permit holder", model.BluePermitCity) & _ + EmailRow("Permit number", model.BluePermitNumber) + End If + End If + html = html & EmailSection("Blue AV Envelopes", _ - EmailRow("Provider", LabelBlueProvider(model.BlueEnvelopeProvider)) & _ EmailRow("Print permit", EmailYesNo(model.BluePrintPermit)) & _ - EmailRow("Permit number", model.BluePermitNumber) & _ - EmailRow("City of permit holder", model.BluePermitCity) & _ - EmailRow("Permit class", model.BluePermitClass) & _ - EmailRow("Print return address", EmailYesNo(model.BluePrintReturnAddress)) & _ - EmailRow("Requested delivery date", EmailDate(model.BlueDeliveryDate))) + EmailRow("Permit ownership", LabelPermitOwnership(model.BluePermitOwnership)) & _ + EmailRow("Confirmed nonprofit status with USPS", EmailYesNo(model.BlueHasNonprofitStatus)) & _ + bluePermitLine) End If If IsTrue(model.MailingWantsService) Then html = html & EmailSection("Ballot Mailing Service", _ EmailRow("Postage", LabelPostageOption(model.MailingPostageOption)) & _ EmailRow("Nonprofit status with USPS", LabelNonprofitStatus(model.MailingHasNonprofitStatus)) & _ - EmailRow("Sort ballots", EmailYesNo(model.MailingWantsSorting)) & _ + EmailRow("Estimated quantity", model.MailingEstimatedQuantity) & _ EmailRow("Preferred pickup date", EmailDate(model.MailingPickupDate))) End If - If NumOrZero(model.SecrecySleevesQty) > 0 Or NumOrZero(model.IVotedStickerRolls) > 0 Or NumOrZero(model.FutureVoterStickerRolls) > 0 Then + If NumOrZero(model.SecrecySleevesQty) > 0 Or NumOrZero(model.IVotedStickerRolls) > 0 Or NumOrZero(model.FutureVoterStickerRolls) > 0 Or Len(Trim(model.SpecialRequests & "")) > 0 Then html = html & EmailSection("Additional Election Items", _ EmailRow("Secrecy sleeves (quantity)", model.SecrecySleevesQty) & _ EmailRow("""I Voted"" stickers (rolls of 250)", model.IVotedStickerRolls) & _ - EmailRow("""Future Voter"" stickers (rolls of 500)", model.FutureVoterStickerRolls)) + EmailRow("""Future Voter"" stickers (rolls of 500)", model.FutureVoterStickerRolls) & _ + EmailRow("Special requests", model.SpecialRequests)) End If html = html & "

Questions about this order? Just reply to this email.

" & _ @@ -277,9 +292,27 @@ Class OrderApiController_Class ' model - falls back to the raw code for anything unrecognized rather than hiding it. Private Function LabelPrintOption(code) Select Case CStr(code & "") - Case "AddressesAndPostage" : LabelPrintOption = "Addresses and return postage" - Case "PostageOnly" : LabelPrintOption = "Return postage only" - Case Else : LabelPrintOption = CStr(code & "") + Case "AddressesAndPermit" : LabelPrintOption = "Addresses and state of Michigan permit" + Case "PermitOnly" : LabelPrintOption = "State of Michigan permit only" + Case Else : LabelPrintOption = CStr(code & "") + End Select + End Function + + Private Function LabelPurpleBlueProvider(code) + Select Case CStr(code & "") + Case "ElectionSource" : LabelPurpleBlueProvider = "ElectionSource" + Case "PSI" : LabelPurpleBlueProvider = "PSI" + Case "Spectrum" : LabelPurpleBlueProvider = "Spectrum" + Case "Other" : LabelPurpleBlueProvider = "Other" + Case Else : LabelPurpleBlueProvider = CStr(code & "") + End Select + End Function + + Private Function LabelPermitOwnership(code) + Select Case CStr(code & "") + Case "KCIPermit" : LabelPermitOwnership = "KCI permit" + Case "OwnPermit" : LabelPermitOwnership = "My organization's permit" + Case Else : LabelPermitOwnership = CStr(code & "") End Select End Function @@ -294,7 +327,7 @@ Class OrderApiController_Class Private Function LabelPrintStyle(code) Select Case CStr(code & "") Case "ColorCoding" : LabelPrintStyle = "Color Coding" - Case "BlackOnly" : LabelPrintStyle = "Black Only" + Case "BlackOnly" : LabelPrintStyle = "Black Ink Only" Case Else : LabelPrintStyle = CStr(code & "") End Select End Function @@ -307,20 +340,13 @@ Class OrderApiController_Class End Select End Function - Private Function LabelBlueProvider(code) - Select Case CStr(code & "") - Case "KCI" : LabelBlueProvider = "KCI" - Case "OtherProvider" : LabelBlueProvider = "Other provider" - Case Else : LabelBlueProvider = CStr(code & "") - End Select - End Function - Private Function LabelPostageOption(code) Select Case CStr(code & "") - Case "FirstClass" : LabelPostageOption = "Yes, at First Class Rate" - Case "NonprofitRate" : LabelPostageOption = "Yes, at Nonprofit Rate" - Case "No" : LabelPostageOption = "No" - Case Else : LabelPostageOption = CStr(code & "") + Case "FirstClass" : LabelPostageOption = "Yes, at First Class Rate ($0.721/pc.)" + Case "NonprofitRate" : LabelPostageOption = "Yes, at Nonprofit Rate ($0.263/pc.)" + Case "PresortStandard" : LabelPostageOption = "Yes, at Presort Standard Rate ($0.473/pc.)" + Case "No" : LabelPostageOption = "No" + Case Else : LabelPostageOption = CStr(code & "") End Select End Function @@ -345,13 +371,13 @@ Class OrderApiController_Class RequireNonEmptyString errors, answers, "Municipality", "Municipality is required." RequireNonEmptyString errors, answers, "Phone", "Phone number is required." - RequireEnum errors, answers, "PurplePrintOption", Array("AddressesAndPostage", "PostageOnly") RequireEnum errors, answers, "PurpleEnvelopeStock", Array("KCIStock", "OwnStock") + RequireEnum errors, answers, "PurplePrintOption", Array("AddressesAndPermit", "PermitOnly") + RequireEnum errors, answers, "PurpleBlueProvider", Array("ElectionSource", "PSI", "Spectrum", "Other") RequireEnum errors, answers, "PurplePrintStyle", Array("ColorCoding", "BlackOnly") RequireEnum errors, answers, "PurpleColorCodingBy", Array("Precinct", "Election") - RequireEnum errors, answers, "BlueEnvelopeProvider", Array("KCI", "OtherProvider") - RequireEnum errors, answers, "BluePermitClass", Array("NP", "STD") - RequireEnum errors, answers, "MailingPostageOption", Array("FirstClass", "NonprofitRate", "No") + RequireEnum errors, answers, "BluePermitOwnership", Array("KCIPermit", "OwnPermit") + RequireEnum errors, answers, "MailingPostageOption", Array("FirstClass", "NonprofitRate", "PresortStandard", "No") RequireEnum errors, answers, "MailingHasNonprofitStatus", Array("Yes", "No", "NotSure") RequireBoolean errors, answers, "PurpleWantsQuote" @@ -359,18 +385,16 @@ Class OrderApiController_Class RequireBoolean errors, answers, "PurpleTrackMIBallot" RequireBoolean errors, answers, "BlueWantsQuote" RequireBoolean errors, answers, "BluePrintPermit" - RequireBoolean errors, answers, "BluePrintReturnAddress" + RequireBoolean errors, answers, "BlueHasNonprofitStatus" RequireBoolean errors, answers, "MailingWantsService" - RequireBoolean errors, answers, "MailingWantsSorting" RequireNonNegativeInteger errors, answers, "PurplePrecinctCount" RequireNonNegativeInteger errors, answers, "PurpleExtraEnvelopeQty" + RequireNonNegativeInteger errors, answers, "MailingEstimatedQuantity" RequireNonNegativeInteger errors, answers, "SecrecySleevesQty" RequireNonNegativeInteger errors, answers, "IVotedStickerRolls" RequireNonNegativeInteger errors, answers, "FutureVoterStickerRolls" - RequireValidDate errors, answers, "PurpleDeliveryDate" - RequireValidDate errors, answers, "BlueDeliveryDate" RequireValidDate errors, answers, "MailingPickupDate" If UBound(errors) >= 0 Then @@ -445,38 +469,39 @@ Class OrderApiController_Class ' Purple envelope model.PurpleWantsQuote = AnswerValue(answers, "PurpleWantsQuote") - model.PurplePrintOption = AnswerValue(answers, "PurplePrintOption") model.PurpleEnvelopeStock = AnswerValue(answers, "PurpleEnvelopeStock") - model.PurpleEnvelopeProvider = AnswerValue(answers, "PurpleEnvelopeProvider") + model.PurplePrintOption = AnswerValue(answers, "PurplePrintOption") model.PurpleWantsBlueEnvelopes = AnswerValue(answers, "PurpleWantsBlueEnvelopes") + model.PurpleBlueProvider = AnswerValue(answers, "PurpleBlueProvider") + model.PurpleBlueProviderOther = AnswerValue(answers, "PurpleBlueProviderOther") model.PurplePrintStyle = AnswerValue(answers, "PurplePrintStyle") model.PurpleColorCodingBy = AnswerValue(answers, "PurpleColorCodingBy") model.PurplePrecinctCount = AnswerValue(answers, "PurplePrecinctCount") + model.PurpleColorNames = AnswerValue(answers, "PurpleColorNames") model.PurpleTrackMIBallot = AnswerValue(answers, "PurpleTrackMIBallot") model.PurpleExtraEnvelopeQty = AnswerValue(answers, "PurpleExtraEnvelopeQty") - model.PurpleDeliveryDate = AnswerValue(answers, "PurpleDeliveryDate") ' Blue envelope model.BlueWantsQuote = AnswerValue(answers, "BlueWantsQuote") - model.BlueEnvelopeProvider = AnswerValue(answers, "BlueEnvelopeProvider") model.BluePrintPermit = AnswerValue(answers, "BluePrintPermit") - model.BluePermitNumber = AnswerValue(answers, "BluePermitNumber") + model.BluePermitOwnership = AnswerValue(answers, "BluePermitOwnership") + model.BlueHasNonprofitStatus = AnswerValue(answers, "BlueHasNonprofitStatus") + model.BlueNonprofitAuthCode = AnswerValue(answers, "BlueNonprofitAuthCode") model.BluePermitCity = AnswerValue(answers, "BluePermitCity") - model.BluePermitClass = AnswerValue(answers, "BluePermitClass") - model.BluePrintReturnAddress = AnswerValue(answers, "BluePrintReturnAddress") - model.BlueDeliveryDate = AnswerValue(answers, "BlueDeliveryDate") + model.BluePermitNumber = AnswerValue(answers, "BluePermitNumber") ' Mailing service model.MailingWantsService = AnswerValue(answers, "MailingWantsService") model.MailingPostageOption = AnswerValue(answers, "MailingPostageOption") model.MailingHasNonprofitStatus = AnswerValue(answers, "MailingHasNonprofitStatus") - model.MailingWantsSorting = AnswerValue(answers, "MailingWantsSorting") + model.MailingEstimatedQuantity = AnswerValue(answers, "MailingEstimatedQuantity") model.MailingPickupDate = AnswerValue(answers, "MailingPickupDate") ' Additional items model.SecrecySleevesQty = AnswerValue(answers, "SecrecySleevesQty") model.IVotedStickerRolls = AnswerValue(answers, "IVotedStickerRolls") model.FutureVoterStickerRolls = AnswerValue(answers, "FutureVoterStickerRolls") + model.SpecialRequests = AnswerValue(answers, "SpecialRequests") End Sub ' Returns the value for key in a parsed aspJSON Dictionary, or Null if the question was diff --git a/app/models/OrderDetailsRepository.asp b/app/models/OrderDetailsRepository.asp index 3f3ef4b..144d0ec 100644 --- a/app/models/OrderDetailsRepository.asp +++ b/app/models/OrderDetailsRepository.asp @@ -1,6 +1,6 @@ <% ' Auto-generated Repository for table [OrderDetails] -' Generated on 7/28/2026 2:53:42 PM +' Generated on 8/4/2026 3:40:46 PM ' Generator: GenerateRepo.vbs v1.0 ' ' Dependencies: @@ -13,7 +13,7 @@ Class OrderDetailsRepository_Class Public Function FindByID(id) - Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleColorCodingBy], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SubmittedAt] FROM [OrderDetails] WHERE [OrderDetailID] = ?" + Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BlueHasNonprofitStatus], [BlueNonprofitAuthCode], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePermitOwnership], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingEstimatedQuantity], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleBlueProvider], [PurpleBlueProviderOther], [PurpleColorCodingBy], [PurpleColorNames], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SpecialRequests], [SubmittedAt] FROM [OrderDetails] WHERE [OrderDetailID] = ?" Dim rs : Set rs = DAL.Query(sql, Array(id)) If rs.EOF Then Err.Raise 1, "OrderDetailsRepository_Class", RecordNotFoundException("OrderDetailID", id) @@ -28,7 +28,7 @@ Class OrderDetailsRepository_Class End Function Public Function Find(where_kvarray, order_string_or_array) - Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleColorCodingBy], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SubmittedAt] FROM [OrderDetails]" + Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BlueHasNonprofitStatus], [BlueNonprofitAuthCode], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePermitOwnership], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingEstimatedQuantity], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleBlueProvider], [PurpleBlueProviderOther], [PurpleColorCodingBy], [PurpleColorNames], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SpecialRequests], [SubmittedAt] FROM [OrderDetails]" Dim where_keys, where_values, i If Not IsEmpty(where_kvarray) Then KVUnzip where_kvarray, where_keys, where_values @@ -52,7 +52,7 @@ Class OrderDetailsRepository_Class End Function Public Function FindPaged(where_kvarray, order_string_or_array, per_page, page_num, ByRef page_count, ByRef record_count) - Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleColorCodingBy], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SubmittedAt] FROM [OrderDetails]" + Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BlueHasNonprofitStatus], [BlueNonprofitAuthCode], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePermitOwnership], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingEstimatedQuantity], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleBlueProvider], [PurpleBlueProviderOther], [PurpleColorCodingBy], [PurpleColorNames], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SpecialRequests], [SubmittedAt] FROM [OrderDetails]" Dim where_keys, where_values, i If Not IsEmpty(where_kvarray) Then KVUnzip where_kvarray, where_keys, where_values @@ -77,7 +77,7 @@ Class OrderDetailsRepository_Class End Function Public Function SearchTablePaged(columns_array, search_value, order_string_or_array, per_page, page_num, ByRef page_count, ByRef record_count) - Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleColorCodingBy], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SubmittedAt] FROM [OrderDetails]" + Dim sql : sql = "Select [BlueDeliveryDate], [BlueEnvelopeProvider], [BlueHasNonprofitStatus], [BlueNonprofitAuthCode], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePermitOwnership], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingEstimatedQuantity], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderDetailID], [OrderID], [Phone], [PurpleBlueProvider], [PurpleBlueProviderOther], [PurpleColorCodingBy], [PurpleColorNames], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SpecialRequests], [SubmittedAt] FROM [OrderDetails]" Dim i, params() If IsArray(columns_array) And UBound(columns_array) >= 0 Then sql = sql & " WHERE " @@ -112,8 +112,8 @@ Class OrderDetailsRepository_Class End Function Public Sub AddNew(ByRef model) - Dim sql : sql = "INSERT INTO [OrderDetails] ([BlueDeliveryDate], [BlueEnvelopeProvider], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderID], [Phone], [PurpleColorCodingBy], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SubmittedAt]) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" - DAL.Execute sql, Array(model.BlueDeliveryDate, model.BlueEnvelopeProvider, model.BluePermitCity, model.BluePermitClass, model.BluePermitNumber, model.BluePrintPermit, model.BluePrintReturnAddress, model.BlueWantsQuote, model.ContactName, model.FutureVoterStickerRolls, model.IVotedStickerRolls, model.MailingHasNonprofitStatus, model.MailingPickupDate, model.MailingPostageOption, model.MailingWantsService, model.MailingWantsSorting, model.Municipality, model.OrderID, model.Phone, model.PurpleColorCodingBy, model.PurpleDeliveryDate, model.PurpleEnvelopeProvider, model.PurpleEnvelopeStock, model.PurpleExtraEnvelopeQty, model.PurplePrecinctCount, model.PurplePrintOption, model.PurplePrintStyle, model.PurpleTrackMIBallot, model.PurpleWantsBlueEnvelopes, model.PurpleWantsQuote, model.SecrecySleevesQty, model.SubmittedAt) + Dim sql : sql = "INSERT INTO [OrderDetails] ([BlueDeliveryDate], [BlueEnvelopeProvider], [BlueHasNonprofitStatus], [BlueNonprofitAuthCode], [BluePermitCity], [BluePermitClass], [BluePermitNumber], [BluePermitOwnership], [BluePrintPermit], [BluePrintReturnAddress], [BlueWantsQuote], [ContactName], [FutureVoterStickerRolls], [IVotedStickerRolls], [MailingEstimatedQuantity], [MailingHasNonprofitStatus], [MailingPickupDate], [MailingPostageOption], [MailingWantsService], [MailingWantsSorting], [Municipality], [OrderID], [Phone], [PurpleBlueProvider], [PurpleBlueProviderOther], [PurpleColorCodingBy], [PurpleColorNames], [PurpleDeliveryDate], [PurpleEnvelopeProvider], [PurpleEnvelopeStock], [PurpleExtraEnvelopeQty], [PurplePrecinctCount], [PurplePrintOption], [PurplePrintStyle], [PurpleTrackMIBallot], [PurpleWantsBlueEnvelopes], [PurpleWantsQuote], [SecrecySleevesQty], [SpecialRequests], [SubmittedAt]) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + DAL.Execute sql, Array(model.BlueDeliveryDate, model.BlueEnvelopeProvider, model.BlueHasNonprofitStatus, model.BlueNonprofitAuthCode, model.BluePermitCity, model.BluePermitClass, model.BluePermitNumber, model.BluePermitOwnership, model.BluePrintPermit, model.BluePrintReturnAddress, model.BlueWantsQuote, model.ContactName, model.FutureVoterStickerRolls, model.IVotedStickerRolls, model.MailingEstimatedQuantity, model.MailingHasNonprofitStatus, model.MailingPickupDate, model.MailingPostageOption, model.MailingWantsService, model.MailingWantsSorting, model.Municipality, model.OrderID, model.Phone, model.PurpleBlueProvider, model.PurpleBlueProviderOther, model.PurpleColorCodingBy, model.PurpleColorNames, model.PurpleDeliveryDate, model.PurpleEnvelopeProvider, model.PurpleEnvelopeStock, model.PurpleExtraEnvelopeQty, model.PurplePrecinctCount, model.PurplePrintOption, model.PurplePrintStyle, model.PurpleTrackMIBallot, model.PurpleWantsBlueEnvelopes, model.PurpleWantsQuote, model.SecrecySleevesQty, model.SpecialRequests, model.SubmittedAt) ' Retrieve the newly inserted ID On Error Resume Next @@ -132,8 +132,8 @@ Class OrderDetailsRepository_Class End Sub Public Sub Update(model) - Dim sql : sql = "UPDATE [OrderDetails] SET [BlueDeliveryDate] = ?, [BlueEnvelopeProvider] = ?, [BluePermitCity] = ?, [BluePermitClass] = ?, [BluePermitNumber] = ?, [BluePrintPermit] = ?, [BluePrintReturnAddress] = ?, [BlueWantsQuote] = ?, [ContactName] = ?, [FutureVoterStickerRolls] = ?, [IVotedStickerRolls] = ?, [MailingHasNonprofitStatus] = ?, [MailingPickupDate] = ?, [MailingPostageOption] = ?, [MailingWantsService] = ?, [MailingWantsSorting] = ?, [Municipality] = ?, [OrderID] = ?, [Phone] = ?, [PurpleColorCodingBy] = ?, [PurpleDeliveryDate] = ?, [PurpleEnvelopeProvider] = ?, [PurpleEnvelopeStock] = ?, [PurpleExtraEnvelopeQty] = ?, [PurplePrecinctCount] = ?, [PurplePrintOption] = ?, [PurplePrintStyle] = ?, [PurpleTrackMIBallot] = ?, [PurpleWantsBlueEnvelopes] = ?, [PurpleWantsQuote] = ?, [SecrecySleevesQty] = ?, [SubmittedAt] = ? WHERE [OrderDetailID] = ?" - DAL.Execute sql, Array(model.BlueDeliveryDate, model.BlueEnvelopeProvider, model.BluePermitCity, model.BluePermitClass, model.BluePermitNumber, model.BluePrintPermit, model.BluePrintReturnAddress, model.BlueWantsQuote, model.ContactName, model.FutureVoterStickerRolls, model.IVotedStickerRolls, model.MailingHasNonprofitStatus, model.MailingPickupDate, model.MailingPostageOption, model.MailingWantsService, model.MailingWantsSorting, model.Municipality, model.OrderID, model.Phone, model.PurpleColorCodingBy, model.PurpleDeliveryDate, model.PurpleEnvelopeProvider, model.PurpleEnvelopeStock, model.PurpleExtraEnvelopeQty, model.PurplePrecinctCount, model.PurplePrintOption, model.PurplePrintStyle, model.PurpleTrackMIBallot, model.PurpleWantsBlueEnvelopes, model.PurpleWantsQuote, model.SecrecySleevesQty, model.SubmittedAt, model.OrderDetailID) + Dim sql : sql = "UPDATE [OrderDetails] SET [BlueDeliveryDate] = ?, [BlueEnvelopeProvider] = ?, [BlueHasNonprofitStatus] = ?, [BlueNonprofitAuthCode] = ?, [BluePermitCity] = ?, [BluePermitClass] = ?, [BluePermitNumber] = ?, [BluePermitOwnership] = ?, [BluePrintPermit] = ?, [BluePrintReturnAddress] = ?, [BlueWantsQuote] = ?, [ContactName] = ?, [FutureVoterStickerRolls] = ?, [IVotedStickerRolls] = ?, [MailingEstimatedQuantity] = ?, [MailingHasNonprofitStatus] = ?, [MailingPickupDate] = ?, [MailingPostageOption] = ?, [MailingWantsService] = ?, [MailingWantsSorting] = ?, [Municipality] = ?, [OrderID] = ?, [Phone] = ?, [PurpleBlueProvider] = ?, [PurpleBlueProviderOther] = ?, [PurpleColorCodingBy] = ?, [PurpleColorNames] = ?, [PurpleDeliveryDate] = ?, [PurpleEnvelopeProvider] = ?, [PurpleEnvelopeStock] = ?, [PurpleExtraEnvelopeQty] = ?, [PurplePrecinctCount] = ?, [PurplePrintOption] = ?, [PurplePrintStyle] = ?, [PurpleTrackMIBallot] = ?, [PurpleWantsBlueEnvelopes] = ?, [PurpleWantsQuote] = ?, [SecrecySleevesQty] = ?, [SpecialRequests] = ?, [SubmittedAt] = ? WHERE [OrderDetailID] = ?" + DAL.Execute sql, Array(model.BlueDeliveryDate, model.BlueEnvelopeProvider, model.BlueHasNonprofitStatus, model.BlueNonprofitAuthCode, model.BluePermitCity, model.BluePermitClass, model.BluePermitNumber, model.BluePermitOwnership, model.BluePrintPermit, model.BluePrintReturnAddress, model.BlueWantsQuote, model.ContactName, model.FutureVoterStickerRolls, model.IVotedStickerRolls, model.MailingEstimatedQuantity, model.MailingHasNonprofitStatus, model.MailingPickupDate, model.MailingPostageOption, model.MailingWantsService, model.MailingWantsSorting, model.Municipality, model.OrderID, model.Phone, model.PurpleBlueProvider, model.PurpleBlueProviderOther, model.PurpleColorCodingBy, model.PurpleColorNames, model.PurpleDeliveryDate, model.PurpleEnvelopeProvider, model.PurpleEnvelopeStock, model.PurpleExtraEnvelopeQty, model.PurplePrecinctCount, model.PurplePrintOption, model.PurplePrintStyle, model.PurpleTrackMIBallot, model.PurpleWantsBlueEnvelopes, model.PurpleWantsQuote, model.SecrecySleevesQty, model.SpecialRequests, model.SubmittedAt, model.OrderDetailID) End Sub Public Sub Delete(id) diff --git a/app/models/POBO_OrderDetails.asp b/app/models/POBO_OrderDetails.asp index f3c431d..15acc9e 100644 --- a/app/models/POBO_OrderDetails.asp +++ b/app/models/POBO_OrderDetails.asp @@ -1,6 +1,6 @@ <% ' Auto-generated POBO for table [OrderDetails] -' Generated on 7/28/2026 2:53:42 PM +' Generated on 8/4/2026 3:40:46 PM ' Generator: GenerateRepo.vbs v1.0 ' ' Dependencies: core/helpers.asp (QuoteValue function) @@ -12,15 +12,19 @@ Class POBO_OrderDetails Private pBlueDeliveryDate Private pBlueEnvelopeProvider + Private pBlueHasNonprofitStatus + Private pBlueNonprofitAuthCode Private pBluePermitCity Private pBluePermitClass Private pBluePermitNumber + Private pBluePermitOwnership Private pBluePrintPermit Private pBluePrintReturnAddress Private pBlueWantsQuote Private pContactName Private pFutureVoterStickerRolls Private pIVotedStickerRolls + Private pMailingEstimatedQuantity Private pMailingHasNonprofitStatus Private pMailingPickupDate Private pMailingPostageOption @@ -30,7 +34,10 @@ Class POBO_OrderDetails Private pOrderDetailID Private pOrderID Private pPhone + Private pPurpleBlueProvider + Private pPurpleBlueProviderOther Private pPurpleColorCodingBy + Private pPurpleColorNames Private pPurpleDeliveryDate Private pPurpleEnvelopeProvider Private pPurpleEnvelopeStock @@ -42,30 +49,38 @@ Class POBO_OrderDetails Private pPurpleWantsBlueEnvelopes Private pPurpleWantsQuote Private pSecrecySleevesQty + Private pSpecialRequests Private pSubmittedAt Private Sub Class_Initialize() pBlueDeliveryDate = Null pBlueEnvelopeProvider = Null + pBlueHasNonprofitStatus = Null + pBlueNonprofitAuthCode = Null pBluePermitCity = Null pBluePermitClass = Null pBluePermitNumber = Null + pBluePermitOwnership = Null pBluePrintPermit = False pBluePrintReturnAddress = False pBlueWantsQuote = False pContactName = Null pFutureVoterStickerRolls = 0 pIVotedStickerRolls = 0 + pMailingEstimatedQuantity = 0 pMailingHasNonprofitStatus = Null pMailingPickupDate = Null pMailingPostageOption = Null - pMailingWantsService = False - pMailingWantsSorting = False + pMailingWantsService = Null + pMailingWantsSorting = Null pMunicipality = Null pOrderDetailID = 0 pOrderID = 0 pPhone = Null + pPurpleBlueProvider = Null + pPurpleBlueProviderOther = Null pPurpleColorCodingBy = Null + pPurpleColorNames = Null pPurpleDeliveryDate = Null pPurpleEnvelopeProvider = Null pPurpleEnvelopeStock = Null @@ -73,12 +88,13 @@ Class POBO_OrderDetails pPurplePrecinctCount = 0 pPurplePrintOption = Null pPurplePrintStyle = Null - pPurpleTrackMIBallot = False - pPurpleWantsBlueEnvelopes = False - pPurpleWantsQuote = False + pPurpleTrackMIBallot = Null + pPurpleWantsBlueEnvelopes = Null + pPurpleWantsQuote = Null pSecrecySleevesQty = 0 + pSpecialRequests = Null pSubmittedAt = #1/1/1970# - Properties = Array("BlueDeliveryDate","BlueEnvelopeProvider","BluePermitCity","BluePermitClass","BluePermitNumber","BluePrintPermit","BluePrintReturnAddress","BlueWantsQuote","ContactName","FutureVoterStickerRolls","IVotedStickerRolls","MailingHasNonprofitStatus","MailingPickupDate","MailingPostageOption","MailingWantsService","MailingWantsSorting","Municipality","OrderDetailID","OrderID","Phone","PurpleColorCodingBy","PurpleDeliveryDate","PurpleEnvelopeProvider","PurpleEnvelopeStock","PurpleExtraEnvelopeQty","PurplePrecinctCount","PurplePrintOption","PurplePrintStyle","PurpleTrackMIBallot","PurpleWantsBlueEnvelopes","PurpleWantsQuote","SecrecySleevesQty","SubmittedAt") + Properties = Array("BlueDeliveryDate","BlueEnvelopeProvider","BlueHasNonprofitStatus","BlueNonprofitAuthCode","BluePermitCity","BluePermitClass","BluePermitNumber","BluePermitOwnership","BluePrintPermit","BluePrintReturnAddress","BlueWantsQuote","ContactName","FutureVoterStickerRolls","IVotedStickerRolls","MailingEstimatedQuantity","MailingHasNonprofitStatus","MailingPickupDate","MailingPostageOption","MailingWantsService","MailingWantsSorting","Municipality","OrderDetailID","OrderID","Phone","PurpleBlueProvider","PurpleBlueProviderOther","PurpleColorCodingBy","PurpleColorNames","PurpleDeliveryDate","PurpleEnvelopeProvider","PurpleEnvelopeStock","PurpleExtraEnvelopeQty","PurplePrecinctCount","PurplePrintOption","PurplePrintStyle","PurpleTrackMIBallot","PurpleWantsBlueEnvelopes","PurpleWantsQuote","SecrecySleevesQty","SpecialRequests","SubmittedAt") End Sub Public Property Get PrimaryKey() @@ -123,6 +139,36 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get BlueHasNonprofitStatus() + BlueHasNonprofitStatus = pBlueHasNonprofitStatus + End Property + + Public Property Let BlueHasNonprofitStatus(val) + On Error Resume Next + If IsNull(val) Then + pBlueHasNonprofitStatus = Null + Else + pBlueHasNonprofitStatus = CBool(val) + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.BlueHasNonprofitStatus", "Invalid value for BlueHasNonprofitStatus: " & Err.Description + End If + On Error GoTo 0 + End Property + + Public Property Get BlueNonprofitAuthCode() + BlueNonprofitAuthCode = pBlueNonprofitAuthCode + End Property + + Public Property Let BlueNonprofitAuthCode(val) + On Error Resume Next + pBlueNonprofitAuthCode = val ' kept as text - authorization codes may have leading zeros + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.BlueNonprofitAuthCode", "Invalid value for BlueNonprofitAuthCode: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get BluePermitCity() BluePermitCity = pBluePermitCity End Property @@ -170,6 +216,23 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get BluePermitOwnership() + BluePermitOwnership = pBluePermitOwnership + End Property + + Public Property Let BluePermitOwnership(val) + On Error Resume Next + If IsNumeric(val) Then + pBluePermitOwnership = CDbl(val) + Else + pBluePermitOwnership = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.BluePermitOwnership", "Invalid value for BluePermitOwnership: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get BluePrintPermit() BluePrintPermit = pBluePrintPermit End Property @@ -272,6 +335,23 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get MailingEstimatedQuantity() + MailingEstimatedQuantity = pMailingEstimatedQuantity + End Property + + Public Property Let MailingEstimatedQuantity(val) + On Error Resume Next + If IsNumeric(val) Then + pMailingEstimatedQuantity = CDbl(val) + Else + pMailingEstimatedQuantity = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.MailingEstimatedQuantity", "Invalid value for MailingEstimatedQuantity: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get MailingHasNonprofitStatus() MailingHasNonprofitStatus = pMailingHasNonprofitStatus End Property @@ -421,6 +501,40 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get PurpleBlueProvider() + PurpleBlueProvider = pPurpleBlueProvider + End Property + + Public Property Let PurpleBlueProvider(val) + On Error Resume Next + If IsNumeric(val) Then + pPurpleBlueProvider = CDbl(val) + Else + pPurpleBlueProvider = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.PurpleBlueProvider", "Invalid value for PurpleBlueProvider: " & Err.Description + End If + On Error GoTo 0 + End Property + + Public Property Get PurpleBlueProviderOther() + PurpleBlueProviderOther = pPurpleBlueProviderOther + End Property + + Public Property Let PurpleBlueProviderOther(val) + On Error Resume Next + If IsNumeric(val) Then + pPurpleBlueProviderOther = CDbl(val) + Else + pPurpleBlueProviderOther = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.PurpleBlueProviderOther", "Invalid value for PurpleBlueProviderOther: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get PurpleColorCodingBy() PurpleColorCodingBy = pPurpleColorCodingBy End Property @@ -438,6 +552,23 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get PurpleColorNames() + PurpleColorNames = pPurpleColorNames + End Property + + Public Property Let PurpleColorNames(val) + On Error Resume Next + If IsNumeric(val) Then + pPurpleColorNames = CDbl(val) + Else + pPurpleColorNames = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.PurpleColorNames", "Invalid value for PurpleColorNames: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get PurpleDeliveryDate() PurpleDeliveryDate = pPurpleDeliveryDate End Property @@ -625,6 +756,23 @@ Class POBO_OrderDetails On Error GoTo 0 End Property + Public Property Get SpecialRequests() + SpecialRequests = pSpecialRequests + End Property + + Public Property Let SpecialRequests(val) + On Error Resume Next + If IsNumeric(val) Then + pSpecialRequests = CDbl(val) + Else + pSpecialRequests = val + End If + If Err.Number <> 0 Then + Err.Raise Err.Number, "POBO_OrderDetails.SpecialRequests", "Invalid value for SpecialRequests: " & Err.Description + End If + On Error GoTo 0 + End Property + Public Property Get SubmittedAt() SubmittedAt = pSubmittedAt End Property diff --git a/app/views/Order/continue.asp b/app/views/Order/continue.asp index a07e356..d4c85a1 100644 --- a/app/views/Order/continue.asp +++ b/app/views/Order/continue.asp @@ -18,6 +18,20 @@
+ +