Finished the Order Entry Corrugated changes and will be moving to web plate

2d9baac6 · Cameron Hayes · b3095bc3 · 2d9baac6 · 2d9baac6 · 2d9baac6
Commit 2d9baac6 authored Jul 25, 2025 by Cameron Hayes
10 changed files
--- a/kgOrdersClient/View.AddAddress.dfm
+++ b/kgOrdersClient/View.AddAddress.dfm
@@ -61,6 +61,7 @@ object FViewAddAddress: TFViewAddAddress
    Width = 78
    Height = 22
    HeightPercent = 100.000000000000000000
+    TabOrder = 4
    WidthPercent = 100.000000000000000000
  end
  object edtFirstLine: TWebEdit
@@ -70,6 +71,7 @@ object FViewAddAddress: TFViewAddAddress
    Height = 22
    ChildOrder = 1
    HeightPercent = 100.000000000000000000
+    TabOrder = 1
    WidthPercent = 100.000000000000000000
  end
  object edtCity: TWebEdit
@@ -79,6 +81,7 @@ object FViewAddAddress: TFViewAddAddress
    Height = 22
    ChildOrder = 2
    HeightPercent = 100.000000000000000000
+    TabOrder = 3
    WidthPercent = 100.000000000000000000
  end
  object edtZip: TWebEdit
@@ -88,6 +91,7 @@ object FViewAddAddress: TFViewAddAddress
    Height = 22
    ChildOrder = 3
    HeightPercent = 100.000000000000000000
+    TabOrder = 5
    WidthPercent = 100.000000000000000000
  end
  object edtContact: TWebEdit
@@ -97,6 +101,7 @@ object FViewAddAddress: TFViewAddAddress
    Height = 22
    ChildOrder = 4
    HeightPercent = 100.000000000000000000
+    TabOrder = 6
    WidthPercent = 100.000000000000000000
  end
  object edtAddress: TWebEdit
@@ -106,6 +111,7 @@ object FViewAddAddress: TFViewAddAddress
    Height = 22
    ChildOrder = 1
    HeightPercent = 100.000000000000000000
+    TabOrder = 2
    WidthPercent = 100.000000000000000000
  end
  object edtNotification: TWebEdit

--- a/kgOrdersClient/View.OrderEntryCorrugated.dfm
+++ b/kgOrdersClient/View.OrderEntryCorrugated.dfm
@@ -107,90 +107,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HeightPercent = 100.000000000000000000
    WidthPercent = 100.000000000000000000
  end
-  object dtpOrderDate: TWebDateTimePicker
-    Left = 22
-    Top = 218
-    Width = 170
-    Height = 22
-    ElementID = 'dtporderdate'
-    BorderStyle = bsSingle
-    ChildOrder = 4
-    Color = clWhite
-    Date = 45748.499176736110000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
-  object dtpProofDate: TWebDateTimePicker
-    Left = 22
-    Top = 250
-    Width = 170
-    Height = 22
-    ElementID = 'dtpproofdate'
-    BorderStyle = bsSingle
-    ChildOrder = 4
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
-  object dtpShipDate: TWebDateTimePicker
-    Left = 22
-    Top = 282
-    Width = 170
-    Height = 22
-    ElementID = 'dtpshipdate'
-    BorderStyle = bsSingle
-    ChildOrder = 4
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
-  object dtpArtDue: TWebDateTimePicker
-    Left = 24
-    Top = 544
-    Width = 170
-    Height = 22
-    ElementID = 'dtpartdue'
-    BorderStyle = bsSingle
-    ChildOrder = 17
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
-  object dtpPlateDue: TWebDateTimePicker
-    Left = 24
-    Top = 568
-    Width = 170
-    Height = 22
-    ElementID = 'dtpplatedue'
-    BorderStyle = bsSingle
-    ChildOrder = 17
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
-  object dtpMountDue: TWebDateTimePicker
-    Left = 24
-    Top = 592
-    Width = 170
-    Height = 22
-    ElementID = 'dtpmountdue'
-    BorderStyle = bsSingle
-    ChildOrder = 17
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    Text = ''
-  end
  object btnAddColor: TWebButton
    Left = 658
    Top = 150
@@ -206,22 +122,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    WidthPercent = 100.000000000000000000
    OnClick = btnAddColorClick
  end
-  object dtpApprovedDate: TWebDateTimePicker
-    Left = 662
-    Top = 508
-    Width = 170
-    Height = 22
-    ElementID = 'dtpapproveddate'
-    BorderStyle = bsSingle
-    ChildOrder = 72
-    Color = clWhite
-    Date = 45748.499176770830000000
-    ElementPosition = epRelative
-    Role = 'null'
-    ShowFocus = False
-    TabStop = False
-    Text = ''
-  end
  object edtCompanyName: TWebDBEdit
    Left = 18
    Top = 92
@@ -238,7 +138,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    WidthStyle = ssAuto
    WidthPercent = 100.000000000000000000
    DataField = 'NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCompanyAccountName: TWebDBEdit
    Left = 24
@@ -254,23 +154,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'SHORT_NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-  end
-  object edtInQuickBooks: TWebDBEdit
-    Left = 26
-    Top = 148
-    Width = 121
-    Height = 22
-    TabStop = False
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtinquickbooks'
-    ElementPosition = epRelative
-    HeightPercent = 100.000000000000000000
-    HideSelection = False
-    WidthPercent = 100.000000000000000000
-    DataField = 'inQuickBooks'
-    DataSource = WebDataSource1
  end
  object edtShipVia: TWebDBEdit
    Left = 24
@@ -286,7 +170,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtQuantity: TWebDBEdit
    Left = 26
@@ -302,7 +186,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'staff_fields_quantity'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtPrice: TWebDBEdit
    Left = 24
@@ -317,7 +201,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'staff_fields_price'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtInvoiceTo: TWebDBEdit
    Left = 26
@@ -333,7 +217,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'staff_fields_invoice_to'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtPONumber: TWebDBEdit
    Left = 26
@@ -349,11 +233,11 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'staff_fields_po_number'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtJobName: TWebDBEdit
    Left = 26
-    Top = 486
+    Top = 523
    Width = 200
    Height = 22
    TabStop = False
@@ -364,8 +248,9 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HeightPercent = 100.000000000000000000
    HideSelection = False
    WidthPercent = 100.000000000000000000
+    OnExit = edtJobNameExit
    DataField = 'staff_fields_job_name'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtOther: TWebDBEdit
    Left = 316
@@ -381,7 +266,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'supplied_by_customer_other'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCADFile: TWebDBEdit
    Left = 496
@@ -397,7 +282,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_cad_file'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtAroundNo: TWebDBEdit
    Left = 496
@@ -413,7 +298,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_around_no'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtAcrossNo: TWebDBEdit
    Left = 496
@@ -429,7 +314,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_accross_no'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtDieCutNo: TWebDBEdit
    Left = 496
@@ -445,7 +330,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_die_cut_no'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtRSCD: TWebDBEdit
    Left = 496
@@ -461,7 +346,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_rcs_d'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtRSCW: TWebDBEdit
    Left = 496
@@ -477,7 +362,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_rcs_w'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtRSCL: TWebDBEdit
    Left = 496
@@ -493,7 +378,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_rsc_l'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCustomAdhesive: TWebDBEdit
    Left = 496
@@ -510,7 +395,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'mounting_custom_adhesive'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCustomBacking: TWebDBEdit
    Left = 496
@@ -526,7 +411,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'mounting_custom_backing'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtStandardSetup: TWebDBEdit
    Left = 496
@@ -542,7 +427,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'mounting_standard_setup'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtStripMount: TWebDBEdit
    Left = 496
@@ -558,7 +443,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'mounting_strip_mount'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtLoose: TWebDBEdit
    Left = 496
@@ -574,7 +459,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'mounting_loose'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtRSCStyle: TWebDBEdit
    Left = 496
@@ -590,7 +475,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HideSelection = False
    WidthPercent = 100.000000000000000000
    DataField = 'layout_rsc_style'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtProofOther: TWebDBEdit
    Left = 658
@@ -607,7 +492,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_other'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtProofShipTo: TWebDBEdit
    Left = 658
@@ -624,7 +509,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_ship_to'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtEmailAttn: TWebDBEdit
    Left = 658
@@ -641,7 +526,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_e_mail_attn'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtProofEmail: TWebDBEdit
    Left = 658
@@ -658,7 +543,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_e_mail'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtFaxAttn: TWebDBEdit
    Left = 658
@@ -675,7 +560,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_fax_attn'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtFax: TWebDBEdit
    Left = 658
@@ -692,7 +577,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_fax'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtClemson: TWebDBEdit
    Left = 658
@@ -709,7 +594,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'colors_clemson'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCrossHairs: TWebDBEdit
    Left = 658
@@ -726,7 +611,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'colors_cross_hairs'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtMachineIndent: TWebDBEdit
    Left = 658
@@ -743,7 +628,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'colors_machine_ident'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtCylinderSize: TWebDBEdit
    Left = 658
@@ -760,11 +645,11 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'colors_cylinder_size'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object edtJobNumber: TWebDBEdit
-    Left = 852
+    Left = 833
-    Top = 105
+    Top = 109
    Width = 121
    Height = 22
    TabStop = False
@@ -777,7 +662,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'plates_job_number'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object cbArtApprovedAsIs: TWebDBCheckBox
    Left = 662
@@ -789,15 +674,14 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ChildOrder = 79
    ElementID = 'cbartapprovedasis'
    ElementPosition = epRelative
-    Enabled = False
    HeightPercent = 100.000000000000000000
    Role = 'null'
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_art_approved_as_is'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-    ValueChecked = 'True'
+    ValueChecked = 'T'
-    ValueUnChecked = 'False'
+    ValueUnChecked = 'F'
  end
  object cbPDFFile: TWebDBCheckBox
    Left = 662
@@ -809,15 +693,14 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ChildOrder = 79
    ElementID = 'cbpdffile'
    ElementPosition = epRelative
-    Enabled = False
    HeightPercent = 100.000000000000000000
    Role = 'null'
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_pdf_file'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-    ValueChecked = 'True'
+    ValueChecked = 'T'
-    ValueUnChecked = 'False'
+    ValueUnChecked = 'F'
  end
  object cbWideFormat: TWebDBCheckBox
    Left = 658
@@ -829,15 +712,14 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ChildOrder = 79
    ElementID = 'cbwideformat'
    ElementPosition = epRelative
-    Enabled = False
    HeightPercent = 100.000000000000000000
    Role = 'null'
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_wide_format'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-    ValueChecked = 'True'
+    ValueChecked = 'T'
-    ValueUnChecked = 'False'
+    ValueUnChecked = 'F'
  end
  object cbPrintCard: TWebDBCheckBox
    Left = 658
@@ -849,15 +731,14 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ChildOrder = 79
    ElementID = 'cbprintcard'
    ElementPosition = epRelative
-    Enabled = False
    HeightPercent = 100.000000000000000000
    Role = 'null'
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_print_card'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-    ValueChecked = 'True'
+    ValueChecked = 'T'
-    ValueUnChecked = 'False'
+    ValueUnChecked = 'F'
  end
  object cbFullSizePanel: TWebDBCheckBox
    Left = 658
@@ -869,15 +750,14 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ChildOrder = 79
    ElementID = 'cbfullsizepanel'
    ElementPosition = epRelative
-    Enabled = False
    HeightPercent = 100.000000000000000000
    Role = 'null'
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'proofing_full_size_panel'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
-    ValueChecked = 'True'
+    ValueChecked = 'T'
-    ValueUnChecked = 'False'
+    ValueUnChecked = 'F'
  end
  object edtSpecialInstructions: TWebDBEdit
    Left = 852
@@ -894,7 +774,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    ShowFocus = False
    WidthPercent = 100.000000000000000000
    DataField = 'general_special_instructions'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object btnSave: TWebButton
    Left = 530
@@ -910,186 +790,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    WidthPercent = 100.000000000000000000
    OnClick = btnSaveClick
  end
-  object cbRefArtAPDF: TWebCheckBox
-    Left = 316
-    Top = 463
-    Width = 113
-    Height = 22
-    Caption = 'Ref Art A PDF?'
-    ChildOrder = 76
-    ElementID = 'edtrefartapdf'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbRefArtPrintCard: TWebCheckBox
-    Left = 316
-    Top = 435
-    Width = 113
-    Height = 22
-    Caption = 'Ref Art Print Card?'
-    ChildOrder = 76
-    ElementID = 'edtrefartprintcard'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbExistingCuttingDie: TWebCheckBox
-    Left = 316
-    Top = 407
-    Width = 113
-    Height = 22
-    Caption = 'Existing Cutting Die?'
-    ChildOrder = 76
-    ElementID = 'edtexistingcuttingdie'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbFTP: TWebCheckBox
-    Left = 320
-    Top = 318
-    Width = 113
-    Height = 22
-    Caption = 'FTP?'
-    ChildOrder = 76
-    ElementID = 'cbftp'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbSampleCarton: TWebCheckBox
-    Left = 316
-    Top = 283
-    Width = 113
-    Height = 22
-    Caption = 'Sample Carton'
-    ChildOrder = 76
-    ElementID = 'cbsampleCarton'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbPlates: TWebCheckBox
-    Left = 316
-    Top = 255
-    Width = 113
-    Height = 22
-    Caption = 'Plates'
-    ChildOrder = 76
-    ElementID = 'cbplates'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbColorCopy: TWebCheckBox
-    Left = 316
-    Top = 227
-    Width = 113
-    Height = 22
-    Caption = 'Color Copy'
-    ChildOrder = 76
-    ElementID = 'cbcolorcopy'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbStripMount: TWebCheckBox
-    Left = 496
-    Top = 406
-    Width = 113
-    Height = 22
-    Caption = 'Strip Mount'
-    ChildOrder = 76
-    ElementID = 'cbstripmount'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbFullMount: TWebCheckBox
-    Left = 496
-    Top = 382
-    Width = 113
-    Height = 22
-    Caption = 'Full Mount'
-    ChildOrder = 76
-    ElementID = 'cbfullmount'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbStickyBak: TWebCheckBox
-    Left = 496
-    Top = 358
-    Width = 113
-    Height = 22
-    Caption = 'Sticky Bak'
-    ChildOrder = 76
-    ElementID = 'cbstickybak'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbLoose: TWebCheckBox
-    Left = 496
-    Top = 309
-    Width = 113
-    Height = 22
-    Caption = 'Loose'
-    ChildOrder = 76
-    ElementID = 'cbloose'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
-  object cbExcaliburDie: TWebCheckBox
-    Left = 496
-    Top = 233
-    Width = 113
-    Height = 22
-    Caption = 'Excalibur Die'
-    ChildOrder = 76
-    ElementID = 'cbexcaliburdie'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
  object wdbcbShipTo: TWebDBComboBox
    Left = 26
    Top = 430
@@ -1100,28 +800,12 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HeightPercent = 100.000000000000000000
    Role = 'null'
    WidthPercent = 100.000000000000000000
-    OnChange = wdbcbShipToChange
    ItemIndex = -1
    DataField = 'staff_fields_ship_to'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
    ListField = 'ADDRESS'
    ListSource = wdsShipTo
  end
