kgOrdersTest v0.9.15.3 deployed

kgOrdersClient/ConnectionModule.pas

@@ -19,7 +19,7 @@ type
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
 
   public
-    const clientVersion = '0.9.15.1';
+    const clientVersion = '0.9.15.3';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
     procedure SetClientConfig(Callback: TVersionCheckCallback);

kgOrdersClient/Utils.pas

@@ -92,6 +92,12 @@ end;
 procedure ShowErrorModal(msg: string);
 begin
   HideSpinner('spinner');
+  if msg = '' then
+  begin
+    msg :=  'Error connecting to EM Sytems Server.' + slinebreak +
+            'Please contact EM Systems Support.'
+  end;
+
   asm
     var modal = document.getElementById('main_errormodal');
     var label = document.getElementById('main_lblmodal_body');

kgOrdersClient/View.Customer.Add.dfm

@@ -23,7 +23,7 @@ object FViewAddCustomer: TFViewAddCustomer
     WidthPercent = 100.000000000000000000
     OnChange = edtShortNameChange
     DataField = 'SHORT_NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtName: TWebDBEdit
     Left = 19
@@ -36,7 +36,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'NAME'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtBillAddress: TWebDBEdit
     Left = 19
@@ -49,7 +49,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'BILL_ADDRESS'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtBillCity: TWebDBEdit
     Left = 19
@@ -62,7 +62,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'BILL_CITY'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtBillState: TWebDBEdit
     Left = 19
@@ -75,7 +75,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'BILL_STATE'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtBillZip: TWebDBEdit
     Left = 19
@@ -88,7 +88,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'BILL_ZIP'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtBillContact: TWebDBEdit
     Left = 19
@@ -101,7 +101,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'BILL_CONTACT'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object btnSave: TWebButton
     Left = 19
@@ -165,8 +165,9 @@ object FViewAddCustomer: TFViewAddCustomer
     Enabled = False
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnChange = edtCustomerIDChange
     DataField = 'CUSTOMER_ID'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object edtQBID: TWebDBEdit
     Left = 151
@@ -179,7 +180,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'QB_LIST_ID'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object memoAddressBlock: TWebMemo
     Left = 162
@@ -309,7 +310,7 @@ object FViewAddCustomer: TFViewAddCustomer
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     DataField = 'QB_TYPE'
-    DataSource = WebDataSource1
+    DataSource = wdsCustomer
   end
   object wdbtcAddresses: TWebDBTableControl
     Left = 310
@@ -465,56 +466,55 @@ object FViewAddCustomer: TFViewAddCustomer
     Left = 454
     Top = 72
   end
-  object WebDataSource1: TWebDataSource
-    AutoEdit = False
-    DataSet = XDataWebDataSet1
+  object wdsCustomer: TWebDataSource
+    DataSet = xdwdsCustomer
     Left = 532
     Top = 126
   end
-  object XDataWebDataSet1: TXDataWebDataSet
+  object xdwdsCustomer: TXDataWebDataSet
     Connection = DMConnection.ApiConnection
     Left = 426
     Top = 132
-    object XDataWebDataSet1SHORT_NAME: TStringField
+    object xdwdsCustomerSHORT_NAME: TStringField
       FieldName = 'SHORT_NAME'
     end
-    object XDataWebDataSet1NAME: TStringField
+    object xdwdsCustomerNAME: TStringField
       FieldName = 'NAME'
     end
-    object XDataWebDataSet1BILL_ADDRESS: TStringField
+    object xdwdsCustomerBILL_ADDRESS: TStringField
       FieldName = 'BILL_ADDRESS'
     end
-    object XDataWebDataSet1BILL_CITY: TStringField
+    object xdwdsCustomerBILL_CITY: TStringField
       FieldName = 'BILL_CITY'
     end
-    object XDataWebDataSet1BILL_STATE: TStringField
+    object xdwdsCustomerBILL_STATE: TStringField
       FieldName = 'BILL_STATE'
     end
-    object XDataWebDataSet1BILL_CONTACT: TStringField
+    object xdwdsCustomerBILL_CONTACT: TStringField
       FieldName = 'BILL_CONTACT'
     end
