@riosst100/pwa-marketplace 2.9.3 → 2.9.5

package/src/overwrites/venia-ui/lib/components/AccountInformationPage/DeleteAccount.js

@@ -2,49 +2,17 @@ import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import Button from '@magento/venia-ui/lib/components/Button';
 import { Message } from '@magento/venia-ui/lib/components/Field';
-
-// Dummy mutation placeholder
-const useDeleteAccount = () => {
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState(null);
-    const [success, setSuccess] = useState(false);
-
-    const deleteAccount = async () => {
-        setLoading(true);
-        setError(null);
-        setSuccess(false);
-        // Simulate API call
-        setTimeout(() => {
-            setLoading(false);
-            setSuccess(true);
-        }, 1500);
-    };
-
-    return {
-        loading,
-        error,
-        success,
-        deleteAccount
-    };
-};
+import { useDeleteAccount } from '@riosst100/pwa-marketplace/src/talons/AccountInformationPage/useDeleteAccount';
 
 const DeleteAccount = () => {
     const [confirm, setConfirm] = useState(false);
     const [agreement, setAgreement] = useState(false);
-    const { loading, error, success, deleteAccount } = useDeleteAccount();
+
+    const { loading, error, success, handleDeleteAccount } = useDeleteAccount();
+
     const handleChange = (event) => {
         setAgreement(event.target.checked);
     }
-    if (success) {
-        return (
-            <Message type="success">
-                <FormattedMessage
-                    id="deleteAccount.success"
-                    defaultMessage="Your account has been deleted."
-                />
-            </Message>
-        );
-    }
 
     return (
         <div style={{ marginTop: 32, border: '1px solid #f87171', padding: 24, borderRadius: 8, background: '#fef2f2' }}>
@@ -91,7 +59,7 @@ const DeleteAccount = () => {
                     <Button
                         priority="high"
                         disabled={loading || !agreement}
-                        onClick={deleteAccount}
+                        onClick={handleDeleteAccount}
                         style={{ marginRight: 8, textTransform: 'none' }}
                     >
                         <FormattedMessage

package/src/overwrites/venia-ui/lib/components/Adapter/adapter.js

@@ -61,8 +61,10 @@ const Adapter = props => {
     useEffect(() => {
         if (!websiteCodeInUrl && getWebsiteByUserIp) {
             setVerifyUserIp(false);
+
+            const search = location.search;
             
-            const query = new URLSearchParams(location.search);
+            const query = new URLSearchParams(search);
             const isAccessBaseWebsite = query.get('access_base_website') || (
                 storage.getItem('access_base_website') || null
             );

package/src/overwrites/venia-ui/lib/components/Breadcrumbs/breadcrumbs.js

@@ -26,7 +26,9 @@ const Breadcrumbs = props => {
 
     const talonProps = useBreadcrumbs({ categoryId });
 
-    const DELIMITER = <ArrowRight2 size={13} className='inline-flex text-gray-200' />
+    const location = useLocation(); // ✅ dipindah ke atas sebelum conditional return
+
+    const DELIMITER = <ArrowRight2 size={13} className='inline-flex text-gray-200' />;
 
     const {
         currentCategory,
@@ -39,13 +41,15 @@ const Breadcrumbs = props => {
 
     // For all links generate a fragment like "/ Text"
     const links = useMemo(() => {
-        return normalizedData.map(({ text, path }) => {
+        return normalizedData.map(({ text, path }, index) => {
             if (text == "dCollectible Card Games") {
                 return '';
             }
-            
+
+            console.log('index', index);
+
             return (
-                <Fragment key={text}>
+                <Fragment key={index}>
                     <span className={classes.divider}>{DELIMITER}</span>
                     <Link
                         className={classes.link}
@@ -74,14 +78,11 @@ const Breadcrumbs = props => {
         );
     }
 
-    const filterBreadcrumbsElement = [];
+    let filterBreadcrumbsElement = []; // ✅ pakai let agar bisa di-push
 
     const lastIndex = currentFilter ? currentFilter.length - 1 : 0;
-    // const filterpath = ;
-
-    const { search } = useLocation();
 
-    // const previousSearch = useRef(search);
+    const { search } = location;
 
     const removeShopbyParam = (url) => {
         const urlParts = url.split("?"); // Pisahkan URL sebelum dan sesudah tanda tanya
@@ -98,78 +99,72 @@ const Breadcrumbs = props => {
 
         // Gabungkan URL dasar dengan query string yang telah dimodifikasi
         return newQueryString ? `${baseUrl}?${newQueryString}` : baseUrl;
-    }
+    };
 
     const params = removeShopbyParam(search);
-    
+
     currentFilter && currentFilter.length && currentFilter.map((filter, index) => {
         currentProduct ? (
             filterBreadcrumbsElement.push(
-                <>
-                <span className={classes.divider}>{DELIMITER}</span>
-                <Link
-                    key={index}
-                    className={classes.link}
-                    to={resourceUrl('/'+currentCategoryPath)}
-                    onClick={handleClick}
-                >
-                    {filter.label}
-                </Link>
-                </>
-            )
-        ) : (
-            customPage ? (
-                filterBreadcrumbsElement.push(
-                    <>
+                <span key={index}>
                     <span className={classes.divider}>{DELIMITER}</span>
                     <Link
-                        key={index}
                         className={classes.link}
-                        to={resourceUrl('/'+currentCategoryPath+params)}
+                        to={resourceUrl('/' + currentCategoryPath)}
                         onClick={handleClick}
                     >
                         {filter.label}
                     </Link>
-                    </>
+                </span>
+            )
+        ) : (
+            customPage ? (
+                filterBreadcrumbsElement.push(
+                    <span key={index}>
+                        <span className={classes.divider}>{DELIMITER}</span>
+                        <Link
+                            className={classes.link}
+                            to={resourceUrl('/' + currentCategoryPath + params)}
+                            onClick={handleClick}
+                        >
+                            {filter.label}
+                        </Link>
+                    </span>
                 )
             ) : filterBreadcrumbsElement.push(
                 index == lastIndex ?
-                <>
-                    <span className={classes.divider}>{DELIMITER}</span>
-                    <span key={index} className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{filter.label}</span>
-                </> : <>
-                    <span className={classes.divider}>{DELIMITER}</span>
-                    <Link
-                        key={index}
-                        className={classes.link}
-                        to={resourceUrl('/'+currentCategoryPath+params)}
-                        onClick={handleClick}
-                    >
-                        {filter.label}
-                    </Link>
-                    </>
+                    <span key={index}>
+                        <span className={classes.divider}>{DELIMITER}</span>
+                        <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{filter.label}</span>
+                    </span> : <span key={index}>
+                        <span className={classes.divider}>{DELIMITER}</span>
+                        <Link
+                            className={classes.link}
+                            to={resourceUrl('/' + currentCategoryPath + params)}
+                            onClick={handleClick}
+                        >
+                            {filter.label}
+                        </Link>
+                    </span>
             )
         );
     });
 
-    // If we have a "currentProduct" it means we're on a PDP so we want the last
-    // category text to be a link. If we don't have a "currentProduct" we're on
-    // a category page so it should be regular text.
     const currentCategoryLink = currentCategory == "dCollectible Card Games" ? '' : (customPage || currentProduct || currentFilter && currentFilter.length ? (
         <>
-        <span className={classes.divider}>{DELIMITER}</span>
-        <Link
-            className={classes.link}
-            to={'/'+resourceUrl(currentCategoryPath)}
-            onClick={handleClick}
-        >
-            {currentCategory}
-        </Link>
+            <span className={classes.divider}>{DELIMITER}</span>
+            <Link
+                className={classes.link}
+                to={'/' + resourceUrl(currentCategoryPath)}
+                onClick={handleClick}
+            >
+                {currentCategory}
+            </Link>
         </>
     ) : (
         <>
-        <span className={classes.divider}>{DELIMITER}</span>
-        <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{currentCategory}</span>
+            <span className={classes.divider}>{DELIMITER}</span>
+            <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{currentCategory}</span>
         </>
     ));
 
@@ -186,7 +181,7 @@ const Breadcrumbs = props => {
             <span className={classes.text}>{customPage}</span>
         </Fragment>
     ) : null;
-    
+
     return (
         <div className={classes.root} aria-live="polite" aria-busy="false">
             <Link className={classes.link} to="/">

package/src/overwrites/venia-ui/lib/components/CheckoutPage/OrderConfirmationPage/orderConfirmationPage.js

@@ -15,9 +15,27 @@ const OrderConfirmationPage = props => {
     const { data, orderNumber } = props;
     const { formatMessage } = useIntl();
 
-    const talonProps = useOrderConfirmationPage({
-        data
-    });
+    // If data is not available (e.g., after external redirect without snapshot),
+    // render a minimal confirmation page.
+    const hasData =
+        data &&
+        data.cart &&
+        Array.isArray(data.cart.shipping_addresses) &&
+        data.cart.shipping_addresses.length > 0;
+
+    const talonProps = hasData
+        ? useOrderConfirmationPage({ data })
+        : { flatData: {
+              city: '',
+              country: '',
+              email: '',
+              firstname: '',
+              lastname: '',
+              postcode: '',
+              region: '',
+              shippingMethod: '',
+              street: []
+          }, isSignedIn: true };
 
     const { flatData, isSignedIn } = talonProps;
 
@@ -33,7 +51,7 @@ const OrderConfirmationPage = props => {
         street
     } = flatData;
 
-    const streetRows = street.map((row, index) => {
+    const streetRows = (street || []).map((row, index) => {
         return (
             <span key={index} className={classes.addressStreet}>
                 {row}
@@ -51,6 +69,13 @@ const OrderConfirmationPage = props => {
                 behavior: 'smooth'
             });
         }
+        // Best-effort cleanup of stored snapshot after successful view
+        try {
+            if (orderNumber) {
+                const key = `orderConfirmationSnapshot:${orderNumber}`;
+                globalThis.localStorage && globalThis.localStorage.removeItem(key);
+            }
+        } catch (_) {}
     }, []);
 
     const createAccountForm = !isSignedIn ? (
@@ -109,42 +134,46 @@ const OrderConfirmationPage = props => {
                         </Link>
                     </div>
                 </div>
-                <div className={classes.detailsGrid}>
-                    <div className={classes.card}>
-                        <div
-                            data-cy="OrderConfirmationPage-shippingInfoHeading"
-                            className={classes.cardHeading}
-                        >
-                            <FormattedMessage
-                                id={'global.shippingInformation'}
-                                defaultMessage={'Shipping Information'}
-                            />
+                {hasData ? (
+                    <>
+                        <div className={classes.detailsGrid}>
+                            <div className={classes.card}>
+                                <div
+                                    data-cy="OrderConfirmationPage-shippingInfoHeading"
+                                    className={classes.cardHeading}
+                                >
+                                    <FormattedMessage
+                                        id={'global.shippingInformation'}
+                                        defaultMessage={'Shipping Information'}
+                                    />
+                                </div>
+                                <div className={classes.shippingInfo}>
+                                    <span className={classes.email}>{email}</span>
+                                    <span className={classes.name}>{nameString}</span>
+                                    {streetRows}
+                                    <span className={classes.addressAdditional}>
+                                        {additionalAddressString}
+                                    </span>
+                                </div>
+                            </div>
+                            <div className={classes.card}>
+                                <div
+                                    data-cy="OrderConfirmationPage-shippingMethodHeading"
+                                    className={classes.cardHeading}
+                                >
+                                    <FormattedMessage
+                                        id={'global.shippingMethod'}
+                                        defaultMessage={'Shipping Method'}
+                                    />
+                                </div>
+                                <div className={classes.shippingMethod}>{shippingMethod}</div>
+                            </div>
                         </div>
-                        <div className={classes.shippingInfo}>
-                            <span className={classes.email}>{email}</span>
-                            <span className={classes.name}>{nameString}</span>
-                            {streetRows}
-                            <span className={classes.addressAdditional}>
-                                {additionalAddressString}
-                            </span>
+                        <div className={classes.itemsReview}>
+                            <ItemsReview data={data} />
                         </div>
-                    </div>
-                    <div className={classes.card}>
-                        <div
-                            data-cy="OrderConfirmationPage-shippingMethodHeading"
-                            className={classes.cardHeading}
-                        >
-                            <FormattedMessage
-                                id={'global.shippingMethod'}
-                                defaultMessage={'Shipping Method'}
-                            />
-                        </div>
-                        <div className={classes.shippingMethod}>{shippingMethod}</div>
-                    </div>
-                </div>
-                <div className={classes.itemsReview}>
-                    <ItemsReview data={data} />
-                </div>
+                    </>
+                ) : null}
                 <div
                     data-cy="OrderConfirmationPage-additionalText"
                     className={classes.additionalText}
@@ -181,6 +210,6 @@ OrderConfirmationPage.propTypes = {
         additionalText: string,
         sidebarContainer: string
     }),
-    data: object.isRequired,
+    data: object,
     orderNumber: string
 };

package/src/overwrites/venia-ui/lib/components/CheckoutPage/checkoutPage.js

@@ -125,7 +125,7 @@ const CheckoutPage = props => {
             defaultMessage: 'Checkout'
         });
 
-    if (orderNumber && orderDetailsData) {
+    if (orderNumber) {
         return (
             <OrderConfirmationPage
                 data={orderDetailsData}

package/src/overwrites/venia-ui/lib/components/OrderHistoryPage/orderHistoryPage.js

@@ -10,7 +10,7 @@ import { Form } from 'informed';
 
 import { useToasts } from '@magento/peregrine/lib/Toasts';
 import OrderHistoryContextProvider from '@magento/peregrine/lib/talons/OrderHistoryPage/orderHistoryContext';
-import { useOrderHistoryPage } from '@magento/peregrine/lib/talons/OrderHistoryPage/useOrderHistoryPage';
+import { useOrderHistoryPage } from '@riosst100/pwa-marketplace/src/talons/OrderHistoryPage/useOrderHistoryPage';
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import Button from '@magento/venia-ui/lib/components/Button';
@@ -24,6 +24,7 @@ import OrderRow from './orderRow';
 import ResetButton from './resetButton';
 import { SearchNormal } from 'iconsax-react';
 import cn from 'classnames';
+import Pagination from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Pagination';
 
 const errorIcon = (
     <Icon
@@ -46,7 +47,8 @@ const OrderHistoryPage = props => {
         isLoadingWithoutData,
         orders,
         pageInfo,
-        searchText
+        searchText,
+        pageControl
     } = talonProps;
     const [, { addToast }] = useToasts();
     const { formatMessage } = useIntl();
@@ -205,6 +207,12 @@ const OrderHistoryPage = props => {
                     <span className={classes.pageInfo}>{pageInfoLabel}</span>
                 </div>
                 {pageContents}
+                {/* Pagination Controls */}
+                <div className="mt-4">
+                    {pageControl?.totalPages > 1 ? (
+                        <Pagination pageControl={pageControl} />
+                    ) : null}
+                </div>
                 {loadMoreButton}
             </div>
         </OrderHistoryContextProvider >