-  object cbEmail: TWebCheckBox
-    Left = 316
-    Top = 376
-    Width = 113
-    Height = 22
-    Caption = 'Email?'
-    ChildOrder = 75
-    ElementID = 'edtemail'
-    ElementPosition = epRelative
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    Role = 'null'
-    ShowFocus = False
-    WidthPercent = 100.000000000000000000
-  end
  object btnCancel: TWebButton
    Left = 764
    Top = 560
@@ -1138,7 +822,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
  end
  object wdbcbQuickbooksItem: TWebDBComboBox
    Left = 26
-    Top = 515
+    Top = 491
    Width = 145
    Height = 22
    ElementID = 'wcbqbitem'
@@ -1146,9 +830,10 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    HeightPercent = 100.000000000000000000
    Role = 'null'
    WidthPercent = 100.000000000000000000
+    OnChange = wdbcbQuickbooksItemChange
    ItemIndex = -1
    DataField = 'staff_fields_quickbooks_item'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
    ListField = 'name'
    ListSource = wdsQBItem
  end
@@ -1169,7 +854,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
      'PhotoPolymer'
      'Rubber')
    DataField = 'plates_plate_material'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object WebDBComboBox4: TWebDBComboBox
    Left = 833
@@ -1191,7 +876,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
      '.067'
      '.045')
    DataField = 'plates_thickness'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
  end
  object btnPDF: TWebButton
    Left = 877
@@ -1243,18 +928,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    WidthPercent = 100.000000000000000000
    OnClick = btnCloseClick
  end
-  object edtOrderNum: TWebEdit
-    Left = 126
-    Top = 194
-    Width = 121
-    Height = 22
-    TabStop = False
-    ChildOrder = 81
-    ElementID = 'edtordernum'
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-  end
  object btnEdit: TWebButton
    Left = 1202
    Top = 560
@@ -1292,308 +965,667 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    WidthPercent = 100.000000000000000000
    OnClick = WebButton2Click
  end
+  object dtpShipDate: TWebDBDateTimePicker
+    Left = 24
+    Top = 278
+    Width = 170
+    Height = 22
+    ElementID = 'dtpshipdate'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_ship_date'
+    DataSource = wdsOrder
+  end
+  object dtpProofDate: TWebDBDateTimePicker
+    Left = 24
+    Top = 250
+    Width = 170
+    Height = 22
+    ElementID = 'dtpproofdate'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_proof_date'
+    DataSource = wdsOrder
+  end
+  object dtpOrderDate: TWebDBDateTimePicker
+    Left = 24
+    Top = 222
+    Width = 170
+    Height = 22
+    ElementID = 'dtporderdate'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_order_date'
+    DataSource = wdsOrder
+  end
+  object dtpApprovedDate: TWebDBDateTimePicker
+    Left = 658
+    Top = 508
+    Width = 170
+    Height = 22
+    ElementID = 'dtpapproveddate'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    ShowFocus = False
+    ShowSeconds = False
+    TabStop = False
+    Text = ''
+    DataField = 'proofing_approved_date'
+    DataSource = wdsOrder
+  end
+  object dtpMountDue: TWebDBDateTimePicker
+    Left = 24
+    Top = 648
+    Width = 170
+    Height = 22
+    ElementID = 'dtpmountdue'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_mount_due'
+    DataSource = wdsOrder
+  end
+  object dtpPlateDue: TWebDBDateTimePicker
+    Left = 24
+    Top = 624
+    Width = 170
+    Height = 22
+    ElementID = 'dtpplatedue'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_plate_due'
+    DataSource = wdsOrder
+  end
+  object dtpArtDue: TWebDBDateTimePicker
+    Left = 24
+    Top = 600
+    Width = 170
+    Height = 22
+    ElementID = 'dtpartdue'
+    BorderStyle = bsSingle
+    ChildOrder = 85
+    Color = clWhite
+    Date = 45862.469870092590000000
+    Role = ''
+    Text = ''
+    DataField = 'staff_fields_art_due'
+    DataSource = wdsOrder
+  end
+  object cbPlates: TWebDBCheckBox
+    Left = 316
+    Top = 255
+    Width = 113
+    Height = 22
+    Caption = 'Plates'
+    ChildOrder = 85
+    ElementID = 'cbplates'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_plates'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbSampleCarton: TWebDBCheckBox
+    Left = 316
+    Top = 286
+    Width = 113
+    Height = 22
+    Caption = 'Sample Carton'
+    ChildOrder = 85
+    ElementID = 'cbsampleCarton'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_sample_ca'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbFTP: TWebDBCheckBox
+    Left = 316
+    Top = 314
+    Width = 113
+    Height = 22
+    Caption = 'FTP?'
+    ChildOrder = 85
+    ElementID = 'cbftp'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_ftp'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbColorCopy: TWebDBCheckBox
+    Left = 316
+    Top = 227
+    Width = 113
+    Height = 22
+    Caption = 'Color Copy?'
+    ChildOrder = 85
+    ElementID = 'cbcolorcopy'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_color_copy'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbEmail: TWebDBCheckBox
+    Left = 316
+    Top = 376
+    Width = 113
+    Height = 22
+    Caption = 'Email?'
+    ChildOrder = 85
+    ElementID = 'edtemail'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_e_mail'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbExistingCuttingDie: TWebDBCheckBox
+    Left = 316
+    Top = 407
+    Width = 113
+    Height = 22
+    Caption = 'Existing Cutting Die?'
+    ChildOrder = 85
+    ElementID = 'edtexistingcuttingdie'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_existing_'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbRefArtAPDF: TWebDBCheckBox
+    Left = 316
+    Top = 470
+    Width = 113
+    Height = 22
+    Caption = 'Ref Art A PDF?'
+    ChildOrder = 85
+    ElementID = 'edtrefartapdf'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_ref_art_a'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbRefArtPrintCard: TWebDBCheckBox
+    Left = 316
+    Top = 435
+    Width = 113
+    Height = 22
+    Caption = 'Ref Art Print Card?'
+    ChildOrder = 85
+    ElementID = 'edtrefartprintcard'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'supplied_by_customer_ref_art_p'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbFullMount: TWebDBCheckBox
+    Left = 496
+    Top = 378
+    Width = 113
+    Height = 22
+    TabStop = False
+    Caption = 'Full Mount'
+    ChildOrder = 85
+    ElementID = 'cbfullmount'
+    HeightPercent = 100.000000000000000000
+    ShowFocus = False
+    WidthPercent = 100.000000000000000000
+    DataField = 'mounting_full_mount'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbStickyBak: TWebDBCheckBox
+    Left = 496
+    Top = 356
+    Width = 113
+    Height = 22
+    TabStop = False
+    Caption = 'Sticky Bak'
+    ChildOrder = 85
+    ElementID = 'cbstickybak'
+    HeightPercent = 100.000000000000000000
+    ShowFocus = False
+    WidthPercent = 100.000000000000000000
+    DataField = 'mounting_sticky_bak'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbExcaliburDie: TWebDBCheckBox
+    Left = 496
+    Top = 235
+    Width = 113
+    Height = 22
+    TabStop = False
+    Caption = 'Excalibur Die'
+    ChildOrder = 85
+    ElementID = 'cbexcaliburdie'
+    HeightPercent = 100.000000000000000000
+    ShowFocus = False
+    WidthPercent = 100.000000000000000000
+    DataField = 'layout_excalibur_die'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object cbLoose: TWebCheckBox
+    Left = 496
+    Top = 309
+    Width = 113
+    Height = 22
+    TabStop = False
+    Caption = 'Loose'
+    ChildOrder = 84
+    ElementID = 'cbloose'
+    HeightPercent = 100.000000000000000000
+    ShowFocus = False
+    WidthPercent = 100.000000000000000000
+  end
+  object cbStripMount: TWebCheckBox
+    Left = 494
+    Top = 402
+    Width = 113
+    Height = 22
+    TabStop = False
+    Caption = 'Strip Mount'
+    ChildOrder = 84
+    ElementID = 'cbstripmount'
+    HeightPercent = 100.000000000000000000
+    ShowFocus = False
+    WidthPercent = 100.000000000000000000
+  end
+  object edtQBItemDescription: TWebEdit
+    Left = 26
+    Top = 551
+    Width = 121
+    Height = 22
+    ChildOrder = 31
+    ElementID = 'edtitemdescription'
+    Enabled = False
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+  end
+  object edtQBOrderNum: TWebDBEdit
+    Left = 151
+    Top = 149
+    Width = 121
+    Height = 22
+    AutoCompletion = acNope
+    AutoSize = True
+    ChildOrder = 79
+    ElementID = 'edtqbordernum'
+    Enabled = False
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'QB_ORDER_NUM'
+    DataSource = wdsOrder
+  end
+  object wdbcbINQB: TWebDBCheckBox
+    Left = 26
+    Top = 149
+    Width = 113
+    Height = 22
+    Caption = 'In Quickbooks?'
+    ChildOrder = 29
+    ElementID = 'wdbcbinqb'
+    Enabled = False
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'IN_QB'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object edtOrderNum: TWebDBEdit
+    Left = 103
+    Top = 185
+    Width = 121
+    Height = 22
+    ChildOrder = 30
+    ElementID = 'edtordernum'
+    Enabled = False
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'ORDER_ID'
+    DataSource = wdsOrder
+  end
+  object btnQB: TWebButton
+    Left = 1080
+    Top = 517
+    Width = 96
+    Height = 25
+    Caption = 'Send To QB'
+    ChildOrder = 30
+    ElementID = 'btnsendtoqb'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    OnClick = btnQBClick
+  end
  object XDataWebClient1: TXDataWebClient
    Connection = DMConnection.ApiConnection
    Left = 1014
    Top = 44
  end
-  object XDataWebDataSet1: TXDataWebDataSet
+  object xdwdsOrder: TXDataWebDataSet
    Connection = DMConnection.ApiConnection
    Left = 1060
    Top = 182
-    object XDataWebDataSet1ORDER_ID: TIntegerField
+    object xdwdsOrderORDER_ID: TIntegerField
      FieldName = 'ORDER_ID'
    end
-    object XDataWebDataSet1COMPANY_ID: TIntegerField
+    object xdwdsOrderCOMPANY_ID: TIntegerField
      FieldName = 'COMPANY_ID'
    end
-    object XDataWebDataSet1USER_ID: TIntegerField
+    object xdwdsOrderUSER_ID: TIntegerField
      FieldName = 'USER_ID'
    end
-    object XDataWebDataSet1ORDER_DATE: TDateField
+    object xdwdsOrderORDER_DATE: TDateField
      FieldName = 'ORDER_DATE'
    end
-    object XDataWebDataSet1START_DATE: TDateField
+    object xdwdsOrderSTART_DATE: TDateField
      FieldName = 'START_DATE'
    end
-    object XDataWebDataSet1END_DATE: TDateField
+    object xdwdsOrderEND_DATE: TDateField
      FieldName = 'END_DATE'
    end
-    object XDataWebDataSet1ORDER_STATUS: TStringField
+    object xdwdsOrderORDER_STATUS: TStringField
      FieldName = 'ORDER_STATUS'
    end
-    object XDataWebDataSet1SCHED_JSON: TStringField
+    object xdwdsOrderSCHED_JSON: TStringField
      FieldName = 'SCHED_JSON'
    end
-    object XDataWebDataSet1NAME: TStringField
+    object xdwdsOrderNAME: TStringField
      FieldName = 'NAME'
    end
-    object XDataWebDataSet1SHORT_NAME: TStringField
+    object xdwdsOrderSHORT_NAME: TStringField
      FieldName = 'SHORT_NAME'
    end
-    object XDataWebDataSet1staff_fields_ship_via: TStringField
+    object xdwdsOrderstaff_fields_ship_via: TStringField
      FieldName = 'staff_fields_ship_via'
    end
-    object XDataWebDataSet1staff_fields_price: TStringField
+    object xdwdsOrderstaff_fields_price: TStringField
      FieldName = 'staff_fields_price'
    end
-    object XDataWebDataSet1staff_fields_invoice_to: TStringField
+    object xdwdsOrderstaff_fields_invoice_to: TStringField
      FieldName = 'staff_fields_invoice_to'
    end
-    object XDataWebDataSet1staff_fields_invoice_attention: TStringField
+    object xdwdsOrderstaff_fields_invoice_attention: TStringField
      FieldName = 'staff_fields_invoice_attention'
    end
-    object XDataWebDataSet1staff_fields_ship_to: TStringField
+    object xdwdsOrderstaff_fields_ship_to: TStringField
      FieldName = 'staff_fields_ship_to'
    end
-    object XDataWebDataSet1staff_fields_ship_attention: TStringField
+    object xdwdsOrderstaff_fields_ship_attention: TStringField
      FieldName = 'staff_fields_ship_attention'
    end
-    object XDataWebDataSet1staff_fields_po_number: TStringField
+    object xdwdsOrderstaff_fields_po_number: TStringField
      FieldName = 'staff_fields_po_number'
    end
-    object XDataWebDataSet1staff_fields_job_name: TStringField
+    object xdwdsOrderstaff_fields_job_name: TStringField
      FieldName = 'staff_fields_job_name'
    end
-    object XDataWebDataSet1plates_job_number: TStringField
+    object xdwdsOrderplates_job_number: TStringField
      FieldName = 'plates_job_number'
    end
-    object XDataWebDataSet1supplied_by_customer_b_w_copy: TBooleanField
+    object xdwdsOrdersupplied_by_customer_dimension: TStringField
-      FieldName = 'supplied_by_customer_b_w_copy'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1supplied_by_customer_dimension: TStringField
      FieldName = 'supplied_by_customer_dimension'
    end
-    object XDataWebDataSet1supplied_by_customer_e_mail: TStringField
+    object xdwdsOrdersupplied_by_customer_other: TStringField
-      FieldName = 'supplied_by_customer_e_mail'
-    end
-    object XDataWebDataSet1supplied_by_customer_ftp: TStringField
-      FieldName = 'supplied_by_customer_ftp'
-    end
-    object XDataWebDataSet1supplied_by_customer_other: TStringField
      FieldName = 'supplied_by_customer_other'
    end
-    object XDataWebDataSet1supplied_by_customer_existing_: TStringField
+    object xdwdsOrdercut_die_cutdier: TStringField
-      FieldName = 'supplied_by_customer_existing_'
-    end
-    object XDataWebDataSet1supplied_by_customer_ref_art_p: TStringField
-      FieldName = 'supplied_by_customer_ref_art_p'
-    end
-    object XDataWebDataSet1supplied_by_customer_ref_art_a: TStringField
-      FieldName = 'supplied_by_customer_ref_art_a'
-    end
-    object XDataWebDataSet1cut_die_cutdier: TStringField
      FieldName = 'cut_die_cutdier'
    end
-    object XDataWebDataSet1cut_die_cutdieb: TStringField
+    object xdwdsOrdercut_die_cutdieb: TStringField
      FieldName = 'cut_die_cutdieb'
    end
-    object XDataWebDataSet1cut_die_cutdief: TStringField
+    object xdwdsOrdercut_die_cutdief: TStringField
      FieldName = 'cut_die_cutdief'
    end
