orionplace-react 0.7.7 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-react",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Next.js 16 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English, Russian and Spanish, plus an Android app build.",
   "type": "module",
   "license": "MIT",

package/templates/components/orionplace/orders/OrderDetails.tsx

@@ -404,8 +404,8 @@ export function OrderDetails({
                 {step.current ? (
                   <span className={styles.stepState}>{labels.stepStates.current}</span>
                 ) : null}
-                {step.key === 'placed' && order.time_submited?.date ? (
-                  <span className={styles.stepNote}>{order.time_submited.date}</span>
+                {step.date ? (
+                  <span className={styles.stepNote}>{step.date}</span>
                 ) : step.total > 1 ? (
                   <span className={styles.stepNote}>
                     {step.count} {labels.of} {step.total}

package/templates/hooks/useOrionplaceStorefront.tsx

@@ -29,6 +29,17 @@ import { apiErrorMessage, OrionplaceApiError } from '@/lib/orionplace/api';
 import { useOrionplaceApi } from '@/hooks/useOrionplaceApi';
 import { productAvailability } from '@/lib/orionplace/productAvailability';
 import { productActionLabels } from '@/lib/orionplace/productActionLabels';
+
+// What a finished product action did: a key of productActionLabels.
+type ProductActionDone =
+  | 'cartAdded'
+  | 'cartUpdated'
+  | 'cartRemoved'
+  | 'favoriteAdded'
+  | 'favoriteRemoved'
+  | 'subscribed'
+  | 'unsubscribed'
+  | 'preorderSaved';
 import styles from '@/app/storefront.module.css';
 import { signInPageLocation } from '@/lib/orionplace/signInReturn';
 
@@ -236,7 +247,11 @@ export function OrionplaceStorefrontProvider({
     }
   }
 
-  async function action(work: () => Promise<void>) {
+  // done names what the action did, for the notice («Added to the cart.»).
+  async function action(
+    work: () => Promise<void>,
+    done: ProductActionDone,
+  ) {
     if (actionPending.current) {
       return;
     }
@@ -248,7 +263,7 @@ export function OrionplaceStorefrontProvider({
     setMessageSignIn(false);
     try {
       await work();
-      setMessage(copy.saved);
+      setMessage(copy[done]);
     } catch (reason) {
       if (
         reason instanceof OrionplaceApiError &&
@@ -399,9 +414,12 @@ export function OrionplaceStorefrontProvider({
           } finally {
             products.getState().setPendingFavorite(selection.product);
           }
-        });
+        }, selection.selected ? 'favoriteAdded' : 'favoriteRemoved');
       },
       onAdd(selection) {
+        // Adding a product already in the cart sets its new quantity.
+        const inCart = Boolean(product(selection.product)?.cart_counts?.cart_id);
+
         void action(async () => {
           const data    = await api.request<{
             cart_item_id?: number;
@@ -431,7 +449,7 @@ export function OrionplaceStorefrontProvider({
               c_cart_positions: data.c_cart_positions,
             });
           }
-        });
+        }, inCart ? 'cartUpdated' : 'cartAdded');
       },
       onRemove(selection) {
         void action(async () => {
@@ -446,7 +464,7 @@ export function OrionplaceStorefrontProvider({
               c_cart_positions: data.c_cart_positions,
             });
           }
-        });
+        }, 'cartRemoved');
       },
       onSubscribe(selection) {
         if (!init?.is_authenticated) {
@@ -465,7 +483,7 @@ export function OrionplaceStorefrontProvider({
           });
           await refreshNotificationState();
           await refreshProduct(selection.product);
-        });
+        }, 'subscribed');
       },
       onUnsubscribe(selection) {
         if (!init?.is_authenticated) {
@@ -477,7 +495,7 @@ export function OrionplaceStorefrontProvider({
             product_id: selection.product,
           });
           await refreshProduct(selection.product);
-        });
+        }, 'unsubscribed');
       },
       onPreorder(selection) {
         const current = product(selection.product);
@@ -511,7 +529,7 @@ export function OrionplaceStorefrontProvider({
           }
           await api.request('preorders_create', body);
           setPreorder(undefined);
-        });
+        }, 'preorderSaved');
       },
       closePreorder() {
         setPreorder(undefined);

package/templates/lib/orionplace/orderPresentation.ts

@@ -59,6 +59,8 @@ export interface OrderStep {
   current: boolean;
   count: number;
   total: number;
+  /** The date the step was reached ('' until then); see orderStepDate. */
+  date?: string;
 }
 
 export type OrderShipmentStateKey =
@@ -228,7 +230,39 @@ export function orderCanCancel(
 }
 
 // Canceled and returned orders have no delivery progress to show.
-export function orderSteps(order: OrderShipmentCounters): OrderStep[] {
+// The date a step was reached: the order's own date for Placed; for Shipped
+// and Delivered, once every shipment got there, the latest of their sent
+// (or delivery) dates; '' while a shipment has not reached the step.
+export function orderStepDate(
+  order: OrderShipmentCounters & Partial<Pick<IOrder, 'time_submited'>>,
+  key: OrderStepKey,
+): string {
+  if (key === 'placed') {
+    return order.time_submited?.date ?? '';
+  }
+
+  const shipments = order.delivery_froms ?? [];
+  const reached   = shipments.map((shipment) =>
+    key === 'shipped'
+      ? shipment.dates?.sent || shipment.dates?.delivery_date_real
+      : shipment.dates?.delivery_date_real,
+  );
+
+  if (!reached.length || reached.some((date) => !date?.date)) {
+    return '';
+  }
+
+  // The latest is the one the fewest minutes ago (any date format).
+  const latest = reached.reduce((best, date) =>
+    Number(date?.minutes_ago ?? 0) < Number(best?.minutes_ago ?? 0) ? date : best,
+  );
+
+  return latest?.date ?? '';
+}
+
+export function orderSteps(
+  order: OrderShipmentCounters & Partial<Pick<IOrder, 'time_submited'>>,
+): OrderStep[] {
   const { total, sent, delivered } = orderShipmentProgress(order);
 
   if (
@@ -239,13 +273,21 @@ export function orderSteps(order: OrderShipmentCounters): OrderStep[] {
   }
 
   const steps = [
-    { key: 'placed', state: 'done', current: false, count: 1, total: 1 },
+    {
+      key: 'placed',
+      state: 'done',
+      current: false,
+      count: 1,
+      total: 1,
+      date: orderStepDate(order, 'placed'),
+    },
     {
       key: 'shipped',
       state: stepState(sent, total),
       current: false,
       count: sent,
       total,
+      date: orderStepDate(order, 'shipped'),
     },
     {
       key: 'delivered',
@@ -253,6 +295,7 @@ export function orderSteps(order: OrderShipmentCounters): OrderStep[] {
       current: false,
       count: delivered,
       total,
+      date: orderStepDate(order, 'delivered'),
     },
   ] satisfies OrderStep[];
 

package/templates/lib/orionplace/productActionLabels.ts

@@ -4,6 +4,13 @@ const labels = {
   en: {
     pending: 'Updating product…',
     saved: 'Product updated.',
+    cartAdded: 'Added to the cart.',
+    cartUpdated: 'Cart quantity updated.',
+    cartRemoved: 'Removed from the cart.',
+    favoriteAdded: 'Saved to favorites.',
+    favoriteRemoved: 'Removed from favorites.',
+    subscribed: 'We will let you know when it is back in stock.',
+    unsubscribed: 'Availability notification turned off.',
     failed: 'The request failed. Your confirmed product data is unchanged.',
     unavailable: 'This action is unavailable.',
     login: 'Sign in to save favorites or availability notifications.',
@@ -31,6 +38,13 @@ const labels = {
   ru: {
     pending: 'Обновляем товар…',
     saved: 'Товар обновлён.',
+    cartAdded: 'Товар добавлен в корзину.',
+    cartUpdated: 'Количество в корзине изменено.',
+    cartRemoved: 'Товар удалён из корзины.',
+    favoriteAdded: 'Товар добавлен в избранное.',
+    favoriteRemoved: 'Товар удалён из избранного.',
+    subscribed: 'Сообщим, когда товар появится в наличии.',
+    unsubscribed: 'Уведомление о наличии отключено.',
     failed: 'Запрос не выполнен. Подтверждённые данные товара сохранены.',
     unavailable: 'Это действие недоступно.',
     login: 'Войдите, чтобы сохранять избранное и уведомления о наличии.',
@@ -56,6 +70,13 @@ const labels = {
   es: {
     pending: 'Actualizando el producto…',
     saved: 'Producto actualizado.',
+    cartAdded: 'Añadido al carrito.',
+    cartUpdated: 'Cantidad del carrito actualizada.',
+    cartRemoved: 'Eliminado del carrito.',
+    favoriteAdded: 'Guardado en favoritos.',
+    favoriteRemoved: 'Eliminado de favoritos.',
+    subscribed: 'Te avisaremos cuando vuelva a estar disponible.',
+    unsubscribed: 'Aviso de disponibilidad desactivado.',
     failed: 'La solicitud ha fallado. Los datos confirmados del producto no han cambiado.',
     unavailable: 'Esta acción no está disponible.',
     login: 'Inicia sesión para guardar favoritos o avisos de disponibilidad.',