@weareconceptstudio/account 0.6.1 → 0.6.3

package/dist/components/AccountCounter/index.js

@@ -4,7 +4,7 @@ import { useCart } from '../../modules';
 //* Style
 import AccountCounterStyle from './style';
 const AccountCounter = ({ productId, qty = 1, isGift, maxQty, promotionId }) => {
-    const { toggleCartItem, items, setCheckGift } = useCart();
+    const { toggleCartItem, items, setGifts } = useCart();
     //! State
     const [count, setCount] = useState(qty);
     useEffect(() => {
@@ -21,7 +21,7 @@ const AccountCounter = ({ productId, qty = 1, isGift, maxQty, promotionId }) =>
         e.stopPropagation();
         const newCount = type == 'inc' ? count + 1 : count - 1;
         setCount(newCount);
-        isGift ? setCheckGift({ promotionId, qty: newCount, productId }) : debouncedUpdateCartServer(newCount);
+        isGift ? setGifts({ promotionId, qty: newCount, productId }) : debouncedUpdateCartServer(newCount);
     };
     return (React.createElement(AccountCounterStyle, { onClick: (e) => e.stopPropagation(), className: `counter-block ${count == 0 ? 'opacity-zero pointer-none' : ''}` },
         React.createElement("div", { className: 'counter' },

package/dist/components/TotalCheckout/BalanceComp/utils.d.ts

@@ -6,6 +6,5 @@ export declare const balanceFields: {
     };
     fieldProps: {
         placeholder: string;
-        type: string;
     };
 }[];

package/dist/components/TotalCheckout/BalanceComp/utils.js

@@ -1,13 +1,12 @@
 export const balanceFields = [
     {
-        fieldType: 'input',
+        fieldType: 'number',
         labelProps: {
             name: 'balance',
             errorKey: 'account.balance_promotions.balance',
         },
         fieldProps: {
             placeholder: 'account.balance_promotions.balancePlaceholder',
-            type: 'number',
         },
     },
 ];

package/dist/components/TotalCheckout/PromoCodeComp/AppliedPromotion/index.d.ts

@@ -1,5 +1,7 @@
 export default AppliedPromotion;
-declare function AppliedPromotion({ name }: {
+declare function AppliedPromotion({ name, onClick, isExcluded }: {
     name: any;
+    onClick: any;
+    isExcluded?: boolean;
 }): React.JSX.Element;
 import React from 'react';

package/dist/components/TotalCheckout/PromoCodeComp/AppliedPromotion/index.js

@@ -1,11 +1,8 @@
 import React from 'react';
 import { Text } from '@weareconceptstudio/core';
-const AppliedPromotion = ({ name }) => {
+const AppliedPromotion = ({ name, onClick, isExcluded = false }) => {
     return (React.createElement("div", { className: `promo-code-success-block` },
         React.createElement(Text, { className: 'account-p account-p4 account-primary-color2 account-font-medium promo-code-success-text' }, name),
-        React.createElement(Text, { text: 'account.general_actions.remove', className: 'account-p account-p4 account-primary-color2 account-font-medium promo-code-remove-text', onClick: () => {
-                // promotionHandler(null);
-                // setDisable(false);
-            } })));
+        React.createElement(Text, { text: isExcluded ? 'account.general_actions.restore' : 'account.general_actions.remove', className: 'account-p account-p4 account-primary-color2 account-font-medium promo-code-remove-text', onClick: onClick })));
 };
 export default AppliedPromotion;

package/dist/components/TotalCheckout/PromoCodeComp/index.js

@@ -8,16 +8,13 @@ import { promoCodeFields } from './utils';
 //* Style
 import PromoCodeCompStyle from './style';
 const PromoCodeComp = () => {
-    const { itemsCount, usePromotion, appliedPromotions, fillCart } = useCart();
-    const handlePromotion = (promotion) => {
-        fillCart('usePromotion', promotion);
-    };
+    const { itemsCount, appliedPromotions, fillCart, togglePromotion, checkoutData } = useCart();
     const onFinish = (values) => {
-        handlePromotion(values.promo_code);
+        fillCart('promotion_code', values?.promo_code || null);
     };
     const promotions = useMemo(() => {
-        return appliedPromotions?.map((promotion, index) => (React.createElement(AppliedPromotion, { key: index, ...promotion })));
-    }, [appliedPromotions]);
+        return appliedPromotions?.map((promotion) => (React.createElement(AppliedPromotion, { key: promotion.id, ...promotion, isExcluded: checkoutData?.excludedPromotions?.includes(promotion.id), onClick: () => (promotion.is_manual ? onFinish(null) : togglePromotion({ promotionId: promotion.id })) })));
+    }, [appliedPromotions, checkoutData.excludedPromotions]);
     return (React.createElement(PromoCodeCompStyle, { className: `collapse-distance ${itemsCount ? '' : 'disable'}` },
         React.createElement(CollapseItem, { status: appliedPromotions?.length ? 'open' : 'close', title: React.createElement(React.Fragment, null,
                 React.createElement("div", { className: 'inner-wrapper-icon' },
@@ -26,9 +23,9 @@ const PromoCodeComp = () => {
                         React.createElement("path", { d: 'M6 12L6 0', stroke: 'black', strokeWidth: '2' }))),
                 React.createElement(Text, { className: 'account-p account-p4 account-primary-color1 account-font-medium promo-code-text', text: 'account.balance_promotions.gotPromotionCode' })), description: React.createElement(React.Fragment, null,
                 promotions,
-                usePromotion ? (React.createElement(AppliedPromotion, { name: usePromotion, onClick: () => handlePromotion(null) })) : (React.createElement(FormBuilder, { onSubmit: onFinish, fields: promoCodeFields, className: `promo-code-block`, formOptions: {
+                !checkoutData.promotion_code ? (React.createElement(FormBuilder, { onSubmit: onFinish, fields: promoCodeFields, className: `promo-code-block`, formOptions: {
                         className: 'promo-code-container',
                     } },
-                    React.createElement(AccountButton, { type: 'submit', btnType: `promo-code-version`, text: `account.general_actions.add` })))) })));
+                    React.createElement(AccountButton, { type: 'submit', btnType: `promo-code-version`, text: `account.general_actions.add` }))) : null) })));
 };
 export default PromoCodeComp;

