@licklist/design 0.71.12 → 0.71.14

package/dist/events/event-statistic-modal/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/events/event-statistic-modal/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAKjG,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE;QACT,aAAa,EAAE,MAAM,CAAA;QACrB,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;CACF,CAAA;AAED,eAAO,MAAM,gCAAgC,SACrC,MAAM,kBACI,cAAc,sBA6G/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/events/event-statistic-modal/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAKjG,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE;QACT,aAAa,EAAE,MAAM,CAAA;QACrB,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;CACF,CAAA;AAED,eAAO,MAAM,gCAAgC,SACrC,MAAM,kBACI,cAAc,sBAiI/B,CAAA"}

package/dist/events/event-statistic-modal/utils/index.js

@@ -1,6 +1,6 @@
 import { DateTime } from 'luxon';
 import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config';
-import { values, maxBy } from 'lodash';
+import { maxBy } from 'lodash';
 
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
@@ -45,18 +45,20 @@ var convertEventStatisticToTableData = function(date, eventStatistic) {
         return DateTime.fromFormat(date, DATE_TIME_FULL_FORMAT).toFormat(DATE_FORMAT) === summaryFormattedDate;
     })) !== null && _Object_keys_filter !== void 0 ? _Object_keys_filter : [];
     var summaryMap = new Map();
