admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-06-01 22:22:00 +00:00
parent e154104102
commit 6d291e1aa2
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/AyaNova/Controllers/GlobalBizSettingsController.cs
View File

@@ -117,6 +117,9 @@ namespace AyaNova.Api.Controllers
DefaultTaxPartSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxPartSaleId,
DefaultTaxPartPurchaseId = AyaNova.Util.ServerGlobalBizSettings.TaxPartPurchaseId,
DefaultTaxRateSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxRateSaleId,
WorkOrderTravelDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkOrderTravelDefaultMinutes,
WorkLaborScheduleDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkLaborScheduleDefaultMinutes,
//used to drive UI in case of unlicensed or attention required
LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,

7
server/AyaNova/models/GlobalBizSettings.cs
View File

@@ -29,6 +29,13 @@ namespace AyaNova.Models
public long? TaxPartSaleId { get; set; }
public long? TaxRateSaleId { get; set; }
//DEFAULT WO MINUTES
[Required]
public int WorkLaborScheduleDefaultMinutes {get;set;}
[Required]
public int WorkOrderTravelDefaultMinutes {get;set;}
[Required]
public TimeSpan WorkOrderCompleteByAge { get; set; } = TimeSpan.Zero;//was workorderclosebyage

6
server/AyaNova/util/AySchema.cs
View File

@@ -253,7 +253,9 @@ namespace AyaNova.Util
await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
+ "searchcasesensitiveonly BOOL DEFAULT FALSE, "
+ "useinventory BOOL DEFAULT TRUE, "
+ "workordercompletebyage INTERVAL NOT NULL DEFAULT '00:00:00'"
+ "workordercompletebyage INTERVAL NOT NULL DEFAULT '00:00:00', "
+ "workordertraveldefaultminutes INTEGER NOT NULL DEFAULT 0, "
+ "worklaborscheduledefaultminutes INTEGER NOT NULL DEFAULT 0 "
+ ")");
//create global ops BACKUP settings table
@@ -512,7 +514,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//Global tax code defaults
await ExecQueryAsync("ALTER TABLE aglobalbizsettings ADD column taxpartpurchaseid BIGINT REFERENCES ataxcode, "
+"ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
+ "ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
//MEMO
await ExecQueryAsync("CREATE TABLE amemo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "

10
server/AyaNova/util/ServerGlobalBizSettings.cs
View File

@@ -15,12 +15,13 @@ namespace AyaNova.Util
{
internal static bool SearchCaseSensitiveOnly { get; set; }
internal static bool UseInventory { get; set; }
internal static bool UseInventory { get; set; }
internal static long? TaxPartPurchaseId { get; set; }
internal static long? TaxPartSaleId { get; set; }
internal static long? TaxRateSaleId { get; set; }
internal static TimeSpan WorkOrderCompleteByAge { get; set; }
internal static int WorkLaborScheduleDefaultMinutes { get; set; }
internal static int WorkOrderTravelDefaultMinutes { get; set; }
/// <summary>
/// Populate and / or create the settings
@@ -46,7 +47,10 @@ namespace AyaNova.Util
TaxPartPurchaseId = global.TaxPartPurchaseId;
TaxPartSaleId = global.TaxPartSaleId;
TaxRateSaleId = global.TaxRateSaleId;
WorkOrderCompleteByAge=global.WorkOrderCompleteByAge;
WorkOrderCompleteByAge = global.WorkOrderCompleteByAge;
WorkLaborScheduleDefaultMinutes = global.WorkLaborScheduleDefaultMinutes;
WorkOrderTravelDefaultMinutes = global.WorkOrderTravelDefaultMinutes;
}