Commit 43b62c06 by Cameron Hayes

Fixed issue where dataset was still able to be editted outside of edit mode

parent 4a70910b
......@@ -773,7 +773,6 @@ begin
xdwdsOrder.Close;
xdwdsOrder.SetJsonData(order);
xdwdsOrder.Open;
xdwdsOrder.Edit;
container := TJSHTMLElement(document.getElementById('additionalFields'));
if Assigned(container) then
......
......@@ -162,12 +162,9 @@ begin
else
table := 'cutting_die_orders';
SQL := 'select * from ' + table + ' cpo join customers c on cpo.COMPANY_ID = c.CUSTOMER_ID join customers_ship cs on cpo.staff_fields_ship_to = cs.ship_block JOIN qb_items ON cpo.staff_fields_quickbooks_item = qb_items.qb_item_name where cpo.ORDER_ID = ' + ORDER_ID;
doQuery(ordersDB.UniQuery1, SQL);
estimateJSON.AddPair('TxnDate', ordersDB.UniQuery1.FieldByName('staff_fields_order_date').AsString);
CustomerRefJSON := TJSONObject.Create;
......
......@@ -11,15 +11,12 @@ uses
System.Hash, Api.Database, Vcl.ExtCtrls, WEBLib.Forms, WEBLib.Controls, WEBLib.StdCtrls,
WEBLib.ExtCtrls, WEBLib.REST, WEBLib.WebTools,System.Net.HttpClient,
System.Net.URLClient, System.Net.HttpClientComponent, System.netencoding,
IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.DateUtils, System.IniFiles;
IdHTTP, IdSSLOpenSSL, IdSSLOpenSSLHeaders, System.DateUtils, System.IniFiles,
AdvPanel, AdvOfficePager;
type
TfQB = class(TForm)
Button2: TButton;
Button3: TButton;
Button4: TButton;
Button5: TButton;
uq: TUniQuery;
uqORDER_ID: TIntegerField;
uqCOMPANY_ID: TIntegerField;
......@@ -106,21 +103,35 @@ type
uqupc_distortion_percent: TStringField;
uqupc_distortion_amount: TStringField;
uqstaff_fields_art_location: TStringField;
Memo1: TMemo;
Splitter1: TSplitter;
Splitter2: TSplitter;
AdvPanel1: TAdvPanel;
asgData: TAdvStringGrid;
Panel1: TPanel;
Button2: TButton;
Button3: TButton;
Button4: TButton;
Button5: TButton;
Button6: TButton;
Button7: TButton;
Button1: TButton;
Panel1: TPanel;
asgData2: TAdvStringGrid;
Panel2: TPanel;
Splitter1: TSplitter;
asgData: TAdvStringGrid;
Splitter2: TSplitter;
Button8: TButton;
Button9: TButton;
Button10: TButton;
Button11: TButton;
Button12: TButton;
AdvPanel2: TAdvPanel;
asgData2: TAdvStringGrid;
AdvOfficePager1: TAdvOfficePager;
AdvOfficePager11: TAdvOfficePage;
AdvOfficePager12: TAdvOfficePage;
AdvOfficePager13: TAdvOfficePage;
Memo1: TMemo;
Memo2: TMemo;
Panel2: TPanel;
Button13: TButton;
Panel3: TPanel;
Button14: TButton;
procedure Button1Click(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure Button2Click(Sender: TObject);
......@@ -132,8 +143,6 @@ type
procedure Button7Click(Sender: TObject);
procedure asgData2ClickCell(Sender: TObject; ARow, ACol: Integer);
procedure asgDataClickCell(Sender: TObject; ARow, ACol: Integer);
procedure Panel1Resize(Sender: TObject);
procedure Panel2Resize(Sender: TObject);
procedure Button8Click(Sender: TObject);
procedure Button9Click(Sender: TObject);
procedure Button10Click(Sender: TObject);
......@@ -1401,18 +1410,6 @@ begin
asgData2.AutoSizeColumns(true);
end;
procedure TfQB.Panel1Resize(Sender: TObject);
begin
AsgData2.Width := Panel1.ClientWidth;
AsgData2.Height := Panel1.ClientHeight;
end;
procedure TfQB.Panel2Resize(Sender: TObject);
begin
AsgData.Width := Panel2.ClientWidth;
AsgData.Height := Panel2.ClientHeight;
end;
procedure tfQB.findMatches(CustomerList: TJSONArray; JSONfield, DBField: string);
var
I: integer;
......
......@@ -2,7 +2,7 @@
MemoLogLevel=3
FileLogLevel=5
webClientVersion=0.9.7
LogFileNum=946
LogFileNum=950
[Database]
Server=192.168.159.155
......@@ -14,11 +14,9 @@ Password=emsys01
--Password=emsys!012
[Quickbooks]
CompanyID=9341454272655710
ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
RefreshToken=RT1-222-H0-17626191874vkaap374wzbpuk0lnvh
AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..0QjLsnLwqTISwro5qh9UsA.-GEQx2lb0_vw3h01Bx77UYf8bzTxuk4QH17BYInZMEm3lTzv5eovx96_AfoVwZdVwrDBQOT2j5aDOWml4-B_Hi3fIHZn95JrPHcx24cP7DXznGWQhW5TNs8mi3Ac5ygFTD8rm6JKWJ_IctpH1rBKfQQAtiBK-AtUoZ6kZK2R9yY_bn8qE-ocUC_G8pXy7l3qkGuQSaLSgxNVdCy3k0ElRE5FiDyakxY4Zye9ha2Z9DIzlDDWVe2N3oA6AN8dXV3oLPtUu0o4ZusoXRUet9Ghroazg0JRf3IfN9oAsUhIojiSDAQ_7XGsctBg1o7ms2YokPL4UIPHEIPfeJq6snS7YR-8UzSQngFCKJhscXmkokvUCLAB2r-xJArDwjJiv-NBaVntVSRhPG3_tjrwekJG3uVWKZeD3w_IwZJduGga1U-rYquswWLWDa04AXYx48eQxy1anNP0R2QMyrJZcNqQx_ivefEA-Z9JmWsDawDWXH4.XI7T7R4DQGJ9vWzyHn7KxQ
LastRefresh=7/30/2025 12:28:34 PM
--RefreshToken=RT1-10-H0-1760618473k44t73jittvqlr4wynn6
CompanyID=9341454336461805
ClientID=ABYqlDx1EsacZYXvHIJ7RDB7zmnQdwABU3fwQLIZPmBgU0VW1P
ClientSecret=PM7OnvQWsgOqjWfDpZAnyRttDN9446Am6d85pDxr
RefreshToken=RT1-239-H0-1763040466igs14r2e4bjybwf86uzy
AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..lXW-FVFOPPAtm-tzjyrE3Q.vWV5cCaLiP03iXblbK5VbosURDrUNsJT5uaKPzzv2S3Nujulxp57ss--nKRVmFBYuwIXxz6VDwh6SqxaECJrR5yysauOcKuz7m22qjOOTPJyaeEhm0u2FLvAODSUpaHN5NDQSgHqBd6_-E-B8gEJeHqDpO3UqxDi9yxy6Px3kyZWXs7InUWYEHtROsPOR_HeJ2vFMhXA5fkifbxCb5bkJOEABoAzrBoLm2QSD6VbV5ydfdrSwfuV--oZ0nvabPS88JurJSbaJyDKCUSmOEt2bnZadhEq88dHMNcOPfqELYSU0dKrzMs-TPYgqeg5wOx_MO0cKkRnSaACCevj-LCYo2YKgxXyYoiNgFIf6Gf4TfLO5is0nh3I0IT14112DBUc7lFwaBCS5m3d_4SCv6sH41rkr01wIPs2o45vGStSgUCuzHQos1UtrEvX96S2NDFt1sYQcNXpFexiTB5Z9WCJgmEH3xuUrkW_d6wzVCD-Src.ZmSj6RCCiDipsvEli9fdLg
LastRefresh=8/4/2025 9:27:46 AM
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