Web Plate Orders is completely finished and I fixed some old errors to match the old program

kgOrdersClient/View.OrderEntryCorrugated.dfm

@@ -354,19 +354,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     DataField = 'staff_fields_job_name'
     DataSource = WebDataSource1
   end
-  object edtQuickBooksItem: TWebDBEdit
-    Left = 26
-    Top = 514
-    Width = 121
-    Height = 22
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtquickbooksitem'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_quickbooks_item'
-    DataSource = WebDataSource1
-  end
   object edtOther: TWebDBEdit
     Left = 316
     Top = 348
@@ -692,32 +679,6 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     DataField = 'plates_job_number'
     DataSource = WebDataSource1
   end
-  object edtPlateMaterial: TWebDBEdit
-    Left = 852
-    Top = 72
-    Width = 121
-    Height = 22
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtplatematerial'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'plates_plate_material'
-    DataSource = WebDataSource1
-  end
-  object edtThickness: TWebDBEdit
-    Left = 852
-    Top = 39
-    Width = 121
-    Height = 22
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtThickness'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'plates_thickness'
-    DataSource = WebDataSource1
-  end
   object cbArtApprovedAsIs: TWebDBCheckBox
     Left = 662
     Top = 480
@@ -988,6 +949,53 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     WidthPercent = 100.000000000000000000
     OnClick = btnCancelClick
   end
+  object WebDBComboBox2: TWebDBComboBox
+    Left = 26
+    Top = 515
+    Width = 145
+    Height = 22
+    ElementID = 'wcbqbitem'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    DataField = 'staff_fields_quickbooks_item'
+    DataSource = WebDataSource1
+    ListField = 'name'
+    ListSource = wdsQBItem
+  end
+  object WebDBComboBox3: TWebDBComboBox
+    Left = 833
+    Top = 77
+    Width = 145
+    Height = 22
+    ElementID = 'wcbmaterial'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      'PhotoPolymer'
+      'Rubber')
+    DataField = 'plates_plate_material'
+    DataSource = WebDataSource1
+  end
+  object WebDBComboBox4: TWebDBComboBox
+    Left = 833
+    Top = 48
+    Width = 145
+    Height = 22
+    ElementID = 'wcbthickness'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      '.250'
+      '.155'
+      '.107'
+      '.067'
+      '.045')
+    DataField = 'plates_thickness'
+    DataSource = WebDataSource1
+  end
   object XDataWebClient1: TXDataWebClient
     Connection = DMConnection.ApiConnection
     Left = 160
@@ -1288,10 +1296,22 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     Top = 436
   end
   object xdwdsShipTo: TXDataWebDataSet
-    Left = 192
-    Top = 486
+    Left = 202
+    Top = 416
     object xdwdsShipToADDRESS: TStringField
       FieldName = 'ADDRESS'
     end
   end
+  object wdsQBItem: TWebDataSource
+    DataSet = xdwdsQBItem
+    Left = 240
+    Top = 518
+  end
+  object xdwdsQBItem: TXDataWebDataSet
+    Left = 200
+    Top = 512
+    object xdwdsQBItemname: TStringField
+      FieldName = 'name'
+    end
+  end
 end

kgOrdersClient/View.OrderEntryCorrugated.html

@@ -68,7 +68,7 @@
                         </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>
-                            <input id="edtquickbooksitem" class="form-control input-sm" width='50%'/>
+                            <select id="wcbqbitem" class='form-select'></select>
                         </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>
@@ -278,15 +278,15 @@
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label class='pe-2' style="font-weight: 700; font-size: 15px;" id="lblthickness">Thickness:</label>
-                            <input id="edtThickness" class="form-control input-sm" style="width: 150px"/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Thickness:</label>
+                            <select id="wcbthickness" class='form-select'></select>
                         </div>
                         <div class="col-auto">
-                            <label class='pe-2' style="font-weight: 700; font-size: 15px;" id="lblplatematerial">Plate Material:</label>
-                            <input id="edtplatematerial" class="form-control input-sm" style="width: 150px"/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Plate Material:</label>
+                            <select id="wcbmaterial" class='form-select'></select>
                         </div>
                         <div class="col-auto">
-                            <label class='pe-2' style="font-weight: 700; font-size: 15px;" id="lbljobnumber">Job Number:</label>
+                            <label class="form-label mt-2" style="font-weight: 700; font-size: 15px;" id="lbljobnumber">Job Number:</label>
                             <input id="edtjobnumber" class="form-control input-sm" style="width: 150px"/>
                         </div>
                     </div>

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -42,7 +42,6 @@ type
     edtInvoiceTo: TWebDBEdit;
     edtPONumber: TWebDBEdit;
     edtJobName: TWebDBEdit;
-    edtQuickBooksItem: TWebDBEdit;
     edtOther: TWebDBEdit;
     edtCADFile: TWebDBEdit;
     edtAroundNo: TWebDBEdit;
@@ -68,8 +67,6 @@ type
     edtMachineIndent: TWebDBEdit;
     edtCylinderSize: TWebDBEdit;
     edtJobNumber: TWebDBEdit;
-    edtPlateMaterial: TWebDBEdit;
-    edtThickness: TWebDBEdit;
     cbArtApprovedAsIs: TWebDBCheckBox;
     cbPDFFile: TWebDBCheckBox;
     cbWideFormat: TWebDBCheckBox;
@@ -191,6 +188,12 @@ type
     XDataWebDataSet1supplied_by_customer_order_date: TStringField;
     btnEdit: TWebButton;
     btnCancel: TWebButton;
+    WebDBComboBox2: TWebDBComboBox;
+    wdsQBItem: TWebDataSource;
+    xdwdsQBItem: TXDataWebDataSet;
+    xdwdsQBItemname: TStringField;
+    WebDBComboBox3: TWebDBComboBox;
+    WebDBComboBox4: TWebDBComboBox;
     procedure WebFormCreate(Sender: TObject);
     procedure HideNotification();
     procedure ShowNotification(Notification: string);
@@ -355,7 +358,7 @@ begin
     XDataWebDataSet1.Next;
   end;
   orderJSON.AddPair('COMPANY_ID', customerID);
-  orderJSON.AddPair('USER_ID', '1011');
+  orderJSON.AddPair('USER_ID', JS.toString(AuthService.TokenPayload.Properties['user_id']));
   orderJSON.AddPair('mode', mode);
   if mode = 'EDIT' then
     orderJSON.AddPair('ORDER_ID', orderID);
@@ -480,6 +483,7 @@ var
   color: TJSObject;
   colorJSON: TJSONObject;
   colorListJSON: TJSONArray;
+  items: TJSObject;
 begin
   xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrder',
         [Order_ID]));
@@ -602,7 +606,17 @@ begin
     cbStripMount.Checked := false;
 
   if mode = 'EDIT' then
+  begin
     CustomerID := XDataWebDataSet1COMPANY_ID.AsString;
+    xdwdsShipTo.Close;
+    xdwdsShipTo.SetJSONData(order['ADDRESS_LIST']);
+    xdwdsShipTo.Open;
+  end;
+
+  xdwdsQBItem.Close;
+  items := TJSObject(order['ITEMS']);
+  xdwdsQBItem.SetJsonData(items['data']);
+  xdwdsQBITEM.Open;
 
 end;
 

kgOrdersClient/View.OrderEntryWeb.dfm

 object FOrderEntryWeb: TFOrderEntryWeb
   Width = 1015
   Height = 628
+  OnShow = WebFormShow
   object WebLabel2: TWebLabel
     Left = 26
     Top = 72
@@ -331,19 +332,6 @@ object FOrderEntryWeb: TFOrderEntryWeb
     DataField = 'staff_fields_job_name'
     DataSource = WebDataSource1
   end
-  object edtQuickBooksItem: TWebDBEdit
-    Left = 26
-    Top = 514
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtquickbooksitem'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_quickbooks_item'
-    DataSource = WebDataSource1
-  end
   object WebDBComboBox1: TWebDBComboBox
     Left = 26
     Top = 430
@@ -368,7 +356,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtbworcolorcopy'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_b_w_or_co'
     DataSource = WebDataSource1
   end
   object edtPlates: TWebDBEdit
@@ -381,7 +369,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtplates'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_plates'
     DataSource = WebDataSource1
   end
   object edtDimensionalLayout: TWebDBEdit
@@ -394,7 +382,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtdimensionallayout'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_dimension'
     DataSource = WebDataSource1
   end
   object edtSample: TWebDBEdit
@@ -407,20 +395,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtsample'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
-  end
-  object edtDisk: TWebDBEdit
-    Left = 276
-    Top = 375
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtdisk'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_sample'
     DataSource = WebDataSource1
   end
   object edtOther: TWebDBEdit
@@ -433,12 +408,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtother'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_other'
     DataSource = WebDataSource1
   end
   object edtEmail: TWebDBEdit
     Left = 276
-    Top = 404
+    Top = 379
     Width = 121
     Height = 23
     AutoSize = True
@@ -446,12 +421,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtemail'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_e_mail'
     DataSource = WebDataSource1
   end
   object edtTotalInchesUsed: TWebDBEdit
     Left = 276
-    Top = 467
+    Top = 442
     Width = 121
     Height = 23
     AutoSize = True
@@ -459,12 +434,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edttotalinchesused'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_total_inc'
     DataSource = WebDataSource1
   end
   object edtFTP: TWebDBEdit
     Left = 276
-    Top = 433
+    Top = 408
     Width = 121
     Height = 23
     AutoSize = True
@@ -472,12 +447,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtftp'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_ftp'
     DataSource = WebDataSource1
   end
   object edtSheetsUsed: TWebDBEdit
     Left = 276
-    Top = 496
+    Top = 471
     Width = 121
     Height = 23
     AutoSize = True
@@ -485,12 +460,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtsheetsused'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_sheets_us'
     DataSource = WebDataSource1
   end
   object edtInitials: TWebDBEdit
     Left = 276
-    Top = 529
+    Top = 504
     Width = 121
     Height = 23
     AutoSize = True
@@ -498,7 +473,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtinitials'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'supplied_by_customer_initials'
     DataSource = WebDataSource1
   end
   object cbPDF: TWebDBCheckBox
@@ -511,7 +486,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'cbpdf'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'proofing_full_size_panel'
+    DataField = 'proofing_pdf'
     DataSource = WebDataSource1
   end
   object edtPDFTo: TWebDBEdit
@@ -524,7 +499,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtpdfto'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_pdf_to'
     DataSource = WebDataSource1
   end
   object dtpPDFDate1: TWebDateTimePicker
@@ -576,7 +551,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'cbfullsizeinkjet'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'proofing_full_size_panel'
+    DataField = 'proofing_full_size_ink_jet_for'
     DataSource = WebDataSource1
   end
   object edtInkJetTo2: TWebDBEdit
@@ -589,7 +564,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtinkjetto2'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_ink_jet_to_2'
     DataSource = WebDataSource1
   end
   object edtInkJetTo1: TWebDBEdit
@@ -602,7 +577,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtinkjetto'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_ink_jet_to'
     DataSource = WebDataSource1
   end
   object dtpInkJetDate1: TWebDateTimePicker
@@ -654,23 +629,10 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcolorcontrastto'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
-  end
-  object edtColorContrast: TWebDBEdit
-    Left = 444
-    Top = 406
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtcolorcontrast'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_color_contrac_to'
     DataSource = WebDataSource1
   end
