From 6f842043b2a62641bf7834f3ddb0926fa18a0cdf Mon Sep 17 00:00:00 2001
From: MEHMETKECECI <mehmet_kececi89@hotmail.com>
Date: Mon, 16 Feb 2026 17:29:40 +0300
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ui/src/pages/ChangePassword.vue      |   4 +-
 ui/src/pages/FirstPasswordChange.vue |  78 ++++++++--------
 ui/src/pages/MainPage.vue            | 104 ++++++++++-----------
 ui/src/pages/MePassword.vue          |  74 +++++++--------
 ui/src/pages/ResetPassword.vue       | 132 ++++++++++++++-------------
 ui/src/stores/orderentryStore.js     |   5 +
 6 files changed, 206 insertions(+), 191 deletions(-)

diff --git a/ui/src/pages/ChangePassword.vue b/ui/src/pages/ChangePassword.vue
index 0265f43..7ada2f3 100644
--- a/ui/src/pages/ChangePassword.vue
+++ b/ui/src/pages/ChangePassword.vue
@@ -11,6 +11,7 @@ Mevcut şifrenizi girerek yeni şifre belirleyin
 
 <q-separator />
 
+<q-form @submit.prevent="submit">
 <q-card-section>
 <q-input
 v-model="current"
@@ -46,13 +47,14 @@ class="bg-red-1 text-red q-mt-md"
 <q-card-actions align="right">
 <q-btn
 v-if="canUpdateSystem"
+type="submit"
 label="GÜNCELLE"
 color="primary"
 :loading="loading"
 :disable="!canSubmit"
-@click="submit"
 />
 </q-card-actions>
+</q-form>
 </q-card>
 
 </q-page>
diff --git a/ui/src/pages/FirstPasswordChange.vue b/ui/src/pages/FirstPasswordChange.vue
index f0867e6..abe0efe 100644
--- a/ui/src/pages/FirstPasswordChange.vue
+++ b/ui/src/pages/FirstPasswordChange.vue
@@ -8,48 +8,50 @@
         </div>
       </q-card-section>
 
-      <q-card-section class="q-gutter-md">
-        <q-input
-          v-model="currentPassword"
-          type="password"
-          label="Mevcut Şifre"
-          outlined
-          dense
-        />
+      <q-form @submit.prevent="submit">
+        <q-card-section class="q-gutter-md">
+          <q-input
+            v-model="currentPassword"
+            type="password"
+            label="Mevcut Şifre"
+            outlined
+            dense
+          />
 
-        <q-input
-          v-model="newPassword"
-          type="password"
-          label="Yeni Şifre"
-          outlined
-          dense
-        />
+          <q-input
+            v-model="newPassword"
+            type="password"
+            label="Yeni Şifre"
+            outlined
+            dense
+          />
 
-        <q-input
-          v-model="newPassword2"
-          type="password"
-          label="Yeni Şifre (Tekrar)"
-          outlined
-          dense
-        />
+          <q-input
+            v-model="newPassword2"
+            type="password"
+            label="Yeni Şifre (Tekrar)"
+            outlined
+            dense
+          />
 
-        <q-banner
-          v-if="error"
-          class="bg-red-1 text-red q-mt-sm"
-          rounded
-        >
-          {{ error }}
-        </q-banner>
-      </q-card-section>
+          <q-banner
+            v-if="error"
+            class="bg-red-1 text-red q-mt-sm"
+            rounded
+          >
+            {{ error }}
+          </q-banner>
+        </q-card-section>
 
-      <q-card-actions align="right">
-        <q-btn
-          label="Kaydet"
-          color="primary"
-          :loading="loading"
-          @click="submit"
-        />
-      </q-card-actions>
+        <q-card-actions align="right">
+          <q-btn
+            type="submit"
+            label="Kaydet"
+            color="primary"
+            :loading="loading"
+          />
+        </q-card-actions>
+      </q-form>
     </q-card>
   </q-page>
 </template>
diff --git a/ui/src/pages/MainPage.vue b/ui/src/pages/MainPage.vue
index 83c1ca7..a9118b6 100644
--- a/ui/src/pages/MainPage.vue
+++ b/ui/src/pages/MainPage.vue
@@ -10,66 +10,68 @@
         <div class="login-title q-mt-sm">Kullanıcı Girişi</div>
       </q-card-section>
 
-      <!-- FORM -->
-      <q-card-section>
-        <q-input
-          v-model="username"
-          label="Kullanıcı Adı"
-          dense
-          standout="bg-white"
-          class="q-mb-md custom-input"
-          autocomplete="username"
-        />
+      <q-form @submit.prevent="login">
+        <!-- FORM -->
+        <q-card-section>
+          <q-input
+            v-model="username"
+            label="Kullanıcı Adı"
+            dense
+            standout="bg-white"
+            class="q-mb-md custom-input"
+            autocomplete="username"
+          />
 
