@weareconceptstudio/account 0.6.1 → 0.6.2

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/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) }),

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,13 +5,13 @@ 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;
 }
@@ -27,7 +27,7 @@ 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[];
@@ -47,7 +47,7 @@ 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;

package/dist/modules/cart/CartProvider.js

@@ -29,7 +29,7 @@ export const CartProvider = ({ useUser, children }) => {
         useBalance: null,
         note: '',
         paymentType: user?.payment_method || 'cash_on_delivery',
-        checkGift: [],
+        gifts: [],
         card_id: null,
     };
     const [checkoutData, setCheckoutData] = useState(initialCheckoutData);
@@ -110,6 +110,7 @@ export const CartProvider = ({ useUser, children }) => {
         }
     };
     const clearCart = async () => {
+        sessionStorage.clear();
         if (isLoggedIn) {
             const { data } = await api.post('clear-cart');
             setResourceDecorator(data);
@@ -119,34 +120,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 {
@@ -188,11 +188,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 +231,7 @@ export const CartProvider = ({ useUser, children }) => {
             fillCheckoutData,
             handleCheckout,
             fillCart,
-            setCheckGift,
+            setGifts,
             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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@weareconceptstudio/account",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"description": "Concept Studio Account",
 	"author": "Concept Studio",
 	"license": "ISC",