Reworked Cutting Die Order Entry

Server now sends back the entire order, added 3 fields QB_ORDER_NUM, QB_ESTIMATE_ID, and IN_QB

kgOrdersClient/View.OrderEntryCuttingDie.dfm

@@ -2,8 +2,8 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
   Width = 956
   Height = 728
   object WebLabel2: TWebLabel
-    Left = 26
-    Top = 72
+    Left = 24
+    Top = 71
     Width = 52
     Height = 15
     Caption = 'Company'
@@ -51,20 +51,21 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'SHORT_NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
-  object edtInQuickBooks: TWebDBEdit
-    Left = 24
-    Top = 152
+  object edtQBOrderNum: TWebDBEdit
+    Left = 151
+    Top = 149
     Width = 121
     Height = 23
     AutoCompletion = acNope
     AutoSize = True
     ChildOrder = 79
-    ElementID = 'edtinquickbooks'
+    ElementID = 'edtqbordernum'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    DataSource = WebDataSource1
+    DataField = 'QB_ORDER_NUM'
+    DataSource = wdsOrder
   end
   object dtpOrderDate: TWebDateTimePicker
     Left = 22
@@ -116,7 +117,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_ship_via'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object edtQuantity: TWebDBEdit
     Left = 24
@@ -130,7 +131,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_quantity'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object edtPrice: TWebDBEdit
     Left = 24
@@ -142,7 +143,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_price'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object edtInvoiceTo: TWebDBEdit
     Left = 26
@@ -155,7 +156,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_invoice_to'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object wdbcbShipTo: TWebDBComboBox
     Left = 26
@@ -167,7 +168,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     WidthPercent = 100.000000000000000000
     ItemIndex = -1
     DataField = 'staff_fields_ship_to'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
     ListField = 'ADDRESS'
     ListSource = wdsShipTo
   end
@@ -182,7 +183,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_po_number'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object edtJobName: TWebDBEdit
     Left = 26
@@ -195,7 +196,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'staff_fields_job_name'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object edtSpecialInstructions: TWebDBEdit
     Left = 835
@@ -208,7 +209,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'general_special_instructions'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object btnSave: TWebButton
     Left = 526
@@ -235,7 +236,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     OnClick = btnCancelClick
   end
   object edtCompanyName: TWebDBEdit
-    Left = 26
+    Left = 24
     Top = 92
     Width = 121
     Height = 22
@@ -244,7 +245,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
   end
   object wcbQBItem: TWebDBComboBox
     Left = 26
@@ -256,7 +257,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     WidthPercent = 100.000000000000000000
     ItemIndex = -1
     DataField = 'staff_fields_quickbooks_item'
-    DataSource = WebDataSource1
+    DataSource = wdsOrder
     ListField = 'name'
     ListSource = wdsQBItem
   end
@@ -272,17 +273,6 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     WidthPercent = 100.000000000000000000
     OnClick = btnPDFClick
   end
-  object edtOrderNum: TWebEdit
-    Left = 126
-    Top = 194
-    Width = 121
-    Height = 22
-    ChildOrder = 81
-    ElementID = 'edtordernum'
-    Enabled = False
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-  end
   object btnDelete: TWebButton
     Left = 534
     Top = 458
@@ -355,78 +345,112 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     WidthPercent = 100.000000000000000000
     OnClick = WebButton2Click
   end
-  object WebDataSource1: TWebDataSource
+  object wdbcbINQB: TWebDBCheckBox
+    Left = 26
+    Top = 149
+    Width = 113
+    Height = 22
+    Caption = 'In Quickbooks?'
+    ChildOrder = 29
+    ElementID = 'wdbcbinqb'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'IN_QB'
+    DataSource = wdsOrder
+    ValueChecked = 'T'
+    ValueUnChecked = 'F'
+  end
+  object edtOrderNum: TWebDBEdit
+    Left = 103
+    Top = 185
+    Width = 121
+    Height = 22
+    ChildOrder = 30
+    ElementID = 'edtordernum'
+    Enabled = False
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    DataField = 'ORDER_ID'
+    DataSource = wdsOrder
+  end
+  object wdsOrder: TWebDataSource
     AutoEdit = False
-    DataSet = XDataWebDataSet1
+    DataSet = xdwdsOrder
     Left = 418
     Top = 86
   end
-  object XDataWebDataSet1: TXDataWebDataSet
+  object xdwdsOrder: TXDataWebDataSet
     Connection = DMConnection.ApiConnection
     Left = 422
     Top = 28
