@pisell/private-materials 6.7.9 → 6.8.1

package/es/components/pay/toC/locales.d.ts

@@ -97,6 +97,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -195,6 +196,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -293,6 +295,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
 };
 export default _default;

package/es/components/pay/toC/locales.js

@@ -116,7 +116,8 @@ export default {
     'tocPay.text.viewDetail': 'View detail',
     'tocPay.text.returnAndSelectOtherPaymentMethod': 'Go Back / Choose Another Payment',
     'tocPay.text.paymentCompletedAndViewOrder': 'Payment Completed / View Order',
-    'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful'
+    'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful',
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.'
   },
   'zh-CN': {
     'tocPay.text.checkout': '结账',
@@ -234,7 +235,8 @@ export default {
     'tocPay.text.viewDetail': '查看详情',
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 选择其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看订单',
-    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功"
+    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。'
   },
   'zh-HK': {
     'tocPay.text.checkout': '結帳',
@@ -352,6 +354,7 @@ export default {
     'tocPay.text.viewDetail': '查看詳情',
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 選擇其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看訂單',
-    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功"
+    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。'
   }
 };

package/es/components/pay/toC/status.d.ts

@@ -10,3 +10,4 @@ export declare const paymentKeys: string[];
  * @Date: 2024-08-30 10:16:26
  */
 export declare const isTripartitePayment: (service: string) => boolean;
+export declare const saleChannelMap: Record<string, string>;

package/es/components/pay/toC/status.js

@@ -113,4 +113,7 @@ export var paymentKeys = Object.keys(paymentServices);
  */
 export var isTripartitePayment = function isTripartitePayment(service) {
   return tripartitePaymentKeys.includes(service);
+};
+export var saleChannelMap = {
+  'mobile_order': 'mobile-order'
 };

package/es/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/es/components/subTotal/index.js

@@ -62,7 +62,7 @@ var Item = function Item(props) {
     }
     var str = '';
     str = str + (tax === null || tax === void 0 ? void 0 : tax.title);
-    str = str + ' ' + Number(tax.rate) * 100 + '%';
+    str = str + ' ' + (Number(tax.rate) * 100).toFixed(2) + '%';
 
     // 判断税费是 包含在订单内  还是单独的
     if (tax !== null && tax !== void 0 && tax.is_price_include_tax) {

package/es/components/systemSettings/registry/components/GroupModal.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { GroupModalProps } from '../types';
+declare const GroupModal: React.FC<GroupModalProps>;
+export default GroupModal;

package/es/components/{checkout/PaymentPlugin.js → systemSettings/registry/components/GroupModal.js}

@@ -8,192 +8,153 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useRef, useEffect, useState } from "react";
-import { Button } from "antd";
-import { CloseOutlined } from "@ant-design/icons";
-import useModal from "../../hooks/useModal";
-import Checkout from "./content";
-import { locales } from "@pisell/utils";
-import checkoutLocales from "./locales";
-import useEngineContext from "../../hooks/useEngineContext";
-import React from "react";
+import React, { useEffect } from 'react';
+import { Drawer, Form, Input, Space } from 'antd';
+import { Button, BaseTranslation } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import localesData from "../locales";
 
-// 添加样式来覆盖Modal的默认padding
-var modalStyle = document.createElement('style');
-modalStyle.textContent = "\n  :where(.payment-modal-wrapper) .ant-modal .ant-modal-content,\n  .payment-modal-wrapper .ant-modal .ant-modal-content,\n  .payment-modal-wrapper .ant-modal-content {\n    padding: 12px 36px 36px 36px !important;\n  }\n";
-if (!document.querySelector('.payment-modal-style')) {
-  modalStyle.className = 'payment-modal-style';
-  document.head.appendChild(modalStyle);
-}
-var PaymentPlugin = function PaymentPlugin() {
-  var _context$appHelper;
-  var context = useEngineContext();
-  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    pisellos = _context$appHelper$ut.pisellos;
-  var paymentRef = useRef();
-  var callback = useRef();
-  var _useState = useState(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    totalAmount = _useState2[0],
-    setTotalAmount = _useState2[1];
-  // 创建本地翻译函数，优先使用 checkout 语言包
-  var translation = function translation(key, fallback) {
-    var _checkoutLocales;
-    var currentLang = locales.locale || 'en';
-    var checkoutText = (_checkoutLocales = checkoutLocales[currentLang]) === null || _checkoutLocales === void 0 ? void 0 : _checkoutLocales[key];
-    if (checkoutText) {
-      return checkoutText;
-    }
+// 创建本地的 getText 函数
+var getText = function getText(key) {
+  // 先尝试使用 locales.getText，如果没有找到再使用本地数据
+  var globalText = locales.getText(key);
+  if (globalText !== key) {
+    return globalText;
+  }
 
-    // 回退到全局语言包
-    return locales.getText(key) || fallback;
-  };
-  var handlePaymentComplete = function handlePaymentComplete(result) {
-    var _callback$current;
-    console.log("Payment completed:", result);
-    (_callback$current = callback.current) === null || _callback$current === void 0 || _callback$current.call(callback, result);
-    hideModal(); // 支付完成后关闭弹窗
-  };
-  var handlePaymentCancel = function handlePaymentCancel() {
-    var _callback$current2;
-    console.log("Payment cancelled");
-    hideModal();
-    (_callback$current2 = callback.current) === null || _callback$current2 === void 0 || _callback$current2.call(callback, {
-      status: "cancelled"
-    });
-  };
+  // 使用本地多语言数据
+  var currentLocale = locales.locale || 'zh-CN'; // 默认使用中文
+  var localeData = localesData[currentLocale] || localesData['en'] || {};
+  return localeData[key] || key;
+};
+var GroupModal = function GroupModal(_ref) {
+  var open = _ref.open,
+    type = _ref.type,
+    data = _ref.data,
+    onOk = _ref.onOk,
+    onCancel = _ref.onCancel;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
 
-  // 自定义头部组件
-  var CustomHeader = function CustomHeader() {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: "flex",
-        alignItems: "center",
-        justifyContent: "space-between",
-        padding: "16px 0",
-        marginBottom: "16px",
-        borderBottom: "1px solid #f0f0f0",
-        backgroundColor: "#fafafa",
-        margin: "-12px -36px 16px -36px",
-        // 扩展到modal边缘
-        paddingLeft: "36px",
-        paddingRight: "36px"
-      }
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: "flex",
-        alignItems: "center",
-        gap: "12px"
-      }
-    }, "\u786C\u4EF6\u72B6\u6001"), /*#__PURE__*/React.createElement("div", null, translation("order.total"), "\uFF1A", totalAmount), /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: "flex",
-        alignItems: "center",
-        gap: "8px"
-      }
-    }, /*#__PURE__*/React.createElement(Button, {
-      type: "text",
-      size: "small",
-      icon: /*#__PURE__*/React.createElement(CloseOutlined, null),
-      onClick: handlePaymentCancel,
-      style: {
-        color: "#8c8c8c",
-        border: "none",
-        boxShadow: "none"
+  // 当模态框打开时，初始化表单数据
+  useEffect(function () {
+    if (open) {
+      if (type === 'edit' && data) {
+        form.setFieldsValue({
+          title: data.title,
+          code: data.code
+        });
+      } else {
+        form.resetFields();
       }
-    })));
-  };
-  var _useModal = useModal({
-      title: null,
-      // 移除默认标题，使用自定义头部
-      children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CustomHeader, null), /*#__PURE__*/React.createElement(Checkout, {
-        paymentData: paymentRef.current,
-        moduleConfig: {
-          showWalletPass: true,
-          showCashPayment: true,
-          showAdditionalModule: true,
-          showPaymentOptions: true
-        },
-        onPaymentComplete: handlePaymentComplete,
-        onPaymentCancel: handlePaymentCancel,
-        onStatusChange: function onStatusChange(status) {
-          return console.log("Status changed:", status);
-        },
-        open_deposit: true // 开启押金选择功能
-      })),
-      width: 880,
-      // 808px 内容宽度 + 36px 左右内边距
-      destroyOnClose: true,
-      maskClosable: false,
-      footer: null,
-      // 移除默认的确定/取消按钮，让组件内部处理
-      closeIcon: null,
-      // 移除默认关闭图标，使用自定义的
-      onCancel: handlePaymentCancel,
-      wrapClassName: "payment-modal-wrapper"
-    }),
-    showModal = _useModal.showModal,
-    hideModal = _useModal.hideModal,
-    content = _useModal.content;
-  var onOpen = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props) {
-      var checkout, _props$data, _props$data2, orderInfo;
+    }
+  }, [open, type, data, form]);
+
+  // 处理确认
+  var handleOk = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            // 获取 checkout 模块并处理订单数据
-            checkout = pisellos.getModule("checkout");
-            if (!checkout) {
-              _context.next = 6;
-              break;
-            }
-            _context.next = 4;
-            return checkout.createLocalOrderAsync({
-              orderData: (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.order_info,
-              cartSummary: (_props$data2 = props.data) === null || _props$data2 === void 0 || (_props$data2 = _props$data2.subtotal_info) === null || _props$data2 === void 0 ? void 0 : _props$data2.subTotalList,
-              autoPayment: true
-            });
-          case 4:
-            // 获取订单总金额
-            orderInfo = checkout.getCurrentOrderInfo();
-            if (orderInfo && orderInfo.totalAmount) {
-              setTotalAmount(orderInfo.totalAmount);
-            }
+            _context.prev = 0;
+            _context.next = 3;
+            return form.validateFields();
+          case 3:
+            values = _context.sent;
+            _context.next = 6;
+            return onOk(values);
           case 6:
-            paymentRef.current = props === null || props === void 0 ? void 0 : props.data;
-            callback.current = props === null || props === void 0 ? void 0 : props.callback;
-            showModal(); // 打开弹窗
+            form.resetFields();
+            _context.next = 12;
+            break;
           case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](0);