-  object dtpColorContrastDate1: TWebDateTimePicker
+  object dtpColorContractDate1: TWebDateTimePicker
     Left = 444
     Top = 464
     Width = 170
@@ -683,7 +645,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Role = ''
     Text = ''
   end
-  object dtpColorContrastDate2: TWebDateTimePicker
+  object dtpColorContractDate2: TWebDateTimePicker
     Left = 444
     Top = 488
     Width = 170
@@ -706,7 +668,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtdigitalcolorto'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_digital_color_to'
     DataSource = WebDataSource1
   end
   object edtDigitalColorKey: TWebDBEdit
@@ -719,7 +681,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtdigitalcolorkey'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'proofing_digital_color_key'
     DataSource = WebDataSource1
   end
   object dtpDigitalColorDate: TWebDateTimePicker
@@ -745,7 +707,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtanilaxinfo'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'quantity_and_colors_anilox_info'
     DataSource = WebDataSource1
   end
   object edtPressName: TWebDBEdit
@@ -758,7 +720,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtpressname'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'quantity_and_colors_press_name'
     DataSource = WebDataSource1
   end
   object WebButton1: TWebButton
@@ -771,6 +733,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'btnaddcolor'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnClick = WebButton1Click
   end
   object edtMicroDots: TWebDBEdit
     Left = 634
@@ -782,7 +745,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtmicrodots'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_microdots'
     DataSource = WebDataSource1
   end
   object edtMicrodotsComments: TWebDBEdit
@@ -795,7 +758,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtmicrodotscomments'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_microdots_comments'
     DataSource = WebDataSource1
   end
   object edtCrosshairsComments: TWebDBEdit
@@ -808,7 +771,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcrosshairscomments'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_crosshairs_comments'
     DataSource = WebDataSource1
   end
   object edtCrosshairs: TWebDBEdit
@@ -821,7 +784,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcrosshairs'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_crosshairs'
     DataSource = WebDataSource1
   end
   object edtColorBarsComments: TWebDBEdit
@@ -834,7 +797,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcolorbarscomments'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_color_bars_comments'
     DataSource = WebDataSource1
   end
   object edtColorBars: TWebDBEdit
@@ -847,7 +810,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcolorbars'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_color_bars'
     DataSource = WebDataSource1
   end
   object edtPlateOther: TWebDBEdit
@@ -860,7 +823,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtplateother'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_other'
     DataSource = WebDataSource1
   end
   object edtPlateOtherComments: TWebDBEdit
@@ -873,20 +836,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtplateothercomments'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
-  end
-  object edtPrintOrientation: TWebDBEdit
-    Left = 634
-    Top = 408
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtprintorientation'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plate_marks_other_comments'
     DataSource = WebDataSource1
   end
   object edtAround: TWebDBEdit
@@ -899,7 +849,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtaround'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_around'
     DataSource = WebDataSource1
   end
   object edtAccross: TWebDBEdit
@@ -912,7 +862,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtaccross'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_accross'
     DataSource = WebDataSource1
   end
   object edtReversePrint: TWebDBEdit
@@ -925,7 +875,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtreverseprint'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_reverse_print'
     DataSource = WebDataSource1
   end
   object edtSurfacePrint: TWebDBEdit
@@ -938,7 +888,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtsurfaceprint'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_surface_print'
     DataSource = WebDataSource1
   end
   object edtCutoffDimension: TWebDBEdit
@@ -951,7 +901,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcutoffdimension'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_cutoff_dimension'
     DataSource = WebDataSource1
   end
   object edtCylinderRepeat: TWebDBEdit
@@ -964,7 +914,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcylinderrepeat'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_cylinder_repeat'
     DataSource = WebDataSource1
   end
   object edtPitch: TWebDBEdit
@@ -977,7 +927,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtpitch'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_pitch'
     DataSource = WebDataSource1
   end
   object edtBleed: TWebDBEdit
@@ -990,7 +940,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtbleed'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_bleed'
     DataSource = WebDataSource1
   end
   object edtTeeth: TWebDBEdit
@@ -1003,7 +953,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtteeth'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_teeth'
     DataSource = WebDataSource1
   end
   object edtCutback: TWebDBEdit
@@ -1016,7 +966,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcutback'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_cutback'
     DataSource = WebDataSource1
   end
   object edtMinimumTrapDim: TWebDBEdit
@@ -1029,7 +979,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtminimumtrapdimension'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_minimum_trap_dim'
     DataSource = WebDataSource1
   end
   object edtMaximumTrapDim: TWebDBEdit
@@ -1042,7 +992,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtmaximumtrapdimension'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'layout_maximum_trap_dim'
     DataSource = WebDataSource1
   end
   object edtSize: TWebDBEdit
@@ -1055,7 +1005,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtsize'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'upc_size'
     DataSource = WebDataSource1
   end
   object edtBarWidthReduction: TWebDBEdit
@@ -1068,7 +1018,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtbarwidthreduction'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'upc_bar_width_reduction'
     DataSource = WebDataSource1
   end
   object edtDistortionAmount: TWebDBEdit
@@ -1081,7 +1031,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtdistortionamount'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'upc_distortion_amount'
     DataSource = WebDataSource1
   end
   object edtDistortionPercent: TWebDBEdit
@@ -1094,33 +1044,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtdistortionpercent'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
-  end
-  object edtPlateMaterial: TWebDBEdit
-    Left = 634
-    Top = 458
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtplatematerial'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
-  end
-  object edtThickness: TWebDBEdit
-    Left = 634
-    Top = 487
-    Width = 121
-    Height = 23
-    AutoSize = True
-    ChildOrder = 79
-    ElementID = 'edtthickness'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'upc_distortion_percent'
     DataSource = WebDataSource1
   end
   object edtJobNumber: TWebDBEdit
@@ -1133,7 +1057,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtjobnumber'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'plates_job_number'
     DataSource = WebDataSource1
   end
   object Comments: TWebDBEdit
@@ -1146,7 +1070,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'edtcomments'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataField = 'staff_fields_ship_via'
+    DataField = 'general_comments'
     DataSource = WebDataSource1
   end
   object btnConfirm: TWebButton
@@ -1159,6 +1083,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ElementID = 'btnconfirm'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnClick = btnConfirmClick
   end
   object btnEdit: TWebButton
     Left = 867
@@ -1182,6 +1107,83 @@ object FOrderEntryWeb: TFOrderEntryWeb
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
+  object wcbQBItem: TWebDBComboBox
+    Left = 26
+    Top = 515
+    Width = 145
+    Height = 23
+    ElementID = 'wcbqbitem'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    DataField = 'staff_fields_quickbooks_item'
+    DataSource = WebDataSource1
+    ListField = 'name'
+    ListSource = wdsQBItem
+  end
+  object WebDBComboBox2: TWebDBComboBox
+    Left = 631
+    Top = 487
+    Width = 145
+    Height = 23
+    ElementID = 'wcbmaterial'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      'PhotoPolymer'
+      'Rubber')
+    DataField = 'plates_plate_material'
+    DataSource = WebDataSource1
+  end
+  object WebDBComboBox3: TWebDBComboBox
+    Left = 631
+    Top = 458
+    Width = 145
+    Height = 23
+    ElementID = 'wcbthickness'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      '.250'
+      '.155'
+      '.107'
+      '.067'
+      '.045')
+    DataField = 'plates_thickness'
+    DataSource = WebDataSource1
+  end
+  object wcbPrint: TWebDBComboBox
+    Left = 621
+    Top = 408
+    Width = 145
+    Height = 23
+    ElementID = 'wcbprint'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      'Portrait'
+      'Landscape')
+    DataField = 'print_orientation_print_orient'
+    DataSource = WebDataSource1
+  end
+  object WebDBComboBox4: TWebDBComboBox
+    Left = 444
+    Top = 402
+    Width = 145
+    Height = 23
+    ElementID = 'wcbcolorcontract'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    Items.Strings = (
+      'Cromapro Ink Jet'
+      'Kodak Approval')
+    DataField = 'print_orientation_print_orient'
+    DataSource = WebDataSource1
+  end
   object XDataWebClient1: TXDataWebClient
     Connection = DMConnection.ApiConnection
     Left = 160
@@ -1189,6 +1191,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
   end
   object tmrScrollTop: TWebTimer
     Interval = 100
+    OnTimer = tmrScrollTopTimer
     Left = 240
     Top = 8
   end
@@ -1208,18 +1211,6 @@ object FOrderEntryWeb: TFOrderEntryWeb
     object XDataWebDataSet1ORDER_DATE: TDateField
       FieldName = 'ORDER_DATE'
     end
-    object XDataWebDataSet1START_DATE: TDateField
-      FieldName = 'START_DATE'
-    end
-    object XDataWebDataSet1END_DATE: TDateField
-      FieldName = 'END_DATE'
-    end
-    object XDataWebDataSet1ORDER_STATUS: TStringField
-      FieldName = 'ORDER_STATUS'
-    end
-    object XDataWebDataSet1SCHED_JSON: TStringField
-      FieldName = 'SCHED_JSON'
-    end
     object XDataWebDataSet1NAME: TStringField
       FieldName = 'NAME'
     end
@@ -1250,224 +1241,217 @@ object FOrderEntryWeb: TFOrderEntryWeb
     object XDataWebDataSet1staff_fields_job_name: TStringField
       FieldName = 'staff_fields_job_name'
     end
-    object XDataWebDataSet1plates_job_number: TStringField
-      FieldName = 'plates_job_number'
-    end
-    object XDataWebDataSet1supplied_by_customer_b_w_copy: TBooleanField
-      FieldName = 'supplied_by_customer_b_w_copy'
-    end
-    object XDataWebDataSet1supplied_by_customer_dimension: TStringField
-      FieldName = 'supplied_by_customer_dimension'
-    end
-    object XDataWebDataSet1supplied_by_customer_e_mail: TStringField
-      FieldName = 'supplied_by_customer_e_mail'
+    object XDataWebDataSet1staff_fields_quickbooks_item: TStringField
+      FieldName = 'staff_fields_quickbooks_item'
     end
-    object XDataWebDataSet1supplied_by_customer_ftp: TStringField
-      FieldName = 'supplied_by_customer_ftp'
+    object XDataWebDataSet1staff_fields_quantity: TStringField
+      FieldName = 'staff_fields_quantity'
     end
-    object XDataWebDataSet1supplied_by_customer_other: TStringField
-      FieldName = 'supplied_by_customer_other'
+    object XDataWebDataSet1staff_fields_art_location: TStringField
+      FieldName = 'staff_fields_art_location'
     end
-    object XDataWebDataSet1supplied_by_customer_existing_: TStringField
-      FieldName = 'supplied_by_customer_existing_'
+    object XDataWebDataSet1staff_fields_order_date: TStringField
+      FieldName = 'staff_fields_order_date'
     end
-    object XDataWebDataSet1supplied_by_customer_ref_art_p: TStringField
-      FieldName = 'supplied_by_customer_ref_art_p'
+    object XDataWebDataSet1staff_fields_proof_date: TStringField
+      FieldName = 'staff_fields_proof_date'
     end
-    object XDataWebDataSet1supplied_by_customer_ref_art_a: TStringField
-      FieldName = 'supplied_by_customer_ref_art_a'
+    object XDataWebDataSet1staff_fields_ship_date: TStringField
+      FieldName = 'staff_fields_ship_date'
     end
-    object XDataWebDataSet1cut_die_cutdier: TStringField
-      FieldName = 'cut_die_cutdier'
+    object XDataWebDataSet1staff_fields_art_due: TStringField
+      FieldName = 'staff_fields_art_due'
     end
