v9.15.0 deployed

kgOrdersClient/ConnectionModule.pas

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

kgOrdersClient/View.Items.pas

@@ -470,7 +470,6 @@ begin
       end;
     end
   );
-end
 end;
 
 procedure TFViewItems.btnCancelClick(Sender: TObject);

kgOrdersClient/View.OrderEntryCorrugated.dfm

@@ -805,7 +805,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     ItemIndex = -1
     DataField = 'staff_fields_ship_to'
     DataSource = wdsOrder
-    ListField = 'ADDRESS'
+    ListField = 'ship_block'
     ListSource = wdsShipTo
   end
   object btnCancel: TWebButton
@@ -1660,8 +1660,9 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
   object xdwdsShipTo: TXDataWebDataSet
     Left = 1096
     Top = 40
-    object xdwdsShipToADDRESS: TStringField
-      FieldName = 'ADDRESS'
+    object xdwdsShipToship_block: TStringField
+      DisplayWidth = 500
+      FieldName = 'ship_block'
     end
   end
   object wdsQBItem: TWebDataSource

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -140,7 +140,6 @@ type
     xdwdsOrderADDRESS_LIST: TStringField;
     wdsShipTo: TWebDataSource;
     xdwdsShipTo: TXDataWebDataSet;
-    xdwdsShipToADDRESS: TStringField;
     wdbcbShipTo: TWebDBComboBox;
     xdwdsOrdersupplied_by_customer_order_date: TStringField;
     btnCancel: TWebButton;
@@ -205,6 +204,7 @@ type
     btnQB: TWebButton;
     xdwdsOrderIN_QB: TStringField;
     xdwdsOrderQB_ORDER_NUM: TStringField;
+    xdwdsShipToship_block: TStringField;
     procedure WebFormCreate(Sender: TObject);
     [async] procedure getOrder(Order_ID: string);
     [async] procedure SetEmptyOrderInfo(customerID: string);
@@ -783,6 +783,7 @@ begin
     xdwdsOrder.Close;
     xdwdsOrder.SetJsonData(order);
     xdwdsOrder.Open;
+    console.log(order);
 
     container := TJSHTMLElement(document.getElementById('additionalFields'));
     if Assigned(container) then
@@ -807,6 +808,7 @@ begin
 
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [xdwdsOrder.FieldByName('COMPANY_ID').AsString]));
     customer :=  TJSObject(xdcResponse.Result);
+    console.log(customer);
 
     xdwdsShipTo.Close;
     xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
@@ -842,6 +844,7 @@ begin
   try
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomer', [customerID]));
     customer :=  TJSObject(xdcResponse.Result);
+    console.log(customer);
     xdwdsOrder.Close;
     xdwdsOrder.SetJsonData(customer);
     xdwdsOrder.Open;

kgOrdersClient/View.OrderEntryCuttingDie.dfm

@@ -133,7 +133,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     ItemIndex = -1
     DataField = 'staff_fields_ship_to'
     DataSource = wdsOrder
-    ListField = 'ADDRESS'
+    ListField = 'ship_block'
     ListSource = wdsShipTo
   end
   object edtPONumber: TWebDBEdit
@@ -505,8 +505,8 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
   object xdwdsShipTo: TXDataWebDataSet
     Left = 528
     Top = 26
-    object xdwdsShipToADDRESS: TStringField
-      FieldName = 'ADDRESS'
+    object xdwdsShipToship_block: TStringField
+      FieldName = 'ship_block'
     end
   end
   object wdsQBItem: TWebDataSource

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -40,7 +40,6 @@ type
     edtJobName: TWebDBEdit;
     wdsShipTo: TWebDataSource;
     xdwdsShipTo: TXDataWebDataSet;
-    xdwdsShipToADDRESS: TStringField;
     WebLabel9: TWebLabel;
     edtSpecialInstructions: TWebDBEdit;
     btnSave: TWebButton;
@@ -79,6 +78,7 @@ type
     xdwdsQBItemdescription: TStringField;
     edtQBItemDescription: TWebEdit;
     wcbQBItem: TWebDBComboBox;