+            console.error('Validation failed:', _context.t0);
+          case 12:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[0, 9]]);
     }));
-    return function onOpen(_x) {
-      return _ref.apply(this, arguments);
+    return function handleOk() {
+      return _ref2.apply(this, arguments);
     };
   }();
-  var onClose = function onClose() {
-    hideModal();
-  };
 
-  /**
-   * @title: 初始化, 注入插件
-   * @description:
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2023-09-13 09:41
-   */
-  var init = function init() {
-    var state = {
-      open: onOpen,
-      close: onClose
-    };
-    console.log("PaymentPlugin", state);
+  // 处理取消
+  var handleCancel = function handleCancel() {
+    form.resetFields();
+    onCancel();
   };
-  useEffect(function () {
-    init();
-  }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, content);
+  var title = locales.getText(type === 'add' ? 'registry.modal.add.group' : 'registry.modal.edit.group');
+  return /*#__PURE__*/React.createElement(Drawer, {
+    title: title,
+    open: open,
+    onClose: handleCancel,
+    width: 400,
+    destroyOnClose: true,
+    footer: /*#__PURE__*/React.createElement("div", {
+      style: {
+        textAlign: 'right'
+      }
+    }, /*#__PURE__*/React.createElement(Space, {
+      size: "small"
+    }, /*#__PURE__*/React.createElement(Button, {
+      onClick: handleCancel
+    }, locales.getText('registry.button.cancel')), /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      onClick: handleOk
+    }, locales.getText('registry.button.save'))))
+  }, /*#__PURE__*/React.createElement(Form, {
+    form: form,
+    layout: "vertical",
+    requiredMark: true
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "title",
+    label: locales.getText('registry.form.title'),
+    rules: [{
+      required: true,
+      message: locales.getText('registry.message.required')
+    }]
+  }, /*#__PURE__*/React.createElement(BaseTranslation, {
+    placeholder: locales.getText('registry.form.name.placeholder')
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "code",
+    label: locales.getText('registry.form.code'),
+    rules: [{
+      required: true,
+      message: locales.getText('registry.message.required')
+    }, {
+      validator: function validator(_, value) {
+        if (!value) return Promise.resolve();
+
+        // 格式检查：只能包含小写字母、数字、点和下划线
+        if (!/^[a-z0-9\._]+$/.test(value)) {
+          return Promise.reject(new Error(getText('registry.message.code.format')));
+        }
+
+        // 开头规则检查：必须以字母开头
+        if (!/^[a-z]/.test(value)) {
+          return Promise.reject(new Error(getText('registry.message.code.start')));
+        }
+
+        // 结尾规则检查：不能以点或下划线结尾
+        if (/[\._]$/.test(value)) {
+          return Promise.reject(new Error(getText('registry.message.code.end')));
+        }
+
+        // 连续特殊字符检查：不能使用连续的点或下划线
+        if (/[\.]{2,}|[\_]{2,}/.test(value)) {
+          return Promise.reject(new Error(getText('registry.message.code.consecutive')));
+        }
+        return Promise.resolve();
+      }
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: locales.getText('registry.form.code.placeholder')
+  }))));
 };
-export default PaymentPlugin;
+export default GroupModal;

package/es/components/systemSettings/registry/components/ItemModal.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ItemModalProps } from '../types';
+declare const ItemModal: React.FC<ItemModalProps>;
+export default ItemModal;