-    object XDataWebDataSet1cut_die_cutdieb: TStringField
-      FieldName = 'cut_die_cutdieb'
+    object XDataWebDataSet1staff_fields_plate_due: TStringField
+      FieldName = 'staff_fields_plate_due'
     end
-    object XDataWebDataSet1cut_die_cutdief: TStringField
-      FieldName = 'cut_die_cutdief'
+    object XDataWebDataSet1ADDRESS_LIST: TStringField
+      FieldName = 'ADDRESS_LIST'
     end
-    object XDataWebDataSet1cut_die_cutdierkr: TStringField
-      FieldName = 'cut_die_cutdierkr'
+    object XDataWebDataSet1plates_job_number: TStringField
+      FieldName = 'plates_job_number'
     end
-    object XDataWebDataSet1cut_die_cutdiefkr: TStringField
-      FieldName = 'cut_die_cutdiefkr'
+    object XDataWebDataSet1supplied_by_customer_plates: TStringField
+      FieldName = 'supplied_by_customer_plates'
     end
-    object XDataWebDataSet1cut_die_cad_file: TStringField
-      FieldName = 'cut_die_cad_file'
+    object XDataWebDataSet1supplied_by_customer_sample: TStringField
+      FieldName = 'supplied_by_customer_sample'
     end
-    object XDataWebDataSet1cut_die_attached: TStringField
-      FieldName = 'cut_die_attached'
+    object XDataWebDataSet1supplied_by_customer_dimension: TStringField
+      FieldName = 'supplied_by_customer_dimension'
     end
-    object XDataWebDataSet1cut_die_boxpol250: TStringField
-      FieldName = 'cut_die_boxpol250'
+    object XDataWebDataSet1supplied_by_customer_other: TStringField
+      FieldName = 'supplied_by_customer_other'
     end
-    object XDataWebDataSet1cut_die_boxpol155: TStringField
-      FieldName = 'cut_die_boxpol155'
+    object XDataWebDataSet1supplied_by_customer_disk: TStringField
+      FieldName = 'supplied_by_customer_disk'
     end
-    object XDataWebDataSet1cut_die_boxpol125: TStringField
-      FieldName = 'cut_die_boxpol125'
+    object XDataWebDataSet1supplied_by_customer_e_mail: TStringField
+      FieldName = 'supplied_by_customer_e_mail'
     end
-    object XDataWebDataSet1cut_die_brub: TStringField
-      FieldName = 'cut_die_brub'
+    object XDataWebDataSet1supplied_by_customer_ftp: TStringField
+      FieldName = 'supplied_by_customer_ftp'
     end
-    object XDataWebDataSet1proofing_fax: TStringField
-      FieldName = 'proofing_fax'
+    object XDataWebDataSet1plates_plate_material: TStringField
+      FieldName = 'plates_plate_material'
     end
-    object XDataWebDataSet1proofing_fax_attn: TStringField
-      FieldName = 'proofing_fax_attn'
+    object XDataWebDataSet1plates_thickness: TStringField
+      FieldName = 'plates_thickness'
     end
-    object XDataWebDataSet1proofing_e_mail: TStringField
-      FieldName = 'proofing_e_mail'
+    object XDataWebDataSet1supplied_by_customer_total_inc: TStringField
+      FieldName = 'supplied_by_customer_total_inc'
     end
-    object XDataWebDataSet1proofing_ship_to: TStringField
-      FieldName = 'proofing_ship_to'
+    object XDataWebDataSet1supplied_by_customer_sheets_us: TStringField
+      FieldName = 'supplied_by_customer_sheets_us'
     end
-    object XDataWebDataSet1proofing_other: TStringField
-      FieldName = 'proofing_other'
+    object XDataWebDataSet1supplied_by_customer_initials: TStringField
+      FieldName = 'supplied_by_customer_initials'
     end
-    object XDataWebDataSet1proofing_changes_required: TStringField
-      FieldName = 'proofing_changes_required'
+    object XDataWebDataSet1proofing_pdf_to: TStringField
+      FieldName = 'proofing_pdf_to'
     end
-    object XDataWebDataSet1proofing_changes_date: TDateField
-      FieldName = 'proofing_changes_date'
+    object XDataWebDataSet1proofing_pdf_date_1: TStringField
+      FieldName = 'proofing_pdf_date_1'
     end
-    object XDataWebDataSet1layout_rsc_l: TStringField
-      FieldName = 'layout_rsc_l'
+    object XDataWebDataSet1proofing_pdf_date_2: TStringField
+      FieldName = 'proofing_pdf_date_2'
     end
-    object XDataWebDataSet1layout_rcs_w: TStringField
-      FieldName = 'layout_rcs_w'
+    object XDataWebDataSet1proofing_pdf_date_3: TStringField
+      FieldName = 'proofing_pdf_date_3'
     end
-    object XDataWebDataSet1layout_rcs_d: TStringField
-      FieldName = 'layout_rcs_d'
+    object XDataWebDataSet1proofing_ink_jet_to: TStringField
+      FieldName = 'proofing_ink_jet_to'
     end
-    object XDataWebDataSet1layout_die_cut_no: TStringField
-      FieldName = 'layout_die_cut_no'
+    object XDataWebDataSet1proofing_ink_jet_to_2: TStringField
+      FieldName = 'proofing_ink_jet_to_2'
     end
-    object XDataWebDataSet1layout_accross_no: TStringField
-      FieldName = 'layout_accross_no'
+    object XDataWebDataSet1proofing_ink_jet_date_1: TStringField
+      FieldName = 'proofing_ink_jet_date_1'
+      Size = 0
     end
-    object XDataWebDataSet1layout_around_no: TStringField
-      FieldName = 'layout_around_no'
+    object XDataWebDataSet1proofing_ink_jet_date_2: TStringField
+      FieldName = 'proofing_ink_jet_date_2'
     end
-    object XDataWebDataSet1layout_cad_file: TStringField
-      FieldName = 'layout_cad_file'
+    object XDataWebDataSet1proofing_ink_jet_date_3: TStringField
+      FieldName = 'proofing_ink_jet_date_3'
     end
-    object XDataWebDataSet1mounting_standard_setup: TStringField
-      FieldName = 'mounting_standard_setup'
+    object XDataWebDataSet1proofing_color_contract: TStringField
+      FieldName = 'proofing_color_contract'
     end
-    object XDataWebDataSet1mounting_custom_backing: TStringField
-      FieldName = 'mounting_custom_backing'
+    object XDataWebDataSet1proofing_color_contrac_to: TStringField
+      FieldName = 'proofing_color_contrac_to'
     end
-    object XDataWebDataSet1mounting_custom_adhesive: TStringField
-      FieldName = 'mounting_custom_adhesive'
+    object XDataWebDataSet1proofing_color_contrac_date_1: TStringField
+      FieldName = 'proofing_color_contrac_date_1'
     end
-    object XDataWebDataSet1colors_cylinder_size: TStringField
-      FieldName = 'colors_cylinder_size'
+    object XDataWebDataSet1proofing_color_contrac_date_2: TStringField
+      FieldName = 'proofing_color_contrac_date_2'
     end
-    object XDataWebDataSet1colors_cross_hairs: TStringField
-      FieldName = 'colors_cross_hairs'
+    object XDataWebDataSet1proofing_digital_color_key: TStringField
+      FieldName = 'proofing_digital_color_key'
     end
-    object XDataWebDataSet1colors_machine_ident: TStringField
-      FieldName = 'colors_machine_ident'
+    object XDataWebDataSet1proofing_digital_color_to: TStringField
+      FieldName = 'proofing_digital_color_to'
     end
-    object XDataWebDataSet1colors_clemson: TStringField
-      FieldName = 'colors_clemson'
+    object XDataWebDataSet1proofing_digital_color_date_1: TStringField
+      FieldName = 'proofing_digital_color_date_1'
+      Size = 0
     end
-    object XDataWebDataSet1plates_thickness: TStringField
-      FieldName = 'plates_thickness'
+    object XDataWebDataSet1quantity_and_colors_press_name: TStringField
+      FieldName = 'quantity_and_colors_press_name'
     end
-    object XDataWebDataSet1plates_plate_material: TStringField
-      FieldName = 'plates_plate_material'
+    object XDataWebDataSet1quantity_and_colors_anilox_info: TStringField
+      FieldName = 'quantity_and_colors_anilox_info'
     end
-    object XDataWebDataSet1general_special_instructions: TStringField
-      FieldName = 'general_special_instructions'
+    object XDataWebDataSet1plate_marks_microdots_comments: TStringField
+      FieldName = 'plate_marks_microdots_comments'
     end
-    object XDataWebDataSet1colors_colors: TStringField
-      FieldName = 'colors_colors'
+    object XDataWebDataSet1plate_marks_microdots: TStringField
+      FieldName = 'plate_marks_microdots'
     end
-    object XDataWebDataSet1staff_fields_quickbooks_item: TStringField
-      FieldName = 'staff_fields_quickbooks_item'
+    object XDataWebDataSet1plate_marks_crosshairs: TStringField
+      FieldName = 'plate_marks_crosshairs'
     end
-    object XDataWebDataSet1staff_fields_quantity: TStringField
-      FieldName = 'staff_fields_quantity'
+    object XDataWebDataSet1plate_marks_crosshairs_comments: TStringField
+      FieldName = 'plate_marks_crosshairs_comments'
     end
-    object XDataWebDataSet1layout_rsc_style: TStringField
-      FieldName = 'layout_rsc_style'
+    object XDataWebDataSet1plate_marks_color_bars: TStringField
+      FieldName = 'plate_marks_color_bars'
     end
-    object XDataWebDataSet1staff_fields_art_location: TStringField
-      FieldName = 'staff_fields_art_location'
+    object XDataWebDataSet1plate_marks_color_bars_comments: TStringField
+      FieldName = 'plate_marks_color_bars_comments'
     end
-    object XDataWebDataSet1supplied_by_customer_color_copy: TBooleanField
-      FieldName = 'supplied_by_customer_color_copy'
+    object XDataWebDataSet1plate_marks_other: TStringField
+      FieldName = 'plate_marks_other'
     end
-    object XDataWebDataSet1supplied_by_customer_plates: TBooleanField
-      FieldName = 'supplied_by_customer_plates'
+    object XDataWebDataSet1plate_marks_other_comments: TStringField
+      FieldName = 'plate_marks_other_comments'
     end
-    object XDataWebDataSet1supplied_by_customer_sample_ca: TBooleanField
-      FieldName = 'supplied_by_customer_sample_ca'
+    object XDataWebDataSet1print_orientation_print_orient: TStringField
+      FieldName = 'print_orientation_print_orient'
     end
-    object XDataWebDataSet1supplied_by_customer_disk_or_cd: TBooleanField
-      FieldName = 'supplied_by_customer_disk_or_cd'
+    object XDataWebDataSet1layout_around: TStringField
+      FieldName = 'layout_around'
     end
-    object XDataWebDataSet1mounting_loose: TStringField
-      FieldName = 'mounting_loose'
+    object XDataWebDataSet1layout_accross: TStringField
+      FieldName = 'layout_accross'
     end
-    object XDataWebDataSet1mounting_sticky_bak: TBooleanField
-      FieldName = 'mounting_sticky_bak'
+    object XDataWebDataSet1layout_surface_print: TStringField
+      FieldName = 'layout_surface_print'
     end