package/dist/modules/address/AddressProvider.js

@@ -8,7 +8,7 @@ export const useAddressContext = () => {
 };
 export const AddressProvider = ({ addressType, addressFormFields = [], useUser, children }) => {
     const { isLoggedIn } = useUser();
-    const { fillCheckoutData, fillCart, isCheckoutPage } = useCart();
+    const { fillCheckoutData, fillCart, isCheckoutPage, checkoutData } = useCart();
     const [addressLoading, setAddressLoading] = useState(false);
     const [addresses, setAddresses] = useState(addressType ? { billing: [], shipping: [] } : []);
     const [selectedAddresses, setSelectedAddresses] = useState(addressType ? { billing: {}, shipping: {} } : {});
@@ -35,6 +35,14 @@ export const AddressProvider = ({ addressType, addressFormFields = [], useUser,
             });
         }
     }, [isLoggedIn]);
+    useEffect(() => {
+        if (checkoutData?.addressId) {
+            let storageSelectedAddress = addresses.find((item) => item.id == checkoutData.addressId);
+            if (storageSelectedAddress) {
+                setSelectedAddresses(storageSelectedAddress);
+            }
+        }
+    }, [checkoutData?.addressId, addresses]);
     const createAddress = async ({ data, type }) => {
         return await api.post('addresses', data).then((res) => {
             if (addressType) {

package/dist/modules/cart/CartItems/Item/index.js

@@ -5,10 +5,10 @@ import { useAccountContext } from '../../../../AccountProvider';
 import { useCart } from '../../CartProvider';
 import { defaultIconGift } from '../util';
 const Item = memo(({ data, remove, select, isLast, actions, isCheckout }) => {
-    const { checkoutData, setCheckGift } = useCart();
+    const { checkoutData, setGifts } = useCart();
     const { currency, handleProductClick } = useAccountContext();
     const { translate } = useTranslation();
-    return !isCheckout || checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion?.id && item.id == data.product.id)?.qty !== 0 ? (React.createElement("div", { className: `item-wrap user-select-none` },
+    return !isCheckout || checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion?.id && item.productId == data.product.id)?.qty !== 0 ? (React.createElement("div", { className: `item-wrap user-select-none` },
         React.createElement("div", { className: 'line' }),
         React.createElement("div", { className: `item-inner-wrapper` },
             React.createElement("div", { className: `col-item tl-col-1 col-item-1` },
@@ -27,10 +27,10 @@ const Item = memo(({ data, remove, select, isLast, actions, isCheckout }) => {
                         "\u00A0",
                         React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: data.size }))) : data.product.short_info_2 ? (React.createElement("div", { className: `right-second-item-wrap` },
                         React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1`, text: data.product.short_info_2 }))) : null)),
-            React.createElement("div", { className: `col-item tl-col-2` }, select && !data.is_gift ? (React.createElement("div", { className: `select-and-out-of-stock-wrap` }, !data.product.out_of_stock ? (React.createElement(AccountCounter, { productId: data.product.id })) : (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: 'account.general_actions.outOfStock' })))) : data.is_gift && !isCheckout ? (React.createElement("div", { className: 'wrapper-gift-button' }, checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion.id && item.id == data.product.id)?.qty !== 0 ? (React.createElement(React.Fragment, null,
-                React.createElement(AccountCounter, { maxQty: data?.qty, productId: data.product.id, promotionId: data.appliedPromotion.id, isGift: data.is_gift, qty: checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion.id && item.id == data.product.id)?.qty }))) : (React.createElement(React.Fragment, null,
+            React.createElement("div", { className: `col-item tl-col-2` }, select && !data.is_gift ? (React.createElement("div", { className: `select-and-out-of-stock-wrap` }, !data.product.out_of_stock ? (React.createElement(AccountCounter, { productId: data.product.id })) : (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: 'account.general_actions.outOfStock' })))) : data.is_gift && !isCheckout ? (React.createElement("div", { className: 'wrapper-gift-button' }, checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion.id && item.productId == data.product.id)?.qty !== 0 ? (React.createElement(React.Fragment, null,
+                React.createElement(AccountCounter, { maxQty: data?.qty, productId: data.product.id, promotionId: data.appliedPromotion.id, isGift: data.is_gift, qty: checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion.id && item.productId == data.product.id)?.qty }))) : (React.createElement(React.Fragment, null,
                 React.createElement(AccountButton, { className: `button-gift`, text: 'account.general_actions.restore', onClick: () => {
-                        setCheckGift({ promotionId: data.appliedPromotion.id, productId: data.product.id, qty: data?.qty });
+                        setGifts({ promotionId: data.appliedPromotion.id, productId: data.product.id, qty: data?.qty });
                     } }))))) : (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: data?.qty }))),
             React.createElement("div", { className: `col-item tl-col-3 col-item-3 nowrap` }, (data.product.sale_price || data.product.discount) && !data.is_gift ? (React.createElement("div", null,
                 React.createElement(Text, { className: `account-p account-p3 account-font-bold account-secondary-color2 align-right cart-sale-price`, text: handlePriceCheckFunc(data.product.sale_price, currency) }),
@@ -48,11 +48,6 @@ const Item = memo(({ data, remove, select, isLast, actions, isCheckout }) => {
                     React.createElement("div", { className: `flex-end-wrap` }, (data.sale_total || data.product.discount) && !data.is_gift ? (React.createElement("div", null,
                         React.createElement(Text, { className: `account-p account-p3 account-font-bold account-secondary-color2 align-right cart-sale-total`, text: handlePriceCheckFunc(data.sale_total, currency) }),
                         React.createElement("div", { className: 'wrapper-discount' },
-                            data.product.discount ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text` },
-                                data.product.discount.value,
-                                data.product.discount.type === 'percentage' ? '%' : ` ${currency}`,
-                                "\u00A0",
-                                React.createElement("span", { className: 'lowercase' }, translate('account.order_balance.discount')))) : null,
                             React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through value align-right cart-total1`, text: handlePriceCheckFunc(data.total, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 align-right cart-total2` }, data.is_gift ? (React.createElement(React.Fragment, null,
                         handlePriceCheckFunc(0, currency),
                         React.createElement("span", { className: 'gift-name-text' }, data.appliedPromotion.name))) : (handlePriceCheckFunc(data.total, currency))))),

package/dist/modules/cart/CartItems/ItemMobile/index.js

@@ -7,8 +7,8 @@ import { defaultIconGift } from '../util';
 const ItemMobile = memo(({ data, select, isCheckout }) => {
     const { handleProductClick, currency } = useAccountContext();
     const { translate } = useTranslation();
-    const { checkoutData, setCheckGift } = useCart();
-    return !isCheckout || checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion?.id && item.id == data.product.id)?.qty !== 0 ? (React.createElement(React.Fragment, null,
+    const { checkoutData, setGifts } = useCart();
+    return !isCheckout || checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion?.id && item.productId == data.product.id)?.qty !== 0 ? (React.createElement(React.Fragment, null,
         React.createElement("div", { className: `mobile-cart-item-wrap user-select-none` },
             React.createElement("div", { className: `mobile-cart-item-inner-wrap` },
                 React.createElement("div", { className: `mobile-image-wrap` },
@@ -39,9 +39,7 @@ const ItemMobile = memo(({ data, select, isCheckout }) => {
                             handlePriceCheckFunc(0, currency),
                             React.createElement("span", { className: 'gift-name-text' }, data.appliedPromotion.name))) : (handlePriceCheckFunc(data.total, currency)))),
                         select && !data.is_gift ? (React.createElement("div", { className: `inner-container` }, !data.product.out_of_stock ? (React.createElement(AccountCounter, { productId: data.product.id })) : (React.createElement("div", { className: `in-block` },
-                            React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: 'account.general_actions.outOfStock' }))))) : data.is_gift && !isCheckout ? (React.createElement("div", { className: 'wrapper-gift-button' }, checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion.id && item.id == data.product.id)?.qty !== 0 ? (React.createElement(AccountCounter, { maxQty: data?.qty, productId: data.product.id, promotionId: data.appliedPromotion.id, isGift: data.is_gift, qty: checkoutData.checkGift.find((item) => item.promotionId == data.appliedPromotion.id && item.id == data.product.id)?.qty })) : (React.createElement(AccountButton, { className: `capitalize button-gift`, text: 'account.general_actions.restore', onClick: () => {
-                                setCheckGift({ promotionId: data.appliedPromotion.id, productId: data.product.id, qty: data?.qty });
-                            } })))) : (React.createElement("div", { className: `in-block` },
+                            React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: 'account.general_actions.outOfStock' }))))) : data.is_gift && !isCheckout ? (React.createElement("div", { className: 'wrapper-gift-button' }, checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion.id && item.productId == data.product.id)?.qty !== 0 ? (React.createElement(AccountCounter, { maxQty: data?.qty, productId: data.product.id, promotionId: data.appliedPromotion.id, isGift: data.is_gift, qty: checkoutData.gifts.find((item) => item.promotionId == data.appliedPromotion.id && item.productId == data.product.id)?.qty })) : (React.createElement(AccountButton, { className: `capitalize button-gift`, text: 'account.general_actions.restore', onClick: () => setGifts({ promotionId: data.appliedPromotion.id, productId: data.product.id, qty: data?.qty }) })))) : (React.createElement("div", { className: `in-block` },
                             React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1 mobile-quantity-with-symbol2` },
                                 translate('account.order_balance.quantity'),
                                 ":"),

package/dist/modules/cart/CartProvider.d.ts

@@ -5,15 +5,17 @@ interface CartItem {
 }
 interface CheckoutData {
     addressId: number | null;
-    useBalance: boolean | null;
+    useBalance: number | string | null;
     note: string;
     paymentType: string;
-    checkGift: {
-        id: number;
-        qty: number;
+    gifts: {
+        productId: number;
         promotionId: number;
+        qty: number;
     }[];
     card_id: number | null;
+    excludedPromotions: any[];
+    promotion_code: string | null;
 }
 interface CartState {
     itemsCount: number;
@@ -27,10 +29,10 @@ interface CartState {
     shippingCostValue: number | null;
     hasFreeGift: boolean | null;
     giftThresholdRemaining: number | null;
-    useBalance: boolean | null;
+    useBalance: number | string | null;
     discount: number | null;
-    usePromotion?: string | null;
     appliedPromotions: any[];
+    promotion_code: string | null;
 }
 interface CartContextType extends CartState {
     getCart: (params?: Record<string, any>) => Promise<void>;
@@ -47,11 +49,14 @@ interface CartContextType extends CartState {
     fillCheckoutData: (key: string, value: any) => void;
     handleCheckout: () => Promise<void>;
     fillCart: (key: string, value: any) => void;
-    setCheckGift: ({ promotionId, qty, productId }: {
+    setGifts: ({ promotionId, qty, productId }: {
         promotionId: number;
         qty: number;
         productId: number;
     }) => void;
+    togglePromotion: ({ promotionId }: {
+        promotionId: any;
+    }) => void;
     checkoutBtnDisabled: boolean;
     isCheckoutPage: boolean;
 }

package/dist/modules/cart/CartProvider.js

@@ -21,6 +21,7 @@ export const CartProvider = ({ useUser, children }) => {
         hasFreeGift: null,
         giftThresholdRemaining: null,
         useBalance: null,
+        promotion_code: null,
         discount: null,
         appliedPromotions: [],
     });
@@ -29,8 +30,10 @@ export const CartProvider = ({ useUser, children }) => {
         useBalance: null,
         note: '',
         paymentType: user?.payment_method || 'cash_on_delivery',
-        checkGift: [],
+        gifts: [],
         card_id: null,
+        excludedPromotions: [],
+        promotion_code: null
     };
     const [checkoutData, setCheckoutData] = useState(initialCheckoutData);
     const checkoutDataRef = useRef(checkoutData);
@@ -45,8 +48,16 @@ export const CartProvider = ({ useUser, children }) => {
         return cookieCart ? JSON.parse(cookieCart) : [];
     };
     const setResourceDecorator = (data) => {
-        setCartState((prev) => ({ ...prev, ...data, loading: false }));
-        setCheckoutData((prev) => ({ ...prev, useBalance: data.useBalance }));
+        setCartState((prev) => ({
+            ...prev,
+            ...data,
+            loading: false
+        }));
+        setCheckoutData((prev) => ({
+            ...prev,
+            useBalance: data.useBalance,
+            promotion_code: data.promotion_code
+        }));
     };
     const isCheckoutPage = useMemo(() => {
         return window.location.href.includes('checkout');
@@ -58,7 +69,7 @@ export const CartProvider = ({ useUser, children }) => {
         return isCheckoutPage || isCartPage ? 'cart' : 'cart-summary';
     }, [isCheckoutPage, isCartPage]);
     const getCart = async (params = {}) => {
-        let newParams = { ...cleanObject(params), ...cleanObject(checkoutDataRef.current), cartResourceType };
+        let newParams = { ...cleanObject(checkoutDataRef.current), ...params, cartResourceType };
         if (isLoggedIn) {
             const { data } = await api.get({ url: 'cart', lang: selectedLang, params: newParams });
             setResourceDecorator(data);
@@ -110,6 +121,7 @@ export const CartProvider = ({ useUser, children }) => {
         }
     };
     const clearCart = async () => {
+        sessionStorage.clear();
         if (isLoggedIn) {
             const { data } = await api.post('clear-cart');
             setResourceDecorator(data);
@@ -119,34 +131,33 @@ export const CartProvider = ({ useUser, children }) => {
             await getCart();
         }
     };
-    // TODO: make router push func
     const reorder = async (orderId) => {
         const { data } = await api.post('reorder', { orderId });
         setResourceDecorator(data);
-        // router.push(getLangPath('cart'));
+        window.location.href = `/${selectedLang}/cart`;
     };
     //! Has gift from data
     useEffect(() => {
-        if (cartState.items.length && !checkoutData.checkGift.length) {
+        if (cartState.items.length && !checkoutData.gifts?.length) {
             setCheckoutData((prev) => {
-                const checkGift = cartState.items
+                const gifts = cartState.items
                     .filter((item) => item.is_gift)
                     .map((item) => ({
-                    id: item.product.id,
-                    qty: item.qty,
+                    productId: item.product.id,
                     promotionId: item.appliedPromotion.id,
+                    qty: item.qty,
                 }));
-                return { ...prev, checkGift };
+                return { ...prev, gifts };
             });
         }
     }, [cartState.items]);
     //! Set gift Select
-    const setCheckGift = useCallback(({ promotionId, qty, productId }) => {
+    const setGifts = useCallback(({ promotionId, qty, productId }) => {
         setCheckoutData((prev) => ({
             ...prev,
-            checkGift: [
-                ...prev.checkGift.map((item) => {
-                    if (item.promotionId == promotionId && item.id == productId) {
+            gifts: [
+                ...prev.gifts.map((item) => {
+                    if (item.promotionId == promotionId && item.productId == productId) {
                         return { ...item, qty };
                     }
                     else {
@@ -156,6 +167,21 @@ export const CartProvider = ({ useUser, children }) => {
             ],
         }));
     }, []);
+    const togglePromotion = ({ promotionId }) => {
+        setCheckoutData((prev) => {
+            const excludedPromotions = prev.excludedPromotions;
+            const index = excludedPromotions.indexOf(promotionId);
+            if (index > -1) {
+                excludedPromotions.splice(index, 1);
+            }
+            else {
+                excludedPromotions.push(promotionId);
+            }
+            const updatedData = { ...prev, excludedPromotions };
+            getCart(updatedData);
+            return updatedData;
+        });
+    };
     const checkoutBtnDisabled = useMemo(() => {
         let isDisabled = false;
         if (isCheckoutPage && isNumeric(checkoutData.paymentType)) {
@@ -188,11 +214,8 @@ export const CartProvider = ({ useUser, children }) => {
     const handleCheckout = async () => {
         let data = cleanObject({ ...checkoutData });
         //! Check gift
-        if (data.checkGift) {
-            data.checkGift = data.checkGift.filter((item) => item.qty);
-            if (!data.checkGift.length)
-                delete data.checkGift;
-        }
+        if (!data.gifts.length)
+            delete data.gifts;
         if (isNumeric(checkoutData.paymentType)) {
             data.paymentType = 'credit_card';
             data.card_id = Number(checkoutData.paymentType);
@@ -234,7 +257,8 @@ export const CartProvider = ({ useUser, children }) => {
             fillCheckoutData,
             handleCheckout,
             fillCart,
-            setCheckGift,
+            setGifts,
+            togglePromotion,
             checkoutBtnDisabled,
             isCheckoutPage,
         } },

package/dist/modules/checkout/ThankYouTemplate/index.js

@@ -7,6 +7,7 @@ import { useAccountContext } from '../../../AccountProvider';
 import { confirmImage } from './icons';
 import AccountContainer from '../../../components/AccountContainer';
 import { useCart } from '../../cart';
+// TODO: maybe need change order number translate
 const ThankYouTemplate = ({ orderNumber, thankIcon }) => {
     const { shopUrl } = useAccountContext();
     const { translate } = useTranslation();

package/dist/modules/order/OrderedItems/Item/index.js

@@ -26,29 +26,22 @@ const Item = memo(({ data }) => {
                         React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: data.product.short_info_2 }))) : null)),
             React.createElement("div", { className: `col-item tl-col-2` },
                 React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: data?.qty })),
-            React.createElement("div", { className: `col-item tl-col-3 col-item-3 nowrap` }, (data.sale_price || data.product?.discount) && !data.is_gift ? (React.createElement("div", null,
+            React.createElement("div", { className: `col-item tl-col-3 col-item-3 nowrap` }, data.sale_price && !data.is_gift ? (React.createElement("div", null,
                 React.createElement(Text, { className: `account-p account-p3 account-font-bold account-secondary-color2 align-right order-sale-price`, text: handlePriceCheckFunc(data.sale_price, currency) }),
                 React.createElement("div", { className: 'wrapper-discount' },
-                    data.product?.discount ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text` },
-                        data.product.discount,
-                        data.product?.discount_type === 'percentage' ? '%' : ` ${currency}`,
+                    data.appliedPromotion ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text` },
+                        data.appliedPromotion.value,
+                        data.appliedPromotion.type === 'percentage' ? '%' : ` ${currency}`,
                         "\u00A0",
                         React.createElement("span", { className: 'lowercase' }, translate('account.order_balance.discount')))) : null,
                     React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through value align-right order-price1`, text: handlePriceCheckFunc(data.price, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 align-right order-sale-price` }, data.is_gift ? (React.createElement(React.Fragment, null,
                 handlePriceCheckFunc(0, currency),
-                React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name || 'Karlen'))) : (handlePriceCheckFunc(data.price, currency))))),
+                React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name))) : (handlePriceCheckFunc(data.price, currency))))),
             React.createElement("div", { className: `col-item tl-col-4 col-item-4 nowrap price-block` },
                 React.createElement("div", { className: `col-item-inner-wrap` },
-                    React.createElement("div", { className: `flex-end-wrap` }, (data.sale_total || data.product?.discount) && !data.is_gift ? (React.createElement("div", null,
+                    React.createElement("div", { className: `flex-end-wrap` }, data.sale_total && !data.is_gift ? (React.createElement("div", null,
                         React.createElement(Text, { className: `account-p account-p3 account-font-bold account-secondary-color2 align-right order-sale-price`, text: handlePriceCheckFunc(data.sale_total, currency) }),
                         React.createElement("div", { className: 'wrapper-discount' },
-                            data.product?.discount ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text` },
-                                data.product.discount,
-                                data.product?.discount_type === 'percentage' ? '%' : ` ${currency}`,
-                                "\u00A0",
-                                React.createElement("span", { className: 'lowercase' }, translate('account.order_balance.discount')))) : null,
-                            React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through value align-right order-price1`, text: handlePriceCheckFunc(data.total, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 align-right order-sale-price` }, data.is_gift ? (React.createElement(React.Fragment, null,
-                        handlePriceCheckFunc(0, currency),
-                        React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name || 'Karlen'))) : (handlePriceCheckFunc(data.total, currency))))))))));
+                            React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through value align-right order-price1`, text: handlePriceCheckFunc(data.total, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 align-right order-sale-price` }, handlePriceCheckFunc(data.total, currency)))))))));
 });
 export default Item;