-    object XDataWebDataSet1BILL_ZIP: TStringField
+    object xdwdsCustomerBILL_ZIP: TStringField
       FieldName = 'BILL_ZIP'
     end
-    object XDataWebDataSet1START_DATE: TStringField
+    object xdwdsCustomerSTART_DATE: TStringField
       FieldName = 'START_DATE'
     end
-    object XDataWebDataSet1QB_LIST_ID: TStringField
+    object xdwdsCustomerQB_LIST_ID: TStringField
       FieldName = 'QB_LIST_ID'
     end
-    object XDataWebDataSet1END_DATE: TStringField
+    object xdwdsCustomerEND_DATE: TStringField
       FieldName = 'END_DATE'
     end
-    object XDataWebDataSet1FAX: TStringField
+    object xdwdsCustomerFAX: TStringField
       FieldName = 'FAX'
     end
-    object XDataWebDataSet1PHONE: TStringField
+    object xdwdsCustomerPHONE: TStringField
       FieldName = 'PHONE'
     end
-    object XDataWebDataSet1CUSTOMER_ID: TIntegerField
+    object xdwdsCustomerCUSTOMER_ID: TIntegerField
       FieldName = 'CUSTOMER_ID'
     end
-    object XDataWebDataSet1QB_TYPE: TStringField
+    object xdwdsCustomerQB_TYPE: TStringField
       FieldName = 'QB_TYPE'
     end
   end

kgOrdersClient/View.Items.pas

@@ -506,15 +506,16 @@ end;
 
 procedure TFViewItems.btnDeleteClick(Sender: TObject);
 begin
-  ShowNotificationModal('Deleting items is not yet implemented.');
+  ShowToast('Deleting items is not yet implemented.', 'info');
 end;
 
 procedure TFViewItems.btnUpdateClick(Sender: TObject);
 var
-  itemOptions: string;
+  itemOptions, AccessType: string;
   newform: TFViewAddItem;
 begin
-  if JS.toString(AuthService.TokenPayload.Properties['user_access_type']) = 'ADMIN' then
+  AccessType := JS.toString(AuthService.TokenPayload.Properties['user_access_type']);
+  if( ( AccessType =  'ADMIN' ) or ( AccessType = 'QBUSR' ) ) then
   begin
     UpdateItem();
   end

kgOrdersClient/View.Login.pas

@@ -54,7 +54,7 @@ procedure TFViewLogin.btnLoginClick(Sender: TObject);
 
   procedure LoginError(AMsg: string);
   begin
-    ShowNotification('Login Error: ' + AMsg);
+    ShowNotification(AMsg);
   end;
 var
   hashPW: string;

kgOrdersClient/View.Main.dfm

@@ -74,6 +74,7 @@ object FViewMain: TFViewMain
     Height = 14
     ElementID = 'dropdown.menu.itemlist'
     ElementFont = efCSS
+    Enabled = False
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     OnClick = lblItemsListClick
@@ -86,6 +87,7 @@ object FViewMain: TFViewMain
     Height = 14
     ElementID = 'dropdown.menu.users'
     ElementFont = efCSS
+    Enabled = False
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
     OnClick = lblUsersClick
@@ -114,6 +116,7 @@ object FViewMain: TFViewMain
     ElementID = 'lblcustomers'
     ElementFont = efCSS
     ElementPosition = epRelative
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
@@ -140,6 +143,7 @@ object FViewMain: TFViewMain
     Caption = 'QB Info'
     ElementID = 'dropdown.menu.linktoqb'
     ElementFont = efCSS
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000

kgOrdersClient/View.Main.pas

@@ -92,7 +92,7 @@ uses
 
 procedure TFViewMain.WebFormCreate(Sender: TObject);
 var
-  userName: string;
+  userName, AccessType: string;
   test: boolean;
 begin
   FUserInfo := GetUserInfo;
@@ -100,14 +100,20 @@ begin
   lblUsername.Caption := ' ' + userName.ToLower + ' ';
   FChildForm := nil;
   change := false;
+  AccessType := JS.toString(AuthService.TokenPayload.Properties['user_access_type']);
 