-    object XDataWebDataSet1mounting_full_mount: TBooleanField
-      FieldName = 'mounting_full_mount'
+    object XDataWebDataSet1layout_reverse_print: TStringField
+      FieldName = 'layout_reverse_print'
     end
-    object XDataWebDataSet1mounting_strip_mount: TStringField
-      FieldName = 'mounting_strip_mount'
+    object XDataWebDataSet1layout_cylinder_repeat: TStringField
+      FieldName = 'layout_cylinder_repeat'
     end
-    object XDataWebDataSet1layout_excalibur_die: TBooleanField
-      FieldName = 'layout_excalibur_die'
+    object XDataWebDataSet1layout_cutoff_dimension: TStringField
+      FieldName = 'layout_cutoff_dimension'
     end
-    object XDataWebDataSet1proofing_full_size_panel: TBooleanField
-      FieldName = 'proofing_full_size_panel'
+    object XDataWebDataSet1layout_pitch: TStringField
+      FieldName = 'layout_pitch'
     end
-    object XDataWebDataSet1proofing_print_card: TBooleanField
-      FieldName = 'proofing_print_card'
+    object XDataWebDataSet1layout_teeth: TStringField
+      FieldName = 'layout_teeth'
     end
-    object XDataWebDataSet1proofing_wide_format: TBooleanField
-      FieldName = 'proofing_wide_format'
+    object XDataWebDataSet1layout_bleed: TStringField
+      FieldName = 'layout_bleed'
     end
-    object XDataWebDataSet1proofing_pdf_file: TBooleanField
-      FieldName = 'proofing_pdf_file'
+    object XDataWebDataSet1layout_minimum_trap_dim: TStringField
+      FieldName = 'layout_minimum_trap_dim'
     end
-    object XDataWebDataSet1proofing_art_approved_as_is: TBooleanField
-      FieldName = 'proofing_art_approved_as_is'
+    object XDataWebDataSet1layout_maximum_trap_dim: TStringField
+      FieldName = 'layout_maximum_trap_dim'
     end
-    object XDataWebDataSet1proofing_e_mail_attn: TStringField
-      FieldName = 'proofing_e_mail_attn'
+    object XDataWebDataSet1upc_size: TStringField
+      FieldName = 'upc_size'
     end
-    object XDataWebDataSet1proofing_approved_date: TStringField
-      FieldName = 'proofing_approved_date'
+    object XDataWebDataSet1upc_bar_width_reduction: TStringField
+      FieldName = 'upc_bar_width_reduction'
     end
-    object XDataWebDataSet1staff_fields_order_date: TStringField
-      FieldName = 'staff_fields_order_date'
+    object XDataWebDataSet1general_comments: TStringField
+      FieldName = 'general_comments'
     end
-    object XDataWebDataSet1staff_fields_proof_date: TStringField
-      FieldName = 'staff_fields_proof_date'
+    object XDataWebDataSet1upc_distortion_percent: TStringField
+      FieldName = 'upc_distortion_percent'
     end
-    object XDataWebDataSet1staff_fields_ship_date: TStringField
-      FieldName = 'staff_fields_ship_date'
+    object XDataWebDataSet1upc_distortion_amount: TStringField
+      FieldName = 'upc_distortion_amount'
     end
-    object XDataWebDataSet1staff_fields_art_due: TStringField
-      FieldName = 'staff_fields_art_due'
+    object XDataWebDataSet1layout_cutback: TStringField
+      FieldName = 'layout_cutback'
     end
-    object XDataWebDataSet1staff_fields_plate_due: TStringField
-      FieldName = 'staff_fields_plate_due'
+    object XDataWebDataSet1proofing_full_size_ink_jet_for: TBooleanField
+      FieldName = 'proofing_full_size_ink_jet_for'
     end
-    object XDataWebDataSet1staff_fields_mount_due: TStringField
-      FieldName = 'staff_fields_mount_due'
+    object XDataWebDataSet1proofing_pdf: TBooleanField
+      FieldName = 'proofing_pdf'
     end
-    object XDataWebDataSet1ADDRESS_LIST: TStringField
-      FieldName = 'ADDRESS_LIST'
+    object XDataWebDataSet1quantity_and_colors_qty_colors: TStringField
+      FieldName = 'quantity_and_colors_qty_colors'
     end
-    object XDataWebDataSet1supplied_by_customer_order_date: TStringField
-      FieldName = 'supplied_by_customer_order_date'
+    object XDataWebDataSet1supplied_by_customer_b_w_or_co: TStringField
+      FieldName = 'supplied_by_customer_b_w_or_co'
     end
   end
   object WebDataSource1: TWebDataSource
@@ -1481,10 +1465,22 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Top = 436
   end
   object xdwdsShipTo: TXDataWebDataSet
-    Left = 192
-    Top = 486
+    Left = 208
+    Top = 398
     object xdwdsShipToADDRESS: TStringField
       FieldName = 'ADDRESS'
     end
   end
+  object wdsQBItem: TWebDataSource
+    DataSet = xdwdsQBItem
+    Left = 240
+    Top = 518
+  end
+  object xdwdsQBItem: TXDataWebDataSet
+    Left = 200
+    Top = 512
+    object xdwdsQBItemname: TStringField
+      FieldName = 'name'
+    end
+  end
 end

kgOrdersClient/View.OrderEntryWeb.html

@@ -68,7 +68,7 @@
                         </div>
                         <div class="col-auto">
                             <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QuickBooks Item:</label>
-                            <input id="edtquickbooksitem" class="form-control input-sm" width='50%'/>
+                            <select id="wcbqbitem" class='form-select'></select>
                         </div>
                         <div class="col-auto">
                             <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Art Due:</label>
@@ -103,10 +103,6 @@
                             <input id="edtother" class="form-control input-sm" width='50%'/>
                         </div>
                         <div class="col-auto">
-                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Disk:</label>
-                            <input id="edtdisk" class="form-control input-sm" width='50%'/>
-                        </div>
-                        <div class="col-auto">
                             <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Email:</label>
                             <input id="edtemail" class="form-control input-sm" width='50%'/>
                         </div>
@@ -131,7 +127,7 @@
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">PDF:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">PDF:</label>
                             <input type="checkbox" id="cbpdf">
                         </div>
                         <div class="col-auto">
@@ -151,7 +147,7 @@
                             <input class="form-control input-sm" id="dtppdfdate3" type="date">
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Full Size Ink Jet For Layout Content Only:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Full Size Ink Jet For Layout Content Only:</label>
                             <input type="checkbox" id="cbfullsizeinkjet">
                         </div>
                         <div class="col-auto">
@@ -175,11 +171,11 @@
                             <input class="form-control input-sm" id="dtpinkjetdate3" type="date">
                         </div>
                         <div class="col-auto">
-                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Contrast:</label>
-                            <input id="edtcolorcontrast" class="form-control input-sm" width='50%'/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Contract:</label>
+                            <select id="wcbcolorcontract" class='form-select'></select>
                         </div>
                         <div class="col-auto">
-                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Contrast To:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Contract To:</label>
                             <input id="edtcolorcontrastto" class="form-control input-sm" width='50%'/>
                         </div>
                         <div class="col-auto">
@@ -224,87 +220,87 @@
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Microdots:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Microdots:</label>
                             <input id="edtmicrodots" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Microdots Comments:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Microdots Comments:</label>
                             <input id="edtmicrodotscomments" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Crosshairs:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Crosshairs:</label>
                             <input id="edtcrosshairs" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Crosshairs Comments:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Crosshairs Comments:</label>
                             <input id="edtcrosshairscomments" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Color Bars:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Bars:</label>
                             <input id="edtcolorbars" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Color Bars Comments:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Color Bars Comments:</label>
                             <input id="edtcolorbarscomments" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Other:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Other:</label>
                             <input id="edtplateother" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Microdots Comments:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Microdots Comments:</label>
                             <input id="edtplateothercomments" class="form-control input-sm" style="width: 150px"/>
                         </div>
                     </div>
-                    <h4 class="custom-h4 mt-3">Plate Marks</h4>
+                    <h4 class="custom-h4 mt-3">Layout</h4>
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Around:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Around:</label>
                             <input id="edtaround" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Accross:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Accross:</label>
                             <input id="edtaccross" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Surface Print:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Surface Print:</label>
                             <input id="edtsurfaceprint" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Reverse Print:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Reverse Print:</label>
                             <input id="edtreverseprint" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Cylinder Repeat:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Cylinder Repeat:</label>
                             <input id="edtcylinderrepeat" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Cutoff Dimension:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Cutoff Dimension:</label>
                             <input id="edtcutoffdimension" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Pitch:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Pitch:</label>
                             <input id="edtpitch" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Teeth:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Teeth:</label>
                             <input id="edtteeth" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Bleed:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Bleed:</label>
                             <input id="edtbleed" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Cutback:</label>
+                            <label label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Cutback:</label>
                             <input id="edtcutback" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Minimum Trap Dimension:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Minimum Trap Dimension:</label>
                             <input id="edtminimumtrapdimension" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Maximum Trap Dimension:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Maximum Trap Dimension:</label>
                             <input id="edtmaximumtrapdimension" class="form-control input-sm" style="width: 150px"/>
                         </div>
                     </div>
@@ -312,42 +308,42 @@
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Print Orientation:</label>
-                            <input id="edtprintorientation" class="form-control input-sm" style="width: 150px"/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Print Orientation:</label>
+                            <select id="wcbprint" class='form-select'></select>
                         </div>
                     </div>
                     <h4 class="custom-h4 mt-3">UPC</h4>
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Size:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Size:</label>
                             <input id="edtsize" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Bar Width Reduction:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Bar Width Reduction:</label>
                             <input id="edtbarwidthreduction" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Distortion Percent:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Distortion Percent:</label>
                             <input id="edtdistortionpercent" class="form-control input-sm" style="width: 150px"/>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Distortion Amount:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Distortion Amount:</label>
                             <input id="edtdistortionamount" class="form-control input-sm" style="width: 150px"/>
                         </div>
                     <h4 class="custom-h4 mt-3">Plates</h4>
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Plate Material:</label>
-                            <input id="edtplatematerial" class="form-control input-sm" style="width: 150px"/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Thickness:</label>
+                            <select id="wcbthickness" class='form-select'></select>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Thickness:</label>
-                            <input id="edtthickness" class="form-control input-sm" style="width: 150px"/>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Plate Material:</label>
+                            <select id="wcbmaterial" class='form-select'></select>
                         </div>
                         <div class="col-auto">
-                            <label for="wdbe_first_name" class="form-label mt-2">Job Number:</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Number:</label>
                             <input id="edtjobnumber" class="form-control input-sm" style="width: 150px"/>
                         </div>
                     </div>
@@ -355,7 +351,7 @@
                     <hr class="custom-hr">
                     <div class="row">
                         <div class="col-auto">
-                            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Comments</label>
+                            <label style="font-weight: 700; font-size: 15px;" class="form-label">Comments</label>
                             <textarea id="edtcomments" class="form-control" style=" width: 500px; height: 150px;"></textarea>
                         </div>
                     </div>

kgOrdersClient/View.OrderEntryWeb.pas

@@ -25,10 +25,6 @@ type
     XDataWebDataSet1COMPANY_ID: TIntegerField;
     XDataWebDataSet1USER_ID: TIntegerField;
     XDataWebDataSet1ORDER_DATE: TDateField;
