@dascompany/product 4.1.4 → 4.1.6

package/dist/SQL.json

@@ -73,8 +73,8 @@
     },
     "orders": {
         "select": "SELECT * FROM orders.orders",
-        "insert": "INSERT INTO orders.orders( id, email, price, client_id, delivery_details_id, company_details_id, payment_details_id, invoice ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT, $delivery_details_id::BIGINT , $company_details_id::BIGINT, $payment_details_id::BIGINT, $invoice::BOOL )",
-        "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT, invoice = $invoice::BOOL WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO orders.orders( id, email, net_price, client_id, delivery_details_id, company_details_id, payment_details_id, invoice, vat ) VALUES ($order_id::BIGINT, $email::TEXT, $net_price::DOUBLE PRECISION, $client_id::BIGINT, $delivery_details_id::BIGINT , $company_details_id::BIGINT, $payment_details_id::BIGINT, $invoice::BOOL, $vat::BIGINT )",
+        "update": "UPDATE orders.orders SET net_price = $net_price::DOUBLE PRECISION, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT, invoice = $invoice::BOOL, vat = $vat::BIGINT WHERE id = $id::BIGINT",
         "count": "SELECT COUNT (*) AS TOTAL_ROWS FROM orders.orders",
         "selectNextId": "SELECT nextval('orders.orders_id'::regclass)"
     },

package/dist/reader/OrderReader.js

@@ -1,7 +1,6 @@
 import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import OrderStatusReader from "./OrderStatusReader";