-  if (not (JS.toString(AuthService.TokenPayload.Properties['user_access_type']) = 'ADMIN'))  then
+  if ( AccessType = 'ADMIN' )  then
   begin
-    lblUsers.enabled := false;
-    lblQBInfo.Enabled := false;
-    lblCustomers.Enabled := false;
-    lblItemsList.Enabled := false;
+    lblUsers.enabled := true;
+    lblCustomers.Enabled := true;
+    lblItemsList.Enabled := true;
   end;
+
+  if( ( AccessType =  'ADMIN' ) or ( AccessType = 'QBUSR' ) ) then
+  begin
+    lblQBInfo.Enabled := true;
+  end;
+
   lblAppTitle.Caption := 'Koehler-Gibson Orders';
   lblVersion.Caption := 'v' + DMConnection.clientVersion;
   ShowForm(TFViewOrders);

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -390,8 +390,10 @@ procedure TFOrderEntryCorrugated.btnQBClick(Sender: TObject);
 var
   orderJSON: TJSONObject;
   qbEnabled: boolean;
+  AccessType: string;
 begin
-  if JS.toString(AuthService.TokenPayload.Properties['user_access_type']) = 'ADMIN' then
+  AccessType := JS.toString(AuthService.TokenPayload.Properties['user_access_type']);
+  if( ( AccessType =  'ADMIN' ) or ( AccessType = 'QBUSR' ) ) then
   begin
     if ( VerifyQBOrder() )then
     begin
@@ -513,6 +515,10 @@ begin
   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';
 
   ShowToast(string(jsObj.Properties['status']));
@@ -788,7 +794,7 @@ begin
 
     container := TJSHTMLElement(document.getElementById('additionalFields'));
     if Assigned(container) then
-      container.innerHTML := '';  // Wipe previous content
+      container.innerHTML := '';  // Wipe previous colors
 
     if xdwdsOrdercolors_colors.Value <> '' then
     begin
@@ -801,6 +807,7 @@ begin
       end;
     end;
 
+
     if xdwdsOrder.FieldByName('mounting_loose').AsString <> '' then
       cbLoose.Checked := true;
 

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -194,8 +194,10 @@ procedure TFOrderEntryCuttingDie.btnQBClick(Sender: TObject);
 var
   orderJSON: TJSONObject;
   qbEnabled: boolean;
+  AccessType: string;
 begin
-  if JS.toString(AuthService.TokenPayload.Properties['user_access_type']) = 'ADMIN' then
+  AccessType := JS.toString(AuthService.TokenPayload.Properties['user_access_type']);
+  if( ( AccessType =  'ADMIN' ) or ( AccessType = 'QBUSR' ) ) then
   begin
     if ( VerifyQBOrder() )then
     begin
@@ -428,6 +430,7 @@ begin
     xdwdsOrder.Close;
     xdwdsOrder.SetJsonData(jsObj);
     xdwdsOrder.Open;
+    OrderID := xdwdsOrderORDER_ID.AsString;
 
     mode := 'EDIT';
     ShowToast(String(jsObj.Properties['status']));
@@ -488,8 +491,8 @@ begin
       if confirmed then
       begin
         FViewMain.change := false;
-        if xdwdsOrder.FieldByName('ORDER_ID').AsString <> '' then
-          FViewMain.ViewOrderEntryCuttingDie(xdwdsOrder.FieldByName('ORDER_ID').AsString, '', 'EDIT', 'Failure:  Changes Discarded')
+        if orderID <> '' then
+          FViewMain.ViewOrderEntryCuttingDie(orderID, '', 'EDIT', 'Failure:  Changes Discarded')
         else
           FViewMain.ViewOrders('');
       end;

kgOrdersClient/View.OrderEntryWeb.pas

@@ -454,8 +454,10 @@ procedure TFOrderEntryWeb.btnQBClick(Sender: TObject);
 var
   orderJSON: TJSONObject;
   qbEnabled: boolean;
+  AccessType: string;
 begin
-  if JS.toString(AuthService.TokenPayload.Properties['user_access_type']) = 'ADMIN' then
+  AccessType := JS.toString(AuthService.TokenPayload.Properties['user_access_type']);
+  if( ( AccessType =  'ADMIN' ) or ( AccessType = 'QBUSR' ) ) then
   begin
     if ( VerifyQBOrder() )then
     begin