+    xdwdsShipToship_block: TStringField;
     procedure btnSaveClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure WebFormCreate(Sender: TObject);

kgOrdersClient/View.OrderEntryWeb.dfm

@@ -257,7 +257,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ItemIndex = -1
     DataField = 'staff_fields_ship_to'
     DataSource = wdsOrder
-    ListField = 'ADDRESS'
+    ListField = 'ship_block'
     ListSource = wdsShipTo
   end
   object edtBWorColorCopy: TWebDBEdit
@@ -1732,8 +1732,8 @@ object FOrderEntryWeb: TFOrderEntryWeb
   object xdwdsShipTo: TXDataWebDataSet
     Left = 322
     Top = 6
-    object xdwdsShipToADDRESS: TStringField
-      FieldName = 'ADDRESS'
+    object xdwdsShipToship_block: TStringField
+      FieldName = 'ship_block'
     end
   end
   object wdsQBItem: TWebDataSource

kgOrdersClient/View.OrderEntryWeb.pas

@@ -50,7 +50,6 @@ type
     wdbcbShipTo: TWebDBComboBox;
     wdsShipTo: TWebDataSource;
     xdwdsShipTo: TXDataWebDataSet;
-    xdwdsShipToADDRESS: TStringField;
     WebLabel3: TWebLabel;
     edtBWorColorCopy: TWebDBEdit;
     edtPlates: TWebDBEdit;
@@ -211,6 +210,7 @@ type
     xdwdsQBItemID: TStringField;
     btnQB: TWebButton;
     dtpArtDue: TWebDBDateTimePicker;
+    xdwdsShipToship_block: TStringField;
     procedure WebFormCreate(Sender: TObject);
     [async] procedure getOrder(Order_ID: string);
     [async] procedure SetNewOrderInfo(customerID: string);
@@ -794,7 +794,7 @@ begin
         [xdwdsOrder.FieldByName('COMPANY_ID').AsString]));
     customer :=  TJSObject(xdcResponse.Result);
     customer_qb_id := string(customer['QB_LIST_ID']);
-
+    console.log(customer);
     xdwdsShipTo.Close;
     xdwdsShipTo.SetJSONData(customer['SHIPPING_ADDRESS_LIST']);
     xdwdsShipTo.Open;

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -1195,7 +1195,7 @@ var
   params: TStringList;
   PageNum, PageSize: Integer;
   OrderBy, offset, limit: string;
-  SQL, whereSQL: string;
+  SQL, whereSQL, repSQL: string;
   OrderID, CompanyID, JobName, orderType, cadFile: string;
   status1, status2: TStatusSearchInfo;
   ForPDF: Boolean;
@@ -1206,7 +1206,7 @@ begin
   params := TStringList.Create;
   status1 := nil;
   status2 := nil;
-  logger.log(3, 'TLookupService.generatingOrdersSQL');
+  logger.log(3, 'TLookupService.generatingOrdersSQL - start');
   try
     try
       params.StrictDelimiter := True;
@@ -1272,7 +1272,12 @@ begin
         whereSQL := whereSQL + ' AND cpo.layout_cad_file LIKE ' + QuotedStr('%' + cadFile + '%');
 
       if accessRights = 'SALES' then
-        whereSQL := whereSQL + ' AND c.REP_USER_ID = ' + userID;
+      begin
+        repSQL := 'SELECT * FROM users WHERE USER_ID = ' + userID;
+        doQuery(ordersDB.UniQuery2, repSQL);
+        whereSQL := whereSQL + ' AND c.QB_TYPE = ' + quotedStr(ordersDB.UniQuery2.FieldByName('QB_ID').AsString);
+        whereSQL := whereSQL + ' AND c.QB_TYPE <> ' + quotedStr('');
+      end;
 
       SQL := SQL + ' o.PRICE, qb.QB_REF_NUM, ' +
                    'COALESCE(cpo.staff_fields_po_number, wpo.staff_fields_po_number, cdo.staff_fields_po_number) AS po_number, ' +

kgOrdersServer/kgOrdersServer.dproj

@@ -114,10 +114,10 @@
         <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.14.0;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.0;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>14</VerInfo_Release>
+        <VerInfo_Release>15</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>