Fixed issue with po number, short name, and memo not appearing on estimate in qb

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -304,7 +304,6 @@ begin
   if VerifyOrder() then
   begin
     SendCorrugatedOrder();
-    ViewMode();
   end;
 end;
 
@@ -507,21 +506,26 @@ begin
 
   orderJSON.AddPair('mode', mode);
   orderJSON.AddPair('REVISION_NOTES', REVISION_NOTES);
+  try
+    Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddCorrugatedOrder',
+                [orderJSON.ToString]));
+    jsObj := JS.TJSObject(Response.Result);
 
-  Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddCorrugatedOrder',
-              [orderJSON.ToString]));
-  jsObj := JS.TJSObject(Response.Result);
-
-  xdwdsOrder.Close;
-  xdwdsOrder.SetJsonData(jsObj);
-  xdwdsOrder.Open;
-  cbLoose.Checked := ( xdwdsOrder.FieldByName('mounting_loose').AsString <> '' );
-  cbStripMount.Checked := ( xdwdsOrder.FieldByName('mounting_strip_mount').AsString <> '' );
-  OrderID := xdwdsOrderORDER_ID.AsString;
+    xdwdsOrder.Close;
+    xdwdsOrder.SetJsonData(jsObj);
+    xdwdsOrder.Open;
+    cbLoose.Checked := ( xdwdsOrder.FieldByName('mounting_loose').AsString <> '' );
+    cbStripMount.Checked := ( xdwdsOrder.FieldByName('mounting_strip_mount').AsString <> '' );
+    OrderID := xdwdsOrderORDER_ID.AsString;
 
-  mode := 'EDIT';
+    mode := 'EDIT';
 
-  ShowToast(string(jsObj.Properties['status']));
+    ShowToast(string(jsObj.Properties['status']));
+    ViewMode();
+  except
+    on E: EXDataClientRequestException do
+      Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);
+  end;
 end;
 
 

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -291,7 +291,6 @@ begin
   if VerifyOrder() then
   begin
     sendCuttingDieOrder();
-    ViewMode();
   end;
   window.scrollTo(0, 0);
 end;
@@ -434,6 +433,7 @@ begin
 
     mode := 'EDIT';
     ShowToast(String(jsObj.Properties['status']));
+    ViewMode();
   except
     on E: EXDataClientRequestException do
       Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);

kgOrdersClient/View.OrderEntryWeb.pas

@@ -379,7 +379,6 @@ begin
   if VerifyOrder() then
   begin
     sendWebOrder();
-    ViewMode();
   end;
   window.scrollTo(0, 0);
 end;
@@ -601,10 +600,12 @@ begin
     mode := 'EDIT';
     OrderID := xdwdsOrderORDER_ID.AsString;
     ShowToast(String(jsObj.Properties['status']));
+    ViewMode();
   except
     on E: EXDataClientRequestException do
       Utils.ShowErrorModal(E.ErrorResult.ErrorMessage);
   end;
+
 end;
 
 procedure TFOrderEntryWeb.addColorRow(num: string; Color: string; LPI: string; Size: string);

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -245,7 +245,7 @@ var
   TxnTaxCodeRef: TJSONObject;
   TxnTaxDetail: TJSONObject;
   JSONData: TJSONObject;
-  ORDER_ID, companyID, RefreshToken, AccessToken, USER_ID: string;
+  ORDER_ID, companyID, RefreshToken, AccessToken, USER_ID, MemoField: string;
   table, msg: string;
   ShipMethodRef: TJSONObject;
   LastRefresh: TDateTime;
@@ -281,6 +281,7 @@ begin
       SQL := 'select * from orders where ORDER_ID = ' + ORDER_ID;
       logger.Log(5, 'Retrieving order type with SQL: ' + SQL);
       doQuery(ordersDB.UniQuery1, SQL);
+      MemoField := 'general_special_instructions';
       if ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString  = 'corrugated_plate' then
       begin
         table := 'corrugated_plate_orders';
@@ -288,6 +289,7 @@ begin
       else if ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString  = 'web_plate' then
       begin
         table := 'web_plate_orders';
+        MemoField := 'general_comments';
       end
       else
         table := 'cutting_die_orders';
@@ -320,12 +322,30 @@ begin
 
       estimateJSON.AddPair('BillAddr', BillAddrJSON);
 
-      CustomField.AddPair('DefinitionId', '1');
-      CustomField.AddPair('Name', 'CUSTID');
-      CustomField.AddPair('Type', 'StringType');
-      CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString);
+      SQL := 'SELECT CUST_FIELD_NAME, CUST_FIELD_TYPE, CUST_FIELD_DEFINITION_ID FROM custom_fields';
+      doQuery(ordersDB.UniQuery2, SQL);
+
+      ordersDB.UniQuery2.First;
+      while not ordersDB.UniQuery2.Eof do
+      begin
+        CustomField := TJSONObject.Create;
+
 
-      CustomFields.AddElement(CustomField);
+        CustomField.AddPair('DefinitionId', ordersDB.UniQuery2.FieldByName('CUST_FIELD_DEFINITION_ID').AsString);
+        CustomField.AddPair('Name', ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString);
+        CustomField.AddPair('Type', ordersDB.UniQuery2.FieldByName('CUST_FIELD_TYPE').AsString);
+
+        if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'CUSTID' then
+          CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString)
+        else if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'MEMO' then
+          CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName(MemoField).AsString)
+        else if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'CUSTOMER PO#' then
+          CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName('staff_fields_po_number').AsString);
+
+        CustomFields.AddElement(CustomField);
+
+        ordersDB.UniQuery2.Next;
+      end;
 
       EstimateJSON.AddPair('CustomField', CustomFields);
 
@@ -397,7 +417,7 @@ begin
       AccessToken := iniFile.ReadString('Quickbooks', 'AccessToken', '');
 
       restRequest.Method := rmPOST;
-      res := '/v3/company/' + companyID + '/estimate';
+      res := '/v3/company/' + companyID + '/estimate?minorversion=75';
       restRequest.Resource := res;
 
       param := restRequest.Params.AddItem;
@@ -411,6 +431,7 @@ begin
       logger.Log(5, 'Executing rest request with JSON: ' + estimateJSON.ToJSON);
       restRequest.Execute;
 
+      logger.Log(5, 'Rest Response: ' + restResponse.JSONText);
       jsValue := restResponse.JSONValue;
 
       jsObj := TJSONObject(jsValue).GetValue<TJSONObject>('Estimate');

kgOrdersServer/Source/qbAPI.pas

@@ -537,7 +537,7 @@ begin
   end;
 
   restRequest.Method := rmGET;
-  res := '/v3/company/' + companyid + '/customer/58';
+  res := '/v3/company/' + companyid + '/customer/58?include=enhancedAllCustomFields';
   restRequest.Resource := res;
 
   param := restRequest.Params.AddItem;
@@ -988,7 +988,7 @@ begin
   end;
 
   restRequest.Method := rmGET;
-  res := '/v3/company/' + companyID + '/query?query=select * from estimate where DocNumber = ' + quotedStr('1002') + '&minorversion=75';
+  res := '/v3/company/' + companyID + '/query?query=select * from estimate&minorversion=75&include=enhancedAllCustomFields'; //where DocNumber = ' + quotedStr('1002') + '&minorversion=75';
   restRequest.Resource := res;