@@ -597,6 +599,7 @@ begin
     xdwdsOrder.Open;
 
     mode := 'EDIT';
+    OrderID := xdwdsOrderORDER_ID.AsString;
     ShowToast(String(jsObj.Properties['status']));
   except
     on E: EXDataClientRequestException do
@@ -768,6 +771,7 @@ var
   colorList: TJSArray;
   color: TJSObject;
   items: TJSObject;
+  container: TJSHTMLElement;
 begin
   Utils.ShowSpinner('spinner');
   try
@@ -779,6 +783,10 @@ begin
     xdwdsOrder.SetJsonData(order);
     xdwdsOrder.Open;
 
+    container := TJSHTMLElement(document.getElementById('additionalFields'));
+    if Assigned(container) then
+      container.innerHTML := '';  // Wipe previous colors
+
     if xdwdsOrderquantity_and_colors_qty_colors.Value <> '' then
     begin
       colorObject := TJSObject(TJSJSON.parse(xdwdsOrderquantity_and_colors_qty_colors.Value));
@@ -875,6 +883,7 @@ begin
   btnCancel.Enabled := True;
   btnEdit.Enabled := false;
   btnAdd.Enabled := false;
+  btnQB.Enabled := false;
 
   cbPdf.Enabled := True;
   cbInkJet.Enabled := True;
@@ -912,6 +921,7 @@ begin
   btnCancel.Enabled := false;
   btnEdit.Enabled := true;
   btnAdd.Enabled := true;
+  btnQB.Enabled := true;
   FViewMain.change := false;
 
   cbPdf.Enabled := False;

kgOrdersClient/View.Orders.pas

@@ -14,7 +14,7 @@ uses
   WEBLib.JSON, Auth.Service, XData.Web.Client, WebLib.Storage,
   ConnectionModule, App.Types, Vcl.StdCtrls, Vcl.Controls, WEBLib.DBCtrls,
   XData.Web.JsonDataset, WEBLib.DB, Data.DB, XData.Web.Dataset, XData.Web.DatasetCommon,
-  WEBLib.Grids, VCL.Forms;
+  WEBLib.Grids, VCL.Forms, Math;
 
 type
   TFViewOrders = class(TWebForm)
@@ -552,8 +552,15 @@ end;
 
 
 procedure TFViewOrders.wcbPageSizeChange(Sender: TObject);
+var
+  ratio: double;
 begin
+  ratio := PageSize/StrToInt(wcbPageSize.Text);
   PageSize := StrToInt(wcbPageSize.Text);
+  if ratio < 1 then
+    PageNumber := Ceil(PageNumber * ratio)
+  else
+    PageNumber := Ceil(PageNumber * ratio) - Trunc(ratio) + 1;
   getOrders(generateSearchOptions());
 end;
 

kgOrdersClient/View.SetStatus.pas

@@ -220,7 +220,7 @@ begin
     else if wlcbStatus.DisplayText = 'Plate Done' then
     begin
       dtpPlateDue.Date := plateDue;
-      dtpShipDue.Date := plateDue;
+      dtpShipDue.Date := dtpDate.Date;
     end
     else if wlcbStatus.DisplayText = 'Ship Done' then
     begin
@@ -235,10 +235,6 @@ begin
     begin
       dtpShipDue.Date := shipDue;
     end
-    else if wlcbStatus.DisplayText = 'Art Done' then
-    begin
-      dtpShipDue.Date := dtpDate.Date;
-    end
     else if wlcbStatus.DisplayText = 'Ship Done' then
     begin
       dtpShipDue.Date := shipDue;

kgOrdersClient/View.User.Add.dfm

@@ -195,23 +195,9 @@ object FViewEditUser: TFViewEditUser
     ChildOrder = 19
     ElementID = 'edtrights'
     HeightPercent = 100.000000000000000000
+    MaxLength = 11
     WidthPercent = 100.000000000000000000
   end
