dokuman silme

src/module/cekilisler/components/TabPiyangoKatilimciListesi.vue

@@ -315,10 +315,11 @@
         headers: { 'Content-Type': 'multipart/form-data' }
       }
     )
-
-    if (response.data !== 'errorfalse') {
+console.log('excel response',response)
+    if (response !== 'errorfalse') {
       // Başarı işlemi zaten onCompleted içinde yapıldı
     } else {
+
       // Hata olursa paneli kapat
       uploadProgressPanel.value = false
     }

src/module/cekilisler/components/display/FormPiyangoDocumentsDisplay.vue

@@ -63,7 +63,7 @@
   }
 
   const DeleteDocument = async (id: number | string) => {
-    var dt = await dataStore.dataDelete('Popup/' + id)
+    var dt = await dataStore.dataDelete('Dokuman/' + id)
 
     if (dt !== 'errorfalse') {
       dialogStore.CloseDialog('deletedoc')

src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue

@@ -34,9 +34,15 @@
         :invalidText="piyangoTeminatValidationStore.invalidTexts.refundCount" />
       <form-file
         v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl"
+        label='Klasör Arşiv'
         elclass="panel-documents-item"
         :invalidText="piyangoTeminatValidationStore.invalidTexts.refundDocumentUrl"
         @change="OnKeyup" />
+      <form-input
+        modelKey="refundDescription"
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDescription"
+        label="İade Açıklama"
+        @keyup="OnKeyup"  />
     </template>
 
     <form-display

src/module/cekilisler/service/piyangoTeminatService.ts

@@ -52,6 +52,7 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
           piyangoTeminatStore.piyangoTeminatFormData.refundDate = ''
           piyangoTeminatStore.piyangoTeminatFormData.refundCount = ''
           piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl = ''
+          piyangoTeminatStore.piyangoTeminatFormData.refundDescription = ''
         }
         dataForm.append(
           'refundDate',
@@ -65,6 +66,10 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
           'refundDocumentUrl',
           piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl
         )
+        dataForm.append(
+          'refundDescription',
+          piyangoTeminatStore.piyangoTeminatFormData.refundDescription
+        )
       }
 
       if (piyangoTeminatStore.isNew) {

src/module/cekilisler/stores/piyangoTeminatStore.ts

@@ -26,7 +26,8 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
     file: '',
     refundDate: '',
     refundCount: '',
-    refundDocumentUrl: ''
+    refundDocumentUrl: '',
+    refundDescription:''
   })
 
   const piyangoTeminatFormData = reactive<Record<string, any>>({})

src/module/cekilisler/views/PiyangoListe.vue

