From 7776e24dddcbedfba5042e5153ff50d6218a84bf Mon Sep 17 00:00:00 2001
From: Kevser <>
Date: Mon, 28 Jul 2025 18:52:04 +0300
Subject: [PATCH] =?UTF-8?q?-=20Teminat=20durumu=20zaman=20a=C5=9F=C4=B1m?=
 =?UTF-8?q?=C4=B1=20iade=20i=C3=A7in=20de=20ek=20alanlar=20a=C3=A7=C4=B1ld?=
 =?UTF-8?q?=C4=B1=20-=20iadeSay=C4=B1=20alan=C4=B1=20eklendi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TabPiyangoTeminatDurumu.vue       | 16 ++++++++++------
 .../panel/PanelPiyangoTeminatDurumuDisplay.vue   | 16 ++++++++++++++--
 src/module/cekilisler/service/piyangoServices.ts |  5 +++++
 .../cekilisler/service/piyangoTeminatService.ts  |  3 ++-
 .../cekilisler/stores/piyangoTeminatStore.ts     |  1 +
 .../validation/piyangoTeminatValidationStore.ts  |  6 ++++++
 6 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue b/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue
index 22fbce6..945002d 100644
--- a/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue
+++ b/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue
@@ -22,13 +22,20 @@
         v-if="
           usersStore.isPanelUser ||
           (!usersStore.isPanelUser &&
+            piyangoStore.lotteryApprove !== 0 &&
+            piyangoStore.lotteryApprove !== 1 &&
+            piyangoStore.lotteryApprove !== 2 &&
             piyangoStore.lotteryApprove !== 3 &&
             !piyangoTeminatStore.isNew)
         " />
       <panel-piyango-teminat-durumu
         v-if="
           !usersStore.isPanelUser &&
-          (piyangoStore.lotteryApprove === 3 || piyangoTeminatStore.isNew)
+          (piyangoStore.lotteryApprove === 0 ||
+            piyangoStore.lotteryApprove === 1 ||
+            piyangoStore.lotteryApprove === 2 ||
+            piyangoStore.lotteryApprove === 3 ||
+            piyangoTeminatStore.isNew)
         " />
     </template>
     <template #footerButton>
@@ -43,7 +50,7 @@
   </panel-wrapper>
 </template>
 <script setup lang="ts">
-  import { ref, computed,onBeforeMount } from 'vue'
+  import { ref, computed, onBeforeMount } from 'vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
 
   import PanelPiyangoTeminatDurumu from './panel/PanelPiyangoTeminatDurumu.vue'
@@ -143,10 +150,7 @@
   ])
 
   const teminatAddAction = computed(() => {
-    if (
-      !usersStore.isPanelUser
-    )
-      return NewTeminatDurum
+    if (!usersStore.isPanelUser) return NewTeminatDurum
     else return ''
   })
 
diff --git a/src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue b/src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue
index 01614f2..737f106 100644
--- a/src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue
+++ b/src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue
@@ -12,21 +12,33 @@
       @change="OnKeyup"
       :disabled="!usersStore.isPanelUser" />
 
-    <template v-if="piyangoTeminatStore.piyangoTeminatFormData.state === 2">
+    <template
+      v-if="
+        piyangoTeminatStore.piyangoTeminatFormData.state === 2 ||
+        piyangoTeminatStore.piyangoTeminatFormData.state === 3
+      ">
       <form-date
         type="date"
+        half
         modelKey="iadeTarihi"
         v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi"
         label="İlan Tarihi"
         :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeTarihi"
         @change="OnKeyup" />
+      <form-input
+        modelKey="iadeSayi"
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeSayi"
+        half
+        label="Sayısı"
+        @keyup="OnKeyup"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeSayi" />
       <form-file
         v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeFile"
         elclass="panel-documents-item"
         :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeFile"
         @change="OnKeyup" />
     </template>
-    
+
     <form-display
       v-model="piyangoTeminatStore.piyangoTeminatFormData.amount"
       half
diff --git a/src/module/cekilisler/service/piyangoServices.ts b/src/module/cekilisler/service/piyangoServices.ts
index 6ef4a7b..988306c 100644
--- a/src/module/cekilisler/service/piyangoServices.ts
+++ b/src/module/cekilisler/service/piyangoServices.ts
@@ -52,6 +52,11 @@ export const usePiyangoServices = defineStore('piyangoServices', () => {
   }
   const GetPiyangoTeminatDurumList = async () => {
     if (piyangoDataStore.piyangoTeminatDurumlari.length === 0) {
+      /*
+        1: Açık
+        2: İade
+        3: Zaman Aşımı İade
+      */
       let data = await dataStore.dataGet('TeminantStates/Durumlar')
       piyangoDataStore.piyangoTeminatDurumlari = data
     }
diff --git a/src/module/cekilisler/service/piyangoTeminatService.ts b/src/module/cekilisler/service/piyangoTeminatService.ts
index edae094..beb7a73 100644
--- a/src/module/cekilisler/service/piyangoTeminatService.ts
+++ b/src/module/cekilisler/service/piyangoTeminatService.ts
@@ -48,8 +48,9 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
       )
 
       if (usersStore.isPanelUser) {
-        if (piyangoTeminatStore.piyangoTeminatFormData.state !== 2) {
+        if (piyangoTeminatStore.piyangoTeminatFormData.state === 1) {
           piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi = ''
+          piyangoTeminatStore.piyangoTeminatFormData.iadeSayi = ''
           piyangoTeminatStore.piyangoTeminatFormData.iadeFile = ''
         }
         dataForm.append(
diff --git a/src/module/cekilisler/stores/piyangoTeminatStore.ts b/src/module/cekilisler/stores/piyangoTeminatStore.ts
index 28dabb3..02cf4c2 100644
--- a/src/module/cekilisler/stores/piyangoTeminatStore.ts
+++ b/src/module/cekilisler/stores/piyangoTeminatStore.ts
@@ -25,6 +25,7 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
     description: '',
     file: '',
     iadeTarihi: '',
+    iadeSayi: '',
     iadeFile: ''
   })
 
diff --git a/src/module/cekilisler/validation/piyangoTeminatValidationStore.ts b/src/module/cekilisler/validation/piyangoTeminatValidationStore.ts
index 81547a2..aa3c444 100644
--- a/src/module/cekilisler/validation/piyangoTeminatValidationStore.ts
+++ b/src/module/cekilisler/validation/piyangoTeminatValidationStore.ts
@@ -30,6 +30,12 @@ export const usePiyangoTeminatValidationStore = defineStore(
           'iadeTarihi',
           'Lütfen iade tarihini seçiniz.'
         )
+        validationStore.IsFieldEmpty(
+          piyangoTeminatStore.piyangoTeminatFormData,
+          invalidTexts,
+          'iadeSayi',
+          'Lütfen iade sayı no giriniz.'
+        )
       }
 
       validationStore.IsFieldEmpty(