@pisell/private-materials 6.7.4 → 6.7.6

package/es/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -46,6 +46,7 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
     originalValue = props.originalValue,
     _props$selectType = props.selectType,
     selectType = _props$selectType === void 0 ? 'light' : _props$selectType,
+    tips = props.tips,
     resetText = props.resetText,
     doneText = props.doneText,
     onEnter = props.onEnter,
@@ -309,9 +310,17 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
       value: payableAmount
     })))));
   };
+  var renderTipsContent = function renderTipsContent() {
+    if (tips) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "pisell-pro-price-keyboard-tips"
+      }, tips);
+    }
+    return null;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-pro-price-keyboard-discount"
-  }, /*#__PURE__*/React.createElement(Segmented, {
+  }, renderTipsContent(), /*#__PURE__*/React.createElement(Segmented, {
     size: "large",
     style: {
       padding: 6

package/es/pro/priceKeyboard/components/discountKeyboard/index.less

@@ -7,6 +7,20 @@
   gap: 10px;
   background-color: var(--pisell-pro-price-keyboard-bg-color, #ffffff);
 
+  .pisell-pro-price-keyboard-tips {
+    background-color: var(
+      --pisell-pro-price-keyboard-bg-color-gray-200,
+      #eaecf0
+    );
+    color: #ffffff;
+    font-size: 14px;
+    font-weight: 600;
+    height: 36px;
+    line-height: 36px;
+    text-align: center;
+    border-radius: 8px;
+  }
+
   .ellipsis {
     overflow: hidden;
     text-overflow: ellipsis;

package/es/pro/priceKeyboard/components/paymentKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PaymentKeyboardBaseProps } from './types';
 import './index.less';
 interface PaymentKeyboardProps extends PaymentKeyboardBaseProps {

package/es/pro/priceKeyboard/components/shortcuts/index.d.ts

@@ -12,6 +12,7 @@ export interface ShortcutsProps {
     presets?: ShortcutsItem[];
     onChange?: (val: string) => void;
     disabled?: boolean;
+    size?: 'default' | 'large';
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ShortcutsProps & React.RefAttributes<HTMLDivElement>>>;
 export default _default;

package/es/pro/priceKeyboard/components/shortcuts/index.js

@@ -4,7 +4,9 @@ import "./index.less";
 var Shortcuts = /*#__PURE__*/forwardRef(function (props, ref) {
   var presets = props.presets,
     onChange = props.onChange,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    _props$size = props.size,
+    size = _props$size === void 0 ? 'default' : _props$size;
   var handleItemClick = function handleItemClick(item) {
     if (disabled || item.disabled) {
       return;
@@ -32,7 +34,8 @@ var Shortcuts = /*#__PURE__*/forwardRef(function (props, ref) {
       var itemProps = {
         key: index,
         className: classNames('pisell-virtual-keyboard-shortcut', {
-          disabled: item.disabled
+          disabled: item.disabled,
+          large: size === 'large'
         }),
         style: item.style,
         onClick: function onClick() {

package/es/pro/priceKeyboard/components/shortcuts/index.less

@@ -28,6 +28,10 @@
     cursor: pointer;
     position: relative;
 
+    &.large {
+      height: 54px;
+    }
+
     &.disabled {
       cursor: not-allowed;
       pointer-events: none;

package/es/pro/priceKeyboard/hooks/rightItems.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const useRightItems: (props: {
     rightItemsStyle?: any;
     doneText?: string;

package/lib/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/lib/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/lib/components/appointmentBooking/components/Header/index.d.ts

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

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

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

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item._bundleOrigin,
+        bundle: item.bundle,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -122,6 +122,7 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onUpdateBookingDate", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/lib/components/appointmentBooking/deposit/index.d.ts

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

package/lib/components/appointmentBooking/index.d.ts

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

package/lib/components/booking/addons/index.js

@@ -51,23 +51,31 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const bundleDiscountList = (0, import_utils.getBundleDiscountList)(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+    const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+    discount_list.push(...bundleDiscountList);
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
       price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
-      discount_list: (item == null ? void 0 : item.discount_list) || [],
+      discount_list: discount_list || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
+      bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+      "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
+      "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
+      "source_product_price": (0, import_utils.getSourceProductPrice)(item),
+      "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
+      "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
+      "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;
@@ -241,12 +249,12 @@ var Addons = (0, import_model.Provider)((props) => {
           isAddons: true,
           _key: e.key,
           _extend: {
-            price: _detail.price,
             other: e,
             quantity: (e == null ? void 0 : e.quantity) || 1
           },
           quantity: (e == null ? void 0 : e.quantity) || 1
         };
+        product._extend.price = (0, import_utils2.getMainPrice)(product, _detail.price);
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
         product._extend.origin_total = _total;

package/lib/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/lib/components/booking/components/collapsibleList/utils.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

package/lib/components/booking/components/footer/amount.d.ts

@@ -33,4 +33,5 @@ export declare const getSumTotal: (state: any, options: {
     dueAmount: number;
     roundingAmount: number;
     originExpectAmount: number;
+    originExpectAmountWithoutDiscount: number;
 };