@atomsolution/sdk-merchant 1.6.10 → 1.6.12

package/dist/batch-product-creation/components/merchant-batch-create-form/merge-and-check-data.d.ts

@@ -1,5 +1,5 @@
 type Props = {
-    taxDeductionMethod: "direct" | "credit";
+    taxDeductionMethod: 'direct' | 'credit';
 };
 export default function MergeAndCheckData({ taxDeductionMethod }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/batch-product-creation.cjs

@@ -26830,16 +26830,8 @@ function MergeAndCheckData({ taxDeductionMethod }) {
   } = useUploadStore();
   const normalize = (str) => str.replace(/\r?\n|\r|\t/g, "").trim();
   let sheetHeaders = sheetData[0] || [];
-  sheetHeaders = sheetHeaders.map(
-    (h) => typeof h === "string" ? normalize(h) : h
-  );
-  const {
-    mappings,
-    setMappings,
-    defaultMappings,
-    setDefaultMappings,
-    resetMappings
-  } = useMappingStore();
+  sheetHeaders = sheetHeaders.map((h) => typeof h === "string" ? normalize(h) : h);
+  const { mappings, setMappings, defaultMappings, setDefaultMappings, resetMappings } = useMappingStore();
   const isMappableField = (field) => !EXCLUDED_SYSTEM_FIELDS.includes(field);
   React.useEffect(() => {
     if (sheetHeaders.length > 0 && Object.keys(defaultMappings).length === 0) {
@@ -26874,9 +26866,7 @@ function MergeAndCheckData({ taxDeductionMethod }) {
         if (taxNumber === 0) {
           priceBeforeTax = Math.round(priceAfterTaxNumber);
         } else {
-          priceBeforeTax = Math.round(
-            priceAfterTaxNumber / (1 + taxNumber / 100)
-          );
+          priceBeforeTax = Math.round(priceAfterTaxNumber / (1 + taxNumber / 100));
         }
       }
       return {
@@ -27008,17 +26998,51 @@ function MergeAndCheckData({ taxDeductionMethod }) {
       ] })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("div", { className: "w-full px-4 py-4 max-h-[540px] overflow-auto rounded bg-[#F9FAFB]", children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("div", { className: "rounded-xl p-4 bg-white", children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("table", { className: "min-w-full text-xs border-separate border-spacing-0", children: [
-      /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("colgroup", { children: [
-        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { className: "w-[12%]" }),
-        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { className: "w-[25%]" }),
-        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { className: "w-[20%]" }),
-        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { className: "w-[14%]" }),
-        /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { className: "w-[10%]" })
-      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("colgroup", { children: (() => {
+        const propMap = {
+          0: "code",
+          1: "name",
+          2: "priceBeforeTax",
+          3: "tax",
+          4: "priceAfterTax",
+          5: "unit",
+          6: "category"
+        };
+        const getCellString = (row, fieldIndex) => {
+          const prop = propMap[fieldIndex];
+          if (!prop) return "";
+          const val = row[prop];
+          if (fieldIndex === 2 || fieldIndex === 4) {
+            return typeof val === "number" ? formatVND(val) : String(val != null ? val : "");
+          }
+          if (fieldIndex === 3) {
+            return typeof val === "number" ? val + "%" : String(val != null ? val : "");
+          }
+          return String(val != null ? val : "");
+        };
+        const columnWeights = visibleSystemFields.map((field) => {
+          const fieldIndex = systemFields.indexOf(field);
+          let maxLen = field.length;
+          filteredRows.forEach((row) => {
+            const cellStr = getCellString(row, fieldIndex);
+            if (cellStr.length > maxLen) {
+              maxLen = cellStr.length;
+            }
+          });
+          let weight = Math.sqrt(maxLen);
+          if (fieldIndex === 0 || fieldIndex === 1) weight *= 1.2;
+          return weight;
+        });
+        const totalWeight = columnWeights.reduce((a2, b) => a2 + b, 0);
+        return visibleSystemFields.map((_, index2) => {
+          const width = `${columnWeights[index2] / totalWeight * 100}%`;
+          return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("col", { style: { width } }, index2);
+        });
+      })() }),
       /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("thead", { children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("tr", { children: visibleSystemFields.map((field) => /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(
         "th",
         {
-          className: "px-2 py-3 text-left font-semibold text-[14px] text-[#475467] border-b",
+          className: "px-2 py-3 text-left font-semibold text-[14px] text-[#475467] border-b whitespace-nowrap",
           children: field
         },
         field
@@ -29343,14 +29367,18 @@ const CreateProductConfirmModal = ({
     setLoading(true);
     const formattedProducts = checkedProducts.map((product) => {
       var _a;
-      const priceBeforeTax = calcPriceBeforeTax(
+      calcPriceBeforeTax(
         product.priceAfterTax,
         product.tax
       );
       return __spreadValues({
         code: product.code,
         name: product.name,
-        price: taxDeductionMethod === "direct" ? product.priceAfterTax : priceBeforeTax != null ? priceBeforeTax : 0,
+        price: product.priceAfterTax,
+        // price:
+        //   taxDeductionMethod === "direct"
+        //     ? product.priceAfterTax
+        //     : priceBeforeTax ?? 0,
         img: product.img || "",
         unit: product.unit,
         cost: 0,
@@ -29360,9 +29388,7 @@ const CreateProductConfirmModal = ({
       }, taxDeductionMethod === "credit" ? { price_after_vat: (_a = product.priceAfterTax) != null ? _a : 0 } : {});
     });
     try {
-      const response = yield createProductsService.createProducts(
-        formattedProducts
-      );
+      const response = yield createProductsService.createProducts(formattedProducts);
       index.CustomToast.success(
         translate("toast_success_title"),
         translate("toast_create_products_success")