@weareconceptstudio/account 0.1.4 → 0.1.5

package/dist/components/{ui/CustomCheckbox → CustomCheckbox}/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text } from '@weareconceptstudio/core';
 //* Icons
-import { CheckboxCheckedIcon, CheckboxIcon } from '../../../utils/icons';
+import { CheckboxCheckedIcon, CheckboxIcon } from '../../utils/icons';
 //* Style
 import CustomCheckboxStyle from './style';
 const CustomCheckbox = ({ hide, setHide, isText = true }) => {

package/dist/components/TotalCheckout/index.js

@@ -1,7 +1,7 @@
 import React, { memo, useMemo } from 'react';
 import { Text } from '@weareconceptstudio/core';
 import { useAccountContext } from '../../AccountProvider';
-import AccountButton from '../ui/AccountButton';
+import AccountButton from '../AccountButton';
 import { Input, Radio } from '@weareconceptstudio/form';
 //* Utils
 import { handlePriceCheckFunc, numToLocalString } from '../../utils/_functions';

package/dist/components/index.d.ts

@@ -1,8 +1,8 @@
-export * from './ui';
-export * from './cart';
+export { default as AccountButton } from './AccountButton';
+export { default as CustomCheckbox } from './CustomCheckbox';
 export { default as FormInputCode } from './FormInputCode';
+export { default as Pagination } from './Pagination';
+export { default as Sequence } from './Sequence';
 export { default as TotalCheckout } from './TotalCheckout';
-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 WarningMessage } from './WarningMessage';
+export { default as WarningMessageForPopup } from './WarningMessageForPopup';

package/dist/components/index.js

@@ -1,8 +1,8 @@
-export * from './ui';
-export * from './cart';
+export { default as AccountButton } from './AccountButton';
+export { default as CustomCheckbox } from './CustomCheckbox';
 export { default as FormInputCode } from './FormInputCode';
+export { default as Pagination } from './Pagination';
+export { default as Sequence } from './Sequence';
 export { default as TotalCheckout } from './TotalCheckout';
-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 WarningMessage } from './WarningMessage';
+export { default as WarningMessageForPopup } from './WarningMessageForPopup';

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export * from './AccountProvider';
-export * from './modules';
-export * from './templates';
 export * from './components';
+export * from './modules';

package/dist/index.js

@@ -1,5 +1,4 @@
 'use client';
 export * from './AccountProvider';
-export * from './modules';
-export * from './templates';
 export * from './components';
+export * from './modules';