-    object XDataWebDataSet1cut_die_cutdierkr: TStringField
+    object xdwdsOrdercut_die_cutdierkr: TStringField
      FieldName = 'cut_die_cutdierkr'
    end
-    object XDataWebDataSet1cut_die_cutdiefkr: TStringField
+    object xdwdsOrdercut_die_cutdiefkr: TStringField
      FieldName = 'cut_die_cutdiefkr'
    end
-    object XDataWebDataSet1cut_die_cad_file: TStringField
+    object xdwdsOrdercut_die_cad_file: TStringField
      FieldName = 'cut_die_cad_file'
    end
-    object XDataWebDataSet1cut_die_attached: TStringField
+    object xdwdsOrdercut_die_attached: TStringField
      FieldName = 'cut_die_attached'
    end
-    object XDataWebDataSet1cut_die_boxpol250: TStringField
+    object xdwdsOrdercut_die_boxpol250: TStringField
      FieldName = 'cut_die_boxpol250'
    end
-    object XDataWebDataSet1cut_die_boxpol155: TStringField
+    object xdwdsOrdercut_die_boxpol155: TStringField
      FieldName = 'cut_die_boxpol155'
    end
-    object XDataWebDataSet1cut_die_boxpol125: TStringField
+    object xdwdsOrdercut_die_boxpol125: TStringField
      FieldName = 'cut_die_boxpol125'
    end
-    object XDataWebDataSet1cut_die_brub: TStringField
+    object xdwdsOrdercut_die_brub: TStringField
      FieldName = 'cut_die_brub'
    end
-    object XDataWebDataSet1proofing_fax: TStringField
+    object xdwdsOrderproofing_fax: TStringField
      FieldName = 'proofing_fax'
    end
-    object XDataWebDataSet1proofing_fax_attn: TStringField
+    object xdwdsOrderproofing_fax_attn: TStringField
      FieldName = 'proofing_fax_attn'
    end
-    object XDataWebDataSet1proofing_e_mail: TStringField
+    object xdwdsOrderproofing_e_mail: TStringField
      FieldName = 'proofing_e_mail'
    end
-    object XDataWebDataSet1proofing_ship_to: TStringField
+    object xdwdsOrderproofing_ship_to: TStringField
      FieldName = 'proofing_ship_to'
    end
-    object XDataWebDataSet1proofing_other: TStringField
+    object xdwdsOrderproofing_other: TStringField
      FieldName = 'proofing_other'
    end
-    object XDataWebDataSet1proofing_changes_required: TStringField
+    object xdwdsOrderproofing_changes_required: TStringField
      FieldName = 'proofing_changes_required'
    end
-    object XDataWebDataSet1proofing_changes_date: TDateField
+    object xdwdsOrderproofing_changes_date: TDateField
      FieldName = 'proofing_changes_date'
    end
-    object XDataWebDataSet1layout_rsc_l: TStringField
+    object xdwdsOrderlayout_rsc_l: TStringField
      FieldName = 'layout_rsc_l'
    end
-    object XDataWebDataSet1layout_rcs_w: TStringField
+    object xdwdsOrderlayout_rcs_w: TStringField
      FieldName = 'layout_rcs_w'
    end
-    object XDataWebDataSet1layout_rcs_d: TStringField
+    object xdwdsOrderlayout_rcs_d: TStringField
      FieldName = 'layout_rcs_d'
    end
-    object XDataWebDataSet1layout_die_cut_no: TStringField
+    object xdwdsOrderlayout_die_cut_no: TStringField
      FieldName = 'layout_die_cut_no'
    end
-    object XDataWebDataSet1layout_accross_no: TStringField
+    object xdwdsOrderlayout_accross_no: TStringField
      FieldName = 'layout_accross_no'
    end
-    object XDataWebDataSet1layout_around_no: TStringField
+    object xdwdsOrderlayout_around_no: TStringField
      FieldName = 'layout_around_no'
    end
-    object XDataWebDataSet1layout_cad_file: TStringField
+    object xdwdsOrderlayout_cad_file: TStringField
      FieldName = 'layout_cad_file'
    end
-    object XDataWebDataSet1mounting_standard_setup: TStringField
+    object xdwdsOrdermounting_standard_setup: TStringField
      FieldName = 'mounting_standard_setup'
    end
-    object XDataWebDataSet1mounting_custom_backing: TStringField
+    object xdwdsOrdermounting_custom_backing: TStringField
      FieldName = 'mounting_custom_backing'
    end
-    object XDataWebDataSet1mounting_custom_adhesive: TStringField
+    object xdwdsOrdermounting_custom_adhesive: TStringField
      FieldName = 'mounting_custom_adhesive'
    end
-    object XDataWebDataSet1colors_cylinder_size: TStringField
+    object xdwdsOrdercolors_cylinder_size: TStringField
      FieldName = 'colors_cylinder_size'
    end
-    object XDataWebDataSet1colors_cross_hairs: TStringField
+    object xdwdsOrdercolors_cross_hairs: TStringField
      FieldName = 'colors_cross_hairs'
    end
-    object XDataWebDataSet1colors_machine_ident: TStringField
+    object xdwdsOrdercolors_machine_ident: TStringField
      FieldName = 'colors_machine_ident'
    end
-    object XDataWebDataSet1colors_clemson: TStringField
+    object xdwdsOrdercolors_clemson: TStringField
      FieldName = 'colors_clemson'
    end
-    object XDataWebDataSet1plates_thickness: TStringField
+    object xdwdsOrderplates_thickness: TStringField
      FieldName = 'plates_thickness'
    end
-    object XDataWebDataSet1plates_plate_material: TStringField
+    object xdwdsOrderplates_plate_material: TStringField
      FieldName = 'plates_plate_material'
    end
-    object XDataWebDataSet1general_special_instructions: TStringField
+    object xdwdsOrdergeneral_special_instructions: TStringField
      FieldName = 'general_special_instructions'
    end
-    object XDataWebDataSet1colors_colors: TStringField
+    object xdwdsOrdercolors_colors: TStringField
      FieldName = 'colors_colors'
    end
-    object XDataWebDataSet1staff_fields_quickbooks_item: TStringField
+    object xdwdsOrderstaff_fields_quickbooks_item: TStringField
      FieldName = 'staff_fields_quickbooks_item'
    end
-    object XDataWebDataSet1staff_fields_quantity: TStringField
+    object xdwdsOrderstaff_fields_quantity: TStringField
      FieldName = 'staff_fields_quantity'
    end
-    object XDataWebDataSet1layout_rsc_style: TStringField
+    object xdwdsOrderlayout_rsc_style: TStringField
      FieldName = 'layout_rsc_style'
    end
-    object XDataWebDataSet1staff_fields_art_location: TStringField
+    object xdwdsOrderstaff_fields_art_location: TStringField
      FieldName = 'staff_fields_art_location'
    end
-    object XDataWebDataSet1supplied_by_customer_color_copy: TBooleanField
+    object xdwdsOrdermounting_loose: TStringField
-      FieldName = 'supplied_by_customer_color_copy'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1supplied_by_customer_plates: TBooleanField
-      FieldName = 'supplied_by_customer_plates'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1supplied_by_customer_sample_ca: TBooleanField
-      FieldName = 'supplied_by_customer_sample_ca'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1supplied_by_customer_disk_or_cd: TBooleanField
-      FieldName = 'supplied_by_customer_disk_or_cd'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1mounting_loose: TStringField
      FieldName = 'mounting_loose'
    end
-    object XDataWebDataSet1mounting_sticky_bak: TBooleanField
+    object xdwdsOrdermounting_strip_mount: TStringField
-      FieldName = 'mounting_sticky_bak'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1mounting_full_mount: TBooleanField
-      FieldName = 'mounting_full_mount'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1mounting_strip_mount: TStringField
      FieldName = 'mounting_strip_mount'
    end
-    object XDataWebDataSet1layout_excalibur_die: TBooleanField
+    object xdwdsOrderproofing_e_mail_attn: TStringField
-      FieldName = 'layout_excalibur_die'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_full_size_panel: TBooleanField
-      FieldName = 'proofing_full_size_panel'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_print_card: TBooleanField
-      FieldName = 'proofing_print_card'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_wide_format: TBooleanField
-      FieldName = 'proofing_wide_format'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_pdf_file: TBooleanField
-      FieldName = 'proofing_pdf_file'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_art_approved_as_is: TBooleanField
-      FieldName = 'proofing_art_approved_as_is'
-      DisplayValues = 'True;False'
-    end
-    object XDataWebDataSet1proofing_e_mail_attn: TStringField
      FieldName = 'proofing_e_mail_attn'
    end
-    object XDataWebDataSet1proofing_approved_date: TStringField
+    object xdwdsOrderproofing_approved_date: TStringField
      FieldName = 'proofing_approved_date'
    end
-    object XDataWebDataSet1staff_fields_order_date: TStringField
+    object xdwdsOrderstaff_fields_order_date: TStringField
      FieldName = 'staff_fields_order_date'
    end
-    object XDataWebDataSet1staff_fields_proof_date: TStringField
+    object xdwdsOrderstaff_fields_proof_date: TStringField
      FieldName = 'staff_fields_proof_date'
    end
-    object XDataWebDataSet1staff_fields_ship_date: TStringField
+    object xdwdsOrderstaff_fields_ship_date: TStringField
      FieldName = 'staff_fields_ship_date'
    end
-    object XDataWebDataSet1staff_fields_art_due: TStringField
+    object xdwdsOrderstaff_fields_art_due: TStringField
      FieldName = 'staff_fields_art_due'
    end
-    object XDataWebDataSet1staff_fields_plate_due: TStringField
+    object xdwdsOrderstaff_fields_plate_due: TStringField
      FieldName = 'staff_fields_plate_due'
    end
-    object XDataWebDataSet1staff_fields_mount_due: TStringField
+    object xdwdsOrderstaff_fields_mount_due: TStringField
      FieldName = 'staff_fields_mount_due'
    end
-    object XDataWebDataSet1ADDRESS_LIST: TStringField
+    object xdwdsOrderADDRESS_LIST: TStringField
      FieldName = 'ADDRESS_LIST'
    end
-    object XDataWebDataSet1supplied_by_customer_order_date: TStringField
+    object xdwdsOrdersupplied_by_customer_order_date: TStringField
      FieldName = 'supplied_by_customer_order_date'
    end
-    object XDataWebDataSet1inQuickBooks: TStringField
+    object xdwdsOrderinQuickBooks: TStringField
      FieldName = 'inQuickBooks'
    end
+    object xdwdsOrdersupplied_by_customer_color_copy: TStringField
+      FieldName = 'supplied_by_customer_color_copy'
+    end
+    object xdwdsOrdersupplied_by_customer_plates: TStringField
+      FieldName = 'supplied_by_customer_plates'
+    end
+    object xdwdsOrdersupplied_by_customer_sample_ca: TStringField
+      FieldName = 'supplied_by_customer_sample_ca'
+    end
+    object xdwdsOrdersupplied_by_customer_ftp: TStringField
+      FieldName = 'supplied_by_customer_ftp'
+    end
+    object xdwdsOrdersupplied_by_customer_e_mail: TStringField
+      FieldName = 'supplied_by_customer_e_mail'
+    end
+    object xdwdsOrdersupplied_by_customer_existing_: TStringField
+      FieldName = 'supplied_by_customer_existing_'
+    end
+    object xdwdsOrdersupplied_by_customer_ref_art_p: TStringField
+      FieldName = 'supplied_by_customer_ref_art_p'
+    end
+    object xdwdsOrdersupplied_by_customer_ref_art_a: TStringField
+      FieldName = 'supplied_by_customer_ref_art_a'
+    end
+    object xdwdsOrderlayout_excalibur_die: TStringField
+      FieldName = 'layout_excalibur_die'
    end
-  object WebDataSource1: TWebDataSource
+    object xdwdsOrdermounting_sticky_bak: TStringField
+      FieldName = 'mounting_sticky_bak'
+    end
+    object xdwdsOrdermounting_full_mount: TStringField
+      FieldName = 'mounting_full_mount'
+    end
+    object xdwdsOrderproofing_full_size_panel: TStringField
+      FieldName = 'proofing_full_size_panel'
+    end
+    object xdwdsOrderproofing_print_card: TStringField
+      FieldName = 'proofing_print_card'
+    end
+    object xdwdsOrderproofing_wide_format: TStringField
+      FieldName = 'proofing_wide_format'
+    end
+    object xdwdsOrderproofing_pdf_file: TStringField
+      FieldName = 'proofing_pdf_file'
+    end
+    object xdwdsOrderproofing_art_approved_as_is: TStringField
+      FieldName = 'proofing_art_approved_as_is'
+    end
+    object xdwdsOrderIN_QB: TStringField
+      FieldName = 'IN_QB'
+    end
+    object xdwdsOrderQB_ORDER_NUM: TStringField
+      FieldName = 'QB_ORDER_NUM'
+    end
+  end
+  object wdsOrder: TWebDataSource
    AutoEdit = False
-    DataSet = XDataWebDataSet1
+    DataSet = xdwdsOrder
    Left = 1176
    Top = 182
  end
@@ -1622,6 +1654,13 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
    object xdwdsQBItemname: TStringField
      FieldName = 'name'
    end
+    object xdwdsQBItemdescription: TStringField
+      FieldName = 'description'
+    end
+    object xdwdsQBItemQB_ID: TStringField
+      FieldName = 'QB_ID'
+      Size = 0
+    end
  end
  object tmrReturn: TWebTimer
    Enabled = False

--- a/kgOrdersClient/View.OrderEntryCorrugated.html
+++ b/kgOrdersClient/View.OrderEntryCorrugated.html
@@ -29,6 +29,9 @@
      <li class="nav-item pe-2">
        <button id="btncancel" class="btn btn-danger btn-sm">Cancel</button>
      </li>
+      <li class="nav-item pe-2">
+        <button id="btnsendtoqb" class="btn btn-primary btn-sm">Send To QB</button>
+      </li>
      <li class="nav-item">
        <button id="btnclose" class="btn btn-primary btn-sm">Close</button>
      </li>
@@ -37,9 +40,6 @@
  </div>
 </nav>
    <div class="row mx-5">
-        <div class="col-12 col-md-8">
-        </div>
        <h4 class="custom-h4 mt-3">Customer</h4>
        <hr class="custom-hr">
        <div class="row">
@@ -57,9 +57,13 @@
                    Please Provide a Customer ID Name.
                </div>
            </div>
+            <div class="col-auto d-flex flex-column">
+              <label for="wdbcbinqb" class="form-label mt-2" style="font-weight: 700; font-size: 15px;">In QB?:</label>
+              <input id="wdbcbinqb" type="checkbox" class="form-check-input mt-1">
+            </div>
            <div class="col-auto">
-                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">In Quickbooks?:</label>
+                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QB Order Number:</label>
-                <input id="edtinquickbooks"type="text" class="form-control" style="width: 150px"/>
+                <input id="edtqbordernum"type="text" class="form-control" style="width: 150px" required/>
            </div>
        </div>
        <h4 class="custom-h4 mt-3">Staff Fields</h4>
@@ -90,11 +94,17 @@
            </div>
            <div class="col-auto">
                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label>