package/dist/modules/order/OrderedItems/ItemMobile/index.js

@@ -31,27 +31,22 @@ const ItemMobile = memo(({ data }) => {
                     React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: data?.qty })),
                 React.createElement("div", { className: `mobile-price-wrap nowrap` },
                     React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: `account.order_balance.price` }),
-                    (data.sale_price || data.product?.discount) && !data.is_gift ? (React.createElement(React.Fragment, null,
+                    data.sale_price && !data.is_gift ? (React.createElement(React.Fragment, null,
                         React.createElement(Text, { className: `account-p account-p3 account-font-medium account-secondary-color2 sale-price`, text: handlePriceCheckFunc(data.sale_price, currency) }),
                         React.createElement("div", { className: 'wrapper-discount' },
-                            data.product?.discount ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text-mobile` },
-                                data.product.discount,
-                                data.product?.discount_type === 'percentage' ? '%' : ` ${currency}`,
+                            data.appliedPromotion ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text-mobile` },
+                                data.appliedPromotion.value,
+                                data.appliedPromotion.type === 'percentage' ? '%' : ` ${currency}`,
                                 "\u00A0",
                                 React.createElement("span", { className: 'lowercase' }, translate('account.order_balance.discount')))) : null,
                             React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through price1`, text: handlePriceCheckFunc(data.price, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1 price2` }, data.is_gift ? (React.createElement(React.Fragment, null,
                         handlePriceCheckFunc(0, currency),
-                        React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name || 'Karlen'))) : (handlePriceCheckFunc(data.price, currency))))),
+                        React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name))) : (handlePriceCheckFunc(data.price, currency))))),
                 React.createElement("div", { className: `mobile-total-price-wrap nowrap` },
                     React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1`, text: `account.order_balance.total` }),
-                    (data.sale_total || data.product?.discount) && !data.is_gift ? (React.createElement(React.Fragment, null,
+                    data.sale_total && !data.is_gift ? (React.createElement(React.Fragment, null,
                         React.createElement(Text, { className: `account-p account-p3 account-font-medium account-secondary-color2 sale-total`, text: handlePriceCheckFunc(data.sale_total, currency) }),
                         React.createElement("div", { className: 'wrapper-discount' },
-                            data.product?.discount ? (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color2 discount-text-mobile` },
-                                data.product.discount,
-                                data.product?.discount_type === 'percentage' ? '%' : ` ${currency}`,
-                                "\u00A0",
-                                React.createElement("span", { className: 'lowercase' }, translate('account.order_balance.discount')))) : null,
                             React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through total1`, text: handlePriceCheckFunc(data.total, currency) })))) : (React.createElement(Text, { className: `account-p account-p3 account-font-medium account-primary-color1 total2`, text: handlePriceCheckFunc(data.is_gift ? 0 : data.total, currency) }, data.is_gift ? (React.createElement(React.Fragment, null,
                         handlePriceCheckFunc(0, currency),
                         React.createElement("span", { className: 'gift-name-text' }, data?.appliedPromotion?.name || 'Karlen'))) : (handlePriceCheckFunc(data.total, currency)))))))));

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@weareconceptstudio/account",
-	"version": "0.6.1",
+	"version": "0.6.3",
 	"description": "Concept Studio Account",
 	"author": "Concept Studio",
 	"license": "ISC",
 	"main": "dist/index.js",
+	"sideEffects": false,
 	"files": [
 		"dist"
 	],