-    object XDataWebDataSet1COMPANY_ID: TIntegerField
-      FieldName = 'COMPANY_ID'
-    end
-    object XDataWebDataSet1USER_ID: TIntegerField
-      FieldName = 'USER_ID'
-    end
-    object XDataWebDataSet1ORDER_DATE: TDateField
+    object xdwdsOrderORDER_DATE: TDateField
       FieldName = 'ORDER_DATE'
     end
-    object XDataWebDataSet1ORDER_STATUS: TStringField
-      FieldName = 'ORDER_STATUS'
-    end
-    object XDataWebDataSet1SHORT_NAME: TStringField
+    object xdwdsOrderSHORT_NAME: TStringField
       FieldName = 'SHORT_NAME'
     end
-    object XDataWebDataSet1staff_fields_ship_via: TStringField
+    object xdwdsOrderstaff_fields_ship_via: TStringField
       FieldName = 'staff_fields_ship_via'
     end
-    object XDataWebDataSet1staff_fields_price: TStringField
+    object xdwdsOrderstaff_fields_price: TStringField
       FieldName = 'staff_fields_price'
     end
-    object XDataWebDataSet1staff_fields_invoice_to: TStringField
+    object xdwdsOrderstaff_fields_invoice_to: TStringField
       FieldName = 'staff_fields_invoice_to'
     end
-    object XDataWebDataSet1staff_fields_invoice_attention: TStringField
+    object xdwdsOrderstaff_fields_invoice_attention: TStringField
       FieldName = 'staff_fields_invoice_attention'
     end
-    object XDataWebDataSet1staff_fields_ship_to: TStringField
+    object xdwdsOrderstaff_fields_ship_to: TStringField
       FieldName = 'staff_fields_ship_to'
     end
-    object XDataWebDataSet1staff_fields_ship_attention: TStringField
+    object xdwdsOrderstaff_fields_ship_attention: TStringField
       FieldName = 'staff_fields_ship_attention'
     end
-    object XDataWebDataSet1staff_fields_po_number: TStringField
+    object xdwdsOrderstaff_fields_po_number: TStringField
       FieldName = 'staff_fields_po_number'
     end
-    object XDataWebDataSet1staff_fields_job_name: TStringField
+    object xdwdsOrderstaff_fields_job_name: TStringField
       FieldName = 'staff_fields_job_name'
     end
-    object XDataWebDataSet1staff_fields_order_date: TStringField
+    object xdwdsOrderstaff_fields_order_date: TStringField
       FieldName = 'staff_fields_order_date'
     end
-    object XDataWebDataSet1staff_fields_proof_date: TStringField
+    object xdwdsOrderstaff_fields_proof_date: TStringField
       FieldName = 'staff_fields_proof_date'
     end
-    object XDataWebDataSet1staff_fields_ship_date: TStringField
+    object xdwdsOrderstaff_fields_ship_date: TStringField
       FieldName = 'staff_fields_ship_date'
     end
-    object XDataWebDataSet1NAME: TStringField
+    object xdwdsOrderNAME: TStringField
       FieldName = 'NAME'
     end
-    object XDataWebDataSet1staff_fields_quickbooks_item: TStringField
+    object xdwdsOrderstaff_fields_quickbooks_item: TStringField
       FieldName = 'staff_fields_quickbooks_item'
     end
-    object XDataWebDataSet1general_special_instructions: TStringField
+    object xdwdsOrdergeneral_special_instructions: TStringField
       FieldName = 'general_special_instructions'
     end
-    object XDataWebDataSet1staff_fields_quantity: TStringField
+    object xdwdsOrderstaff_fields_quantity: TStringField
       FieldName = 'staff_fields_quantity'
     end
-    object XDataWebDataSet1inQuickBooks: TStringField
-      FieldName = 'inQuickBooks'
+    object xdwdsOrderQB_ESTIMATE_ID: TStringField
+      FieldName = 'QB_ESTIMATE_ID'
+    end
+    object xdwdsOrderQB_ORDER_NUM: TStringField
+      FieldName = 'QB_ORDER_NUM'
+    end
+    object xdwdsOrderUSER_ID: TIntegerField
+      FieldName = 'USER_ID'
+    end
+    object xdwdsOrderCOMPANY_ID: TIntegerField
+      FieldName = 'COMPANY_ID'
+    end
+    object xdwdsOrderORDER_ID: TIntegerField
+      FieldName = 'ORDER_ID'
+    end
+    object xdwdsOrderIN_QB: TStringField
+      FieldName = 'IN_QB'
     end
   end
   object XDataWebClient1: TXDataWebClient

