From 628548a50972b10f64c0201eb9622d48c0c9816f Mon Sep 17 00:00:00 2001
From: suryacp23 <suryacp.com@gmail.com>
Date: Thu, 16 Jul 2026 12:51:19 +0530
Subject: [PATCH] new form

---
 .../forms/fields/SmartGridField.tsx           | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/components/forms/fields/SmartGridField.tsx b/src/components/forms/fields/SmartGridField.tsx
index 431717e..51ab648 100644
--- a/src/components/forms/fields/SmartGridField.tsx
+++ b/src/components/forms/fields/SmartGridField.tsx
@@ -22,7 +22,15 @@ export function SmartGridField({
   const [editingIdx, setEditingIdx] = useState<number | null>(null);
 
   const visibleColumns = columns.filter(c => {
-    return true; // Temporarily show all columns for debugging
+    const isOrderDetails = label.toLowerCase().includes('order');
+    if (isOrderDetails) {
+      const n = (c.name || '').toLowerCase();
+      const id = (c.id || '').toLowerCase();
+      // Show only Category, Name, and Bags
+      return n.includes('category') || n.includes('name') || n.includes('bags') || 
+             id.includes('category') || id.includes('name') || id.includes('bags');
+    }
+    return true; 
   });
 
   const removeRow = (idx: number) => {
@@ -202,12 +210,15 @@ export function SmartGridField({
         </div>
       )}
 
-      <Button type="button" variant="secondary" size="sm" onClick={startAdd} className="mt-2 self-start">
-        + Add Row
-      </Button>
-
-      <Modal open={isModalOpen} onClose={() => setIsModalOpen(false)} title={editingIdx !== null ? "Edit Row" : "Add Row"} width="sm">
-        <form onSubmit={(e) => { e.preventDefault(); e.stopPropagation(); submitNewRow(); }} className="flex flex-col gap-4">
+      <div className="mt-4 p-4 border border-border-subtle rounded-xl bg-white shadow-sm">
+        <h4 className="text-sm font-semibold text-strong mb-4 flex items-center gap-2">
+          {editingIdx !== null ? (
+            <><Pencil size={16} className="text-blue-600" /> Edit Row</>
+          ) : (
+            <>Add New Item</>
+          )}
+        </h4>
+        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4 items-end">
           {visibleColumns.map(col => {
             const val = newRow[col.id];
             if (col.data_type === 'select' || col.data_type === 'multiselect') {
@@ -261,12 +272,19 @@ export function SmartGridField({
               />
             );
           })}
-          <div className="flex justify-end gap-3 mt-4">
-            <Button type="button" variant="ghost" onClick={() => setIsModalOpen(false)}>Cancel</Button>
-            <Button type="submit" variant="primary">{editingIdx !== null ? "Save" : "Add"}</Button>
+          
+          <div className="flex justify-end gap-2 sm:col-span-2 md:col-span-3 mt-2">
+            {editingIdx !== null && (
+              <Button type="button" variant="ghost" onClick={() => { setEditingIdx(null); setNewRow({}); }}>
+                Cancel
+              </Button>
+            )}
+            <Button type="button" variant="primary" onClick={submitNewRow}>
+              {editingIdx !== null ? "Save Item" : "+ Add to Order"}
+            </Button>
           </div>
-        </form>
-      </Modal>
+        </div>
+      </div>
     </div>
   );
 }