-    XDataWebDataSet1START_DATE: TDateField;
-    XDataWebDataSet1END_DATE: TDateField;
-    XDataWebDataSet1ORDER_STATUS: TStringField;
-    XDataWebDataSet1SCHED_JSON: TStringField;
     XDataWebDataSet1NAME: TStringField;
     XDataWebDataSet1SHORT_NAME: TStringField;
     XDataWebDataSet1staff_fields_ship_via: TStringField;
@@ -39,79 +35,15 @@ type
     XDataWebDataSet1staff_fields_ship_attention: TStringField;
     XDataWebDataSet1staff_fields_po_number: TStringField;
     XDataWebDataSet1staff_fields_job_name: TStringField;
-    XDataWebDataSet1plates_job_number: TStringField;
-    XDataWebDataSet1supplied_by_customer_b_w_copy: TBooleanField;
-    XDataWebDataSet1supplied_by_customer_dimension: TStringField;
-    XDataWebDataSet1supplied_by_customer_e_mail: TStringField;
-    XDataWebDataSet1supplied_by_customer_ftp: TStringField;
-    XDataWebDataSet1supplied_by_customer_other: TStringField;
-    XDataWebDataSet1supplied_by_customer_existing_: TStringField;
-    XDataWebDataSet1supplied_by_customer_ref_art_p: TStringField;
-    XDataWebDataSet1supplied_by_customer_ref_art_a: TStringField;
-    XDataWebDataSet1cut_die_cutdier: TStringField;
-    XDataWebDataSet1cut_die_cutdieb: TStringField;
-    XDataWebDataSet1cut_die_cutdief: TStringField;
-    XDataWebDataSet1cut_die_cutdierkr: TStringField;
-    XDataWebDataSet1cut_die_cutdiefkr: TStringField;
-    XDataWebDataSet1cut_die_cad_file: TStringField;
-    XDataWebDataSet1cut_die_attached: TStringField;
-    XDataWebDataSet1cut_die_boxpol250: TStringField;
-    XDataWebDataSet1cut_die_boxpol155: TStringField;
-    XDataWebDataSet1cut_die_boxpol125: TStringField;
-    XDataWebDataSet1cut_die_brub: TStringField;
-    XDataWebDataSet1proofing_fax: TStringField;
-    XDataWebDataSet1proofing_fax_attn: TStringField;
-    XDataWebDataSet1proofing_e_mail: TStringField;
-    XDataWebDataSet1proofing_ship_to: TStringField;
-    XDataWebDataSet1proofing_other: TStringField;
-    XDataWebDataSet1proofing_changes_required: TStringField;
-    XDataWebDataSet1proofing_changes_date: TDateField;
-    XDataWebDataSet1layout_rsc_l: TStringField;
-    XDataWebDataSet1layout_rcs_w: TStringField;
-    XDataWebDataSet1layout_rcs_d: TStringField;
-    XDataWebDataSet1layout_die_cut_no: TStringField;
-    XDataWebDataSet1layout_accross_no: TStringField;
-    XDataWebDataSet1layout_around_no: TStringField;
-    XDataWebDataSet1layout_cad_file: TStringField;
-    XDataWebDataSet1mounting_standard_setup: TStringField;
-    XDataWebDataSet1mounting_custom_backing: TStringField;
-    XDataWebDataSet1mounting_custom_adhesive: TStringField;
-    XDataWebDataSet1colors_cylinder_size: TStringField;
-    XDataWebDataSet1colors_cross_hairs: TStringField;
-    XDataWebDataSet1colors_machine_ident: TStringField;
-    XDataWebDataSet1colors_clemson: TStringField;
-    XDataWebDataSet1plates_thickness: TStringField;
-    XDataWebDataSet1plates_plate_material: TStringField;
-    XDataWebDataSet1general_special_instructions: TStringField;
-    XDataWebDataSet1colors_colors: TStringField;
     XDataWebDataSet1staff_fields_quickbooks_item: TStringField;
     XDataWebDataSet1staff_fields_quantity: TStringField;
-    XDataWebDataSet1layout_rsc_style: TStringField;
     XDataWebDataSet1staff_fields_art_location: TStringField;
-    XDataWebDataSet1supplied_by_customer_color_copy: TBooleanField;
-    XDataWebDataSet1supplied_by_customer_plates: TBooleanField;
-    XDataWebDataSet1supplied_by_customer_sample_ca: TBooleanField;
-    XDataWebDataSet1supplied_by_customer_disk_or_cd: TBooleanField;
-    XDataWebDataSet1mounting_loose: 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;
     XDataWebDataSet1ADDRESS_LIST: TStringField;
-    XDataWebDataSet1supplied_by_customer_order_date: TStringField;
     WebDataSource1: TWebDataSource;
     WebLabel1: TWebLabel;
     dtpOrderDate: TWebDateTimePicker;
@@ -125,7 +57,6 @@ type
     edtInvoiceTo: TWebDBEdit;
     edtPONumber: TWebDBEdit;
     edtJobName: TWebDBEdit;
-    edtQuickBooksItem: TWebDBEdit;
     WebDBComboBox1: TWebDBComboBox;
     wdsShipTo: TWebDataSource;
     xdwdsShipTo: TXDataWebDataSet;
@@ -135,7 +66,6 @@ type
     edtPlates: TWebDBEdit;
     edtDimensionalLayout: TWebDBEdit;
     edtSample: TWebDBEdit;
-    edtDisk: TWebDBEdit;
     edtOther: TWebDBEdit;
     edtEmail: TWebDBEdit;
     edtTotalInchesUsed: TWebDBEdit;
@@ -155,9 +85,8 @@ type
     dtpInkJetDate3: TWebDateTimePicker;
     dtpInkJetDate2: TWebDateTimePicker;
     edtColorContrastTo: TWebDBEdit;
-    edtColorContrast: TWebDBEdit;
-    dtpColorContrastDate1: TWebDateTimePicker;
-    dtpColorContrastDate2: TWebDateTimePicker;
+    dtpColorContractDate1: TWebDateTimePicker;
+    dtpColorContractDate2: TWebDateTimePicker;
     edtDigitalColorTo: TWebDBEdit;
     edtDigitalColorKey: TWebDBEdit;
     dtpDigitalColorDate: TWebDateTimePicker;
@@ -175,7 +104,6 @@ type
     edtPlateOther: TWebDBEdit;
     edtPlateOtherComments: TWebDBEdit;
     WebLabel7: TWebLabel;
-    edtPrintOrientation: TWebDBEdit;
     WebLabel8: TWebLabel;
     edtAround: TWebDBEdit;
     edtAccross: TWebDBEdit;
@@ -195,14 +123,81 @@ type
     edtDistortionAmount: TWebDBEdit;
     edtDistortionPercent: TWebDBEdit;
     WebLabel10: TWebLabel;
-    edtPlateMaterial: TWebDBEdit;
-    edtThickness: TWebDBEdit;
     edtJobNumber: TWebDBEdit;
     WebLabel11: TWebLabel;
     Comments: TWebDBEdit;
     btnConfirm: TWebButton;
     btnEdit: TWebButton;
     btnCancel: TWebButton;
+    XDataWebDataSet1plates_job_number: TStringField;
+    XDataWebDataSet1supplied_by_customer_plates: TStringField;
+    XDataWebDataSet1supplied_by_customer_sample: TStringField;
+    XDataWebDataSet1supplied_by_customer_dimension: TStringField;
+    XDataWebDataSet1supplied_by_customer_other: TStringField;
+    XDataWebDataSet1supplied_by_customer_disk: TStringField;
+    XDataWebDataSet1supplied_by_customer_e_mail: TStringField;
+    XDataWebDataSet1supplied_by_customer_ftp: TStringField;
+    XDataWebDataSet1plates_plate_material: TStringField;
+    XDataWebDataSet1plates_thickness: TStringField;
+    XDataWebDataSet1supplied_by_customer_total_inc: TStringField;
+    XDataWebDataSet1supplied_by_customer_sheets_us: TStringField;
+    XDataWebDataSet1supplied_by_customer_initials: TStringField;
+    XDataWebDataSet1proofing_pdf_to: TStringField;
+    XDataWebDataSet1proofing_pdf_date_1: TStringField;
+    XDataWebDataSet1proofing_pdf_date_2: TStringField;
+    XDataWebDataSet1proofing_pdf_date_3: TStringField;
+    XDataWebDataSet1proofing_ink_jet_to: TStringField;
+    XDataWebDataSet1proofing_ink_jet_to_2: TStringField;
+    XDataWebDataSet1proofing_ink_jet_date_1: TStringField;
+    XDataWebDataSet1proofing_ink_jet_date_2: TStringField;
+    XDataWebDataSet1proofing_ink_jet_date_3: TStringField;
+    XDataWebDataSet1proofing_color_contract: TStringField;
+    XDataWebDataSet1proofing_color_contrac_to: TStringField;
+    XDataWebDataSet1proofing_color_contrac_date_1: TStringField;
+    XDataWebDataSet1proofing_color_contrac_date_2: TStringField;
+    XDataWebDataSet1proofing_digital_color_key: TStringField;
+    XDataWebDataSet1proofing_digital_color_to: TStringField;
+    XDataWebDataSet1proofing_digital_color_date_1: TStringField;
+    XDataWebDataSet1quantity_and_colors_press_name: TStringField;
+    XDataWebDataSet1quantity_and_colors_anilox_info: TStringField;
+    XDataWebDataSet1plate_marks_microdots_comments: TStringField;
+    XDataWebDataSet1plate_marks_microdots: TStringField;
+    XDataWebDataSet1plate_marks_crosshairs: TStringField;
+    XDataWebDataSet1plate_marks_crosshairs_comments: TStringField;
+    XDataWebDataSet1plate_marks_color_bars: TStringField;
+    XDataWebDataSet1plate_marks_color_bars_comments: TStringField;
+    XDataWebDataSet1plate_marks_other: TStringField;
+    XDataWebDataSet1plate_marks_other_comments: TStringField;
+    XDataWebDataSet1print_orientation_print_orient: TStringField;
+    XDataWebDataSet1layout_around: TStringField;
+    XDataWebDataSet1layout_accross: TStringField;
+    XDataWebDataSet1layout_surface_print: TStringField;
+    XDataWebDataSet1layout_reverse_print: TStringField;
+    XDataWebDataSet1layout_cylinder_repeat: TStringField;
+    XDataWebDataSet1layout_cutoff_dimension: TStringField;
+    XDataWebDataSet1layout_pitch: TStringField;
+    XDataWebDataSet1layout_teeth: TStringField;
+    XDataWebDataSet1layout_bleed: TStringField;
+    XDataWebDataSet1layout_minimum_trap_dim: TStringField;
+    XDataWebDataSet1layout_maximum_trap_dim: TStringField;
+    XDataWebDataSet1upc_size: TStringField;
+    XDataWebDataSet1upc_bar_width_reduction: TStringField;
+    XDataWebDataSet1general_comments: TStringField;
+    XDataWebDataSet1upc_distortion_percent: TStringField;
+    XDataWebDataSet1upc_distortion_amount: TStringField;
+    XDataWebDataSet1layout_cutback: TStringField;
+    XDataWebDataSet1proofing_full_size_ink_jet_for: TBooleanField;
+    XDataWebDataSet1proofing_pdf: TBooleanField;
+    XDataWebDataSet1quantity_and_colors_qty_colors: TStringField;
+    XDataWebDataSet1supplied_by_customer_b_w_or_co: TStringField;
+    wcbQBItem: TWebDBComboBox;
+    wdsQBItem: TWebDataSource;
+    xdwdsQBItem: TXDataWebDataSet;
+    xdwdsQBItemname: TStringField;
+    WebDBComboBox2: TWebDBComboBox;
+    WebDBComboBox3: TWebDBComboBox;
+    wcbPrint: TWebDBComboBox;
+    WebDBComboBox4: TWebDBComboBox;
     procedure WebFormCreate(Sender: TObject);
     procedure HideNotification();
     procedure ShowNotification(Notification: string);
