to merge for cam

kgOrdersClient/View.Main.html

@@ -102,24 +102,6 @@
   </div>
 </div>
 
-<div class="modal fade" id="confirmation_modal" tabindex="-1" aria-labelledby="confirmation_modal_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content shadow-lg">
-      <div class="modal-header">
-        <h5 class="modal-title" id="confirmation_modal_label">Confirm</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body fs-6 fw-bold" id="modal_body">
-        Are you sure you want to delete this order?
-      </div>
-      <div class="modal-footer justify-content-center">
-        <button type="button" class="btn btn-secondary me-3" data-bs-dismiss="modal" id="btn_confirm_cancel">Cancel</button>
-        <button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="btn_confirm_delete">Delete</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 
 
 

kgOrdersClient/View.Main.pas

@@ -6,7 +6,7 @@ uses
   System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
   WEBLib.Forms, WEBLib.Dialogs, WEBLib.ExtCtrls, Vcl.Controls, Vcl.StdCtrls,
   WEBLib.StdCtrls, Data.DB, XData.Web.JsonDataset, XData.Web.Dataset,
-  App.Types, ConnectionModule, XData.Web.Client, WEBLib.Menus;
+  App.Types, ConnectionModule, XData.Web.Client, WEBLib.Menus, Utils;
 
 type
   TFViewMain = class(TWebForm)
@@ -118,7 +118,7 @@ begin
     setActive('Customers');
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.lblHomeClick(Sender: TObject);

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -261,6 +261,7 @@ implementation
 uses
   View.Home, View.Main, View.AddOrder, View.AddAddress, Utils;
 
+
 procedure TFOrderEntryCorrugated.sendOrderToServer();
 // This can be improved. I was struggling to get the checkboxes to work with
 // The dataset at first, but if you just change the fields in the database to be
@@ -399,9 +400,9 @@ begin
     orderJSON.AddPair('ORDER_ID', orderID);
 
   AddCorrugatedOrder(orderJSON);
-
 end;
 
+
 procedure TFOrderEntryCorrugated.btnSaveClick(Sender: TObject);
 // Converts all the information on the page into a JSON to then send to the server
 begin
@@ -427,7 +428,6 @@ begin
   else
     input.classList.remove('is-invalid');
 
-
   input := TJSHTMLInputElement(document.getElementById('edtaccountcompanyname'));
   if edtCompanyAccountName.Text = '' then
   begin
@@ -467,6 +467,7 @@ begin
     input.classList.remove('is-invalid');
 end;
 
+
 procedure TFOrderEntryCorrugated.btnCopyClick(Sender: TObject);
 begin
   mode := 'ADD';
@@ -504,11 +505,13 @@ begin
   end;
 end;
 
+
 procedure TFOrderEntryCorrugated.btnEditClick(Sender: TObject);
 begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCorrugated.btnPDFClick(Sender: TObject);
 begin
   if mode = 'EDIT' then
@@ -517,6 +520,7 @@ begin
     ShowToast('Failure: Cannot Generate PDF when Adding an Order');
 end;
 
+
 procedure TFOrderEntryCorrugated.btn_confirm_deleteClick(Sender: TObject);
 begin
   if  document.getElementById('btn_confirm_delete').innerText = 'Yes' then
@@ -549,6 +553,7 @@ begin
   end;
 end;
 
+
 [async] procedure TFOrderEntryCorrugated.GenerateReportPDF;
 // sends the search to the server which then sends back a pdf of the results
 var
@@ -589,6 +594,7 @@ begin
   ShowToast(string(jsObj.Properties['status']));
 end;
 
+
 procedure TFOrderEntryCorrugated.DelOrder();
 var
   Response: TXDataClientResponse;
@@ -679,6 +685,7 @@ begin
   container.appendChild(newRow);
 end;
 
+
 procedure TFOrderEntryCorrugated.RemoveColorRow(Sender: TObject);
 var
   btn: TWebButton;
@@ -702,11 +709,13 @@ begin
   addColorRow('','','','');
 end;
 
+
 procedure TFOrderEntryCorrugated.WebButton2Click(Sender: TObject);
 begin
   ShowAddAddressForm();
 end;
 
+
 procedure TFOrderEntryCorrugated.SendAddressToServer(AddressJSON: TJSONObject);
 var
   Response: TXDataClientResponse;
@@ -722,6 +731,7 @@ begin
   xdwdsShipTo.Open;
 end;
 
+
 procedure TFOrderEntryCorrugated.ShowAddAddressForm;
 // displays the search pop-up that allows the user to filter the order list
 var
@@ -808,9 +818,9 @@ begin
   );
 end;
 
+
 procedure TFOrderEntryCorrugated.btnCancelClick(Sender: TObject);
 begin
-  console.log('click');
   document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes?';
   document.getElementById('btn_confirm_cancel').innerText := 'No';
   document.getElementById('btn_confirm_delete').innerText := 'Yes';
@@ -846,6 +856,7 @@ begin
    end;
 end;
 
+
 procedure TFOrderEntryCorrugated.getOrder(Order_ID: string);
 // retrieves an order from the server then loads the info into the page
 var
@@ -1002,6 +1013,7 @@ begin
   end;
 end;
 
+
 procedure TFOrderEntryCorrugated.getCustomer(customerID: string);
 // gets a customer from the database then loads the appropiate fields
 var