@@ -80,12 +80,6 @@
     }
 
     header.push(
-      {
-        name: 'piyangoId',
-        title: 'Piyango ID',
-        sort: true,
-        style: { width: '10%' }
-      },
       {
         name: 'baslik',
         title: 'Başlık',

src/module/muhasebe/components/TabIzinBedelOraniListe.vue

@@ -27,7 +27,6 @@
 </template>
 <script setup lang="ts">
   import { ref, computed, onBeforeMount } from 'vue'
-  import ListTableContent from '@/components/global/ListTableContent.vue'
   import { useIzinBedelOraniStore } from '../store/izinBedelOraniStore'
   import { useIzinBedelOraniService } from '../service/izinBedelOraniService'
 

src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue

@@ -14,7 +14,7 @@
           Başvuru Bedelini Muhasebeleştir
         </button>
         <button
-          @click="IzinBedeliMuhasebelestir"
+          @click="OpenIzinBedeliModal"
           v-if="
             piyangoStore.lotteryApprove === 4 &&
             piyangoStore.lotteryData.amacpiyangoId !== 3 &&
@@ -30,6 +30,40 @@
       </div>
     </div>
     <piyango-bilgileri-display-content v-if="loaded" :isPreview="isPreview" />
+    
+    <!-- İzin Bedeli Modal -->
+    <teleport to="body">
+      <div v-if="showIzinBedeliModal" class="modal-overlay" @click="CloseIzinBedeliModal">
+        <div class="modal-content" @click.stop>
+          <div class="modal-header">
+            <h3>İzin Bedeli Muhasebeleştir</h3>
+            <button class="modal-close" @click="CloseIzinBedeliModal">×</button>
+          </div>
+                     <div class="modal-body">
+             <div class="form-group">
+               <label>Oran Seçiniz:</label>
+               <select @change="OnOranChange" class="form-select">
+                 <option value="">Lütfen bir oran seçiniz</option>
+                 <option 
+                   v-for="oran in izinBedelOranlari" 
+                   :key="oran.id" 
+                   :value="oran.id">
+                   {{ oran.oran }}% - {{ oran.adi }}
+                 </option>
+               </select>
+             </div>
+           </div>
+          <div class="modal-footer">
+            <button class="button-c button-cancel" @click="CloseIzinBedeliModal">
+              İptal
+            </button>
+            <button class="button-c button-save" @click="IzinBedeliMuhasebelestir">
+              Muhasebeleştir
+            </button>
+          </div>
+        </div>
+      </div>
+    </teleport>
   </div>
 </template>
 <script setup lang="ts">
@@ -57,6 +91,10 @@
   const piyangoStore = usePiyangoStore()
 
   const loaded = ref<boolean>(false)
+  const showIzinBedeliModal = ref<boolean>(false)
+  const selectedOran = ref<number | null>(null)
+  const izinBedelOranlari = ref<Record<string, any>[]>([])
+  const selectedOranId = ref<number | null>(null)
 
   const GetData = async () => {
     let data = await dataStore.dataGet(
@@ -95,6 +133,13 @@
       Object.assign(piyangoStore.araciUyeData, data)
     }
   }
+
+  const GetIzinBedelOranlari = async () => {
+    let data = await dataStore.dataGet('IzinBedelOrani/aktif')
+    if (data !== 'errorfalse') {
+      izinBedelOranlari.value = data
+    }
+  }
   const BasvuruBedeliMuhasebelestir = async () => {
     let data = await dataStore.dataGet(
       'MuhasebeSettings/BasvuruBedeli/' + piyangoStore.selectedLottery
@@ -111,15 +156,50 @@
     }
   }
 
+  const OpenIzinBedeliModal = async () => {
+    await GetIzinBedelOranlari()
+    showIzinBedeliModal.value = true
+    selectedOran.value = null
+    selectedOranId.value = null
+  }
+
+  const CloseIzinBedeliModal = () => {
+    showIzinBedeliModal.value = false
+    selectedOran.value = null
+    selectedOranId.value = null
+  }
+
+  const OnOranChange = (event: Event) => {
+    const target = event.target as HTMLSelectElement
+    const selectedId = parseInt(target.value)
+    const selectedOranData = izinBedelOranlari.value.find(item => item.id === selectedId)
+    
+    if (selectedOranData) {
+      selectedOranId.value = selectedOranData.id
+      selectedOran.value = selectedOranData.oran
+    } else {
+      selectedOranId.value = null
+      selectedOran.value = null
+    }
+  }
+
   const IzinBedeliMuhasebelestir = async () => {
+    if (selectedOranId.value === null) {
+      toastStore.AddToast('Lütfen bir oran seçiniz', 'error', 5000)
+      return
+    }
+
     let data = await dataStore.dataGet(
-      'MuhasebeSettings/IzinBasvuruBedeli/' + piyangoStore.selectedLottery
+      'MuhasebeSettings/IzinBasvuruBedeli/' + piyangoStore.selectedLottery + '/' + selectedOranId.value
     )
     if (data !== 'errorfalse') {
       toastStore.AddToast('İzin bedeli başarıyla muhasebeleştirildi. Fatura No: '+data.izinBelgeNo , 'success', 30000)
       loaded.value = false
       await GetData()
       piyangoStore.lotteryIzinBedeliStatus = true
+      showIzinBedeliModal.value = false
+      selectedOran.value = null
+      selectedOranId.value = null
       setTimeout(() => {
         loaded.value = true
       }, 30)
@@ -131,3 +211,133 @@
     await GetData()
   })
 </script>
+
+<style scoped>
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.modal-content {
+  background: white;
+  border-radius: 8px;
+  padding: 0;
+  max-width: 500px;
+  width: 90%;
+  max-height: 90vh;
+  overflow-y: auto;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 24px;
+  border-bottom: 1px solid #e5e7eb;
+}
+
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+  color: #1f2937;
+}
+
+.modal-close {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  color: #6b7280;
+  padding: 0;
+  width: 30px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  transition: background-color 0.2s;
+}
+
+.modal-close:hover {
+  background-color: #f3f4f6;
+}
+
+.modal-body {
+  padding: 24px;
+}
+
+.form-group {
+  margin-bottom: 16px;
+}
+
+.form-group label {
+  display: block;
+  margin-bottom: 8px;
+  font-weight: 500;
+  color: #374151;
+}
+
+.form-select {
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #d1d5db;
+  border-radius: 6px;
+  font-size: 14px;
+  background-color: white;
+  transition: border-color 0.2s;
+}
+
+.form-select:focus {
+  outline: none;
+  border-color: #3b82f6;
+  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  padding: 20px 24px;
+  border-top: 1px solid #e5e7eb;
+  background-color: #f9fafb;
+  border-radius: 0 0 8px 8px;
+}
+
+.button-c {
+  padding: 10px 20px;
+  border: none;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.button-cancel {
+  background-color: #6b7280;
+  color: white;
+}
+
+.button-cancel:hover {
+  background-color: #4b5563;
+}
+
+.button-save {
+  background-color: #3b82f6;
+  color: white;
+}
+
+.button-save:hover {
+  background-color: #2563eb;
+}
+</style>

src/module/muhasebe/views/IzinBedelOrani.vue

@@ -55,7 +55,6 @@
 <script setup lang="ts">
   import { ref, onBeforeMount, computed } from 'vue'
   import AdminLayout from '@/layouts/AdminLayout.vue'
-  import { Breadcrumb, ListTableContent } from '@/components/global'
   import PanelWrapper from '@/components/PanelWrapper.vue'
   import { useIzinBedelOraniStore } from '../store/izinBedelOraniStore'
   import { useIzinBedelOraniService } from '../service/izinBedelOraniService'

src/stores/dataStore.ts

@@ -163,17 +163,23 @@ export const useDataStore = defineStore('dataStore', () => {
 
   const CheckApiError = async (status: number, data: Record<string, any>) => {
     if (status === 400) {
-      const errorKey = data['hata'] || data['errors']
+      const errorKey = typeof data === "string" ? data : data?.hata || data?.errors;
 
       if (errorKey !== undefined) {
+        if (Array.isArray(errorKey)) {
           errorKey.forEach((el: string) => {
-          toastStore.AddToast(el, 'alert')
-        })
+            toastStore.AddToast(el, "alert");
+          });
+        } else if (typeof errorKey === "string") {
+          toastStore.AddToast(errorKey, "alert");
         } else {
-        toastStore.AddToast('Bir hata oluştu.', 'alert')
-      }
+          toastStore.AddToast("Bir hata oluştu.", "alert");
+        }
+      } else {
+        toastStore.AddToast("Bir hata oluştu.", "alert");
       }
     }
+  };
 
   const GetCustomerTipList = async () => {
     if (globalDataStore.customerTips.length === 0) {