@@ -213,7 +208,7 @@ type
     procedure WebButton1Click(Sender: TObject);
     procedure addColorRow(num, Color, LPI, Size: string);
     procedure btnConfirmClick(Sender: TObject);
-    [async] procedure AddCorrugatedOrder(orderJSON: TJSONObject);
+    [async] procedure AddWebOrder(orderJSON: TJSONObject);
     procedure btnCancelClick(Sender: TObject);
   private
     FAgencyCode: string;
@@ -248,10 +243,11 @@ var
   colorJSON, orderJSON, colorListJSON: TJSONObject;
   fieldNames: TStringList;
   itemList: TJSNodeList;
-  header, value: string;
+  header, value, info: string;
   Field: TField;
   Response: TXDataClientResponse;
 begin
+  console.log('confirm');
   orderJSON := TJSONObject.Create;
   colorList := TJSONArray.Create;
   container := document.getElementById('additionalFields');
@@ -273,7 +269,7 @@ begin
   colorListJSON.AddPair('items', colorList);
   XDataWebDataSet1.Edit;
 
-  XDataWebDataSet1colors_colors.Value := colorListJSON.ToString;
+  XDataWebDataSet1quantity_and_colors_qty_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);
@@ -281,10 +277,15 @@ begin
   XDataWebDataSet1staff_fields_art_due.Value := DateTimeToStr(dtpArtDue.Date);
   XDataWebDataSet1staff_fields_plate_due.Value := DateTimeToStr(dtpPlateDue.Date);
   XDataWebDataSet1staff_fields_order_date.Value := DateTimeToStr(dtpOrderDate.Date);
-
-  //TODO add all other dtps
-
-  // Convert all check boxes to strings because the database stores them as strings
+  XDataWebDataSet1proofing_pdf_date_1.Value := DateTimeToStr(dtpPDFDate1.Date);
+  XDataWebDataSet1proofing_pdf_date_2.Value := DateTimeToStr(dtpPDFDate2.Date);
+  XDataWebDataSet1proofing_pdf_date_3.Value := DateTimeToStr(dtpPDFDate3.Date);
+  XDataWebDataSet1proofing_ink_jet_date_1.Value := DateTimeToStr(dtpInkJetDate1.Date);
+  XDataWebDataSet1proofing_ink_jet_date_2.Value := DateTimeToStr(dtpInkJetDate2.Date);
+  XDataWebDataSet1proofing_ink_jet_date_3.Value := DateTimeToStr(dtpInkJetDate3.Date);
+  XDataWebDataSet1proofing_color_contrac_date_1.Value := DateTimeToStr(dtpColorContractDate1.Date);
+  XDataWebDataSet1proofing_color_contrac_date_2.Value := DateTimeToStr(dtpColorContractDate2.Date);
+  XDataWebDataSet1proofing_digital_color_date_1.Value := DateTimeToStr(dtpDigitalColorDate.Date);
 
   XDataWebDataSet1.Post;
   XDataWebDataSet1.First;
@@ -310,15 +311,21 @@ begin
     XDataWebDataSet1.Next;
   end;
   orderJSON.AddPair('COMPANY_ID', customerID);
-  orderJSON.AddPair('USER_ID', '1011');
+  orderJSON.AddPair('USER_ID', JS.toString(AuthService.TokenPayload.Properties['user_id']));
   orderJSON.AddPair('mode', mode);
   if mode = 'EDIT' then
+  begin
     orderJSON.AddPair('ORDER_ID', orderID);
-  AddCorrugatedOrder(orderJSON);
-  FViewMain.ViewOrders('Success:Order Successfully Added');
+    info := 'Success:Order Successfully Edited';
+  end
+  else
+    info := 'Success:Order Successfully Added';
+  AddWebOrder(orderJSON);
+
+  FViewMain.ViewOrders(info);
 end;
 
-procedure TFOrderEntryWeb.AddCorrugatedOrder(orderJSON: TJSONObject);
+procedure TFOrderEntryWeb.AddWebOrder(orderJSON: TJSONObject);
 // sends the order JSON object to the server
 var
 Response: TXDataClientResponse;
@@ -435,17 +442,19 @@ var
   color: TJSObject;
   colorJSON: TJSONObject;
   colorListJSON: TJSONArray;
+  items: TJSObject;
 begin
-  xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrder',
+  xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetWebOrder',
         [Order_ID]));
   order :=  TJSObject(xdcResponse.Result);
+  console.log(order);
   data := TJSArray(order['data']);
   XDataWebDataSet1.Close;
   XDataWebDataSet1.SetJsonData(order);
   XDataWebDataSet1.Open;
-  if XDataWebDataSet1colors_colors.Value <> '' then
+  if XDataWebDataSet1quantity_and_colors_qty_colors.Value <> '' then
   begin
-  colorObject := TJSObject(TJSJSON.parse(XDataWebDataSet1colors_colors.Value));
+  colorObject := TJSObject(TJSJSON.parse(XDataWebDataSet1quantity_and_colors_qty_colors.Value));
   colorList := TJSArray(colorObject['items']);
   for I := 0 to colorList.length -1 do
     begin
@@ -454,7 +463,7 @@ begin
     end;
   end;
 
-  // Check boxes and dates need to be manually set
+  // Dates need to be manually set
 
   if not (XDataWebDataSet1staff_fields_order_date.AsString = '') then
     dtpOrderDate.Date := StrToDateTime(XDataWebDataSet1staff_fields_order_date.Value)
@@ -477,10 +486,64 @@ begin
   else
     dtpPlateDue.Date := 0;
 
-  //TODO Add other dtps
+  if not (XDataWebDataSet1proofing_pdf_date_1.AsString = '') then
+    dtpPDFDate1.Date := StrToDateTime(XDataWebDataSet1proofing_pdf_date_1.Value)
+  else
+    dtpPDFDate1.Date := 0;
+
+  if not (XDataWebDataSet1proofing_pdf_date_2.AsString = '') then
+    dtpPDFDate2.Date := StrToDateTime(XDataWebDataSet1proofing_pdf_date_2.Value)
+  else
+    dtpPDFDate2.Date := 0;
+
+  if not (XDataWebDataSet1proofing_pdf_date_3.AsString = '') then
+    dtpPDFDate3.Date := StrToDateTime(XDataWebDataSet1proofing_pdf_date_3.Value)
+  else
+    dtpPDFDate3.Date := 0;
+
+  if not (XDataWebDataSet1proofing_ink_jet_date_1.AsString = '') then
+    dtpInkJetDate1.Date := StrToDateTime(XDataWebDataSet1proofing_ink_jet_date_1.Value)
+  else
+    dtpInkJetDate1.Date := 0;
+
+  if not (XDataWebDataSet1proofing_ink_jet_date_2.AsString = '') then
+    dtpInkJetDate2.Date := StrToDateTime(XDataWebDataSet1proofing_ink_jet_date_2.Value)
+  else
+    dtpInkJetDate2.Date := 0;
+
+  if not (XDataWebDataSet1proofing_ink_jet_date_3.AsString = '') then
+    dtpInkJetDate3.Date := StrToDateTime(XDataWebDataSet1proofing_ink_jet_date_3.Value)
+  else
+    dtpInkJetDate3.Date := 0;
+
+  if not (XDataWebDataSet1proofing_color_contrac_date_1.AsString = '') then
+    dtpColorContractDate1.Date := StrToDateTime(XDataWebDataSet1proofing_color_contrac_date_1.Value)
+  else
+    dtpColorContractDate1.Date := 0;
+
+  if not (XDataWebDataSet1proofing_color_contrac_date_2.AsString = '') then
+    dtpColorContractDate2.Date := StrToDateTime(XDataWebDataSet1proofing_color_contrac_date_2.Value)
+  else
+    dtpColorContractDate2.Date := 0;
+
+  if not (XDataWebDataSet1proofing_digital_color_date_1.AsString = '') then
+    dtpDigitalColorDate.Date := StrToDateTime(XDataWebDataSet1proofing_digital_color_date_1.Value)
+  else
+    dtpDigitalColorDate.Date := 0;
+
 
   if mode = 'EDIT' then
+  begin
     CustomerID := XDataWebDataSet1COMPANY_ID.AsString;
+    xdwdsShipTo.Close;
+    xdwdsShipTo.SetJSONData(order['ADDRESS_LIST']);
+    xdwdsShipTo.Open;
+  end;
+
+  xdwdsQBItem.Close;
+  items := TJSObject(order['ITEMS']);
+  xdwdsQBItem.SetJsonData(items['data']);
+  xdwdsQBITEM.Open;
 
 end;
 

kgOrdersClient/View.Orders.pas

@@ -345,7 +345,6 @@ begin
         StatusJSON.AddPair('staff_fields_art_due', DateToStr(newForm.dtpNewArtDue.Date));
 
 
-        console.log(StatusJSON);
         SetStatus(StatusJSON.ToString);
         OrderID := '';
         getOrders(GenerateSearchOptions());
@@ -722,7 +721,6 @@ begin
 
                     if orderID <> '' then
                       searchOptions := searchOptions + '&orderID=' + orderID;
-  console.log(searchOptions);
   Result := searchOptions;
 end;
 

kgOrdersServer/Source/Lookup.Service.pas

@@ -125,13 +125,15 @@ type
     data: TList<TCustomerItem>;
   end;
 
-  TFullOrder = class
+  TFullOrder = class //TODO change name to TCorrugatedOrder
   Public
       //Company
       COMPANY_ID: integer;
       NAME: string;
       SHORT_NAME: string;
       inQuickBooks: string;
+      ADDRESS_LIST: TList<TAddressItem>;
+      ITEMS: TItemList;
 
       // Staff Fields:
       staff_fields_order_date: string;
@@ -215,9 +217,115 @@ type
 
        // General
        general_special_instructions: string;
-
   end;
 
