@appcorp/stellar-solutions-invoice-module 0.1.10 → 0.1.12

package/base-modules/invoice/actions.d.ts

@@ -1,4 +1,4 @@
-import { INVOICE_DRAWER, InvoiceState, InvoiceTypeBE, Product, Service } from './types';
+import { DISCOUNT_UNIT, INVOICE_DRAWER, InvoiceState, InvoiceTypeBE, Product, Service } from './types';
 export declare enum INVOICE_ACTION_TYPES {
     SET_INPUT_FIELD = "SET_INPUT_FIELD",
     SET_CUSTOMER_DATA = "SET_CUSTOMER_DATA",
@@ -120,7 +120,7 @@ export type InvoiceDeleteItemServiceAction = {
 export type InvoiceSetDiscountUnitAction = {
     type: INVOICE_ACTION_TYPES.SET_DISCOUNT_UNIT;
     payload: {
-        discountUnit: string;
+        discountUnit: DISCOUNT_UNIT;
     };
 };
 export type InvoiceSetCustomerDataAction = {

package/base-modules/invoice/calculate-total.d.ts

@@ -1,4 +1,5 @@
-export declare const calculateTotal: (subtotal: string, tax: string, discountUnit: string, discount: string) => {
+import { DISCOUNT_UNIT } from "./types";
+export declare const calculateTotal: (subtotal: string, tax: string, discountUnit: DISCOUNT_UNIT, discount: string) => {
     totalTaxValue: string;
     totalDiscountValue: number;
     total: string;

package/base-modules/invoice/calculate-total.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateTotal = void 0;
+var types_1 = require("./types");
 var calculateTotal = function (subtotal, tax, discountUnit, discount) {
     var subtotalValue = parseFloat(subtotal || '0');
     var taxValue = ((subtotalValue * parseFloat(tax)) / 100).toFixed(2);
     var discountType = discountUnit;
     var discountValue = parseFloat(discount || '0');
-    var discountedAmount = discountType === 'percentage-value'
+    var discountedAmount = discountType === types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE
         ? (subtotalValue * discountValue) / 100
         : discountValue;
     var totalTaxValue = taxValue;

package/base-modules/invoice/constants.js

@@ -11,6 +11,7 @@ var form_schema_1 = require("@appcorp/app-corp-vista/utils/form-schema");
 var vista_button_type_1 = require("@appcorp/app-corp-vista/type/vista-button-type");
 var solid_1 = require("@heroicons/react/24/solid");
 var vista_table_type_1 = require("@appcorp/app-corp-vista/type/vista-table-type");
+var types_1 = require("./types");
 exports.pageLimit = Number(process.env.NEXT_PUBLIC_PAGE_LIMIT);
 var handleSplitId = function (value) {
     return value === null || value === void 0 ? void 0 : value.split(util_functions_1.VALUE_DELIMITER.COLON);
@@ -222,14 +223,14 @@ exports.staticPricingSection = (_b = {},
                     id: 'item-1',
                     label: 'Fixed Value',
                     order: 1,
-                    value: 'fixed-value',
+                    value: types_1.DISCOUNT_UNIT.FIXED_VALUE,
                 },
                 {
                     enabled: true,
                     id: 'item-2',
                     label: 'Percentage Value',
                     order: 2,
-                    value: 'percentage-value',
+                    value: types_1.DISCOUNT_UNIT.PERCENTAGE_VALUE,
                 },
             ],
         },

package/base-modules/invoice/context.js

@@ -99,7 +99,6 @@ var actions_1 = require("./actions");
 var constants_1 = require("./constants");
 var reducer_1 = require("./reducer");
 var types_1 = require("./types");
-var validate_1 = require("./validate");
 var generate_toast_1 = require("@appcorp/app-corp-vista/utils/generate-toast");
 var calculate_subtotal_1 = require("./calculate-subtotal");
 var context_1 = require("@appcorp/stellar-solutions-product-module/base-modules/product/context");
@@ -135,18 +134,27 @@ var useInvoiceState = function () {
             });
         }
     };
-    // const updateParams: Omit<InvoiceTypeBE, 'createdAt' | 'updatedAt' | 'serial' | 'isDeleted'> = useMemo(() => ({
-    //   buyPrice: state.buyPrice,
-    //   currency: state.currency,
-    //   description: state.description,
-    //   id: state.id,
-    //   images: state.images,
-    //   name: state.name,
-    //   productCategoryId: state.productCategoryId,
-    //   quantity: state.quantity,
-    //   ref: state.ref,
-    //   salePrice: state.salePrice,
-    // }), [state]);
+    var updatedParams = (0, react_1.useMemo)(function () { return ({
+        category: state.category,
+        companyId: state.companyId,
+        currency: state.currency,
+        customerId: state.customerId,
+        date: state.date,
+        discount: state.discount,
+        discountUnit: state.discountUnit,
+        expiryDate: state.expiryDate,
+        id: state.id,
+        invoiceStatus: state.invoiceStatus,
+        note: state.note,
+        payments: state.payments,
+        products: state.products,
+        quoteStatus: state.quoteStatus,
+        ref: state.ref,
+        services: state.services,
+        subTotal: state.subTotal,
+        taxValue: state.taxValue,
+        total: state.total,
+    }); }, [state]);
     var updateCallback = function (_a) {
         var data = _a.data, error = _a.error;
         if (error) {
@@ -228,7 +236,7 @@ var useInvoiceState = function () {
         unitUrl: constants_1.INVOICE_API_ROUTES.INVOICE,
         updateCallback: updateCallback,
         updateDeps: [state],
-        updateParams: {},
+        updateParams: __assign(__assign({}, updatedParams), { mode: 'Create' }),
     }), byIdError = _b.byIdError, byIdFetchNow = _b.byIdFetchNow, byIdLoading = _b.byIdLoading, deleteError = _b.deleteError, deleteFetchNow = _b.deleteFetchNow, deleteLoading = _b.deleteLoading, listError = _b.listError, listFetchNow = _b.listFetchNow, listLoading = _b.listLoading, updateError = _b.updateError, updateFetchNow = _b.updateFetchNow, updateLoading = _b.updateLoading;
     (0, react_1.useEffect)(function () {
         listFetchNow();
@@ -240,8 +248,6 @@ var useInvoiceState = function () {
     ]);
     (0, react_1.useEffect)(function () {
         var _a = (0, calculate_total_1.calculateTotal)(state.subTotal, state.taxValue, state.discountUnit, state.discount), totalTaxValue = _a.totalTaxValue, total = _a.total, totalDiscountValue = _a.totalDiscountValue;
-        // setTotalTax(totalTaxValue);
-        // setTotalDiscount(totalDiscountValue);
         dispatch({
             type: actions_1.INVOICE_ACTION_TYPES.SET_INPUT_FIELD,
             payload: {
@@ -342,33 +348,31 @@ var useInvoiceState = function () {
     //   return urls;
     // }, [state.images]);
     var handleSubmit = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var validationResult, validationErrors_1;
         return __generator(this, function (_a) {
-            // let urls;
-            // if (state.images?.length) {
-            //   urls = await handleUploadImage();
-            // }
             dispatch({
                 type: actions_1.INVOICE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
                 payload: { disableSaveButton: true },
             });
             try {
-                validationResult = validate_1.formValidation === null || validate_1.formValidation === void 0 ? void 0 : validate_1.formValidation.safeParse(__assign({}));
-                if (validationResult === null || validationResult === void 0 ? void 0 : validationResult.error) {
-                    validationErrors_1 = {};
-                    validationResult === null || validationResult === void 0 ? void 0 : validationResult.error.errors.forEach(function (err) {
-                        validationErrors_1[err.path[0]] = err.message;
-                    });
-                    dispatch({
-                        type: actions_1.INVOICE_ACTION_TYPES.SET_ERRORS,
-                        payload: validationErrors_1,
-                    });
-                }
-                if (validationResult === null || validationResult === void 0 ? void 0 : validationResult.success) {
-                    updateFetchNow(undefined, {
-                        body: JSON.stringify(__assign({})),
-                    });
-                }
+                // const validationResult =
+                //   formValidation?.safeParse({
+                //     ...updatedParams,
+                //   });
+                // if (validationResult?.error) {
+                //   const validationErrors: Record<string, string> = {};
+                //   validationResult?.error.errors.forEach((err) => {
+                //     validationErrors[err.path[0]] = err.message;
+                //   });
+                //   dispatch({
+                //     type: INVOICE_ACTION_TYPES.SET_ERRORS,
+                //     payload: validationErrors,
+                //   });
+                // }
+                // if (validationResult?.success) {
+                updateFetchNow(undefined, {
+                    body: JSON.stringify(__assign({}, updatedParams)),
+                });
+                // }
             }
             catch (_b) {
                 (0, generate_toast_1.generateToast)({
@@ -384,7 +388,7 @@ var useInvoiceState = function () {
             });
             return [2 /*return*/];
         });
-    }); }, [updateFetchNow]);
+    }); }, [updateFetchNow, updatedParams]);
     var handleChange = (0, react_1.useCallback)(function (key, value) {
         if (key === 'taxValue') {
             dispatch({

package/base-modules/invoice/reducer.js

@@ -27,42 +27,38 @@ var types_1 = require("./types");
 var constants_1 = require("./constants");
 var date_fns_1 = require("date-fns");
 exports.initialInvoiceState = {
-    count: 0,
-    disableSaveButton: false,
-    drawer: null,
-    modal: null,
-    payments: [],
-    mode: 'Create',
-    invoiceId: '',
+    address: '',
     category: types_1.QUOTE_INVOICE.INVOICE,
-    company: {
-        name: '',
-        country: '',
-        createdAt: '',
-        updatedAt: '',
-        id: '',
-        phone: '',
-        email: '',
-        website: '',
-    },
-    // btnDisableInvoice: false,
+    city: '',
     companyId: '',
     companyQuery: '',
+    count: 0,
+    country: '',
     currency: 'PKR',
     currentPage: 1,
+    customerId: '',
     date: new Date().toISOString(),
+    disableSaveButton: false,
     discount: '',
-    discountUnit: '',
+    discountUnit: types_1.DISCOUNT_UNIT.FIXED_VALUE,
+    drawer: null,
+    email: '',
     errors: {},
     expiryDate: (0, date_fns_1.addDays)(new Date(), 7).toISOString(),
-    // formLoadingInvoice: false,
+    firstName: '',
     id: '',
-    invoiceStatus: '',
+    invoiceStatus: types_1.INVOICE_STATUS.UNPAID,
     invoices: [],
+    lastName: '',
     loading: true,
+    modal: null,
+    mode: 'Create',
     netTotal: '',
     note: '',
     pageLimit: constants_1.pageLimit,
+    payments: [],
+    phone: '',
+    quoteStatus: types_1.QUOTE_STATUS.DRAFT,
     ref: '',
     searchQuery: '',
     subTotal: '',
@@ -70,6 +66,16 @@ exports.initialInvoiceState = {
     total: '',
     totalDiscount: '',
     totalTax: '',
+    company: {
+        name: '',
+        country: '',
+        createdAt: '',
+        updatedAt: '',
+        id: '',
+        phone: '',
+        email: '',
+        website: '',
+    },
     services: [
         {
             mode: 'Create',
@@ -89,18 +95,6 @@ exports.initialInvoiceState = {
             rowTotal: '',
         },
     ],
-    firstName: '',
-    lastName: '',
-    country: '',
-    phone: '',
-    email: '',
-    city: '',
-    // fetchPhoneLoading: false,
-    address: '',
-    customerId: '',
-    // fieldDisabled: true,
-    // isInvoiceApiSuccess: false,
-    // pageLimit: pageLimit
 };
 function invoiceReducer(state, action) {
     var _a;

package/base-modules/invoice/types.d.ts

@@ -94,57 +94,56 @@ export interface PaymentTypeBE {
     updatedAt: string;
 }
 export interface InvoiceTypeBE {
-    category: string;
+    category: QUOTE_INVOICE;
     company: CompanyTypeBE;
     companyId: string;
     createdAt: string;
     currency: string;
-    currentPage: number;
+    customer?: CustomerTypeBE;
     customerId: string;
     date: string;
     discount: string;
-    discountUnit: string;
+    discountUnit: DISCOUNT_UNIT;
     expiryDate: string;
     id: string;
-    invoiceId: string;
-    invoiceStatus: string;
-    loading: boolean;
-    mode: 'Create' | 'Edit';
+    invoiceStatus: INVOICE_STATUS;
     note: string;
     payments: PaymentTypeBE[] | [];
     products: Product[];
+    quoteStatus: QUOTE_STATUS;
     ref: string;
     services: Service[];
     subTotal: string;
     taxValue: string;
     total: string;
-    count: number;
     updatedAt: string;
 }
 export interface InvoiceState extends Omit<InvoiceTypeBE, 'createdAt' | 'updatedAt'> {
+    address: string;
+    city: string;
+    companyQuery: string;
     count: number;
+    country: string;
     currentPage: number;
     disableSaveButton: boolean;
     drawer: null | INVOICE_DRAWER;
+    email: string;
     errors: {
         [key: string]: string;
     };
+    firstName: string;
+    invoices: InvoiceTypeBE[];
+    lastName: string;
+    loading: boolean;
     modal: null | PRODUCT_MODAL;
+    mode: 'Create' | 'Edit';
+    netTotal: string;
     pageLimit: number;
-    companyQuery: string;
-    invoices: InvoiceTypeBE[];
+    phone: string;
     products: Product[];
     searchQuery: string;
-    netTotal: string;
-    firstName: string;
-    lastName: string;
-    country: string;
-    phone: string;
-    email: string;
-    city: string;
-    address: string;
-    totalTax: string;
     totalDiscount: string;
+    totalTax: string;
 }
 export interface FetchInvoicesArgs {
     currentPage: number;
@@ -178,3 +177,18 @@ export declare enum CURRENCY {
     SAR = "SAR",
     USD = "USD"
 }
+export declare enum INVOICE_STATUS {
+    UNPAID = "UNPAID",
+    PAID = "PAID"
+}
+export declare enum QUOTE_STATUS {
+    DRAFT = "DRAFT",
+    PENDING = "PENDING",
+    SENT = "SENT",
+    ACCEPTED = "ACCEPTED",
+    DECLINED = "DECLINED"
+}
+export declare enum DISCOUNT_UNIT {
+    FIXED_VALUE = "FIXED_VALUE",
+    PERCENTAGE_VALUE = "PERCENTAGE_VALUE"
+}

package/base-modules/invoice/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CURRENCY = exports.QUOTE_INVOICE = exports.PRODUCT_MODAL = exports.INVOICE_DRAWER = exports.PAYMENT_TYPE = exports.PAYMENT_MODE = void 0;
+exports.DISCOUNT_UNIT = exports.QUOTE_STATUS = exports.INVOICE_STATUS = exports.CURRENCY = exports.QUOTE_INVOICE = exports.PRODUCT_MODAL = exports.INVOICE_DRAWER = exports.PAYMENT_TYPE = exports.PAYMENT_MODE = void 0;
 var PAYMENT_MODE;
 (function (PAYMENT_MODE) {
 })(PAYMENT_MODE || (exports.PAYMENT_MODE = PAYMENT_MODE = {}));
@@ -38,3 +38,21 @@ var CURRENCY;
     CURRENCY["SAR"] = "SAR";
     CURRENCY["USD"] = "USD";
 })(CURRENCY || (exports.CURRENCY = CURRENCY = {}));
+var INVOICE_STATUS;
+(function (INVOICE_STATUS) {
+    INVOICE_STATUS["UNPAID"] = "UNPAID";
+    INVOICE_STATUS["PAID"] = "PAID";
+})(INVOICE_STATUS || (exports.INVOICE_STATUS = INVOICE_STATUS = {}));
+var QUOTE_STATUS;
+(function (QUOTE_STATUS) {
+    QUOTE_STATUS["DRAFT"] = "DRAFT";
+    QUOTE_STATUS["PENDING"] = "PENDING";
+    QUOTE_STATUS["SENT"] = "SENT";
+    QUOTE_STATUS["ACCEPTED"] = "ACCEPTED";
+    QUOTE_STATUS["DECLINED"] = "DECLINED";
+})(QUOTE_STATUS || (exports.QUOTE_STATUS = QUOTE_STATUS = {}));
+var DISCOUNT_UNIT;
+(function (DISCOUNT_UNIT) {
+    DISCOUNT_UNIT["FIXED_VALUE"] = "FIXED_VALUE";
+    DISCOUNT_UNIT["PERCENTAGE_VALUE"] = "PERCENTAGE_VALUE";
+})(DISCOUNT_UNIT || (exports.DISCOUNT_UNIT = DISCOUNT_UNIT = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/stellar-solutions-invoice-module",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "scripts": {
     "build": "yarn clean && yarn build:ts && cp package.json lib && cp README.md lib",
     "build:next": "next build",