diff --git a/app/frontend/src/javascript/components/cart/store-cart.tsx b/app/frontend/src/javascript/components/cart/store-cart.tsx index 290ab007e..77b9be6bb 100644 --- a/app/frontend/src/javascript/components/cart/store-cart.tsx +++ b/app/frontend/src/javascript/components/cart/store-cart.tsx @@ -266,7 +266,7 @@ const StoreCart: React.FC = ({ onSuccess, onError, currentUser,
{t('app.public.store_cart.reference_short')} {item.orderable_ref || ''} -

{item.orderable_name}

+

{item.orderable_name}

{item.quantity_min > 1 && {t('app.public.store_cart.minimum_purchase')}{item.quantity_min} } diff --git a/app/frontend/src/javascript/components/store/show-order.tsx b/app/frontend/src/javascript/components/store/show-order.tsx index 0683e4207..9aad2ebf3 100644 --- a/app/frontend/src/javascript/components/store/show-order.tsx +++ b/app/frontend/src/javascript/components/store/show-order.tsx @@ -97,6 +97,16 @@ export const ShowOrder: React.FC = ({ orderId, currentUser, onSu onSuccess(message); }; + /** + * Ruturn item's ordrable url + */ + const itemOrderableUrl = (item) => { + if (isPrivileged()) { + return `/#!/admin/store/products/${item.orderable_id}/edit`; + } + return `/#!/store/p/${item.orderable_slug}`; + }; + if (!order) { return null; } @@ -153,7 +163,7 @@ export const ShowOrder: React.FC = ({ orderId, currentUser, onSu
{t('app.shared.store.show_order.reference_short')} {item.orderable_ref || ''} -

{item.orderable_name}

+

{item.orderable_name}

diff --git a/app/frontend/src/javascript/models/order.ts b/app/frontend/src/javascript/models/order.ts index 0ac99a3b4..08d9d53bf 100644 --- a/app/frontend/src/javascript/models/order.ts +++ b/app/frontend/src/javascript/models/order.ts @@ -31,6 +31,7 @@ export interface Order { orderable_type: string, orderable_id: number, orderable_name: string, + orderable_slug: string, orderable_ref?: string, orderable_main_image_url?: string, orderable_external_stock: number, diff --git a/app/views/api/orders/_order.json.jbuilder b/app/views/api/orders/_order.json.jbuilder index 7c4836fae..3bb146813 100644 --- a/app/views/api/orders/_order.json.jbuilder +++ b/app/views/api/orders/_order.json.jbuilder @@ -26,6 +26,7 @@ json.order_items_attributes order.order_items.order(created_at: :asc) do |item| json.orderable_id item.orderable_id json.orderable_name item.orderable.name json.orderable_ref item.orderable.sku + json.orderable_slug item.orderable.slug json.orderable_main_image_url item.orderable.main_image&.attachment_url json.orderable_external_stock item.orderable.stock['external'] json.quantity item.quantity