@riosst100/pwa-marketplace 3.3.3 → 3.3.5

package/i18n/id_ID.json

@@ -546,5 +546,12 @@
     "messages.loginRequired": "Silakan masuk ke akun Anda untuk mengirim pesan ke seller.",
     "messages.messageSent": "Pesan berhasil dikirim.",
     "messages.replySent": "Balasan berhasil dikirim.",
-    "messages.messageDeleted": "Pesan berhasil dihapus."
+    "messages.messageDeleted": "Pesan berhasil dihapus.",
+    "order.track.inTransit": "Sedang Dikirim",
+    "order.track.delivered": "Pesanan Tiba",
+    "order.track.courier": "Kurir",
+    "order.track.waybill": "Resi",
+    "order.track.status": "Status",
+    "order.track.step1": "Langkah 1 dari 2",
+    "order.track.step2": "Langkah 2 dari 2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/components/LoadingRequest/loadingRequest.js

@@ -18,6 +18,7 @@ const LoadingRequest = props => {
     const {
         isLoading
     } = props;
+    // const isLoading = true;
 
     const modal = isLoading ? (
         <div className={modalClasses.overlay} role="dialog" aria-modal="true" aria-label="Modal">
@@ -27,7 +28,8 @@ const LoadingRequest = props => {
                     <img src={process.env.MAGENTO_BACKEND_URL + "/media/images/spinner2.gif"} style={{"width":"15%"}} />
                     <div style={{
                         "marginTop": "10px",
-                        "color": "white"
+                        "color": "white",
+                        "fontSize": "14px"
                     }}>Please wait...</div>
                 </div>
             </div>

package/src/components/LoadingRequest/loadingRequest.module.css

@@ -75,8 +75,9 @@
 .backdrop{
     position:absolute;
     inset:0;
-    background: rgba(0, 0, 0, 0.64);
-    backdrop-filter: blur(8px);
+    /* background: rgba(0, 0, 0, 0.64); */
+    background: rgb(0 0 0 / 50%);
+    /* backdrop-filter: blur(1px); */
 }
 .dialog{
     position:relative;
@@ -119,6 +120,7 @@
     text-align: center;
     flex-wrap: wrap;
     align-content: center;
+    align-items: center;
 }
 .triggerBtn{
     background:#f76b1c;

package/src/components/OrderDetail/components/trackOrder.js

@@ -0,0 +1,151 @@
+import React, { useMemo, useState } from 'react';
+import { TickCircle } from 'iconsax-react';
+import { useIntl } from 'react-intl';
+
+import useTrackOrder from '@riosst100/pwa-marketplace/src/talons/TrackOrder/useTrackOrder';
+
+const TrackOrder = ({ order }) => {
+    const incrementId = useMemo(() => {
+        const num = order?.number;
+        return typeof num === 'number' ? String(num) : (num || '');
+    }, [order]);
+
+    const { trackOrder, isLoadingWithoutData, isBackgroundLoading, errorMessage } = useTrackOrder({ incrementId });
+
+    const { formatMessage, locale } = useIntl();
+
+    const status = (order?.status || '').toLowerCase();
+    const delivered = status === 'complete';
+    const canceled = status === 'canceled' || status === 'cancel' || status === 'cancelled';
+    const inTransit = !canceled && status !== '' && !delivered;
+
+    const summary = trackOrder?.summary;
+    const manifests = Array.isArray(trackOrder?.manifest)
+        ? trackOrder.manifest
+        : (trackOrder?.manifest ? [trackOrder.manifest] : []);
+
+    const activeManifestIndex = useMemo(() => {
+        if (!manifests.length) return -1;
+        let bestIdx = 0;
+        let bestTime = -Infinity;
+        manifests.forEach((m, idx) => {
+            const d = m?.manifest_date;
+            const t = m?.manifest_time;
+            const dt = d && t ? new Date(`${d}T${t}`) : undefined;
+            const time = dt && !isNaN(dt) ? dt.getTime() : NaN;
+            if (!isNaN(time) && time > bestTime) {
+                bestTime = time;
+                bestIdx = idx;
+            }
+        });
+        return isFinite(bestTime) ? bestIdx : 0;
+    }, [manifests]);
+
+    const formatManifestDate = m => {
+        const d = m?.manifest_date;
+        const t = m?.manifest_time;
+        if (d && t) {
+            const dt = new Date(`${d}T${t}`);
+            if (!isNaN(dt)) {
+                try {
+                    return new Intl.DateTimeFormat(locale, { dateStyle: 'medium', timeStyle: 'short' }).format(dt);
+                } catch (e) {
+                    return dt.toLocaleString();
+                }
+            }
+        }
+        return [t || '', d || ''].filter(Boolean).join(' ') || '-';
+    };
+
+    const [copied, setCopied] = useState(false);
+    const handleCopyWaybill = () => {
+        const text = summary?.waybill_number;
+        if (!text) return;
+        if (navigator?.clipboard?.writeText) {
+            navigator.clipboard.writeText(text)
+                .then(() => {
+                    setCopied(true);
+                    setTimeout(() => setCopied(false), 1500);
+                })
+                .catch(() => {});
+        }
+    };
+
+    const loading = isLoadingWithoutData || isBackgroundLoading;
+    return (
+        <div className="block-content rounded-md border border-gray-100 px-4 py-6 relative" aria-busy={loading}>
+            <div className="relative h-12 mb-6">
+                <div className="absolute left-0 right-0 top-[10px] flex">
+                    <div className={`h-[2px] w-1/2 rounded-l-full ${inTransit || delivered ? 'bg-blue-600' : 'bg-gray-100'}`}></div>
+                    <div className={`h-[2px] w-1/2 rounded-r-full ${delivered ? 'bg-blue-600' : 'bg-gray-100'}`}></div>
+                </div>
+                <div className="absolute left-0 right-0 top-[10px] flex justify-between">
+                    <div className="flex flex-col items-center">
+                        <span className={`w-3 h-3 rounded-full -translate-y-1/2 ring-2 ring-white shadow ${inTransit || delivered ? 'bg-blue-700' : 'bg-gray-100'} ${inTransit ? 'animate-pulse' : ''}`}></span>
+                        <span className={`mt-2 text-sm ${inTransit || delivered ? 'text-blue-700 font-medium' : 'text-gray-200'}`}>{formatMessage({ id: 'order.track.inTransit', defaultMessage: 'In Transit' })}</span>
+                    </div>
+                    <div className="flex flex-col items-center">
+                        <span className={`w-5 h-5 rounded-full -translate-y-1/2 flex items-center justify-center ring-2 ring-white shadow transition-transform duration-300 ${delivered ? 'bg-green-500 scale-110' : (delivered || inTransit ? 'bg-blue-700' : 'bg-gray-100')}`}>
+                            {delivered && <TickCircle size={14} color="#ffffff" variant="Bold" />}
+                        </span>
+                        <span className={`mt-2 text-sm ${delivered ? 'text-green-600 font-medium' : 'text-gray-200'}`}>{formatMessage({ id: 'order.track.delivered', defaultMessage: 'Delivered' })}</span>
+                    </div>
+                </div>
+            </div>
+
+            <div className="flex flex-col gap-2 mb-6">
+                {summary && (
+                    <div className="flex flex-col gap-2">
+                        <div className="px-2 py-1 rounded bg-gray-100 text-gray-900 text-xs w-[250px]">
+                            <strong>{formatMessage({ id: 'order.track.courier', defaultMessage: 'Courier' })}:</strong> {summary.courier_name || '-'}
+                        </div>
+                        <div className="px-2 py-1 rounded bg-gray-100 text-gray-900 text-xs w-[250px] flex items-center justify-between">
+                            <div className="truncate" title={summary.waybill_number || ''}>
+                                <strong>{formatMessage({ id: 'order.track.waybill', defaultMessage: 'Waybill' })}:</strong> {summary.waybill_number || '-'}
+                            </div>
+                            {summary.waybill_number && (
+                                <button type="button" onClick={handleCopyWaybill} className="ml-2 px-2 py-1 rounded bg-blue-600 text-white text-xs hover:bg-blue-700">
+                                    {copied ? formatMessage({ id: 'common.copied', defaultMessage: 'Copied!' }) : formatMessage({ id: 'common.copy', defaultMessage: 'Copy' })}
+                                </button>
+                            )}
+                        </div>
+                        <div className={`px-2 py-1 rounded text-xs w-[250px] ${summary.status?.toLowerCase() === 'delivered' ? 'bg-green-100 text-green-700' : 'bg-blue-100 text-blue-700'}`}>
+                            <strong>{formatMessage({ id: 'order.track.status', defaultMessage: 'Status' })}:</strong> {summary.status || '-'}
+                        </div>
+                    </div>
+                )}
+                {errorMessage && (
+                    <div className="text-red-600 text-sm">{errorMessage}</div>
+                )}
+            </div>
+
+            {manifests.length > 0 && (
+                <div className="relative flex flex-col gap-4">
+                    <div className="pointer-events-none absolute left-[4px] top-0 bottom-0 border-l border-gray-100"></div>
+                    {manifests.map((m, idx) => (
+                        <div key={idx} className="flex items-start gap-3">
+                            <div className={`mt-1 w-2 h-2 rounded-full z-10 ${idx === activeManifestIndex ? 'bg-blue-700' : 'bg-gray-100'}`}></div>
+                            <div className="flex-1">
+                                <div className="text-sm text-gray-800">{m?.manifest_description || '-'}</div>
+                                {m?.city_name && (
+                                    <div className="text-xs text-gray-500">{m.city_name}</div>
+                                )}
+                                <div className="text-xs text-gray-500">{formatManifestDate(m)}</div>
+                            </div>
+                        </div>
+                    ))}
+                </div>
+            )}
+            {loading && (
+                <div className="absolute inset-0 z-20 bg-white/60 backdrop-blur-[1px] flex items-center justify-center">
+                    <div className="flex items-center gap-2">
+                        <span className="w-5 h-5 rounded-full border-2 border-gray-200 border-t-blue-600 animate-spin"></span>
+                        <span className="text-sm text-gray-700">{formatMessage({ id: 'order.track.loading', defaultMessage: 'Loading tracking order…' })}</span>
+                    </div>
+                </div>
+            )}
+        </div>
+    );
+};
+
+export default TrackOrder;

package/src/components/OrderDetail/orderDetail.js

@@ -5,6 +5,7 @@ import Button from '@magento/venia-ui/lib/components/Button';
 import cn from 'classnames';
 import { Printer, ConvertCard } from 'iconsax-react';
 import ItemsOrdered from './components/itemsOrdered';
+import TrackOrder from './components/trackOrder';
 import RMAList from './components/rmaList';
 import useRmaPage from '@riosst100/pwa-marketplace/src/talons/RMAPage/useRmaPage';
 import { useLocation, useParams, useHistory } from 'react-router-dom';
@@ -93,6 +94,7 @@ const OrderDetail = (props) => {
         ? new Date(order.order_date.replace(' ', 'T')).toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric' })
         : '-';
     const status = order?.status || '-';
+    const isClosed = (order?.status || '').toLowerCase() === 'closed';
     const shippingMethod = order?.shipping_method || '-';
     const trackingNumber = order?.shipments?.[0]?.tracking?.[0]?.number || '-';
     const shippingAddress = order?.shipping_address;
@@ -236,6 +238,19 @@ const OrderDetail = (props) => {
                     </div>
                 </div>
             </div>
+            {!isClosed && (
+                <div className="block block-order-details-view">
+                    <div aria-live="polite" className="text-lg font-medium text-left mb-4 block-title">
+                        {
+                            formatMessage({
+                                id: 'order.trackOrder',
+                                defaultMessage: 'Track Order'
+                            })
+                        }
+                    </div>
+                    <TrackOrder order={order} />
+                </div>
+            )}
             <div className="block block-order-details-view">
                 <div aria-live="polite" className="text-lg font-medium text-left mb-4 block-title">
                     {

package/src/overwrites/peregrine/lib/talons/SignIn/useSignIn.js

@@ -158,6 +158,7 @@ export const useSignIn = props => {
                 }
 
                 setIsSigningIn(false);
+                setIsLoading(false);
             }
         },
         [

package/src/overwrites/peregrine/lib/talons/TrackOrder/trackOrder.gql.js

@@ -0,0 +1,24 @@
+import { gql } from '@apollo/client';
+
+export const GET_TRACK_ORDER = gql`
+	query GetTrackOrder($increment_id: String!) {
+		trackOrder(increment_id: $increment_id) {
+			delivered
+			summary {
+				courier_name
+				waybill_number
+				status
+			}
+			manifest {
+				manifest_description
+				manifest_date
+                city_name
+                manifest_time
+			}
+		}
+	}
+`;
+
+export default {
+	getTrackOrderQuery: GET_TRACK_ORDER
+};

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

@@ -70,62 +70,6 @@ const Adapter = props => {
     const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
 
     useEffect(() => {
-        if (!websiteCodeInUrl) {
-            // history.replace(location.pathname + location.search)
-        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
-            const storeCodeInUrl = websiteStores[websiteCodeInUrl];
-
-
-
-            // const search = location.search;
-            
-            // const query = new URLSearchParams(search);
-            // const isAccessBaseWebsite = query.get('access_base_website') || (
-            //     storage.getItem('access_base_website') || null
-            // );
-
-            // routerProps.basename = websiteCodeInUrl != process.env.WEBSITE_CODE && !isAccessBaseWebsite ? '/'+websiteCodeInUrl : '/';
-
-            // setNewRouterProps(routerProps);
-
-            // await removeCart();
-
-            // alert(storeCodeInUrl)
-
-            // update store/website saat url berubah, misal /id ke /sg
-
-            // issue store view code gk berubah, klo di graphql aman
-
-            // ini update di graphql dan di cookie, tapi di cookie beda klo ga di hardcode
-
-            // ini oke, store di graphql dari sini
-            // storeCodeInUrl = 'id_id_store_view';
-            // console.log('storeCodeInUrl',storeCodeInUrl)
-
-            // await apolloClient.clearCacheData(apolloClient, 'cart');
-            // await removeCart();
-
-            // klo enabled jd redirect tros
-            // storage.removeItem('cartId');
-
-            // storage.setItem('store_view_code', storeCodeInUrl);
-            // storage.setItem('website_code', websiteCodeInUrl);
-            // storage.setItem(
-            //     'store_view_currency',
-            //     storeCurrencies[storeCodeInUrl]
-            // );
-            // storage.setItem(
-            //     'store_view_secure_base_media_url',
-            //     storeSecureBaseMediaUrl[storeCodeInUrl]
-            // );
-
-            // We're required to reload the page as the basename doesn't
-            // change entirely without a full page reload.
-            // history.go(0);
-        }
-
-        // console.log('currentWebsiteCode',currentWebsiteCode)
-
         if (!websiteCodeInUrl) {
             const websiteCode = process.env.WEBSITE_CODE;
             // if (websiteCode != storage.getItem('website_code')) {
@@ -168,7 +112,7 @@ const Adapter = props => {
                 }
             // }
         }
-    }, [websiteCodeInUrl, currentWebsiteCode]);
+    }, [websiteCodeInUrl]);
 
     // TODO: Replace with app skeleton. See PWA-547.
     if (!initialized) {

package/src/overwrites/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js

@@ -39,7 +39,18 @@ const StoreCodeRoute = () => {
     // the storage value and refresh so that we start using the new code.
     useEffect(() => {
         if (websiteCodeInUrl) {
-            let prefix = '';
+            const websiteCodes = [];
+
+            AVAILABLE_WEBSITES.forEach(store => {
+                websiteCodes.push(store.website_code);
+            });
+
+            const { location } = globalThis;
+            const match = location && location.pathname.split("/")[1];
+            const websiteCodeInUrl = websiteCodes.find((str) => str === match);
+
+            const prefix = websiteCodeInUrl ? websiteCodeInUrl + '_' : '';
+            
             let storeCodeInUrl = websiteStores[websiteCodeInUrl];
 
             storage.setItem(prefix + 'store_view_code', storeCodeInUrl);

package/src/talons/SocialLogin/useSocialLogin.js

@@ -134,6 +134,7 @@ export const useSocialLogin = props => {
                 }
 
                 setIsSigningIn(false);
+                setIsLoading(false);
             }
         }
     }, [

package/src/talons/TrackOrder/useTrackOrder.js

@@ -0,0 +1,53 @@
+import { useEffect, useMemo } from 'react';
+import { useQuery } from '@apollo/client';
+
+import { useAppContext } from '@magento/peregrine/lib/context/app';
+import { deriveErrorMessage } from '@magento/peregrine/lib/util/deriveErrorMessage';
+
+import operations from '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/TrackOrder/trackOrder.gql';
+
+export const useTrackOrder = (props = {}) => {
+	const { incrementId } = props;
+	const { getTrackOrderQuery } = operations;
+
+	const [
+		,
+		{
+			actions: { setPageLoading }
+		}
+	] = useAppContext();
+
+	const {
+		data,
+		error,
+		loading,
+		refetch
+	} = useQuery(getTrackOrderQuery, {
+		fetchPolicy: 'cache-and-network',
+		variables: { increment_id: incrementId },
+		skip: !incrementId
+	});
+
+	const isLoadingWithoutData = !data && loading;
+	const isBackgroundLoading = !!data && loading;
+
+	// Update the page indicator if the GraphQL query is in flight.
+	useEffect(() => {
+		setPageLoading(isBackgroundLoading);
+	}, [isBackgroundLoading, setPageLoading]);
+
+	const derivedErrorMessage = useMemo(
+		() => deriveErrorMessage([error]),
+		[error]
+	);
+
+	return {
+		errorMessage: derivedErrorMessage,
+		isLoadingWithoutData,
+		isBackgroundLoading,
+		trackOrder: data ? data.trackOrder : undefined,
+		refetchTrackOrder: refetch
+	};
+};
+
+export default useTrackOrder;