kgOrdersClient/View.OrderEntryCuttingDie.html

@@ -56,7 +56,11 @@
             </div>
         <div class="col-auto">
             <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">In Quickbooks?:</label>
-            <input id="edtinquickbooks"type="text" class="form-control" style="width: 150px"/>
+            <input id="wdbcbinqb" type="checkbox">
+        </div>
+        <div class="col-auto">
+            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quickbooks Order Number:</label>
+            <input id="edtqbordernum"type="text" class="form-control" style="width: 150px" required/>
         </div>
     </div>
     <h4 class="custom-h4 mt-3">Staff Fields</h4>

kgOrdersServer/Source/Lookup.Service.pas

@@ -353,10 +353,12 @@ type
 
 
     // Company
-    COMPANY_ID: integer;
+      ORDER_ID: integer;
+      COMPANY_ID: integer;
       NAME: string;
       SHORT_NAME: string;
-      inQuickBooks: string;
+      IN_QB: string;
+      QB_ORDER_NUM: string;
       ADDRESS_LIST: TList<TAddressItem>;
       ITEMS: TItemList;
 

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -1324,10 +1324,12 @@ begin
     result := TCuttingDie.Create;
 
     // Company
+    result.ORDER_ID := ordersDB.UniQuery1.FieldByName('ORDER_ID').AsInteger;
     result.COMPANY_ID := ordersDB.UniQuery1.FieldByName('COMPANY_ID').AsInteger;
     result.NAME := ordersDB.UniQuery1.FieldByName('NAME').AsString;
     result.SHORT_NAME := ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString;
-    result.inQuickBooks := '?';
+    result.IN_QB := ordersDB.UniQuery1.FieldByName('IN_QB').AsString;
+    result.QB_ORDER_NUM := ordersDB.UniQuery1.FieldByName('QB_ORDER_NUM').AsString;
 
     // Staff Fields
     result.staff_fields_order_date := ordersDB.UniQuery1.FieldByName('staff_fields_order_date').AsString;
@@ -2219,6 +2221,8 @@ var
   ORDER_ID: integer;
   mode: string;
   msg: string;
+  temp: string;
+  temp2: boolean;
 begin
   DateFormat := TFormatSettings.Create;
   DateFormat.ShortDateFormat := 'yyyy-mm-dd';
@@ -2259,13 +2263,15 @@ begin
       // handles any dates or datetimes
         if (Field is TDateTimeField) then
         begin
-        if (Pair.JsonValue.Value = '') or (Pair.JsonValue.Value = 'null') or (Pair.JsonValue.Value = '12/30/1899') then
-          Field.Clear // This sets the field to NULL (empty)
-        else
-          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value);
+          if (Pair.JsonValue.Value = '') or (Pair.JsonValue.Value = 'null') or (Pair.JsonValue.Value = '12/30/1899') then
+            Field.Clear // This sets the field to NULL (empty)
+          else
+            TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value);
         end
+        else if Field is TStringField then
+          Field.AsString := Pair.JsonValue.Value
         else
-          Field.AsString := Pair.JsonValue.Value;
+          Field.AsInteger := pair.JsonValue.AsType<Integer>;
       end;
     end;
 
@@ -2286,8 +2292,9 @@ begin
     else
       msg := 'Success: Order Successfully Edited';
 
-    Result := TJSONObject.Create.AddPair('status', msg);
-    Result.AddPair('OrderID', ORDER_ID);
+    Result := JSONData;
+    Result.AddPair('status', msg);
+    Result.AddPair('ORDER_ID', ORDER_ID);
     TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
   except
     on E: Exception do
@@ -2468,8 +2475,11 @@ begin
               Field.Clear // This sets the field to NULL (empty)
            else
             TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
-        else if Pair.JsonValue.Value <> '' then
-          Field.AsString := Pair.JsonValue.Value;
+        else if ( ( field is TStringField ) and ( Pair.JsonValue.Value <> '' ) ) then
+          Field.AsString := Pair.JsonValue.Value
+        else if field is TIntegerField  then
+          Field.AsInteger := Pair.JsonValue.AsType<Integer>;
+
       end;
     end;
     ordersDB.UniQuery1.FieldByName('ORDER_ID').AsString := OrderID;

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.7
-LogFileNum=849
+LogFileNum=864
 
 [Database]
 Server=192.168.159.144