+  TWebOrder = class
+  Public
+      //Company
+      COMPANY_ID: integer;
+      NAME: string;
+      SHORT_NAME: string;
+      inQuickBooks: string;
+      ADDRESS_LIST: TList<TAddressItem>;
+      ITEMS: TItemList;
+
+      // Staff Fields:
+      staff_fields_order_date: string;
+      staff_fields_proof_date: string;
+      staff_fields_ship_date: string;
+      staff_fields_ship_via: string;
+      staff_fields_quantity: string;
+      staff_fields_price: string;
+      staff_fields_invoice_to: string;
+      staff_fields_ship_to: string;
+      staff_fields_po_number: string;
+      staff_fields_job_name: string;
+      staff_fields_quickbooks_item: string;
+      staff_fields_art_due: string;
+      staff_fields_plate_due: string;
+      staff_fields_mount_due: string;
+      staff_fields_art_location: string;
+
+      // Supplied by Customer:
+      supplied_by_customer_b_w_or_co: string;
+      supplied_by_customer_plates: string;
+      supplied_by_customer_sample: string;
+      supplied_by_customer_dimension: string;
+      supplied_by_customer_other: string;
+      supplied_by_customer_disk: string;
+      supplied_by_customer_e_mail: string;
+      supplied_by_customer_ftp: string;
+      supplied_by_customer_total_inc: string;
+      supplied_by_customer_sheets_us: string;
+      supplied_by_customer_initials: string;
+
+      // Proofing
+      proofing_pdf: boolean;
+      proofing_pdf_to: string;
+      proofing_pdf_date_1: string;
+      proofing_pdf_date_2: string;
+      proofing_pdf_date_3: string;
+      proofing_full_size_ink_jet_for: boolean;
+      proofing_ink_jet_to: string;
+      proofing_ink_jet_to_2: string;
+      proofing_ink_jet_date_1: string;
+      proofing_ink_jet_date_2: string;
+      proofing_color_contract: string;
+      proofing_color_contrac_to: string;
+      proofing_color_contrac_date_1: string;
+      proofing_color_contrac_date_2: string;
+      proofing_digital_color_key: string;
+      proofing_digital_color_to: string;
+      proofing_digital_color_date_1: string;
+
+      // Print Orientation
+      print_orientation_print_orient: string;
+
+      // Plate
+      plates_plate_material: string;
+      plates_thickness: string;
+      plates_job_number: string;
+
+      // Quantity and Color
+      quantity_and_colors_press_name: string;
+      quantity_and_colors_anilox_info: string;
+      quantity_and_colors_qty_colors: string;
+
+      // Plate Marks
+
+      plate_marks_microdots: string;
+      plate_marks_microdots_comments: string;
+      plate_marks_crosshairs: string;
+      plate_marks_crosshairs_comments: string;
+      plate_marks_color_bars: string;
+      plate_marks_color_bars_comments: string;
+      plate_marks_other: string;
+      plate_marks_other_comments: string;
+
+      // Layout
+      layout_around: string;
+      layout_accross: string;
+      layout_surface_print: string;
+
+      layout_reverse_print: string;
+      layout_cylinder_repeat: string;
+      layout_cutoff_dimension: string;
+      layout_pitch: string;
+      layout_teeth: string;
+      layout_bleed: string;
+      layout_cutback: string;
+      layout_minimum_trap_dim: string;
+      layout_maximum_trap_dim: string;
+
+       // UPC
+       upc_size: string;
+       upc_bar_width_reduction: string;
+       upc_distortion_percent: string;
+       upc_distortion_amount: string;
+
+       // General
+       general_comments: string;
+  end;
 
 
 type
@@ -228,6 +336,7 @@ type
     [HttpGet] function GetItems(searchOptions: string): TItemList;
     [HttpGet] function GetOrders(searchOptions: string): TOrderList;
     [HttpGet] function GetOrder(orderInfo: string): TFullOrder;
+    [HttpGet] function GetWebOrder(orderInfo: string): TWebOrder;
     [HttpGet] function GetCustomers(): TCustomerList;
     [HttpGet] function GetCustomer(ID: string): TCustomerItem;
     [HttpGet] function GenerateReportPDF(searchOptions: string): string;
@@ -238,6 +347,7 @@ type
     function DelUser(username: string): string;
     function EditUser(const editOptions: string): string;
     function AddCorrugatedOrder(orderInfo: string): TJSONObject;
+    function AddWebOrder(orderInfo: string): TJSONObject;
     function AddStatusSchedule(StatusType: string; order: TJSONObject; ORDER_ID: integer): string;
     function SetStatus(statusOptions: string): string;
   end;

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -45,6 +45,7 @@ type
     function AddStatusSchedule(StatusType: string; order: TJSONObject; ORDER_ID: integer): string;
     function GenerateOrdersSQL(searchOptions: string): TSQLQuery;
     function GetColorCount(colors: string): string;
+    function GetWebOrder(orderInfo: string): TWebOrder;
     function GenerateStatusSelectSQL(statusTableShort, statusTableLong, startDate, endDate, statusType: string): string;
     function GenerateStatusWhereSQL(status: TStatusSearchInfo): string;
     function CreateStatusSearchInfo(params: TStringList; statusNum: string): TStatusSearchInfo;
@@ -475,6 +476,7 @@ var
   orderID: string;
   SQL: string;
   table: string;
+  ADDRESS: TAddressItem;
 begin
   orderID := orderInfo;
   SQL := 'select ORDER_TYPE from orders where ORDER_ID = ' + quotedStr(orderID);
@@ -647,6 +649,163 @@ begin
     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('');
+end;
+
+function TLookupService.GetWebOrder(orderInfo: string): TWebOrder;
+var
+  orderType: string;
+  orderID: string;
+  SQL: string;
+  ADDRESS: TAddressItem;
+begin
+  orderID := orderInfo;
+  SQL := 'select * from web_plate_orders o JOIN customers c ON c.CUSTOMER_ID = o.COMPANY_ID where ORDER_ID = ' + quotedStr(orderID);
+  doQuery(ordersDB.UniQuery1, SQL);
+
+  result := TWebOrder.Create;
+
+  // Company
+  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 := '?';
+
+  // Staff Fields
+  result.staff_fields_order_date := ordersDB.UniQuery1.FieldByName('staff_fields_order_date').AsString;
+  result.staff_fields_proof_date := ordersDB.UniQuery1.FieldByName('staff_fields_proof_date').AsString;
+  result.staff_fields_ship_date := ordersDB.UniQuery1.FieldByName('staff_fields_ship_date').AsString;
+  result.staff_fields_ship_via := ordersDB.UniQuery1.FieldByName('staff_fields_ship_via').AsString;
+  result.staff_fields_quantity := ordersDB.UniQuery1.FieldByName('staff_fields_quantity').AsString;
+  result.staff_fields_ship_to := ordersDB.UniQuery1.FieldByName('staff_fields_ship_to').AsString;
+  result.staff_fields_po_number := ordersDB.UniQuery1.FieldByName('staff_fields_po_number').AsString;
+  result.staff_fields_job_name := ordersDB.UniQuery1.FieldByName('staff_fields_job_name').AsString;
+  result.staff_fields_quickbooks_item := ordersDB.UniQuery1.FieldByName('staff_fields_quickbooks_item').AsString;
+  result.staff_fields_art_due := ordersDB.UniQuery1.FieldByName('staff_fields_art_due').AsString;
+  result.staff_fields_plate_due := ordersDB.UniQuery1.FieldByName('staff_fields_plate_due').AsString;
+  result.staff_fields_price := ordersDB.UniQuery1.FieldByName('staff_fields_price').AsString;
+  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_b_w_or_co := ordersDB.UniQuery1.FieldByName('supplied_by_customer_b_w_or_co').AsString;
+  result.supplied_by_customer_plates := ordersDB.UniQuery1.FieldByName('supplied_by_customer_plates').AsString;
+  result.supplied_by_customer_sample := ordersDB.UniQuery1.FieldByName('supplied_by_customer_sample').AsString;
+  result.supplied_by_customer_dimension := ordersDB.UniQuery1.FieldByName('supplied_by_customer_dimension').AsString;
+  result.supplied_by_customer_other := ordersDB.UniQuery1.FieldByName('supplied_by_customer_other').AsString;
+  result.supplied_by_customer_disk := ordersDB.UniQuery1.FieldByName('supplied_by_customer_disk').AsString;
+  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_total_inc := ordersDB.UniQuery1.FieldByName('supplied_by_customer_total_inc').AsString;
+  result.supplied_by_customer_sheets_us := ordersDB.UniQuery1.FieldByName('supplied_by_customer_sheets_us').AsString;
+  result.supplied_by_customer_initials := ordersDB.UniQuery1.FieldByName('supplied_by_customer_initials').AsString;
+
+  // Proofing
+  result.proofing_pdf := ordersDB.UniQuery1.FieldByName('proofing_pdf').AsBoolean;
+  result.proofing_pdf_to := ordersDB.UniQuery1.FieldByName('proofing_pdf_to').AsString;
+  result.proofing_pdf_date_1 := ordersDB.UniQuery1.FieldByName('proofing_pdf_date_1').AsString;
+  result.proofing_pdf_date_2 := ordersDB.UniQuery1.FieldByName('proofing_pdf_date_2').AsString;
+  result.proofing_pdf_date_3 := ordersDB.UniQuery1.FieldByName('proofing_pdf_date_3').AsString;
+  result.proofing_full_size_ink_jet_for := ordersDB.UniQuery1.FieldByName('proofing_full_size_ink_jet_for').AsBoolean;
+  result.proofing_ink_jet_to := ordersDB.UniQuery1.FieldByName('proofing_ink_jet_to').AsString;
+  result.proofing_ink_jet_to_2 := ordersDB.UniQuery1.FieldByName('proofing_ink_jet_to').AsString;
+  result.proofing_ink_jet_date_1 := ordersDB.UniQuery1.FieldByName('proofing_ink_jet_date_1').AsString;
+  result.proofing_ink_jet_date_2 := ordersDB.UniQuery1.FieldByName('proofing_ink_jet_date_2').AsString;
+  result.proofing_color_contract := ordersDB.UniQuery1.FieldByName('proofing_color_contract').AsString;
+  result.proofing_color_contrac_to := ordersDB.UniQuery1.FieldByName('proofing_color_contrac_to').AsString;
+  result.proofing_color_contrac_date_1 := ordersDB.UniQuery1.FieldByName('proofing_color_contrac_date_1').AsString;
+  result.proofing_color_contrac_date_2 := ordersDB.UniQuery1.FieldByName('proofing_color_contrac_date_2').AsString;
+  result.proofing_digital_color_key := ordersDB.UniQuery1.FieldByName('proofing_digital_color_key').AsString;
+  result.proofing_digital_color_to := ordersDB.UniQuery1.FieldByName('proofing_digital_color_to').AsString;
+  result.proofing_digital_color_date_1 := ordersDB.UniQuery1.FieldByName('proofing_digital_color_date_1').AsString;
+
+  // Colors
+  result.quantity_and_colors_press_name := ordersDB.UniQuery1.FieldByName('quantity_and_colors_press_name').AsString;
+  result.quantity_and_colors_anilox_info := ordersDB.UniQuery1.FieldByName('quantity_and_colors_anilox_info').AsString;
+  result.quantity_and_colors_qty_colors := ordersDB.UniQuery1.FieldByName('quantity_and_colors_qty_colors').AsString;
+
+  // Plate Marks
+  result.plate_marks_microdots := ordersDB.UniQuery1.FieldByName('plate_marks_microdots').AsString;
+  result.plate_marks_microdots_comments := ordersDB.UniQuery1.FieldByName('plate_marks_microdots_comments').AsString;
+  result.plate_marks_crosshairs := ordersDB.UniQuery1.FieldByName('plate_marks_crosshairs').AsString;
+  result.plate_marks_crosshairs_comments := ordersDB.UniQuery1.FieldByName('plate_marks_crosshairs').AsString;
+  result.plate_marks_color_bars := ordersDB.UniQuery1.FieldByName('plate_marks_color_bars').AsString;
+  result.plate_marks_color_bars_comments := ordersDB.UniQuery1.FieldByName('plate_marks_color_bars_comments').AsString;
+  result.plate_marks_other := ordersDB.UniQuery1.FieldByName('plate_marks_other').AsString;
+  result.plate_marks_other_comments := ordersDB.UniQuery1.FieldByName('plate_marks_other_comments').AsString;
+
+  // Print Orientation
+  result.print_orientation_print_orient := ordersDB.UniQuery1.FieldByName('print_orientation_print_orient').AsString;
+
+  // Plate
+  result.plates_plate_material := ordersDB.UniQuery1.FieldByName('plates_plate_material').AsString;
+  result.plates_thickness := ordersDB.UniQuery1.FieldByName('plates_thickness').AsString;
+  result.plates_job_number := ordersDB.UniQuery1.FieldByName('plates_job_number').AsString;
+
+  // Layout
+  result.layout_around := ordersDB.UniQuery1.FieldByName('layout_around').AsString;
+  result.layout_accross := ordersDB.UniQuery1.FieldByName('layout_accross').AsString;
+  result.layout_surface_print := ordersDB.UniQuery1.FieldByName('layout_surface_print').AsString;
+  result.layout_reverse_print := ordersDB.UniQuery1.FieldByName('layout_reverse_print').AsString;
+  result.layout_cylinder_repeat := ordersDB.UniQuery1.FieldByName('layout_cylinder_repeat').AsString;
+  result.layout_cutoff_dimension := ordersDB.UniQuery1.FieldByName('layout_cutoff_dimension').AsString;
+  result.layout_pitch := ordersDB.UniQuery1.FieldByName('layout_pitch').AsString;
+  result.layout_teeth := ordersDB.UniQuery1.FieldByName('layout_teeth').AsString;
+  result.layout_bleed := ordersDB.UniQuery1.FieldByName('layout_bleed').AsString;
+  result.layout_cutback := ordersDB.UniQuery1.FieldByName('layout_cutback').AsString;
+  result.layout_minimum_trap_dim := ordersDB.UniQuery1.FieldByName('layout_minimum_trap_dim').AsString;
+  result.layout_maximum_trap_dim := ordersDB.UniQuery1.FieldByName('layout_maximum_trap_dim').AsString;
+
+  // UPC
+  result.upc_size := ordersDB.UniQuery1.FieldByName('upc_size').AsString;
+  result.upc_bar_width_reduction := ordersDB.UniQuery1.FieldByName('upc_bar_width_reduction').AsString;
+  result.upc_distortion_percent := ordersDB.UniQuery1.FieldByName('upc_distortion_percent').AsString;
+  result.upc_distortion_amount := ordersDB.UniQuery1.FieldByName('upc_distortion_amount').AsString;
+
+
+  // General
+  result.general_comments := 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('');
+
+
 end;
 
 function TLookupService.GetItems(searchOptions: string): TItemList;
