Commit d217635b by Cam Hayes

Version 0.9.13.9 test deployed

parent 0128c655
...@@ -19,7 +19,7 @@ type ...@@ -19,7 +19,7 @@ type
FUnauthorizedAccessProc: TUnauthorizedAccessProc; FUnauthorizedAccessProc: TUnauthorizedAccessProc;
public public
const clientVersion = '0.9.13.8'; const clientVersion = '0.9.13.9';
procedure InitApp(SuccessProc: TSuccessProc; procedure InitApp(SuccessProc: TSuccessProc;
UnauthorizedAccessProc: TUnauthorizedAccessProc); UnauthorizedAccessProc: TUnauthorizedAccessProc);
procedure SetClientConfig(Callback: TVersionCheckCallback); procedure SetClientConfig(Callback: TVersionCheckCallback);
......
object FQBInfo: TFQBInfo object FQBInfo: TFQBInfo
Width = 449 Width = 449
Height = 157 Height = 191
OnCreate = WebFormCreate OnCreate = WebFormCreate
OnShow = WebFormShow OnShow = WebFormShow
object lblConnected: TWebLabel object lblConnected: TWebLabel
...@@ -33,8 +33,8 @@ object FQBInfo: TFQBInfo ...@@ -33,8 +33,8 @@ object FQBInfo: TFQBInfo
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object lblCompanyID: TWebLabel object lblCompanyID: TWebLabel
Left = 16 Left = 15
Top = 76 Top = 73
Width = 93 Width = 93
Height = 21 Height = 21
Caption = 'Company ID: ' Caption = 'Company ID: '
...@@ -47,16 +47,42 @@ object FQBInfo: TFQBInfo ...@@ -47,16 +47,42 @@ object FQBInfo: TFQBInfo
ParentFont = False ParentFont = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object WebButton1: TWebButton object lblLastRefresh: TWebLabel
Left = 16
Top = 100
Width = 92
Height = 21
Caption = 'Last Refresh: '
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -16
Font.Name = 'Segoe UI'
Font.Style = []
HeightPercent = 100.000000000000000000
ParentFont = False
WidthPercent = 100.000000000000000000
end
object btnLinkToQB: TWebButton
Left = 13 Left = 13
Top = 107 Top = 137
Width = 96 Width = 96
Height = 25 Height = 25
Caption = 'Link to QB' Caption = 'Link to QB'
ChildOrder = 3 ChildOrder = 3
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = WebButton1Click OnClick = btnLinkToQBClick
end
object btnClose: TWebButton
Left = 115
Top = 137
Width = 96
Height = 25
Caption = 'Close'
ChildOrder = 3
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnCloseClick
end end
object XDataWebClient1: TXDataWebClient object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection Connection = DMConnection.ApiConnection
......
...@@ -12,11 +12,14 @@ type ...@@ -12,11 +12,14 @@ type
lblConnected: TWebLabel; lblConnected: TWebLabel;
lblCompanyName: TWebLabel; lblCompanyName: TWebLabel;
lblCompanyID: TWebLabel; lblCompanyID: TWebLabel;
WebButton1: TWebButton; btnLinkToQB: TWebButton;
XDataWebClient1: TXDataWebClient; XDataWebClient1: TXDataWebClient;
procedure WebButton1Click(Sender: TObject); lblLastRefresh: TWebLabel;
btnClose: TWebButton;
procedure btnLinkToQBClick(Sender: TObject);
procedure WebFormCreate(Sender: TObject); procedure WebFormCreate(Sender: TObject);
procedure WebFormShow(Sender: TObject); procedure WebFormShow(Sender: TObject);
procedure btnCloseClick(Sender: TObject);
private private
{ Private declarations } { Private declarations }
ClientID: string; ClientID: string;
...@@ -34,7 +37,7 @@ implementation ...@@ -34,7 +37,7 @@ implementation
uses View.Main, Utils; uses View.Main, Utils;
procedure TFQBInfo.WebButton1Click(Sender: TObject); procedure TFQBInfo.btnLinkToQBClick(Sender: TObject);
var var
qblink, redirectUri: string; qblink, redirectUri: string;
qbWindow: TJSWindow; qbWindow: TJSWindow;
...@@ -68,6 +71,11 @@ begin ...@@ -68,6 +71,11 @@ begin
GetQBInfo(); GetQBInfo();
end; end;
procedure TFQBInfo.btnCloseClick(Sender: TObject);
begin
Close();
end;
procedure TFQBInfo.GetQBInfo(); procedure TFQBInfo.GetQBInfo();
// retrieves customer list from server // retrieves customer list from server
var var
...@@ -84,7 +92,8 @@ begin ...@@ -84,7 +92,8 @@ begin
begin begin
lblCompanyName.Caption := lblCompanyName.Caption + String(QBInfo['CompanyName']); lblCompanyName.Caption := lblCompanyName.Caption + String(QBInfo['CompanyName']);
lblCompanyID.Caption := lblCompanyID.Caption + String(QBInfo['CompanyID']); lblCompanyID.Caption := lblCompanyID.Caption + String(QBInfo['CompanyID']);
lblConnected.Caption := 'QuickBooks is connected.' lblConnected.Caption := 'QuickBooks is connected.';
lblLastRefresh.Caption := lblLastRefresh.Caption + String(QBInfo['LastRefresh']);
end end
else else
lblConnected.Caption := 'Quickbooks is not connected.'; lblConnected.Caption := 'Quickbooks is not connected.';
......
...@@ -26,6 +26,7 @@ type ...@@ -26,6 +26,7 @@ type
CompanyName: string; CompanyName: string;
CompanyID: string; CompanyID: string;
connected: boolean; connected: boolean;
LastRefresh: string;
end; end;
TUserItem = class TUserItem = class
......
...@@ -162,6 +162,7 @@ begin ...@@ -162,6 +162,7 @@ begin
result.CompanyName := CompanyInfo.GetValue('CompanyName').Value; result.CompanyName := CompanyInfo.GetValue('CompanyName').Value;
result.CompanyID := CompanyID; result.CompanyID := CompanyID;
result.connected := true; result.connected := true;
result.LastRefresh := iniFile.ReadString('Quickbooks', 'LastRefresh', '');
end; end;
except except
on E: Exception do on E: Exception do
......
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<DCC_ExeOutput>.\bin</DCC_ExeOutput> <DCC_ExeOutput>.\bin</DCC_ExeOutput>
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.13.8;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys> <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.13.9;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
<VerInfo_MajorVer>0</VerInfo_MajorVer> <VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer> <VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>13</VerInfo_Release> <VerInfo_Release>13</VerInfo_Release>
<VerInfo_Build>8</VerInfo_Build> <VerInfo_Build>9</VerInfo_Build>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode> <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
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