deploy ver 0.9.11

.gitignore

@@ -27,3 +27,5 @@ kgOrdersServer/bin/logs/
 kgOrdersServer/bin/static/
 
 kgOrdersServer/static/reports/
+
+kgOrdersServer/bin/kgOrdersServer_MemoryManager_EventLog.txt

kgOrdersClient/AddCustomer.pas

@@ -117,7 +117,7 @@ type
     shipmode: string;
   public
     { Public declarations }
-     class function CreateForm(AElementID, customerInfo, info: string): TWebForm;
+    class function CreateForm(AElementID, customerInfo, info: string): TWebForm;
   end;
 
 var

kgOrdersClient/Utils.pas

@@ -318,7 +318,6 @@ begin
 end;
 
 
-
 procedure ApplyReportTitle(CurrentReportType: string);
 var
   CrimeTitleElement: TJSHTMLElement;
@@ -350,3 +349,4 @@ end;
 // end;
 
 end.
+

kgOrdersClient/View.Customers.pas

@@ -184,7 +184,7 @@ begin
   if AuthService.TokenPayload.Properties['qb_enabled'] then
     ShowSelectCustomerForm()
   else
-    ShowNotificationModal('Quickbooks interface not currently active');
+    ShowNotificationModal('QuickBooks interface is not currently active');
 end;
 
 procedure TFViewCustomers.edtFilterChange(Sender: TObject);

kgOrdersClient/View.EditUser.pas

@@ -226,7 +226,7 @@ begin
     Exit;
 
   ShowConfirmationModal(
-    'Are you sure you want to save changes to your profile?',
+    'Are you sure you want to save changes?',
     'Save',
     'Cancel',
     procedure(confirmed: Boolean)

kgOrdersClient/View.Items.pas

@@ -477,13 +477,13 @@ begin
     );
   end
   else
-     ShowNotificationModal('Quickbooks interface not currently active.');
+     ShowNotificationModal('QuickBooks interface is not currently active.');
 end;
 
 procedure TFViewItems.btnCancelClick(Sender: TObject);
 begin
   ShowConfirmationModal(
-    'Are you sure you want to cancel all changes to the customer?',
+    'Are you sure you want to cancel?',
     'Yes',
     'No',
     procedure(confirmed: Boolean)

kgOrdersClient/css/app.css

@@ -390,17 +390,3 @@ is-invalid .form-check-input {
   transform: translate(-50%, -50%);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -1184,7 +1184,7 @@ begin
   try
     SQL := SQLQuery.SQL;
     whereSQL := SQLQuery.whereSQL;
-    logger.Log(3, 'Getting orders with SQL query ' + SQL);
+    logger.Log(5, 'Getting orders with SQL query ' + SQL);
 
     doQuery(ordersDB.UniQuery1, SQL);
 

kgOrdersServer/Source/Main.pas

@@ -147,29 +147,35 @@ begin
     Logger.Log(1, '--- Database ---');
     iniStr := IniFile.ReadString( 'Database', 'Server', '' );
     if iniStr.IsEmpty then
-      Logger.Log( 1, '--Database->Server: Entry not found' )
+      Logger.Log( 1, '----Database->Server: Entry not found - ERROR: ini entry required!!!' )
     else
-      Logger.Log( 1, '--Database->Server: ' + iniStr );
+      Logger.Log( 1, '----Database->Server: ' + iniStr );
 
     iniStr := iniFile.ReadString('Database', 'Database', '');
     if iniStr.IsEmpty then
-      Logger.Log( 1, '----Database->Database: Entry not found' )
+      Logger.Log( 1, '----Database->Database: ini entry not found - default: kg_order_entry' )
     else
-      Logger.Log( 1, '----Database->Database: ' + iniStr );
+      Logger.Log( 1, '----Database->Database: ini entry: ' + iniStr );
 
     iniStr := iniFile.ReadString('Database', 'Username', '');
     if iniStr.IsEmpty then
-      Logger.Log( 1, '----Database->Username: Entry not found' )
+      Logger.Log( 1, '----Database->Username: Entry not found - default: root' )
     else
       Logger.Log( 1, '----Database->Username: ' + iniStr );
 
     iniStr := iniFile.ReadString('Database', 'Password', '');
     if iniStr.IsEmpty then
-      Logger.Log( 1, '----Database->Password: Entry not found' )
+      Logger.Log( 1, '----Database->Password: Entry not found - default: xxxxxx' )
     else
       Logger.Log( 1, '----Database->Password: xxxxxxxx' );
 
     Logger.Log(1, '---Quickbooks---');
+    iniStr := IniFile.ReadString( 'Quickbooks', 'Enabled', '' );
+    if iniStr.IsEmpty then
+      Logger.Log( 1, '--Quickbooks->Enabled: Entry not found - default: yes' )
+    else
+      Logger.Log( 1, '--Quickbooks->Enabled: ' + iniStr );
+
     iniStr := IniFile.ReadString( 'Quickbooks', 'CompanyID', '' );
     if iniStr.IsEmpty then
       Logger.Log( 1, '--Quickbooks->CompanyID: Entry not found' )

kgOrdersServer/Source/uLibrary.pas

@@ -22,10 +22,10 @@ var
 begin
   iniFile := TIniFile.Create( ExtractFilePath(Application.ExeName) + iniFilename );
   try
-    uc.Server := iniFile.ReadString('Database', 'Server', uc.Server);
-    uc.Database := iniFile.ReadString('Database', 'Database', uc.Database);
-    uc.Username := iniFile.ReadString('Database', 'Username', uc.Username);
-    uc.Password := iniFile.ReadString('Database', 'Password', uc.Password);
+    uc.Server := iniFile.ReadString('Database', 'Server', '');
+    uc.Database := iniFile.ReadString('Database', 'Database', 'kg_order_entry');
+    uc.Username := iniFile.ReadString('Database', 'Username', 'root');
+    uc.Password := iniFile.ReadString('Database', 'Password', 'emsys01');
   finally
     iniFile.Free;
   end;

kgOrdersServer/bin/kgOrdersServer.ini

@@ -2,16 +2,16 @@
 MemoLogLevel=4
 FileLogLevel=4
 webClientVersion=0.9.11
-LogFileNum=160
+LogFileNum=164
 
 [Database]
---Server=192.168.116.138
-Server=192.168.102.129
+Server=192.168.116.132
+--Server=192.168.102.129
 --Server=192.168.75.133
 --Server=192.168.159.10
-Database=kg_order_entry
-Username=root
-Password=emsys01
+--Database=kg_order_entry
+--Username=root
+--Password=emsys01
 --Password=emsys!012
 
 [Quickbooks]