@@ -1017,8 +1029,6 @@ begin
     XDataWebDataSet1.SetJsonData(customer);
     XDataWebDataSet1.Open;
 
-
-
     xdwdsShipTo.Close;
     xdwdsShipTo.SetJSONData(customer['ADDRESS_LIST']);
     xdwdsShipTo.Open;
@@ -1041,6 +1051,7 @@ begin
   end;
 end;
 
+
 procedure TFOrderEntryCorrugated.WebFormShow(Sender: TObject);
 begin
   if mode <> 'ADD' then
@@ -1060,16 +1071,19 @@ begin
   end;
 end;
 
+
 procedure TFOrderEntryCorrugated.XDataWebDataSet1AfterEdit(DataSet: TDataSet);
 begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCorrugated.xdwdsQBItemAfterEdit(DataSet: TDataSet);
 begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCorrugated.xdwdsShipToAfterEdit(DataSet: TDataSet);
 begin
   EditMode();
@@ -1083,12 +1097,14 @@ begin
   FViewMain.ViewOrders('Success: Order Successfully Deleted');
 end;
 
+
 procedure TFOrderEntryCorrugated.tmrScrollTopTimer(Sender: TObject);
 begin
   tmrScrollTop.Enabled := False;
   window.scrollTo(0, 0);
 end;
 
+
 procedure TFOrderEntryCorrugated.EditMode();
 begin
   FViewMain.change := true;

kgOrdersClient/webKGOrders.dproj

@@ -5,7 +5,7 @@
         <FrameworkType>VCL</FrameworkType>
         <MainSource>webKGOrders.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.6
-LogFileNum=742
+LogFileNum=743
 
 [Database]
 --Server=192.168.159.131
@@ -17,6 +17,6 @@ Password=emsys01
 CompanyID=9341454272655710 
 ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
 ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
-RefreshToken=RT1-50-H0-17591616685fy7n22svc0jln80s91f
-AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..EnXDNxlkQ5_RXhG8GgbGjA.rlY-UZ8LudTLltvxjuzHTWMXdmrtFVRaQF2W1GpX6ZK-MLiYmV3mCzYDKDIob9mbvscIsY6m71EwesdEDKtUxSAIFBNb3l3PFYMA4SIJQYaqdgleWoBagWfc6Bm_8glcB09PbJYj5utWNKMMnso8SnRuAVHuAUAh7o2HhGS0y0QPG6MIJn3XeKJcl9b68dz41liCM1239v_DD1UYQTE3oXdc8rMl_dkfOAYVdsoojr2XH6yJ-dvu4M6iit0QhxLu2-QtJNCQYXKxR1oPnk4f6VoJG7EDIYgp71damCHW0yK7AvRIMfCxxNF6ilAsuxlh4DiRBB6LZCgbTxoID5MFaHVVMyEchTKsnqzZK2Q9Lb4eiurXgNV50v_xLIqsDs7KxCB3timwpili-_HZ0jx5QVFe4cUuhz8IJfbiskSZO8Dimx0xGnEFgFkzAFA9awXu1wiS3r3yT0lpA2Nyp__HGT6k8xfCQQmfztDbVL_1cPAlpC8elZlj8qPsMmwSxtZDazg4MF-383d5aAr11dCME21II9DyLxNgO4vQpb54yXLNlmf_lKveFe0BQpbwyE848XSdDa3XgVOSQJ1_4m5qx_c8d2lZKfBb5WYcyWdUjcPpQmNyzg5edka09fL_TgnH.C7MivFE-BRKnXk-NvDruoQ
-LastRefresh=6/21/2025 12:14:19 AM
+RefreshToken=RT1-251-H0-1759499151mghzkhn74tjkqi2vg5c0
+AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..BPFIXN1xTjdWuZGjkh1jUQ.IghcYUEoPWx47KnmuIbgZBNm1EhInMZjAXUi68M-l6zZkuKnlQYmbYq6gC3gIyTd66cx85t7pMmdBAH_q-v3qkUKx2ZqVSRZyYVKSrxYWFl0Vafzbj_BY-4kjrGEqZRFtR4dfQfbFmmlDW215Vjn8MO9v3tvgAVbWO9kafJ3Frv4KtNRgJQPmC01nz4ixF5RD91EnCSo-q4DuuRtCERkjjIiEW9D8ODt1GexshbHxam7dWCDGM2yHX_V0trWi37X5jBBrWgTYRogXhTPfpvlfkCQKTrNmKWhVDuVUxJB3aPREI43IMlW6h3hf445quAjINvgK5wokDCnmVPW3XvIDvnckgAaa9qOLzpl5UktpjqDRRiI4zVNs6BXP7kCsZs9ez0Ai5oeWgj0_j0NKbuVW1exkLcrinmYrMny-s8XpADNDslW8XCmJnHPsOWqZZL5bEXFJXPcYfPkGkV7rt-ln84gRD9413Ji05cmOzO1X5ClhrRhFRwjT3dbrgh88Dro-vMNs3weRdYOVpYFvA5aDXs9xkmHx8auphCdZo5a3sB8n9iKiM618HR-mSeYwCIU3aF2xE8kx0ljH8qVgX1bI2w9ByfM-mNBkasu3uKDH3HcpfqJBKWNOkG692JjzBoy.6H4UaInosVyqlMSCqGMAaA
+LastRefresh=6/24/2025 10:51:36 AM