-  object cbAccess: TWebComboBox
-    Left = 346
-    Top = 90
-    Width = 145
-    Height = 23
-    ElementID = 'cbaccess'
-    HeightPercent = 100.000000000000000000
-    TabStop = False
-    WidthPercent = 100.000000000000000000
-    ItemIndex = -1
-    Items.Strings = (
-      'SALES'
-      'USER'
-      'ADMIN')
-  end
   object edtQB: TWebEdit
     Left = 346
     Top = 62
@@ -223,6 +209,33 @@ object FViewEditUser: TFViewEditUser
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
+  object cbAccess: TWebLookupComboBox
+    Left = 346
+    Top = 93
+    Width = 145
+    Height = 22
+    ElementID = 'cbaccess'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    ItemIndex = -1
+    LookupValues = <
+      item
+        Value = 'ADMIN'
+        DisplayText = 'Admin'
+      end
+      item
+        Value = 'USER'
+        DisplayText = 'User'
+      end
+      item
+        Value = 'SALES'
+        DisplayText = 'Sales User'
+      end
+      item
+        Value = 'QBUSR'
+        DisplayText = 'QB User'
+      end>
+  end
   object XDataWebClient1: TXDataWebClient
     Connection = DMConnection.ApiConnection
     Left = 514

kgOrdersClient/View.User.Add.pas

@@ -29,9 +29,9 @@ type
     lblRights: TWebLabel;
     edtRights: TWebEdit;
     lblAccess: TWebLabel;
-    cbAccess: TWebComboBox;
     lblQB: TWebLabel;
     edtQB: TWebEdit;
+    cbAccess: TWebLookupComboBox;
     procedure WebFormCreate(Sender: TObject);
     procedure btnConfirmClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
@@ -90,7 +90,7 @@ begin
               '&password=' + edtPassword.Text +
               '&status=' + BoolToStr(cbStatus.Checked) +
               '&email=' + edtEmail.Text +
-              '&access=' + cbAccess.Text +
+              '&access=' + cbAccess.Value +
               '&newuser=' + edtUsername.Text +
               '&rights=' + edtRights.Text +
               '&QB=' + edtQB.Text;
@@ -123,7 +123,7 @@ begin
                   '&password=' + edtPassword.Text +
                   '&status=' + BoolToStr(cbStatus.Checked) +
                   '&email=' + edtEmail.Text +
-                  '&access=' + cbAccess.Text +
+                  '&access=' + cbAccess.Value +
                   '&newuser=' + edtUsername.Text +
                   '&rights=' + edtRights.Text +
                   '&QB=' + edtQB.Text;
@@ -176,7 +176,10 @@ begin
     edtPassword.Text := 'hidden';
   end;
   edtEmail.Text := Email;
-  cbAccess.Text := Access;
+  if Access = '' then
+    cbAccess.Value := 'USER'
+  else
+    cbAccess.Value := Access;
   edtRights.Text := Rights;
   edtQB.Text :=  QB;
   if Status = 'ACTIVE' then

kgOrdersClient/webKGOrders.dpr

@@ -65,6 +65,9 @@ end;
 
 procedure UnauthorizedAccessProc(AMessage: string);
 begin
+  if Pos('JWT', AMessage) > 0 then
+    DisplayLoginView('Login token expired! Please login again')
+  else
     DisplayLoginView(AMessage);
 end;
 
@@ -110,6 +113,9 @@ begin
 //                location.replace(base + "?ver=" + ClientVer + "&r=" + Date.now() + location.hash);
 //              });
 //            end;
+            if Pos('version', ErrorMessage) > 0 then
+              ShowMessage( ErrorMessage )
+            else
               ShowMessage( 'Error connecting to kgOrdersServer' + sLineBreak + 'Please contact EM Systems support' );
           end;
         end);

kgOrdersServer/Source/Auth.Database.pas

@@ -48,14 +48,13 @@ uses
 procedure TAuthDatabase.DataModuleCreate(Sender: TObject);
 begin
   Logger.Log( 5, 'TAuthDatabase.DataModuleCreate' );
-  LoadDatabaseSettings( ucKG );
   try
+    LoadDatabaseSettings( ucKG );
     ucKG.Connect;
   except
     on E: Exception do
     begin
       Logger.Log( 1, '--TAuthDatabase.DataModuleCreate -Error connecting to database: ' + E.Message );
