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

---
 ...g.js.temporary.compiled.1772626141848.mjs} |   0
 ui/src/pages/OrderEntry.vue                   | 102 +++++++++++-------
 2 files changed, 61 insertions(+), 41 deletions(-)
 rename ui/{quasar.config.js.temporary.compiled.1772606929877.mjs => quasar.config.js.temporary.compiled.1772626141848.mjs} (100%)

diff --git a/ui/quasar.config.js.temporary.compiled.1772606929877.mjs b/ui/quasar.config.js.temporary.compiled.1772626141848.mjs
similarity index 100%
rename from ui/quasar.config.js.temporary.compiled.1772606929877.mjs
rename to ui/quasar.config.js.temporary.compiled.1772626141848.mjs
diff --git a/ui/src/pages/OrderEntry.vue b/ui/src/pages/OrderEntry.vue
index 8a43ba4..42e0f2c 100644
--- a/ui/src/pages/OrderEntry.vue
+++ b/ui/src/pages/OrderEntry.vue
@@ -29,6 +29,7 @@
             :options="filteredCariOptions"
             label="Cari Seçimi"
             filled
+            dense
             use-input
             input-debounce="300"
             emit-value
@@ -98,8 +99,44 @@
           />
         </div>
 
+        <!-- 🔹 Cari Bilgi Satırı (2. Satır) -->
+        <div
+          v-if="cariInfo"
+          v-show="!filterBarCollapsed"
+          class="col-12 row q-col-gutter-md q-mt-xs cari-info-bar"
+        >
+          <div class="col-3">
+            <q-input
+              :model-value="cariInfo.Musteri_Temsilcisi || '-'"
+              label="Müşteri Temsilcisi"
+              filled dense readonly
+            />
+          </div>
+          <div class="col-3">
+            <q-input
+              :model-value="cariInfo.Musteri_Ana_Grubu || '-'"
+              label="Ana Grup"
+              filled dense readonly
+            />
+          </div>
+          <div class="col-3">
+            <q-input
+              :model-value="cariInfo.Piyasa || '-'"
+              label="Piyasa"
+              filled dense readonly
+            />
+          </div>
+          <div class="col-3">
+            <q-input
+              :model-value="cariInfo.Ulke || '-'"
+              label="Ülke"
+              filled dense readonly
+            />
+          </div>
+        </div>
+
         <!-- 💰 TOPLAM TUTAR + KDV -->
-        <div class="col-12 row q-col-gutter-sm q-mt-xs items-center">
+        <div v-show="!filterBarCollapsed" class="col-12 row q-col-gutter-sm q-mt-xs items-center">
           <!-- 💰 Toplam Tutar -->
           <div class="col-3">
             <q-input
@@ -172,7 +209,7 @@
 
       </div>
       <!-- 📝 Sipariş Genel Açıklaması (filter bar altında) -->
-      <div class="filter-bar-desc q-mt-sm">
+      <div v-show="!filterBarCollapsed" class="filter-bar-desc q-mt-sm">
         <q-input
           v-model="form.Description"
           type="textarea"
@@ -187,47 +224,18 @@
           :readonly="isViewOnly"
         />
       </div>
-      <!-- 🔹 Cari Bilgi Barı -->
-      <q-slide-transition>
-        <div
-          v-if="cariInfo"
-          class="row q-col-gutter-md q-mt-xs cari-info-bar"
-        >
-          <div class="col-3">
-            <q-input
-              :model-value="cariInfo.Musteri_Temsilcisi || '-'"
-              label="Müşteri Temsilcisi"
-              filled dense readonly
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              :model-value="cariInfo.Musteri_Ana_Grubu || '-'"
-              label="Ana Grup"
-              filled dense readonly
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              :model-value="cariInfo.Piyasa || '-'"
-              label="Piyasa"
-              filled dense readonly
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              :model-value="cariInfo.Ulke || '-'"
-              label="Ülke"
-              filled dense readonly
-            />
-          </div>
-        </div>
-      </q-slide-transition>
-
       <!-- 🔹 Save Toolbar -->
       <div class="save-toolbar">
         <div class="text-subtitle2 text-weight-bold">Sipariş Formu</div>
         <div>
+          <q-btn
+            flat
+            color="grey-7"
+            class="q-ml-sm"
+            :label="filterBarCollapsed ? 'FİLTREYİ GENİŞLET' : 'FİLTREYİ DARALT'"
+            :icon="filterBarCollapsed ? 'expand_more' : 'expand_less'"
+            @click="toggleFilterBarCollapsed"
+          />
           <q-btn
             flat
             color="grey-7"
@@ -807,6 +815,15 @@ const formatDate = formatDateDisplay
 
 const showEditor = ref(false)
 const compactGridHeader = ref(false)
+const filterBarCollapsed = ref(false)
+
+function toggleFilterBarCollapsed () {
+  filterBarCollapsed.value = !filterBarCollapsed.value
+  nextTick(() => {
+    updateStickyVars()
+    measureHeaderGap()
+  })
+}
 
 
 
@@ -3191,7 +3208,10 @@ function updateStickyVars() {
   try {
     const root = document.documentElement
     const headerH = document.querySelector('.q-header')?.offsetHeight || 56
-    const filterH = document.querySelector('.filter-bar')?.offsetHeight || 72
+    const filterMainH = document.querySelector('.filter-bar')?.offsetHeight || 0
+    const filterDescH = document.querySelector('.filter-bar-desc')?.offsetHeight || 0
+    const cariInfoH = document.querySelector('.cari-info-bar')?.offsetHeight || 0
+    const filterH = filterMainH + filterDescH + cariInfoH
     const saveH = document.querySelector('.save-toolbar')?.offsetHeight || 52
     const totalSticky = headerH + filterH + saveH
 
@@ -3200,7 +3220,7 @@ function updateStickyVars() {
     root.style.setProperty('--save-h', `${saveH}px`)
     root.style.setProperty('--sticky-total', `${totalSticky}px`)
 
-    console.log(`📐 Sticky vars → header:${headerH}, filter:${filterH}, save:${saveH}`)
+    console.log(`📐 Sticky vars → header:${headerH}, filterMain:${filterMainH}, filterDesc:${filterDescH}, cariInfo:${cariInfoH}, filterTotal:${filterH}, save:${saveH}`)
   } catch (err) {
     console.warn('⚠️ updateStickyVars hata:', err)
   }