@connect-plus-online/ogabai-integrations 0.0.88 → 0.0.93

package/dist/index.d.mts

@@ -349,10 +349,12 @@ interface Expense {
     repeatedEvery: "day" | "week" | "month" | "year";
     dispenseStaffIds: string[];
     createdAt: string;
-    expenseType: "none" | "operation" | "staffRequest";
+    expenseType: "none" | "operation" | "staffRequest" | "staffRequestFulfilled" | "staffRequestDeclined";
     amount: number;
     narration: string;
     createdById: string;
+    storeId: string;
+    paymentType: Transaction["paymentType"];
 }
 type DateFilter = {
     startDate: string;
@@ -396,6 +398,7 @@ type Transaction = {
     createdById: string;
     expenseId: string;
     narration: string;
+    expenseReceiptUrl: string;
 };
 type OrderStatus = "pending" | "processing" | "routing" | "delivered";
 type Order = {
@@ -1644,6 +1647,11 @@ declare const createPriceService: (client: GraphQLClient) => {
 };
 
 declare const createProductService: (client: GraphQLClient) => {
+    /**
+     *
+     * @param form { storeId: string; productId: string; file: File;}
+     * @returns Transaction
+     */
     uploadProductImage(form: FormData): Promise<Product>;
     getCustomerProductCountsByIds(input: GetCustomerProductCountsByIdsRequest, fetchFields?: {
         root?: (keyof GetCustomerProductCountsByIdsResponse)[];
@@ -1929,6 +1937,16 @@ type UpdateTransactionResponseNestedFields = GetTransactionResponseNestedFields;
 declare const updateTransactionResponseNestedFields: GetTransactionResponseNestedFields;
 
 declare const createTransactionService: (client: GraphQLClient) => {
+    /**
+     * Uploads a transaction receipt
+     * @param form {
+     *   file: File;
+     *   transactionId: string;
+     *   storeId: string;
+     * }
+     * @returns Transaction with updated receipt URL
+     */
+    uploadExpenseReceipt(form: FormData): Promise<Transaction>;
     updateTransaction(input: UpdateTransactionRequest, fetchFields?: {
         root?: (keyof UpdateTransactionResponse)[];
         nestedFields?: UpdateTransactionResponseNestedFields;
@@ -2105,12 +2123,15 @@ declare const createExpenseDispenseService: (client: GraphQLClient) => {
         skip?: number;
     }) => Promise<EntityResponse<Transaction[], "transactions"> | null>;
     dispenseExpense: (req: {
-        expenseDispense: Pick<Transaction, "expenseId" | "amountPaid" | "narration" | "createdById">;
+        expenseDispense: Pick<Transaction, "expenseId" | "amountPaid" | "narration" | "createdById" | "paymentType">;
     }) => Promise<EntityResponse<Transaction, "transaction"> | undefined>;
     approveExpenseDispense(req: {
         expenseId: string;
         addToExpenseList?: boolean;
     }): Promise<EntityResponse<Transaction, "transaction"> | null>;
+    declineExpenseDispense: (req: {
+        expenseId: string;
+    }) => Promise<EntityResponse<Transaction, "transaction"> | null>;
 };
 type ExpenseDispenseService = ReturnType<typeof createExpenseDispenseService>;
 

package/dist/index.d.ts

@@ -349,10 +349,12 @@ interface Expense {
     repeatedEvery: "day" | "week" | "month" | "year";
     dispenseStaffIds: string[];
     createdAt: string;
-    expenseType: "none" | "operation" | "staffRequest";
+    expenseType: "none" | "operation" | "staffRequest" | "staffRequestFulfilled" | "staffRequestDeclined";
     amount: number;
     narration: string;
     createdById: string;
+    storeId: string;
+    paymentType: Transaction["paymentType"];
 }
 type DateFilter = {
     startDate: string;
@@ -396,6 +398,7 @@ type Transaction = {
     createdById: string;
     expenseId: string;
     narration: string;
+    expenseReceiptUrl: string;
 };
 type OrderStatus = "pending" | "processing" | "routing" | "delivered";
 type Order = {
@@ -1644,6 +1647,11 @@ declare const createPriceService: (client: GraphQLClient) => {
 };
 
 declare const createProductService: (client: GraphQLClient) => {
+    /**
+     *
+     * @param form { storeId: string; productId: string; file: File;}
+     * @returns Transaction
+     */
     uploadProductImage(form: FormData): Promise<Product>;
     getCustomerProductCountsByIds(input: GetCustomerProductCountsByIdsRequest, fetchFields?: {
         root?: (keyof GetCustomerProductCountsByIdsResponse)[];
@@ -1929,6 +1937,16 @@ type UpdateTransactionResponseNestedFields = GetTransactionResponseNestedFields;
 declare const updateTransactionResponseNestedFields: GetTransactionResponseNestedFields;
 
 declare const createTransactionService: (client: GraphQLClient) => {
+    /**
+     * Uploads a transaction receipt
+     * @param form {
+     *   file: File;
+     *   transactionId: string;
+     *   storeId: string;
+     * }
+     * @returns Transaction with updated receipt URL
+     */
+    uploadExpenseReceipt(form: FormData): Promise<Transaction>;
     updateTransaction(input: UpdateTransactionRequest, fetchFields?: {
         root?: (keyof UpdateTransactionResponse)[];
         nestedFields?: UpdateTransactionResponseNestedFields;
@@ -2105,12 +2123,15 @@ declare const createExpenseDispenseService: (client: GraphQLClient) => {
         skip?: number;
     }) => Promise<EntityResponse<Transaction[], "transactions"> | null>;
     dispenseExpense: (req: {
-        expenseDispense: Pick<Transaction, "expenseId" | "amountPaid" | "narration" | "createdById">;
+        expenseDispense: Pick<Transaction, "expenseId" | "amountPaid" | "narration" | "createdById" | "paymentType">;
     }) => Promise<EntityResponse<Transaction, "transaction"> | undefined>;
     approveExpenseDispense(req: {
         expenseId: string;
         addToExpenseList?: boolean;
     }): Promise<EntityResponse<Transaction, "transaction"> | null>;
+    declineExpenseDispense: (req: {
+        expenseId: string;
+    }) => Promise<EntityResponse<Transaction, "transaction"> | null>;
 };
 type ExpenseDispenseService = ReturnType<typeof createExpenseDispenseService>;
 

package/dist/index.esm.js

@@ -2558,9 +2558,9 @@ var productSchema = {
 };
 
 // src/services/file/file.service.ts
-var createFileService = (client) => ({
-  async uploadFile(formData) {
-    const url = client["url"].replace("/graphql", "") + "/api/upload";
+var createFileService = (client) => {
+  async function uploadFile(path, formData) {
+    const url = client["url"].replace("/graphql", "") + path;
     const token = await client["tokenProvider"]();
     const headers = {
       ...token ? { Authorization: `Bearer ${token}` } : {}
@@ -2579,13 +2579,40 @@ var createFileService = (client) => ({
       return text;
     }
   }
-});
+  return {
+    /**
+     * 
+     * @param form { storeId: string; productId: string; file: File;}
+     * @returns Transaction
+     */
+    uploadFileProductImage(form) {
+      return uploadFile("/api/upload/product", form);
+    },
+    /**
+     * Uploads a transaction receipt
+     * @param form {
+     *   file: File;
+     *   transactionId: string;
+     *   storeId: string;
+     * }
+     * @returns Transaction with updated receipt URL
+     */
+    uploadTxReceipt(form) {
+      return uploadFile("/api/upload/transaction-receipt", form);
+    }
+  };
+};
 
 // src/services/inventory/product.service.ts
 var createProductService = (client) => ({
+  /**
+   * 
+   * @param form { storeId: string; productId: string; file: File;}
+   * @returns Transaction
+   */
   async uploadProductImage(form) {
     const fileClient = createFileService(client);
-    return (await fileClient.uploadFile(form)).product;
+    return (await fileClient.uploadFileProductImage(form)).product;
   },
   async getCustomerProductCountsByIds(input, fetchFields, option) {
     var _a, _b, _c, _d;
@@ -3204,12 +3231,19 @@ var orderSchema = {
 
 // src/services/sales/sale.entity.ts
 var expenseQuery = [
-  "id",
+  "amount",
   "createdAt",
+  "createdById",
   "description",
-  "title",
+  "dispenseStaffIds",
+  "expenseCategoryId",
+  "expenseType",
+  "id",
+  "narration",
+  "paymentType",
   "repeatedEvery",
-  "expenseCategoryId"
+  "title",
+  "storeId"
 ];
 var expenseCategoryQuery = [
   "id",
@@ -3433,6 +3467,19 @@ var updateTransactionResponseNestedFields = getTransactionResponseNestedFields;
 
 // src/services/sales/transaction.service.ts
 var createTransactionService = (client) => ({
+  /**
+   * Uploads a transaction receipt
+   * @param form {
+   *   file: File;
+   *   transactionId: string;
+   *   storeId: string;
+   * }
+   * @returns Transaction with updated receipt URL
+   */
+  async uploadExpenseReceipt(form) {
+    const fileClient = createFileService(client);
+    return (await fileClient.uploadTxReceipt(form)).transaction;
+  },
   async updateTransaction(input, fetchFields, option) {
     var _a, _b, _c, _d;
     const res = await client.request(
@@ -3765,7 +3812,7 @@ var createExpenseDispenseService = (client) => {
       });
     },
     dispenseExpense: async (req) => {
-      const { amountPaid, narration, createdById, expenseId } = req.expenseDispense;
+      const { amountPaid, narration, createdById, expenseId, paymentType } = req.expenseDispense;
       const expenseRes = await expenseService.getExpense({
         expense: {
           id: expenseId
@@ -3784,7 +3831,8 @@ var createExpenseDispenseService = (client) => {
           amountPaid,
           narration,
           createdById,
-          expenseId
+          expenseId,
+          paymentType
         }
       });
       return transaction || void 0;
@@ -3808,18 +3856,39 @@ var createExpenseDispenseService = (client) => {
           expenseId,
           amountPaid: expense.amount,
           narration: expense.narration || "Approved expense dispense",
-          createdById: expense.createdById
+          createdById: expense.createdById,
+          paymentType: expense.paymentType
+        }
+      });
+      await expenseService.updateExpense({
+        expenseId,
+        expense: {
+          expenseType: addToExpenseList ? "operation" : "staffRequestFulfilled"
         }
       });
-      if (addToExpenseList) {
-        await expenseService.updateExpense({
-          expenseId,
-          expense: {
-            expenseType: "operation"
-          }
-        });
-      }
       return transaction || null;
+    },
+    declineExpenseDispense: async (req) => {
+      const { expenseId } = req;
+      const expenseRes = await expenseService.getExpense({
+        expense: {
+          id: expenseId
+        }
+      });
+      if (!expenseRes || !expenseRes.expense) {
+        throw new Error("Expense not found");
+      }
+      const expense = expenseRes.expense;
+      if (expense.expenseType !== "staffRequest") {
+        throw new Error("Only staff requested expenses can be declined for dispense");
+      }
+      await expenseService.updateExpense({
+        expenseId,
+        expense: {
+          expenseType: "staffRequestDeclined"
+        }
+      });
+      return null;
     }
   };
 };