@dascompany/product 4.2.8 → 4.2.10

package/dist/index.d.ts

@@ -76,4 +76,5 @@ import MarketPlacesReader from "./reader/MarketPlacesReader";
 import PriceConverter from "./utils/PriceConverter";
 import createQueryOptionsForId from "./utils/createQueryOptionsForId";
 import CilentAccountExistWithThisEmail from "./lib/errors/CilentAccountExistWithThisEmail";
-export { Client, ClientAccountRepo, ClientAccountReader, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, AccountCart, AccountCartReader, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, 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, MarketPlacesReader, PriceConverter, createQueryOptionsForId, CilentAccountExistWithThisEmail };
+import MarketPlaceI from "./types/MarketPlaceI";
+export { Client, ClientAccountRepo, ClientAccountReader, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, AccountCart, AccountCartReader, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, 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, MarketPlacesReader, PriceConverter, createQueryOptionsForId, CilentAccountExistWithThisEmail, MarketPlaceI };

package/dist/reader/MarketPlacesReader.d.ts

@@ -1,13 +1,8 @@
 import { QueryOptions } from "@dascompany/database";
-type MarketData = {
-    id: string;
-    country: string;
-    vatRate: string;
-};
+import MarketPlaceI from "../types/MarketPlaceI";
 export default class MarketPlacesReader {
-    static get(queryOptions: QueryOptions): Promise<MarketData>;
-    static getAll(queryOptions: QueryOptions): Promise<MarketData[]>;
+    static get(queryOptions: QueryOptions): Promise<MarketPlaceI>;
+    static getAll(queryOptions: QueryOptions): Promise<MarketPlaceI[]>;
     private static correctMarkets;
     private static correctMarket;
 }
-export {};

package/dist/reader/MarketPlacesReader.js

@@ -21,7 +21,7 @@ export default class MarketPlacesReader {
         const correctMarket = {
             id: marketRow.id,
             country: marketRow.country,
-            vatRate: marketRow.vat_rate,
+            vatRate: Number(marketRow.vat_rate)
         };
         return correctMarket;
     }

package/dist/reader/ProductReader.d.ts

@@ -1,8 +1,8 @@
 import { QueryOptions } from "@dascompany/database";
 import ProductI from "../types/ProductI";
 export default class ProductReader {
-    static get(queryOption: QueryOptions): Promise<ProductI>;
-    static getAll(queryOption: QueryOptions): Promise<ProductI[]>;
+    static get(queryOption: QueryOptions, vat: number): Promise<ProductI>;
+    static getAll(queryOption: QueryOptions, vat: number): Promise<ProductI[]>;
     static getId(queryOptions: QueryOptions): Promise<string>;
     static getQuantity(queryOptions: QueryOptions): Promise<number>;
     static getMaxPrice(queryOptions: QueryOptions): Promise<number>;

package/dist/reader/ProductReader.js

@@ -5,18 +5,18 @@ import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import PriceConverter from "../utils/PriceConverter";
 import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class ProductReader {
-    static async get(queryOption) {
+    static async get(queryOption, vat) {
         const productRow = await DatabaseConnection.getInstance().products.select(queryOption);
         const queryOptionsFiles = new QueryOptions();
         queryOptionsFiles.setWhere([{ name: 'connection_id', type: ParameterType.bigint, value: productRow.id }, { name: 'connection_type', type: ParameterType.string, value: FileConnectionTypeE.product }]);
         queryOptionsFiles.setOrderBy([{ key: 'sequence', order: 'asc' }]);
         const files = await FilesReader.getForConnection(queryOptionsFiles);
-        const product = await this.correctProduct(productRow);
+        const product = await this.correctProduct(productRow, vat);
         return { ...product, files };
     }
-    static async getAll(queryOption) {
+    static async getAll(queryOption, vat) {
         const products = await DatabaseConnection.getInstance().products.selectAll(queryOption);
-        return this.correctProducts(products);
+        return this.correctProducts(products, vat);
     }
     static async getId(queryOptions) {
         return await DatabaseConnection.getInstance().products.selectId(queryOptions);
@@ -29,15 +29,15 @@ export default class ProductReader {
         const price = await DatabaseConnection.getInstance().products.selectMaxPrice(queryOptions);
         return Number(price);
     }
-    static async correctProducts(products) {
+    static async correctProducts(products, vat) {
         const correctProducts = [];
         for (let i = 0; i < products.length; i++) {
-            const correctProduct = await this.correctProduct(products[i]);
+            const correctProduct = await this.correctProduct(products[i], vat);
             correctProducts.push(correctProduct);
         }
         return correctProducts;
     }
-    static async correctProduct(product) {
+    static async correctProduct(product, vat) {
         const thumbnail = await FilesReader.get(createQueryOptionsForId(product.file_id));
         return {
             id: product.id,
@@ -48,8 +48,8 @@ export default class ProductReader {
             subtitle: product.subtitle,
             description: product.description,
             netPrice: product.net_price,
+            promotionalGrossPrice: PriceConverter.netToGrossPrice(product.promotional_net_price, vat),
             promotionalNetPrice: product.promotional_net_price,
-            vat: product.vat,
             color: product.color,
             quantity: product.quantity,
             width: product.width,
@@ -58,7 +58,7 @@ export default class ProductReader {
             createdAt: product.created_at,
             deleted: product.deleted,
             thumbnail: thumbnail ? thumbnail : null,
-            grossPrice: PriceConverter.netToGrossPrice(Number(product.net_price), Number(product.vat)),
+            grossPrice: PriceConverter.netToGrossPrice(Number(product.net_price), vat),
             jsonData: product.json_data
         };
     }

package/dist/stockObjects/Order.js

@@ -46,7 +46,7 @@ export default class Order extends StockObject {
         return this.zsiId;
     }
     getGrossPrice() {
-        const vatPercentage = 23; //brak stawki vat dla zamówienia
+        const vatPercentage = this.vat ? this.vat : 23;
         return PriceConverter.netToGrossPrice(this.net_price, vatPercentage);
     }
     getClientId() {

package/dist/types/MarketPlaceI.d.ts

@@ -0,0 +1,5 @@
+export default interface MarketPlaceI {
+    id: string;
+    country: string;
+    vatRate: number;
+}

package/dist/types/MarketPlaceI.js

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

package/package.json

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