-                <input id="edtquantity" class="form-control input-sm" style="width: 100px"/>
+                <input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
+                 <div class="invalid-feedback" style="font-size: 15px;" required>
+                    Please Provide a Quantity.
+                </div>
            </div>
            <div class="col-auto">
                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label>
-                <input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="0"/>
+                <input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
+                 <div class="invalid-feedback" style="font-size: 15px;">
+                    Please Provide a Price.
+                </div>
            </div>
            <div>
                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Invoice To:</label>
@@ -118,12 +128,26 @@
                <input id="edtponumber" class="form-control input-sm" width='50%'/>
            </div>
            <div class="col-auto">
-                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Name:</label>
+                <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QB Item:</label>
-                <input id="edtjobname" class="form-control input-sm" style="width: 300px"/>
+                <select id="wcbqbitem" class='form-select' required></select>
+                 <div class="invalid-feedback" style="font-size: 15px;">
+                    Please Provide a QB Item.
+                </div>
            </div>
            <div class="col-auto">
-                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QuickBooks Item:</label>
+                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Name:</label>
-                <select id="wcbqbitem" class='form-select'></select>
+                <input id="edtjobname" class="form-control input-sm" style="width: 600px"/>
+                <div class="invalid-feedback" style="font-size: 15px;">
+                    Please Provide a Job Name.
+                </div>
+            </div>
+            <div class="row">
+              <div class="col-12">
+                <label for="edtitemdescription" class="form-label mt-2" style="font-weight: 700; font-size: 15px;">
+                  Item Description:
+                </label>
+                <input id="edtitemdescription" class="form-control" style="width: 100%;" />
+              </div>
            </div>
            <div class="col-auto">
                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Art Due:</label>

--- a/kgOrdersClient/View.OrderEntryCorrugated.pas
+++ b/kgOrdersClient/View.OrderEntryCorrugated.pas
@@ -13,26 +13,18 @@ uses
 type
  TFOrderEntryCorrugated = class(TWebForm)
-    dtpOrderDate: TWebDateTimePicker;
-    dtpProofDate: TWebDateTimePicker;
-    dtpShipDate: TWebDateTimePicker;
    WebLabel1: TWebLabel;
    WebLabel2: TWebLabel;
-    dtpArtDue: TWebDateTimePicker;
-    dtpPlateDue: TWebDateTimePicker;
-    dtpMountDue: TWebDateTimePicker;
    WebLabel3: TWebLabel;
    WebLabel4: TWebLabel;
    WebLabel5: TWebLabel;
    WebLabel6: TWebLabel;
    btnAddColor: TWebButton;
    WebLabel7: TWebLabel;
-    dtpApprovedDate: TWebDateTimePicker;
    WebLabel8: TWebLabel;
    WebLabel9: TWebLabel;
    edtCompanyName: TWebDBEdit;
    edtCompanyAccountName: TWebDBEdit;
-    edtInQuickBooks: TWebDBEdit;
    edtShipVia: TWebDBEdit;
    edtQuantity: TWebDBEdit;
    edtPrice: TWebDBEdit;
@@ -71,117 +63,86 @@ type
    cbFullSizePanel: TWebDBCheckBox;
    XDataWebClient1: TXDataWebClient;
    edtSpecialInstructions: TWebDBEdit;
-    XDataWebDataSet1: TXDataWebDataSet;
+    xdwdsOrder: TXDataWebDataSet;
-    WebDataSource1: TWebDataSource;
+    wdsOrder: TWebDataSource;
    btnSave: TWebButton;
-    XDataWebDataSet1ORDER_ID: TIntegerField;
+    xdwdsOrderORDER_ID: TIntegerField;
-    XDataWebDataSet1COMPANY_ID: TIntegerField;
+    xdwdsOrderCOMPANY_ID: TIntegerField;
-    XDataWebDataSet1USER_ID: TIntegerField;
+    xdwdsOrderUSER_ID: TIntegerField;
-    XDataWebDataSet1ORDER_STATUS: TStringField;
+    xdwdsOrderORDER_STATUS: TStringField;
-    XDataWebDataSet1SCHED_JSON: TStringField;
+    xdwdsOrderSCHED_JSON: TStringField;
-    XDataWebDataSet1staff_fields_ship_via: TStringField;
+    xdwdsOrderstaff_fields_ship_via: TStringField;
-    XDataWebDataSet1staff_fields_price: TStringField;
+    xdwdsOrderstaff_fields_price: TStringField;
-    XDataWebDataSet1staff_fields_invoice_to: TStringField;
+    xdwdsOrderstaff_fields_invoice_to: TStringField;
-    XDataWebDataSet1staff_fields_invoice_attention: TStringField;
+    xdwdsOrderstaff_fields_invoice_attention: TStringField;
-    XDataWebDataSet1staff_fields_ship_to: TStringField;
+    xdwdsOrderstaff_fields_ship_to: TStringField;
-    XDataWebDataSet1staff_fields_ship_attention: TStringField;
+    xdwdsOrderstaff_fields_ship_attention: TStringField;
-    XDataWebDataSet1staff_fields_po_number: TStringField;
+    xdwdsOrderstaff_fields_po_number: TStringField;
-    XDataWebDataSet1staff_fields_job_name: TStringField;
+    xdwdsOrderstaff_fields_job_name: TStringField;
-    XDataWebDataSet1ORDER_DATE: TDateField;
+    xdwdsOrderORDER_DATE: TDateField;
-    XDataWebDataSet1START_DATE: TDateField;
+    xdwdsOrderSTART_DATE: TDateField;
-    XDataWebDataSet1END_DATE: TDateField;
+    xdwdsOrderEND_DATE: TDateField;
-    XDataWebDataSet1plates_job_number: TStringField;
+    xdwdsOrderplates_job_number: TStringField;
-    XDataWebDataSet1supplied_by_customer_dimension: TStringField;
+    xdwdsOrdersupplied_by_customer_dimension: TStringField;
-    XDataWebDataSet1supplied_by_customer_e_mail: TStringField;
+    xdwdsOrdersupplied_by_customer_other: TStringField;
-    XDataWebDataSet1supplied_by_customer_ftp: TStringField;
+    xdwdsOrdercut_die_cutdier: TStringField;
-    XDataWebDataSet1supplied_by_customer_other: TStringField;
+    xdwdsOrdercut_die_cutdieb: TStringField;
-    XDataWebDataSet1supplied_by_customer_existing_: TStringField;
+    xdwdsOrdercut_die_cutdief: TStringField;
-    XDataWebDataSet1supplied_by_customer_ref_art_p: TStringField;
+    xdwdsOrdercut_die_cutdierkr: TStringField;
-    XDataWebDataSet1supplied_by_customer_ref_art_a: TStringField;
+    xdwdsOrdercut_die_cutdiefkr: TStringField;
-    XDataWebDataSet1cut_die_cutdier: TStringField;
+    xdwdsOrdercut_die_cad_file: TStringField;
-    XDataWebDataSet1cut_die_cutdieb: TStringField;
+    xdwdsOrdercut_die_attached: TStringField;
-    XDataWebDataSet1cut_die_cutdief: TStringField;
+    xdwdsOrdercut_die_boxpol250: TStringField;
-    XDataWebDataSet1cut_die_cutdierkr: TStringField;
+    xdwdsOrdercut_die_boxpol155: TStringField;
-    XDataWebDataSet1cut_die_cutdiefkr: TStringField;
+    xdwdsOrdercut_die_boxpol125: TStringField;
-    XDataWebDataSet1cut_die_cad_file: TStringField;
+    xdwdsOrdercut_die_brub: TStringField;
-    XDataWebDataSet1cut_die_attached: TStringField;
+    xdwdsOrderproofing_fax: TStringField;
-    XDataWebDataSet1cut_die_boxpol250: TStringField;
+    xdwdsOrderproofing_fax_attn: TStringField;
-    XDataWebDataSet1cut_die_boxpol155: TStringField;
+    xdwdsOrderproofing_e_mail: TStringField;
-    XDataWebDataSet1cut_die_boxpol125: TStringField;
+    xdwdsOrderproofing_ship_to: TStringField;
-    XDataWebDataSet1cut_die_brub: TStringField;
+    xdwdsOrderproofing_other: TStringField;
-    XDataWebDataSet1proofing_fax: TStringField;
+    xdwdsOrderproofing_changes_required: TStringField;
-    XDataWebDataSet1proofing_fax_attn: TStringField;
+    xdwdsOrderproofing_changes_date: TDateField;
-    XDataWebDataSet1proofing_e_mail: TStringField;
+    xdwdsOrderlayout_rsc_l: TStringField;
-    XDataWebDataSet1proofing_ship_to: TStringField;
+    xdwdsOrderlayout_rcs_w: TStringField;
-    XDataWebDataSet1proofing_other: TStringField;
+    xdwdsOrderlayout_rcs_d: TStringField;
-    XDataWebDataSet1proofing_changes_required: TStringField;
+    xdwdsOrderlayout_die_cut_no: TStringField;
-    XDataWebDataSet1proofing_changes_date: TDateField;
+    xdwdsOrderlayout_accross_no: TStringField;
-    XDataWebDataSet1layout_rsc_l: TStringField;
+    xdwdsOrderlayout_around_no: TStringField;
-    XDataWebDataSet1layout_rcs_w: TStringField;
+    xdwdsOrderlayout_cad_file: TStringField;
-    XDataWebDataSet1layout_rcs_d: TStringField;
+    xdwdsOrdercolors_cylinder_size: TStringField;
-    XDataWebDataSet1layout_die_cut_no: TStringField;
+    xdwdsOrdercolors_machine_ident: TStringField;
-    XDataWebDataSet1layout_accross_no: TStringField;
+    xdwdsOrdermounting_standard_setup: TStringField;
-    XDataWebDataSet1layout_around_no: TStringField;
+    xdwdsOrdermounting_custom_backing: TStringField;
-    XDataWebDataSet1layout_cad_file: TStringField;
+    xdwdsOrdermounting_custom_adhesive: TStringField;
-    XDataWebDataSet1colors_cylinder_size: TStringField;
+    xdwdsOrdercolors_cross_hairs: TStringField;
-    XDataWebDataSet1colors_machine_ident: TStringField;
+    xdwdsOrdercolors_clemson: TStringField;
-    XDataWebDataSet1mounting_standard_setup: TStringField;
+    xdwdsOrderplates_thickness: TStringField;
-    XDataWebDataSet1mounting_custom_backing: TStringField;
+    xdwdsOrderplates_plate_material: TStringField;
-    XDataWebDataSet1mounting_custom_adhesive: TStringField;
+    xdwdsOrdergeneral_special_instructions: TStringField;
-    XDataWebDataSet1colors_cross_hairs: TStringField;
+    xdwdsOrdercolors_colors: TStringField;
-    XDataWebDataSet1colors_clemson: TStringField;
+    xdwdsOrderstaff_fields_quickbooks_item: TStringField;
-    XDataWebDataSet1plates_thickness: TStringField;
+    xdwdsOrderstaff_fields_quantity: TStringField;
-    XDataWebDataSet1plates_plate_material: TStringField;
+    xdwdsOrderlayout_rsc_style: TStringField;
-    XDataWebDataSet1general_special_instructions: TStringField;
+    xdwdsOrderstaff_fields_art_location: TStringField;
-    XDataWebDataSet1colors_colors: TStringField;
+    xdwdsOrderNAME: TStringField;
-    XDataWebDataSet1staff_fields_quickbooks_item: TStringField;
+    xdwdsOrderSHORT_NAME: TStringField;
-    XDataWebDataSet1staff_fields_quantity: TStringField;
+    xdwdsOrdermounting_loose: TStringField;
-    XDataWebDataSet1layout_rsc_style: TStringField;
+    xdwdsOrdermounting_strip_mount: TStringField;
-    XDataWebDataSet1staff_fields_art_location: TStringField;
+    xdwdsOrderproofing_e_mail_attn: TStringField;
-    XDataWebDataSet1NAME: TStringField;
+    xdwdsOrderproofing_approved_date: TStringField;
-    XDataWebDataSet1SHORT_NAME: TStringField;
+    xdwdsOrderstaff_fields_order_date: TStringField;
-    XDataWebDataSet1supplied_by_customer_b_w_copy: TBooleanField;
+    xdwdsOrderstaff_fields_proof_date: TStringField;
-    XDataWebDataSet1supplied_by_customer_color_copy: TBooleanField;
+    xdwdsOrderstaff_fields_ship_date: TStringField;
-    XDataWebDataSet1supplied_by_customer_plates: TBooleanField;
+    xdwdsOrderstaff_fields_art_due: TStringField;
-    XDataWebDataSet1supplied_by_customer_sample_ca: TBooleanField;
+    xdwdsOrderstaff_fields_plate_due: TStringField;
-    XDataWebDataSet1supplied_by_customer_disk_or_cd: TBooleanField;
+    xdwdsOrderstaff_fields_mount_due: TStringField;
-    XDataWebDataSet1mounting_loose: TStringField;
+    xdwdsOrderADDRESS_LIST: TStringField;
-    XDataWebDataSet1mounting_sticky_bak: TBooleanField;
-    XDataWebDataSet1mounting_full_mount: TBooleanField;
-    XDataWebDataSet1mounting_strip_mount: TStringField;
-    XDataWebDataSet1layout_excalibur_die: TBooleanField;
-    XDataWebDataSet1proofing_full_size_panel: TBooleanField;
-    XDataWebDataSet1proofing_print_card: TBooleanField;
-    XDataWebDataSet1proofing_wide_format: TBooleanField;
-    XDataWebDataSet1proofing_pdf_file: TBooleanField;
-    XDataWebDataSet1proofing_art_approved_as_is: TBooleanField;
-    XDataWebDataSet1proofing_e_mail_attn: TStringField;
-    XDataWebDataSet1proofing_approved_date: TStringField;
-    XDataWebDataSet1staff_fields_order_date: TStringField;
-    XDataWebDataSet1staff_fields_proof_date: TStringField;
-    XDataWebDataSet1staff_fields_ship_date: TStringField;
-    XDataWebDataSet1staff_fields_art_due: TStringField;
-    XDataWebDataSet1staff_fields_plate_due: TStringField;
-    XDataWebDataSet1staff_fields_mount_due: TStringField;
-    cbRefArtAPDF: TWebCheckBox;
-    cbRefArtPrintCard: TWebCheckBox;
-    cbExistingCuttingDie: TWebCheckBox;
-    cbFTP: TWebCheckBox;
-    cbSampleCarton: TWebCheckBox;
-    cbPlates: TWebCheckBox;
-    cbColorCopy: TWebCheckBox;
-    cbStripMount: TWebCheckBox;
-    cbFullMount: TWebCheckBox;
-    cbStickyBak: TWebCheckBox;
-    cbLoose: TWebCheckBox;
-    cbExcaliburDie: TWebCheckBox;
-    XDataWebDataSet1ADDRESS_LIST: TStringField;
    wdsShipTo: TWebDataSource;
    xdwdsShipTo: TXDataWebDataSet;
    xdwdsShipToADDRESS: TStringField;
    wdbcbShipTo: TWebDBComboBox;
-    cbEmail: TWebCheckBox;
+    xdwdsOrdersupplied_by_customer_order_date: TStringField;
-    XDataWebDataSet1supplied_by_customer_order_date: TStringField;
    btnCancel: TWebButton;
    wdbcbQuickbooksItem: TWebDBComboBox;
    wdsQBItem: TWebDataSource;
