feat: ✨ Fix to issue #34

apps/admin/src/components/customers/Edit.tsx

@@ -2,14 +2,10 @@ import { currencyCodes } from "lib/Currencies";
 import { Edit, FormTab, PasswordInput, AutocompleteInput, TabbedForm, TextInput, SelectInput, ArrayInput, SimpleFormIterator, NumberInput, ReferenceInput, useEditController } from "react-admin";
 //@ts-ignore
 import MarkdownInput from 'ra-input-markdown';
-import React from "react";
-import { IInvoice } from "interfaces/Invoice.interface";
 
 export const EditCustomer = (props: any) =>
 {
     const controllerProps = useEditController(props);
-    const { resource, record, save } = controllerProps;
-
     // get id
     const id = props.id;
 
@@ -53,7 +49,7 @@ export const EditCustomer = (props: any) =>
                             <ReferenceInput filterToQuery={(searchText: any) => ({
                                 "id": searchText,
                                 customer_uid: id,
-                            })} perPage={100} label="Invoice id" source="invoice_id" reference="invoices">
+                            })} perPage={100} allowEmpty label="Invoice id" source="invoice_id" reference="invoices">
                                 <AutocompleteInput
                                     isRequired={false}
                                     optionText="id"

apps/admin/src/components/images/Create.tsx

@@ -1,6 +1,6 @@
 import
 {
-    Create, FileField, FileInput, FormTab,
+    Create, FormTab,
     TabbedForm,
 } from "react-admin";
 

apps/admin/src/components/invoices/Edit.tsx

@@ -8,22 +8,16 @@ import
     ReferenceArrayInput, ReferenceInput, AutocompleteInput,
     SimpleFormIterator,
     TabbedForm,
-    useGetOne,
-    SelectInput,
     useEditController,
 } from "react-admin";
 //@ts-ignore
 import MarkdownInput from 'ra-input-markdown';
 import { currencyCodes } from "lib/Currencies";
 import RenderFullName from "../../lib/RenderFullName";
-import React from "react";
-import { ICustomer } from "interfaces/Customer.interface";
 
 export const EditInvoices = (props: any) =>
 {
     const controllerProps = useEditController(props);
-    const { resource, record, save } = controllerProps;
-    console.log(record)
     return (
         <Edit value={controllerProps} mutationMode="pessimistic" {...props}>
             <TabbedForm>
@@ -100,8 +94,7 @@ export const EditInvoices = (props: any) =>
                         </SimpleFormIterator>
                     </ArrayInput>
 
-                    {/* @ts-ignore */}
-                    <ReferenceArrayInput filterToQuery={searchText => ({
+                    <ReferenceArrayInput filterToQuery={(searchText: any) => ({
                         "id": searchText,
                     })} perPage={100} source="transactions" reference="transactions">
                         <AutocompleteArrayInput

apps/admin/src/components/orders/Create.tsx

@@ -95,15 +95,6 @@ export const CreateOrders = (props: any) =>
                     return { id: e, name: e };
                 })} />
             </FormTab>
-            <FormTab label="Invoices">
-                {/* @ts-ignore */}
-                <ReferenceArrayInput filterToQuery={searchText => ({
-                    "id": searchText,
-                })} perPage={100} source="invoices" reference="invoices">
-                    <AutocompleteInput optionText={(record) => record?.id?.toString() ?? ""} />
-                </ReferenceArrayInput>
-
-            </FormTab>
         </TabbedForm>
     </Create>
 );

apps/admin/src/components/orders/Edit.tsx

@@ -9,6 +9,7 @@ import
     TabbedForm,
     TextInput,
     FormDataConsumer,
+    AutocompleteArrayInput,
 } from "react-admin";
 import RenderFullName from "../../lib/RenderFullName";
 
@@ -98,7 +99,7 @@ export const EditOrders = (props: any) =>
             <FormTab label="Invoices">
 
                 <ReferenceArrayInput source="invoices" reference="invoices">
-                    <AutocompleteInput optionText={(record) => record?.id?.toString() ?? ""} />
+                    <AutocompleteArrayInput optionText={(record) => record?.id?.toString() ?? ""} />
                 </ReferenceArrayInput>
 
             </FormTab>

apps/admin/src/components/orders/List.tsx

@@ -9,7 +9,6 @@ export const OrderList = (props: any) => (
             <TextField label="Id" source="id" />
             <ReferenceField label="Customer" source="customer_uid" reference="customers">
                 <FunctionField
-                    // @ts-ignore
                     render={RenderFullName}
                     source="personal.first_name"
                 />

apps/api/src/Cache/reCache.ts

@@ -68,7 +68,7 @@ export async function reCache_Customers()
                 c.currency = companyCurrency.toLocaleUpperCase() as TPaymentCurrency;
                 await c.save();
             }
-            Logger.cache(`Caching customer ${c.uid}`);
+            // Logger.cache(`Caching customer ${c.uid}`);
             CacheCustomer.set(c.uid, c);
         }
         return resolve(true);
@@ -81,7 +81,7 @@ export async function reCache_Product()
     return new Promise(async (resolve) =>
     {
         const product = await ProductModel.find();
-        for (const c of product)
+        for await (const c of product)
         {
             // Check if product has currency
             if (!c.currency)
@@ -90,44 +90,55 @@ export async function reCache_Product()
                 c.currency = companyCurrency.toLocaleUpperCase() as TPaymentCurrency;
                 await c.save();
             }
-            Logger.cache(`Caching product ${c.uid}`);
-            CacheProduct.set(c.uid, c);
+            if (typeof c.category_uid === "string")
+            {
+                c.category_uid = parseInt(c.category_uid);
+                await c.save();
+            }
+            // CacheProduct.set(c.uid, c);
         }
         return resolve(true);
     });
 }
 