-        <q-input
-          v-model="password"
-          type="password"
-          label="Şifre"
-          dense
-          standout="bg-white"
-          class="custom-input"
-          autocomplete="current-password"
-        />
+          <q-input
+            v-model="password"
+            type="password"
+            label="Şifre"
+            dense
+            standout="bg-white"
+            class="custom-input"
+            autocomplete="current-password"
+          />
 
-        <div class="q-mt-md row items-center justify-between">
-          <div>
-            <q-checkbox
-              v-model="rememberUser"
-              label="Kullanıcıyı hatırla"
-              color="secondary"
-              dense
-            />
-            <q-checkbox
-              v-model="rememberPass"
-              label="Parolayı kaydet"
-              color="secondary"
+          <div class="q-mt-md row items-center justify-between">
+            <div>
+              <q-checkbox
+                v-model="rememberUser"
+                label="Kullanıcıyı hatırla"
+                color="secondary"
+                dense
+              />
+              <q-checkbox
+                v-model="rememberPass"
+                label="Parolayı kaydet"
+                color="secondary"
+                dense
+              />
+            </div>
+
+            <q-btn
+              flat
               dense
+              color="primary"
+              label="Şifremi Unuttum"
+              @click="forgotOpen = true"
             />
           </div>
+        </q-card-section>
 
+        <!-- ACTION -->
+        <q-card-actions align="center">
           <q-btn
-            flat
-            dense
+            type="submit"
+            label="Giriş Yap"
             color="primary"
-            label="Şifremi Unuttum"
-            @click="forgotOpen = true"
+            glossy
+            unelevated
+            icon="login"
+            class="full-width"
+            :loading="loading"
           />
-        </div>
-      </q-card-section>
-
-      <!-- ACTION -->
-      <q-card-actions align="center">
-        <q-btn
-          label="Giriş Yap"
-          color="primary"
-          glossy
-          unelevated
-          icon="login"
-          class="full-width"
-          :loading="loading"
-          @click="login"
-        />
-      </q-card-actions>
+        </q-card-actions>
+      </q-form>
     </q-card>
 
     <!-- 🔐 FORGOT PASSWORD -->
diff --git a/ui/src/pages/MePassword.vue b/ui/src/pages/MePassword.vue
index 3030e89..13a579c 100644
--- a/ui/src/pages/MePassword.vue
+++ b/ui/src/pages/MePassword.vue
@@ -11,46 +11,48 @@
 
       <q-separator />
 
-      <q-card-section class="q-gutter-sm">
-        <q-input
-          v-model="current"
-          type="password"
-          label="Mevcut Şifre"
-          dense filled
-        />
+      <q-form @submit.prevent="submit">
+        <q-card-section class="q-gutter-sm">
+          <q-input
+            v-model="current"
+            type="password"
+            label="Mevcut Şifre"
+            dense filled
+          />
 
-        <q-input
-          v-model="password"
-          type="password"
-          label="Yeni Şifre"
-          dense filled
-        />
+          <q-input
+            v-model="password"
+            type="password"
+            label="Yeni Şifre"
+            dense filled
+          />
 
-        <q-input
-          v-model="password2"
-          type="password"
-          label="Yeni Şifre (Tekrar)"
-          dense filled
-        />
+          <q-input
+            v-model="password2"
+            type="password"
+            label="Yeni Şifre (Tekrar)"
+            dense filled
+          />
 
-        <q-banner
-          v-if="error"
-          class="bg-red-1 text-red q-mt-sm"
-          rounded
-        >
-          {{ error }}
-        </q-banner>
-      </q-card-section>
+          <q-banner
+            v-if="error"
+            class="bg-red-1 text-red q-mt-sm"
+            rounded
+          >
+            {{ error }}
+          </q-banner>
+        </q-card-section>
 
-      <q-card-actions align="right">
-        <q-btn
-          label="GÜNCELLE"
-          color="primary"
-          :loading="loading"
-          :disable="!canSubmit"
-          @click="submit"
-        />
-      </q-card-actions>
+        <q-card-actions align="right">
+          <q-btn
+            type="submit"
+            label="GÜNCELLE"
+            color="primary"
+            :loading="loading"
+            :disable="!canSubmit"
+          />
+        </q-card-actions>
+      </q-form>
 
     </q-card>
   </q-page>
