@dascompany/product 4.1.5 → 4.1.7

package/dist/reader/payment/PaymentDetailsReader.js

@@ -2,6 +2,7 @@ import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../../DatabaseConnection";
 import PaymentMethodReader from "./PaymentMethodReader";
 import PaymentStatusesReader from "./PaymentStatusesReader";
+import createQueryOptionsForId from "../../utils/createQueryOptionsForId";
 export default class PaymentDetailsReader {
     static async get(queryOptions) {
         const paymentDetails = await DatabaseConnection.getInstance().paymentDetails.select(queryOptions);
@@ -9,26 +10,20 @@ export default class PaymentDetailsReader {
     }
     static async correctPaymentDetails(paymentDetails) {
         const id = paymentDetails.id;
-        const queryOptionsForPaymentMethod = new QueryOptions();
-        queryOptionsForPaymentMethod.setWhere([{
-                name: 'id',
-                type: ParameterType.bigint,
-                value: paymentDetails.payment_method_id
-            }]);
+        const queryOptionsForPaymentMethod = createQueryOptionsForId(paymentDetails.payment_method_id);
+        const paymentMethod = await PaymentMethodReader.get(queryOptionsForPaymentMethod);
         const queryOptionsForPaymentStatus = new QueryOptions();
         queryOptionsForPaymentStatus.setWhere([{
                 name: 'payment_details_id',
                 type: ParameterType.bigint,
                 value: paymentDetails.id
             }]);
-        const [paymentMethod, statuses] = await Promise.all([
-            PaymentMethodReader.get(queryOptionsForPaymentMethod),
-            PaymentStatusesReader.getAll(queryOptionsForPaymentStatus)
-        ]);
+        const statuses = await PaymentStatusesReader.getAll(queryOptionsForPaymentStatus);
         return {
             id,
             paymentMethod,
             statuses,
+            paymentOrderId: paymentDetails.payment_order_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.net_price, orderData.client_id, orderData.delivery_details_id, orderData.company_details_id, orderData.payment_details_id, orderData.invoice, orderData.vat);
+        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

@@ -9,7 +9,7 @@ export default class Order extends StockObject {
     private invoice;
     private zsiId;
     private vat;
-    constructor(email: string, net_price: number, clientId: string | null, deliveryDetailsId: string, companyDetailsId: string | null | undefined, paymentDetailsId: string | null | undefined, invoice: boolean | undefined, vat: number);
+    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;

package/dist/stockObjects/Order.js

@@ -12,7 +12,7 @@ export default class Order extends StockObject {
     invoice;
     zsiId;
     vat;
-    constructor(email, net_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.net_price = net_price;

package/dist/types/PaymentDetailsI.d.ts

@@ -3,4 +3,5 @@ export default interface PaymentDetailsI {
     id: string;
     paymentMethod: PaymentMethodI;
     statuses: any[];
+    paymentOrderId: any;
 }

package/package.json

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