@@ -670,14 +829,20 @@ begin
   params.Delimiter := '&';
   params.DelimitedText := searchOptions;
 
-  PageNum := StrToInt(params.Values['pagenumber']);
-  PageSize := StrToInt(params.Values['pagesize']);
-  OrderBy := params.Values['orderby'];
+  SQL := 'select * from qb_items';
+
+  if (  ( params.Values['pagenumber'] <> '' ) and ( params.Values['pagesize'] <> '' ) ) then
+  begin
+    pageNum := StrToInt(params.Values['pagenumber']);
+    PageSize := StrToInt(params.Values['pagesize']);
+    OrderBy := params.Values['orderby'];
 
-  offset := IntToStr((PageNum - 1) * PageSize);
-  limit := IntToStr(PageSize);
 
-  SQL := 'select * from qb_items ' + 'limit ' + limit + ' offset ' + offset;
+    limit := IntToStr(PageSize);
+    offset := IntToStr((PageNum - 1) * PageSize);
+    SQL := SQL + ' limit ' + limit + ' offset ' + offset;
+  end;
+
 
   doQuery(ordersDB.UniQuery1, SQL);
 
@@ -857,37 +1022,10 @@ begin
   if JSONData = nil then
     raise Exception.Create('Invalid JSON format');  // If parsing fails, raise an exception
   mode := JSONData.GetValue<string>('mode');
-  if mode = 'ADD' then
-    SQL := 'select * from corrugated_plate_orders where ORDER_ID = 0 and ORDER_ID <> 0'
-  else
-  begin
-    ORDER_ID := JSONData.GetValue<integer>('ORDER_ID');
-    SQL := 'select * from corrugated_plate_orders where ORDER_ID = ' + IntToStr(ORDER_ID);
-  end;
-  doQuery(ordersDB.UniQuery1, SQL);
-  try
-    if mode = 'ADD' then
-      ordersDB.UniQuery1.Insert
-    else
-      ordersDB.UniQuery1.Edit;
-
-    for Pair in JSONData do
-    begin
-      Field := ordersDB.UniQuery1.FindField(Pair.JsonString.Value); // Checks if the field exists in the dataset
-      if Assigned(Field) then
-      begin
-      // handles any dates or datetimes
-        if (Field is TDateTimeField) and (Pair.JsonValue.Value <> '') then
-          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
-        else if Pair.JsonValue.Value <> '' then
-          Field.AsString := Pair.JsonValue.Value;
-      end;
-    end;
 
-    // Post the record to the database
-    ordersDB.UniQuery1.Post;
+  // Add entry to Orders Table to retrieve the order ID
 
-    if mode = 'ADD' then
+  if mode = 'ADD' then
     begin
       SQL := 'select * from orders where ORDER_ID = 0 and ORDER_ID <> 0';
       doQuery(ordersDB.UniQuery1, SQL);
@@ -900,12 +1038,16 @@ begin
       ordersDB.UniQuery1.Edit;
     end;
 
-    temp :=  JSONData.GetValue<string>('COMPANY_ID');
     ordersDB.UniQuery1.FieldByName('COMPANY_ID').AsString := JSONData.GetValue<string>('COMPANY_ID');
     ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString := 'corrugated_plate';
 
     if mode = 'ADD' then
-      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := Now;
+      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := Now
+    else
+    begin
+      // No idea why I need this line but without it an error gets thrown
+      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime;
+    end;
 
     if JSONData.GetValue<string>('staff_fields_price') = '' then
       ordersDB.UniQuery1.FieldByName('PRICE').AsString := '0'
@@ -919,6 +1061,8 @@ begin
     ordersDB.UniQuery1.Post;
 
     ordersDB.UniQuery1.Close;
+
+    //Retrieve Order ID
     if mode = 'ADD' then
     begin
       ordersDB.UniQuery1.SQL.Text := 'SELECT LAST_INSERT_ID() AS OrderID'; // Use database's method to get the last inserted ID
@@ -926,6 +1070,40 @@ begin
       ORDER_ID := ordersDB.UniQuery1.FieldByName('OrderID').AsInteger;
     end;
 
+
+  if mode = 'ADD' then
+    SQL := 'select * from corrugated_plate_orders where ORDER_ID = 0 and ORDER_ID <> 0'
+  else
+  begin
+    ORDER_ID := JSONData.GetValue<integer>('ORDER_ID');
+    SQL := 'select * from corrugated_plate_orders where ORDER_ID = ' + IntToStr(ORDER_ID);
+  end;
+  doQuery(ordersDB.UniQuery1, SQL);
+  try
+    if mode = 'ADD' then
+      ordersDB.UniQuery1.Insert
+    else
+      ordersDB.UniQuery1.Edit;
+
+    for Pair in JSONData do
+    begin
+      Field := ordersDB.UniQuery1.FindField(Pair.JsonString.Value); // Checks if the field exists in the dataset
+      if Assigned(Field) then
+      begin
+      // handles any dates or datetimes
+        if (Field is TDateTimeField) and (Pair.JsonValue.Value <> '') then
+          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
+        else if Pair.JsonValue.Value <> '' then
+          Field.AsString := Pair.JsonValue.Value;
+      end;
+    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') <> '' then
       AddStatusSchedule('PROOF', JSONData, ORDER_ID);
     if JSONData.GetValue<string>('staff_fields_ship_date') <> '' then
@@ -1233,37 +1411,8 @@ begin
   if JSONData = nil then
     raise Exception.Create('Invalid JSON format');  // If parsing fails, raise an exception
   mode := JSONData.GetValue<string>('mode');
-  if mode = 'ADD' then
-    SQL := 'select * from web_plate_orders where ORDER_ID = 0 and ORDER_ID <> 0'
-  else
-  begin
-    ORDER_ID := JSONData.GetValue<integer>('ORDER_ID');
-    SQL := 'select * from web_plate_orders where ORDER_ID = ' + IntToStr(ORDER_ID);
-  end;
-  doQuery(ordersDB.UniQuery1, SQL);
-  try
-    if mode = 'ADD' then
-      ordersDB.UniQuery1.Insert
-    else
-      ordersDB.UniQuery1.Edit;
 
-    for Pair in JSONData do
-    begin
-      Field := ordersDB.UniQuery1.FindField(Pair.JsonString.Value); // Checks if the field exists in the dataset
-      if Assigned(Field) then
-      begin
-      // handles any dates or datetimes
-        if (Field is TDateTimeField) and (Pair.JsonValue.Value <> '') then
-          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
-        else if Pair.JsonValue.Value <> '' then
-          Field.AsString := Pair.JsonValue.Value;
-      end;
-    end;
-
-    // Post the record to the database
-    ordersDB.UniQuery1.Post;
-
-    if mode = 'ADD' then
+  if mode = 'ADD' then
     begin
       SQL := 'select * from orders where ORDER_ID = 0 and ORDER_ID <> 0';
       doQuery(ordersDB.UniQuery1, SQL);
@@ -1281,7 +1430,12 @@ begin
     ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString := 'web_plate';
 
     if mode = 'ADD' then
-      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := Now;
+      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := Now
+    else
+    begin
+      // No idea why I need this line but without it an error gets thrown
+      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime;
+    end;
 
     if JSONData.GetValue<string>('staff_fields_price') = '' then
       ordersDB.UniQuery1.FieldByName('PRICE').AsString := '0'
@@ -1302,6 +1456,38 @@ begin
       ORDER_ID := ordersDB.UniQuery1.FieldByName('OrderID').AsInteger;
     end;
 
+  if mode = 'ADD' then
+    SQL := 'select * from web_plate_orders where ORDER_ID = 0 and ORDER_ID <> 0'
+  else
+  begin
+    ORDER_ID := JSONData.GetValue<integer>('ORDER_ID');
+    SQL := 'select * from web_plate_orders where ORDER_ID = ' + IntToStr(ORDER_ID);
+  end;
+  doQuery(ordersDB.UniQuery1, SQL);
+  try
+    if mode = 'ADD' then
+      ordersDB.UniQuery1.Insert
+    else
+      ordersDB.UniQuery1.Edit;
+
+    for Pair in JSONData do
+    begin
+      Field := ordersDB.UniQuery1.FindField(Pair.JsonString.Value); // Checks if the field exists in the dataset
+      if Assigned(Field) then
+      begin
+      // handles any dates or datetimes
+        if (Field is TDateTimeField) and (Pair.JsonValue.Value <> '') then
+          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
+        else if Pair.JsonValue.Value <> '' then
+          Field.AsString := Pair.JsonValue.Value;
+      end;
+    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') <> '' then
       AddStatusSchedule('PROOF', JSONData, ORDER_ID);
     if JSONData.GetValue<string>('staff_fields_ship_date') <> '' then

kgOrdersServer/kgOrdersServer.ini

 [Settings]
 MemoLogLevel=4
 FileLogLevel=5
-LogFileNum=125
+LogFileNum=146
 webClientVersion=1.0.0
 
 [Database]