diff --git a/ui/src/pages/ResetPassword.vue b/ui/src/pages/ResetPassword.vue
index d89dc50..c4d7d48 100644
--- a/ui/src/pages/ResetPassword.vue
+++ b/ui/src/pages/ResetPassword.vue
@@ -21,76 +21,78 @@
 
       <q-separator />
 
-      <q-card-section>
-        <!-- NEW PASSWORD -->
-        <q-input
-          v-model="password"
-          :type="showPassword ? 'text' : 'password'"
-          label="Yeni Parola"
-          dense
-          filled
-          :rules="[passwordRule]"
-        >
-          <template #append>
-            <q-icon
-              :name="showPassword ? 'visibility_off' : 'visibility'"
-              class="cursor-pointer"
-              @click="showPassword = !showPassword"
-            />
-          </template>
-        </q-input>
+      <q-form @submit.prevent="submit">
+        <q-card-section>
+          <!-- NEW PASSWORD -->
+          <q-input
+            v-model="password"
+            :type="showPassword ? 'text' : 'password'"
+            label="Yeni Parola"
+            dense
+            filled
+            :rules="[passwordRule]"
+          >
+            <template #append>
+              <q-icon
+                :name="showPassword ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="showPassword = !showPassword"
+              />
+            </template>
+          </q-input>
 
-        <!-- STRENGTH -->
-        <div class="q-mt-xs">
-          <q-linear-progress
-            :value="passwordStrength.value"
-            :color="passwordStrength.color"
-            rounded
-            size="6px"
-          />
-          <div class="text-caption q-mt-xs" :class="passwordStrength.textColor">
-            {{ passwordStrength.label }}
+          <!-- STRENGTH -->
+          <div class="q-mt-xs">
+            <q-linear-progress
+              :value="passwordStrength.value"
+              :color="passwordStrength.color"
+              rounded
+              size="6px"
+            />
+            <div class="text-caption q-mt-xs" :class="passwordStrength.textColor">
+              {{ passwordStrength.label }}
+            </div>
           </div>
-        </div>
 
-        <!-- CONFIRM -->
-        <q-input
-          v-model="password2"
-          :type="showPassword2 ? 'text' : 'password'"
-          label="Parola Tekrar"
-          dense
-          filled
-          class="q-mt-sm"
-          :rules="[confirmRule]"
-        >
-          <template #append>
-            <q-icon
-              :name="showPassword2 ? 'visibility_off' : 'visibility'"
-              class="cursor-pointer"
-              @click="showPassword2 = !showPassword2"
-            />
-          </template>
-        </q-input>
+          <!-- CONFIRM -->
+          <q-input
+            v-model="password2"
+            :type="showPassword2 ? 'text' : 'password'"
+            label="Parola Tekrar"
+            dense
+            filled
+            class="q-mt-sm"
+            :rules="[confirmRule]"
+          >
+            <template #append>
+              <q-icon
+                :name="showPassword2 ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="showPassword2 = !showPassword2"
+              />
+            </template>
+          </q-input>
 
-        <!-- ERROR -->
-        <q-banner
-          v-if="error"
-          class="bg-red-1 text-red q-mt-md"
-          rounded
-        >
-          {{ error }}
-        </q-banner>
-      </q-card-section>
+          <!-- ERROR -->
+          <q-banner
+            v-if="error"
+            class="bg-red-1 text-red q-mt-md"
+            rounded
+          >
+            {{ error }}
+          </q-banner>
+        </q-card-section>
 
-      <q-card-actions align="right">
-        <q-btn
-          label="PAROLAYI GÜNCELLE"
-          color="primary"
-          :loading="loading"
-          :disable="!canSubmit"
-          @click="submit"
-        />
-      </q-card-actions>
+        <q-card-actions align="right">
+          <q-btn
+            type="submit"
+            label="PAROLAYI GÜNCELLE"
+            color="primary"
+            :loading="loading"
+            :disable="!canSubmit"
+          />
+        </q-card-actions>
+      </q-form>
     </q-card>
 
     <!-- ❌ TOKEN INVALID -->
diff --git a/ui/src/stores/orderentryStore.js b/ui/src/stores/orderentryStore.js
index 6030e9b..604d5c9 100644
--- a/ui/src/stores/orderentryStore.js
+++ b/ui/src/stores/orderentryStore.js
@@ -3335,6 +3335,11 @@ export function normalizeBedenLabel(v) {
   return s
 }
 
+// Backward-compatible alias kept for older call sites/bundles.
+export function normalizeBeden(v) {
+  return normalizeBedenLabel(v)
+}
+
 /* ===========================================================
    Size Group Detection
    - Core logic aligned with backend detectBedenGroupGo