@@ -193,26 +154,69 @@ type
    btnCopy: TWebButton;
    btnDelete: TWebButton;
    btnClose: TWebButton;
-    edtOrderNum: TWebEdit;
    tmrReturn: TWebTimer;
    btnEdit: TWebButton;
    btnAdd: TWebButton;
    WebButton2: TWebButton;
    lblFormState: TWebLabel;
-    XDataWebDataSet1inQuickBooks: TStringField;
+    xdwdsOrderinQuickBooks: TStringField;
+    dtpShipDate: TWebDBDateTimePicker;
+    dtpProofDate: TWebDBDateTimePicker;
+    dtpOrderDate: TWebDBDateTimePicker;
+    dtpApprovedDate: TWebDBDateTimePicker;
+    dtpMountDue: TWebDBDateTimePicker;
+    dtpPlateDue: TWebDBDateTimePicker;
+    dtpArtDue: TWebDBDateTimePicker;
+    cbPlates: TWebDBCheckBox;
+    cbSampleCarton: TWebDBCheckBox;
+    cbFTP: TWebDBCheckBox;
+    cbColorCopy: TWebDBCheckBox;
+    cbEmail: TWebDBCheckBox;
+    cbExistingCuttingDie: TWebDBCheckBox;
+    cbRefArtAPDF: TWebDBCheckBox;
+    cbRefArtPrintCard: TWebDBCheckBox;
+    cbFullMount: TWebDBCheckBox;
+    cbStickyBak: TWebDBCheckBox;
+    cbExcaliburDie: TWebDBCheckBox;
+    cbLoose: TWebCheckBox;
+    cbStripMount: TWebCheckBox;
+    xdwdsOrdersupplied_by_customer_color_copy: TStringField;
+    xdwdsOrdersupplied_by_customer_plates: TStringField;
+    xdwdsOrdersupplied_by_customer_sample_ca: TStringField;
+    xdwdsOrdersupplied_by_customer_ftp: TStringField;
+    xdwdsOrdersupplied_by_customer_e_mail: TStringField;
+    xdwdsOrdersupplied_by_customer_existing_: TStringField;
+    xdwdsOrdersupplied_by_customer_ref_art_p: TStringField;
+    xdwdsOrdersupplied_by_customer_ref_art_a: TStringField;
+    xdwdsOrderlayout_excalibur_die: TStringField;
+    xdwdsOrdermounting_sticky_bak: TStringField;
+    xdwdsOrdermounting_full_mount: TStringField;
+    xdwdsOrderproofing_full_size_panel: TStringField;
+    xdwdsOrderproofing_print_card: TStringField;
+    xdwdsOrderproofing_wide_format: TStringField;
+    xdwdsOrderproofing_pdf_file: TStringField;
+    xdwdsOrderproofing_art_approved_as_is: TStringField;
+    edtQBItemDescription: TWebEdit;
+    edtQBOrderNum: TWebDBEdit;
+    wdbcbINQB: TWebDBCheckBox;
+    edtOrderNum: TWebDBEdit;
+    xdwdsQBItemdescription: TStringField;
+    xdwdsQBItemQB_ID: TStringField;
+    btnQB: TWebButton;
+    xdwdsOrderIN_QB: TStringField;
+    xdwdsOrderQB_ORDER_NUM: TStringField;
    procedure WebFormCreate(Sender: TObject);
    [async] procedure getOrder(Order_ID: string);
-    [async] procedure getCustomer(customerID: string);
+    [async] procedure SetEmptyOrderInfo(customerID: string);
    procedure btnAddColorClick(Sender: TObject);
    procedure addColorRow(num, Color, LPI, Size: string);
    procedure btnSaveClick(Sender: TObject);
-    [async] procedure AddCorrugatedOrder(orderJSON: TJSONObject);
+    [async] procedure SendCorrugatedOrder();
    [async] procedure GenerateReportPDF;
    [async] procedure DelOrder();
    procedure btnCancelClick(Sender: TObject);
    procedure btnPDFClick(Sender: TObject);
    procedure btnCopyClick(Sender: TObject);
-    procedure sendOrderToServer();
    procedure btnCloseClick(Sender: TObject);
    procedure btnDeleteClick(Sender: TObject);
    procedure tmrReturnTimer(Sender: TObject);
@@ -224,7 +228,10 @@ type
    procedure WebButton2Click(Sender: TObject);
    procedure ShowAddAddressForm();
    [async] procedure SendAddressToServer(AddressJSON: TJSONObject);
-    procedure wdbcbShipToChange(Sender: TObject);
+    procedure edtJobNameExit(Sender: TObject);
+    procedure wdbcbQuickbooksItemChange(Sender: TObject);
+    procedure btnQBClick(Sender: TObject);
+    function VerifyQBOrder: Boolean;
  private
    FAgencyCode: string;
    FCurrentReportType: string;
@@ -234,8 +241,10 @@ type
    customerID: string;
    changed: boolean;
    notification: string;
+    customer_qb_id: string;
    procedure RemoveColorRow(Sender: TObject);
    [async] procedure InitializeForm;
+    [async] procedure AddEstimate(orderID: string);
    //FJSONProc1: TJSONProc1;
  public
    class function CreateForm(AElementID, orderInfo, customerInfo, modeparam, info: string): TWebForm;
@@ -273,7 +282,7 @@ end;
 begin
  if mode = 'ADD' then
  begin
-    await(getCustomer(customerID));
+    await(SetEmptyOrderInfo(customerID));
    EditMode;
  end
  else
@@ -287,230 +296,52 @@ begin
    ShowToast(notification);
 end;
-procedure TFOrderEntryCorrugated.sendOrderToServer();
-// This can be improved. I was struggling to get the checkboxes to work with
-// The dataset at first, but if you just change the fields in the database to be
-// Booleans it should work
-var
-  colorList: TJSONArray;
-  container: TJSElement;
-  colorCollection: TJSHTMLCollection;
-  color: TJSHTMLElement;
-  I, J: integer;
-  colorJSON, orderJSON, colorListJSON: TJSONObject;
-  fieldNames: TStringList;
-  itemList: TJSNodeList;
-  header, value: string;
-  Field: TField;
-  Response: TXDataClientResponse;
-begin
-  orderJSON := TJSONObject.Create;
-  colorList := TJSONArray.Create;
-  container := document.getElementById('additionalFields');
-  colorCollection := container.children;
-  for I := 0 to colorCollection.length - 1 do
-  begin
-    colorJSON := TJSONObject.Create;
-    itemList := colorCollection[I].childNodes;
-    for J := 0 to itemList.length - 2 do
-    begin
-      header := TJSHTMLElement(itemList[J]).children[0].innerText.Replace(':', '').Trim();
-      value := TJSHTMLInputElement(TJSHTMLElement(itemList[J]).childNodes[1]).value;
-      colorJSON.AddPair(header, value);
-    end;
-    colorList.Add(colorJSON);
-  end;
-  colorListJSON := TJSONObject.Create;
-  colorListJSON.AddPair('items', colorList);
-  XDataWebDataSet1.Edit;
-  XDataWebDataSet1colors_colors.Value := colorListJSON.ToString;
-  //Convert all dates to strings because I was having less issues with that data type.
-  XDataWebDataSet1staff_fields_proof_date.Value := DateTimeToStr(dtpProofDate.Date);
-  XDataWebDataSet1staff_fields_ship_date.Value := DateTimeToStr(dtpShipDate.Date);
-  XDataWebDataSet1staff_fields_art_due.Value := DateTimeToStr(dtpArtDue.Date);
-  XDataWebDataSet1staff_fields_mount_due.Value := DateTimeToStr(dtpMountDue.Date);
-  XDataWebDataSet1staff_fields_plate_due.Value := DateTimeToStr(dtpPlateDue.Date);
-  XDataWebDataSet1staff_fields_order_date.Value := DateTimeToStr(dtpOrderDate.Date);
-  XDataWebDataSet1proofing_approved_date.Value := DateTimeToStr(dtpApprovedDate.Date);
-  // Convert all check boxes to strings because the database stores them as strings
-  if cbFTP.Checked then
-    XDataWebDataSet1supplied_by_customer_ftp.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_ftp.AsString := '';
-  if cbExistingCuttingDie.Checked then
-    XDataWebDataSet1supplied_by_customer_existing_.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_existing_.AsString := '';
-  if cbRefArtPrintCard.Checked then
-    XDataWebDataSet1supplied_by_customer_ref_art_p.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_ref_art_p.AsString := '';
-  if cbRefArtAPDF.Checked then
-    XDataWebDataSet1supplied_by_customer_ref_art_a.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_ref_art_a.AsString := '';
-  if cbColorCopy.Checked then
-    XDataWebDataSet1supplied_by_customer_color_copy.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_color_copy.AsString := '';
-  if cbPlates.Checked then
-    XDataWebDataSet1supplied_by_customer_plates.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_plates.AsString := '';
-  if cbSampleCarton.Checked then
-    XDataWebDataSet1supplied_by_customer_sample_ca.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_sample_ca.AsString := '';
-  if cbEmail.Checked then
-     XDataWebDataSet1supplied_by_customer_e_mail.AsString := 'T'
-  else
-    XDataWebDataSet1supplied_by_customer_e_mail.AsString := '';
-  // layout
-  if cbExcaliburDie.Checked then
-    XDataWebDataSet1layout_excalibur_die.AsString := 'T'
-  else
-    XDataWebDataSet1layout_excalibur_die.AsString := '';
-  // proofing
-  if cbPDFFile.Checked then
-    XDataWebDataSet1proofing_pdf_file.AsString := 'T'
-  else
-    XDataWebDataSet1proofing_pdf_file.AsString := '';
-  // Mounting
-  if cbStickyBak.Checked then
-    XDataWebDataSet1mounting_sticky_bak.AsString := 'T'
-  else
-    XDataWebDataSet1mounting_sticky_bak.AsString := '';
-  if cbStickyBak.Checked then
-    XDataWebDataSet1mounting_full_mount.AsString := 'T'
-  else
-    XDataWebDataSet1mounting_full_mount.AsString := '';
-  XDataWebDataSet1.Post;
-  //xdwdsShipTo.Post;
-  //xdwdsQBItem.Post;
-  XDataWebDataSet1.First;
-  while not XDataWebDataSet1.Eof do
-  begin
-    for Field in XDataWebDataSet1.Fields do
-    begin
-      if Field is TStringField then
-      begin
-        if Field.AsString = '' then
-        begin
-          orderJSON.AddPair(Field.FieldName, '');
-        end
-        else
-          orderJSON.AddPair(Field.FieldName, Field.AsString);  // Add all other fields
-      end
-      else if Field is TBooleanField then
-      begin
-        if Field.AsBoolean then
-          orderJSON.AddPair(Field.FieldName, 'T')
-        else
-          orderJSON.AddPair(Field.FieldName, '');
-      end;
-    end;
-    XDataWebDataSet1.Next;
-  end;
-  orderJSON.AddPair('COMPANY_ID', customerID);
-  orderJSON.AddPair('USER_ID', JS.toString(AuthService.TokenPayload.Properties['user_id']));
-  orderJSON.AddPair('mode', mode);
-  if mode = 'EDIT' then
-    orderJSON.AddPair('ORDER_ID', orderID);
-  AddCorrugatedOrder(orderJSON);
-end;
 procedure TFOrderEntryCorrugated.btnSaveClick(Sender: TObject);
 // Converts all the information on the page into a JSON to then send to the server
 begin
  if VerifyOrder() then
  begin
-    sendOrderToServer();
+    SendCorrugatedOrder();
    ViewMode();
  end;
 end;
-function TFOrderEntryCorrugated.VerifyOrder: Boolean;
+procedure TFOrderEntryCorrugated.AddEstimate(orderID: string);
 var
-  input: TJSHTMLInputElement;
+  Response: TXDataClientResponse;
+  notification: TJSObject;
+  msg: string;
 begin
-  result := true;
+  try
+    Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddEstimate',
-  input := TJSHTMLInputElement(document.getElementById('edtcompanyname'));
+                [orderID]));
-  if edtCompanyName.Text = '' then
+    notification := TJSObject(Response.Result);
-  begin
+    msg := string(notification['status']);
-    input.classList.add('is-invalid');
+    Utils.HideSpinner('spinner');
-    result := false;
+    getOrder(orderID);
-  end
-  else
-    input.classList.remove('is-invalid');
-  input := TJSHTMLInputElement(document.getElementById('edtaccountcompanyname'));
-  if edtCompanyAccountName.Text = '' then
-  begin
-    input.classList.add('is-invalid');
-    result := false;
-  end
-  else
-    input.classList.remove('is-invalid');
-  input := TJSHTMLInputElement(document.getElementById('edtinvoiceto'));
-  if edtInvoiceTo.Text = '' then
-  begin
-    input.classList.add('is-invalid');
-    result := false;
-  end
-  else
-    input.classList.remove('is-invalid');
-  input := TJSHTMLInputElement(document.getElementById('wcbshipto'));
-  if wdbcbShipTo.Text = '' then
-  begin
-    input.classList.add('is-invalid');
-    result := false;
-  end
-  else
-    input.classList.remove('is-invalid');
-  input := TJSHTMLInputElement(document.getElementById('dtporderdate'));
+    ShowToast(msg);
-  if dtpOrderDate.Date = 0 then
+  except
-  begin
+      on E: EXDataClientRequestException do
-    input.classList.add('is-invalid');
+        Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);
-    result := false;
+    end;
-  end
-  else
-    input.classList.remove('is-invalid');
 end;
 procedure TFOrderEntryCorrugated.btnCopyClick(Sender: TObject);
 begin
  mode := 'ADD';
  window.scrollTo(0, 0);
-  dtpOrderDate.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_order_date').AsDateTime := 0;
-  dtpProofDate.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_proof_date').AsDateTime := 0;
-  dtpArtDue.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_art_due').AsDateTime := 0;
-  dtpPlateDue.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_plate_due').AsDateTime := 0;
-  dtpMountDue.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_mount_due').AsDateTime := 0;
-  dtpShipDate.Date := 0;
+  xdwdsOrder.FieldByName('staff_fields_ship_date').AsDateTime := 0;
-  dtpApprovedDate.Date := 0;
+  xdwdsOrder.FieldByName('proofing_approved_date').AsDateTime := 0;
-  edtOrderNum.Text := '';
+  xdwdsOrder.FieldByName('IN_QB').AsString := 'F';
+  xdwdsOrder.FieldByName('QB_ORDER_NUM').AsString := '';
+  xdwdsOrder.FieldByName('ORDER_ID').AsString := '';
  EditMode();
  ShowToast('Success: Order Successfully Copied');
  window.scrollTo(0, 0);
@@ -551,6 +382,25 @@ begin
 end;
