Merge remote-tracking branch 'origin/cam3' into mac3

kgOrdersClient/View.AddItem.dfm

@@ -196,6 +196,7 @@ object fViewAddItem: TfViewAddItem
     ChildOrder = 5
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnClick = btnCancelClick
   end
   object btnConfirm: TWebButton
     Left = 446

kgOrdersClient/View.AddItem.pas

@@ -33,6 +33,7 @@ type
     procedure WebFormShow(Sender: TObject);
     procedure TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
     procedure btnConfirmClick(Sender: TObject);
+    procedure btnCancelClick(Sender: TObject);
   private
     { Private declarations }
     [async] procedure getItems();
@@ -65,13 +66,18 @@ begin
   getItems();
 end;
 
+procedure TfViewAddItem.btnCancelClick(Sender: TObject);
+begin
+  close();
+end;
+
 procedure TfViewAddItem.btnConfirmClick(Sender: TObject);
 begin
   xdwdsCustomers.Locate('qb_item_name', edtName.Text, []);
   if edtName.Text = '' then
-    edtNotification.Text := 'Please Select a Customer'
+    edtNotification.Text := 'Please Select an Item'
   else if xdwdsCustomers.FieldByName('qb_items_id').AsString <> '' then
-    edtNotification.Text := 'Customer Already In Database'
+    edtNotification.Text := 'Item Already In Database'
   else
     SendItemToServer();
 end;

kgOrdersServer/kgOrdersServer.ini

@@ -5,8 +5,8 @@ webClientVersion=0.9.4
 LogFileNum=722
 
 [Database]
---Server=192.168.159.131
-Server=192.168.102.130
+Server=192.168.159.131
+--Server=192.168.102.130
 --Server=192.168.75.133
 Database=kg_order_entry
 Username=root
@@ -17,7 +17,6 @@ Password=emsys01
 CompanyID=9341454272655710 
 ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
 ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
---RefreshToken=RT1-60-H0-1758811104981v5rmhboxz6ul6wqho
 RefreshToken=RT1-7-H0-1758919884sgbdvdaawcewm26l9f9k
-AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..Q1yKDxuYmNYv1PNqLpzz8w.hfXO29ZyxrCqr-pQ0UIcY8a_La4lXl5J_epGEtBrAowc4OGuScGt3hFDDrRrhqzuvSa4pyLfbxNj_lJ_fBrdy7gSdD9Wx_gN6w4klZOVOV1IGRxvW5Z2sUFIk1IENZMCiv3nUXGY0pCBBtfjsL_O-2-wL6gJ61hY29smmcaIsCVVOt1T1Gd3pHTlDcvcW9wYV2iSbZ_rxd14qhMDj06G0fnVMNvIp-tjuBICdRSRvM2anF6QdUpHGgIjNzJEeNWNnfXqfJFkNqMqf6tMdjXHf1lNwYQl28_0YP3V4nixwYdQomILqdA-hxj6Jz9R8J_1WpY3JSDUi4ER9zsSdGr5l6RHj2ELB6m7eBb_7yBbGZ7eM6xkXchsyFv8dETFTT1mmimP6gVgfpJfMajSds5eUTTTHKiMUH4iGpmnoxPGo_2N0w6XmevTCiyyzAbP9PaR37IKwdPRtz0-4SrSFeWTUfA_M3NXRg1T0YdHa9JBXJvXCOZWxP18akgxhEgXb35YLIIQqXGk_wJ6DRWIsOKi8NCNBz5Xi2Dn7ODI6dYmrqLwMut0yVdllPpFd1ZvhC1FRNin-GzNyLqFE2KzbfZVHjD98EgxtNvTilQx5wThRIIRRd68pyfikoJPflVDcOaT.70MhUoq7L8jsbIJynOCpYQ
-LastRefresh=6/18/2025 10:13:24 AM
+AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..5Uv-0kfuVDyI0DHwQrGfIA.yz4mQ8OjrVdyjALb6BRBz_OahGdn7Xn0JnLK3CnuYmieFwj_qkXDzlD9V9-R3CkGfkPhjprCowkYeWbzbRve055teEAj90qGoR_OuzRfJMsI6GRbWHZXlAGHzmbDWSQD1lwbj3MCx3YZ8h_BZSCF3ojF6HH7ggyLmlEcr1UZMRH5wykRtuRH9WQPbL7OUuEx__fnB25EbyQF6fu8tRjOfyt_IaWqXa_9N_sIdjrjcBwMOo-z3-xCPSCp2TU15hF13U2_IF9_RNJDvFANXrhy5Pv9ENe9vvJxU5seJe709X9ko0yh_N5AFwZoE3-xf63XziRyvBCpdkriMBSGKSVwuMoTJdx6KqDDKitf4kWXl56gtJ9wJGl_gTp54HW5luSZPDxLCmVKDf2UXsakDmXhZe6LyQcdTkJlaWqguUyDM9O-6o3AgnzJ_5PGW_7AklSXGagxMS34xyD4NH9O0YQIhlFzaWVkrLv5giyw5IP2NFlxnKybxsjfLTKgxEqFpJqgG2YovLNxPLNzl7zieVAaK8VbzonKBae6AfIQVVuDqnM__KeKjgtb0N0XV1r3vLB1wDAa9N8_3nvKDqXjQVfW_xwhETxrE_fNRBwu5cQ63MoQpMctLu2tdJwu5zTpKSBR.AmloWkat-1tymc9Aebazxg
+LastRefresh=6/18/2025 10:27:34 AM