orionplace-svelte 0.7.7 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-svelte",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "SvelteKit 2 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/src/lib/components/orionplace/orders/OrderDetails.svelte

@@ -402,9 +402,9 @@
               </span>
             {/if}
 
-            {#if step.key === 'placed' && inputs.order.time_submited?.date}
+            {#if step.date}
               <span class={['op-orders-step-note']}>
-                {inputs.order.time_submited.date}
+                {step.date}
               </span>
             {:else if stepCount(step.count, step.total)}
               <span class={['op-orders-step-note']}>

package/templates/src/lib/components/orionplace/products/StorefrontProduct.svelte

@@ -218,7 +218,9 @@
         actionLabels.value.failed
       );
     }
-    return actions.success.value ? actionLabels.value.saved : '';
+    return actions.success.value
+      ? actionLabels.value[actions.done.value ?? 'saved']
+      : '';
   });
   const previewStatus      = computed(() => {
     if (!inputs.previewKey || !product.value) {

package/templates/src/lib/layouts/StorefrontLayout.svelte

@@ -106,9 +106,8 @@
     if (!actions.success.value) {
       return '';
     }
-    return actions.preorderId.value
-      ? actionCopy.value.preorderSaved
-      : actionCopy.value.saved;
+    // The notice names what the action did («Added to the cart.»).
+    return actionCopy.value[actions.done.value ?? 'saved'];
   });
   // Header selection messages stay neutral.
   const actionTone                                         = computed(() => {

package/templates/src/lib/utils/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/src/lib/utils/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.',

package/templates/src/lib/utils/orionplace/productActions.svelte.ts

@@ -140,6 +140,18 @@ export function applyProductActionPatch(
   }
 }
 
+// What a finished action did, so the notice can say it («Added to the
+// cart.» rather than «Product updated.»); a key of productActionLabels.
+export type ProductActionDone =
+  | 'cartAdded'
+  | 'cartUpdated'
+  | 'cartRemoved'
+  | 'favoriteAdded'
+  | 'favoriteRemoved'
+  | 'subscribed'
+  | 'unsubscribed'
+  | 'preorderSaved';
+
 export function createProductActions(options: {
   request: ProductActionRequest;
   authenticated: () => boolean;
@@ -164,6 +176,7 @@ export function createProductActions(options: {
   }>();
   const success      = ref(false);
   const preorderId   = ref<number>();
+  const done         = ref<ProductActionDone>();
   const needsRefresh = ref(false);
   let refreshTarget: { store: ProductActionStore; id: number } | undefined;
 
@@ -482,6 +495,7 @@ export function createProductActions(options: {
 
     error.value      = undefined;
     success.value    = false;
+    done.value       = undefined;
     preorderId.value = undefined;
 
     try {
@@ -511,16 +525,28 @@ export function createProductActions(options: {
 
       pending.value       = true;
 
+      let finished: ProductActionDone | undefined;
+
       if (action === 'toggleFavorite') {
         await changeFavorite(store, selection);
+        finished = selection.selected ? 'favoriteAdded' : 'favoriteRemoved';
       } else if (action === 'add' || action === 'remove') {
+        // Adding a product already in the cart sets its new quantity.
+        const inCart = Boolean(product.cart_counts?.cart_id);
+
         await changeCart(store, action, selection, product);
+        finished = action === 'remove'
+          ? 'cartRemoved'
+          : inCart ? 'cartUpdated' : 'cartAdded';
       } else if (action === 'subscribe' || action === 'unsubscribe') {
         await changeSubscription(store, action, id);
+        finished = action === 'subscribe' ? 'subscribed' : 'unsubscribed';
       } else if (action === 'preorder') {
         await createPreorder(selection, availability.canPreorder);
+        finished = 'preorderSaved';
       }
 
+      done.value          = finished;
       success.value       = true;
       return true;
     } catch (reason) {
@@ -540,6 +566,7 @@ export function createProductActions(options: {
     pending,
     error,
     success,
+    done,
     preorderId,
     needsRefresh,
     retryRefresh,