diff --git a/AyaNovaQBI/ApproveCompanyFile.cs b/AyaNovaQBI/ApproveCompanyFile.cs index 4f7b3a2..9dd90b2 100644 --- a/AyaNovaQBI/ApproveCompanyFile.cs +++ b/AyaNovaQBI/ApproveCompanyFile.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -16,34 +9,34 @@ namespace AyaNovaQBI { InitializeComponent(); } - private string _CompanyName; - private string _CompanyPath; - public string QBCompanyName - { - set - { - _CompanyName = value; - } - } - public string QBCompanyPath - { - set - { - _CompanyPath = value; - } - } - private void ApproveCompanyFile_Load(object sender, EventArgs e) + private string _CompanyName; + private string _CompanyPath; + public string QBCompanyName { - this.btnCancel.Text = util.AyaTranslations["Cancel"]; - this.btnOK.Text = util.AyaTranslations["OK"]; - this.lblCompany.Text = _CompanyName; - this.lblPath.Text = _CompanyPath; - } + set + { + _CompanyName = value; + } + } + public string QBCompanyPath + { + set + { + _CompanyPath = value; + } + } + private void ApproveCompanyFile_Load(object sender, EventArgs e) + { + this.btnCancel.Text = util.AyaTranslations["Cancel"]; + this.btnOK.Text = util.AyaTranslations["OK"]; + this.lblCompany.Text = _CompanyName; + this.lblPath.Text = _CompanyPath; + } private void btnOK_Click(object sender, EventArgs e) { - this.DialogResult = DialogResult.OK; - this.Close(); + this.DialogResult = DialogResult.OK; + this.Close(); } } } diff --git a/AyaNovaQBI/AuthorizationRoles.cs b/AyaNovaQBI/AuthorizationRoles.cs index 9a86239..b070cd9 100644 --- a/AyaNovaQBI/AuthorizationRoles.cs +++ b/AyaNovaQBI/AuthorizationRoles.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { diff --git a/AyaNovaQBI/AyaNovaLicense.cs b/AyaNovaQBI/AyaNovaLicense.cs index 34b7236..07df3e9 100644 --- a/AyaNovaQBI/AyaNovaLicense.cs +++ b/AyaNovaQBI/AyaNovaLicense.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { diff --git a/AyaNovaQBI/AyaType.cs b/AyaNovaQBI/AyaType.cs index f1ba8b0..8bb80b3 100644 --- a/AyaNovaQBI/AyaType.cs +++ b/AyaNovaQBI/AyaType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace AyaNovaQBI +namespace AyaNovaQBI { /// /// All AyaNova types and their attributes indicating what features that type will support (tagging, attachments etc) diff --git a/AyaNovaQBI/CopyableMessageBox.cs b/AyaNovaQBI/CopyableMessageBox.cs index e2222d0..620f5f3 100644 --- a/AyaNovaQBI/CopyableMessageBox.cs +++ b/AyaNovaQBI/CopyableMessageBox.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -16,7 +9,7 @@ namespace AyaNovaQBI public CopyableMessageBox(string Display) { InitializeComponent(); - mDisplay=Display; + mDisplay = Display; Icon = AyaNovaQBI.Properties.Resources.logo; btnOK.Text = util.AyaTranslations["OK"]; } diff --git a/AyaNovaQBI/Customer.cs b/AyaNovaQBI/Customer.cs index 94333b9..6c7d44a 100644 --- a/AyaNovaQBI/Customer.cs +++ b/AyaNovaQBI/Customer.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -11,7 +8,7 @@ namespace AyaNovaQBI public long Id { get; set; } public uint Concurrency { get; set; } - + public string Name { get; set; } public bool Active { get; set; } public string Notes { get; set; } @@ -24,18 +21,18 @@ namespace AyaNovaQBI public string AlertNotes { get; set; } public bool BillHeadOffice { get; set; } public long? HeadOfficeId { get; set; } - + public string HeadOfficeViz { get; set; } public string TechNotes { get; set; } public string AccountNumber { get; set; } //public bool UsesBanking { get; set; } public long? ContractId { get; set; } - + public string ContractViz { get; set; } public DateTime? ContractExpires { get; set; } - + public long? LastWorkOrderViz { get; set; } - + public DateTime? LastServiceDateViz { get; set; } public string Phone1 { get; set; } public string Phone2 { get; set; } @@ -68,7 +65,7 @@ namespace AyaNovaQBI } - + }//eoc } diff --git a/AyaNovaQBI/Integration.cs b/AyaNovaQBI/Integration.cs index b472525..d7ce0b6 100644 --- a/AyaNovaQBI/Integration.cs +++ b/AyaNovaQBI/Integration.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { diff --git a/AyaNovaQBI/InvoiceTemplateBuilder.cs b/AyaNovaQBI/InvoiceTemplateBuilder.cs index cc89a9d..ed2d755 100644 --- a/AyaNovaQBI/InvoiceTemplateBuilder.cs +++ b/AyaNovaQBI/InvoiceTemplateBuilder.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -68,9 +61,9 @@ namespace AyaNovaQBI if (!menutag.StartsWith("Set"))//skip the two permanently visible ones { t.Visible = edittag == menutag; - // System.Diagnostics.Debug.WriteLine($"editField_Enter setting menu item {menutag} to visible= {t.Visible}"); + // System.Diagnostics.Debug.WriteLine($"editField_Enter setting menu item {menutag} to visible= {t.Visible}"); } - } + } } private void tbManager_ItemClicked(object sender, ToolStripItemClickedEventArgs e) @@ -78,7 +71,7 @@ namespace AyaNovaQBI if (e.ClickedItem.Tag == null) return;//probably just a container menu item / not a special menu item string tag = e.ClickedItem.Tag.ToString(); - // System.Diagnostics.Debug.WriteLine($"you clicked on {tag}"); + // System.Diagnostics.Debug.WriteLine($"you clicked on {tag}"); if (tag.StartsWith("~")) _CurrentTextEditor.Text = _CurrentTextEditor.Text.Insert(_CurrentTextEditor.SelectionStart, tag); else diff --git a/AyaNovaQBI/InvoiceableItem.cs b/AyaNovaQBI/InvoiceableItem.cs index 5144d88..911a27c 100644 --- a/AyaNovaQBI/InvoiceableItem.cs +++ b/AyaNovaQBI/InvoiceableItem.cs @@ -1,29 +1,23 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { internal class InvoiceableItem { - public string Customer { get; set; } - public string Status { get; set; } - public string ServiceNumber { get; set; } - public string ServiceDate { get; set; } - public string Project { get; set; } - public string StatusColor { get; set; } + public string Customer { get; set; } + public string Status { get; set; } + public string ServiceNumber { get; set; } + public string ServiceDate { get; set; } + public string Project { get; set; } + public string StatusColor { get; set; } - public long WorkorderId { get; set; } - public bool Linked { get; set; } - public long CustomerId { get; set; } + public long WorkorderId { get; set; } + public bool Linked { get; set; } + public long CustomerId { get; set; } - /* + /* grid.DisplayLayout.Bands[0].Columns["WorkingID"].Hidden=true; grid.DisplayLayout.Bands[0].Columns["ClientID"].Hidden=true; grid.DisplayLayout.Bands[0].Columns["Linked"].Hidden=true; @@ -34,6 +28,6 @@ namespace AyaNovaQBI grid.DisplayLayout.Bands[1].Columns["StatusARGB"].Hidden=true; grid.DisplayLayout.Bands[1].Columns["Linked"].Hidden=true; */ - } + } } diff --git a/AyaNovaQBI/MainForm.cs b/AyaNovaQBI/MainForm.cs index 9235b2a..5e01483 100644 --- a/AyaNovaQBI/MainForm.cs +++ b/AyaNovaQBI/MainForm.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; using System.Linq; using System.Reflection; using System.Text; @@ -20,7 +18,7 @@ namespace AyaNovaQBI Icon = AyaNovaQBI.Properties.Resources.logo; } - async private void MainForm_Load(object sender, EventArgs e) + private async void MainForm_Load(object sender, EventArgs e) { //Initialize @@ -465,7 +463,7 @@ namespace AyaNovaQBI - // grid.DisplayLayout.Rows.CollapseAll(false); + // grid.DisplayLayout.Rows.CollapseAll(false); //foreach (UltraGridRow r in grid.Rows) //{ // foreach (UltraGridRow rr in r.ChildBands[0].Rows) diff --git a/AyaNovaQBI/Map.cs b/AyaNovaQBI/Map.cs index 3f54ee8..57d222e 100644 --- a/AyaNovaQBI/Map.cs +++ b/AyaNovaQBI/Map.cs @@ -993,7 +993,7 @@ namespace AyaNovaQBI private async void updateSelectedItemsToolStripMenuItem_Click(object sender, EventArgs e) { - + if (gridAya.SelectedRows.Count == 0 && gridQB.SelectedRows.Count == 0) return; bool IsAyaGrid = false; IsAyaGrid = gridAya.SelectedRows.Count > 0; diff --git a/AyaNovaQBI/MapApproveUpdateSelectedItems.cs b/AyaNovaQBI/MapApproveUpdateSelectedItems.cs index 0a2390b..a08d094 100644 --- a/AyaNovaQBI/MapApproveUpdateSelectedItems.cs +++ b/AyaNovaQBI/MapApproveUpdateSelectedItems.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -19,17 +12,19 @@ namespace AyaNovaQBI public bool ShowUpdatePriceCostOnlyCheckBox { get; set; } = false; - public bool PriceOnly { get + public bool PriceOnly + { + get { return ckUpdatePriceCostOnly.Checked; - } + } } public string UpdateMessage { get; set; } private void MapApproveUpdateSelectedItems_Load(object sender, EventArgs e) { ckUpdatePriceCostOnly.Visible = ShowUpdatePriceCostOnlyCheckBox; - lblUpdateMessage.Text=UpdateMessage; + lblUpdateMessage.Text = UpdateMessage; btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; } diff --git a/AyaNovaQBI/MapSelectAyaNovaItem.cs b/AyaNovaQBI/MapSelectAyaNovaItem.cs index 80cabb4..65b1244 100644 --- a/AyaNovaQBI/MapSelectAyaNovaItem.cs +++ b/AyaNovaQBI/MapSelectAyaNovaItem.cs @@ -1,11 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -20,7 +14,7 @@ namespace AyaNovaQBI public string SelectedItemName { get - { + { return ((DataRowView)cbItems.SelectedItem).Row[0].ToString(); } } @@ -28,7 +22,7 @@ namespace AyaNovaQBI public long SelectedItemId { get - { + { return (long)((DataRowView)cbItems.SelectedItem).Row[1]; } } @@ -58,6 +52,6 @@ namespace AyaNovaQBI Close(); } - + } } diff --git a/AyaNovaQBI/MapSelectQBItem.cs b/AyaNovaQBI/MapSelectQBItem.cs index c1a5e20..2002d78 100644 --- a/AyaNovaQBI/MapSelectQBItem.cs +++ b/AyaNovaQBI/MapSelectQBItem.cs @@ -1,11 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -39,7 +33,7 @@ namespace AyaNovaQBI private void MapSelectQBItem_Load(object sender, EventArgs e) { cbQBItems.DataSource = QBItems; - + cbQBItems.DisplayMember = "name"; cbQBItems.ValueMember = "id"; btnCancel.Text = util.AyaTranslations["Cancel"]; diff --git a/AyaNovaQBI/NameIdActiveChargeCostItem.cs b/AyaNovaQBI/NameIdActiveChargeCostItem.cs index 3db4e5c..db7880d 100644 --- a/AyaNovaQBI/NameIdActiveChargeCostItem.cs +++ b/AyaNovaQBI/NameIdActiveChargeCostItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { public class NameIdActiveChargeCostItem { @@ -12,7 +6,7 @@ namespace AyaNovaQBI public string Name { get; set; } public bool Active { get; set; } public decimal Cost { get; set; } - + public decimal Charge { get; set; } } } diff --git a/AyaNovaQBI/NameIdActiveItem.cs b/AyaNovaQBI/NameIdActiveItem.cs index adf6094..6679ec9 100644 --- a/AyaNovaQBI/NameIdActiveItem.cs +++ b/AyaNovaQBI/NameIdActiveItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { public class NameIdActiveItem { diff --git a/AyaNovaQBI/NameIdItem.cs b/AyaNovaQBI/NameIdItem.cs index 6b50259..e702d9b 100644 --- a/AyaNovaQBI/NameIdItem.cs +++ b/AyaNovaQBI/NameIdItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { public class NameIdItem diff --git a/AyaNovaQBI/Part.cs b/AyaNovaQBI/Part.cs index 85a559e..e218dd4 100644 --- a/AyaNovaQBI/Part.cs +++ b/AyaNovaQBI/Part.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AyaNovaQBI { @@ -43,7 +39,7 @@ namespace AyaNovaQBI Retail = 0m; } - + }//eoc } diff --git a/AyaNovaQBI/PartInventory.cs b/AyaNovaQBI/PartInventory.cs index 0bacbc3..e6fdbb1 100644 --- a/AyaNovaQBI/PartInventory.cs +++ b/AyaNovaQBI/PartInventory.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { diff --git a/AyaNovaQBI/PartStockLevel.cs b/AyaNovaQBI/PartStockLevel.cs index c4288b6..84db0e1 100644 --- a/AyaNovaQBI/PartStockLevel.cs +++ b/AyaNovaQBI/PartStockLevel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { public class PartStockLevel { diff --git a/AyaNovaQBI/Program.cs b/AyaNovaQBI/Program.cs index 6a49e49..7b229b6 100644 --- a/AyaNovaQBI/Program.cs +++ b/AyaNovaQBI/Program.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI diff --git a/AyaNovaQBI/Properties/AssemblyInfo.cs b/AyaNovaQBI/Properties/AssemblyInfo.cs index 587b876..a1b144d 100644 --- a/AyaNovaQBI/Properties/AssemblyInfo.cs +++ b/AyaNovaQBI/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/AyaNovaQBI/QBIIntegrationData.cs b/AyaNovaQBI/QBIIntegrationData.cs index 0bef7fc..314b832 100644 --- a/AyaNovaQBI/QBIIntegrationData.cs +++ b/AyaNovaQBI/QBIIntegrationData.cs @@ -1,9 +1,4 @@ -using System; -using Newtonsoft.Json; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Newtonsoft.Json; namespace AyaNovaQBI { diff --git a/AyaNovaQBI/ServiceRate.cs b/AyaNovaQBI/ServiceRate.cs index c5b2942..403ea66 100644 --- a/AyaNovaQBI/ServiceRate.cs +++ b/AyaNovaQBI/ServiceRate.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AyaNovaQBI { - public class ServiceRate + public class ServiceRate { public long Id { get; set; } public uint Concurrency { get; set; } diff --git a/AyaNovaQBI/SetAutoClose.cs b/AyaNovaQBI/SetAutoClose.cs index 4aae8f7..bc892fc 100644 --- a/AyaNovaQBI/SetAutoClose.cs +++ b/AyaNovaQBI/SetAutoClose.cs @@ -1,5 +1,4 @@ using System; -using System.Data; using System.Windows.Forms; namespace AyaNovaQBI @@ -40,7 +39,7 @@ namespace AyaNovaQBI btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; - + } diff --git a/AyaNovaQBI/SetInfoOnly.cs b/AyaNovaQBI/SetInfoOnly.cs index 238b750..8ba2ee9 100644 --- a/AyaNovaQBI/SetInfoOnly.cs +++ b/AyaNovaQBI/SetInfoOnly.cs @@ -1,5 +1,4 @@ using System; -using System.Data; using System.Windows.Forms; namespace AyaNovaQBI @@ -19,7 +18,7 @@ namespace AyaNovaQBI public string OptionDescription { get; set; } - + private void SetQBClass_load(object sender, EventArgs e) { @@ -29,7 +28,7 @@ namespace AyaNovaQBI btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; - + } diff --git a/AyaNovaQBI/SetMemoField.cs b/AyaNovaQBI/SetMemoField.cs index 389e752..3f1d999 100644 --- a/AyaNovaQBI/SetMemoField.cs +++ b/AyaNovaQBI/SetMemoField.cs @@ -1,5 +1,4 @@ using System; -using System.Data; using System.Windows.Forms; namespace AyaNovaQBI @@ -41,7 +40,7 @@ namespace AyaNovaQBI btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; - + } diff --git a/AyaNovaQBI/SetQBChargeAs.cs b/AyaNovaQBI/SetQBChargeAs.cs index be780b1..7979a0e 100644 --- a/AyaNovaQBI/SetQBChargeAs.cs +++ b/AyaNovaQBI/SetQBChargeAs.cs @@ -1,11 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI diff --git a/AyaNovaQBI/SetQBClass.cs b/AyaNovaQBI/SetQBClass.cs index f1029e9..74333b6 100644 --- a/AyaNovaQBI/SetQBClass.cs +++ b/AyaNovaQBI/SetQBClass.cs @@ -20,8 +20,8 @@ namespace AyaNovaQBI public DataTable QBClasses { get; set; } - - + + public string SelectedQBClass { diff --git a/AyaNovaQBI/SetQBImportInventoryAccounts.cs b/AyaNovaQBI/SetQBImportInventoryAccounts.cs index 9e87ecc..ad782c1 100644 --- a/AyaNovaQBI/SetQBImportInventoryAccounts.cs +++ b/AyaNovaQBI/SetQBImportInventoryAccounts.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI diff --git a/AyaNovaQBI/SetQBImportServiceRateAccounts.cs b/AyaNovaQBI/SetQBImportServiceRateAccounts.cs index 5fda818..dd94d98 100644 --- a/AyaNovaQBI/SetQBImportServiceRateAccounts.cs +++ b/AyaNovaQBI/SetQBImportServiceRateAccounts.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -18,7 +11,7 @@ namespace AyaNovaQBI } private void SetQBImportServiceRateAccounts_Load(object sender, EventArgs e) - { + { btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; diff --git a/AyaNovaQBI/SetQBInvoiceTemplate.cs b/AyaNovaQBI/SetQBInvoiceTemplate.cs index ae3e95d..db84d4c 100644 --- a/AyaNovaQBI/SetQBInvoiceTemplate.cs +++ b/AyaNovaQBI/SetQBInvoiceTemplate.cs @@ -21,7 +21,7 @@ namespace AyaNovaQBI public DataTable QBInvoiceTemplates { get; set; } - + public string SelectedQBInvoiceTemplate { diff --git a/AyaNovaQBI/SetQBTerms.cs b/AyaNovaQBI/SetQBTerms.cs index 50b35e6..e51c4cc 100644 --- a/AyaNovaQBI/SetQBTerms.cs +++ b/AyaNovaQBI/SetQBTerms.cs @@ -21,7 +21,7 @@ namespace AyaNovaQBI public DataTable QBTerms { get; set; } - + public string SelectedQBTerm { get diff --git a/AyaNovaQBI/SetToBePrinted.cs b/AyaNovaQBI/SetToBePrinted.cs index 19bc0e8..6e4b238 100644 --- a/AyaNovaQBI/SetToBePrinted.cs +++ b/AyaNovaQBI/SetToBePrinted.cs @@ -1,5 +1,4 @@ using System; -using System.Data; using System.Windows.Forms; namespace AyaNovaQBI diff --git a/AyaNovaQBI/SetWOStatus.cs b/AyaNovaQBI/SetWOStatus.cs index 061d75a..1fa2dc0 100644 --- a/AyaNovaQBI/SetWOStatus.cs +++ b/AyaNovaQBI/SetWOStatus.cs @@ -1,11 +1,7 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI diff --git a/AyaNovaQBI/TravelRate.cs b/AyaNovaQBI/TravelRate.cs index 90ad8c8..e8985b5 100644 --- a/AyaNovaQBI/TravelRate.cs +++ b/AyaNovaQBI/TravelRate.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AyaNovaQBI { - public class TravelRate + public class TravelRate { public long Id { get; set; } public uint Concurrency { get; set; } diff --git a/AyaNovaQBI/UserType.cs b/AyaNovaQBI/UserType.cs index 21f06e5..a7e7b91 100644 --- a/AyaNovaQBI/UserType.cs +++ b/AyaNovaQBI/UserType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { /// /// AyaNova User types diff --git a/AyaNovaQBI/Vendor.cs b/AyaNovaQBI/Vendor.cs index 3689559..82143ac 100644 --- a/AyaNovaQBI/Vendor.cs +++ b/AyaNovaQBI/Vendor.cs @@ -1,17 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AyaNovaQBI { - public class Vendor + public class Vendor { public long Id { get; set; } public uint Concurrency { get; set; } - + public string Name { get; set; } public bool Active { get; set; } public string Notes { get; set; } @@ -54,7 +50,7 @@ namespace AyaNovaQBI Tags = new List(); } - + }//eoc } diff --git a/AyaNovaQBI/Waiting.cs b/AyaNovaQBI/Waiting.cs index 57da805..4a195b9 100644 --- a/AyaNovaQBI/Waiting.cs +++ b/AyaNovaQBI/Waiting.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using System.Windows.Forms; namespace AyaNovaQBI { @@ -17,23 +9,23 @@ namespace AyaNovaQBI InitializeComponent(); } - public string Ops - { - set - { - lblOps.Text = value; - this.Refresh(); - } - } + public string Ops + { + set + { + lblOps.Text = value; + this.Refresh(); + } + } - public string Step - { - set - { - lblStep.Text = value; - this.Refresh(); - } - } + public string Step + { + set + { + lblStep.Text = value; + this.Refresh(); + } + } - } + } } diff --git a/AyaNovaQBI/WorkOrder.cs b/AyaNovaQBI/WorkOrder.cs index 6529d31..c7744d2 100644 --- a/AyaNovaQBI/WorkOrder.cs +++ b/AyaNovaQBI/WorkOrder.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -85,7 +82,7 @@ namespace AyaNovaQBI public decimal? Longitude { get; set; } public List Items { get; set; } = new List(); - // public List States { get; set; } = new List(); + // public List States { get; set; } = new List(); //UTILITY FIELDS diff --git a/AyaNovaQBI/WorkOrderAccountingListItem.cs b/AyaNovaQBI/WorkOrderAccountingListItem.cs index 6023aa6..747e3e0 100644 --- a/AyaNovaQBI/WorkOrderAccountingListItem.cs +++ b/AyaNovaQBI/WorkOrderAccountingListItem.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -10,15 +6,15 @@ namespace AyaNovaQBI /// /// DTO object to receive list from server of billable workorders /// - internal class WorkOrderAccountingListItem + public class WorkOrderAccountingListItem { - internal long id { get; set; } - internal long customerId { get; set; } - internal string customerName { get; set; } - internal string workorderStatusName { get; set; } - internal long serial { get; set; } - internal DateTime? serviceDate { get; set; } - internal string color { get; set; } - internal string projectName { get; set; } + public long id { get; set; } + public long customerId { get; set; } + public string customerName { get; set; } + public string workorderStatusName { get; set; } + public long serial { get; set; } + public DateTime? serviceDate { get; set; } + public string color { get; set; } + public string projectName { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderGridListItem.cs b/AyaNovaQBI/WorkOrderGridListItem.cs index 433d99c..0279298 100644 --- a/AyaNovaQBI/WorkOrderGridListItem.cs +++ b/AyaNovaQBI/WorkOrderGridListItem.cs @@ -1,25 +1,21 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { /// /// Working list for selection by user in grid /// - internal class WorkOrderGridListItem + public class WorkOrderGridListItem { - internal long Id { get; set; } - internal long CustomerId { get; set; } - internal string CustomerName { get; set; } - internal string WorkorderStatusName { get; set; } - internal long Serial { get; set; } - internal DateTime? ServiceDate { get; set; } - internal string Color { get; set; } - internal string ProjectName { get; set; } + public long Id { get; set; } + public long CustomerId { get; set; } + public string CustomerName { get; set; } + public string WorkorderStatusName { get; set; } + public long Serial { get; set; } + public DateTime? ServiceDate { get; set; } + public string Color { get; set; } + public string ProjectName { get; set; } - internal bool Linked { get; set; } + public bool Linked { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderItem.cs b/AyaNovaQBI/WorkOrderItem.cs index 5796373..e6e5d51 100644 --- a/AyaNovaQBI/WorkOrderItem.cs +++ b/AyaNovaQBI/WorkOrderItem.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -15,19 +12,19 @@ namespace AyaNovaQBI public string CustomFields { get; set; } public List Tags { get; set; } = new List(); - + public long WorkOrderId { get; set; } public string TechNotes { get; set; } public long? WorkOrderItemStatusId { get; set; } - + public string WorkOrderItemStatusNameViz { get; set; } - + public string WorkOrderItemStatusColorViz { get; set; } public long? WorkOrderItemPriorityId { get; set; } - + public string WorkOrderItemPriorityNameViz { get; set; } - + public string WorkOrderItemPriorityColorViz { get; set; } public DateTime? RequestDate { get; set; } @@ -35,26 +32,26 @@ namespace AyaNovaQBI public int Sequence { get; set; } public long? FromCSRId { get; set; } - + public string FromCSRViz { get; set; } //workaround for notification - + public string Name { get; set; } //Principle - + public WorkOrder WorkOrder { get; set; } //dependents public List Expenses { get; set; } = new List(); public List Labors { get; set; } = new List(); public List Loans { get; set; } = new List(); public List Parts { get; set; } = new List(); - // public List PartRequests { get; set; } = new List(); - // public List ScheduledUsers { get; set; } = new List(); - // public List Tasks { get; set; } = new List(); + // public List PartRequests { get; set; } = new List(); + // public List ScheduledUsers { get; set; } = new List(); + // public List Tasks { get; set; } = new List(); public List Travels { get; set; } = new List(); - // public List Units { get; set; } = new List(); + // public List Units { get; set; } = new List(); public List OutsideServices { get; set; } = new List(); } } diff --git a/AyaNovaQBI/WorkOrderItemExpense.cs b/AyaNovaQBI/WorkOrderItemExpense.cs index fc9767e..0591150 100644 --- a/AyaNovaQBI/WorkOrderItemExpense.cs +++ b/AyaNovaQBI/WorkOrderItemExpense.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { internal class WorkOrderItemExpense { @@ -13,29 +7,29 @@ namespace AyaNovaQBI public string Description { get; set; } public string Name { get; set; } - + public decimal TotalCost { get; set; } - + public decimal ChargeAmount { get; set; } - + public decimal TaxPaid { get; set; } public long? ChargeTaxCodeId { get; set; } - + public string TaxCodeViz { get; set; } public bool ReimburseUser { get; set; } = false; public long? UserId { get; set; } - + public string UserViz { get; set; } public bool ChargeToCustomer { get; set; } = false; - + public decimal TaxAViz { get; set; } - + public decimal TaxBViz { get; set; } - + public decimal LineTotalViz { get; set; } - + public long WorkOrderItemId { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderItemLabor.cs b/AyaNovaQBI/WorkOrderItemLabor.cs index ae0f3fe..4debbb5 100644 --- a/AyaNovaQBI/WorkOrderItemLabor.cs +++ b/AyaNovaQBI/WorkOrderItemLabor.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -12,47 +8,47 @@ namespace AyaNovaQBI public uint Concurrency { get; set; } public long? UserId { get; set; } - + public string UserViz { get; set; } public DateTime? ServiceStartDate { get; set; } public DateTime? ServiceStopDate { get; set; } public long? ServiceRateId { get; set; } - + public string ServiceRateViz { get; set; } public string ServiceDetails { get; set; } - + public decimal ServiceRateQuantity { get; set; } - + public decimal NoChargeQuantity { get; set; } //public long? ServiceBankId { get; set; } public long? TaxCodeSaleId { get; set; } - + public string TaxCodeViz { get; set; } //Standard pricing fields (mostly to support printed reports though some show in UI) //some not to be sent with record depending on role (i.e. cost and charge in some cases) public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero - + public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered - + public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered - + public string UnitOfMeasureViz { get; set; }//"each", "hour" etc - + public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override - + public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) - + public decimal TaxAViz { get; set; }//total amount of taxA - + public decimal TaxBViz { get; set; }//total amount of taxB - + public decimal LineTotalViz { get; set; }//line total netViz + taxes - + public long WorkOrderItemId { get; set; } - + } } diff --git a/AyaNovaQBI/WorkOrderItemLoan.cs b/AyaNovaQBI/WorkOrderItemLoan.cs index ade1410..8f59def 100644 --- a/AyaNovaQBI/WorkOrderItemLoan.cs +++ b/AyaNovaQBI/WorkOrderItemLoan.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -27,15 +24,15 @@ namespace AyaNovaQBI // // public decimal Charges { get; set; }//removed in favor of ListPRice snapshot which normalizes fields to other objects public long? TaxCodeId { get; set; } - + public string TaxCodeViz { get; set; } - + public long LoanUnitId { get; set; } - + public string LoanUnitViz { get; set; } - + public decimal Quantity { get; set; } - + public LoanUnitRateUnit Rate { get; set; } public decimal Cost { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered @@ -45,25 +42,25 @@ namespace AyaNovaQBI //some not to be sent with record depending on role (i.e. cost and charge in some cases) public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero - + public string UnitOfMeasureViz { get; set; }//"each", "hour" etc - + public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override - + public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) - + public decimal TaxAViz { get; set; }//total amount of taxA - + public decimal TaxBViz { get; set; }//total amount of taxB - + public decimal LineTotalViz { get; set; }//line total netViz + taxes //workaround for notification - + public List Tags { get; set; } = new List(); - + public string Name { get; set; } - + public long WorkOrderItemId { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderItemOutsideService.cs b/AyaNovaQBI/WorkOrderItemOutsideService.cs index d02050f..22520d7 100644 --- a/AyaNovaQBI/WorkOrderItemOutsideService.cs +++ b/AyaNovaQBI/WorkOrderItemOutsideService.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -12,52 +9,52 @@ namespace AyaNovaQBI public uint Concurrency { get; set; } public string Notes { get; set; } - + public long UnitId { get; set; } - + public string UnitViz { get; set; } public long? VendorSentToId { get; set; } - + public string VendorSentToViz { get; set; } public long? VendorSentViaId { get; set; } - + public string VendorSentViaViz { get; set; } public string RMANumber { get; set; } public string TrackingNumber { get; set; } - + public decimal RepairCost { get; set; } - + public decimal RepairPrice { get; set; } - + public decimal ShippingCost { get; set; } - + public decimal ShippingPrice { get; set; } public DateTime? SentDate { get; set; } public DateTime? ETADate { get; set; } public DateTime? ReturnDate { get; set; } public long? TaxCodeId { get; set; } - + public string TaxCodeViz { get; set; } - + public decimal CostViz { get; set; }//Total cost shipping + repairs - + public decimal PriceViz { get; set; }//Total price shipping + repairs - + public decimal NetViz { get; set; }//=priceViz for standardization not because it's necessary (before taxes line total essentially) - + public decimal TaxAViz { get; set; }//total amount of taxA - + public decimal TaxBViz { get; set; }//total amount of taxB - + public decimal LineTotalViz { get; set; }//line total netViz + taxes //workaround for notification - + public List Tags { get; set; } = new List(); - + public string Name { get; set; } - + public long WorkOrderItemId { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderItemPart.cs b/AyaNovaQBI/WorkOrderItemPart.cs index 64a2b4d..2b78742 100644 --- a/AyaNovaQBI/WorkOrderItemPart.cs +++ b/AyaNovaQBI/WorkOrderItemPart.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AyaNovaQBI { @@ -12,23 +8,23 @@ namespace AyaNovaQBI public uint Concurrency { get; set; } public string Description { get; set; } public string Serials { get; set; } - + public long PartId { get; set; } - + public string PartDescriptionViz { get; set; } - + public string PartNameViz { get; set; } - + public string UpcViz { get; set; } - + public long PartWarehouseId { get; set; } - + public string PartWarehouseViz { get; set; } - + public decimal Quantity { get; set; } public decimal SuggestedQuantity { get; set; } public long? TaxPartSaleId { get; set; } - + public string TaxCodeViz { get; set; } //NOTE: part prices are volatile and expected to be frequently edited so snapshotted when newly added unlike other things like rates etc that are protected from change @@ -40,26 +36,26 @@ namespace AyaNovaQBI public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero - + public string UnitOfMeasureViz { get; set; }//"each", "hour" etc - + public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override - + public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) - + public decimal TaxAViz { get; set; }//total amount of taxA - + public decimal TaxBViz { get; set; }//total amount of taxB - + public decimal LineTotalViz { get; set; }//line total netViz + taxes //workaround for notification - + public List Tags { get; set; } = new List(); - + public string Name { get; set; } - + public long WorkOrderItemId { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderItemTravel.cs b/AyaNovaQBI/WorkOrderItemTravel.cs index f313968..795d87b 100644 --- a/AyaNovaQBI/WorkOrderItemTravel.cs +++ b/AyaNovaQBI/WorkOrderItemTravel.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AyaNovaQBI { @@ -12,19 +9,19 @@ namespace AyaNovaQBI public uint Concurrency { get; set; } public long? UserId { get; set; } - + public string UserViz { get; set; } public DateTime? TravelStartDate { get; set; } public DateTime? TravelStopDate { get; set; } public long? TravelRateId { get; set; } - + public string TravelRateViz { get; set; } public string TravelDetails { get; set; } public decimal TravelRateQuantity { get; set; } public decimal NoChargeQuantity { get; set; } //public long? ServiceBankId { get; set; } public long? TaxCodeSaleId { get; set; } - + public string TaxCodeViz { get; set; } public decimal Distance { get; set; } @@ -32,30 +29,30 @@ namespace AyaNovaQBI //Standard pricing fields (mostly to support printed reports though some show in UI) //some not to be sent with record depending on role (i.e. cost and charge in some cases) public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero - + public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered - + public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered - + public string UnitOfMeasureViz { get; set; }//"each", "hour" etc - + public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override - + public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially) - + public decimal TaxAViz { get; set; }//total amount of taxA - + public decimal TaxBViz { get; set; }//total amount of taxB - + public decimal LineTotalViz { get; set; }//line total netViz + taxes //workaround for notification - + public List Tags { get; set; } = new List(); - + public string Name { get; set; } - + public long WorkOrderItemId { get; set; } } } diff --git a/AyaNovaQBI/WorkOrderStatus.cs b/AyaNovaQBI/WorkOrderStatus.cs index 47d4b18..3be7ef1 100644 --- a/AyaNovaQBI/WorkOrderStatus.cs +++ b/AyaNovaQBI/WorkOrderStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AyaNovaQBI +namespace AyaNovaQBI { internal class WorkOrderStatus { diff --git a/AyaNovaQBI/auth.cs b/AyaNovaQBI/auth.cs index c98337a..e0aa688 100644 --- a/AyaNovaQBI/auth.cs +++ b/AyaNovaQBI/auth.cs @@ -65,11 +65,11 @@ namespace AyaNovaQBI return; } -// MessageBox.Show($@"TEST - LOGIN SUCCEEDED: \r\ -//AyaNovaUserName: {util.AyaNovaUserName}\r\n -//JWT: {util.JWT}\r\n -//AyaNovaUserRoles: {util.AyaNovaUserRoles}\r\n -//AyaNovaUserType: {util.AyaNovaUserType}"); + // MessageBox.Show($@"TEST - LOGIN SUCCEEDED: \r\ + //AyaNovaUserName: {util.AyaNovaUserName}\r\n + //JWT: {util.JWT}\r\n + //AyaNovaUserRoles: {util.AyaNovaUserRoles}\r\n + //AyaNovaUserType: {util.AyaNovaUserType}"); btnLogin.Enabled = btnTest.Enabled = true; diff --git a/AyaNovaQBI/tfa.cs b/AyaNovaQBI/tfa.cs index ab89554..64d3bab 100644 --- a/AyaNovaQBI/tfa.cs +++ b/AyaNovaQBI/tfa.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AyaNovaQBI @@ -20,13 +13,13 @@ namespace AyaNovaQBI private void auth_Load(object sender, EventArgs e) { - + } private void btnVerifyCode_click(object sender, EventArgs e) { - + TFAPin = edTFACode.Text; if (string.IsNullOrWhiteSpace(TFAPin)) { @@ -37,7 +30,7 @@ namespace AyaNovaQBI this.Close(); } - + } } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index 29fd659..ee1f461 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -1,17 +1,16 @@ -using System; +using Interop.QBFC15; +using Newtonsoft.Json.Linq; +using System; +using System.Collections; using System.Collections.Generic; +using System.Data; using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; using System.Net.Http; using System.Net.Http.Headers; -using Newtonsoft.Json.Linq; -using Interop.QBFC15; +using System.Text; using System.Text.RegularExpressions; +using System.Threading.Tasks; using System.Windows.Forms; -using System.Data; -using System.Collections; namespace AyaNovaQBI { @@ -91,7 +90,7 @@ namespace AyaNovaQBI } - public async static Task AuthenticateAsync(string login, string password = null) + public static async Task AuthenticateAsync(string login, string password = null) { InitClient(); @@ -202,7 +201,7 @@ namespace AyaNovaQBI - public async static Task GetAsync(string route) + public static async Task GetAsync(string route) { Exception FirstException = null; @@ -224,7 +223,7 @@ namespace AyaNovaQBI throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); } - private async static Task TryGetAsync(string route) + private static async Task TryGetAsync(string route) { var requestMessage = new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + route); @@ -258,7 +257,7 @@ namespace AyaNovaQBI - public async static Task PostAsync(string route, dynamic d) + public static async Task PostAsync(string route, dynamic d) { Exception FirstException = null; @@ -280,7 +279,7 @@ namespace AyaNovaQBI throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); } - public async static Task PostAsync(string route, string s = null) + public static async Task PostAsync(string route, string s = null) { Exception FirstException = null; @@ -303,7 +302,7 @@ namespace AyaNovaQBI } - internal async static Task TryPostAsync(string route, string postJson = null) + internal static async Task TryPostAsync(string route, string postJson = null) { var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route); @@ -367,7 +366,7 @@ namespace AyaNovaQBI - public async static Task PutAsync(string route, dynamic d) + public static async Task PutAsync(string route, dynamic d) { Exception FirstException = null; @@ -389,7 +388,7 @@ namespace AyaNovaQBI throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); } - public async static Task PutAsync(string route, string s = null) + public static async Task PutAsync(string route, string s = null) { Exception FirstException = null; @@ -411,7 +410,7 @@ namespace AyaNovaQBI throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); } - public async static Task PutAsync(string route) + public static async Task PutAsync(string route) { Exception FirstException = null; @@ -433,7 +432,7 @@ namespace AyaNovaQBI throw new Exception($"API call failed after {MAX_TRIES.ToString()} attempts", FirstException); } - public async static Task TryPutAsync(string route, string putJson = null) + public static async Task TryPutAsync(string route, string putJson = null) { var requestMessage = new HttpRequestMessage(HttpMethod.Put, ApiBaseUrl + route); @@ -1384,7 +1383,7 @@ namespace AyaNovaQBI /// gather info required for future /// transactions /// - public async static Task QBValidate() + public static async Task QBValidate() { // We want to know if we begun a session so we can end it if an // error happens @@ -1750,7 +1749,7 @@ namespace AyaNovaQBI /// Populate the cached qb data /// billable /// - internal async static Task PopulateQBItemCacheAsync() + internal static async Task PopulateQBItemCacheAsync() { if (_dtQBItems == null) { @@ -3144,7 +3143,7 @@ namespace AyaNovaQBI /// /// Populate the cached qb terms list data /// - private async static Task PopulateQBTermsCache() + private static async Task PopulateQBTermsCache() { if (_dtQBTerms == null) { @@ -3411,7 +3410,7 @@ namespace AyaNovaQBI #endregion QB api helper methods end #region AyaNova cached lists - public async static Task PopulateAyaListCache() + public static async Task PopulateAyaListCache() { //Get the cached QB data Waiting w = new Waiting(); @@ -5965,7 +5964,7 @@ namespace AyaNovaQBI #endregion qbi stuff (anything not api) #region general utils - static public void OpenWebURL(object oUrl) + public static void OpenWebURL(object oUrl) { if (oUrl == null) return;