-import PriceConverter from "../utils/PriceConverter";
 export default class OrderReader {
     static async get(queryOptions) {
         const orderData = await DatabaseConnection.getInstance().orders.select(queryOptions);
@@ -40,7 +39,8 @@ export default class OrderReader {
         const correctOrder = {
             id: order.id,
             email: order.email,
-            price: PriceConverter.priceToPenny(order.price),
+            netPrice: order.net_price,
+            vat: order.vat,
             createdAt: order.created_at,
             clientId: order.client_id,
             deliveryDetailsId: order.delivery_details_id,

package/dist/repo/OrderRepo.js

@@ -6,7 +6,7 @@ export default class OrderRepo {
         return this.createOrderFromRow(orderData);
     }
     static createOrderFromRow(orderData) {
-        const order = new Order(orderData.email, orderData.price, orderData.client_id, orderData.delivery_details_id, orderData.company_details_id, orderData.payment_details_id, orderData.invoice);
+        const order = new Order(orderData.email, orderData.net_price, orderData.vat, orderData.client_id, orderData.delivery_details_id, orderData.company_details_id, orderData.payment_details_id, orderData.invoice);
         order.setId(orderData.id);
         return order;
     }

package/dist/stockObjects/Order.d.ts

@@ -1,18 +1,19 @@
 import { StockObject, StockObjectMapper } from "@dascompany/database";
 export default class Order extends StockObject {
     private email;
-    private price;
+    private net_price;
     private clientId;
     private deliveryDetailsId;
     private companyDetailsId;
     private paymentDetailsId;
     private invoice;
     private zsiId;
-    constructor(email: string, price: number, clientId: string | null, deliveryDetailsId: string, companyDetailsId?: string | null, paymentDetailsId?: string | null, invoice?: boolean);
+    private vat;
+    constructor(email: string, net_price: number, vat: number, clientId: string | null, deliveryDetailsId: string, companyDetailsId?: string | null, paymentDetailsId?: string | null, invoice?: boolean);
     getData(): Promise<{
         id: string | null;
         email: string;
-        price: number;
+        net_price: number;
         invoice: boolean;
         clientId: string | null;
         deliveryDetailsId: string | null;
@@ -20,20 +21,22 @@ export default class Order extends StockObject {
         paymentDetailsId: string | null;
     }>;
     getEmail(): string;
-    getPrice(): number;
+    getNetPrice(): number;
     getZsiId(): number | null;
     getGrossPrice(): number;
     getClientId(): string | null;
     getDeliveryDetailsId(): string | null;
     getCompanyDetailsId(): string | null;
     getPaymentDetailsId(): string | null;
+    getVat(): number;
     isInvoice(): boolean;
-    setPrice(price: number): void;
+    setNetPrice(net_price: number): void;
     setclientId(clientId: string): void;
     setDeliveryDetailsId(deliveryDetailsId: string): void;
     setCompanyDetailsId(companyDetailsId: string): void;
     setPaymentDetailsId(paymentDetailsId: string): void;
     setZsiId(zsiId: number): void;
+    setVat(vat: number): void;
     calculateAndUpdatePrice(): Promise<void>;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/Order.js

@@ -4,29 +4,31 @@ import OrderProductsRepo from "../repo/OrderProductsRepo";
 import PriceConverter from "../utils/PriceConverter";
 export default class Order extends StockObject {
     email;
-    price;
+    net_price;
     clientId;
     deliveryDetailsId;
     companyDetailsId;
     paymentDetailsId;
     invoice;
     zsiId;
-    constructor(email, price, clientId, deliveryDetailsId, companyDetailsId = null, paymentDetailsId = null, invoice = false) {
+    vat;
+    constructor(email, net_price, vat, clientId, deliveryDetailsId, companyDetailsId = null, paymentDetailsId = null, invoice = false) {
         super();
         this.email = email;
-        this.price = price;
+        this.net_price = net_price;
         this.clientId = clientId;
         this.deliveryDetailsId = deliveryDetailsId;
         this.companyDetailsId = companyDetailsId;
         this.paymentDetailsId = paymentDetailsId;
         this.invoice = invoice;
         this.zsiId = null;
+        this.vat = vat;
     }
     async getData() {
         return {
             id: this.getId(),
             email: this.email,
-            price: this.price,
+            net_price: this.net_price,
             invoice: this.invoice,
             clientId: this.clientId,
             deliveryDetailsId: this.deliveryDetailsId,
@@ -37,15 +39,15 @@ export default class Order extends StockObject {
     getEmail() {
         return this.email;
     }
-    getPrice() {
-        return this.price;
+    getNetPrice() {
+        return this.net_price;
     }
     getZsiId() {
         return this.zsiId;
     }
     getGrossPrice() {
         const vatPercentage = 23; //brak stawki vat dla zamówienia
-        return PriceConverter.netToGrossPrice(this.price, vatPercentage);
+        return PriceConverter.netToGrossPrice(this.net_price, vatPercentage);
     }
     getClientId() {
         return this.clientId;
@@ -59,11 +61,14 @@ export default class Order extends StockObject {
     getPaymentDetailsId() {
         return this.paymentDetailsId;
     }
+    getVat() {
+        return this.vat;
+    }
     isInvoice() {
         return this.invoice;
     }
-    setPrice(price) {
-        this.price = price;
+    setNetPrice(net_price) {
+        this.net_price = net_price;
     }
     setclientId(clientId) {
         this.clientId = clientId;
@@ -80,6 +85,9 @@ export default class Order extends StockObject {
     setZsiId(zsiId) {
         this.zsiId = zsiId;
     }
+    setVat(vat) {
+        this.vat = vat;
+    }
     async calculateAndUpdatePrice() {
         const id = this.getId();
         if (id) {
@@ -90,7 +98,7 @@ export default class Order extends StockObject {
             for (const product of orderProducts) {
                 totalPrice += product.getNetPrice();
             }
-            this.setPrice(totalPrice);
+            this.setNetPrice(totalPrice);
         }
         else
             throw Error('The price of an uncreated order cannot be calculated');

package/dist/tables/orders/OrdersTable.js

@@ -28,19 +28,20 @@ export default class OrdersTable extends Table {
         const orderId = order.getId();
         const query = this.createQuery(SQL.orders.update);
         query.bindParameter('id', orderId);
-        query.bindParameter('price', order.getPrice());
+        query.bindParameter('net_price', order.getNetPrice());
         query.bindParameter('zsi_id', order.getZsiId());
         this.bindDetailsParameters(query, order);
         await query.execute();
     }
     bindParameters(query, order) {
         query.bindParameter('email', order.getEmail());
-        query.bindParameter('price', order.getPrice());
+        query.bindParameter('net_price', order.getNetPrice());
         query.bindParameter('client_id', order.getClientId());
         this.bindDetailsParameters(query, order);
     }
     bindDetailsParameters(query, order) {
         query.bindParameter('invoice', order.isInvoice());
+        query.bindParameter('vat', order.getVat());
         query.bindParameter('delivery_details_id', order.getDeliveryDetailsId());
         query.bindParameter('company_details_id', order.getCompanyDetailsId());
         query.bindParameter('payment_details_id', order.getPaymentDetailsId());

package/dist/types/OrderI.d.ts

@@ -2,7 +2,7 @@ import StatusI from "./StatusI";
 export default interface OrderI {
     id: string;
     email: string;
-    price: number;
+    netPrice: number;
     createdAt: string;
     clientId: string;
     deliveryDetailsId: string;
@@ -11,4 +11,5 @@ export default interface OrderI {
     invoice: boolean;
     zsiId: string;
     status: StatusI;
+    vat: number;
 }

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

@@ -1,7 +1,8 @@
 export default interface OrderRow {
     id: string;
     email: string;
-    price: number;
+    net_price: number;
+    vat: number;
     created_at: string;
     client_id: string;
     delivery_details_id: string;

package/package.json

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