@dascompany/product 2.1.16 → 3.0.1

package/dist/DatabaseConnection.d.ts

@@ -21,7 +21,8 @@ import PaymentStatusesTable from './tables/orders/PaymentStatusesTable';
 import CompanyDataTable from './tables/settings/CompanyDataTable';
 import FileConnectionsTable from './tables/files/FileConnectionsTable';
 import AdminAccountsTable from './tables/public/AdminAccountsTable';
-import AccountAddressesTable from './tables/clients/AccountAddressesTable';
+import AccountCompanyDetailsTable from './tables/clients/AccountCompanyDetailsTable';
+import AccountDeliveryDetailsTable from './tables/clients/AccountDeliveryDetailsTable copy';
 export default class DatabaseConnection {
     static instance: DatabaseConnection;
     private tables;
@@ -35,7 +36,8 @@ export default class DatabaseConnection {
     get statuses(): StatusesTable;
     get addresses(): AddressesTable;
     get clientAccounts(): ClientAccountsTable;
-    get accountAddresses(): AccountAddressesTable;
+    get accountCompanyDetails(): AccountCompanyDetailsTable;
+    get accountDeliveryDetails(): AccountDeliveryDetailsTable;
     get adminAccounts(): AdminAccountsTable;
     get companyDetails(): CompanyDetailsTable;
     get personalData(): PersonalDataTable;

package/dist/DatabaseConnection.js

@@ -23,7 +23,8 @@ import PaymentStatusesTable from './tables/orders/PaymentStatusesTable';
 import CompanyDataTable from './tables/settings/CompanyDataTable';
 import FileConnectionsTable from './tables/files/FileConnectionsTable';
 import AdminAccountsTable from './tables/public/AdminAccountsTable';
-import AccountAddressesTable from './tables/clients/AccountAddressesTable';
+import AccountCompanyDetailsTable from './tables/clients/AccountCompanyDetailsTable';
+import AccountDeliveryDetailsTable from './tables/clients/AccountDeliveryDetailsTable copy';
 export default class DatabaseConnection {
     static instance;
     tables = new Map();
@@ -71,10 +72,15 @@ export default class DatabaseConnection {
             this.tables.set(TableNames.clientAccounts, new ClientAccountsTable(this.connection));
         return this.tables.get(TableNames.clientAccounts);
     }
-    get accountAddresses() {
-        if (!this.tables.get(TableNames.accountAddresses))
-            this.tables.set(TableNames.accountAddresses, new AccountAddressesTable(this.connection));
-        return this.tables.get(TableNames.accountAddresses);
+    get accountCompanyDetails() {
+        if (!this.tables.get(TableNames.accountCompanyDetails))
+            this.tables.set(TableNames.accountCompanyDetails, new AccountCompanyDetailsTable(this.connection));
+        return this.tables.get(TableNames.accountCompanyDetails);
+    }
+    get accountDeliveryDetails() {
+        if (!this.tables.get(TableNames.accountDeliveryDetails))
+            this.tables.set(TableNames.accountDeliveryDetails, new AccountDeliveryDetailsTable(this.connection));
+        return this.tables.get(TableNames.accountDeliveryDetails);
     }
     get adminAccounts() {
         if (!this.tables.get(TableNames.adminAccounts))

package/dist/SQL.json

@@ -17,12 +17,15 @@
         "count": "SELECT COUNT(*) AS total_rows FROM clients.accounts",
         "selectNextId": "SELECT nextval('clients.accounts_id'::regclass)"
     },
-    "accountAddresses": {
-        "select": "SELECT * FROM clients.account_addresses",
-        "selectId": "SELECT id FROM clients.account_addresses ",
-        "insert": "INSERT INTO clients.account_addresses( id, account_id, address_id) VALUES ($id::BIGINT, $account_id::BIGINT, $address_id::BIGINT)",
-        "delete": "DELETE FROM clients.account_addresses WHERE id = $id::BIGINT",
-        "selectNextId": "SELECT nextval('clients.account_addresses_id'::regclass)"
+    "accountDeliveryDetails": {
+        "select": "SELECT * FROM clients.account_delivery_details WHERE account_id = $account_id::BIGINT",
+        "insert": "INSERT INTO clients.account_delivery_details(account_id, delivery_details_id) VALUES ($account_id::BIGINT, $delivery_details_id::BIGINT)",
+        "delete": "DELETE FROM clients.account_delivery_details"
+    },
+    "accountCompanyDetails": {
+        "select": "SELECT * FROM clients.account_company_details WHERE account_id = $account_id::BIGINT",
+        "insert": "INSERT INTO clients.account_company_details(account_id, company_details_id) VALUES ($account_id::BIGINT, $company_details_id::BIGINT)",
+        "delete": "DELETE FROM clients.account_company_details"
     },
     "contactDetails": {
         "select": "SELECT * FROM personal_information.contact_details",
@@ -64,8 +67,8 @@
     "products": {
         "select": "SELECT * FROM products",
         "selectId": "SELECT id FROM products",
-        "insert": "INSERT INTO products( id, sku, url, title, description, net_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $url::TEXT, $title::TEXT, $description::TEXT, $net_price::DOUBLE PRECISION, $vat::INT, $color::TEXT, $quantity::INT, $width::INT,  $length::INT, $height::DOUBLE PRECISION,$file_id::BIGINT , $json_data::JSON, false::BOOL)",
-        "update": "UPDATE products SET url = $url::TEXT, title = $title::TEXT, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, vat = $vat::INT, color = $color::TEXT, quantity = $quantity::INT, width = $width::INT, length = $length::INT, height = $height::DOUBLE PRECISION, file_id = $file_id::BIGINT, json_data = $json_data::JSON  WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO products( id, sku, url, title, description, net_price, installation_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $url::TEXT, $title::TEXT, $description::TEXT, $net_price::DOUBLE PRECISION, $installation_price::DOUBLE PRECISION, $vat::INT, $color::TEXT, $quantity::INT, $width::INT,  $length::INT, $height::DOUBLE PRECISION,$file_id::BIGINT , $json_data::JSON, false::BOOL)",
+        "update": "UPDATE products SET url = $url::TEXT, title = $title::TEXT, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, installation_price = $installation_price::DOUBLE PRECISION ,vat = $vat::INT, color = $color::TEXT, quantity = $quantity::INT, width = $width::INT, length = $length::INT, height = $height::DOUBLE PRECISION, file_id = $file_id::BIGINT, json_data = $json_data::JSON  WHERE id = $id::BIGINT",
         "delete": "UPDATE products SET deleted = true WHERE id = $id::BIGINT",
         "maxPrice": "SELECT MAX(net_price) FROM products",
         "count": "SELECT COUNT(*) AS total_rows FROM products",

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import Client from "./stockObjects/Client";
 import ClientAccountRepo from "./repo/ClientAccountRepo";
 import ClientAccountReader from "./reader/ClientAccountReader";
-import AccountAddress from "./stockObjects/AccountAddress";
-import AccountAddressesReader from "./reader/AccountAddressesReader";
-import AccountAddressesRepo from "./repo/AccountAddressesRepo";
+import AccountDeliveryDetailsReader from "./reader/AccountDeliveryDetailsReader";
+import AccountCompanyDetailsReader from "./reader/AccountCompanyDetailsReader";
 import Admin from "./stockObjects/Admin";
 import AdminRepo from "./repo/AdminRepo";
 import AdminReader from "./reader/AdminReader";
@@ -81,4 +80,4 @@ import CompanyDataReader from "./reader/CompanyDataReader";
 import CompanyDataI from "./types/CompanyDataI";
 import PriceConverter from "./utils/PriceConverter";
 import createQueryOptionsForId from "./utils/createQueryOptionsForId";
-export { Client, ClientAccountRepo, ClientAccountReader, AccountAddress, AccountAddressesReader, AccountAddressesRepo, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, ContactDetails, ContactDetailsRepo, ContactDetailsReader, ContactDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, InvoiceDetailsI, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentDetailsI, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentMethodI, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, OrderProductI, Status, OrderStatusReader, StatusI, OrderStatusTypeE, StatusTypesReader, ProductI, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileI, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, CompanyDataI, PriceConverter, createQueryOptionsForId };
+export { Client, ClientAccountRepo, ClientAccountReader, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, ContactDetails, ContactDetailsRepo, ContactDetailsReader, ContactDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, InvoiceDetailsI, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentDetailsI, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentMethodI, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, OrderProductI, Status, OrderStatusReader, StatusI, OrderStatusTypeE, StatusTypesReader, ProductI, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileI, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, CompanyDataI, PriceConverter, createQueryOptionsForId };

package/dist/index.js

@@ -1,9 +1,8 @@
 import Client from "./stockObjects/Client";
 import ClientAccountRepo from "./repo/ClientAccountRepo";
 import ClientAccountReader from "./reader/ClientAccountReader";
-import AccountAddress from "./stockObjects/AccountAddress";
-import AccountAddressesReader from "./reader/AccountAddressesReader";
-import AccountAddressesRepo from "./repo/AccountAddressesRepo";
+import AccountDeliveryDetailsReader from "./reader/AccountDeliveryDetailsReader";
+import AccountCompanyDetailsReader from "./reader/AccountCompanyDetailsReader";
 import Admin from "./stockObjects/Admin";
 import AdminRepo from "./repo/AdminRepo";
 import AdminReader from "./reader/AdminReader";
@@ -67,4 +66,4 @@ import CompanyDataRepo from "./repo/CompanyDataRepo";
 import CompanyDataReader from "./reader/CompanyDataReader";
 import PriceConverter from "./utils/PriceConverter";
 import createQueryOptionsForId from "./utils/createQueryOptionsForId";
-export { Client, ClientAccountRepo, ClientAccountReader, AccountAddress, AccountAddressesReader, AccountAddressesRepo, Admin, AdminRepo, AdminReader, Address, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, ContactDetails, ContactDetailsRepo, ContactDetailsReader, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, Status, OrderStatusReader, OrderStatusTypeE, StatusTypesReader, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, PriceConverter, createQueryOptionsForId };
+export { Client, ClientAccountRepo, ClientAccountReader, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, Admin, AdminRepo, AdminReader, Address, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, ContactDetails, ContactDetailsRepo, ContactDetailsReader, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, Status, OrderStatusReader, OrderStatusTypeE, StatusTypesReader, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, PriceConverter, createQueryOptionsForId };

package/dist/reader/AccountCompanyDetailsReader.d.ts

@@ -0,0 +1,5 @@
+import CompanyDetailsI from "../types/CompanyDetailsI";
+export default class AccountCompanyDetailsReader {
+    static getAll(accountId: number): Promise<CompanyDetailsI[]>;
+    private static correctAccountCompanyDetails;
+}

package/dist/reader/AccountCompanyDetailsReader.js

@@ -0,0 +1,17 @@
+import DatabaseConnection from "../DatabaseConnection";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
+import CompanyDetailsReader from "./CompanyDetailsReader";
+export default class AccountCompanyDetailsReader {
+    static async getAll(accountId) {
+        const accountCompanyDetails = await DatabaseConnection.getInstance().accountCompanyDetails.selectAll(accountId);
+        return this.correctAccountCompanyDetails(accountCompanyDetails);
+    }
+    static async correctAccountCompanyDetails(accountCompanyDetails) {
+        const correctAccountCompanyDetails = [];
+        for (let i = 0; i < accountCompanyDetails.length; i++) {
+            const companyDetails = await CompanyDetailsReader.get(createQueryOptionsForId(accountCompanyDetails[i].company_details_id));
+            correctAccountCompanyDetails.push(companyDetails);
+        }
+        return correctAccountCompanyDetails;
+    }
+}

package/dist/reader/AccountDeliveryDetailsReader.d.ts

@@ -0,0 +1,5 @@
+import DeliveryDetailsI from "../types/DeliveryDetailsI";
+export default class AccountDeliveryDetailsReader {
+    static getAll(accountId: number): Promise<DeliveryDetailsI[]>;
+    private static correctAccountDeliveryDetails;
+}

package/dist/reader/AccountDeliveryDetailsReader.js

@@ -0,0 +1,17 @@
+import DatabaseConnection from "../DatabaseConnection";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
+import DeliveryDetailsReader from "./DeliveryDetailsReader";
+export default class AccountDeliveryDetailsReader {
+    static async getAll(accountId) {
+        const accountDeliveryDetails = await DatabaseConnection.getInstance().accountDeliveryDetails.selectAll(accountId);
+        return this.correctAccountDeliveryDetails(accountDeliveryDetails);
+    }
+    static async correctAccountDeliveryDetails(accountDeliveryDetails) {
+        const correctAccountDeliveryDetails = [];
+        for (let i = 0; i < accountDeliveryDetails.length; i++) {
+            const deliveryDetails = await DeliveryDetailsReader.get(createQueryOptionsForId(accountDeliveryDetails[i].delivery_details_id));
+            correctAccountDeliveryDetails.push(deliveryDetails);
+        }
+        return correctAccountDeliveryDetails;
+    }
+}

package/dist/reader/ClientAccountReader.js

@@ -31,9 +31,9 @@ export default class ClientAccountReader {
             createdAt: client.created_at,
             activated: client.activated,
             deleted: client.deleted,
-            contactDetailsId: client.contact_details_id,
+            personalDataId: client.contact_details_id,
             deliveryDetailsId: client.delivery_details_id,
-            invoiceDetailsId: client.invoice_details_id,
+            companyDetailsId: client.invoice_details_id,
         };
     }
 }

package/dist/reader/ProductReader.js

@@ -46,6 +46,7 @@ export default class ProductReader {
             title: product.title,
             description: product.description,
             netPrice: product.net_price,
+            installationPrice: product.installation_price,
             vat: product.vat,
             color: product.color,
             quantity: product.quantity,

package/dist/repo/ClientAccountRepo.js

@@ -6,7 +6,7 @@ export default class ClientAccountRepo {
         return this.createCilentAccountFromRow(accountData);
     }
     static createCilentAccountFromRow(accountData) {
-        const client = new Client(accountData.email, accountData.activated, accountData.deleted, accountData.contact_details_id, accountData.delivery_details_id, accountData.invoice_details_id, accountData.created_at);
+        const client = new Client(accountData.email, accountData.activated, accountData.deleted, accountData.personal_data_id, accountData.delivery_details_id, accountData.company_details_id, accountData.created_at);
         client.setId(accountData.id);
         return client;
     }

package/dist/repo/ProductRepo.js

@@ -6,7 +6,7 @@ export default class ProductRepo {
         return this.createProductFromRow(product);
     }
     static createProductFromRow(productRow) {
-        const product = new Product(productRow.sku, productRow.url, productRow.title, productRow.description, productRow.net_price, productRow.vat, productRow.color, productRow.quantity, productRow.width, productRow.length, productRow.height, productRow.file_id, productRow.deleted);
+        const product = new Product(productRow.sku, productRow.url, productRow.title, productRow.description, productRow.net_price, productRow.installation_price, productRow.vat, productRow.color, productRow.quantity, productRow.width, productRow.length, productRow.height, productRow.file_id, productRow.deleted);
         product.setId(productRow.id);
         product.setCreatedAt(productRow.created_at);
         return product;

package/dist/stockObjects/Client.d.ts

@@ -3,21 +3,24 @@ export default class Client extends StockObject {
     private email;
     private activated;
     private deleted;
-    private contactDetailsId;
+    private personalDetailsId;
     private deliveryDetailsId;
-    private invoiceDetailsId;
+    private companyDetailsId;
     private createdAt;
-    constructor(email: string, activated: boolean, deleted: boolean, contactDetailsId: number, deliveryDetailsId?: number | null, invoiceDetailsId?: number | null, createdAt?: string | null);
+    constructor(email: string, activated: boolean, deleted: boolean, personalDetailsId: number, deliveryDetailsId?: number | null, companyDetailsId?: number | null, createdAt?: string | null);
     getEmail(): string;
     getActivated(): boolean;
     getDeleted(): boolean;
-    getContactDetailsId(): number | null;
+    getPersonalDataId(): number | null;
     getDeliveryDetailsId(): number | null;
-    getInvoiceDetailsId(): number | null;
+    getCompanyDetailsId(): number | null;
     setActivated(activated: boolean): void;
     setDeleted(deleted: boolean): void;
-    setContactDetailsId(contactDetailsId: number): void;
+    setPersonalDetailsId(personalDetailsId: number): void;
     setDeliveryDetailsId(deliveryDetailsId: number): void;
-    setInvoiceDetailsId(invoiceDetailsId: number): void;
+    setCompanyDetailsId(companyDetailsId: number): void;
+    addCompanyDetails(companyDetailsId: number): Promise<void>;
+    addDeliveryDetails(deliveryDetailsId: number): Promise<void>;
+    getCompanyDetails(): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/Client.js

@@ -1,21 +1,22 @@
 import { StockObject } from "@dascompany/database";
 import ClientMapper from "../mappers/ClientMapper";
+import DatabaseConnection from "../DatabaseConnection";
 export default class Client extends StockObject {
     email;
     activated;
     deleted;
-    contactDetailsId;
+    personalDetailsId;
     deliveryDetailsId;
-    invoiceDetailsId;
+    companyDetailsId;
     createdAt;
-    constructor(email, activated, deleted, contactDetailsId, deliveryDetailsId = null, invoiceDetailsId = null, createdAt = null) {
+    constructor(email, activated, deleted, personalDetailsId, deliveryDetailsId = null, companyDetailsId = null, createdAt = null) {
         super();
         this.email = email;
         this.activated = activated;
         this.deleted = deleted;
-        this.contactDetailsId = contactDetailsId;
+        this.personalDetailsId = personalDetailsId;
         this.deliveryDetailsId = deliveryDetailsId;
-        this.invoiceDetailsId = invoiceDetailsId;
+        this.companyDetailsId = companyDetailsId;
         this.createdAt = createdAt;
     }
     getEmail() {
@@ -27,14 +28,14 @@ export default class Client extends StockObject {
     getDeleted() {
         return this.deleted;
     }
-    getContactDetailsId() {
-        return this.contactDetailsId;
+    getPersonalDataId() {
+        return this.personalDetailsId;
     }
     getDeliveryDetailsId() {
         return this.deliveryDetailsId;
     }
-    getInvoiceDetailsId() {
-        return this.invoiceDetailsId;
+    getCompanyDetailsId() {
+        return this.companyDetailsId;
     }
     setActivated(activated) {
         this.activated = activated;
@@ -42,14 +43,30 @@ export default class Client extends StockObject {
     setDeleted(deleted) {
         this.deleted = deleted;
     }
-    setContactDetailsId(contactDetailsId) {
-        this.contactDetailsId = contactDetailsId;
+    setPersonalDetailsId(personalDetailsId) {
+        this.personalDetailsId = personalDetailsId;
     }
     setDeliveryDetailsId(deliveryDetailsId) {
         this.deliveryDetailsId = deliveryDetailsId;
     }
-    setInvoiceDetailsId(invoiceDetailsId) {
-        this.invoiceDetailsId = invoiceDetailsId;
+    setCompanyDetailsId(companyDetailsId) {
+        this.companyDetailsId = companyDetailsId;
+    }
+    async addCompanyDetails(companyDetailsId) {
+        const id = this.getId();
+        if (id)
+            await DatabaseConnection.getInstance().accountCompanyDetails.insert(id, companyDetailsId);
+        else
+            throw new Error(`Client account ${id} does not exist. Cannot add company details.`);
+    }
+    async addDeliveryDetails(deliveryDetailsId) {
+        const id = this.getId();
+        if (id)
+            await DatabaseConnection.getInstance().accountDeliveryDetails.insert(id, deliveryDetailsId);
+        else
+            throw new Error(`Client account ${id} does not exist. Cannot add delivery details.`);
+    }
+    getCompanyDetails() {
     }
     getMapper() {
         return new ClientMapper(this);

package/dist/stockObjects/Product.d.ts

@@ -6,6 +6,7 @@ export default class Product extends StockObject {
     private title;
     private description;
     private netPrice;
+    private installationPrice;
     private vat;
     private color;
     private quantity;
@@ -18,12 +19,13 @@ export default class Product extends StockObject {
     private file;
     private jsonData;
     private files;
-    constructor(sku: string, url: string, title: string, description: string, netPrice: number, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
+    constructor(sku: string, url: string, title: string, description: string, netPrice: number, installationPrice: number, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
     getSku(): string;
     getUrl(): string;
     getTitle(): string;
     getDescription(): string;
     getNetPrice(): number;
+    getInstallationPrice(): number;
     getGrossPrice(): number;
     getVat(): number;
     getColor(): string;
@@ -43,6 +45,7 @@ export default class Product extends StockObject {
         title: string;
         description: string;
         netPrice: number;
+        installationPrice: number;
         vat: number;
         color: string;
         quantity: number;
@@ -59,6 +62,7 @@ export default class Product extends StockObject {
     setTitle(title: string): string;
     setDescription(description: string): string;
     setNetPrice(netPrice: number): number;
+    setInstallationPrice(installationPrice: number): number;
     setVat(vat: number): number;
     setColor(color: string): string;
     setQuantity(quantity: number): number;

package/dist/stockObjects/Product.js

@@ -9,6 +9,7 @@ export default class Product extends StockObject {
     title;
     description;
     netPrice;
+    installationPrice;
     vat;
     color;
     quantity;
@@ -21,13 +22,14 @@ export default class Product extends StockObject {
     file;
     jsonData;
     files;
-    constructor(sku, url, title, description, netPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
+    constructor(sku, url, title, description, netPrice, installationPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
         super();
         this.sku = sku;
         this.url = url;
         this.title = title;
         this.description = description;
         this.netPrice = netPrice;
+        this.installationPrice = installationPrice;
         this.vat = vat;
         this.color = color;
         this.quantity = quantity;
@@ -56,6 +58,9 @@ export default class Product extends StockObject {
     getNetPrice() {
         return PriceConverter.netToGrossPrice(this.netPrice, this.vat);
     }
+    getInstallationPrice() {
+        return this.installationPrice;
+    }
     getGrossPrice() {
         return this.netPrice;
     }
@@ -114,6 +119,7 @@ export default class Product extends StockObject {
             title: this.title,
             description: this.description,
             netPrice: this.netPrice,
+            installationPrice: this.installationPrice,
             vat: this.vat,
             color: this.color,
             quantity: this.quantity,
@@ -143,6 +149,9 @@ export default class Product extends StockObject {
     setNetPrice(netPrice) {
         return this.netPrice = netPrice;
     }
+    setInstallationPrice(installationPrice) {
+        return this.installationPrice = installationPrice;
+    }
     setVat(vat) {
         return this.vat = vat;
     }

package/dist/tables/TableNames.d.ts

@@ -1,7 +1,8 @@
 declare enum TableNames {
     adminAccounts = "adminAccountsTable",
     clientAccounts = "clientAccountsTable",
-    accountAddresses = "accountAddressesTable",
+    accountDeliveryDetails = "accountDeliveryDetailsTable",
+    accountCompanyDetails = "accountCompanyDetailsTable",
     fileConnections = "fileConnectionsTable",
     files = "filesTable",
     ordersProducts = "ordersProductsTable",

package/dist/tables/TableNames.js

@@ -2,7 +2,8 @@ var TableNames;
 (function (TableNames) {
     TableNames["adminAccounts"] = "adminAccountsTable";
     TableNames["clientAccounts"] = "clientAccountsTable";
-    TableNames["accountAddresses"] = "accountAddressesTable";
+    TableNames["accountDeliveryDetails"] = "accountDeliveryDetailsTable";
+    TableNames["accountCompanyDetails"] = "accountCompanyDetailsTable";
     TableNames["fileConnections"] = "fileConnectionsTable";
     TableNames["files"] = "filesTable";
     TableNames["ordersProducts"] = "ordersProductsTable";

package/dist/tables/clients/AccountCompanyDetailsTable.d.ts

@@ -0,0 +1,7 @@
+import { Table } from '@dascompany/database';
+import AccountCompanyDetailsRow from '../../types/rows/AccountCompanyDetailsRow';
+export default class AccountCompanyDetailsTable extends Table {
+    selectAll(accountId: number): Promise<AccountCompanyDetailsRow[]>;
+    delete(companyDetailsId: number): Promise<number>;
+    insert(acoountId: number, companyDetailsId: number): Promise<void>;
+}

package/dist/tables/clients/AccountCompanyDetailsTable.js

@@ -0,0 +1,22 @@
+import { Table } from '@dascompany/database';
+import * as SQL from '../../SQL.json';
+export default class AccountCompanyDetailsTable extends Table {
+    async selectAll(accountId) {
+        const query = this.createQuery(SQL.accountCompanyDetails.select);
+        query.bindParameter('account_id', accountId);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async delete(companyDetailsId) {
+        const query = this.createQuery(SQL.accountCompanyDetails.delete);
+        query.bindParameter('company_details_id', companyDetailsId);
+        const result = await query.execute();
+        return result.getRowCount();
+    }
+    async insert(acoountId, companyDetailsId) {
+        const query = this.createQuery(SQL.accountCompanyDetails.insert);
+        query.bindParameter('company_details_id', companyDetailsId);
+        query.bindParameter('account_id', acoountId);
+        await query.execute();
+    }
+}

package/dist/tables/clients/AccountDeliveryDetailsTable copy.d.ts

@@ -0,0 +1,7 @@
+import { Table } from '@dascompany/database';
+import AccountDeliveryDetailsRow from '../../types/rows/AccountDeliveryDetailsRow';
+export default class AccountDeliveryDetailsTable extends Table {
+    selectAll(accountId: number): Promise<AccountDeliveryDetailsRow[]>;
+    delete(deliveryDetailsId: number): Promise<number>;
+    insert(acoountId: number, deliveryDetailsId: number): Promise<void>;
+}

package/dist/tables/clients/AccountDeliveryDetailsTable copy.js

@@ -0,0 +1,22 @@
+import { Table } from '@dascompany/database';
+import * as SQL from '../../SQL.json';
+export default class AccountDeliveryDetailsTable extends Table {
+    async selectAll(accountId) {
+        const query = this.createQuery(SQL.accountDeliveryDetails.select);
+        query.bindParameter('account_id', accountId);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async delete(deliveryDetailsId) {
+        const query = this.createQuery(SQL.accountDeliveryDetails.delete);
+        query.bindParameter('delivery_details_id', deliveryDetailsId);
+        const result = await query.execute();
+        return result.getRowCount();
+    }
+    async insert(acoountId, deliveryDetailsId) {
+        const query = this.createQuery(SQL.accountDeliveryDetails.insert);
+        query.bindParameter('delivery_details_id', deliveryDetailsId);
+        query.bindParameter('account_id', acoountId);
+        await query.execute();
+    }
+}

package/dist/tables/clients/ClientAccountsTable.js

@@ -36,9 +36,9 @@ export default class ClientAccountsTable extends Table {
     bindParameters(query, clientAccount) {
         query.bindParameter('activated', clientAccount.getActivated());
         query.bindParameter('deleted', clientAccount.getDeleted());
-        query.bindParameter('contact_details_id', clientAccount.getContactDetailsId());
+        query.bindParameter('personal_data_id', clientAccount.getPersonalDataId());
         query.bindParameter('delivery_details_id', clientAccount.getDeliveryDetailsId());
-        query.bindParameter('invoice_details_id', clientAccount.getInvoiceDetailsId());
+        query.bindParameter('company_details_id', clientAccount.getCompanyDetailsId());
     }
     async insert(clientAccount) {
         const clientEmail = clientAccount.getEmail();

package/dist/tables/public/ProductsTable.js

@@ -68,6 +68,7 @@ export default class ProductsTable extends Table {
         query.bindParameter('title', product.getTitle());
         query.bindParameter('description', product.getDescription());
         query.bindParameter('net_price', product.getNetPrice());
+        query.bindParameter('installation_price', product.getInstallationPrice());
         query.bindParameter('vat', product.getVat());
         query.bindParameter('color', product.getColor());
         query.bindParameter('quantity', product.getQuantity());

package/dist/types/AccountDeliveryDetailsI.d.ts

@@ -0,0 +1,7 @@
+import AddressI from "./AddressI";
+export default interface AccountDeliveryDetailsI {
+    id: number;
+    accountId: number;
+    address: AddressI;
+    personalData: number;
+}

package/dist/types/AccountDeliveryDetailsI.js

@@ -0,0 +1 @@
+export {};

package/dist/types/ClientAccountI.d.ts

@@ -4,7 +4,7 @@ export default interface ClientAccountI {
     createdAt: string;
     activated: boolean;
     deleted: boolean;
-    contactDetailsId: number;
+    personalDataId: number;
     deliveryDetailsId: number;
-    invoiceDetailsId: number;
+    companyDetailsId: number;
 }

package/dist/types/ProductI.d.ts

@@ -6,6 +6,7 @@ export default interface ProductI {
     title: string;
     description: string;
     netPrice: number;
+    installationPrice: number;
     grossPrice: number;
     vat: number;
     color: string;

package/dist/types/rows/AccountCompanyDetailsRow.d.ts

@@ -0,0 +1,4 @@
+export default interface AccountCompanyDetailsRow {
+    account_id: number;
+    company_details_id: number;
+}

package/dist/types/rows/AccountCompanyDetailsRow.js

@@ -0,0 +1 @@
+export {};

package/dist/types/rows/AccountDeliveryDetailsRow.d.ts

@@ -0,0 +1,4 @@
+export default interface AccountDeliveryDetailsRow {
+    account_id: number;
+    delivery_details_id: number;
+}

package/dist/types/rows/AccountDeliveryDetailsRow.js

@@ -0,0 +1 @@
+export {};

package/dist/types/rows/ClientAccountRow.d.ts

@@ -4,7 +4,7 @@ export default interface ClientAccountRow {
     created_at: string;
     activated: boolean;
     deleted: boolean;
-    contact_details_id: number;
+    personal_data_id: number;
     delivery_details_id: number;
-    invoice_details_id: number;
+    company_details_id: number;
 }

package/dist/types/rows/ProductRow.d.ts

@@ -6,6 +6,7 @@ export default interface ProductRow {
     description: string;
     file_id: number;
     net_price: number;
+    installation_price: number;
     vat: number;
     color: string;
     quantity: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/product",
-  "version": "2.1.16",
+  "version": "3.0.1",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",