From f40fa0ed18b690fc12dea5e6f4c1b18a477b1c7b Mon Sep 17 00:00:00 2001
From: M_Kececi <you@example.com>
Date: Wed, 4 Mar 2026 13:50:47 +0300
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ui/src/pages/OrderEntry.vue               | 11 ++++++++++-
 ui/src/stores/OrderProductionItemStore.js |  2 +-
 ui/src/stores/orderentryStore.js          | 14 +++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ui/src/pages/OrderEntry.vue b/ui/src/pages/OrderEntry.vue
index f423622..8a43ba4 100644
--- a/ui/src/pages/OrderEntry.vue
+++ b/ui/src/pages/OrderEntry.vue
@@ -2662,7 +2662,16 @@ async function onModelChange(modelCode) {
     let bedenGrpKey = null
 
     // ✅ Hard-match (senin ana gruplarına göre genişletebilirsin)
-    if ((ana.includes('garson') || kat.includes('garson') || kat.includes('yetiskin/garson') || ana.includes('yetiskin/garson')) &&
+    if (
+      (kat.includes('garson') || kat.includes('yetiskin/garson')) &&
+      (
+        ana.includes('gomlek atayaka') ||
+        ana.includes('gomlek ata yaka') ||
+        ana.includes('gomlek klasik')
+      )
+    ) {
+      bedenGrpKey = 'yas'
+    } else if ((ana.includes('garson') || kat.includes('garson') || kat.includes('yetiskin/garson') || ana.includes('yetiskin/garson')) &&
         (ana.includes('ayakkabı') || ana.includes('ayakkabi') || kat.includes('ayakkabı') || kat.includes('ayakkabi'))) {
       bedenGrpKey = 'ayk_garson'
     } else if (ana.includes('pantolon') || kat.includes('pantolon')) {
diff --git a/ui/src/stores/OrderProductionItemStore.js b/ui/src/stores/OrderProductionItemStore.js
index 3159099..575736e 100644
--- a/ui/src/stores/OrderProductionItemStore.js
+++ b/ui/src/stores/OrderProductionItemStore.js
@@ -24,7 +24,7 @@ export function detectProductionBedenGroup (bedenList, urunAnaGrubu = '', urunKa
   const yg = normalizeTextForMatch(yetiskinGarson)
 
   if ((kat.includes('GARSON') || yg.includes('GARSON')) &&
-      (ana.includes('GOMLEK ATAYAKA') || ana.includes('GOMLEK KLASIK'))) {
+      (ana.includes('GOMLEK ATAYAKA') || ana.includes('GOMLEK ATA YAKA') || ana.includes('GOMLEK KLASIK'))) {
     return 'yas'
   }
 
diff --git a/ui/src/stores/orderentryStore.js b/ui/src/stores/orderentryStore.js
index 7b2ae0e..0bd0e8d 100644
--- a/ui/src/stores/orderentryStore.js
+++ b/ui/src/stores/orderentryStore.js
@@ -2513,13 +2513,12 @@ export const useOrderEntryStore = defineStore('orderentry', {
     // 🔸 GRUP ANAHTARI TESPİTİ
     // =======================================================
     activeGroupKeyForRow(row) {
-      const g = (row?.urunAnaGrubu || '').toUpperCase()
-      if (g.includes('TAKIM')) return 'tak'
-      if (g.includes('PANTOLON')) return 'pan'
-      if (g.includes('GOMLEK')) return 'gom'
-      if (g.includes('AYAKKABI')) return 'ayk'
-      if (g.includes('YAS')) return 'yas'
-      return 'tak'
+      return detectBedenGroup(
+        null,
+        row?.urunAnaGrubu || '',
+        row?.kategori || '',
+        row?.YETISKIN_GARSON || row?.yetiskinGarson || ''
+      )
     },
     /* =======================================================
    🔹 MODE YÖNETİMİ — new / edit arası geçiş
@@ -3451,6 +3450,7 @@ export function detectBedenGroup(bedenList, urunAnaGrubu = '', urunKategori = ''
   // YETISKIN/GARSON = GARSON ve URUN ANA GRUBU "GOMLEK ATA YAKA" veya "GOMLEK KLASIK" ise
   // sonuc "yas" olmalidir.
   const isGarsonGomlekAnaGrubu =
+    rawAna.includes('GOMLEK ATAYAKA') ||
     rawAna.includes('GOMLEK ATA YAKA') ||
     rawAna.includes('GOMLEK KLASIK')
   const hasGarsonSignal = rawAna.includes('GARSON') || rawKat.includes('GARSON') || rawYetiskinGarson.includes('GARSON')