+procedure TFOrderEntryCorrugated.btnQBClick(Sender: TObject);
+begin
+  if JS.toString(AuthService.TokenPayload.Properties['user_qb_id']) <> '' then
+  begin
+    if ( VerifyQBOrder() )then
+    begin
+      if wdbcbINQB.Checked = false  then
+      begin
+          Utils.ShowSpinner('spinner');
+          addEstimate(xdwdsOrder.FieldByName('ORDER_ID').AsString);
+      end
+      else
+        ShowToast('Failure:Cannot submit orders already in QuickBooks', 'failure');
+    end;
+  end
+  else
+    ShowToast('Failure:User not authorized to add to QuickBooks', 'failure');
+end;
 [async] procedure TFOrderEntryCorrugated.GenerateReportPDF;
 // sends the search to the server which then sends back a pdf of the results
 var
@@ -574,19 +424,86 @@ begin
 end;
-procedure TFOrderEntryCorrugated.AddCorrugatedOrder(orderJSON: TJSONObject);
+procedure TFOrderEntryCorrugated.SendCorrugatedOrder();
 // sends the order JSON object to the server
 var
  Response: TXDataClientResponse;
  jsObj: TJSObject;
+  colorList: TJSONArray;
+  container: TJSElement;
+  colorCollection: TJSHTMLCollection;
+  color: TJSHTMLElement;
+  I, J: integer;
+  colorJSON, orderJSON, colorListJSON: TJSONObject;
+  fieldNames: TStringList;
+  itemList: TJSNodeList;
+  header, value: string;
+  Field: TField;
 begin
+  orderJSON := TJSONObject.Create;
+  colorList := TJSONArray.Create;
+  container := document.getElementById('additionalFields');
+  colorCollection := container.children;
+  for I := 0 to colorCollection.length - 1 do
+  begin
+    colorJSON := TJSONObject.Create;
+    itemList := colorCollection[I].childNodes;
+    for J := 0 to itemList.length - 2 do
+    begin
+      header := TJSHTMLElement(itemList[J]).children[0].innerText.Replace(':', '').Trim();
+      value := TJSHTMLInputElement(TJSHTMLElement(itemList[J]).childNodes[1]).value;
+      colorJSON.AddPair(header, value);
+    end;
+    colorList.Add(colorJSON);
+  end;
+  colorListJSON := TJSONObject.Create;
+  colorListJSON.AddPair('items', colorList);
+  xdwdsOrder.Edit;
+  xdwdsOrdercolors_colors.Value := colorListJSON.ToString;
+  xdwdsOrderUSER_ID.AsString := JS.toString(AuthService.TokenPayload.Properties['user_id']);
+  xdwdsOrder.Post;
+  xdwdsOrder.First;
+  while not xdwdsOrder.Eof do
+  begin
+    for Field in xdwdsOrder.Fields do
+    begin
+      if Field is TStringField then
+      begin
+        if Field.AsString = '' then
+        begin
+          orderJSON.AddPair(Field.FieldName, '');
+        end
+        else
+          orderJSON.AddPair(Field.FieldName, Field.AsString);  // Add all other fields
+      end
+      else if Field is TBooleanField then
+      begin
+        if Field.AsBoolean then
+          orderJSON.AddPair(Field.FieldName, 'T')
+        else
+          orderJSON.AddPair(Field.FieldName, 'F');
+      end
+      else if Field is TIntegerField then
+        orderJSON.AddPair(Field.FieldName, Field.AsInteger);
+    end;
+    xdwdsOrder.Next;
+  end;
+  orderJSON.AddPair('mode', mode);
  Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddCorrugatedOrder',
              [orderJSON.ToString]));
  jsObj := JS.TJSObject(Response.Result);
-  if mode = 'ADD' then
-    OrderID := String(jsObj.Properties['OrderID']);
+  xdwdsOrder.Close;
-  edtOrderNum.Text := OrderID;
+  xdwdsOrder.SetJsonData(jsObj);
+  xdwdsOrder.Open;
  mode := 'EDIT';
  ShowToast(string(jsObj.Properties['status']));
 end;
@@ -691,7 +608,6 @@ begin
  ShowAddAddressForm();
 end;
 procedure TFOrderEntryCorrugated.SendAddressToServer(AddressJSON: TJSONObject);
 var
  Response: TXDataClientResponse;
@@ -848,19 +764,24 @@ var
  color: TJSObject;
  colorJSON: TJSONObject;
  colorListJSON: TJSONArray;
+  container: TJSHTMLElement;
 begin
  try
-    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrder', [Order_ID]));
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCorrugatedOrder', [Order_ID]));
    order :=  TJSObject(xdcResponse.Result);
    data := TJSArray(order['data']);
-    XDataWebDataSet1.Close;
+    xdwdsOrder.Close;
-    XDataWebDataSet1.SetJsonData(order);
+    xdwdsOrder.SetJsonData(order);
-    XDataWebDataSet1.Open;
+    xdwdsOrder.Open;
-    XDataWebDataSet1.Edit;
+    xdwdsOrder.Edit;
-    if XDataWebDataSet1colors_colors.Value <> '' then
+    container := TJSHTMLElement(document.getElementById('additionalFields'));
+    if Assigned(container) then
+      container.innerHTML := '';  // Wipe previous content
+    if xdwdsOrdercolors_colors.Value <> '' then
    begin
-    colorObject := TJSObject(TJSJSON.parse(XDataWebDataSet1colors_colors.Value));
+    colorObject := TJSObject(TJSJSON.parse(xdwdsOrdercolors_colors.Value));
    colorList := TJSArray(colorObject['items']);
    for I := 0 to colorList.length -1 do
      begin
@@ -869,122 +790,29 @@ begin
      end;
    end;
-    // Check boxes and dates need to be manually set
+    if xdwdsOrder.FieldByName('mounting_loose').AsString <> '' then
+      cbLoose.Checked := true;
-    if not (XDataWebDataSet1staff_fields_order_date.AsString = '') then
-      dtpOrderDate.Date := StrToDateTime(XDataWebDataSet1staff_fields_order_date.Value)
-    else
-      dtpOrderDate.Date := 0;
-    if not (XDataWebDataSet1staff_fields_proof_date.AsString = '') then
-      dtpProofDate.Date := StrToDateTime(XDataWebDataSet1staff_fields_proof_date.AsString)
-    else
-      dtpProofDate.Date := 0;
-    if not (XDataWebDataSet1staff_fields_ship_date.AsString = '') then
-      dtpShipDate.Date := StrToDateTime(XDataWebDataSet1staff_fields_ship_date.AsString)
-    else
-      dtpShipDate.Date := 0;
-    if not (XDataWebDataSet1staff_fields_art_due.AsString = '') then
-      dtpArtDue.Date := StrToDateTime(XDataWebDataSet1staff_fields_art_due.AsString)
-    else
-      dtpArtDue.Date := 0;
-    if not (XDataWebDataSet1staff_fields_plate_due.AsString = '') then
-      dtpPlateDue.Date := StrToDateTime(XDataWebDataSet1staff_fields_plate_due.AsString)
-    else
-      dtpPlateDue.Date := 0;
-    if not (XDataWebDataSet1staff_fields_mount_due.AsString = '') then
-      dtpMountDue.Date := StrToDateTime(XDataWebDataSet1staff_fields_mount_due.AsString)
-    else
-      dtpMountDue.Date := 0;
-    if not (XDataWebDataSet1proofing_approved_date.AsString = '') then
-      dtpApprovedDate.Date := StrToDateTime(XDataWebDataSet1proofing_approved_date.AsString)
-    else
-      dtpApprovedDate.Date := 0;
-    if XDataWebDataSet1supplied_by_customer_existing_.AsString = 'T'  then
-      cbExistingCuttingDie.Checked := true
-    else
-      cbExistingCuttingDie.Checked := false;
-    if XDataWebDataSet1supplied_by_customer_ref_art_a.AsString = 'T'  then
-      cbRefArtAPDF.Checked := true
-    else
-      cbRefArtAPDF.Checked := false;
-    if XDataWebDataSet1supplied_by_customer_ref_art_p.AsString = 'T'  then
-      cbRefArtPrintCard.Checked := true
-    else
-      cbRefArtPrintCard.Checked := false;
-    // Supplied by customers check boxes
+    if xdwdsOrder.FieldByName('mounting_strip_mount').AsString <> '' then
+      cbStripMount.Checked := true;
-    if XDataWebDataSet1supplied_by_customer_color_copy.AsBoolean then
-      cbColorCopy.Checked := true
-    else
-      cbColorCopy.checked := false;
-    if XDataWebDataSet1supplied_by_customer_ftp.AsString <> '' then
-    begin
-      cbFTP.Checked := true;
-    end
-    else
-      cbFTP.Checked := false;
-    if XDataWebDataSet1supplied_by_customer_plates.AsBoolean then
-      cbPlates.Checked := true
-    else
-      cbPlates.Checked := false;
-    if XDataWebDataSet1supplied_by_customer_sample_ca.AsBoolean then
-      cbSampleCarton.Checked := true
-    else
-      cbSampleCarton.Checked := false;
-    if XDataWebDataSet1supplied_by_customer_e_mail.AsBoolean then
-      cbEmail.Checked := true
-    else
-      cbSampleCarton.Checked := false;
-    // layout
+    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [xdwdsOrder.FieldByName('COMPANY_ID').AsString]));
-    if XDataWebDataSet1layout_excalibur_die.AsBoolean then
-      cbExcaliburDie.Checked := true
-    else
-      cbExcaliburDie.Checked := false;
-    // Mounting check boxes
-    if XDataWebDataSet1mounting_loose.AsString <> '' then
-      cbLoose.Checked := true
-    else
-      cbLoose.Checked := false;
-    if XDataWebDataSet1mounting_sticky_bak.AsString <> '' then
-      cbStickyBak.Checked := true
-    else
-      cbStickyBak.Checked := false;
-    if XDataWebDataSet1mounting_full_mount.AsString <> '' then
-      cbFullMount.Checked := true
-    else
-      cbFullMount.Checked := false;
-    if XDataWebDataSet1mounting_strip_mount.AsString <> '' then
-      cbStripMount.Checked := true
-    else
-      cbStripMount.Checked := false;
-    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [XDataWebDataSet1.FieldByName('COMPANY_ID').AsString]));
    customer :=  TJSObject(xdcResponse.Result);
    xdwdsShipTo.Close;
    xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
    xdwdsShipTo.Open;
+    customer_qb_id := string(customer['QB_LIST_ID']);
    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems', []));
    items := TJSObject(xdcResponse.Result);
    xdwdsQBItem.Close;
-    items := TJSObject(order['ITEMS']);
    xdwdsQBItem.SetJsonData(items['data']);
    xdwdsQBITEM.Open;
+    edtQBItemDescription.text := xdwdsQBItem.FieldByName('description').AsString +
+                              ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
  except
    on E: EXDataClientRequestException do
      Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);
@@ -992,7 +820,7 @@ begin
 end;
-procedure TFOrderEntryCorrugated.getCustomer(customerID: string);
+procedure TFOrderEntryCorrugated.SetEmptyOrderInfo(customerID: string);
 // gets a customer from the database then loads the appropiate fields
 var
  xdcResponse: TXDataClientResponse;
@@ -1003,15 +831,26 @@ begin
  try
    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [customerID]));
    customer :=  TJSObject(xdcResponse.Result);
-    XDataWebDataSet1.Close;
+    xdwdsOrder.Close;
-    XDataWebDataSet1.SetJsonData(customer);
+    xdwdsOrder.SetJsonData(customer);
-    XDataWebDataSet1.Open;
+    xdwdsOrder.Open;
-    XDataWebDataSet1.Edit;
+    xdwdsOrder.Edit;
    xdwdsShipTo.Close;
    xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
    xdwdsShipTo.Open;
+    customer_qb_id := string(customer['QB_LIST_ID']);
+    xdwdsOrder.Close;
+    xdwdsOrder.Open;
+    xdwdsOrder.Append;
+    xdwdsOrder.FieldByName('NAME').AsString := string(customer['NAME']);
+    xdwdsOrder.FieldByName('SHORT_NAME').AsString := string(customer['SHORT_NAME']);
+    xdwdsOrder.FieldByName('staff_fields_invoice_to').AsString := string(customer['staff_fields_invoice_to']);
+    xdwdsOrder.FieldByName('COMPANY_ID').AsString := customerID;
+    xdwdsOrder.Post;
    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetItems', []));
    items :=  TJSObject(xdcResponse.Result);
@@ -1019,13 +858,13 @@ begin
    xdwdsQBItem.SetJsonData(items['data']);
    xdwdsQBITEM.Open;
-    dtpOrderDate.Date := 0;
+    {dtpOrderDate.Date := 0;
    dtpProofDate.Date := 0;
    dtpArtDue.Date := 0;
    dtpPlateDue.Date := 0;
    dtpMountDue.Date := 0;
    dtpShipDate.Date := 0;
-    dtpApprovedDate.Date := 0;
+    dtpApprovedDate.Date := 0;}
  except
    on E: EXDataClientRequestException do
      Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);
@@ -1047,7 +886,7 @@ procedure TFOrderEntryCorrugated.EditMode();
 begin
  xdwdsShipTo.Edit;
  xdwdsQBItem.Edit;
-  XDataWebDataSet1.Edit;
+  xdwdsOrder.Edit;
  FViewMain.change := true;
  btnCopy.Enabled := false;
@@ -1058,6 +897,7 @@ begin
  btnCancel.Enabled := True;
  btnEdit.Enabled := false;
  btnAdd.Enabled := false;
+  btnQB.Enabled := false;
  // Enable all non-DB checkboxes manually
  cbRefArtAPDF.Enabled := True;
@@ -1087,6 +927,12 @@ begin
 end;
+procedure TFOrderEntryCorrugated.edtJobNameExit(Sender: TObject);
+begin
+  edtQBItemDescription.text := xdwdsQBItem.FieldByName('description').AsString +
+                              ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
+end;
 procedure TFOrderEntryCorrugated.ViewMode;
 begin
  btnPDF.Enabled := true;
@@ -1097,6 +943,7 @@ begin
  btnCancel.Enabled := false;
  btnEdit.Enabled := true;
  btnAdd.Enabled := true;
+  btnQB.Enabled := true;
  FViewMain.change := false;
  // Explicitly disable all non-DB checkboxes
@@ -1127,10 +974,184 @@ begin
 end;
-procedure TFOrderEntryCorrugated.wdbcbShipToChange(Sender: TObject);
+procedure TFOrderEntryCorrugated.wdbcbQuickbooksItemChange(Sender: TObject);
+begin
+  edtQBItemDescription.text := xdwdsQBItem.FieldByName('description').AsString +
+                              ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
+end;
+function TFOrderEntryCorrugated.VerifyQBOrder: Boolean;
+var
+  msg, SQL: string;
+begin
+  Result := True;
+  msg := 'To add an order to QuickBooks, the following must be present:' + sLineBreak;
+  if edtCompanyName.Text = '' then
+  begin
+    msg := msg + '- Company Name cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if edtCompanyAccountName.Text = '' then
+  begin
+    msg := msg + '- Company ID cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if edtInvoiceTo.Text = '' then
+  begin
+    msg := msg + '- Invoice To cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if wdbcbShipTo.Text = '' then
+  begin
+    msg := msg + '- Ship To cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if dtpOrderDate.Date = 0 then
+  begin
+    msg := msg + '- Order Date cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if edtPrice.Text = '' then
+  begin
+    msg := msg + '- Price cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if edtQuantity.Text = '' then
+  begin
+    msg := msg + '- Quantity cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if wdbcbQuickBooksItem.Text = '' then
+  begin
+    msg := msg + '- Item cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  if edtJobName.Text = '' then
+  begin
+    msg := msg + '- Job Name Cannot be empty' + sLineBreak;
+    Result := False;
+  end;
+  xdwdsQBItem.Locate('name', xdwdsOrder.FieldByName('staff_fields_quickbooks_item').AsString, []);
+  if xdwdsQBItem.FieldByName('QB_ID').AsString = '' then
+  begin
+    msg := msg + '- Item Must be Linked to QuickBooks' + sLineBreak;
+    Result := False;
+  end;
+  if customer_qb_id = '' then
+  begin
+    msg := msg + '- Customer Must be Linked to QuickBooks' + sLineBreak;
+    Result := False;
+  end;
+  if not result then
+  asm
+    alert(msg);
+  end;
+end;
+function TFOrderEntryCorrugated.VerifyOrder: Boolean;
+var
+  input: TJSHTMLInputElement;
 begin