-/**
- * @deprecated
- */
 export async function reCache_Transactions()
 {
     Logger.info(`Starting caching on transactions..`);
     return new Promise(async (resolve) =>
     {
         const transactions = await TransactionsModel.find();
-        for (const t of transactions)
+        for await (const t of transactions)
         {
-            Logger.cache(`Caching transaction ${t.uid}`);
-            CacheTransactions.set(t.uid, t);
+            if (typeof t.customer_uid === "string")
+            {
+                t.customer_uid = parseInt(t.customer_uid);
+                t.save()
+            }
+            if (typeof t.invoice_uid === "string")
+            {
+                t.invoice_uid = parseInt(t.invoice_uid);
+                await t.save()
+            }
+            // CacheTransactions.set(t.uid, t);
         }
         return resolve(true);
     });
 }
 
-/**
- * @deprecated
- */
 export async function reCache_Orders()
 {
     Logger.info(`Starting caching on orders..`);
     return new Promise(async (resolve) =>
     {
         const order = await OrderModel.find();
-        for (const o of order)
+        for await (const o of order)
         {
-            Logger.cache(`Caching order ${o.uid}`);
-            CacheOrder.set(o.uid, o);
+            if (typeof o.customer_uid === "string")
+            {
+                o.customer_uid = parseInt(o.customer_uid);
+                await o.save()
+            }
+            // CacheOrder.set(o.uid, o);
         }
         return resolve(true);
     });
@@ -205,9 +216,6 @@ export async function reCache_Images()
 }
 
 
-/**
- * @deprecated
- */
 export async function reCache_Invoices()
 {
     Logger.info(`Starting caching on invoices..`);
@@ -223,6 +231,13 @@ export async function reCache_Invoices()
                 o.currency = companyCurrency.toLocaleUpperCase() as TPaymentCurrency;
                 await o.save();
             }
+            if (typeof o.customer_uid === "string")
+            {
+                console.log(o.customer_uid, typeof o.customer_uid);
+                o.customer_uid = parseInt(o.customer_uid);
+                o.markModified("customer_uid");
+                await o.save();
+            }
             Logger.cache(`Caching invoice ${o.uid}`);
             CacheInvoice.set(o.uid, o);
         }
@@ -237,8 +252,8 @@ export async function reCache()
     await reCache_Admin();
     await reCache_Customers();
     await reCache_Product();
-    // await reCache_Transactions();
-    // await reCache_Orders();
+    await reCache_Transactions();
+    await reCache_Orders();
     await reCache_Images();
     await reCache_Invoices();
 }

apps/api/src/Database/Models/Invoices.model.ts

@@ -29,7 +29,7 @@ const InvoiceSchema = new Schema
             },
 
             customer_uid: {
-                type: String,
+                type: Number,
                 required: true,
             },
 
@@ -87,7 +87,7 @@ const InvoiceSchema = new Schema
             },
 
             transactions: {
-                type: [String],
+                type: [Number],
                 default: [],
             },
 

apps/api/src/Database/Models/Orders.model.ts

@@ -27,7 +27,7 @@ const OrderSchema = new Schema
             },
 
             customer_uid: {
-                type: String,
+                type: Number,
                 required: true,
             },
 

apps/api/src/Database/Models/Products.model.ts

@@ -35,7 +35,7 @@ const ProductSchema = new Schema
             },
 
             category_uid: {
-                type: String,
+                type: Number,
                 required: true,
             },
 

apps/api/src/Database/Models/Quotes.model.ts

@@ -20,7 +20,7 @@ const QuotesSchema = new Schema
             },
 
             customer_uid: {
-                type: String,
+                type: Number,
                 required: true,
             },
 

apps/api/src/Database/Models/Subscriptions.model.ts

@@ -21,7 +21,7 @@ const SubscriptionSchema = new Schema
             },
 
             customer_uid: {
-                type: String,
+                type: Number,
                 required: true,
             },
 

apps/api/src/Database/Models/Transactions.model.ts

@@ -18,7 +18,7 @@ const TransactionsSchema = new Schema
             },
 
             customer_uid: {
-                type: Number || String,
+                type: Number,
                 required: false
             },
 

apps/api/src/Payments/Stripe.ts

@@ -40,22 +40,22 @@ const cacheIntents = new Map<string, stripe.Response<stripe.PaymentIntent>>();
 const cacheSetupIntents = new Map<string, stripe.Response<stripe.SetupIntent>>();
 
 
-export const createCreditIntent = async ({
-    amount,
-    currency,
-    customer,
-}: ICreateCreditIntentOptions) =>
-{
-    const intent = await Stripe.paymentIntents.create({
-        amount: 0,
-        currency: Company_Currency,
-        payment_method_types: ["card"],
-        confirm: true,
-        return_url: `${Full_Domain}/v2/payments/stripe/webhook`,
-    });
-    cacheIntents.set(intent.id, intent);
-    return intent;
-}
+// export const createCreditIntent = async ({
+//     amount,
+//     currency,
+//     customer,
+// }: ICreateCreditIntentOptions) =>
+// {
+//     const intent = await Stripe.paymentIntents.create({
+//         amount: 0,
+//         currency: Company_Currency,
+//         payment_method_types: ["card"],
+//         confirm: true,
+//         return_url: `${Full_Domain}/v2/payments/stripe/webhook`,
+//     });
+//     cacheIntents.set(intent.id, intent);
+//     return intent;
+// }
 
 // Create a method that will create a payment intent from an order
 export const CreatePaymentIntent = async (invoice: IInvoice) =>