diff --git a/.vscode/launch.json b/.vscode/launch.json
index b4e9329..3300e7e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -35,7 +35,7 @@
"SOCKEYE_DB_CONNECTION": "Server=localhost;Username=postgres;Password=sockeye;Database=sockeye;CommandTimeout=300;",
"SOCKEYE_DATA_PATH": "c:\\temp\\sockeye",
"SOCKEYE_USE_URLS": "http://*:7676;",
- //"SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
+ "SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
//"SOCKEYE_REMOVE_LICENSE_FROM_DB":"true",
//"SOCKEYE_REPORT_RENDERING_TIMEOUT":"1",
"SOCKEYE_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin"
diff --git a/client/src/views/biz-purchase.vue b/client/src/views/biz-purchase.vue
index 14b2558..79b1fb3 100644
--- a/client/src/views/biz-purchase.vue
+++ b/client/src/views/biz-purchase.vue
@@ -5,27 +5,52 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -180,8 +244,6 @@ export default {
name: null,
active: true,
vendorId: 1,
- licenseInterval: "365.0:00:00",
- maintInterval: "365.0:00:00",
vendorCode: null,
ourCode: null,
wiki: null,
@@ -682,11 +744,13 @@ public string VendorData { get; set; }
public DateTime? ProcessedDate { get; set; }
-
-expiredate TIMESTAMPTZ, canceldate TIMESTAMPTZ, couponcode text, notes text, "
-
+"CREATE TABLE apurchase (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, customerid BIGINT NOT NULL REFERENCES acustomer(id) ON DELETE CASCADE, "
++ "vendorid BIGINT NOT NULL REFERENCES avendor(id), productid BIGINT NOT NULL REFERENCES aproduct(id), salesordernumber TEXT NOT NULL, "
++ "purchasedate TIMESTAMPTZ NOT NULL, expiredate TIMESTAMPTZ, canceldate TIMESTAMPTZ, couponcode text, notes text, "
++ "renewnoticesent BOOL NOT NULL DEFAULT false, quantity INTEGER NOT NULL DEFAULT 1, "
+ "vendordata TEXT, processeddate TIMESTAMPTZ, "
+ "wiki TEXT, tags VARCHAR(255) ARRAY )");
+
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'Purchase', 'Purchase' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'PurchaseList', 'Purchases' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'PurchaseSalesOrderNumber', 'Sales order #' FROM atranslation t where t.baselanguage = 'en'");
diff --git a/server/util/AySchema.cs b/server/util/AySchema.cs
index ba3e2a5..fe546e4 100644
--- a/server/util/AySchema.cs
+++ b/server/util/AySchema.cs
@@ -24,14 +24,14 @@ namespace Sockeye.Util
internal const long EXPECTED_COLUMN_COUNT = 495;
internal const long EXPECTED_INDEX_COUNT = 71;
- internal const long EXPECTED_CHECK_CONSTRAINTS = 236;
+ internal const long EXPECTED_CHECK_CONSTRAINTS = 237;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 32;
internal const long EXPECTED_VIEWS = 0;
internal const long EXPECTED_ROUTINES = 2;
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
- ///////////////////////////////////////// (C495:I71:CC236:FC32:V0:R2)
+ ///////////////////////////////////////// (C495:I71:CC237:FC32:V0:R2)
/*