@atomsolution/sdk-merchant 1.5.4 → 1.5.5

package/dist/assets/locales/en/merchant-batch-create-form.json.d.ts

@@ -63,6 +63,8 @@ declare const _default: {
   "export_col_name": "Product name",
   "export_col_unit": "Unit",
   "export_col_price": "Price",
+  "export_col_taxVAT": "Tax VAT",
+  "export_col_priceAfterTax": "Price after tax",
   "export_col_category": "Category",
   "export_col_status": "Status",
   "export_status_success": "Success",
@@ -79,9 +81,10 @@ declare const _default: {
   "unit_required": "Product unit is not allowed to be empty",
   "unit_invalid": "Product unit is invalid",
   "code_must_be_string": "Product code must be a string",
+  "tax_invalid": "Invalid tax",
   "code_required": "Product code is not allowed to be empty",
   "code_invalid": "Product code is invalid",
-  "price_required": "Product price is not allowed to be empty",
+  "price_required": "Price after tax is not allowed to be empty",
   "price_invalid": "Product price is invalid",
   "category_must_be_string": "Product category must be a string",
   "category_invalid": "Product category is invalid",

package/dist/assets/locales/vi/merchant-batch-create-form.json.d.ts

@@ -61,6 +61,8 @@ declare const _default: {
   "export_col_name": "Tên sản phẩm",
   "export_col_unit": "Đơn vị tính",
   "export_col_price": "Giá",
+  "export_col_taxVAT": "Thuế VAT",
+  "export_col_priceAfterTax": "Giá bán sau thuế",
   "export_col_category": "Danh mục sản phẩm",
   "export_col_status": "Trạng thái",
   "export_status_success": "Thành công",
@@ -76,12 +78,13 @@ declare const _default: {
   "unit_must_be_string": "Đơn vị tính phải là chuỗi",
   "unit_invalid": "Đơn vị tính không hợp lệ",
   "code_must_be_string": "Mã sản phẩm phải là chuỗi",
+  "tax_invalid": "Thuế không hợp lệ",
   "code_required": "Mã sản phẩm không được bỏ trống",
   "code_invalid": "Mã sản phẩm không hợp lệ",
   "code_min": "Mã sản phẩm phải có ít nhất 2 ký tự",
   "code_max": "Mã sản phẩm không được vượt quá 20 ký tự",
   "code_invalid_chars": "Mã sản phẩm chỉ được chứa chữ, số, dấu gạch ngang (-), gạch dưới (_), không chứa khoảng trắng",
-  "price_required": "Giá sản phẩm không được bỏ trống",
+  "price_required": "Giá sau thuế không được bỏ trống",
   "price_invalid": "Giá sản phẩm không hợp lệ",
   "category_must_be_string": "Danh mục sản phẩm phải là chuỗi",
   "category_invalid": "Danh mục sản phẩm không hợp lệ",

package/dist/batch-product-creation/components/merchant-batch-create-form/modals/create-product-success-modal.d.ts

@@ -7,6 +7,7 @@ type Props = {
     confirmText?: string;
     open: boolean;
     onClose: () => void;
+    taxDeductionMethod?: "direct" | "credit";
 };
-declare const CreateProductSuccessModal: ({ createdProductsResult, checkedProducts, disable, open, onClose: handleClose, }: Props) => import("react/jsx-runtime").JSX.Element;
+declare const CreateProductSuccessModal: ({ createdProductsResult, checkedProducts, disable, open, onClose: handleClose, taxDeductionMethod, }: Props) => import("react/jsx-runtime").JSX.Element;
 export default CreateProductSuccessModal;

package/dist/batch-product-creation/store/use-upload-store.d.ts

@@ -1,9 +1,9 @@
 export interface ProductPreview {
     name: string;
     code: string;
-    priceBeforeTax: number;
-    tax: number;
-    priceAfterTax: number | null;
+    priceBeforeTax: number | string;
+    tax: number | string;
+    priceAfterTax: number | null | string;
     category: string;
     unit: string;
     note: string;

package/dist/batch-product-creation.cjs

@@ -70,16 +70,16 @@ var __asyncGenerator = (__this, __arguments, generator) => {
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("./jsx-runtime-DV8UmLi4.cjs");
-const useTranslation = require("./use-translation-CN8MTMJN.cjs");
+const useTranslation = require("./use-translation-bkoNjVct.cjs");
 const reactToastify = require("react-toastify");
 const useWesapApiConfig_store = require("./use-wesap-api-config.store-BaseWS--.cjs");
 const React = require("react");
 const create = require("zustand");
-const dropdownMenuAbsolute = require("./dropdownMenuAbsolute-77lk7HqZ.cjs");
+const useExternalConfig_store = require("./use-external-config.store-WVwivWvK.cjs");
+const dropdownMenuAbsolute = require("./dropdownMenuAbsolute-D_UcfPXt.cjs");
 const ReactDOM = require("react-dom");
 const index = require("./index-Ozgk-K52.cjs");
 const axios = require("axios");
-const useExternalConfig_store = require("./use-external-config.store-WVwivWvK.cjs");
 const index_esm = require("./index.esm-B0J-MTn-.cjs");
 require("./use-portal-api-config.store-C8a2gebE.cjs");
 function _interopNamespaceDefault(e) {
@@ -26792,6 +26792,12 @@ function FieldMappingPopup({
     )
   ] });
 }
+function formatVND(price) {
+  if (useExternalConfig_store.useExternalConfigStore.getState().language === "en") {
+    return new Intl.NumberFormat("en-US").format(price);
+  }
+  return new Intl.NumberFormat("vi-VN").format(price) + " VND";
+}
 const EXCLUDED_SYSTEM_FIELDS = ["Giá bán trước thuế", "Price before tax"];
 const getHiddenFieldsByTaxMethod = (method) => {
   if (method === "credit") {
@@ -26842,31 +26848,37 @@ function MergeAndCheckData({ taxDeductionMethod }) {
       setDefaultMappings(def);
     }
   }, [sheetHeaders, systemFields, defaultMappings]);
+  const parseNumber = (val) => {
+    if (val === void 0 || val === null || val === "") return null;
+    const n2 = Number(val);
+    return Number.isFinite(n2) ? n2 : null;
+  };
   React.useEffect(() => {
     if (sheetHeaders.length === 0) return;
     let bodyRows = useHeader ? sheetData.slice(1) : sheetData;
     const mapped = bodyRows.map((row) => {
       var _a, _b, _c, _d;
-      const taxValue = (() => {
-        const val = row[sheetHeaders.indexOf(mappings[systemFields[3]])];
-        return isNaN(val) || val === void 0 || val === null || val === "" ? 0 : Number(val);
-      })();
-      const priceAfterTaxValue = (() => {
-        const val = row[sheetHeaders.indexOf(mappings[systemFields[4]])];
-        return isNaN(val) || val === void 0 || val === null || val === "" ? 0 : Number(val);
-      })();
-      let priceBeforeTaxValue;
-      if (taxValue === 0) {
-        priceBeforeTaxValue = priceAfterTaxValue;
-      } else {
-        priceBeforeTaxValue = priceAfterTaxValue / (1 + taxValue / 100);
+      const rawTax = row[sheetHeaders.indexOf(mappings[systemFields[3]])];
+      console.log(rawTax);
+      const rawPriceAfterTax = row[sheetHeaders.indexOf(mappings[systemFields[4]])];
+      const taxNumber = parseNumber(rawTax);
+      const priceAfterTaxNumber = parseNumber(rawPriceAfterTax);
+      let priceBeforeTax = "";
+      if (priceAfterTaxNumber !== null && taxNumber !== null) {
+        if (taxNumber === 0) {
+          priceBeforeTax = Math.round(priceAfterTaxNumber);
+        } else {
+          priceBeforeTax = Math.round(
+            priceAfterTaxNumber / (1 + taxNumber / 100)
+          );
+        }
       }
       return {
         code: (_a = row[sheetHeaders.indexOf(mappings[systemFields[0]])]) != null ? _a : "",
         name: (_b = row[sheetHeaders.indexOf(mappings[systemFields[1]])]) != null ? _b : "",
-        tax: taxValue,
-        priceAfterTax: priceAfterTaxValue,
-        priceBeforeTax: Number(priceBeforeTaxValue.toFixed(2)),
+        tax: rawTax != null ? rawTax : "",
+        priceAfterTax: rawPriceAfterTax != null ? rawPriceAfterTax : "",
+        priceBeforeTax,
         unit: (_c = row[sheetHeaders.indexOf(mappings[systemFields[5]])]) != null ? _c : "",
         category: (_d = row[sheetHeaders.indexOf(mappings[systemFields[6]])]) != null ? _d : "",
         note: ""
@@ -27053,15 +27065,18 @@ function MergeAndCheckData({ taxDeductionMethod }) {
               translate("noCompatibleData")
             ]
           }
-        ) }) : filteredRows.map((row, idx) => /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.code }),
-          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.name }),
-          taxDeductionMethod == "credit" && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.priceBeforeTax }),
-          taxDeductionMethod == "credit" && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.tax + "%" }),
-          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.priceAfterTax }),
-          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.unit }),
-          /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.category })
-        ] }, idx));
+        ) }) : filteredRows.map((row, idx) => {
+          var _a;
+          return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("tr", { children: [
+            /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.code }),
+            /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.name }),
+            taxDeductionMethod == "credit" && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: typeof row.priceBeforeTax == "number" ? formatVND(row.priceBeforeTax) : "" }),
+            taxDeductionMethod == "credit" && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: typeof row.tax == "number" ? row.tax + "%" : row.tax }),
+            /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: typeof row.priceAfterTax == "number" ? formatVND((_a = row.priceAfterTax) != null ? _a : 0) : row.priceAfterTax }),
+            /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.unit }),
+            /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("td", { className: "px-2 py-3 text-[#2C2C2C] text-[14px] border-b", children: row.category })
+          ] }, idx);
+        });
       })() })
     ] }) }) }),
     /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("div", { className: "flex justify-between items-center", children: [
@@ -29258,17 +29273,20 @@ const CreateProductConfirmModal = ({
   const { translate } = useTranslation.useTranslation("batch-create-product");
   const handleCreateProducts = () => __async(exports, null, function* () {
     setLoading(true);
-    const formattedProducts = checkedProducts.map((product) => ({
-      code: product.code,
-      name: product.name,
-      price: product.priceAfterTax,
-      img: product.img || "",
-      unit: product.unit,
-      cost: 0,
-      tax: taxDeductionMethod == "direct" ? 0 : product.tax,
-      status: 0,
-      category_names: product.category
-    }));
+    const formattedProducts = checkedProducts.map((product) => {
+      var _a;
+      return {
+        code: product.code,
+        name: product.name,
+        price: (_a = product.priceBeforeTax) != null ? _a : 0,
+        img: product.img || "",
+        unit: product.unit,
+        cost: 0,
+        tax: taxDeductionMethod == "direct" ? 0 : product.tax,
+        status: 0,
+        category_names: product.category
+      };
+    });
     try {
       const response = yield createProductsService.createProducts(
         formattedProducts
@@ -52586,7 +52604,8 @@ const CreateProductSuccessModal = ({
   checkedProducts,
   disable,
   open,
-  onClose: handleClose
+  onClose: handleClose,
+  taxDeductionMethod = "direct"
 }) => {
   const setIsDirty = useWesapApiConfig_store.useUnsavedChangesStore((state) => state.setIsDirty);
   const { translate } = useTranslation.useTranslation("batch-create-product");
@@ -52610,12 +52629,14 @@ const CreateProductSuccessModal = ({
       const isFailedProduct = createdProductsResult.products_err.some(
         (failed) => failed === product.code
       );
+      console.log(taxDeductionMethod);
       if (isFailedProduct) {
         return [
           // [translate('export_col_img')]: product.img,
           product.code,
           product.name,
-          product.price,
+          ...taxDeductionMethod === "credit" ? [product.tax] : [],
+          product.priceAfterTax,
           product.unit,
           product.category.join(", "),
           translate("export_status_failed")
@@ -52625,7 +52646,8 @@ const CreateProductSuccessModal = ({
         // [translate('export_col_img')]: product.img,
         product.code,
         product.name,
-        product.price,
+        ...taxDeductionMethod === "credit" ? [product.tax + "%"] : [],
+        product.priceAfterTax,
         product.unit,
         product.category.join(", "),
         translate("export_status_success")
@@ -52639,6 +52661,7 @@ const CreateProductSuccessModal = ({
     )}_${day}${month}${year}`;
   };
   const exportCreationResultToExcel = (dataRows2, name) => __async(exports, null, function* () {
+    console.log(dataRows2);
     const { minutes, hours, day, month, year } = getDateTimeMetrics();
     const now = `${hours}:${minutes} ${day}/${month}/${year}`;
     const workbook = new ExcelJS.Workbook();
@@ -52647,7 +52670,8 @@ const CreateProductSuccessModal = ({
     const columns = [
       translate("export_col_code"),
       translate("export_col_name"),
-      translate("export_col_price"),
+      ...taxDeductionMethod === "credit" ? [translate("export_col_taxVAT")] : [],
+      translate("export_col_priceAfterTax"),
       translate("export_col_unit"),
       translate("export_col_category"),
       translate("export_col_status")
@@ -56095,7 +56119,7 @@ const ProductPreviewSchema = object({
     /^[A-Za-z0-9\-_.]+$/,
     useTranslation.translate("batch-create-product:code_invalid")
   ),
-  priceBeforeTax: number().optional(),
+  priceBeforeTax: number({ error: () => "" }).optional(),
   tax: number({
     error: () => useTranslation.translate("batch-create-product:tax_invalid")
   }).refine((v) => TAX_VALUES.includes(v), {
@@ -56432,12 +56456,6 @@ const UploadImageCell = ({
     }
   );
 };
-function formatVND(price) {
-  if (useExternalConfig_store.useExternalConfigStore.getState().language === "en") {
-    return new Intl.NumberFormat("en-US").format(price);
-  }
-  return new Intl.NumberFormat("vi-VN").format(price) + " VND";
-}
 const CategoryCell = ({ color, children }) => {
   const styleColor = {
     yellow: {
@@ -57546,7 +57564,7 @@ const UpdateProductModal = ({
                 }
               )
             ] }),
-            taxDeductionMethod && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(Label, { labelText: translate("tax"), required: true, children: [
+            taxDeductionMethod == "credit" && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(Label, { labelText: translate("tax"), required: true, children: [
               /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(ErrorMessage, { name: "tax", errors }),
               /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(
                 "select",
@@ -57724,10 +57742,20 @@ const ProductPreviewTable = ({
       minWidth: "200px",
       render: (data) => {
         const { priceAfterTax, tax } = data;
-        if (priceAfterTax === void 0 || priceAfterTax === null || tax === void 0 || tax === null) {
-          return "-";
+        if (tax === "" || tax === null || tax === void 0) {
+          return "";
         }
-        const priceBeforeTax = Math.round(priceAfterTax / (1 + tax / 100));
+        if (priceAfterTax === "" || priceAfterTax === null || priceAfterTax === void 0) {
+          return "";
+        }
+        const priceAfterTaxNumber = Number(priceAfterTax);
+        const taxNumber = Number(tax);
+        if (!Number.isFinite(priceAfterTaxNumber) || !Number.isFinite(taxNumber)) {
+          return "";
+        }
+        const priceBeforeTax = Math.round(
+          priceAfterTaxNumber / (1 + taxNumber / 100)
+        );
         return formatVND(priceBeforeTax);
       }
     },
@@ -57736,8 +57764,15 @@ const ProductPreviewTable = ({
       label: translate("tax"),
       width: "200px",
       minWidth: "200px",
-      render: (data) => {
-        return data.tax + "%";
+      render: ({ tax }) => {
+        if (tax == "" || tax === null || tax === void 0) {
+          return "";
+        }
+        const taxNumber = Number(tax);
+        if (!Number.isFinite(taxNumber)) {
+          return "";
+        }
+        return `${taxNumber}%`;
       }
     }
   ];
@@ -57747,8 +57782,15 @@ const ProductPreviewTable = ({
       label: translate("price_vat"),
       width: "200px",
       minWidth: "200px",
-      render: (data) => {
-        return data.priceAfterTax && formatVND(data.priceAfterTax);
+      render: ({ priceAfterTax }) => {
+        if (priceAfterTax === "" || priceAfterTax === null || priceAfterTax === void 0) {
+          return "";
+        }
+        const n2 = Number(priceAfterTax);
+        if (!Number.isFinite(n2)) {
+          return "";
+        }
+        return formatVND(n2);
       }
     },
     {
@@ -57993,7 +58035,8 @@ const ProductInfoPreview = ({ taxDeductionMethod }) => {
         open: showCreateSuccessModal,
         onClose: () => setShowSuccessModal(false),
         checkedProducts,
-        createdProductsResult
+        createdProductsResult,
+        taxDeductionMethod
       }
     )
   ] });