Commit 8c78643d by Cameron Hayes

Tested 0.9.9 and fixed minor bugs I found with it

parent 553e411e
......@@ -303,7 +303,7 @@ procedure TFViewAddCustomer.btnDeleteClick(Sender: TObject);
// Eventually will delete customers after a confirmation
// TODO implement deleting customers
begin
ShowToast('Deleting Customers Is Not Yet Available', 'danger');
ShowToast('Deleting Customers Is Not Yet Available', 'info');
Exit;
end;
......@@ -459,7 +459,8 @@ end;
procedure TFViewAddCustomer.btnShipDeleteClick(Sender: TObject);
begin
ShowConfirmationModal(
ShowToast('Deleting Shipping AddressesF is not yet implemented.', 'info');
{ShowConfirmationModal(
'Are you sure you want to delete this address?',
'Delete',
'Cancel',
......@@ -469,8 +470,9 @@ begin
begin
Utils.ShowSpinner('spinner');
DelAddress();
clear();
end;
end);
end); }
end;
......
......@@ -19,7 +19,7 @@ type
FUnauthorizedAccessProc: TUnauthorizedAccessProc;
public
const clientVersion = '0.9.8';
const clientVersion = '0.9.9';
procedure InitApp(SuccessProc: TSuccessProc;
UnauthorizedAccessProc: TUnauthorizedAccessProc);
procedure SetClientConfig(Callback: TVersionCheckCallback);
......
......@@ -497,7 +497,7 @@ end;
procedure TFViewItems.btnDeleteClick(Sender: TObject);
begin
ShowToast('Deleting items is no yet implemented.', 'info');
ShowToast('Deleting items is not yet implemented.', 'info');
end;
procedure TFViewItems.btnEditClick(Sender: TObject);
......
......@@ -1202,7 +1202,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
end
object dtpPlateDue: TWebDBDateTimePicker
Left = 26
Top = 578
Top = 584
Width = 170
Height = 22
ElementID = 'dtpplatedue'
......@@ -1227,7 +1227,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45867.392311898150000000
Role = ''
Text = ''
DataField = 'staff_fields_art_due'
DataField = 'proofing_pdf_date_3'
DataSource = wdsOrder
end
object dtpPDFDate2: TWebDBDateTimePicker
......@@ -1432,6 +1432,21 @@ object FOrderEntryWeb: TFOrderEntryWeb
WidthPercent = 100.000000000000000000
OnClick = btnQBClick
end
object dtpArtDue: TWebDBDateTimePicker
Left = 160
Top = 550
Width = 170
Height = 22
ElementID = 'dtpartdue'
BorderStyle = bsSingle
ChildOrder = 95
Color = clWhite
Date = 45867.392311898150000000
Role = ''
Text = ''
DataField = 'staff_fields_art_due'
DataSource = wdsOrder
end
object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection
Left = 160
......
......@@ -210,6 +210,7 @@ type
wcbQBItem: TWebDBComboBox;
xdwdsQBItemID: TStringField;
btnQB: TWebButton;
dtpArtDue: TWebDBDateTimePicker;
procedure WebFormCreate(Sender: TObject);
[async] procedure getOrder(Order_ID: string);
[async] procedure SetNewOrderInfo(customerID: string);
......
......@@ -248,13 +248,10 @@ end;
procedure TFViewOrders.WebButton1Click(Sender: TObject);
begin
if OrderID <> '' then
begin
if OrderID <> '' then
ShowSetStatusForm()
else
ShowToast('Failure: Please select an order');
end;
if statusOrderID <> '' then
ShowSetStatusForm()
else
ShowToast('Failure: Please select an order');
end;
......
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{DB6F5DBF-7E4B-45DA-AFFA-6C8DF15BA740}</ProjectGuid>
<ProjectVersion>20.2</ProjectVersion>
......@@ -119,6 +119,7 @@
<VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>6</VerInfo_Release>
<TMSWebBrowser>1</TMSWebBrowser>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
......
......@@ -39,9 +39,6 @@ object fQB: TfQB
Height = 63
Align = alTop
TabOrder = 0
ExplicitLeft = 4
ExplicitTop = 72
ExplicitWidth = 978
object Button2: TButton
Left = 4
Top = 32
......@@ -169,6 +166,7 @@ object fQB: TfQB
TabOrder = 1
UseDockManager = True
Version = '2.7.0.2'
BorderColor = clBlack
Caption.Color = clWhite
Caption.ColorTo = clNone
Caption.Font.Charset = DEFAULT_CHARSET
......@@ -196,8 +194,6 @@ object fQB: TfQB
StatusBar.Color = clWhite
StatusBar.GradientDirection = gdVertical
Text = ''
ExplicitTop = 428
ExplicitHeight = 230
FullHeight = 200
object asgData2: TAdvStringGrid
Left = 0
......@@ -327,9 +323,6 @@ object fQB: TfQB
SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite
Version = '9.1.4.5'
ExplicitLeft = -682
ExplicitTop = 0
ExplicitHeight = 183
ColWidths = (
64
64
......@@ -726,8 +719,6 @@ object fQB: TfQB
'')
ScrollBars = ssVertical
TabOrder = 0
ExplicitTop = 54
ExplicitHeight = 72
end
object Panel2: TPanel
Left = 2
......@@ -831,8 +822,6 @@ object fQB: TfQB
Height = 33
Align = alTop
TabOrder = 1
ExplicitLeft = 4
ExplicitTop = 4
object Button14: TButton
Left = 46
Top = 4
......@@ -921,6 +910,7 @@ object fQB: TfQB
TabOrder = 3
UseDockManager = True
Version = '2.7.0.2'
BorderColor = clBlack
Caption.Color = clWhite
Caption.ColorTo = clNone
Caption.Font.Charset = DEFAULT_CHARSET
......@@ -948,7 +938,6 @@ object fQB: TfQB
StatusBar.Color = clWhite
StatusBar.GradientDirection = gdVertical
Text = ''
ExplicitTop = 264
FullHeight = 200
object asgData: TAdvStringGrid
Left = 0
......
......@@ -398,12 +398,15 @@ begin
doQuery(ordersDB.UniQuery1, SQL);
while (not ordersDB.UniQuery1.Eof) do
begin
ordersDB.UniQuery1.Edit;
name := ordersDB.UniQuery1.FieldByName('NAME').AsString;
password := ordersDB.UniQuery1.FieldByName('PASSWORD').AsString;
newPassword := THashSHA2.GetHashString(name + password, THashSHA2.TSHA2Version.SHA512).ToUpper;
ordersDB.UniQuery1.FieldByName('PASSWORD').AsString := newPassword;
ordersDB.UniQuery1.Post;
if length(password) <> 128 then
begin
ordersDB.UniQuery1.Edit;
ordersDB.UniQuery1.FieldByName('PASSWORD').AsString := newPassword;
ordersDB.UniQuery1.Post;
end;
ordersDB.UniQuery1.Next;
end;
Memo1.Lines.Add('Finished updating passwords');
......
......@@ -45,6 +45,393 @@ object rptOrderWeb: TrptOrderWeb
DataSetOptions = []
Left = 444
Top = 206
FieldDefs = <
item
FieldName = 'ORDER_ID'
end
item
FieldName = 'COMPANY_ID'
end
item
FieldName = 'USER_ID'
end
item
FieldName = 'ORDER_DATE'
FieldType = fftDateTime
end
item
FieldName = 'START_DATE'
FieldType = fftDateTime
end
item
FieldName = 'END_DATE'
FieldType = fftDateTime
end
item
FieldName = 'ORDER_STATUS'
FieldType = fftString
end
item
FieldName = 'SCHED_JSON'
FieldType = fftString
Size = 4096
end
item
FieldName = 'staff_fields_order_date'
FieldType = fftDateTime
end
item
FieldName = 'staff_fields_proof_date'
FieldType = fftDateTime
end
item
FieldName = 'staff_fields_ship_date'
FieldType = fftDateTime
end
item
FieldName = 'staff_fields_ship_via'
FieldType = fftString
Size = 45
end
item
FieldName = 'staff_fields_price'
FieldType = fftString
end
item
FieldName = 'staff_fields_invoice_to'
FieldType = fftString
Size = 128
end
item
FieldName = 'staff_fields_invoice_attention'
FieldType = fftString
Size = 256
end
item
FieldName = 'staff_fields_ship_to'
FieldType = fftString
Size = 128
end
item
FieldName = 'staff_fields_ship_attention'
FieldType = fftString
Size = 256
end
item
FieldName = 'staff_fields_po_number'
FieldType = fftString
Size = 16
end
item
FieldName = 'staff_fields_job_name'
FieldType = fftString
Size = 45
end
item
FieldName = 'staff_fields_art_due'
FieldType = fftDateTime
end
item
FieldName = 'staff_fields_plate_due'
FieldType = fftDateTime
end
item
FieldName = 'plates_job_number'
FieldType = fftString
Size = 16
end
item
FieldName = 'supplied_by_customer_b_w_or_co'
FieldType = fftString
end
item
FieldName = 'supplied_by_customer_plates'
FieldType = fftString
end
item
FieldName = 'supplied_by_customer_sample'
FieldType = fftString
Size = 45
end
item
FieldName = 'supplied_by_customer_dimension'
FieldType = fftString
end
item
FieldName = 'supplied_by_customer_other'
FieldType = fftString
Size = 45
end
item
FieldName = 'supplied_by_customer_disk'
FieldType = fftString
end
item
FieldName = 'supplied_by_customer_e_mail'
FieldType = fftString
Size = 128
end
item
FieldName = 'supplied_by_customer_ftp'
FieldType = fftString
Size = 128
end
item
FieldName = 'plates_plate_material'
FieldType = fftString
Size = 16
end
item
FieldName = 'plates_thickness'
FieldType = fftString
end
item
FieldName = 'supplied_by_customer_total_inc'
FieldType = fftString
Size = 32
end
item
FieldName = 'supplied_by_customer_sheets_us'
FieldType = fftString
Size = 32
end
item
FieldName = 'supplied_by_customer_initials'
FieldType = fftString
Size = 16
end
item
FieldName = 'proofing_pdf'
FieldType = fftString
end
item
FieldName = 'proofing_pdf_to'
FieldType = fftString
Size = 256
end
item
FieldName = 'proofing_pdf_date_1'
FieldType = fftDateTime
end
item
FieldName = 'proofing_pdf_date_2'
FieldType = fftDateTime
end
item
FieldName = 'proofing_pdf_date_3'
FieldType = fftDateTime
end
item
FieldName = 'proofing_full_size_ink_jet_for'
FieldType = fftString
end
item
FieldName = 'proofing_ink_jet_to'
FieldType = fftString
Size = 256
end
item
FieldName = 'proofing_ink_jet_to_2'
FieldType = fftString
Size = 256
end
item
FieldName = 'proofing_ink_jet_date_1'
FieldType = fftDateTime
end
item
FieldName = 'proofing_ink_jet_date_2'
FieldType = fftDateTime
end
item
FieldName = 'proofing_ink_jet_date_3'
FieldType = fftDateTime
end
item
FieldName = 'proofing_color_contract'
FieldType = fftString
Size = 17
end
item
FieldName = 'proofing_color_contrac_to'
FieldType = fftString
Size = 256
end
item
FieldName = 'proofing_color_contrac_date_1'
FieldType = fftDateTime
end
item
FieldName = 'proofing_color_contrac_date_2'
FieldType = fftDateTime
end
item
FieldName = 'proofing_digital_color_key'
FieldType = fftString
end
item
FieldName = 'proofing_digital_color_to'
FieldType = fftString
Size = 256
end
item
FieldName = 'proofing_digital_color_date_1'
FieldType = fftDateTime
end
item
FieldName = 'quantity_and_colors_press_name'
FieldType = fftString
Size = 64
end
item
FieldName = 'quantity_and_colors_anilox_info'
FieldType = fftString
Size = 64
end
item
FieldName = 'plate_marks_microdots'
FieldType = fftString
end
item
FieldName = 'plate_marks_microdots_comments'
FieldType = fftString
Size = 128
end
item
FieldName = 'plate_marks_crosshairs'
FieldType = fftString
end
item
FieldName = 'plate_marks_crosshairs_comments'
FieldType = fftString
Size = 128
end
item
FieldName = 'plate_marks_color_bars'
FieldType = fftString
end
item
FieldName = 'plate_marks_color_bars_comments'
FieldType = fftString
Size = 128
end
item
FieldName = 'plate_marks_other'
FieldType = fftString
Size = 16
end
item
FieldName = 'plate_marks_other_comments'
FieldType = fftString
Size = 128
end
item
FieldName = 'print_orientation_print_orient'
FieldType = fftString
end
item
FieldName = 'layout_around'
FieldType = fftString
end
item
FieldName = 'layout_accross'
FieldType = fftString
end
item
FieldName = 'layout_surface_print'
FieldType = fftString
end
item
FieldName = 'layout_reverse_print'
FieldType = fftString
end
item
FieldName = 'layout_cylinder_repeat'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_cutoff_dimension'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_pitch'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_teeth'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_bleed'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_cutback'
FieldType = fftString
Size = 16
end
item
FieldName = 'layout_minimum_trap_dim'
FieldType = fftString
end
item
FieldName = 'layout_maximum_trap_dim'
FieldType = fftString
end
item
FieldName = 'upc_size'
FieldType = fftString
Size = 16
end
item
FieldName = 'upc_bar_width_reduction'
FieldType = fftString
Size = 16
end
item
FieldName = 'quantity_and_colors_qty_colors'
FieldType = fftString
Size = 4096
end
item
FieldName = 'general_comments'
FieldType = fftString
Size = 4096
end
item
FieldName = 'staff_fields_quickbooks_item'
FieldType = fftString
Size = 45
end
item
FieldName = 'staff_fields_quantity'
FieldType = fftString
end
item
FieldName = 'upc_distortion_percent'
FieldType = fftString
Size = 16
end
item
FieldName = 'upc_distortion_amount'
FieldType = fftString
Size = 16
end
item
FieldName = 'staff_fields_art_location'
FieldType = fftString
Size = 16
end
item
FieldName = 'QB_REF_NUM'
FieldType = fftString
Size = 24
end>
end
object frxOrderWeb: TfrxReport
Version = '2025.1.4'
......
......@@ -116,8 +116,8 @@
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>8</VerInfo_Release>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.8.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.8.0;Comments=</VerInfo_Keys>
<VerInfo_Release>9</VerInfo_Release>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.9.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.8.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
[Settings]
MemoLogLevel=3
MemoLogLevel=5
FileLogLevel=5
webClientVersion=0.9.8
webClientVersion=0.9.7
LogFileNum=972
webClientVersion=0.9.9
LogFileNum=980
[Database]
Server=192.168.159.162
Server=192.168.159.158
--Server=192.168.102.130
--Server=192.168.75.133
Database=kg_order_entry
......@@ -18,6 +17,6 @@ Password=emsys01
CompanyID=9341454336461805
ClientID=ABYqlDx1EsacZYXvHIJ7RDB7zmnQdwABU3fwQLIZPmBgU0VW1P
ClientSecret=PM7OnvQWsgOqjWfDpZAnyRttDN9446Am6d85pDxr
RefreshToken=RT1-103-H0-1763213066r9617yglhu5jm7fm11jh
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
RefreshToken=RT1-176-H0-1763311149wc7h75ca0kot4wmjajl0
AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..4Lnl865y7RBKrwAlYrUdZw.-NX4xZUYbruXp8U0WT0guGo_MdrKBVAFacX_wbynpC0-kj48Avrm-c-JVsgU32egu40w_-4OIuo3Zt2dIZ12oCb108eysVI0njIa81noaCmS86tsjM1Lc8mO6O4uEVUiquwtkAKyJcMb16EfcWs05iEHj7alkL5G3O95JvH2xTC-N1rLUAEmPohEk-FJL0gdWKxO1905Q3EdCDCrFImg7WwCdeC3SDG5Ne9DIUIy0FWqA3wRHwOZllBxGT-M3PCpwGvVEcPd7EimdlteijNoIB_F55cRHQYgPGWPS779EVHa7m279rSJXAdL6ZLW76iorTGnXVnhQs162ejQiXIY8FFmTJOQWZxIVLDA44CQfcS4cwpTbDvVveoyZsh9NP4KaRai2fu4llzKB5Miqqjh5AEvX8w66XYhoC9J-lYFu8IBk0YQuVF2E3Vkf4dNwIiaFfgBOj7OR1tR1WCFiT-I5ipI4zS-BZaVFbLtIIYCKX8.0jpvxgPnhLC0gJMFpbfcCA
LastRefresh=8/7/2025 12:51:00 PM
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