package/dist/{templates → modules/account}/AccountSettingsTemplate/AccountInfo/index.js

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { Text, useUi } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
-import { AccountButton, WarningMessageForPopup } from '../../../components';
+import { AccountButton, WarningMessageForPopup } from '../../../../components';
 import AccountInfoStyle from './style';
 import { defaultDisplayFields, defaultFormFields } from './utils';
 const AccountInfo = ({ user, onAccountUpdate, displayFields = defaultDisplayFields, formFields = defaultFormFields }) => {

package/dist/{templates → modules/account}/AccountSettingsTemplate/AccountPassword/index.js

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { useUi, Text } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
-import { AccountButton, WarningMessageForPopup } from '../../../components';
+import { AccountButton, WarningMessageForPopup } from '../../../../components';
 import AccountPasswordStyle from './style';
 import { defaultFormFields } from './utils';
 const AccountPassword = ({ formFields = defaultFormFields, onPasswordUpdate }) => {

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

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

package/dist/modules/account/index.js

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

package/dist/modules/address/AddressForm/index.js

@@ -2,7 +2,7 @@ import React, { memo as Memo, useState, useCallback } from 'react';
 import { useUi, Text } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
 import { useAddressContext } from '../AddressProvider';
-import AccountButton from '../../../components/ui/AccountButton';
+import AccountButton from '../../../components/AccountButton';
 //* Icons
 import { CheckboxIcon, CheckboxCheckedIcon } from '../../../utils/icons';
 //* Style

package/dist/modules/address/AddressItem/index.js

@@ -3,13 +3,13 @@ import { Text, useUi } from '@weareconceptstudio/core';
 import { useAddressContext } from '../AddressProvider';
 //* Components
 import AddressForm from '../AddressForm';
-import AccountButton from '../../../components/ui/AccountButton';
-import WarningMessageForPopup from '../../../components/ui/WarningMessageForPopup';
+import AccountButton from '../../../components/AccountButton';
+import WarningMessageForPopup from '../../../components/WarningMessageForPopup';
 //* Style
 import AddressItemStyle from './style';
 const AddressItem = ({ type, title, data, checkout_review, select_address, onClick }) => {
     const { openPopup } = useUi();
-    const { deleteAddress, selectedAddresses, setSelectedAddresses } = useAddressContext();
+    const { deleteAddress, selectedAddresses, selectAddress } = useAddressContext();
     //! Handle Popups
     const handleDeletePopup = useCallback(() => {
         openPopup(React.createElement(WarningMessageForPopup, { isDelete: true, title: 'deleteAddressMessage', description: 'confirmDeleteAddress', onRemove: () => deleteAddress(data.id, data.type) }), { className: 'messagePopup' });
@@ -29,7 +29,7 @@ const AddressItem = ({ type, title, data, checkout_review, select_address, onCli
                     React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1`, text: `${data.city}` }),
                     React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1 phone col-wrap`, text: `${data.phone}` })),
                 data.is_default ? (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 margin-style is-default`, text: `${type === 'shipping' ? 'defaultShippingAddress' : type == 'billing' ? 'defaultBillingAddress' : 'defaultAddress'}` })) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 margin-style opacity-zero`, text: `empty` })),
-                select_address && (React.createElement("div", { className: `circle-selected-wrap cursor-pointer ${selectedAddresses?.id === data.id ? 'active' : ''}`, onClick: () => setSelectedAddresses(data) },
+                select_address && (React.createElement("div", { className: `circle-selected-wrap cursor-pointer ${selectedAddresses?.id === data.id ? 'active' : ''}`, onClick: () => selectAddress(data) },
                     React.createElement("svg", { version: '1.1', viewBox: '0 0 32 32', xmlns: 'http://www.w3.org/2000/svg', className: `checkbox-icon ${selectedAddresses?.id === data.id ? 'selected' : 'note-selected'}` },
                         React.createElement("path", { d: 'M13.345 30.462c-1.062 0-1.859-0.531-2.39-1.328l-9.56-16.996c-0.797-1.328-0.266-2.921 1.062-3.718 1.328-0.531 2.921 0 3.718 1.328l7.436 13.012 12.481-20.183c0.797-1.328 2.39-1.593 3.718-0.797s1.593 2.39 0.797 3.718l-14.871 23.635c-0.531 0.797-1.328 1.328-2.39 1.328z' }))))),
             !checkout_review && (React.createElement("div", { className: `edit-remove-wrapper` },

package/dist/modules/address/AddressProvider.d.ts

@@ -1,8 +1,9 @@
 export function useAddressContext(): any;
-export function AddressProvider({ addressType, addressFormFields, useUser, children }: {
+export function AddressProvider({ addressType, addressFormFields, useUser, useCart, children }: {
     addressType: any;
     addressFormFields?: any[];
     useUser: any;
+    useCart: any;
     children: any;
 }): React.JSX.Element;
 import React from 'react';

package/dist/modules/address/AddressProvider.js

@@ -5,19 +5,21 @@ export const useAddressContext = () => {
     const context = useContext(AddressContext);
     return context;
 };
-export const AddressProvider = ({ addressType, addressFormFields = [], useUser, children }) => {
+export const AddressProvider = ({ addressType, addressFormFields = [], useUser, useCart, children }) => {
     const userContext = useUser();
+    const cartContext = useCart();
     const [addressLoading, setAddressLoading] = useState(true);
     const [addresses, setAddresses] = useState(addressType ? { billing: [], shipping: [] } : []);
     const [selectedAddresses, setSelectedAddresses] = useState(addressType ? { billing: {}, shipping: {} } : {});
+    const [checkoutAddressId, setCheckoutAddressId] = useState(null);
     const hasAddressType = useMemo(() => {
         return !!addressType;
     }, [addressType]);
     const hasCheckoutAddress = useMemo(() => {
         if (hasAddressType) {
-            return !(addresses.shipping.length > 0 && addresses.billing.length > 0);
+            return addresses.shipping.length > 0 && addresses.billing.length > 0;
         }
-        return !(addresses.length > 0);
+        return addresses.length > 0;
     }, [hasAddressType, addresses]);
     useEffect(() => {
         if (userContext.isLoggedIn) {
@@ -54,6 +56,11 @@ export const AddressProvider = ({ addressType, addressFormFields = [], useUser,
             setAddresses(res.data);
         });
     };
+    const selectAddress = (data) => {
+        setSelectedAddresses(data);
+        setCheckoutAddressId(data.id);
+        cartContext.getCart({ addressId: data.id });
+    };
     return (React.createElement(AddressContext.Provider, { value: {
             addressLoading,
             hasAddressType,
@@ -65,5 +72,7 @@ export const AddressProvider = ({ addressType, addressFormFields = [], useUser,
             selectedAddresses,
             setSelectedAddresses,
             hasCheckoutAddress,
+            selectAddress,
+            checkoutAddressId,
         } }, children));
 };

package/dist/modules/address/AddressWrap/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { useAddressContext } from '../AddressProvider';
 import { Text, useUi } from '@weareconceptstudio/core';
-import AccountButton from '../../../components/ui/AccountButton';
+import AccountButton from '../../../components/AccountButton';
 import EmptyAddress from '../EmptyAddress';
 import AddressItem from '../AddressItem';
 import AddressForm from '../AddressForm';

package/dist/modules/address/SelectAddress/index.js

@@ -3,7 +3,7 @@ import { useAddressContext } from '../AddressProvider';
 import { Text, useUi } from '@weareconceptstudio/core';
 import AddressForm from '../AddressForm';
 import AddressItem from '../AddressItem';
-import AccountButton from '../../../components/ui/AccountButton';
+import AccountButton from '../../../components/AccountButton';
 import SelectAddressStyle from './style';
 const SelectAddress = ({ type, title }) => {
     const { openPopup } = useUi();

package/dist/modules/address/SelectShippingBillingPopup/index.js

@@ -2,7 +2,7 @@ import React, { memo as Memo } from 'react';
 import { useUi } from '@weareconceptstudio/core';
 //* Components
 import SelectAddress from '../SelectAddress';
-import AccountButton from '../../../components/ui/AccountButton';
+import AccountButton from '../../../components/AccountButton';
 //* Style
 import SelectShippingBillingStyle from './style';
 const SelectShippingBillingPopup = Memo(({ title, type }) => {

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

@@ -3,6 +3,7 @@ export { default as AddressesTemplate } from "./AddressesTemplate";
 export { default as AddressWrap } from "./AddressWrap";
 export { default as AddressForm } from "./AddressForm";
 export { default as AddressItem } from "./AddressItem";
+export { default as SelectAddress } from "./SelectAddress";
 export { default as ShippingBillingInfo } from "./ShippingBillingInfo";
 export { default as ShippingBillingForm } from "./ShippingBillingForm";
 export { default as SelectShippingBilling } from "./SelectShippingBilling";

package/dist/modules/address/index.js

@@ -3,6 +3,7 @@ export { default as AddressesTemplate } from './AddressesTemplate';
 export { default as AddressWrap } from './AddressWrap';
 export { default as AddressForm } from './AddressForm';
 export { default as AddressItem } from './AddressItem';
+export { default as SelectAddress } from './SelectAddress';
 export { default as ShippingBillingInfo } from './ShippingBillingInfo';
 export { default as ShippingBillingForm } from './ShippingBillingForm';
 export { default as SelectShippingBilling } from './SelectShippingBilling';

package/dist/{templates → modules/auth}/ForgotPasswordTemplate/index.js

@@ -1,7 +1,7 @@
 import React, { useRef, useState } from 'react';
 import { Text, Link, Page } from '@weareconceptstudio/core';
 import { Form, Input } from '@weareconceptstudio/form';
-import { AccountButton, WarningMessage } from '../../components';
+import { AccountButton, WarningMessage } from '../../../components';
 import ForgotPasswordTemplateStyle from './style';
 const ForgotPasswordTemplate = ({ onFormSubmit }) => {
     //! Ref

package/dist/{templates → modules/auth}/ResetPasswordTemplate/index.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Text, Link, Page } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
-import { AccountButton } from '../../components';
+import { AccountButton } from '../../../components';
 import ResetPasswordTemplateStyle from './style';
 import { defaultFormFields } from './utils';
 // @ts-ignore

package/dist/{templates → modules/auth}/SignInTemplate/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, Link, Page } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
-import { AccountButton } from '../../components';
+import { AccountButton } from '../../../components';
 import SignInTemplateStyle from './style';
 import { defaultFormFields } from './utils';
 // @ts-ignore

package/dist/{templates → modules/auth}/SignUpTemplate/index.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Text, useTranslation, Link, Page } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
-import { AccountButton, CustomCheckbox } from '../../components';
+import { AccountButton, CustomCheckbox } from '../../../components';
 import SignUpTemplateStyle from './style';
 import { defaultFormFields } from './utils';
 // @ts-ignore

package/dist/{templates → modules/auth}/VerifyEmailAddressTemplate/index.js

@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useRef } from 'react';
 import { Page, Text, useTranslation, useUi } from '@weareconceptstudio/core';
 //* Components
-import { AccountButton, FormInputCode, WarningMessage, WarningMessageForPopup } from '../../components';
+import { AccountButton, FormInputCode, WarningMessage, WarningMessageForPopup } from '../../../components';
 //* Style
 import VerifyEmailAddressTemplateStyle from './style';
 //TODO: router.push, searchparams, user, verifyAccount, resendVerifyCode, removeAccount, prevRoute

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

@@ -0,0 +1,5 @@
+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';

package/dist/modules/auth/index.js

@@ -0,0 +1,5 @@
+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';

package/dist/{templates → modules/cart}/CartTemplate/index.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { Container, Page } from '@weareconceptstudio/core';
-import { EmptyCart, TotalCheckout, AccountButton, SimpleCartItems } from '../../components';
-import { useAccountContext } from '../../AccountProvider';
+import { SimpleCartItems, EmptyCart } from '..';
+import { TotalCheckout, AccountButton } from '../../../components';
+import { useAccountContext } from '../../../AccountProvider';
 //* Styles
 import CartTemplateStyle from './style';
 const CartTemplate = ({ items, itemsCount, shippingCost, loading, children, subtotal, total, actions, btnDisabled, checkoutUrl = '/checkout/' }) => {

package/dist/{components → modules}/cart/EmptyCart/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Text } from '@weareconceptstudio/core';
-import AccountButton from '../../ui/AccountButton';
+import { AccountButton } from '../../../components';
 //* Style
 import EmptyCartStyle from './style';
 const EmptyCart = ({ shoppingUrl }) => {

package/dist/{components/cart/Items/Simple → modules/cart/SimpleItems}/Item/index.js

@@ -1,8 +1,8 @@
 import React, { memo, useMemo } from 'react';
 import { Image, Text } from '@weareconceptstudio/core';
 import { Select } from '@weareconceptstudio/form';
-import { handlePriceCheckFunc } from '../../../../../utils/_functions';
-import Button from '../../../../ui/AccountButton';
+import { handlePriceCheckFunc } from '../../../../utils/_functions';
+import { AccountButton } from '../../../../components';
 //TODO: Fake
 const pathname = '/cart/';
 const Item = memo(({ data, remove, select, isLast, actions, maxQty, currency }) => {
@@ -22,7 +22,7 @@ const Item = memo(({ data, remove, select, isLast, actions, maxQty, currency })
                 React.createElement("div", { className: `image-wrapper` },
                     React.createElement(Image, { src: data.product.image.src, alt: data.product.image.alt })),
                 React.createElement("div", { className: `col-1-right-wrap` },
-                    React.createElement(Button, { text: data.product.name, btnType: `green-large-text`, url: `/menu/${data.product.slug}`, className: `capitalize title-btn`, target: pathname === '/cart/' || pathname === '/checkout' ? '_blank' : '_self' }),
+                    React.createElement(AccountButton, { text: data.product.name, btnType: `green-large-text`, url: `/menu/${data.product.slug}`, className: `capitalize title-btn`, target: pathname === '/cart/' || pathname === '/checkout' ? '_blank' : '_self' }),
                     React.createElement("div", { className: `right-first-item-wrap` },
                         React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1`, text: data.product.short_info_1 })),
                     React.createElement("div", { className: `right-second-item-wrap` },
@@ -40,7 +40,7 @@ const Item = memo(({ data, remove, select, isLast, actions, maxQty, currency })
                         React.createElement(Text, { className: `account-p account-p3 account-font-bold account-secondary-color2 align-right cart-sale-total`, text: `${data.sale_total} ${currency}` }),
                         React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through value align-right cart-total1`, text: handlePriceCheckFunc(data.product.price * data.qty, currency) }))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 align-right cart-total2`, text: `${data.total} ${currency}` }))),
                     React.createElement("div", { className: `favorite-and-remove-wrap` }, remove && (React.createElement("div", { className: `remove-btn-wrap` },
-                        React.createElement(Button, { text: 'remove', btnType: `green-small-text`, className: 'cart-remove-btn', onClick: () => actions.delete({ productId: data.product?.id }) }))))))),
+                        React.createElement(AccountButton, { text: 'remove', btnType: `green-small-text`, className: 'cart-remove-btn', onClick: () => actions.delete({ productId: data.product?.id }) }))))))),
         isLast ? React.createElement("div", { className: 'line' }) : null));
 });
 export default Item;

package/dist/{components/cart/Items/Simple → modules/cart/SimpleItems}/ItemMobile/index.js

@@ -1,8 +1,8 @@
 import React, { memo, useMemo } from 'react';
 import { Image, Text } from '@weareconceptstudio/core';
 import { Select } from '@weareconceptstudio/form';
-import Button from '../../../../ui/AccountButton';
-import { handlePriceCheckFunc } from '../../../../../utils/_functions';
+import { AccountButton } from '../../../../components';
+import { handlePriceCheckFunc } from '../../../../utils/_functions';
 //TODO: Fake
 const pathname = '/cart/';
 const ItemMobile = memo(({ data, remove, select, actions, maxQty, currency }) => {
@@ -21,7 +21,7 @@ const ItemMobile = memo(({ data, remove, select, actions, maxQty, currency }) =>
                 React.createElement("div", { className: `mobile-image-wrap` },
                     React.createElement(Image, { src: data.product.image.src, alt: data.product.image.alt })),
                 React.createElement("div", { className: `mobile-info-wrap` },
-                    React.createElement(Button, { text: data.product.name, btnType: `green-large-text`, url: `/menu/${data.product.slug}`, className: `capitalize mobile-info-wrap-title`, target: pathname === '/cart/' || pathname === '/checkout/' ? '_blank' : '_self' }),
+                    React.createElement(AccountButton, { text: data.product.name, btnType: `green-large-text`, url: `/menu/${data.product.slug}`, className: `capitalize mobile-info-wrap-title`, target: pathname === '/cart/' || pathname === '/checkout/' ? '_blank' : '_self' }),
                     React.createElement("div", { className: 'mobile-info-item' },
                         React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color1 mobile-short-info1`, text: data.product.short_info_1 })),
                     React.createElement("div", { className: 'mobile-info-item' },
@@ -48,7 +48,7 @@ const ItemMobile = memo(({ data, remove, select, actions, maxQty, currency }) =>
                             React.createElement(Text, { className: `account-p account-p3 account-font-regular account-primary-color2 line-through mobile-total-price`, text: handlePriceCheckFunc(data.product.price * data.qty, currency) }))) : (React.createElement(Text, { className: `account-p account-p3 account-font-bold account-primary-color1 mobile-total-price2`, text: `${data.total} ${currency}` }))))),
             pathname === '/cart/' && (React.createElement("div", { className: `edit-remove-favorite-mobile-wrap` },
                 React.createElement("div", { className: 'empty' }),
-                React.createElement("div", { className: `favorite-remove-mobile-wrap` }, remove && (React.createElement(Button, { text: 'remove', btnType: `green-small-text`, onClick: () => actions.delete({ productId: data.product.id }) })))))),
+                React.createElement("div", { className: `favorite-remove-mobile-wrap` }, remove && (React.createElement(AccountButton, { text: 'remove', btnType: `green-small-text`, onClick: () => actions.delete({ productId: data.product.id }) })))))),
         React.createElement("div", { className: 'line' })));
 });
 export default ItemMobile;

package/dist/{components/cart/Items/Simple → modules/cart/SimpleItems}/index.js

@@ -3,8 +3,8 @@ import { Text, useUi } from '@weareconceptstudio/core';
 //* Components
 import Item from './Item';
 import ItemMobile from './ItemMobile';
-import Button from '../../../ui/AccountButton';
-import { useAccountContext } from '../../../../AccountProvider';
+import { AccountButton } from '../../../components';
+import { useAccountContext } from '../../../AccountProvider';
 //* Style
 import CartItemsStyle from './style';
 const CartItems = memo(({ data, className, title, smallFontSize, additionalParameters, actions }) => {
@@ -35,7 +35,7 @@ const CartItems = memo(({ data, className, title, smallFontSize, additionalParam
     return (React.createElement(CartItemsStyle, { className: className || '' },
         additionalParameters.edit.list ? (React.createElement("div", { className: `title-edit-wrapper` },
             React.createElement(Text, { className: `account-p ${smallFontSize ? 'account-p2' : 'account-p1'} account-font-bold account-primary-color1 cart-items-title2-version`, text: title }),
-            React.createElement(Button, { url: '/cart/', text: `editCart`, btnType: `green-small-text`, className: 'cart-items-edit-btn' }))) : (React.createElement(Text, { className: `account-p ${smallFontSize ? 'account-p2' : 'account-p1'} account-font-bold account-primary-color1 cart-items-title1-version`, text: title })),
+            React.createElement(AccountButton, { url: '/cart/', text: `editCart`, btnType: `green-small-text`, className: 'cart-items-edit-btn' }))) : (React.createElement(Text, { className: `account-p ${smallFontSize ? 'account-p2' : 'account-p1'} account-font-bold account-primary-color1 cart-items-title1-version`, text: title })),
         additionalParameters.horizontalLine ? React.createElement("div", { className: `order-items-line` }) : null,
         orderStore));
 });

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

@@ -0,0 +1,3 @@
+export { default as EmptyCart } from './EmptyCart';
+export { default as SimpleCartItems } from './SimpleItems';
+export { default as CartTemplate } from './CartTemplate';

package/dist/modules/cart/index.js

@@ -0,0 +1,3 @@
+export { default as EmptyCart } from './EmptyCart';
+export { default as SimpleCartItems } from './SimpleItems';
+export { default as CartTemplate } from './CartTemplate';

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

@@ -1,7 +1,6 @@
 import React from 'react';
-import { SelectShippingBilling, useAddressContext } from '../../../modules';
-import SelectAddress from '../../../modules/address/SelectAddress';
-import { SimpleCartItems } from '../../../components';
+import { SelectShippingBilling, useAddressContext, SelectAddress } from '../../../address';
+import { SimpleCartItems } from '../../../cart';
 const StepReview = ({ items }) => {
     const { hasAddressType } = useAddressContext();
     return (React.createElement("div", { className: 'step-review' },

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,10 +1,9 @@
 'use client';
 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, useCart } = useAccountContext();

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/{templates → modules/order}/OrderHistoryTemplate/index.js

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