-      raise; //EXDataHttpException.Create(500, 'Error Connecting to database! Please try again later or contact a system admin!');
     end;
   end;
 end;

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -54,7 +54,7 @@ begin
     if not authDB.ucKG.Connected then
     begin
       Logger.Log(1, 'Unable to connect to the database: A KGOrders Server Error has occured!');
-      raise EXDataHttpException.Create(500, 'Unable to create Auth database: A KGOrders Server Error has occured!');
+      raise EXDataHttpException.Create(500, 'Unable to connect to the database: A KGOrders Server Error has occured!');
     end;
   except
     on E: Exception do
@@ -63,6 +63,9 @@ begin
       raise; //EXDataHttpException.Create(500, 'Unable to create Auth database: A KGOrders Server Error has occured!');
     end;
   end;
+
+
+
 end;
 
 
@@ -93,7 +96,7 @@ begin
       Result.AddPair('error',
         'webApp version mismatch' + sLineBreak + '  Client version: ' + clientVersion  +
          sLineBreak + '  Server version: ' + webClientVersion +
-         sLineBreak + 'Please click button to clear cache and reload.');
+         sLineBreak + 'Please clear cache and reload.');
     end;
   finally
     iniFile.Free;

kgOrdersServer/Source/rOrderCorrugated.pas

@@ -156,15 +156,15 @@ var
   colorArray: TJSONArray;
   colorsObject, colorObject: TJSONObject;
   colorsString: string;
-  i: Integer;
+  i, maxColors: Integer;
 begin
   logger.Log( 5, 'TrptOrderCorrugated.PopulateColorTable' );
-
+  maxColors := 13;
   colorsString := uqOrderCorrugated.FieldByName('colors_colors').AsString;
   colorsObject :=  TJSONObject.ParseJSONValue(colorsString) as TJSONObject;
   colorArray := TJSONArray(colorsObject.GetValue<TJSONArray>('items'));
 
-  for i := 0 to colorArray.Count - 1 do
+  for i := 0 to maxColors - 1 do
   begin
     row := frxOrderCorrugated.FindObject('ColorRow' + IntToStr(i + 1)) as TfrxCustomTableRow;
     colorObject := colorArray.Items[i] as TJSONObject;

kgOrdersServer/Source/rOrderList.dfm

@@ -401,11 +401,10 @@ object rptOrderList: TrptOrderList
           Left = 941.480349130000000000
           Top = 7.559060000000000000
           Width = 45.354330710000000000
-          Height = 30.236220472440900000
+          Height = 30.236220470000000000
           StretchMode = smActualHeight
           ContentScaleOptions.Constraints.MaxIterationValue = 0
           ContentScaleOptions.Constraints.MinIterationValue = 0
-          DataField = 'QB_REF_NUM'
           DataSet = frxDBOrders
           DataSetName = 'frxDBOrders'
           Font.Charset = DEFAULT_CHARSET
@@ -415,7 +414,7 @@ object rptOrderList: TrptOrderList
           Font.Style = []
           Frame.Typ = []
           Memo.UTF8W = (
-            '[frxDBOrders."QB_REF_NUM"]')
+            '[frxDBOrders."QB_ORDER_NUM"]')
           ParentFont = False
         end
         object Memo56: TfrxMemoView
@@ -1217,11 +1216,6 @@ object rptOrderList: TrptOrderList
       FieldName = 'PRICE'
       Required = True
     end
-    object uqOrdersQB_REF_NUM: TStringField
-      FieldName = 'QB_REF_NUM'
-      ReadOnly = True
-      Size = 24
-    end
     object uqOrdersCOLORS: TStringField
       FieldKind = fkCalculated
       FieldName = 'COLORS'
@@ -1271,6 +1265,10 @@ object rptOrderList: TrptOrderList
     object uqOrdersORDER_DATE: TDateField
       FieldName = 'ORDER_DATE'
     end
+    object uqOrdersQB_ORDER_NUM: TStringField
+      FieldName = 'QB_ORDER_NUM'
+      Size = 50
+    end
   end
   object frxDBOrders: TfrxDBDataset
     UserName = 'frxDBOrders'
