@weareconceptstudio/account 0.1.3 → 0.1.5

package/dist/{templates → modules/checkout}/CheckoutTemplate/StepShipping/index.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { AddressItem, ShippingBillingForm, useAddressContext } from '../../../modules';
-import { CustomCheckbox } from '../../../components';
+import { AddressItem, ShippingBillingForm, useAddressContext } from '../../../address';
+import { CustomCheckbox } from '../../../../components';
 const StepShipping = ({ firstStepFormRef }) => {
     const [hide, setHide] = useState();
     const { hasAddressType } = useAddressContext();

package/dist/{templates → modules/checkout}/CheckoutTemplate/index.js

@@ -1,12 +1,13 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { api, Container, Page } from '@weareconceptstudio/core';
-import { Sequence, TotalCheckout } from '../../components';
-import { useAddressContext } from '../../modules';
+import { Sequence, TotalCheckout } from '../../../components';
+import { useAddressContext } from '../../address';
 import StepReview from './StepReview';
 import StepShipping from './StepShipping';
 //* Styles
 import CheckoutTemplateStyle from './style';
 const CheckoutTemplate = ({ itemsCount, items, total, subtotal, shippingCost }) => {
+    const { checkoutAddressId } = useAddressContext();
     const [checkoutData, setCheckoutData] = useState({
         note: '',
         paymentType: 'cash_on_delivery',
@@ -20,14 +21,19 @@ const CheckoutTemplate = ({ itemsCount, items, total, subtotal, shippingCost })
     const { hasCheckoutAddress, addressLoading } = useAddressContext();
     const firstStepFormRef = useRef();
     const checkStep = {
-        isShipping: hasCheckoutAddress,
-        isReview: !hasCheckoutAddress,
+        isShipping: !hasCheckoutAddress,
+        isReview: hasCheckoutAddress,
     };
     const handleCheckoutFirstStep = () => {
         firstStepFormRef.current.submit();
     };
     const handleCheckoutSecondStep = async () => {
-        return await api.post('checkout', checkoutData).then((res) => {
+        return await api
+            .post('checkout', {
+            ...checkoutData,
+            addressId: checkoutAddressId,
+        })
+            .then((res) => {
             if (res.redirect_url) {
                 window.location.href = res.redirect_url;
             }

package/dist/{templates → modules/checkout}/ThankYouTemplate/index.js

@@ -1,14 +1,17 @@
 'use client';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Page, Text, Container, useTranslation } from '@weareconceptstudio/core';
-import { Sequence } from '../../components';
-import Button from '../../components/ui/AccountButton';
+import { Sequence, Button } from '../../../components';
 import ThankYouMessageStyle from './style';
-import { useAccountContext } from '../../AccountProvider';
+import { useAccountContext } from '../../../AccountProvider';
 import { confirmImage } from './icons';
 const ThankYouTemplate = ({ orderNumber }) => {
-    const { shopUrl } = useAccountContext();
+    const { shopUrl, useCart } = useAccountContext();
     const { translate } = useTranslation();
+    const cart = useCart();
+    useEffect(() => {
+        cart.clearCart();
+    }, []);
     return (React.createElement(Page, { className: 'use-account' },
         React.createElement(ThankYouMessageStyle, null,
             React.createElement(Container, null,

package/dist/modules/checkout/index.d.ts

@@ -0,0 +1,2 @@
+export { default as CheckoutTemplate } from './CheckoutTemplate';
+export { default as ThankYouTemplate } from './ThankYouTemplate';

package/dist/modules/checkout/index.js

@@ -0,0 +1,2 @@
+export { default as CheckoutTemplate } from './CheckoutTemplate';
+export { default as ThankYouTemplate } from './ThankYouTemplate';

package/dist/modules/index.d.ts

@@ -1 +1,6 @@
+export * from "./account";
 export * from "./address";
+export * from "./auth";
+export * from "./cart";
+export * from "./checkout";
+export * from "./order";

package/dist/modules/index.js

@@ -1 +1,6 @@
+export * from './account';
 export * from './address';
+export * from './auth';
+export * from './cart';
+export * from './checkout';
+export * from './order';

package/dist/{components → modules/order}/EmptyOrders/index.js

@@ -1,7 +1,7 @@
 import React, { memo as Memo } from 'react';
-import { useAccountContext } from '../../AccountProvider';
+import { useAccountContext } from '../../../AccountProvider';
 import { Text } from '@weareconceptstudio/core';
-import AccountButton from '../ui/AccountButton';
+import { AccountButton } from '../../../components';
 import EmptyOrdersStyle from './style';
 const EmptyOrders = Memo(() => {
     const { shopUrl } = useAccountContext();

package/dist/{components → modules/order}/OrderDetails/index.js

@@ -1,11 +1,9 @@
 import React, { memo } from 'react';
 import { Text, useTranslation } from '@weareconceptstudio/core';
-//* Utils
-import { handlePriceCheckFunc, numToLocalString } from '../../utils/_functions';
-//* Style
+import { useAccountContext } from '../../../AccountProvider';
+import { handlePriceCheckFunc, numToLocalString } from '../../../utils/_functions';
 import OrderDetailsStyle from './style';
-import { useAccountContext } from '../../AccountProvider';
-const OrderDetails = memo(({ className, status, date, delivery_date, orderNumber, itemsCount, total, shippingCost }) => {
+const OrderDetails = memo(({ className, status, date, orderNumber, itemsCount, total, shippingCost }) => {
     const { translate } = useTranslation();
     const { currency } = useAccountContext();
     return (React.createElement(OrderDetailsStyle, { className: `${className || ''}` },
@@ -21,11 +19,6 @@ const OrderDetails = memo(({ className, status, date, delivery_date, orderNumber
                 translate('orderDate'),
                 ":"),
             React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1 value`, text: date })),
-        React.createElement("div", { className: `order-detail-item-wrap` },
-            React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1` },
-                translate('deliverDate'),
-                ":"),
-            React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1 value`, text: delivery_date })),
         React.createElement("div", { className: `order-detail-item-wrap` },
             React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1` },
                 translate('orderNumber'),

package/dist/modules/order/OrderHistoryTemplate/index.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import OrdersList from '../OrdersList';
+import OrderHistoryTemplateStyle from './style';
+const OrderHistoryTemplate = () => {
+    return (React.createElement(OrderHistoryTemplateStyle, null,
+        React.createElement(OrdersList, null)));
+};
+export default OrderHistoryTemplate;

package/dist/{templates → modules/order}/OrderIndividualTemplate/index.js

@@ -1,15 +1,17 @@
 import React, { useState, useEffect } from 'react';
 import { api } from '@weareconceptstudio/core';
+import { useAccountContext } from '../../../AccountProvider';
 //* Components
-import { AccountButton } from '../../components';
-import OrderDetails from '../../components/OrderDetails';
-import OrderedItems from '../../components/OrderedItems';
-import ShippingBillingInfo from '../../modules/address/ShippingBillingInfo';
+import { AccountButton } from '../../../components';
+import OrderDetails from '../OrderDetails';
+import OrderedItems from '../OrderedItems';
+import { ShippingBillingInfo } from '../../address';
 //* Style
 import OrderIndividualTemplateStyle from './style';
-// TODO: delivery date
 // TODO: status change
 const OrderIndividualTemplate = ({ uniqueKey }) => {
+    const { useCart } = useAccountContext();
+    const cartContext = useCart();
     const [data, setData] = useState();
     const [loading, setLoading] = useState(true);
     useEffect(() => {
@@ -18,9 +20,14 @@ const OrderIndividualTemplate = ({ uniqueKey }) => {
             setLoading(false);
         });
     }, [uniqueKey]);
+    const handleReorder = () => {
+        cartContext.reorder(data.id);
+    };
     return !loading ? (React.createElement(OrderIndividualTemplateStyle, null,
         React.createElement("div", { className: `order-info-wrap` },
             React.createElement(AccountButton, { text: `backToList`, btnType: `green-large-text`, url: '/account/order-history/' }),
+            React.createElement("div", null,
+                React.createElement(AccountButton, { btnType: `purple-text`, text: 'reorder', onClick: handleReorder })),
             React.createElement("div", { className: `details-shipping-billing-wrap` },
                 React.createElement(OrderDetails, { className: `col-50`, ...data }),
                 React.createElement(ShippingBillingInfo, { className: `col-50`, billing_address: data?.billingAddress, shipping_address: data?.shippingAddress })),

package/dist/{components → modules/order}/OrderedItems/index.js

@@ -1,11 +1,8 @@
 import React, { useMemo } from 'react';
 import { Image, Text, useUi } from '@weareconceptstudio/core';
-//* Utils
-import { handlePriceCheckFunc } from '../../utils/_functions';
-import { useAccountContext } from '../../AccountProvider';
-//* Components
-import AccountButton from '../ui/AccountButton';
-//* Styles
+import { handlePriceCheckFunc } from '../../../utils/_functions';
+import { useAccountContext } from '../../../AccountProvider';
+import { AccountButton } from '../../../components';
 import OrderedItemsStyle from './style';
 // TODO: product url
 const OrderedItems = ({ data: items, status }) => {

package/dist/{components → modules/order}/OrdersList/OrderItem/index.js

@@ -1,10 +1,8 @@
 import React, { memo as Memo } from 'react';
 import { Text } from '@weareconceptstudio/core';
-//* Utils
-import { handlePriceCheckFunc } from '../../../utils/_functions';
-//* Components
-import AccountButton from '../../ui/AccountButton';
-import { useAccountContext } from '../../../AccountProvider';
+import { useAccountContext } from '../../../../AccountProvider';
+import { handlePriceCheckFunc } from '../../../../utils/_functions';
+import { AccountButton } from '../../../../components';
 const OrderItem = Memo(({ data }) => {
     const { currency } = useAccountContext();
     return (React.createElement("div", { className: `order-table-item-wrap` },

package/dist/modules/order/OrdersList/index.d.ts

@@ -0,0 +1,3 @@
+export default OrdersList;
+declare function OrdersList(): React.JSX.Element;
+import React from 'react';

package/dist/{components → modules/order}/OrdersList/index.js

@@ -1,24 +1,33 @@
-import React, { useMemo, useCallback } from 'react';
-import { createQueryString, Text, useTranslation, useUi } from '@weareconceptstudio/core';
+import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import { Text, useTranslation, useUi, api } from '@weareconceptstudio/core';
 //* Utils
-import { handlePriceCheckFunc } from '../../utils/_functions';
+import { handlePriceCheckFunc } from '../../../utils/_functions';
 //* Components
+import { Pagination, AccountButton } from '../../../components';
 import OrderItem from './OrderItem';
-import Pagination from '../ui/Pagination';
-import AccountButton from '../ui/AccountButton';
+import EmptyOrders from '../EmptyOrders';
 //* Style
 import OrdersListStyle from './style';
-// TODO: status change
-const OrdersList = ({ data, total, pageSize, router, pathname, searchParams }) => {
+const OrdersList = () => {
     const { translate } = useTranslation();
     const { winWidth } = useUi();
-    const onFilterChange = useCallback((type, typeId, multiple = false) => {
-        const params = createQueryString({ searchParams, type, typeId, multiple });
-        if (type === 'page') {
-            window.scrollTo({ top: 0, behavior: 'smooth' });
-        }
-        router.push(pathname + '?' + params, { scroll: false });
-    }, [searchParams]);
+    const [loading, setLoading] = useState(true);
+    const [data, setData] = useState([]);
+    const [currentPage, setCurrentPage] = useState(1);
+    const [pagination, setPagination] = useState({
+        total: 0,
+        pageSize: 0,
+    });
+    const getOrders = useCallback((page) => {
+        api.get({ url: 'orders', params: { page } }).then((res) => {
+            setData(res.orders);
+            setPagination(res.pagination);
+            setLoading(false);
+        });
+    }, []);
+    useEffect(() => {
+        getOrders(currentPage);
+    }, [currentPage]);
     //! List Store
     const listStore = useMemo(() => {
         return winWidth >= 768 ? (React.createElement("div", { className: `order-table-wrap` },
@@ -59,11 +68,11 @@ const OrdersList = ({ data, total, pageSize, router, pathname, searchParams }) =
                         React.createElement(AccountButton, { text: 'viewOrder', btnType: `green-small-text`, url: `/account/order-history${item.id}` })))));
         })));
     }, [winWidth, data]);
-    return (React.createElement(OrdersListStyle, null,
+    return !loading && data.length > 0 ? (React.createElement(OrdersListStyle, null,
         React.createElement(Text, { className: `account-p account-p1 account-font-bold account-primary-color1`, text: 'orderHistory' }),
         React.createElement("div", { className: `order-history-line` }),
         listStore,
         React.createElement("div", { className: `pagination-wrap` },
-            React.createElement(Pagination, { total: total, pageSize: pageSize, onChange: (page) => onFilterChange('page', page) }))));
+            React.createElement(Pagination, { activePageState: currentPage, ...pagination, onChange: (page) => setCurrentPage(page) })))) : !loading ? (React.createElement(EmptyOrders, null)) : null;
 };
 export default OrdersList;

package/dist/modules/order/index.d.ts

@@ -0,0 +1,6 @@
+export { default as EmptyOrders } from './EmptyOrders';
+export { default as OrderDetails } from './OrderDetails';
+export { default as OrderedItems } from './OrderedItems';
+export { default as OrdersList } from './OrdersList';
+export { default as OrderHistoryTemplate } from './OrderHistoryTemplate';
+export { default as OrderIndividualTemplate } from './OrderIndividualTemplate';

package/dist/modules/order/index.js

@@ -0,0 +1,6 @@
+export { default as EmptyOrders } from './EmptyOrders';
+export { default as OrderDetails } from './OrderDetails';
+export { default as OrderedItems } from './OrderedItems';
+export { default as OrdersList } from './OrdersList';
+export { default as OrderHistoryTemplate } from './OrderHistoryTemplate';
+export { default as OrderIndividualTemplate } from './OrderIndividualTemplate';

package/dist/translations/en.d.ts

@@ -166,5 +166,6 @@ declare const _default: {
     confirmMessageTitle: string;
     confirmMessageDesc: string;
     review: string;
+    reorder: string;
 };
 export default _default;

package/dist/translations/en.js

@@ -178,4 +178,5 @@ export default {
     confirmMessageTitle: 'Thank you for shopping with us!',
     confirmMessageDesc: 'You will receive a confirmation email with details of your order.',
     review: 'Review',
+    reorder: 'Reorder',
 };

package/dist/translations/hy.d.ts

@@ -166,5 +166,6 @@ declare const _default: {
     confirmMessageTitle: string;
     confirmMessageDesc: string;
     review: string;
+    reorder: string;
 };
 export default _default;

package/dist/translations/hy.js

@@ -178,4 +178,5 @@ export default {
     confirmMessageTitle: 'Thank you for shopping with us!',
     confirmMessageDesc: 'You will receive a confirmation email with details of your order.',
     review: 'Review',
+    reorder: 'Reorder',
 };

package/dist/translations/index.d.ts

@@ -167,6 +167,7 @@ declare const _default: {
         confirmMessageTitle: string;
         confirmMessageDesc: string;
         review: string;
+        reorder: string;
     };
     hy: {
         editCart: string;
@@ -336,6 +337,7 @@ declare const _default: {
         confirmMessageTitle: string;
         confirmMessageDesc: string;
         review: string;
+        reorder: string;
     };
     ru: {
         editCart: string;
@@ -505,6 +507,7 @@ declare const _default: {
         confirmMessageTitle: string;
         confirmMessageDesc: string;
         review: string;
+        reorder: string;
     };
 };
 export default _default;

package/dist/translations/ru.d.ts

@@ -166,5 +166,6 @@ declare const _default: {
     confirmMessageTitle: string;
     confirmMessageDesc: string;
     review: string;
+    reorder: string;
 };
 export default _default;

package/dist/translations/ru.js

@@ -178,4 +178,5 @@ export default {
     confirmMessageTitle: 'Thank you for shopping with us!',
     confirmMessageDesc: 'You will receive a confirmation email with details of your order.',
     review: 'Review',
+    reorder: 'Reorder',
 };

package/package.json

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

package/dist/components/OrdersList/index.d.ts

@@ -1,10 +0,0 @@
-export default OrdersList;
-declare function OrdersList({ data, total, pageSize, router, pathname, searchParams }: {
-    data: any;
-    total: any;
-    pageSize: any;
-    router: any;
-    pathname: any;
-    searchParams: any;
-}): React.JSX.Element;
-import React from 'react';

package/dist/components/cart/index.d.ts

@@ -1,2 +0,0 @@
-export { default as EmptyCart } from './EmptyCart';
-export { default as SimpleCartItems } from './Items/Simple';

package/dist/components/cart/index.js

@@ -1,2 +0,0 @@
-export { default as EmptyCart } from './EmptyCart';
-export { default as SimpleCartItems } from './Items/Simple';

package/dist/components/ui/index.d.ts

@@ -1,6 +0,0 @@
-export { default as AccountButton } from './AccountButton';
-export { default as Sequence } from './Sequence';
-export { default as Pagination } from './Pagination';
-export { default as CustomCheckbox } from './CustomCheckbox';
-export { default as WarningMessage } from './WarningMessage';
-export { default as WarningMessageForPopup } from './WarningMessageForPopup';

package/dist/components/ui/index.js

@@ -1,6 +0,0 @@
-export { default as AccountButton } from './AccountButton';
-export { default as Sequence } from './Sequence';
-export { default as Pagination } from './Pagination';
-export { default as CustomCheckbox } from './CustomCheckbox';
-export { default as WarningMessage } from './WarningMessage';
-export { default as WarningMessageForPopup } from './WarningMessageForPopup';

package/dist/templates/OrderHistoryTemplate/index.js

@@ -1,20 +0,0 @@
-import React, { useEffect, useState } from 'react';
-//* Style
-import OrderHistoryTemplateStyle from './style';
-//* Components
-import { EmptyOrders, OrdersList } from '../../components';
-import { api } from '@weareconceptstudio/core';
-// TODO:
-const total = 0, pageSize = 0;
-const OrderHistoryTemplate = () => {
-    const [data, setData] = useState();
-    const [loading, setLoading] = useState(true);
-    useEffect(() => {
-        api.get({ url: 'orders' }).then((res) => {
-            setData(res.orders);
-            setLoading(false);
-        });
-    }, []);
-    return !loading ? (React.createElement(OrderHistoryTemplateStyle, null, data?.length > 0 ? (React.createElement(OrdersList, { data: data, total: total, pageSize: pageSize })) : (React.createElement(EmptyOrders, null)))) : null;
-};
-export default OrderHistoryTemplate;

package/dist/templates/index.d.ts

@@ -1,12 +0,0 @@
-export { default as SignInTemplate } from './SignInTemplate';
-export { default as SignUpTemplate } from './SignUpTemplate';
-export { default as ForgotPasswordTemplate } from './ForgotPasswordTemplate';
-export { default as ResetPasswordTemplate } from './ResetPasswordTemplate';
-export { default as VerifyEmailAddressTemplate } from './VerifyEmailAddressTemplate';
-export { default as AccountTemplate } from './AccountTemplate';
-export { default as AccountSettingsTemplate } from './AccountSettingsTemplate';
-export { default as OrderHistoryTemplate } from './OrderHistoryTemplate';
-export { default as OrderIndividualTemplate } from './OrderIndividualTemplate';
-export { default as CartTemplate } from './CartTemplate';
-export { default as CheckoutTemplate } from './CheckoutTemplate';
-export { default as ThankYouTemplate } from './ThankYouTemplate';

package/dist/templates/index.js

@@ -1,17 +0,0 @@
-// ======================== Authentication ======================== //
-export { default as SignInTemplate } from './SignInTemplate';
-export { default as SignUpTemplate } from './SignUpTemplate';
-export { default as ForgotPasswordTemplate } from './ForgotPasswordTemplate';
-export { default as ResetPasswordTemplate } from './ResetPasswordTemplate';
-export { default as VerifyEmailAddressTemplate } from './VerifyEmailAddressTemplate';
-// ======================== Account ======================== //
-export { default as AccountTemplate } from './AccountTemplate';
-export { default as AccountSettingsTemplate } from './AccountSettingsTemplate';
-export { default as OrderHistoryTemplate } from './OrderHistoryTemplate';
-export { default as OrderIndividualTemplate } from './OrderIndividualTemplate';
-// ======================== Cart ======================== //
-export { default as CartTemplate } from './CartTemplate';
-// ======================== Checkout ======================== //
-export { default as CheckoutTemplate } from './CheckoutTemplate';
-// ======================== Thank you ======================== //
-export { default as ThankYouTemplate } from './ThankYouTemplate';