-  console.log(XDataWebDataSet1.FieldByName('staff_fields_ship_to').AsString);
+  result := true;
-  console.log(xdwdsShipTo.FieldByName('ADDRESS').AsString);
+  input := TJSHTMLInputElement(document.getElementById('edtcompanyname'));
+  if edtCompanyName.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('edtjobname'));
+  if edtJobName.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('edtaccountcompanyname'));
+  if edtCompanyAccountName.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('edtinvoiceto'));
+  if edtInvoiceTo.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('wcbshipto'));
+  if wdbcbShipTo.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('dtporderdate'));
+  if dtpOrderDate.Date = 0 then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('edtprice'));
+  if edtPrice.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('edtquantity'));
+  if edtQuantity.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
+  input := TJSHTMLInputElement(document.getElementById('wcbqbitem'));
+  if wdbcbQuickbooksItem.Text = '' then
+  begin
+    input.classList.add('is-invalid');
+    result := false;
+  end
+  else
+    input.classList.remove('is-invalid');
 end;
 initialization

--- a/kgOrdersClient/View.OrderEntryCuttingDie.pas
+++ b/kgOrdersClient/View.OrderEntryCuttingDie.pas
@@ -83,11 +83,10 @@ type
    procedure btnCancelClick(Sender: TObject);
    procedure WebFormCreate(Sender: TObject);
    [async] procedure GetCuttingDieOrder(Order_ID: string);
-    [async] procedure GetEmptyOrderInfo(customerID: string);
+    [async] procedure SetNewOrderInfo(customerID: string);
-    [async] procedure AddCuttingDieOrder(orderJSON: TJSONObject);
+    [async] procedure SendCuttingDieOrder();
    procedure btnPDFClick(Sender: TObject);
    [async] procedure GenerateReportPDF;
-    procedure SendOrderToServer();
    function VerifyOrder(): boolean;
    [async] procedure btnDeleteClick(Sender: TObject);
    [async] procedure delOrder();
@@ -155,7 +154,7 @@ end;
 begin
  if mode = 'ADD' then
  begin
-    await(getEmptyOrderInfo(customerID));
+    await(SetNewOrderInfo(customerID));
    EditMode;
  end
  else
@@ -191,8 +190,6 @@ end;
 procedure TFOrderEntryCuttingDie.btnQBClick(Sender: TObject);
 begin
-  //ShowToast('Sending Orders To QuickBooks is not yet Implemented', 'info');
-  console.log(customer_qb_id);
  if JS.toString(AuthService.TokenPayload.Properties['user_qb_id']) <> '' then
  begin
    if ( VerifyQBOrder() )then
@@ -373,57 +370,12 @@ begin
    input.classList.remove('is-invalid');
 end;
-procedure TFOrderEntryCuttingDie.SendOrderToServer;
-var
-  orderJSON: TJSONObject;
-  fieldNames: TStringList;
-  itemList: TJSNodeList;
-  header, value: string;
-  Field: TField;
-  Response: TXDataClientResponse;
-begin
-  orderJSON := TJSONObject.Create;
-  xdwdsOrder.Edit;
-  xdwdsOrder.Post;
-  xdwdsOrder.First;
-  while not xdwdsOrder.Eof do
-  begin
-    for Field in xdwdsOrder.Fields do
-    begin
-      if Field is TStringField then
-      begin
-        if Field.AsString = '' then
-          orderJSON.AddPair(Field.FieldName, '')
-        else
-          orderJSON.AddPair(Field.FieldName, Field.AsString);  // Add all other fields
-      end
-      else if Field is TBooleanField then
-      begin
-        if Field.AsBoolean then
-          orderJSON.AddPair(Field.FieldName, 'T')
-        else
-          orderJSON.AddPair(Field.FieldName, '');
-      end
-      else if Field is TIntegerField then
-        orderJSON.AddPair(Field.FieldName, Field.AsInteger);
-    end;
-    xdwdsOrder.Next;
-  end;
-  orderJSON.AddPair('mode', mode);
-  console.log(orderJSON);
-  AddCuttingDieOrder(orderJSON);
-end;
 procedure TFOrderEntryCuttingDie.btnSaveClick(Sender: TObject);
 // Converts all the information on the page into a JSON to then send to the server
 begin
  if VerifyOrder() then
  begin
-    sendOrderToServer();
+    sendCuttingDieOrder();
    ViewMode();
  end;
  window.scrollTo(0, 0);
@@ -437,6 +389,8 @@ begin
  xdwdsOrder.FieldByName('staff_fields_order_date').AsDateTime := 0;
  xdwdsOrder.FieldByName('staff_fields_proof_date').AsDateTime := 0;
  xdwdsOrder.FieldByName('staff_fields_ship_date').AsDateTime := 0;
+  xdwdsOrder.FieldByName('IN_QB').AsString := 'F';
+  xdwdsOrder.FieldByName('QB_ORDER_NUM').AsString := '';
  xdwdsOrder.FieldByName('ORDER_ID').AsString := '';
  xdwdsOrder.Post;
@@ -508,24 +462,60 @@ begin
 end;
-procedure TFOrderEntryCuttingDie.AddCuttingDieOrder(orderJSON: TJSONObject);
+procedure TFOrderEntryCuttingDie.SendCuttingDieOrder();
 // sends the order JSON object to the server
 var
  Response: TXDataClientResponse;
  jsObj: TJSObject;
+  orderJSON: TJSONObject;
+  fieldNames: TStringList;
+  itemList: TJSNodeList;
+  header, value: string;
+  Field: TField;
 begin
+   orderJSON := TJSONObject.Create;
+    xdwdsOrder.Edit;
+    xdwdsOrderUSER_ID.AsString := JS.toString(AuthService.TokenPayload.Properties['user_id']);
+    xdwdsOrder.Post;
+    xdwdsOrder.First;
+    while not xdwdsOrder.Eof do
+    begin
+      for Field in xdwdsOrder.Fields do
+      begin
+        if Field is TStringField then
+        begin
+          if Field.AsString = '' then
+            orderJSON.AddPair(Field.FieldName, '')
+          else
+            orderJSON.AddPair(Field.FieldName, Field.AsString);
+        end
+        else if Field is TBooleanField then
+        begin
+          if Field.AsBoolean then
+            orderJSON.AddPair(Field.FieldName, 'T')
+          else
+            orderJSON.AddPair(Field.FieldName, 'F');
+        end
+        else if Field is TIntegerField then
+          orderJSON.AddPair(Field.FieldName, Field.AsInteger);
+      end;
+      xdwdsOrder.Next;
+    end;
+    orderJSON.AddPair('mode', mode);
  try
    Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddCuttingDieOrder',
                [orderJSON.ToString]));
    jsObj := JS.TJSObject(Response.Result);
-    {if mode = 'ADD' then
-      OrderID := String(jsObj.Properties['OrderID']);}
    xdwdsOrder.Close;
    xdwdsOrder.SetJsonData(jsObj);
    xdwdsOrder.Open;
-    edtOrderNum.Text := xdwdsOrder.FieldByName('ORDER_ID').AsString;
+    //edtOrderNum.Text := xdwdsOrder.FieldByName('ORDER_ID').AsString;
    mode := 'EDIT';
    ShowToast(String(jsObj.Properties['status']));
  except
@@ -662,8 +652,9 @@ begin
 end;
-procedure TFOrderEntryCuttingDie.getEmptyOrderInfo(customerID: string);
+procedure TFOrderEntryCuttingDie.SetNewOrderInfo(customerID: string);
-// gets a customer from the database then loads the appropiate fields
+// Set new blank order and then gets the customer and items from the database
+// then loads the appropiate fields
 var
  xdcResponse: TXDataClientResponse;
  customer, items : TJSObject;
@@ -684,7 +675,6 @@ begin
  xdwdsOrder.FieldByName('staff_fields_invoice_to').AsString := string(customer['staff_fields_invoice_to']);
  xdwdsOrder.FieldByName('COMPANY_ID').AsString := customerID;
-  xdwdsOrderUSER_ID.AsString := JS.toString(AuthService.TokenPayload.Properties['user_id']);
  xdwdsOrder.Post;
  xdwdsShipTo.Close;

--- a/kgOrdersClient/View.SelectCustomer.dfm
+++ b/kgOrdersClient/View.SelectCustomer.dfm
@@ -206,7 +206,6 @@ object FSelectCustomer: TFSelectCustomer
    ScrollMode = scmItemScrolling
    DesignTimeSampleData = True
    OnCellClick = TMSFNCGrid1CellClick
-    ExplicitTop = 163
  end
  object btnCancel: TWebButton
    Left = 556

--- a/kgOrdersServer/Source/Lookup.Service.pas
+++ b/kgOrdersServer/Source/Lookup.Service.pas
@@ -146,15 +146,15 @@ type
    data: TList<TCustomerItem>;
  end;
-  TFullOrder = class //TODO change name to TCorrugatedOrder
+  TCorrugatedOrder = class
  Public
      //Company
+      ORDER_ID: integer;
      COMPANY_ID: integer;
      NAME: string;
      SHORT_NAME: string;
-      inQuickBooks: string;
+      IN_QB: string;
-      ADDRESS_LIST: TList<TAddressItem>;
+      QB_ORDER_NUM: string;
-      ITEMS: TItemList;
      // Staff Fields:
      staff_fields_order_date: string;
@@ -174,12 +174,10 @@ type
      staff_fields_art_location: string;
      // Supplied by Customer:
-      supplied_by_customer_b_w_copy: boolean;
+      supplied_by_customer_color_copy: string;
-      supplied_by_customer_color_copy: boolean;
+      supplied_by_customer_plates: string;
-      supplied_by_customer_plates: boolean;
+      supplied_by_customer_sample_ca: string;
-      supplied_by_customer_sample_ca: boolean;
      supplied_by_customer_dimension: string;
-      supplied_by_customer_disk_or_cd: boolean;
      supplied_by_customer_e_mail: string;
      supplied_by_customer_ftp: string;
      supplied_by_customer_other: string;
@@ -198,13 +196,13 @@ type
      layout_accross_no: string;
      layout_around_no: string;
      layout_cad_file: string;
-      layout_excalibur_die: boolean;
+      layout_excalibur_die: string;
      layout_rsc_style: string;
      // Mounting
      mounting_loose: string;
-      mounting_sticky_bak: boolean;
+      mounting_sticky_bak: string;
-      mounting_full_mount: boolean;
+      mounting_full_mount: string;
      mounting_strip_mount: string;
      mounting_standard_setup: string;
      mounting_custom_backing: string;
@@ -223,12 +221,12 @@ type
       proofing_e_mail: string;
       proofing_e_mail_attn: string;
       proofing_ship_to: string;
-       proofing_full_size_panel: boolean;
+       proofing_full_size_panel: string;
-       proofing_print_card: boolean;
+       proofing_print_card: string;
-       proofing_wide_format: boolean;
+       proofing_wide_format: string;
-       proofing_pdf_file: boolean;
+       proofing_pdf_file: string;
       proofing_other: string;
-       proofing_art_approved_as_is: boolean;
+       proofing_art_approved_as_is: string;
       proofing_approved_date: string;
       // Plates
@@ -479,7 +477,7 @@ type
    [HttpGet] function GetUsers(searchOptions: string): TUserList;
    [HttpGet] function GetItems(searchOptions: string): TItemList;
    [HttpGet] function GetOrders(searchOptions: string): TOrderList;
-    [HttpGet] function GetOrder(orderInfo: string): TFullOrder;
+    [HttpGet] function GetCorrugatedOrder(orderInfo: string): TCorrugatedOrder;
    [HttpGet] function GetWebOrder(orderInfo: string): TWebOrder;
    [HttpGet] function GetCuttingDieOrder(orderInfo: string): TCuttingDie;
    [HttpGet] function GetCustomers(customerInfo: string): TCustomerList;

--- a/kgOrdersServer/Source/Lookup.ServiceImpl.pas
+++ b/kgOrdersServer/Source/Lookup.ServiceImpl.pas
@@ -34,7 +34,7 @@ type
    function GetItems(searchOptions: string): TItemList;
    function GetUsers(searchOptions: string): TUserList;
    function GetOrders(searchOptions: string): TOrderList;
-    function GetOrder(orderInfo: string): TFullOrder;
+    function GetCorrugatedOrder(orderInfo: string): TCorrugatedOrder;
    function GetCustomers(customerInfo:string): TCustomerList;
    function GetCustomer(ID: string): TCustomerItem;
    function GetWebOrder(orderInfo: string): TWebOrder;
@@ -1209,10 +1209,9 @@ begin
 end;
-function TLookupService.GetOrder(orderInfo: string): TFullOrder;
+function TLookupService.GetCorrugatedOrder(orderInfo: string): TCorrugatedOrder;
 // Gets on singular order from the database for the order entry page.
 // orderInfo: the ORDER_ID.
-// TODO seperate this into GetCorrugatedOrder and GetWebOrder.
 var
  orderType: string;
  orderID: string;
@@ -1222,23 +1221,18 @@ var
 begin
  orderID := orderInfo;
  try
-    SQL := 'select ORDER_TYPE from orders where ORDER_ID = ' + quotedStr(orderID);
+    SQL := 'select * from corrugated_plate_orders cpo JOIN customers c ON c.CUSTOMER_ID = cpo.COMPANY_ID join orders o on cpo.ORDER_ID = o.ORDER_ID where cpo.ORDER_ID = ' + quotedStr(orderID);
-    doQuery(ordersDB.UniQuery1, SQL);
-    orderType := ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString;
-    if orderType = 'web_plate' then
-       table := 'web_plate_orders'
-    else
-      table := 'corrugated_plate_orders';
-    SQL := 'select * from ' + table + ' o JOIN customers c ON c.CUSTOMER_ID = o.COMPANY_ID where ORDER_ID = ' + quotedStr(orderID);
    doQuery(ordersDB.UniQuery1, SQL);
-    result := TFullOrder.Create;
+    result := TCorrugatedOrder.Create;
    // Company
+    result.ORDER_ID := ordersDB.UniQuery1.FieldByName('ORDER_ID').AsInteger;
    result.COMPANY_ID := ordersDB.UniQuery1.FieldByName('COMPANY_ID').AsInteger;
    result.NAME := ordersDB.UniQuery1.FieldByName('NAME').AsString;
    result.SHORT_NAME := ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString;