@@ -1280,6 +1278,126 @@ object rptOrderList: TrptOrderList
     DataSetOptions = []
     Left = 444
     Top = 232
+    FieldDefs = <
+      item
+        FieldName = 'ORDER_ID'
+      end
+      item
+        FieldName = 'Loc'
+        FieldType = fftString
+        Size = 16
+      end
+      item
+        FieldName = 'COMPANY_NAME'
+        FieldType = fftString
+        Size = 90
+      end
+      item
+        FieldName = 'JOB_NAME'
+        FieldType = fftString
+        Size = 128
+      end
+      item
+        FieldName = 'ORDER_TYPE'
+        FieldType = fftString
+        Size = 45
+      end
+      item
+        FieldName = 'PROOF_DUE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'PROOF_DONE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'ART_DUE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'ART_DONE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'PLATE_DUE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'PLATE_DONE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'MOUNT_DUE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'MOUNT_DONE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'SHIP_DUE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'SHIP_DONE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'PRICE'
+      end
+      item
+        FieldName = 'COLORS'
+        FieldType = fftString
+      end
+      item
+        FieldName = 'po_number'
+        FieldType = fftString
+        Size = 16
+      end
+      item
+        FieldName = 'quickbooks_item'
+        FieldType = fftString
+        Size = 45
+      end
+      item
+        FieldName = 'NEW_ORDER_DATE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'NEW_PROOF_DONE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'NEW_ART_DONE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'NEW_PLATE_DONE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'NEW_MOUNT_DONE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'NEW_SHIP_DONE'
+        FieldType = fftString
+        Size = 20
+      end
+      item
+        FieldName = 'ORDER_DATE'
+        FieldType = fftDateTime
+      end
+      item
+        FieldName = 'QB_ORDER_NUM'
+        FieldType = fftString
+        Size = 50
+      end>
   end
   object uqColors: TUniQuery
     Connection = ucKG

kgOrdersServer/Source/rOrderList.pas

@@ -30,7 +30,6 @@ type
     uqOrdersSHIP_DUE: TDateField;
     uqOrdersSHIP_DONE: TDateTimeField;
     uqOrdersPRICE: TFloatField;
-    uqOrdersQB_REF_NUM: TStringField;
     uqOrdersCOLORS: TStringField;
     uqColors: TUniQuery;
     uqOrderspo_number: TStringField;
@@ -42,6 +41,7 @@ type
     uqOrdersNEW_MOUNT_DONE: TStringField;
     uqOrdersNEW_SHIP_DONE: TStringField;
     uqOrdersORDER_DATE: TDateField;
+    uqOrdersQB_ORDER_NUM: TStringField;
     procedure DataModuleCreate(Sender: TObject);
     procedure uqOrdersCalcFields(DataSet: TDataSet);
 

kgOrdersServer/Source/rOrderWeb.pas

@@ -155,15 +155,16 @@ var
   colorArray: TJSONArray;
   colorsObject, colorObject: TJSONObject;
   colorsString: string;
-  i: Integer;
+  i, maxColors: Integer;
 begin
+  maxColors := 10;
   logger.Log( 5, 'TrptOrderWeb.PopulateColorTable' );
 
   colorsString := uqOrderWeb.FieldByName('quantity_and_colors_qty_colors').AsString;
   colorsObject :=  TJSONObject.ParseJSONValue(colorsString) as TJSONObject;
   colorArray := TJSONArray(colorsObject.GetValue<TJSONArray>('items'));
 
-  for i := 0 to colorArray.Count - 1 do
+  for i := 0 to maxColors - 1 do
   begin
     row := frxOrderWeb.FindObject('ColorRow' + IntToStr(i + 1)) as TfrxCustomTableRow;
     colorObject := colorArray.Items[i] as TJSONObject;

kgOrdersServer/kgOrdersServer.dproj

@@ -114,11 +114,11 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_ExeOutput>.\bin</DCC_ExeOutput>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.15.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.15.3;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_Release>15</VerInfo_Release>
-        <VerInfo_Build>1</VerInfo_Build>
+        <VerInfo_Build>3</VerInfo_Build>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>