Skip to content

K
KGOrders
Commit a9c2147a by Cameron Hayes
Options

missed one log

parent 8fa96190
Showing with 41 additions and 24 deletions
kgOrdersServer/Source/Lookup.ServiceImpl.pas
...@@ -355,7 +355,7 @@ var ...@@ -355,7 +355,7 @@ var
ADDRESS_LIST: TJSONArray; ADDRESS_LIST: TJSONArray;
ADDRESS: TJSONObject; ADDRESS: TJSONObject;
begin begin
logger.Log(5, 'TLookupService.DelShippingAddress'); logger.Log(3, 'TLookupService.DelShippingAddress');
SQL := 'DELETE FROM customers_ship WHERE customer_ship_id = ' + AddressID; SQL := 'DELETE FROM customers_ship WHERE customer_ship_id = ' + AddressID;
OrdersDB.UniQuery1.SQL.Text := SQL; OrdersDB.UniQuery1.SQL.Text := SQL;
OrdersDB.UniQuery1.ExecSQL; OrdersDB.UniQuery1.ExecSQL;
...@@ -393,6 +393,7 @@ var ...@@ -393,6 +393,7 @@ var
PageNum, PageSize: integer; PageNum, PageSize: integer;
offset,limit: string; offset,limit: string;
begin begin
logger.Log(3, 'TLookupService.GetCustomers');
params := TStringList.Create; params := TStringList.Create;
params.StrictDelimiter := true; params.StrictDelimiter := true;
params.Delimiter := '&'; params.Delimiter := '&';
...@@ -462,6 +463,7 @@ var ...@@ -462,6 +463,7 @@ var
ADDRESS: TAddressItem; ADDRESS: TAddressItem;
USER: TUserItem; USER: TUserItem;
begin begin
logger.Log(3, 'TLookupService.GetCustomer');
try try
if ID = '' then if ID = '' then
SQL := 'select * FROM customers c LEFT JOIN customers_ship s ON c.CUSTOMER_ID = s.customer_id WHERE c.CUSTOMER_ID = -1' SQL := 'select * FROM customers c LEFT JOIN customers_ship s ON c.CUSTOMER_ID = s.customer_id WHERE c.CUSTOMER_ID = -1'
...@@ -520,18 +522,19 @@ var ...@@ -520,18 +522,19 @@ var
USER: TUserItem; USER: TUserItem;
SQL: string; SQL: string;
begin begin
SQL := 'SELECT USER_ID, NAME from users where QB_ID IS NOT NULL AND QB_ID <> ' + quotedStr(''); Logger.Log(3, 'TLookupService.GetRepUsers');
result := TList<TUserItem>.Create; SQL := 'SELECT USER_ID, NAME from users where QB_ID IS NOT NULL AND QB_ID <> ' + quotedStr('');
doQuery(ordersDB.UniQuery1, SQL); result := TList<TUserItem>.Create;
while not ordersDB.UniQuery1.Eof do doQuery(ordersDB.UniQuery1, SQL);
begin while not ordersDB.UniQuery1.Eof do
USER := TUserItem.Create; begin
TXDataOperationContext.Current.Handler.ManagedObjects.Add( USER ); USER := TUserItem.Create;
USER.userID := ordersDB.UniQuery1.FieldByName('USER_ID').AsString; TXDataOperationContext.Current.Handler.ManagedObjects.Add( USER );
USER.full_name := ordersDB.UniQuery1.FieldByName('NAME').AsString; USER.userID := ordersDB.UniQuery1.FieldByName('USER_ID').AsString;
result.Add(USER); USER.full_name := ordersDB.UniQuery1.FieldByName('NAME').AsString;
ordersDB.UniQuery1.Next; result.Add(USER);
end; ordersDB.UniQuery1.Next;
end;
end; end;
...@@ -543,7 +546,7 @@ var ...@@ -543,7 +546,7 @@ var
CompanyID, CompanyName: string; CompanyID, CompanyName: string;
params: TStringList; params: TStringList;
begin begin
logger.Log(5, 'TLookupService.GenerateOrderListPDF'); logger.Log(3, 'TLookupService.GenerateOrderListPDF');
rptOrderList := TrptOrderList.Create(nil); rptOrderList := TrptOrderList.Create(nil);
try try
try try
...@@ -603,7 +606,7 @@ var ...@@ -603,7 +606,7 @@ var
JSONArray: TJSONArray; JSONArray: TJSONArray;
Item: TAddressItem; Item: TAddressItem;
begin begin
logger.Log(5, 'TLookupSerivce.AddShippingAddress'); logger.Log(3, 'TLookupSerivce.AddShippingAddress');
result := TJSONObject.Create; result := TJSONObject.Create;
JSONData := TJSONObject.ParseJSONValue(AddressInfo) as TJSONObject; JSONData := TJSONObject.ParseJSONValue(AddressInfo) as TJSONObject;
if JSONData = nil then if JSONData = nil then
...@@ -696,6 +699,7 @@ var ...@@ -696,6 +699,7 @@ var
msg: string; msg: string;
unique: boolean; unique: boolean;
begin begin
logger.Log(3, 'TLookupService.AddCustomer');
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
DateFormat.DateSeparator := '-'; DateFormat.DateSeparator := '-';
...@@ -802,7 +806,7 @@ var ...@@ -802,7 +806,7 @@ var
rptOrderCorrugated: TrptOrderCorrugated; // Local instance of the report rptOrderCorrugated: TrptOrderCorrugated; // Local instance of the report
begin begin
rptOrderCorrugated := TrptOrderCorrugated.Create(nil); rptOrderCorrugated := TrptOrderCorrugated.Create(nil);
logger.Log(5, 'TLookupService.GenerateOrderCorrugatedPDF'); logger.Log(3, 'TLookupService.GenerateOrderCorrugatedPDF');
try try
try try
// Generate SQL query for a single order // Generate SQL query for a single order
...@@ -830,6 +834,7 @@ var ...@@ -830,6 +834,7 @@ var
SQL: string; SQL: string;
rptOrderWeb: TrptOrderWeb; // Local instance of the report rptOrderWeb: TrptOrderWeb; // Local instance of the report
begin begin
logger.Log(3, 'TLookupService.GenerateOrderWebPDF');
rptOrderWeb := TrptOrderWeb.Create(nil); rptOrderWeb := TrptOrderWeb.Create(nil);
try try
try try
...@@ -860,7 +865,7 @@ var ...@@ -860,7 +865,7 @@ var
rptOrderCutting: TrptOrderCutting; // Local instance of the report rptOrderCutting: TrptOrderCutting; // Local instance of the report
begin begin
rptOrderCutting := TrptOrderCutting.Create(nil); rptOrderCutting := TrptOrderCutting.Create(nil);
logger.Log(5, 'TLookupService.GenerateOrderCuttingPDF'); logger.Log(3, 'TLookupService.GenerateOrderCuttingPDF');
try try
try try
// Generate SQL query for a single order // Generate SQL query for a single order
...@@ -1133,6 +1138,7 @@ var ...@@ -1133,6 +1138,7 @@ var
ColorType: string; ColorType: string;
SQLQuery: TSQLQuery; SQLQuery: TSQLQuery;
begin begin
logger.Log(3, 'TLookupService.GetOrders');
SQLQuery := generateOrdersSQL(searchOptions); SQLQuery := generateOrdersSQL(searchOptions);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(SQLQuery); TXDataOperationContext.Current.Handler.ManagedObjects.Add(SQLQuery);
...@@ -1221,6 +1227,7 @@ var ...@@ -1221,6 +1227,7 @@ var
table: string; table: string;
ADDRESS: TAddressItem; ADDRESS: TAddressItem;
begin begin
logger.Log(3,'TLookupService.GetCorrugatedOrder');
orderID := orderInfo; orderID := orderInfo;
try try
SQL := 'select * from corrugated_plate_orders cpo JOIN customers c ON c.CUSTOMER_ID = cpo.COMPANY_ID join orders o on cpo.ORDER_ID = o.ORDER_ID where cpo.ORDER_ID = ' + quotedStr(orderID); SQL := 'select * from corrugated_plate_orders cpo JOIN customers c ON c.CUSTOMER_ID = cpo.COMPANY_ID join orders o on cpo.ORDER_ID = o.ORDER_ID where cpo.ORDER_ID = ' + quotedStr(orderID);
...@@ -1330,6 +1337,7 @@ var ...@@ -1330,6 +1337,7 @@ var
SQL: string; SQL: string;
ADDRESS: TAddressItem; ADDRESS: TAddressItem;
begin begin
logger.Log(3, 'TLookupService.GetWebOrder');
try try
orderID := orderInfo; orderID := orderInfo;
SQL := 'select * from web_plate_orders wpo JOIN customers c ON c.CUSTOMER_ID = wpo.COMPANY_ID join orders o on wpo.ORDER_ID = o.ORDER_ID where wpo.ORDER_ID = ' + quotedStr(orderID); SQL := 'select * from web_plate_orders wpo JOIN customers c ON c.CUSTOMER_ID = wpo.COMPANY_ID join orders o on wpo.ORDER_ID = o.ORDER_ID where wpo.ORDER_ID = ' + quotedStr(orderID);
...@@ -1457,6 +1465,7 @@ var ...@@ -1457,6 +1465,7 @@ var
SQL: string; SQL: string;
ADDRESS: TAddressItem; ADDRESS: TAddressItem;
begin begin
logger.Log(3, 'TLookupService.GetCuttingDieOrder');
try try
orderID := orderInfo; orderID := orderInfo;
SQL := 'select * from cutting_die_orders cdo JOIN customers c ON c.CUSTOMER_ID = cdo.COMPANY_ID join orders o on cdo.ORDER_ID = o.ORDER_ID where cdo.ORDER_ID = ' + quotedStr(orderID); SQL := 'select * from cutting_die_orders cdo JOIN customers c ON c.CUSTOMER_ID = cdo.COMPANY_ID join orders o on cdo.ORDER_ID = o.ORDER_ID where cdo.ORDER_ID = ' + quotedStr(orderID);
...@@ -1514,6 +1523,7 @@ var ...@@ -1514,6 +1523,7 @@ var
SQL: string; SQL: string;
item: TItemItem; item: TItemItem;
begin begin
logger.Log(3, 'TLookupService.GetItems');
try try
params := TStringList.Create; params := TStringList.Create;
params.StrictDelimiter := true; params.StrictDelimiter := true;
...@@ -1573,6 +1583,7 @@ function TLookupService.GetUsers(searchOptions: string): TUserList; ...@@ -1573,6 +1583,7 @@ function TLookupService.GetUsers(searchOptions: string): TUserList;
var var
user: TUserItem; user: TUserItem;
begin begin
logger.Log(3, 'TLookupService.GetUsers');
try try
// Prepare and open the query // Prepare and open the query
ordersDB.UniQuery1.Close; ordersDB.UniQuery1.Close;
...@@ -1654,7 +1665,7 @@ var ...@@ -1654,7 +1665,7 @@ var
hashString: string; hashString: string;
hashPW: string; hashPW: string;
begin begin
logger.log(5, 'TLookupService.EditUser'); logger.log(3, 'TLookupService.EditUser');
params := TStringList.Create; params := TStringList.Create;
params.Delimiter := '&'; params.Delimiter := '&';
params.StrictDelimiter := true; params.StrictDelimiter := true;
...@@ -1780,6 +1791,7 @@ var ...@@ -1780,6 +1791,7 @@ var
mode: string; mode: string;
msg: string; msg: string;
begin begin
logger.Log(3, 'TLookupService.AddCorrugatedOrder');
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
DateFormat.DateSeparator := '-'; DateFormat.DateSeparator := '-';
...@@ -1873,7 +1885,7 @@ var ...@@ -1873,7 +1885,7 @@ var
mode: string; mode: string;
change: boolean; change: boolean;
begin begin
logger.Log(5, 'TLookupService.AddStatusSchedule'); logger.Log(3, 'TLookupService.AddStatusSchedule');
mode := order.GetValue<string>('mode'); mode := order.GetValue<string>('mode');
if mode = 'ADD' then if mode = 'ADD' then
begin begin
...@@ -1936,7 +1948,7 @@ var ...@@ -1936,7 +1948,7 @@ var
order: TJSONObject; order: TJSONObject;
begin begin
try try
logger.Log(5, 'TLookupService.SetStatus'); logger.Log(3, 'TLookupService.SetStatus');
StatusInfo := TJSONObject.ParseJSONValue(statusOptions) as TJSONObject; StatusInfo := TJSONObject.ParseJSONValue(statusOptions) as TJSONObject;
params := TStringList.Create; params := TStringList.Create;
// parse the statusOptions // parse the statusOptions
...@@ -2070,7 +2082,7 @@ var ...@@ -2070,7 +2082,7 @@ var
rightsInt: Integer; rightsInt: Integer;
params: TStringList; params: TStringList;
begin begin
logger.Log(5, 'TLookupService.AddUser'); logger.Log(3, 'TLookupService.AddUser');
try try
params := TStringList.Create; params := TStringList.Create;
params.StrictDelimiter := True; params.StrictDelimiter := True;
...@@ -2146,7 +2158,7 @@ var ...@@ -2146,7 +2158,7 @@ var
begin begin
try try
logger.Log(5, 'TLookupService.AddItem'); logger.Log(3, 'TLookupService.AddItem');
result := TJSONObject.Create; result := TJSONObject.Create;
JSONData := TJSONObject.ParseJSONValue(itemInfo) as TJSONObject; JSONData := TJSONObject.ParseJSONValue(itemInfo) as TJSONObject;
if JSONData = nil then if JSONData = nil then
...@@ -2216,7 +2228,7 @@ var ...@@ -2216,7 +2228,7 @@ var
SQL: string; SQL: string;
params: TStringList; params: TStringList;
begin begin
logger.Log(5, 'TLookupService.DelUser'); logger.Log(3, 'TLookupService.DelUser');
SQL := 'select * from users where username = ' + QuotedStr(username.toLower); SQL := 'select * from users where username = ' + QuotedStr(username.toLower);
ordersDB.UniQuery1.Close; ordersDB.UniQuery1.Close;
ordersDB.UniQuery1.SQL.Text := SQL; ordersDB.UniQuery1.SQL.Text := SQL;
...@@ -2250,7 +2262,7 @@ var ...@@ -2250,7 +2262,7 @@ var
mode: string; mode: string;
msg: string; msg: string;
begin begin
logger.Log(5, 'TLookupService.AddWebOrder'); logger.Log(3, 'TLookupService.AddWebOrder');
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
DateFormat.DateSeparator := '-'; DateFormat.DateSeparator := '-';
...@@ -2349,6 +2361,7 @@ var ...@@ -2349,6 +2361,7 @@ var
temp: string; temp: string;
temp2: boolean; temp2: boolean;
begin begin
logger.Log(3, 'TLookupService.AddCuttingDieOrder');
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
DateFormat.DateSeparator := '-'; DateFormat.DateSeparator := '-';
...@@ -2443,6 +2456,7 @@ var ...@@ -2443,6 +2456,7 @@ var
Field: TField; Field: TField;
RevisionID, rev_num, OrderIDInt: Integer; RevisionID, rev_num, OrderIDInt: Integer;
begin begin
logger.Log(3, 'TLookupService.delOrder');
try try
// Convert ORDER_ID to integer safely // Convert ORDER_ID to integer safely
OrderIDInt := StrToIntDef(OrderID, -1); OrderIDInt := StrToIntDef(OrderID, -1);
...@@ -2639,6 +2653,7 @@ var ...@@ -2639,6 +2653,7 @@ var
I: integer; I: integer;
SQL: string; SQL: string;
begin begin
logger.Log(3, 'TLookupService.GetQBCustomers');
Result := TJSONArray.Create; Result := TJSONArray.Create;
iniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'kgOrdersServer.ini'); iniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'kgOrdersServer.ini');
restClient := TRESTClient.Create(nil); restClient := TRESTClient.Create(nil);
...@@ -2782,6 +2797,7 @@ var ...@@ -2782,6 +2797,7 @@ var
LastRefresh: TDateTime; LastRefresh: TDateTime;
iniFile: TIniFile; iniFile: TIniFile;
begin begin
logger.Log(3, 'TLookupService.GetQBItems');
iniFile := nil; iniFile := nil;
restClient := nil; restClient := nil;
restRequest := nil; restRequest := nil;
...@@ -2992,6 +3008,7 @@ var ...@@ -2992,6 +3008,7 @@ var
QB_LIST_ID: string; QB_LIST_ID: string;
unique: Boolean; unique: Boolean;
begin begin
logger.Log(3, 'TLookupService.ImportQBCustomer');
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
DateFormat.DateSeparator := '-'; DateFormat.DateSeparator := '-';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment