Merge pull request #39 from Tolfix/dev

Fixed orders
Tolfix · Dec 2, 2021 · 2045b29 · 2045b29
2 parents fa2ebee + bccd1a2
commit 2045b29
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/Interfaces/Invoice.ts b/src/Interfaces/Invoice.ts
@@ -76,4 +76,5 @@ export interface IInvoices_Items
     quantity: number;
     product_id?: IProduct["id"];
     configurable_options_id?: IConfigurableOptions["id"];
+    configurable_options_index?: IConfigurableOptions["options"]["length"];
 }
diff --git a/src/Lib/Orders/newInvoice.ts b/src/Lib/Orders/newInvoice.ts
@@ -58,14 +58,16 @@ export async function createInvoiceFromOrder(order: IOrder)
             {
                 for await(const configurable_option of configurable_options)
                 {
+                    const option_index = LBProducts.get(product.id)?.configurable_options?.find(e => e.id === configurable_option.id)?.option_index ?? 0;
                     const option = configurable_option.options[
-                        LBProducts.get(product.id)?.configurable_options?.find(e => e.id === configurable_option.id)?.option_index ?? 0
+                        option_index
                     ];
                     items.push({
                         amount: option.price ?? 0,
                         notes: `+ ${product?.name} - ${configurable_option.name} ${option.name}`,
                         quantity: 1,
                         configurable_options_id: configurable_option.id,
+                        configurable_options_index: option_index
                     });
                 }
             }

diff --git a/src/Payments/Paypal.ts b/src/Payments/Paypal.ts
@@ -6,7 +6,7 @@ import { idTransicitons } from "../Lib/Generator";
 import { getInvoiceByIdAndMarkAsPaid } from "../Lib/Invoices/MarkAsPaid";
 import { getDate } from "../Lib/Time";
 
-if(Paypal_Client_Id || Paypal_Client_Secret)
+if(Paypal_Client_Id !== "" || Paypal_Client_Secret !== "")
     paypal.configure({
         'mode': DebugMode ? 'sandbox' : "live",
         'client_id': Paypal_Client_Id,

diff --git a/src/Routes/v2/Orders/Orders.config.ts b/src/Routes/v2/Orders/Orders.config.ts
@@ -254,7 +254,7 @@ export default class OrderRoute
             if(payment_method === "credit_card")
                 return APISuccess(`${Full_Domain}/v2/stripe/pay/${invoice.uid}`)(res);
 
-            return APISuccess(`Invoice sent.`);
+            return APISuccess(`Invoice sent.`)(res);
         });
 
         this.router.get("/:uid", [