-    result.inQuickBooks := '?';
+    result.IN_QB := ordersDB.UniQuery1.FieldByName('IN_QB').AsString;
+    result.QB_ORDER_NUM := ordersDB.UniQuery1.FieldByName('QB_ORDER_NUM').AsString;
    // Staff Fields
    result.staff_fields_order_date := ordersDB.UniQuery1.FieldByName('staff_fields_order_date').AsString;
@@ -1257,52 +1251,18 @@ begin
    result.staff_fields_art_location := ordersDB.UniQuery1.FieldByName('staff_fields_art_location').AsString;
    result.staff_fields_invoice_to := ordersDB.UniQuery1.FieldByName('staff_fields_invoice_to').AsString;
-    // Supplied by Customer
+    result.supplied_by_customer_color_copy := ordersDB.UniQuery1.FieldByName('supplied_by_customer_color_copy').AsString;
-    if ordersDB.UniQuery1.FieldByName('supplied_by_customer_b_w_copy').AsString = 'T' then
+    result.supplied_by_customer_plates := ordersDB.UniQuery1.FieldByName('supplied_by_customer_plates').AsString;
-      result.supplied_by_customer_b_w_copy := true
+    result.supplied_by_customer_sample_ca := ordersDB.UniQuery1.FieldByName('supplied_by_customer_sample_ca').AsString;
-    else
-      result.supplied_by_customer_b_w_copy := false;
-    if ordersDB.UniQuery1.FieldByName('supplied_by_customer_color_copy').AsString = 'T' then
-      result.supplied_by_customer_color_copy := true
-    else
-      result.supplied_by_customer_color_copy := false;
-    if ordersDB.UniQuery1.FieldByName('supplied_by_customer_plates').AsString = 'T' then
-      result.supplied_by_customer_plates := true
-    else
-      result.supplied_by_customer_plates := false;
-    if ordersDB.UniQuery1.FieldByName('supplied_by_customer_sample_ca').AsString = 'T' then
-      result.supplied_by_customer_sample_ca := true
-    else
-      result.supplied_by_customer_sample_ca := false;
    result.supplied_by_customer_dimension := ordersDB.UniQuery1.FieldByName('supplied_by_customer_dimension').AsString;
-    if orderType = 'web_plate' then
-    begin
-      {if ordersDB.UniQuery1.FieldByName('supplied_by_customer_disk').AsString = 'T' then
-        result.diskOrCD := true
-      else
-        result.diskOrCD := false;}
-    end
-    else
-    begin
-      if ordersDB.UniQuery1.FieldByName('supplied_by_customer_disk_or_cd').AsString = 'T' then
-        result.supplied_by_customer_disk_or_cd := true
-      else
-        result.supplied_by_customer_disk_or_cd := false;
-    end;
    result.supplied_by_customer_e_mail := ordersDB.UniQuery1.FieldByName('supplied_by_customer_e_mail').AsString;
    result.supplied_by_customer_ftp := ordersDB.UniQuery1.FieldByName('supplied_by_customer_ftp').AsString;
    result.supplied_by_customer_other := ordersDB.UniQuery1.FieldByName('supplied_by_customer_other').AsString;
-    if orderType = 'corrugated_plate' then
-    begin
    result.supplied_by_customer_existing_ := ordersDB.UniQuery1.FieldByName('supplied_by_customer_existing_').AsString;
    result.supplied_by_customer_ref_art_p := ordersDB.UniQuery1.FieldByName('supplied_by_customer_ref_art_p').AsString;
    result.supplied_by_customer_ref_art_a := ordersDB.UniQuery1.FieldByName('supplied_by_customer_ref_art_a').AsString;
-    end;
    // Layout
-    if orderType = 'corrugated_plate' then
-    begin
    result.layout_rsc_l := ordersDB.UniQuery1.FieldByName('layout_rsc_l').AsString;
    result.layout_rcs_w := ordersDB.UniQuery1.FieldByName('layout_rcs_w').AsString;
    result.layout_rcs_d := ordersDB.UniQuery1.FieldByName('layout_rcs_d').AsString;
@@ -1310,30 +1270,14 @@ begin
    result.layout_accross_no := ordersDB.UniQuery1.FieldByName('layout_accross_no').AsString;
    result.layout_around_no := ordersDB.UniQuery1.FieldByName('layout_around_no').AsString;
    result.layout_cad_file := ordersDB.UniQuery1.FieldByName('layout_cad_file').AsString;
-      if ordersDB.UniQuery1.FieldByName('layout_excalibur_die').AsString = 'T' then
+    result.layout_excalibur_die := ordersDB.UniQuery1.FieldByName('layout_excalibur_die').AsString;
-        result.layout_excalibur_die := true
-      else
-        result.layout_excalibur_die := false;
    result.layout_rsc_style := ordersDB.UniQuery1.FieldByName('layout_rsc_style').AsString;
-    end
-    else
-    begin
-      //result.acrossNo := ordersDB.UniQuery1.FieldByName('layout_accross').AsString;
-      //result.aroundNo := ordersDB.UniQuery1.FieldByName('layout_around').AsString;
-    end;
    // Mounting & Colors & Proofing
-    if orderType = 'corrugated_plate' then
-    begin
    result.mounting_loose := ordersDB.UniQuery1.FieldByName('mounting_loose').AsString;
-      if ordersDB.UniQuery1.FieldByName('mounting_sticky_bak').AsString = 'T' then
+    result.mounting_sticky_bak := ordersDB.UniQuery1.FieldByName('mounting_sticky_bak').AsString;
-        result.mounting_sticky_bak := true
+    result.mounting_full_mount := ordersDB.UniQuery1.FieldByName('mounting_full_mount').AsString;
-      else
-        result.mounting_sticky_bak := false;
-      if ordersDB.UniQuery1.FieldByName('mounting_full_mount').AsString = 'T' then
-        result.mounting_full_mount := true
-      else
-        result.mounting_full_mount := false;
    result.mounting_strip_mount := ordersDB.UniQuery1.FieldByName('mounting_strip_mount').AsString;
    result.mounting_standard_setup := ordersDB.UniQuery1.FieldByName('mounting_standard_setup').AsString;
    result.mounting_custom_backing := ordersDB.UniQuery1.FieldByName('mounting_custom_backing').AsString;
@@ -1350,37 +1294,13 @@ begin
    result.proofing_e_mail := ordersDB.UniQuery1.FieldByName('proofing_e_mail').AsString;
    result.proofing_e_mail_attn := ordersDB.UniQuery1.FieldByName('proofing_e_mail_attn').AsString;
    result.proofing_ship_to := ordersDB.UniQuery1.FieldByName('proofing_ship_to').AsString;
-      if ordersDB.UniQuery1.FieldByName('proofing_full_size_panel').AsString = 'T' then
+    result.proofing_full_size_panel := ordersDB.UniQuery1.FieldByName('proofing_full_size_panel').AsString;
-        result.proofing_full_size_panel := true
+    result.proofing_print_card := ordersDB.UniQuery1.FieldByName('proofing_print_card').AsString;
-      else
+    result.proofing_wide_format := ordersDB.UniQuery1.FieldByName('proofing_wide_format').AsString;
-        result.proofing_full_size_panel := false;
+    result.proofing_pdf_file := ordersDB.UniQuery1.FieldByName('proofing_pdf_file').AsString;
-      if ordersDB.UniQuery1.FieldByName('proofing_print_card').AsString = 'T'then
-        result.proofing_print_card := true
-      else
-        result.proofing_print_card := false;
-      if ordersDB.UniQuery1.FieldByName('proofing_wide_format').AsString = 'T'then
-        result.proofing_wide_format := true
-      else
-        result.proofing_wide_format := false;
-      if ordersDB.UniQuery1.FieldByName('proofing_pdf_file').AsString = 'T'then
-        result.proofing_pdf_file := true
-      else
-        result.proofing_pdf_file := false;
    result.proofing_other := ordersDB.UniQuery1.FieldByName('proofing_other').AsString;
-      if ordersDB.UniQuery1.FieldByName('proofing_art_approved_as_is').AsString = 'T'then
+    result.proofing_art_approved_as_is := ordersDB.UniQuery1.FieldByName('proofing_art_approved_as_is').AsString;
-        result.proofing_art_approved_as_is := true
-      else
-        result.proofing_art_approved_as_is := false;
    result.proofing_approved_date := ordersDB.UniQuery1.FieldByName('proofing_approved_date').AsString;
-    end
-    else
-    begin
-      {result.colors := ordersDB.UniQuery1.FieldByName('quatity_and_colors_qty_colors').AsString;
-      if ordersDB.UniQuery1.FieldByName('proofing_pdf').AsString = 'T'then
-        result.pdfFile := true
-      else
-        result.pdfFile := false;}
-    end;
    // Plates
    result.plates_thickness := ordersDB.UniQuery1.FieldByName('plates_thickness').AsString;
@@ -1388,30 +1308,9 @@ begin
    result.plates_job_number := ordersDB.UniQuery1.FieldByName('plates_job_number').AsString;
    // General
-    if orderType = 'corrugated_plate' then
+    result.general_special_instructions := ordersDB.UniQuery1.FieldByName('general_special_instructions').AsString;
-      result.general_special_instructions := ordersDB.UniQuery1.FieldByName('general_special_instructions').AsString
-    else
-      //result.specialInstructions := ordersDB.UniQuery1.FieldByName('general_comments').AsString
-    ordersDB.UniQuery1.Close;
-    SQL := 'SELECT s.ship_block FROM customers c JOIN customers_ship s ON c.CUSTOMER_ID = s.customer_id WHERE c.CUSTOMER_ID = ' + IntToStr(result.COMPANY_ID);
-    doQuery(ordersDB.UniQuery1, SQL);
-    result.ADDRESS_LIST := TList<TAddressItem>.Create;
-    TXDataOperationContext.Current.Handler.ManagedObjects.Add( Result.ADDRESS_LIST );
-    while not ordersDB.UniQuery1.Eof do
-    begin
-      ADDRESS := TAddressItem.Create;
-      TXDataOperationContext.Current.Handler.ManagedObjects.Add( ADDRESS );
-      ADDRESS.ADDRESS := ordersDB.UniQuery1.FieldByName('ship_block').AsString;
-      result.ADDRESS_LIST.Add(ADDRESS);
-      ordersDB.UniQuery1.Next;
-    end;
    ordersDB.UniQuery1.Close;
-    result.ITEMS := GetItems('');
  except
    on E: Exception do
    begin
@@ -1944,9 +1843,8 @@ begin
    end;
    ordersDB.UniQuery1.FieldByName('ORDER_ID').AsInteger := ORDER_ID;
-    // Post the record to the database
    ordersDB.UniQuery1.Post;
    if ( JSONData.GetValue<string>('staff_fields_proof_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_proof_date') <> '12/30/1899' ) then
      AddStatusSchedule('PROOF', JSONData, ORDER_ID);
    if ( JSONData.GetValue<string>('staff_fields_ship_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_ship_date') <> '12/30/1899' ) then
@@ -1965,9 +1863,9 @@ begin
    else
      msg := 'Success: Order Successfully Edited';
-    Result := TJSONObject.Create.AddPair('status', msg);
+    Result := JSONData;
-    Result.AddPair('OrderID', ORDER_ID);
+    Result.AddPair('status', msg);
+    Result.AddPair('ORDER_ID', ORDER_ID);
    TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
    except
    on E: Exception do

--- a/kgOrdersServer/Source/qbAPI.pas
+++ b/kgOrdersServer/Source/qbAPI.pas
@@ -475,12 +475,6 @@ begin
  finally
    IniFile.Free;
  end;
-  f := TStringList.Create;
-    // Save to file (overwrites existing file)
-  f.SaveToFile('QB.txt');
-  f.Free;
 end;
 procedure TfQB.Button2Click(Sender: TObject);

--- a/kgOrdersServer/kgOrdersServer.ini
+++ b/kgOrdersServer/kgOrdersServer.ini
@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.7
-LogFileNum=927
+LogFileNum=940
 [Database]
 Server=192.168.159.155
@@ -17,8 +17,8 @@ Password=emsys01
 CompanyID=9341454272655710 
 ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
 ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
-RefreshToken=RT1-44-H0-1762010333a3v07cb5eb0luyn2rppm
+RefreshToken=RT1-75-H0-17621978856h99eylecajhs2sw9gvm
-AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..7T78YBCSmvuJPRsZ9lGwuQ.1VJssLuNBAPKI7RAJOPluhtlA8DYgNcmXebNkWSxrHJ1949vjY4SPt5JjruuLsNOV09i_xKrQ76w9Zhjom1MiQaSyNoZHU-CZLfOtWgr9r3-gLxizdTlrTs9cEZs__8ep4_oe2r3n2u34QlM0xdVdLWxQbKYjpCl0k_58XPbS5Z_Vo2Y5qqoAuGJIRxMaTueMOH1ut-bV4Em318Ca1jN2DFCh_NYjLwFQQenWxOrCRMBaj7ZgB2yjtS5mEUxhuxsB7FAeONYqBSJ0OAy1yzWE-Ycxzt4dcZBCTHxzUCTH0-P0Mb_M6ivfmiYyKctf2gsZD8Xw91MgnF9TPwG8yXdej05fWr94VWeC3tFp0V-RYYv3_XRuim6fCvxJjWzfVEZwv9jUiZ6WByNSzu1k1W5_rQuSG7_Hs8WiDC1sBChJLfDclLO8pMoznqpSrM8ZmiNoYm4aZPQrpO6rgY8NiTokZRyeTw2adtW1YgDJsZdoEw.i2MSpKztX0v6UN0vZz5gQg
+AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..bxX38cX1EtQoXIcJyc1aXQ.PAkiydy6yOM54Qzsyu7V2ztL6yuSg0SWBUuAPHAuMHboDIfDJleOAvINtZtBKNPNwsicE9kn9myqRSuIrMBNIMrONueVYFn5mQk1tSGL21rsQ0PYtYITMtOaE3xwqmjAk_MGDFq7NVbI51MQOvdUe1UwPXEX7GnRUf9W_XrIWksMujZh7n2dmbLyppee5VCC-FNWt3fqhxNQpA3zrQLXXrgK9MNei1A3jgnYhVscNUiIBJm2JBqK1YMbXwQ1MoP_YPJPvw7k8nyPRzY3KO90Egr25M9l-lI3C4oIKvaTs64uLCXxINX_9yI4CDbJWnreA6PrubvWfuJralTCvvWsTnEPGBABu2A1ArrpnaSiGr_XgxQAHE9gHAU2YA4tb20RoAY5CPxpH-DhpoxqkyOvdQJzWXVcxlChXQmN1yzKJALJGRNZfnp4DD2CtLN202YHMY9EOTMw6PkcKCC8PD8T-hg22uT6fLOf8pAGq-svy58.rgWZyjDgeaMfm98j_xsfWw
-LastRefresh=7/23/2025 11:18:54 AM
+LastRefresh=7/25/2025 3:42:20 PM
 --RefreshToken=RT1-10-H0-1760618473k44t73jittvqlr4wynn6