-    var allProductsSummary = values(eventStatistic === null || eventStatistic === void 0 ? void 0 : eventStatistic.productCategorySummary).flat().flatMap(function(categorySummary) {
-        return categorySummary.productsSummary;
-    });
-    var maxTotalQuantity = maxBy(allProductsSummary, 'id').totalQuantity || 0;
     summaryDays.map(function(day) {
         return eventStatistic === null || eventStatistic === void 0 ? void 0 : eventStatistic.productCategorySummary[day];
     }).flat().sort(function(prev, next) {
         return prev.categoryName === next.categoryName ? 0 : prev.categoryName > next.categoryName ? 1 : -1;
-    }).forEach(function(param) {
+    }).forEach(function(param, _, // all category at summaryDays
+    selfCategory) {
         var totalPerCategory = param.totalPerCategory, _param_productsSummary = param.productsSummary, productsSummary = _param_productsSummary === void 0 ? [] : _param_productsSummary, categoryName = param.categoryName, eventId = param.eventId;
         var quantity = 0;
         totalAmount += totalPerCategory || 0;
+        var allProductSummaryAtCategory = selfCategory.filter(function(category) {
+            return category.categoryName === categoryName;
+        }).flatMap(function(categorySummary) {
+            return categorySummary.productsSummary;
+        });
         if (!summaryMap.has("".concat(categoryName))) {
             summaryMap.set("".concat(categoryName), {
                 name: categoryName,
@@ -67,24 +69,29 @@ var convertEventStatisticToTableData = function(date, eventStatistic) {
                 total: TRANSLATION_KEYS.total
             });
         }
-        productsSummary === null || productsSummary === void 0 ? void 0 : productsSummary.forEach(function(param) {
-            var productsSold = param.productsSold, name = param.name, totalQuantity = param.totalQuantity, total = param.total;
-            quantity += productsSold;
+        productsSummary === null || productsSummary === void 0 ? void 0 : productsSummary.forEach(function(productSummary, productIndex) {
+            var _maxBy;
+            quantity += productSummary.productsSold;
             var _summaryMap_get;
-            var existingProduct = (_summaryMap_get = summaryMap.get("".concat(categoryName, ".").concat(name))) !== null && _summaryMap_get !== void 0 ? _summaryMap_get : {
+            var existingProduct = (_summaryMap_get = summaryMap.get("".concat(categoryName, ".").concat(productSummary.name))) !== null && _summaryMap_get !== void 0 ? _summaryMap_get : {
                 metadata: {
                     _productsSold: 0,
                     _total: 0
                 }
             };
-            summaryMap.set("".concat(categoryName, ".").concat(name), {
-                name: name,
-                key: "".concat(eventId, ".").concat(categoryName, ".").concat(name),
-                quantity: totalQuantity ? "".concat(existingProduct.metadata._productsSold + productsSold, " / ").concat(maxTotalQuantity) : String(existingProduct.metadata._productsSold + productsSold),
-                total: String(existingProduct.metadata._total + total),
+            var overrides = allProductSummaryAtCategory.filter(function(summary) {
+                return summary.originalProductId === productSummary.id;
+            });
+            var maxTotalQuantity = (_maxBy = maxBy(overrides, 'id')) === null || _maxBy === void 0 ? void 0 : _maxBy.totalQuantity;
+            var totalQuantity = maxTotalQuantity || (productSummary === null || productSummary === void 0 ? void 0 : productSummary.totalQuantity);
+            summaryMap.set("".concat(categoryName, ".").concat(productSummary.name), {
+                name: productSummary.name,
+                key: "".concat(eventId, ".").concat(categoryName).concat(productIndex).concat(productSummary.name),
+                quantity: totalQuantity ? "".concat(existingProduct.metadata._productsSold + productSummary.productsSold, " / ").concat(totalQuantity) : String(existingProduct.metadata._productsSold + productSummary.productsSold),
+                total: String(existingProduct.metadata._total + productSummary.total),
                 metadata: {
-                    _productsSold: existingProduct.metadata._productsSold + productsSold,
-                    _total: existingProduct.metadata._total + total
+                    _productsSold: existingProduct.metadata._productsSold + productSummary.productsSold,
+                    _total: existingProduct.metadata._total + productSummary.total
                 }
             });
         });

package/dist/sales/modals/refund-modal/RefundModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RefundModal.d.ts","sourceRoot":"","sources":["../../../../src/sales/modals/refund-modal/RefundModal.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6DAA6D,CAAA;AAK9F,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAMD,eAAO,MAAM,WAAW,mGASrB,gBAAgB,4CAmGlB,CAAA"}
+{"version":3,"file":"RefundModal.d.ts","sourceRoot":"","sources":["../../../../src/sales/modals/refund-modal/RefundModal.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6DAA6D,CAAA;AAK9F,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAMD,eAAO,MAAM,WAAW,mGASrB,gBAAgB,4CAoGlB,CAAA"}

package/dist/sales/modals/refund-modal/RefundModal.js

@@ -149,6 +149,7 @@ var RefundModal = function(param) {
                                                 });
                                             }
                                         })), {
+                                            step: 0.01,
                                             disabled: isLoading || isFullRefund,
                                             isInvalid: !!errors.amount,
                                             min: 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.71.12",
+  "version": "0.71.14",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/events/event-statistic-modal/utils/index.ts

@@ -1,7 +1,7 @@
 import { EventStatistic } from '@licklist/core/dist/DataMapper/Provider/EventStatisticDataMapper'
 import { DateTime } from 'luxon'
 import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config'
-import { values, maxBy } from 'lodash'
+import { maxBy } from 'lodash'
 
 export const TRANSLATION_KEYS = {
   shortQuantity: 'shortQuantity',
@@ -36,6 +36,7 @@ export const convertEventStatisticToTableData = (
   const summaryFormattedDate = DateTime.fromISO(date)
     .toUTC()
     .toFormat(DATE_FORMAT)
+
   const summaryDays =
     Object.keys(eventStatistic?.productCategorySummary)?.filter(
       (date) =>
@@ -45,11 +46,6 @@ export const convertEventStatisticToTableData = (
     ) ?? []
 
   const summaryMap = new Map<string, TableDataRecord>()
-  const allProductsSummary = values(eventStatistic?.productCategorySummary)
-    .flat()
-    .flatMap((categorySummary) => categorySummary.productsSummary)
-
-  const maxTotalQuantity = maxBy(allProductsSummary, 'id').totalQuantity || 0
 
   summaryDays
     .map((day) => eventStatistic?.productCategorySummary[day])
@@ -62,9 +58,19 @@ export const convertEventStatisticToTableData = (
           : -1,
     )
     .forEach(
-      ({ totalPerCategory, productsSummary = [], categoryName, eventId }) => {
+      (
+        { totalPerCategory, productsSummary = [], categoryName, eventId },
+        _,
+        // all category at summaryDays
+        selfCategory,
+      ) => {
         let quantity = 0
         totalAmount += totalPerCategory || 0
+
+        const allProductSummaryAtCategory = selfCategory
+          .filter((category) => category.categoryName === categoryName)
+          .flatMap((categorySummary) => categorySummary.productsSummary)
+
         if (!summaryMap.has(`${categoryName}`)) {
           summaryMap.set(`${categoryName}`, {
             name: categoryName,
@@ -76,43 +82,56 @@ export const convertEventStatisticToTableData = (
           })
         }
 
-        productsSummary?.forEach(
-          ({ productsSold, name, totalQuantity, total }) => {
-            quantity += productsSold
-
-            const existingProduct = summaryMap.get(
-              `${categoryName}.${name}`,
-            ) ?? {
-              metadata: {
-                _productsSold: 0,
-                _total: 0,
-              },
-            }
-
-            summaryMap.set(`${categoryName}.${name}`, {
-              name,
-              key: `${eventId}.${categoryName}.${name}`,
-              quantity: totalQuantity
-                ? `${
-                    existingProduct.metadata._productsSold + productsSold
-                  } / ${maxTotalQuantity}`
-                : String(existingProduct.metadata._productsSold + productsSold),
-              total: String(existingProduct.metadata._total + total),
-              metadata: {
-                _productsSold:
-                  existingProduct.metadata._productsSold + productsSold,
-                _total: existingProduct.metadata._total + total,
-              },
-            })
-          },
-        )
+        productsSummary?.forEach((productSummary, productIndex) => {
+          quantity += productSummary.productsSold
+
+          const existingProduct = summaryMap.get(
+            `${categoryName}.${productSummary.name}`,
+          ) ?? {
+            metadata: {
+              _productsSold: 0,
+              _total: 0,
+            },
+          }
+
+          const overrides = allProductSummaryAtCategory.filter(
+            (summary) => summary.originalProductId === productSummary.id,
+          )
+
+          const maxTotalQuantity = maxBy(overrides, 'id')?.totalQuantity
+
+          const totalQuantity = maxTotalQuantity || productSummary?.totalQuantity
+
+          summaryMap.set(`${categoryName}.${productSummary.name}`, {
+            name: productSummary.name,
+            key: `${eventId}.${categoryName}${productIndex}${productSummary.name}`,
+            quantity: totalQuantity
+              ? `${
+                  existingProduct.metadata._productsSold +
+                  productSummary.productsSold
+                } / ${totalQuantity}`
+              : String(
+                  existingProduct.metadata._productsSold +
+                    productSummary.productsSold,
+                ),
+            total: String(
+              existingProduct.metadata._total + productSummary.total,
+            ),
+            metadata: {
+              _productsSold:
+                existingProduct.metadata._productsSold +
+                productSummary.productsSold,
+              _total: existingProduct.metadata._total + productSummary.total,
+            },
+          })
+        })
+
         const prevTotalPerCategory = summaryMap.get(
           `${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
         ) ?? {
           quantity: 0,
           total: 0,
         }
-
         summaryMap.set(`${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`, {
           name: TRANSLATION_KEYS.totalPerCategory,
           key: `${eventId}.${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
@@ -120,6 +139,7 @@ export const convertEventStatisticToTableData = (
           total: String(Number(prevTotalPerCategory.total) + totalPerCategory),
           isBold: true,
         })
+
         totalQuantity += quantity
       },
     )

package/src/sales/modals/refund-modal/RefundModal.tsx

@@ -110,6 +110,7 @@ export const RefundModal = ({
                       }) as string
                     },
                   })}
+                  step={0.01}
                   disabled={isLoading || isFullRefund}
                   isInvalid={!!errors.amount}
                   min={0}