From 3a230fd55663987c3072f2739cf58259534b2567 Mon Sep 17 00:00:00 2001 From: Samer Salameh Date: Wed, 18 Nov 2026 17:03:02 +0300 Subject: [PATCH] =?UTF-8?q?Orders:=20back=20button=20label=20"=D8=B9=D9=88?= =?UTF-8?q?=D8=AF=D8=A9"=20on=20the=20new=20order=20form,=20grid=20asks=20?= =?UTF-8?q?for=20a=20filter=20when=20none=20is=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- web/src/features/grains-orders/meta/orders.tsx | 3 ++- web/src/features/grains-orders/pages.tsx | 1 + web/src/features/grains-orders/strings.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/features/grains-orders/meta/orders.tsx b/web/src/features/grains-orders/meta/orders.tsx index 960bff2..72d7a7c 100644 --- a/web/src/features/grains-orders/meta/orders.tsx +++ b/web/src/features/grains-orders/meta/orders.tsx @@ -50,7 +50,8 @@ export const tenderOrderGrid = (h: OrderGridHandlers): GridMeta => endpoint: '/grains/orders', rowKey: (r) => r.id, emptyAsGrid: true, // no orders for the day: the headers stay, "no results" shows inside the table - // The legacy grid stayed empty until a date was typed: start on today (clear the filter to list every day). + // The legacy grid stayed empty until a date was typed: start on today; with the filter cleared the grid asks for a filter. + requireFilter: true, defaultFilters: { orderDate: todayIso() }, filters: [{ name: 'orderDate', type: 'date', label: { en: 'Order date', ar: 'تاريخ الطلبية' } }], columns: [ diff --git a/web/src/features/grains-orders/pages.tsx b/web/src/features/grains-orders/pages.tsx index dabe750..7634649 100644 --- a/web/src/features/grains-orders/pages.tsx +++ b/web/src/features/grains-orders/pages.tsx @@ -120,6 +120,7 @@ export function TenderOrderCreatePage() { initialValues={initial} serverErrors={serverErrors} onCancel={() => navigate('/grains/orders')} + cancelLabel={t('ord.back')} onSubmit={(payload) => new Promise((resolve) => { setServerErrors({}); diff --git a/web/src/features/grains-orders/strings.ts b/web/src/features/grains-orders/strings.ts index 5c7e7ec..413ec6a 100644 --- a/web/src/features/grains-orders/strings.ts +++ b/web/src/features/grains-orders/strings.ts @@ -4,6 +4,7 @@ import { defineStrings } from '@/i18n/useUi'; export default defineStrings({ // ---- menu 'ord.menu.finance': { en: 'Finance', ar: 'المالية' }, + 'ord.back': { en: 'Back', ar: 'عودة' }, 'ord.menu.group': { en: 'Orders', ar: 'الطلبيات' }, 'ord.menu.orders': { en: 'Tender orders', ar: 'الطلبيات' }, 'ord.menu.quotas': { en: 'Daily quota', ar: 'الحصة اليومية' },