Merge pull request '- İade tarihi alan key leri değiştirildi' (#11) from Teminat-İade-Seçeneği-Geliştirmesi into main

Reviewed-on: #11

.env.development

@@ -0,0 +1,2 @@
+VITE_API_URL=http://panelapi.cekilisevitest.gov.tr/
+VITE_SOCKET_URL=http://panelapi.cekilisevitest.gov.tr/uploadHub

.env.localdev

@@ -0,0 +1,2 @@
+VITE_API_URL=https://localhost:7241/
+VITE_SOCKET_URL=https://localhost:7241/uploadHub

.env.production

@@ -0,0 +1,2 @@
+VITE_API_URL=https://panelapi.cekilisevi.gov.tr/
+VITE_SOCKET_URL=https://panelapi.cekilisevi.gov.tr/uploadHub

env.d.ts

@@ -1,2 +1,9 @@
 /// <reference types="vite/client" />
 
+interface ImportMetaEnv {
+  readonly VITE_API_URL: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

package.json

@@ -5,9 +5,12 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
+    "localdev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
+    "buildtest": "run-p type-check \"build-only-test {@}\" --",
     "preview": "vite preview",
     "build-only": "vite build",
+    "build-only-test": "vite build --mode development",
     "type-check": "vue-tsc --build --force"
   },
   "dependencies": {

src/assets/images/icons.svg

@@ -237,4 +237,18 @@
             d="M16.1362 14.1067H14.7781C14.3632 14.1067 14.0268 14.4424 14.0268 14.8564V19.8401C14.0268 20.2541 14.3632 20.5897 14.7781 20.5897H16.1362C16.5511 20.5897 16.8875 20.2541 16.8875 19.8401V14.8564C16.8875 14.4424 16.5511 14.1067 16.1362 14.1067Z"
         />
     </symbol>
+    <symbol id="trash" viewBox="0 0 20 22">
+        <path
+            d="M19.4015 6.14128H18.7672L18.8227 5.47865C18.8227 5.47865 18.8227 5.44229 18.8227 5.42613C18.8227 3.9837 17.6691 2.80795 16.2538 2.80795H14.8544V1.78976C14.8544 0.803906 14.0695 0.00390625 13.1022 0.00390625H6.88614C5.91885 0.00390625 5.13391 0.803906 5.13391 1.78976V2.80795H3.73451C2.31924 2.80795 1.16563 3.9837 1.16563 5.42613C1.16563 5.44229 1.16563 5.46249 1.16563 5.47865L1.22113 6.14128H0.586836C0.257797 6.14128 -0.0078125 6.41199 -0.0078125 6.74734C-0.0078125 7.08269 0.257797 7.3534 0.586836 7.3534H1.3242L2.35096 19.41C2.36682 20.8403 3.5125 21.9999 4.91984 21.9999H15.0645C16.4719 21.9999 17.6176 20.8403 17.6334 19.41L18.6602 7.3534H19.3975C19.7266 7.3534 19.9922 7.08269 19.9922 6.74734C19.9922 6.41199 19.7266 6.14128 19.3975 6.14128H19.4015ZM6.32321 1.78572C6.32321 1.46653 6.57692 1.21199 6.88614 1.21199H13.1022C13.4154 1.21199 13.6651 1.47057 13.6651 1.78572V2.80391H6.32321V1.78572ZM2.35492 5.40189C2.36682 4.63825 2.98129 4.02007 3.73451 4.02007H16.2578C17.011 4.02007 17.6255 4.63825 17.6374 5.40189L17.5739 6.14128H2.41835L2.35492 5.40189ZM16.452 19.3292C16.452 19.3292 16.452 19.3655 16.452 19.3817C16.452 20.1574 15.8336 20.7877 15.0725 20.7877H4.9238C4.16265 20.7877 3.54422 20.1574 3.54422 19.3817C3.54422 19.3655 3.54422 19.3453 3.54422 19.3292L2.52539 7.3534H17.4748L16.456 19.3292H16.452Z"
+        />
+        <path
+            d="M14.7236 13.9756H5.2687C4.93966 13.9756 4.67405 14.2463 4.67405 14.5817C4.67405 14.917 4.93966 15.1877 5.2687 15.1877H14.7196C15.0487 15.1877 15.3143 14.917 15.3143 14.5817C15.3143 14.2463 15.0487 13.9756 14.7196 13.9756H14.7236Z"
+        />
+        <path
+            d="M4.87227 11.6766H15.1161C15.4451 11.6766 15.7107 11.4059 15.7107 11.0706C15.7107 10.7352 15.4451 10.4645 15.1161 10.4645H4.87227C4.54323 10.4645 4.27762 10.7352 4.27762 11.0706C4.27762 11.4059 4.54323 11.6766 4.87227 11.6766Z"
+        />
+        <path
+            d="M14.3272 17.4867H5.66513C5.33609 17.4867 5.07048 17.7574 5.07048 18.0928C5.07048 18.4281 5.33609 18.6989 5.66513 18.6989H14.3232C14.6522 18.6989 14.9179 18.4281 14.9179 18.0928C14.9179 17.7574 14.6522 17.4867 14.3232 17.4867H14.3272Z"
+        />
+    </symbol>
 </svg>

src/assets/style/default.css

@@ -659,7 +659,9 @@ svg {
   max-width: 24px;
   max-height: 24px;
 }
-
+.ico-c.ico-btn:hover{
+  background-color: navy;
+}
 /* colors */
 .back-grad {
   padding: 6px 8px;
@@ -715,7 +717,11 @@ svg {
   color: #000;
   padding: 12px;
 }
-
+.back-grad-dgrey {
+  background-image: linear-gradient(24deg, #797979, #a1a1a1);
+  color: #000;
+  padding: 12px;
+}
 .back-grey {
   background-color: #f1f1f1;
 }

src/components/global/FileListItem.vue

@@ -18,12 +18,15 @@
             {{ fileName }}
           </div>
         </a>
-        <i
-          class="ico-c ico-section ico-section-header-btn ico-replace"
-          @click="OnClick"
-          v-if="editable">
-          <svg><use href="/src/assets/images/icons.svg#replace"></use></svg>
-        </i>
+        <div class="actions-c" v-if="editable || $slots.actionButtons">
+          <slot name="actionButtons"></slot>
+          <i
+            class="ico-c ico-section ico-btn back-grad-dgrey"
+            @click="OnClick"
+            v-if="editable">
+            <svg><use href="/src/assets/images/icons.svg#replace"></use></svg>
+          </i>
+        </div>
       </div>
     </div>
   </template>
@@ -35,12 +38,15 @@
         </div>
         <div v-else>{{ fileType.toLocaleUpperCase() }}</div>
       </a>
-      <i
-        class="ico-c ico-section ico-section-header-btn ico-replace"
-        @click="OnClick"
-        v-if="editable">
-        <svg><use href="/src/assets/images/icons.svg#replace"></use></svg>
-      </i>
+      <div class="actions-c actions-top" v-if="editable || $slots.actionButtons">
+        <slot name="actionButtons"></slot>
+        <i
+          class="ico-c ico-section ico-btn back-grad-dgrey"
+          @click="OnClick"
+          v-if="editable">
+          <svg><use href="/src/assets/images/icons.svg#replace"></use></svg>
+        </i>
+      </div>
     </div>
   </template>
 </template>
@@ -75,8 +81,8 @@
 
   if (props.filePath !== undefined && props.filePath !== null) {
     localFilePath.value = props.usePath
-      ? props.filePath as string
-      : (axios.defaults.baseURL as string + props.filePath as string) as string
+      ? (props.filePath as string)
+      : (((axios.defaults.baseURL as string) + props.filePath) as string as string)
 
     fileType.value = globalStore.FileType(localFilePath.value)
     fileName.value = globalStore.FileName(localFilePath.value)
@@ -96,8 +102,29 @@
     () => props.filePath,
     () => {
       localFilePath.value = props.usePath
-        ? props.filePath as string
-        : (axios.defaults.baseURL as string + props.filePath as string) as string
+        ? (props.filePath as string)
+        : (((axios.defaults.baseURL as string) + props.filePath) as string as string)
     }
   )
 </script>
+<style scoped>
+  .actions-c {
+    display: flex;
+    position: absolute;
+    right: 0;
+    height: 100%;
+    padding: 8px;
+    align-items: center;
+    pointer-events: fill;
+  }
+  .actions-c.actions-top{
+    align-items: flex-start;
+  }
+  .form-item-picture.only-image{
+    width: 140px;
+    height: 140px;
+  }
+  .actions-c .ico-btn:last-child {
+    margin-right: 0;
+  }
+</style>

src/components/global/FormCheckbox.vue

@@ -91,9 +91,9 @@
 
   const emit = defineEmits(['update:modelValue', 'change', 'click'])
 
-  const localValue = ref<
-    (string | number)[] | boolean | null | string | number | undefined
-  >(props.modelValue)
+  const localValue = ref<(string | number)[] | boolean | null | string | number|undefined>(
+    props.modelValue
+  )
 
   const InvalidMessageText = reactive<Record<string, any>>({})
   const InvalidMessages = computed<string>(() => {

src/components/global/FormDisplay.vue

@@ -14,7 +14,9 @@
         </span>
         <template v-if="modelText !== undefined && modelText !== ''">
           <template v-if="typeof modelText === 'string'">
-            <span>{{ price ? globalStore.toTrLocale(modelText) : modelText }}</span>
+            <span :class="[size ? 'form-item-size form-item-size-' + size : '']">
+              {{ price ? globalStore.toTrLocale(modelText) : modelText }}
+            </span>
           </template>
           <template v-if="typeof modelText === 'object'">
             <ul>
@@ -25,7 +27,9 @@
           </template>
         </template>
         <template v-else>
-          <span>{{ price ? globalStore.toTrLocale(localValue) : localValue }}</span>
+          <span :class="[size ? 'form-item-size form-item-size-' + size : '']">
+            {{ price ? globalStore.toTrLocale(localValue) : localValue }}
+          </span>
         </template>
         <span
           class="form-item-alert"
@@ -64,6 +68,7 @@
     modelText?: any
     invalidText?: string
     price?: boolean
+    size?: number | string
   }
   const props = withDefaults(defineProps<Props>(), {
     half: false,
@@ -71,13 +76,23 @@
   })
   const localValue = ref<any>(props.modelValue)
 
-  if (props.type === 'date' && props.modelValue !== null && props.modelValue !== undefined && props.modelValue !== '')
+  if (
+    props.type === 'date' &&
+    props.modelValue !== null &&
+    props.modelValue !== undefined &&
+    props.modelValue !== ''
+  )
     localValue.value = dateStore.dateFormat({
       date: props.modelValue as Date,
       pattern: 'dd-mm-yy'
     })
 
-  if (props.type === 'datetime' && props.modelValue !== null && props.modelValue !== undefined && props.modelValue !== '')
+  if (
+    props.type === 'datetime' &&
+    props.modelValue !== null &&
+    props.modelValue !== undefined &&
+    props.modelValue !== ''
+  )
     localValue.value = dateStore.dateFormat({
       date: props.modelValue as Date,
       pattern: 'dd-mm-yy-t'
@@ -108,3 +123,14 @@
     }
   )
 </script>
+<style scoped>
+  .form-item-size {
+    font-weight: 600;
+  }
+  .form-item-size-1 {
+    font-size: 1.2em;
+  }
+  .form-item-size-2 {
+    font-size: 1.5em;
+  }
+</style>

src/init/axios-init.ts

@@ -2,7 +2,7 @@ import axios from 'axios'
 import { useUsersStore } from '@/stores/usersStore'
 import router from '@/router'
 
-axios.defaults.baseURL = 'https://panelapi.cekilisevi.gov.tr/'
+axios.defaults.baseURL = import.meta.env.VITE_API_URL
 //axios.defaults.timeout = 2000;
 axios.defaults.headers['Content-Type'] = 'application/json; charset=utf-8'
 import { useDataStore } from '@/stores/dataStore'

src/layouts/admin-inc/SideMenu.vue

@@ -109,7 +109,7 @@
     {
       title: 'Site Yönetimi',
       ico: 'sitemanagement',
-      show: usersStore.isPanelUser && !usersStore.isAccounting,
+      show: usersStore.isSuperAdmin,
       sub: [
         {
           title: 'Yeni Sayfa',
@@ -142,6 +142,10 @@
           title: 'Piyango Listesi',
           to: '/muhasebe/piyango-listesi'
         },
+        {
+          title: 'İzin Bedel Oranı',
+          to: '/muhasebe/izin-bedel-orani'
+        },
         {
           title: 'Ayarlar',
           to: '/muhasebe/ayarlar'

src/module/auth/views/Register.vue

@@ -355,6 +355,8 @@
   const globalDataStore = useGlobalDataStore()
   import { useValidationStore } from '@/stores/validationStore'
   const validationStore = useValidationStore()
+  import { useUsersStore } from '@/stores/usersStore'
+  const usersStore = useUsersStore()
   import { useAuthValidationStore } from '../stores/authValidationStore'
   const authValidationStore = useAuthValidationStore()
   import router from '@/router'
@@ -363,6 +365,12 @@
   const uyeBilgileriStore = useUyeBilgileriStore()
   uyeBilgileriStore.ResetStore()
 
+  interface IIl {
+    [key: string]: any
+    ad: string
+    id: number
+  }
+
   const kvkkCheck = ref([
     {
       label: '',

src/module/cekilisler/components/TabPiyangoDosyaKapama.vue

@@ -1,10 +0,0 @@
-<template>
-  <div class="form-content">
-    <div class="form-inner-content form-inner-content-left">
-      <form-piyango-dosya-kapama/>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-  import FormPiyangoDosyaKapama from './form/FormPiyangoDosyaKapama.vue'
-</script>

src/module/cekilisler/components/TabPiyangoKatilimciListesi.vue

@@ -57,7 +57,7 @@
         <panel-katilimci-document />
       </template>
       <template #footerButton>
-        <button class="button-c button-save" @click="FileUpload">Yükle</button>
+        <button class="button-c button-save" @click="FileUpload" :disabled="uploadProgressPanel">Yükle</button>
       </template>
     </panel-wrapper>
     <panel-wrapper

src/module/cekilisler/components/TabPiyangoOnayDurumu.vue

@@ -8,6 +8,11 @@
         <form-piyango-onay-kisiler />
       </div>
     </!--div-->
+    <div class="form-inner-content">
+      <div class="form-part">
+        <form-piyango-onay-durum />
+      </div>
+    </div>
     <div class="form-inner-content">
       <div class="form-part">
         <form-piyango-onay-log />
@@ -16,6 +21,7 @@
   </div>
 </template>
 <script setup lang="ts">
+  import FormPiyangoOnayDurum from './form/FormPiyangoOnayDurum.vue'
   import FormPiyangoOnayLog from './form/FormPiyangoOnayLog.vue'
   import FormPiyangoOnay from './form/FormPiyangoOnay.vue'
   import FormPiyangoOnayKisiler from './form/FormPiyangoOnayKisiler.vue'

src/module/cekilisler/components/TabPiyangoOnayDurumuUser.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="form-inner-content">
       <div class="form-part">
-        <form-piyango-onay-log />
+        <form-piyango-onay-durum />
       </div>
     </div>
   </div>
@@ -19,6 +19,6 @@
   import { usePiyangoStore } from '../stores/piyangoStore'
   const piyangoStore = usePiyangoStore()
 
-  import FormPiyangoOnayLog from './form/FormPiyangoOnayLog.vue'
+  import FormPiyangoOnayDurum from './form/FormPiyangoOnayDurum.vue'
   import FormPiyangoUserOnayaGonder from './form/FormPiyangoUserOnayaGonder.vue'
 </script>

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>
@@ -36,14 +43,22 @@
         class="button-c button-save"
         :disabled="!piyangoTeminatValidationStore.formChanged"
         @click="piyangoTeminatService.SaveTeminatDurum"
-        v-if="piyangoTeminatStore.isNew || usersStore.isPanelUser">
+        v-if="
+          usersStore.isPanelUser ||
+          (!usersStore.isPanelUser &&
+            (piyangoStore.lotteryApprove === 0 ||
+              piyangoStore.lotteryApprove === 1 ||
+              piyangoStore.lotteryApprove === 2 ||
+              piyangoStore.lotteryApprove === 3)) ||
+          piyangoTeminatStore.isNew
+        ">
         Kaydet
       </button>
     </template>
   </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 +158,7 @@
   ])
 
   const teminatAddAction = computed(() => {
-    if (
-      !usersStore.isPanelUser
-    )
-      return NewTeminatDurum
+    if (!usersStore.isPanelUser) return NewTeminatDurum
     else return ''
   })
 

src/module/cekilisler/components/content/LotteryStates.vue

@@ -84,7 +84,7 @@
       Başvuru admin tarafından kapsam dışı olarak işaretlenmiştir.
     </template>
   </div>
-  <div class="form-inner-comment alert-d" v-if="piyangoStore.lotteryApprove === 11">
+  <div class="form-inner-comment alert-d" v-if="piyangoStore.lotteryApprove === 13">
     Kampanya için cezai işlem uygulanmıştır.
   </div>
 </template>

src/module/cekilisler/components/content/PiyangoBilgileriDisplayContent.vue

@@ -3,6 +3,10 @@
     <lottery-states
       :piyangoAmac="piyangoStore.lotteryData.amacpiyangoId"
       v-if="!isPreview" />
+    <form-display
+      v-model="piyangoStore.lotteryData.piyangoId"
+      label="Piyango ID"
+      size="1" />
     <template
       v-if="
         usersStore.isPanelUser &&

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

@@ -39,7 +39,7 @@
   </panel-wrapper>
 </template>
 <script setup lang="ts">
-  import { ref, onBeforeMount } from 'vue'
+  import { ref, reactive, computed, onBeforeMount } from 'vue'
   import { usePDF } from 'vue3-pdfmake'
   import { useUsersStore } from '@/stores/usersStore'
   const usersStore = useUsersStore()

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

@@ -10,7 +10,15 @@
             :editable="false"
             :data="file"
             title="dokumanAdi"
-            :filePath="file.url" />
+            :filePath="file.url">
+            <template #actionButtons v-if="usersStore.isPanelUser">
+              <i
+                class="ico-c ico-btn ico-section back-grad-alert"
+                @click="DeleteDocumentPop(file)">
+                <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+              </i>
+            </template>
+          </file-list-item>
         </template>
       </template>
       <template v-else>
@@ -33,6 +41,35 @@
   const piyangoDocumentStore = usePiyangoDocumentStore()
   import { usePiyangoDocumentService } from '../../service/piyangoDocumentService'
   const piyangoDocumentService = usePiyangoDocumentService()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useDataStore } from '@/stores/dataStore'
+  const dataStore = useDataStore()
+
+  const DeleteDocumentPop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Doküman Sil',
+      id: 'deletedoc',
+      content: 'Dokümanı silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Doküman Sil',
+          type: 'alert',
+          function: () => DeleteDocument(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteDocument = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('Popup/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deletedoc')
+      await piyangoDocumentService.GetDocumentList()
+    }
+  }
 
   onBeforeMount(async () => {
     await piyangoDocumentService.GetDocumentList()

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

@@ -9,9 +9,19 @@
           :data="file"
           onlyPreview
           :editable="false"
-          :filePath="file.resimYolu" />
+          :filePath="file.resimYolu">
+          <template #actionButtons v-if="usersStore.isPanelUser">
+            <i
+              class="ico-c ico-btn ico-section back-grad-alert"
+              @click="DeleteImagePop(file)">
+              <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+            </i>
+          </template>
+        </file-list-item>
       </template>
-      <div v-if="usersStore.isPanelUser && fileList.length === 0" class="form-inner-comment">
+      <div
+        v-if="usersStore.isPanelUser && fileList.length === 0"
+        class="form-inner-comment">
         Eklenmiş resim bulunamadı.
       </div>
     </div>
@@ -26,13 +36,43 @@
   const usersStore = useUsersStore()
   import { usePiyangoStore } from '../../stores/piyangoStore'
   const piyangoStore = usePiyangoStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
 
-  const fileList = ref<Record<string,any>[]>([])
+  const fileList = ref<Record<string, any>[]>([])
 
   const GetData = async () => {
-    let dt = await dataStore.dataGet('CekilisResim/Cekilis/' + piyangoStore.selectedLottery)
+    let dt = await dataStore.dataGet(
+      'CekilisResim/Cekilis/' + piyangoStore.selectedLottery
+    )
     if (dt !== 'errorfalse') fileList.value.splice(0, fileList.value.length, ...dt.data)
   }
+
+  const DeleteImagePop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Resim Sil',
+      id: 'deleteimage',
+      content: 'Resimi silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Resmi Sil',
+          type: 'alert',
+          function: () => DeleteImage(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteImage = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('CekilisResim/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteimage')
+      await GetData()
+    }
+  }
+
   onBeforeMount(async () => {
     await GetData()
   })

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

@@ -1,102 +0,0 @@
-<template>
-    <div class="form-part form-title" v-if="usersStore.isPanelUser">
-      <div class="form-title-buttons">
-        <button
-          class="button-c button-save"
-          @click="piyangoTeminatService.SaveTeminatDurum"
-          :disabled="!piyangoTeminatValidationStore.formChanged">
-          Kaydet
-        </button>
-        <button
-          v-if="piyangoTeminatValidationStore.formChanged"
-          class="button-c button-cancel panel-close"
-          @click="piyangoTeminatStore.ResetFormData">
-          Vazgeç
-        </button>
-      </div>
-    </div>
-    <div :class="['form-part', piyangoTeminatValidationStore.formChanged ? 'changed' : '']"> <div
-      class="form-part-content"
-      v-if="piyangoTeminatStore.loaded">
-      <form-select
-        v-if="usersStore.isPanelUser"
-        label="İşlem"
-        :listData="piyangoDataStore.piyangoTeminatDurumlari"
-        listText="value"
-        listVal="id"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.state"
-        required
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.state"
-        @change="OnKeyup" />
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.amount"
-        half
-        label="Tutarı" />
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminatParentTypeText"
-        half
-        label="Para Birimi" />
-
-      <form-display
-        label="Teminat Türü"
-        half
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantChildTypeText" />
-
-      <form-display
-        type="date"
-        half
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantDate"
-        label="Tarih" />
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantNo"
-        half
-        label="No" />
-      <div class="form-item form-item-half"></div>
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.bankName"
-        half
-        label="Banka Adı" />
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.bankBranch"
-        half
-        label="Banka Şubesi" />
-
-      <!--form-display
-        label="İşlem"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.stateText" /-->
-
-      <file-list-item
-        title="Dosya"
-        :data="piyangoTeminatStore.piyangoTeminatFormData"
-        :editable="false"
-        :filePath="piyangoTeminatStore.piyangoTeminatFormData.teminantDocumentUrl"
-        :usePath="true"
-        :onlyPreview="true" />
-
-      <form-display
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.description"
-        label="Açıklama" />
-    </div></div>
-   
-</template>
-<script setup lang="ts">
-  import { usePiyangoTeminatStore } from '../../stores/piyangoTeminatStore'
-  const piyangoTeminatStore = usePiyangoTeminatStore()
-  import { useUsersStore } from '@/stores/usersStore'
-  const usersStore = useUsersStore()
-  import { usePiyangoDataStore } from '../../stores/piyangoDataStore'
-  const piyangoDataStore = usePiyangoDataStore()
-  import { usePiyangoTeminatValidationStore } from '../../validation/piyangoTeminatValidationStore'
-  const piyangoTeminatValidationStore = usePiyangoTeminatValidationStore()
-  import { usePiyangoTeminatService } from '../../service/piyangoTeminatService'
-  const piyangoTeminatService = usePiyangoTeminatService()
-
-  const OnKeyup = () => {
-    piyangoTeminatValidationStore.formChanged = true
-  }
-</script>

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

@@ -23,6 +23,13 @@
   <strong style="font-size: 10pt; margin-bottom: 12px">
     PİYANGO İLE İLGİLİ BİLGİLER
   </strong>
+  <br />
+  <br />
+  <strong style="font-size: 10pt; margin-bottom: 12px">
+    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
+  </strong>
+  <br />
+  <br />
   <table
     cellspacing="0"
     class="table-no-line"

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

@@ -12,6 +12,12 @@
     Bahisler ve Oyunlar Dairesi Başkanlığına
   </strong>
   <br />
+  <br />
+  <strong style="font-size: 10pt; margin-bottom: 12px">
+    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
+  </strong>
+  <br />
+  <br />
   <table
     cellspacing="0"
     class="table-no-line"

src/module/cekilisler/components/form/FormPiyangoBilgileri.vue

@@ -31,7 +31,17 @@
     </div>
     <div class="form-part-content" v-if="loaded">
       <lottery-states :piyangoAmac="piyangoStore.lotteryData.amacpiyangoId" />
-
+      <template
+        v-if="
+          !piyangoStore.isNew &&
+          piyangoStore.lotteryData.piyangoId !== undefined &&
+          piyangoStore.lotteryData.piyangoId !== null
+        ">
+        <form-display
+          v-model="piyangoStore.lotteryData.piyangoId"
+          label="Piyango ID"
+          size="1" />
+      </template>
       <form-input
         modelKey="cekilisBaslik"
         v-model="piyangoStore.lotteryData.baslik"
@@ -602,7 +612,7 @@
 
       let list = await dataStore.dataGet('Auth/userbyuserChildList/' + id)
 
-      childUsers.value = list.data.filter((p:Record<string,any>) => {
+      childUsers.value = list.data.filter((p: Record<string, any>) => {
         return p.islemTipId === 4 || p.islemTipi === 'Üyelik Onaylandı'
       })
 

src/module/cekilisler/components/form/FormPiyangoDosyaKapama.vue

@@ -1,244 +0,0 @@
-<template>
-  <div class="form-part form-title" v-if="piyangoDosyaKapamaStore.isNew">
-    <div class="form-title-buttons">
-      <div
-        class="button-c button-save"
-        @click="piyangoDosyaKapamaService.SaveDosyaKapama()">
-        Kaydet
-      </div>
-    </div>
-  </div>
-  <div
-    :class="[
-      'form-part',
-      piyangoDosyaKapamaStore.formChanged && !piyangoDosyaKapamaStore.isNew
-        ? 'changed'
-        : ''
-    ]">
-    <div class="form-part-title">
-      <h4>Teminat İade Evrak Kontrol</h4>
-    </div>
-    <div class="form-part-content" v-if="piyangoDosyaKapamaStore.loaded">
-      <form-input
-        modelKey="katilimSekli"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.katilimSekli"
-        label="1. Katılım Şekli"
-        placeholder="Katılım Şekli"
-        @keyup="OnKeyup" />
-
-      <form-checkbox
-        label="2. CD"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.cD"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="3. Kutu Mühürleme Tutanağı"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.kutuMuhurlemeTutanagi"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="4. Kutu Açma Tutanağı"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.kutuAcmaTutanagi"
-        @change="OnKeyup" />
-
-      <div class="form-part-title">
-        <h4>5. Çekiliş Tutanağı</h4>
-      </div>
-      <form-checkbox
-        label="Çekiliş Tutanağı"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.cekilisTutanagi"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Çekiliş izin alınan tarih, saat, adreste yapılmış"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.cekilisIzinAlinanTarihSaatAdres"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Çekilişte önceden belirlenen ikramiyeler çekiliş"
-        v-model="
-          piyangoDosyaKapamaStore.dosyaKapamaData.cekilisOncedenBelirlenenIkramiyeler
-        "
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Çekilişte önceden belirlenen ikramiyeler çekiliş"
-        v-model="
-          piyangoDosyaKapamaStore.dosyaKapamaData.cekilisOncedenBelirlenenIkramiyeler
-        "
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Çekiliş numara üzerinden/isimden"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.cekilisNumaraUzerindenCekilis"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Dağıtılmayan kupon tespiti"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.dagitilmayanKuponTespiti"
-        @change="OnKeyup" />
-
-      <div class="form-part-title">
-        <h4>6. Çekiliş Sonucu İlan</h4>
-      </div>
-      <form-checkbox
-        label="Çekiliş Sonucu İlan"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.cekilisSonucuIlani"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Taahhüt edilen tarih ve gazetede ilan"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.ilandaTarihGazete"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="İlanda toplam katılımcı sayısı"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.ilandaToplamKatilimci"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Çekiliş tutanağı ile uyumlu kazanan numara/isim"
-        v-model="
-          piyangoDosyaKapamaStore.dosyaKapamaData.cekilisTutanagiIleUyumluKazananlar
-        "
-        @change="OnKeyup" />
-      <form-checkbox
-        label="İlanda ikramiyeler son teslim süresi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.ilanSonBasvuruTeslimSuresi"
-        @change="OnKeyup" />
-
-      <form-input
-        modelKey="taahhutEdilenIkramiyeAdedi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.taahhutEdilenIkramiyeAdedi"
-        label="7. Taahhüt Edilen İkramiye"
-        placeholder="Taahhüt Edilen İkramiye"
-        @keyup="OnKeyup" />
-
-      <div class="form-part-title">
-        <h4>8. Teslim Edilen İkramiye</h4>
-      </div>
-      <form-input
-        modelKey="teslimEdilenIkramiyeAdedi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.teslimEdilenIkramiyeAdedi"
-        label="Teslim Edilen İkramiye"
-        placeholder="Teslim Edilen İkramiye"
-        @keyup="OnKeyup" />
-      <form-input
-        modelKey="asilIkramiyeSayisi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.asilIkramiyeSayisi"
-        label="Teslim Edilen Asıl İkramiye"
-        placeholder="Teslim Edilen Asıl İkramiye"
-        @keyup="OnKeyup" />
-      <form-input
-        modelKey="yedekIkramiyeSayisi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.yedekIkramiyeSayisi"
-        label="Teslim Edilen Yedek İkramiye"
-        placeholder="Teslim Edilen Yedek İkramiye"
-        @keyup="OnKeyup" />
-      <form-checkbox
-        label="Nüfus Cüzdanları"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.nufusCuzdani"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Kazanan numaralı noter onaylı ibraname"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.noterOnayliIbraname"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Teslim Belgesi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.teslimBelgesi"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Fatura fotokopileri"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.faturaFotokopileri"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Tescile ait belgeler"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.tescileAitBelgeler"
-        @change="OnKeyup" />
-      <div class="form-part-title">
-        <h4>9. Süresi İçinde Alınmayan İkramiye</h4>
-      </div>
-      <form-input
-        modelKey="sureIcindesAlinmayanIkramiyeAdedi"
-        v-model="
-          piyangoDosyaKapamaStore.dosyaKapamaData.sureIcindesAlinmayanIkramiyeAdedi
-        "
-        label="Süresi İçinde Alınmayan İkramiye"
-        placeholder="Süresi İçinde Alınmayan İkramiye"
-        @keyup="OnKeyup" />
-      <form-checkbox
-        label="Tebligat"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.tebligat"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Feragat"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.feragat"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Bağış"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.bagis"
-        @change="OnKeyup" />
-
-      <div class="form-part-title">
-        <h4>10. Kupon (Aslı) ve Duyuru Örneği</h4>
-      </div>
-      <form-checkbox
-        label="Kupon Aslı"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.kuponAsli"
-        @change="OnKeyup" />
-      <form-checkbox
-        label="Duyuru Örneği"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.duyuruMateryali"
-        @change="OnKeyup" />
-
-      <form-date
-        type="date"
-        modelKey="ikramiyelerinSonTeslimTarihi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.ikramiyelerinSonTeslimTarihi"
-        label="11. İkramiyelerin Son Teslim Tarihi"
-        @change="OnKeyup" />
-      <form-date
-        type="date"
-        modelKey="teminatIadeTarihi"
-        v-model="piyangoDosyaKapamaStore.dosyaKapamaData.teminatIadeTarihi"
-        label="12. Teminat İade Tarihi"
-        @change="OnKeyup" />
-
-      <div
-        class="form-item"
-        v-if="piyangoDosyaKapamaStore.formChanged && !piyangoDosyaKapamaStore.isNew">
-        <button
-          class="button-c button-save"
-          @click="piyangoDosyaKapamaService.SaveDosyaKapama()">
-          Kaydet
-        </button>
-        <button class="button-c button-cancel" @click="CancelSave">Vazgeç</button>
-      </div>
-    </div>
-  </div>
-  <div class="form-part form-title" v-if="piyangoDosyaKapamaStore.isNew">
-    <div class="form-title-buttons">
-      <div
-        class="button-c button-save"
-        @click="piyangoDosyaKapamaService.SaveDosyaKapama()">
-        Kaydet
-      </div>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-  import { onBeforeMount } from 'vue'
-
-  import { usePiyangoDosyaKapamaStore } from '../../stores/piyangoDosyaKapamaStore'
-  const piyangoDosyaKapamaStore = usePiyangoDosyaKapamaStore()
-  import { usePiyangoDosyaKapamaService } from '../../service/piyangoDosyaKapamaService'
-  const piyangoDosyaKapamaService = usePiyangoDosyaKapamaService()
-
-  const OnKeyup = () => {
-    piyangoDosyaKapamaStore.formChanged = true
-  }
-
-  const CancelSave = () => {
-    piyangoDosyaKapamaStore.RestoreFormData()
-    piyangoDosyaKapamaStore.formChanged = false
-  }
-
-  onBeforeMount(async () => {
-    await piyangoDosyaKapamaService.GetDosyaKapama()
-
-    if (piyangoDosyaKapamaStore.isNew) {
-      piyangoDosyaKapamaStore.ResetFormData()
-      piyangoDosyaKapamaStore.loaded = true
-    }
-  })
-</script>

src/module/cekilisler/components/form/FormPiyangoOnayDurum.vue

@@ -0,0 +1,88 @@
+<template>
+  <list-table-content
+  v-if="loaded"
+    :tableHeader="tableHeader"
+    formTitle="Piyango Onay Durumları"
+    listText="Kayıt"
+    :apiList="'OnayDurumu/GetSonOnayDurumlariList/' + piyangoStore.selectedLottery"
+    apiText="Piyango Onay Log Listesi"
+    page="form"
+    :refresh="piyangoOnayStore.refreshList" />
+</template>
+<script setup lang="ts">
+  import { ref,onBeforeMount,computed } from 'vue'
+  import axios from 'axios'
+  import { useDateStore } from '@/stores/dateStore'
+  const dateStore = useDateStore()
+  import { useGlobalStore } from '@/stores/globalStore'
+  const globalStore = useGlobalStore()
+  import { usePiyangoOnayStore } from '../../stores/piyangoOnayStore'
+  const piyangoOnayStore = usePiyangoOnayStore()
+  import { usePiyangoStore } from '../../stores/piyangoStore'
+  const piyangoStore = usePiyangoStore()
+  import { usePiyangoDataStore } from '../../stores/piyangoDataStore'
+  const piyangoDataStore = usePiyangoDataStore()
+  import { usePiyangoServices } from '../../service/piyangoServices'
+  const piyangoServices = usePiyangoServices()
+
+  const loaded = ref<boolean>(false)
+
+  const piyangoOnayDurumlari = computed<Record<string, any>[]>(() => {
+    return piyangoDataStore.piyangoOnayDurumlari
+  })
+
+  const tableHeader = ref<Record<string, any>[]>([
+    {
+      name: 'tarih',
+      title: 'Tarih',
+      compute: (v: Record<string, any>): string => {
+        return v.tarih === null
+          ? ''
+          : dateStore.dateFormat({ pattern: 'dd-mm-yy', date: v.tarih })
+      },
+      sort: true,
+        filter: {
+          type: 'date',
+          range: true
+        }
+    },
+    {
+      name: 'kisiAdi',
+      title: 'Kişi',
+      sort: true,
+      style: { width: '20%' }
+    },
+    {
+      name: 'onayDurumuIslemTipiAdi',
+      title: 'İşlem',
+      sort: true,
+        filter: {
+          type: 'select',
+          data: piyangoOnayDurumlari,
+          listVal: 'id',
+          listText: 'tipAdi',
+          filterId: 'onayDurumuIslemTipiId'
+        }
+    },
+    {
+      name: 'aciklama',
+      title: 'Açıklama',
+      sort: true,
+      style: { width: '30%' }
+    },
+    {
+      dosyaUrl: 'aciklama',
+      title: 'Dosya',
+      computeHtml: (v: Record<string, any>) => {
+        if (v.dosyaUrl !== null && v.dosyaUrl !== undefined) {
+          return globalStore.TableCellDocument(v.dosyaUrl)
+        }
+      },
+      style: { width: '20%' }
+    }
+  ])
+
+  onBeforeMount(async () => {
+    loaded.value = true
+  })
+</script>

src/module/cekilisler/components/form/FormPiyangoOnayLog.vue

@@ -4,7 +4,7 @@
     :tableHeader="tableHeader"
     formTitle="Piyango Onay Logları"
     listText="Kayıt"
-    :apiList="'OnayDurumu/GetSonOnayDurumlariList/' + piyangoStore.selectedLottery"
+    :apiList="'OnayDurumLog/Cekilis/' + piyangoStore.selectedLottery"
     apiText="Piyango Onay Log Listesi"
     page="form"
     :refresh="piyangoOnayStore.refreshList" />
@@ -47,38 +47,24 @@
         }
     },
     {
-      name: 'kisiAdi',
+      name: 'islemYapanKullanici.email',
       title: 'Kişi',
       sort: true,
       style: { width: '20%' }
     },
     {
-      name: 'onayDurumuIslemTipiAdi',
-      title: 'İşlem',
-      sort: true,
-        filter: {
-          type: 'select',
-          data: piyangoOnayDurumlari,
-          listVal: 'id',
-          listText: 'tipAdi',
-          filterId: 'onayDurumuIslemTipiId'
-        }
+      name: 'eskiDurum',
+      title: 'Eski Durum',
+    },
+    {
+      name: 'yeniDurum',
+      title: 'Yeni Durum',
     },
     {
       name: 'aciklama',
       title: 'Açıklama',
       sort: true,
       style: { width: '30%' }
-    },
-    {
-      dosyaUrl: 'aciklama',
-      title: 'Dosya',
-      computeHtml: (v: Record<string, any>) => {
-        if (v.dosyaUrl !== null && v.dosyaUrl !== undefined) {
-          return globalStore.TableCellDocument(v.dosyaUrl)
-        }
-      },
-      style: { width: '20%' }
     }
   ])
 

src/module/cekilisler/components/form/FormPiyangoPictures.vue

@@ -9,7 +9,17 @@
           :data="file"
           @click="EditImage"
           onlyPreview
-          :filePath="file.resimYolu" />
+          :filePath="file.resimYolu">
+          <template
+            #actionButtons
+            v-if="piyangoStore.lotteryApprove === 0 || piyangoStore.lotteryApprove === 3">
+            <i
+              class="ico-c ico-btn ico-section back-grad-alert"
+              @click="DeleteImagePop(file)">
+              <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+            </i>
+          </template>
+        </file-list-item>
       </template>
       <div
         class="form-item form-item-picture clickable"
@@ -23,7 +33,9 @@
           </i>
         </div>
       </div>
-      <div v-if="usersStore.isPanelUser && fileList.length === 0" class="form-inner-comment">
+      <div
+        v-if="usersStore.isPanelUser && fileList.length === 0"
+        class="form-inner-comment">
         Eklenmiş resim bulunamadı.
       </div>
     </div>
@@ -57,16 +69,14 @@
   const usersStore = useUsersStore()
   import { usePiyangoStore } from '../../stores/piyangoStore'
   const piyangoStore = usePiyangoStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
 
   const picturePanel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
   const isFormValid = ref<boolean>(true)
 
-  interface IFileList {
-    [key: string]: any
-  }
-
-  const fileList = ref<IFileList[]>([] as IFileList[])
+  const fileList = ref<Record<string, any>[]>([])
 
   const AddNewImage = () => {
     dataStore.panelData = {
@@ -82,7 +92,9 @@
   }
 
   const GetData = async () => {
-    let dt = await dataStore.dataGet('CekilisResim/Cekilis/' + piyangoStore.selectedLottery)
+    let dt = await dataStore.dataGet(
+      'CekilisResim/Cekilis/' + piyangoStore.selectedLottery
+    )
     if (dt !== 'errorfalse') fileList.value.splice(0, fileList.value.length, ...dt.data)
   }
 
@@ -129,6 +141,30 @@
       }
     }
   }
+  const DeleteImagePop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Resim Sil',
+      id: 'deleteimage',
+      content: 'Resimi silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Resmi Sil',
+          type: 'alert',
+          function: () => DeleteImage(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteImage = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('CekilisResim/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteimage')
+      await GetData()
+    }
+  }
   onBeforeMount(async () => {
     await GetData()
   })

src/module/cekilisler/components/form/FormPiyangoTeminatDurumu.vue

@@ -1,135 +0,0 @@
-<template>
-  <div class="form-part form-title">
-    <div class="form-title-buttons">
-      <button
-        class="button-c button-save"
-        @click="piyangoTeminatService.SaveTeminatDurum"
-        :disabled="!piyangoTeminatValidationStore.formChanged">
-        Kaydet
-      </button>
-      <button
-        v-if="piyangoTeminatValidationStore.formChanged"
-        class="button-c button-cancel panel-close"
-        @click="piyangoTeminatStore.ResetFormData">
-        Vazgeç
-      </button>
-    </div>
-  </div>
-  <div :class="['form-part', piyangoTeminatValidationStore.formChanged ? 'changed' : '']">
-    <div class="form-part-title">
-      <h4>Teminat Durumu</h4>
-    </div>
-    <div class="form-part-content" v-if="piyangoTeminatStore.loaded">
-      <form-input
-        modelKey="amount"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.amount"
-        required
-        half
-        label="Tutarı"
-        minlength="2"
-        @keyup="OnKeyup"
-        @keydown="validationStore.allowPrice"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.amount" />
-
-      <form-select
-        modelKey="teminatParentType"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminatParentType"
-        required
-        half
-        label="Para Birimi"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.teminatParentType"
-        :listData="piyangoDataStore.piyangoTeminatParaBirimleri"
-        listVal="id"
-        listText="value"
-        @change="OnKeyup" />
-
-      <form-select
-        label="Teminat Türü"
-        :listData="piyangoDataStore.piyangoTeminatTurleri"
-        listText="value"
-        listVal="id"
-        half
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantChildType"
-        required
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.teminantChildType"
-        @change="OnKeyup" />
-
-      <form-date
-        type="date"
-        half
-        required
-        modelKey="teminantDate"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantDate"
-        label="Tarih"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.teminantDate"
-        @change="OnKeyup" />
-
-      <form-input
-        modelKey="teminantNo"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.teminantNo"
-        required
-        half
-        label="No"
-        minlength="2"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.teminantNo"
-        @keyup="OnKeyup" />
-      <div class="form-item form-item-half"></div>
-
-      <form-input
-        modelKey="bankName"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.bankName"
-        required
-        half
-        label="Banka Adı"
-        minlength="2"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.bankName"
-        @keyup="OnKeyup" />
-
-      <form-input
-        modelKey="bankBranch"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.bankBranch"
-        required
-        half
-        label="Banka Şubesi"
-        minlength="2"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.bankBranch"
-        @keyup="OnKeyup" />
-
-      <form-display :disabled="!usersStore.isPanelUser"
-        label="İşlem Durumu"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.stateText" />
-
-      <form-file
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.file"
-        elclass="panel-documents-item"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.file"
-        @change="OnKeyup" />
-
-      <form-textarea
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.description"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.description"
-        label="Açıklama"
-        @keyup="OnKeyup" />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-  import { usePiyangoDataStore } from '../../stores/piyangoDataStore'
-  const piyangoDataStore = usePiyangoDataStore()
-  import { usePiyangoServices } from '../../service/piyangoServices'
-  const piyangoServices = usePiyangoServices()
-  import { useValidationStore } from '@/stores/validationStore'
-  const validationStore = useValidationStore()
-  import { usePiyangoTeminatStore } from '../../stores/piyangoTeminatStore'
-  const piyangoTeminatStore = usePiyangoTeminatStore()
-  import { usePiyangoTeminatValidationStore } from '../../validation/piyangoTeminatValidationStore'
-  const piyangoTeminatValidationStore = usePiyangoTeminatValidationStore()
-  import { usePiyangoTeminatService } from '../../service/piyangoTeminatService'
-  const piyangoTeminatService = usePiyangoTeminatService()
-  import { useUsersStore } from '@/stores/usersStore'
-  const usersStore = useUsersStore()
-  
-  const OnKeyup = () => {
-    piyangoTeminatValidationStore.formChanged = true
-  }
-</script>

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

@@ -9,8 +9,35 @@
       v-model="piyangoTeminatStore.piyangoTeminatFormData.state"
       required
       :invalidText="piyangoTeminatValidationStore.invalidTexts.state"
-      @change="OnKeyup" 
-      :disabled="!usersStore.isPanelUser"/>
+      @change="OnKeyup"
+      :disabled="!usersStore.isPanelUser" />
+
+    <template
+      v-if="
+        piyangoTeminatStore.piyangoTeminatFormData.state === 2 ||
+        piyangoTeminatStore.piyangoTeminatFormData.state === 3
+      ">
+      <form-date
+        type="date"
+        half
+        modelKey="refundDate"
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDate"
+        label="İade Tarihi"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.refundDate"
+        @change="OnKeyup" />
+      <form-input
+        modelKey="refundCount"
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.refundCount"
+        half
+        label="Sayısı"
+        @keyup="OnKeyup"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.refundCount" />
+      <form-file
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl"
+        elclass="panel-documents-item"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.refundDocumentUrl"
+        @change="OnKeyup" />
+    </template>
 
     <form-display
       v-model="piyangoTeminatStore.piyangoTeminatFormData.amount"
@@ -51,7 +78,10 @@
       label="Banka Şubesi" />
 
     <file-list-item
-    v-if="piyangoTeminatStore.piyangoTeminatFormData.teminantDocumentUrl !== null && piyangoTeminatStore.piyangoTeminatFormData.teminantDocumentUrl !== undefined"
+      v-if="
+        piyangoTeminatStore.piyangoTeminatFormData.teminantDocumentUrl !== null &&
+        piyangoTeminatStore.piyangoTeminatFormData.teminantDocumentUrl !== undefined
+      "
       title="Dosya"
       :data="piyangoTeminatStore.piyangoTeminatFormData"
       :editable="false"

src/module/cekilisler/service/piyangoDosyaKapamaService.ts

@@ -1,57 +0,0 @@
-import { defineStore } from 'pinia'
-import { useDataStore } from '@/stores/dataStore'
-import { usePiyangoStore } from '../stores/piyangoStore'
-import { usePiyangoDosyaKapamaStore } from '../stores/piyangoDosyaKapamaStore'
-import { usePiyangoDosyaKapamaValidationStore } from '../validation/piyangoDosyaKapamaValidationStore'
-
-export const usePiyangoDosyaKapamaService = defineStore(
-  'piyangoDosyaKapamaService',
-  () => {
-    const dataStore = useDataStore()
-    const piyangoStore = usePiyangoStore()
-    const piyangoDosyaKapamaStore = usePiyangoDosyaKapamaStore()
-    const piyangoDosyaKapamaValidationStore = usePiyangoDosyaKapamaValidationStore()
-
-    const GetDosyaKapama = async () => {
-      let data: Record<string, any> | any = await dataStore.dataGet(
-        'TeminatIadeEvrakKontrol/' + piyangoStore.selectedLottery
-      )
-
-      if (data !== 'errorfalse' || data.data.id === undefined) {
-        Object.assign(piyangoDosyaKapamaStore.dosyaKapamaData, data.data)
-        Object.assign(piyangoDosyaKapamaStore.safeDosyaKapamaData, data.data)
-        piyangoDosyaKapamaStore.isNew = false
-        setTimeout(() => {
-          piyangoDosyaKapamaStore.loaded = true
-        }, 30)
-      } else {
-        piyangoDosyaKapamaStore.isNew = true
-      }
-    }
-
-    const SaveDosyaKapama = async () => {
-      let dt: any
-      dataStore.panelData.yayinlanacagiTarih = new Date(
-        dataStore.panelData.yayinlanacagiTarih
-      )
-      if (!piyangoDosyaKapamaStore.isUpdate) {
-        dt = await dataStore.dataPost('TeminatIadeEvrakKontrol', {
-          data: piyangoDosyaKapamaStore.dosyaKapamaData
-        })
-      } else {
-        dt = await dataStore.dataPut(
-          'TeminatIadeEvrakKontrol/' + piyangoDosyaKapamaStore.dosyaKapamaData.id,
-          {
-            data: piyangoDosyaKapamaStore.dosyaKapamaData
-          }
-        )
-      }
-      if (dt !== 'errorfalse') {
-        piyangoDosyaKapamaStore.isUpdate = false
-        await GetDosyaKapama()
-      }
-    }
-
-    return { GetDosyaKapama, SaveDosyaKapama }
-  }
-)

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
     }

src/module/cekilisler/service/piyangoTeminatService.ts

@@ -18,9 +18,12 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
     if (piyangoTeminatValidationStore.FormCheck()) {
       let form: any
       let dataForm = new FormData()
-      
+
       dataForm.append('state', piyangoTeminatStore.piyangoTeminatFormData.state)
-      dataForm.append('amount', globalStore.floatEnLocale(piyangoTeminatStore.piyangoTeminatFormData.amount))
+      dataForm.append(
+        'amount',
+        globalStore.floatEnLocale(piyangoTeminatStore.piyangoTeminatFormData.amount)
+      )
       dataForm.append('bankName', piyangoTeminatStore.piyangoTeminatFormData.bankName)
       dataForm.append('bankBranch', piyangoTeminatStore.piyangoTeminatFormData.bankBranch)
       dataForm.append(
@@ -43,6 +46,27 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
         'description',
         piyangoTeminatStore.piyangoTeminatFormData.description
       )
+
+      if (usersStore.isPanelUser) {
+        if (piyangoTeminatStore.piyangoTeminatFormData.state === 1) {
+          piyangoTeminatStore.piyangoTeminatFormData.refundDate = ''
+          piyangoTeminatStore.piyangoTeminatFormData.refundCount = ''
+          piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl = ''
+        }
+        dataForm.append(
+          'refundDate',
+          String(piyangoTeminatStore.piyangoTeminatFormData.refundDate)
+        )
+        dataForm.append(
+          'refundCount',
+          String(piyangoTeminatStore.piyangoTeminatFormData.refundCount)
+        )
+        dataForm.append(
+          'refundDocumentUrl',
+          piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl
+        )
+      }
+
       if (piyangoTeminatStore.isNew) {
         form = await dataStore.dataPost('TeminantStates/', {
           data: dataForm,
@@ -61,8 +85,8 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
       }
 
       if (form !== 'errorfalse') {
-        piyangoTeminatStore.isNew = false    
-        piyangoTeminatValidationStore.formChanged = false    
+        piyangoTeminatStore.isNew = false
+        piyangoTeminatValidationStore.formChanged = false
         piyangoTeminatStore.refreshList = true
         piyangoTeminatStore.teminatPanel = false
       }
@@ -80,7 +104,7 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
 
     if (form !== 'errorfalse') {
       piyangoTeminatStore.isNew = false
-      await Object.assign(piyangoTeminatStore.piyangoTeminatFormData, form)      
+      await Object.assign(piyangoTeminatStore.piyangoTeminatFormData, form)
     } else {
       await piyangoTeminatStore.ResetFormData()
       await piyangoTeminatStore.RestoreFormData()

src/module/cekilisler/service/signalrService.ts

@@ -1,34 +1,34 @@
-import * as signalR from "@microsoft/signalr";
-import { v4 as uuidv4 } from "uuid";
+import * as signalR from '@microsoft/signalr'
+import { v4 as uuidv4 } from 'uuid'
 
-let connection: signalR.HubConnection;
-let connectionId = "";
+let connection: signalR.HubConnection
+let connectionId = ''
 
 export const connectToHub = async () => {
   connection = new signalR.HubConnectionBuilder()
-    .withUrl("https://panelapi.cekilisevi.gov.tr/uploadHub", {
-      withCredentials: false  // Bu zorunlu, yoksa cookie vs gönderilmez
+    .withUrl(import.meta.env.VITE_SOCKET_URL, {
+      withCredentials: false // Bu zorunlu, yoksa cookie vs gönderilmez
     }) // backend adresine göre düzenle
     .withAutomaticReconnect()
-    .build();
+    .build()
 
-  await connection.start();
-  connectionId = connection.connectionId || uuidv4(); // SignalR id'si ya da frontend'de de guid üretilebilir
-  return connectionId;
-};
+  await connection.start()
+  connectionId = connection.connectionId || uuidv4() // SignalR id'si ya da frontend'de de guid üretilebilir
+  return connectionId
+}
 
 export const onProgress = (callback: (data: any) => void) => {
-  connection.on("ReceiveProgress", callback);
-};
+  connection.on('ReceiveProgress', callback)
+}
 
 export const onInsertProgress = (callback: (data: any) => void) => {
-  connection.on("ReceiveInsertProgress", callback);
-};
+  connection.on('ReceiveInsertProgress', callback)
+}
 
 export const onCompleted = (callback: (data: any) => void) => {
-  connection.on("ReceiveCompleted", callback);
-};
+  connection.on('ReceiveCompleted', callback)
+}
 
 export const onError = (callback: (data: any) => void) => {
-  connection.on("ReceiveError", callback);
-};
+  connection.on('ReceiveError', callback)
+}

src/module/cekilisler/stores/piyangoDosyaKapamaStore.ts

@@ -1,70 +0,0 @@
-import { defineStore } from 'pinia'
-import { ref, reactive } from 'vue'
-import { useGlobalStore } from '@/stores/globalStore'
-
-export const usePiyangoDosyaKapamaStore = defineStore('piyangoDosyaKapamaStore', () => {
-  const globalStore = useGlobalStore()
-
-  const baseDosyaKapamaData = reactive<Record<string, any>>({
-    katilimSekli: '',
-    cD: false,
-    kutuMuhurlemeTutanagi: false,
-    kutuAcmaTutanagi: false,
-    cekilisTutanagi: false,
-    cekilisIzinAlinanTarihSaatAdres: false,
-    oncedenBelirlenenIkramiyeCekilis: false,
-    cekilisNumaraUzerindenCekilis: false,
-    dagitilmayanKuponTespiti: false,
-    cekilisSonucuIlan: false,
-    ilandaTarihGazete: false,
-    ilandaToplamKatilimci: false,
-    cekilisTutanagiIleUyumluKazananlar: false,
-    ilanSonBasvuruTeslimSuresi: false,
-    taahhutEdilenIkramiyeAdedi: null,
-    teslimEdilenIkramiyeAdedi: null,
-    asilIkramiyeSayisi: null,
-    yedekIkramiyeSayisi: null,
-    nufusCuzdani: false,
-    noterOnayliIbraname: false,
-    teslimBelgesi: false,
-    faturaFotokopileri: false,
-    tescileAitBelgeler: false,
-    sureIcindesAlinmayanIkramiyeAdedi: null,
-    tebligat: false,
-    feragat: false,
-    bagis: false,
-    kuponAsli: false,
-    duyuruMateryali: false,
-    ikramiyelerinSonTeslimTarihi: '',
-    teminatIadeTarihi: ''
-  })
-  const dosyaKapamaData = reactive<Record<string, any>>({})
-  const safeDosyaKapamaData = reactive<Record<string, any>>({})
-  const isNew = ref<boolean>(false)
-  const isUpdate = ref<boolean>(false)
-  const formChanged = ref<boolean>(false)
-  const loaded = ref<boolean>(false)
-
-
-  const ResetFormData = () => {
-    globalStore.ResetObject(dosyaKapamaData, baseDosyaKapamaData)
-    Object.assign(dosyaKapamaData, baseDosyaKapamaData)
-  }
-
-  const RestoreFormData = () => {
-    globalStore.ResetObject(dosyaKapamaData, baseDosyaKapamaData)
-    Object.assign(dosyaKapamaData, safeDosyaKapamaData)
-  }
-
-  return {
-    baseDosyaKapamaData,
-    dosyaKapamaData,
-    safeDosyaKapamaData,
-    isNew,
-    isUpdate,
-    formChanged,
-    loaded,
-    ResetFormData,
-    RestoreFormData
-  }
-})

src/module/cekilisler/stores/piyangoTeminatStore.ts

@@ -23,7 +23,10 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
     cekilisId: piyangoStore.selectedLottery,
     kisiId: usersStore.userId,
     description: '',
-    file: ''
+    file: '',
+    refundDate: '',
+    refundCount: '',
+    refundDocumentUrl: ''
   })
 
   const piyangoTeminatFormData = reactive<Record<string, any>>({})
@@ -31,7 +34,7 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
   const loaded = ref<boolean>(false)
   const isNew = ref<boolean>(false)
   const teminatPanel = ref<boolean>(false)
-  const selectedTeminatId = ref<number|null>(null)
+  const selectedTeminatId = ref<number | null>(null)
   const refreshList = ref<boolean>(false)
 
   const ResetFormData = () => {
@@ -42,7 +45,7 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
       loaded.value = true
     }, 30)
   }
-  const RestoreFormData = () => {    
+  const RestoreFormData = () => {
     Object.assign(piyangoTeminatFormData, piyangoTeminatSafeFormData)
   }
   return {

src/module/cekilisler/validation/piyangoDosyaKapamaValidationStore.ts

@@ -1,35 +0,0 @@
-import { defineStore } from 'pinia'
-import { ref, reactive } from 'vue'
-import { useValidationStore } from '@/stores/validationStore'
-import { usePiyangoDosyaKapamaStore } from '../stores/piyangoDosyaKapamaStore'
-
-export const usePiyangoDosyaKapamaValidationStore = defineStore(
-  'piyangoDosyaKapamaValidationStore',
-  () => {
-    const piyangoDosyaKapamaStore = usePiyangoDosyaKapamaStore()
-    const validationStore = useValidationStore()
-    
-    const isFormValid = ref<boolean>(true)
-    const invalidTexts = reactive<Record<string, any>>({})
-
-    const FormCheck = (): boolean => {
-      Object.assign(invalidTexts, {})
-
-      validationStore.IsFieldEmpty(
-        piyangoDosyaKapamaStore.dosyaKapamaData,
-        invalidTexts,
-        'mecraAdi',
-        'Yayınlanacak mecranın adını yazınız.'
-      )
-
-      isFormValid.value = Object.keys(invalidTexts).length === 0
-      return isFormValid.value
-    }
-
-    return {
-      isFormValid,
-      invalidTexts,
-      FormCheck
-    }
-  }
-)

src/module/cekilisler/validation/piyangoTeminatValidationStore.ts

@@ -24,6 +24,18 @@ export const usePiyangoTeminatValidationStore = defineStore(
           'state',
           'Lütfen işlem tipini seçiniz.'
         )
+        validationStore.IsFieldEmpty(
+          piyangoTeminatStore.piyangoTeminatFormData,
+          invalidTexts,
+          'refundDate',
+          'Lütfen iade tarihini seçiniz.'
+        )
+        validationStore.IsFieldEmpty(
+          piyangoTeminatStore.piyangoTeminatFormData,
+          invalidTexts,
+          'refundCount',
+          'Lütfen iade sayı no giriniz.'
+        )
       }
 
       validationStore.IsFieldEmpty(

src/module/cekilisler/validation/piyangoValidationStore.ts

@@ -216,7 +216,7 @@ export const usePiyangoValidationStore = defineStore('piyangoValidationStore', (
           !usersStore.isPanelUser) ||
           (usersStore.isPanelUser && piyangoStore.duzenleyenData.basvuruTipId !== 22)) &&
         piyangoStore.lotteryData.amacpiyangoId === 2
-      ) {             
+      ) {
         if (!usersStore.isPanelUser) piyangoStore.lotteryData.amacpiyangoId = null
         isFormValid.value = false
         invalidTexts.amacpiyangoId =
@@ -240,7 +240,7 @@ export const usePiyangoValidationStore = defineStore('piyangoValidationStore', (
           if (
             piyangoStore.duzenleyenData.basvuruTipId !== 22 &&
             piyangoStore.lotteryData.amacpiyangoId === 2
-          ) {            
+          ) {
             if (!usersStore.isPanelUser) piyangoStore.lotteryData.amacpiyangoId = null
             isFormValid.value = false
             invalidTexts.amacpiyangoId =
@@ -472,12 +472,16 @@ export const usePiyangoValidationStore = defineStore('piyangoValidationStore', (
             date: ilanTarihi2Max.value,
             pattern: 'dd-mm-yy'
           })
-
-          if (ilanTarihi2 < ilan2min || ilanTarihi2 > ilan2max) {
+          if (ilan2min > ilan2max) {
             isFormValid.value = false
-            invalidTexts.ilantarihi2 = `2. İlan Tarihi ${ilan2mind} - ${ilan2maxd} tarihleri arasında olmalıdır.`
+            invalidTexts.ilantarihi2 = `Lütfen 1. ilan tarihini daha erken bir tarih ile değiştiriniz. 2. İlan tarihi 1. ilan tarihinden en az 1 gün sonra olabilir`
           } else {
-            delete invalidTexts.ilantarihi2
+            if (ilanTarihi2 < ilan2min || ilanTarihi2 > ilan2max) {
+              isFormValid.value = false
+              invalidTexts.ilantarihi2 = `2. İlan Tarihi ${ilan2mind} - ${ilan2maxd} tarihleri arasında olmalıdır.`
+            } else {
+              delete invalidTexts.ilantarihi2
+            }
           }
         }
       }

src/module/cekilisler/views/PiyangoDetay.vue

@@ -16,7 +16,7 @@
       <template #talihliler><tab-piyango-talihli-listesi /></template>
       <template #itirazsikayet><tab-piyango-itiraz /></template>
       <template #piyangologlari><tab-piyango-loglari /></template>
-      <template #yetkilendirme v-if="usersStore.isPanelUser">
+      <template #yetkilendirme>
         <tab-piyango-yetkilendirme />
       </template>
       <template #onaydurumu>
@@ -26,9 +26,6 @@
       <template #teminatlistesi>
         <tab-piyango-teminat-durumu />
       </template>
-      <template #dosyakapama v-if="usersStore.isPanelUser && piyangoStore.lotteryDrawState">
-        <tab-piyango-dosya-kapama />
-      </template>
     </tabs>
   </AdminLayout>
 </template>
@@ -55,7 +52,6 @@
   import TabPiyangoBilgileri from '@/module/cekilisler/components/TabPiyangoBilgileri.vue'
   import TabPiyangoBilgileriDisplay from '../components/TabPiyangoBilgileriDisplay.vue'
   import TabPiyangoItiraz from '@/module/cekilisler/components/TabPiyangoItiraz.vue'
-  import TabPiyangoDosyaKapama from '@/module/cekilisler/components/TabPiyangoDosyaKapama.vue'
 
   const loaded = ref<boolean>(false)
   const tabList = ref<Record<string, any>[]>([
@@ -64,13 +60,14 @@
 
   const CreateTabs = () => {
     if (
-      piyangoStore.lotteryApprove === 4 ||
-      piyangoStore.lotteryApprove === 10 ||
-      piyangoStore.lotteryApprove === 11 ||
-      piyangoStore.lotteryApprove === 12 ||
-      piyangoStore.lotteryApprove === 13 ||
-      piyangoStore.lotteryApprove === 14 ||
-      usersStore.isPanelUser
+      (piyangoStore.lotteryApprove === 4 ||
+        piyangoStore.lotteryApprove === 10 ||
+        piyangoStore.lotteryApprove === 11 ||
+        piyangoStore.lotteryApprove === 12 ||
+        piyangoStore.lotteryApprove === 13 ||
+        piyangoStore.lotteryApprove === 14 ||
+        usersStore.isPanelUser) &&
+      piyangoStore.lotteryPurposeId !== 3
     ) {
       tabList.value.push(
         { text: 'Katılım Listesi', id: 'katilimcilistesi' },
@@ -86,13 +83,9 @@
     }
     tabList.value.push({ text: 'Onay Durumu', id: 'onaydurumu' })
 
-    if (piyangoStore.lotteryApprove !== 0) {
+    if (piyangoStore.lotteryApprove !== 0 && piyangoStore.lotteryPurposeId !== 3) {
       tabList.value.push({ text: 'Teminat Listesi', id: 'teminatlistesi' })
     }
-
-    if (usersStore.isPanelUser && piyangoStore.lotteryDrawState) {
-      tabList.value.push({ text: 'Dossya Kapama', id: 'dosyakapama' })
-    }
   }
 
   onBeforeMount(async () => {

src/module/cekilisler/views/PiyangoListe.vue

@@ -67,11 +67,25 @@
   const tableHeader = computed<Record<string, any>[]>(() => {
     let header: Record<string, any>[] = []
 
+    header.push({
+      name: 'piyangoId',
+      title: 'Piyango Id',
+      sort: true,
+      style: { width: '10%' }
+    })
+
+
     if (usersStore.isAraciFirma || usersStore.isPanelUser) {
       header.push({ name: 'duzenleyen', title: 'Düzenleyen' })
     }
 
     header.push(
+      {
+        name: 'piyangoId',
+        title: 'Piyango ID',
+        sort: true,
+        style: { width: '10%' }
+      },
       {
         name: 'baslik',
         title: 'Başlık',
@@ -101,14 +115,16 @@
           type: 'date',
           range: true
         }
-      })
+      }
+    )
 
     if (usersStore.isVakifDernek || usersStore.isPanelUser) {
       header.push({
         name: 'cekilisTarihi',
         title: 'Çekiliş Tarihi',
         compute: (v: Record<string, any>): string => {
-          return dateStore.dateFormat({ date: v.cekilisTarihi })
+          if(v.piyangoAmacId === 3) return ''
+          else return dateStore.dateFormat({ date: v.cekilisTarihi })
         },
         sort: true,
         filter: {
@@ -146,7 +162,7 @@
           }
         }
       )
-    }    
+    }
 
     header.push(
       {

src/module/muhasebe/components/TabIzinBedelOraniForm.vue

@@ -0,0 +1,8 @@
+<template>
+  <section class="section-list form-inner-content-left">
+    <form-izin-bedel-orani />
+  </section>
+</template>
+<script setup lang="ts">
+  import FormIzinBedelOrani from './form/FormIzinBedelOrani.vue'
+</script>

src/module/muhasebe/components/TabIzinBedelOraniListe.vue

@@ -0,0 +1,106 @@
+<template>
+  <section class="section-list">
+    <div class="section-list-header">
+      <h2>İzin Bedel Oranı Listesi</h2>
+      <div class="section-list-header-buttons">
+        <button class="button-c button-add" @click="izinBedelOraniStore.NewForm()">
+          <i class="ico-c">
+            <svg width="16" height="16">
+              <use href="@/assets/images/icons.svg#plus"></use>
+            </svg>
+          </i>
+          Yeni İzin Bedel Oranı Ekle
+        </button>
+      </div>
+    </div>
+    
+    <list-table-content
+      v-if="izinBedelOraniService.loaded"
+      :tableHeader="tableHeader"
+      :rowAction="EditIzinBedelOrani"
+      icon="draws"
+      title="İzin Bedel Oranları"
+      listText="İzin Bedel Oranı"
+      :apiList="'IzinBedelOrani'"
+      apiText="İzin Bedel Oranı Listesi" />
+  </section>
+</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'
+
+  const izinBedelOraniStore = useIzinBedelOraniStore()
+  const izinBedelOraniService = useIzinBedelOraniService()
+
+  const tableHeader = ref<Record<string, any>[]>(
+     [
+      {
+        name: 'id',
+        title: 'ID',
+        sort: true,
+        style: { width: '8%' }
+      },
+      {
+        name: 'ad',
+        title: 'Ad',
+        sort: true,
+        style: { width: '20%' }
+      },
+      {
+        name: 'oran',
+        title: 'Oran (%)',
+        sort: true,
+        style: { width: '15%' },
+        compute: (v: Record<string, any>): string => {
+          return `%${v.oran}`
+        }
+      },
+      {
+        name: 'aciklama',
+        title: 'Açıklama',
+        sort: true,
+        style: { width: '30%' }
+      },
+      {
+        name: 'aktif',
+        title: 'Durum',
+        sort: true,
+        style: { width: '12%' },
+        computeHtml: (v: Record<string, any>): string => {
+          if (v.aktif) {
+            return `<span class="back-grad back-grad-ok">Aktif</span>`
+          } else {
+            return `<span class="back-grad back-grad-alert">Pasif</span>`
+          }
+        }
+      },
+      {
+        name: 'actions',
+        title: 'İşlemler',
+        style: { width: '15%' },
+        computeHtml: (v: Record<string, any>): string => {
+          let actions = `<button class="button-c button-edit" onclick="window.editIzinBedelOrani(${v.id})">
+            <i class="ico-c">
+              <svg width="14" height="14">
+                <use href="@/assets/images/icons.svg#edit"></use>
+              </svg>
+            </i>
+            Düzenle
+          </button> `
+          return actions
+        }
+      }
+    ]
+  )
+
+  const EditIzinBedelOrani = (row: any) => {
+    izinBedelOraniStore.EditForm(row)
+  }
+
+  onBeforeMount(async () => {
+    await izinBedelOraniService.GetIzinBedelOraniList()
+    izinBedelOraniService.loaded = true
+  })
+</script>

src/module/muhasebe/components/form/FormIzinBedelOrani.vue

@@ -0,0 +1,90 @@
+<template>
+  <div
+    :class="['form-part', izinBedelOraniValidationStore.formChanged ? 'changed' : '']">
+    <div class="form-part-title">
+      <h4>{{ izinBedelOraniStore.isNew ? 'Yeni İzin Bedel Oranı' : 'İzin Bedel Oranı Düzenle' }}</h4>
+      <div class="form-part-title-buttons"></div>
+    </div>
+    <div class="form-part-content">
+      <form-input
+        required
+        half
+        modelKey="ad"
+        v-model="izinBedelOraniStore.izinBedelOraniForm.ad"
+        :invalidText="izinBedelOraniValidationStore.invalidTexts.ad"
+        label="Ad"
+        maxlength="100"
+        @keyup="OnKeyup" />
+      <form-input
+        required
+        half
+        modelKey="oran"
+        v-model="izinBedelOraniStore.izinBedelOraniForm.oran"
+        :invalidText="izinBedelOraniValidationStore.invalidTexts.oran"
+        label="Oran (%)"
+        maxlength="3"
+        @keydown="validationStore.allowNumbersWithKeys"
+        description="1-100 arasında bir rakam giriniz"
+        @keyup="OnKeyup" />
+      <form-textarea
+        required
+        modelKey="aciklama"
+        v-model="izinBedelOraniStore.izinBedelOraniForm.aciklama"
+        :invalidText="izinBedelOraniValidationStore.invalidTexts.aciklama"
+        label="Açıklama"
+        maxlength="500"
+        rows="4"
+        @keyup="OnKeyup" />
+      <form-checkbox
+        modelKey="aktif"
+        v-model="izinBedelOraniStore.izinBedelOraniForm.aktif"
+        label="Aktif"
+        @change="OnKeyup" />
+      <div
+        class="form-item"
+        v-if="izinBedelOraniStore.isNew || izinBedelOraniValidationStore.formChanged">
+        <button
+          class="button-c button-save"
+          @click="izinBedelOraniService.SaveIzinBedelOrani">
+          {{ izinBedelOraniStore.isNew ? 'Kaydet' : 'Güncelle' }}
+        </button>
+        <button 
+          class="button-c button-cancel" 
+          @click="CancelForm" 
+          v-if="izinBedelOraniValidationStore.formChanged">
+          Vazgeç
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { onBeforeMount } from 'vue'
+  import { useValidationStore } from '@/stores/validationStore'
+  const validationStore = useValidationStore()
+  import { useIzinBedelOraniStore } from '../../store/izinBedelOraniStore'
+  const izinBedelOraniStore = useIzinBedelOraniStore()
+  import { useIzinBedelOraniValidationStore } from '../../validation/izinBedelOraniValidationStore'
+  const izinBedelOraniValidationStore = useIzinBedelOraniValidationStore()
+  import { useIzinBedelOraniService } from '../../service/izinBedelOraniService'
+  const izinBedelOraniService = useIzinBedelOraniService()
+
+  const OnKeyup = () => {
+    izinBedelOraniValidationStore.formChanged = true
+  }
+
+  const CancelForm = () => {
+    if (izinBedelOraniStore.isNew) {
+      izinBedelOraniStore.isNew = false
+    } else {
+      izinBedelOraniStore.RestoreData()
+      izinBedelOraniValidationStore.formChanged = false
+    }
+  }
+
+  onBeforeMount(() => {
+    if (izinBedelOraniStore.isNew) {
+      izinBedelOraniStore.ResetForm()
+    }
+  })
+</script>

src/module/muhasebe/components/form/FormMuhasebeAyarlari.vue

@@ -6,17 +6,17 @@
       <div class="form-part-title-buttons"></div>
     </div>
     <div class="form-part-content" v-if="muhasebeSettingsService.loaded">
-      <form-input
-        required
-        half
-        modelKey="izinBedeliOrani"
-        v-model="muhasebeSettingsStore.muhasebeSettingsForm.izinBedeliOrani"
-        :invalidText="muhasebeSettingsValidationStore.invalidTexts.izinBedeliOrani"        
-        label="İzin Bedeli Oranı"
-        maxlength="3"
-        @keydown="validationStore.allowNumbersWithKeys"
-        description="1-100 arasında bir rakam giriniz"
-        @keyup="OnKeyup" />
+<!--      <form-input-->
+<!--        required-->
+<!--        half-->
+<!--        modelKey="izinBedeliOrani"-->
+<!--        v-model="muhasebeSettingsStore.muhasebeSettingsForm.izinBedeliOrani"-->
+<!--        :invalidText="muhasebeSettingsValidationStore.invalidTexts.izinBedeliOrani"        -->
+<!--        label="İzin Bedeli Oranı"-->
+<!--        maxlength="3"-->
+<!--        @keydown="validationStore.allowNumbersWithKeys"-->
+<!--        description="1-100 arasında bir rakam giriniz"-->
+<!--        @keyup="OnKeyup" />-->
       <form-input
         required
         half

src/module/muhasebe/routes/index.ts

@@ -1,9 +1,11 @@
 import muhasebePiyangoListesi from './muhasebe-piyango-listesi'
 import muhasebePiyangoDetay from './muhasebe-piyango-detay'
 import muhasebeAyarlar from './muhasebe-ayarlar'
+import izinBedelOrani from './izin-bedel-orani'
 
 export default [
   muhasebePiyangoListesi,
   muhasebePiyangoDetay,
   muhasebeAyarlar,
+  izinBedelOrani,
 ]

src/module/muhasebe/routes/izin-bedel-orani.ts

@@ -0,0 +1,10 @@
+import IzinBedelOrani from '../views/IzinBedelOrani.vue'
+
+export default {
+  path: '/muhasebe/izin-bedel-orani',
+  name: 'IzinBedelOrani',
+  component: IzinBedelOrani,
+  meta: {
+    authRequired: true
+  }
+}

src/module/muhasebe/service/izinBedelOraniService.ts

@@ -0,0 +1,102 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { useDataStore } from '@/stores/dataStore'
+import { useIzinBedelOraniStore } from '../store/izinBedelOraniStore'
+import { useIzinBedelOraniValidationStore } from '../validation/izinBedelOraniValidationStore'
+
+export const useIzinBedelOraniService = defineStore('izinBedelOraniService', () => {
+  const dataStore = useDataStore()
+  const izinBedelOraniStore = useIzinBedelOraniStore()
+  const izinBedelOraniValidationStore = useIzinBedelOraniValidationStore()
+
+  const loaded = ref<boolean>(false)
+
+  const SaveIzinBedelOrani = async (panelData: Record<string, any>, isUpdate: boolean = false) => {
+    if (izinBedelOraniValidationStore.FormCheck(panelData)) {
+      var res: any
+
+      if (!isUpdate) {
+        res = await dataStore.dataPost('IzinBedelOrani', {
+          data: {
+            adi: panelData.ad,
+            oran: panelData.oran,
+            aciklama: panelData.aciklama,
+            aktif: panelData.aktif
+          }
+        })
+      } else {
+        res = await dataStore.dataPut('IzinBedelOrani/' + panelData.id, {
+          data: {
+            id: panelData.id,
+            adi: panelData.ad,
+            oran: panelData.oran,
+            aciklama: panelData.aciklama,
+            aktif: panelData.aktif
+          }
+        })
+      }
+
+      if (res !== 'errorfalse') {
+        return true
+      }
+    }
+    return false
+  }
+
+  const DeleteIzinBedelOrani = async (id: number | string) => {
+    var res = await dataStore.dataDelete('IzinBedelOrani/' + id)
+    return res !== 'errorfalse'
+  }
+
+  const GetIzinBedelOraniList = async () => {
+    var res = await dataStore.dataGet('IzinBedelOrani')
+    if (res !== 'errorfalse') {
+      izinBedelOraniStore.izinBedelOraniList = res
+      return res
+    }
+    return []
+  }
+
+  const GetIzinBedelOraniById = async (id: number | string) => {
+    var res = await dataStore.dataGet('IzinBedelOrani/' + id)
+    if (res !== 'errorfalse') {
+      return res
+    }
+    return null
+  }
+
+  const GetAktifIzinBedelOraniList = async () => {
+    var res = await dataStore.dataGet('IzinBedelOrani/Aktif')
+    if (res !== 'errorfalse') {
+      izinBedelOraniStore.aktifIzinBedelOraniList = res
+      return res
+    }
+    return []
+  }
+
+  const UpdateIzinBedelOraniStatus = async (id: number | string, aktif: boolean) => {
+    var res = await dataStore.dataPut('IzinBedelOrani/' + id + '/Status', {
+      data: {
+        Aktif: aktif
+      }
+    })
+    return res !== 'errorfalse'
+  }
+
+  const LoadData = async () => {
+    await GetIzinBedelOraniList()
+    await GetAktifIzinBedelOraniList()
+    loaded.value = true
+  }
+
+  return {
+    loaded,
+    SaveIzinBedelOrani,
+    DeleteIzinBedelOrani,
+    GetIzinBedelOraniList,
+    GetIzinBedelOraniById,
+    GetAktifIzinBedelOraniList,
+    UpdateIzinBedelOraniStatus,
+    LoadData
+  }
+})

src/module/muhasebe/store/izinBedelOraniStore.ts

@@ -0,0 +1,59 @@
+import { defineStore } from 'pinia'
+import { ref, reactive } from 'vue'
+import { useUsersStore } from '@/stores/usersStore'
+
+export const useIzinBedelOraniStore = defineStore('izinBedelOraniStore', () => {
+  const usersStore = useUsersStore()
+
+  const izinBedelOraniBaseForm = reactive<Record<string, any>>({
+    ad: '',
+    oran: 0,
+    aciklama: '',
+    aktif: true,
+    appUserId: usersStore.userId
+  })
+  
+  const izinBedelOraniForm = reactive<Record<string, any>>({})
+  const izinBedelOraniSafeForm = reactive<Record<string, any>>({})
+  const izinBedelOraniList = ref<Record<string, any>[]>([])
+  const aktifIzinBedelOraniList = ref<Record<string, any>[]>([])
+  const isNew = ref<boolean>(false)
+  const izinBedelOraniLoaded = ref<boolean>(false)
+
+  const ResetForm = () => {
+    Object.assign(izinBedelOraniForm, izinBedelOraniBaseForm)
+  }
+  
+  const SafeServerData = () => {
+    Object.assign(izinBedelOraniSafeForm, izinBedelOraniForm)
+  }
+
+  const RestoreData = () => {
+    Object.assign(izinBedelOraniForm, izinBedelOraniSafeForm)
+  }
+
+  const NewForm = () => {
+    ResetForm()
+    isNew.value = true
+  }
+
+  const EditForm = (item: Record<string, any>) => {
+    Object.assign(izinBedelOraniForm, item)
+    isNew.value = false
+  }
+
+  return {
+    izinBedelOraniBaseForm,
+    izinBedelOraniForm,
+    izinBedelOraniSafeForm,
+    izinBedelOraniList,
+    aktifIzinBedelOraniList,
+    isNew,
+    izinBedelOraniLoaded,
+    ResetForm,
+    SafeServerData,
+    RestoreData,
+    NewForm,
+    EditForm
+  }
+})

src/module/muhasebe/validation/izinBedelOraniValidationStore.ts

@@ -0,0 +1,64 @@
+import { defineStore } from 'pinia'
+import { ref, reactive } from 'vue'
+import { useValidationStore } from '@/stores/validationStore'
+
+export const useIzinBedelOraniValidationStore = defineStore(
+  'izinBedelOraniValidationStore',
+  () => {
+    const validationStore = useValidationStore()
+
+    const formChanged = ref<boolean>(false)
+    const isFormValid = ref<boolean>(true)
+    const invalidTexts = reactive<Record<string, any>>({})
+
+    const FormCheck = (panelData: Record<string, any>): boolean => {
+      Object.assign(invalidTexts, {})
+
+      validationStore.IsFieldEmpty(
+        panelData,
+        invalidTexts,
+        'ad',
+        'Ad alanı zorunludur'
+      )
+
+      validationStore.IsFieldEmpty(
+        panelData,
+        invalidTexts,
+        'oran',
+        'Oran alanı zorunludur'
+      )
+
+      validationStore.IsFieldEmpty(
+        panelData,
+        invalidTexts,
+        'aciklama',
+        'Açıklama alanı zorunludur'
+      )
+
+      // Oran validation (0-100 arası)
+      if (panelData.oran !== undefined && panelData.oran !== '') {
+        const oran = parseFloat(panelData.oran)
+        if (isNaN(oran) || oran < 0 || oran > 100) {
+          invalidTexts.oran = 'Oran 0-100 arasında olmalıdır'
+        }
+      }
+
+      isFormValid.value = Object.keys(invalidTexts).length === 0
+      return isFormValid.value
+    }
+
+    const ResetValidation = () => {
+      Object.assign(invalidTexts, {})
+      formChanged.value = false
+      isFormValid.value = true
+    }
+
+    return {
+      formChanged,
+      isFormValid,
+      invalidTexts,
+      FormCheck,
+      ResetValidation
+    }
+  }
+)

src/module/muhasebe/views/IzinBedelOrani.vue

@@ -0,0 +1,202 @@
+<template>
+  <AdminLayout>
+    <Breadcrumb currentPageText="Muhasebe / İzin Bedel Oranı" />
+    <section class="section-list">
+      <list-table-content
+        :tableHeader="tableHeader"
+        :rowAction="updateAction"
+        :addAction="addAction"
+        icon="draws"
+        title="İzin Bedel Oranları"
+        listText="İzin Bedel Oranı"
+        :tableData="izinBedelOraniList"
+        apiText="İzin Bedel Oranı Listesi"
+        apiList="IzinBedelOrani"
+        v-model:refresh="refresh"
+        :rowActions="rowActions"
+        :rowActionStyle="'width:15%;'" />
+    </section>
+    
+    <panel-wrapper
+      v-if="panel"
+      v-model="panel"
+      :panel-title="isUpdate ? 'İzin Bedel Oranı Düzenle' : 'Yeni İzin Bedel Oranı Ekle'">
+      <template #panelContent>
+        <form-input 
+          required 
+          v-model="panelIzinBedelOrani.ad" 
+          label="Ad" 
+          maxlength="100" />
+        <form-input 
+          required 
+          v-model="panelIzinBedelOrani.oran" 
+          label="Oran (%)" 
+          maxlength="3"
+          @keydown="validationStore.allowNumbersWithKeys"
+          description="1-100 arasında bir rakam giriniz" />
+        <form-textarea 
+          required 
+          v-model="panelIzinBedelOrani.aciklama" 
+          label="Açıklama" 
+          maxlength="500"
+          rows="4" />
+        <form-checkbox 
+          v-model="panelIzinBedelOrani.aktif" 
+          label="Aktif" />
+      </template>
+      <template #footerButton>
+        <div class="button-c button-save" @click="save">
+          {{ isUpdate ? 'Güncelle' : 'Ekle' }}
+        </div>
+      </template>
+    </panel-wrapper>
+  </AdminLayout>
+</template>
+<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'
+  import { useValidationStore } from '@/stores/validationStore'
+  import { useDialogStore } from '@/components/global/dialogStore'
+  import { useDataStore } from '@/stores/dataStore'
+
+  const izinBedelOraniStore = useIzinBedelOraniStore()
+  const izinBedelOraniService = useIzinBedelOraniService()
+  const validationStore = useValidationStore()
+  const dialogStore = useDialogStore()
+  const dataStore = useDataStore()
+
+  const panel = ref<boolean>(false)
+  const isUpdate = ref<boolean>(false)
+  const refresh = ref<boolean>(false)
+  const panelIzinBedelOrani = ref<Record<string, any>>({})
+  const izinBedelOraniList = ref<Record<string, any>[]>([])
+
+  const tableHeader = ref<Record<string, any>[]>(
+      [
+      {
+        name: 'id',
+        title: 'ID',
+        sort: true,
+        style: { width: '8%' }
+      },
+      {
+        name: 'adi',
+        title: 'Ad',
+        sort: true,
+        style: { width: '20%' }
+      },
+      {
+        name: 'oran',
+        title: 'Oran (%)',
+        sort: true,
+        style: { width: '15%' },
+        compute: (v: Record<string, any>): string => {
+          return `%${v.oran}`
+        }
+      },
+      {
+        name: 'aciklama',
+        title: 'Açıklama',
+        sort: true,
+        style: { width: '30%' }
+      },
+      {
+        name: 'aktif',
+        title: 'Durum',
+        sort: true,
+        style: { width: '12%' },
+        computeHtml: (v: Record<string, any>): string => {
+          if (v.aktif) {
+            return `<span class="back-grad back-grad-ok">Aktif</span>`
+          } else {
+            return `<span class="back-grad back-grad-alert">Pasif</span>`
+          }
+        }
+      }
+    ]
+  )
+
+  const DeleteRowPop = (data: Record<string, any>, i: number) => {
+    dialogStore.CreateDialog({
+      title: 'İzin Bedel Oranı Sil',
+      id: 'deleteIzinBedelOrani',
+      content: 'İzin bedel oranını silmek istediğinize emin misiniz?',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'İzin Bedel Oranı Sil',
+          type: 'alert',
+          function: () => DeleteRow(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteRow = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('IzinBedelOrani/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteIzinBedelOrani')
+      refresh.value = true
+    }
+  }
+
+  const rowActions = ref<Record<string, any>[]>([
+    {
+      text: 'Sil',
+      class: 'alert',
+      action: DeleteRowPop
+    }
+  ])
+
+  const addAction = async () => {
+    isUpdate.value = false
+    panelIzinBedelOrani.value = {
+      ad: '',
+      oran: 0,
+      aciklama: '',
+      aktif: true
+    }
+    panel.value = true
+  }
+
+  const updateAction = (row: any) => {
+    const foundItem = izinBedelOraniList.value.find((x) => x.id == row.id)
+    if (foundItem) {
+      panelIzinBedelOrani.value = {
+        id: foundItem.id,
+        ad: foundItem.adi,
+        oran: foundItem.oran,
+        aciklama: foundItem.aciklama,
+        aktif: foundItem.aktif
+      }
+    }
+    panel.value = true
+    isUpdate.value = true
+  }
+
+  const save = async () => {
+    const result = await izinBedelOraniService.SaveIzinBedelOrani(panelIzinBedelOrani.value, isUpdate.value)
+    if (result) {
+      panel.value = false
+      isUpdate.value = false
+      refresh.value = true
+      await loadIzinBedelOraniList()
+    }
+  }
+
+  const loadIzinBedelOraniList = async () => {
+    const data = await dataStore.dataGet('IzinBedelOrani')
+    if (data !== 'errorfalse') {
+      izinBedelOraniList.value = data
+    }
+  }
+
+  onBeforeMount(async () => {
+    await loadIzinBedelOraniList()
+  })
+</script>

src/module/muhasebe/views/MuhasebePiyangoListesi.vue

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

src/module/site-yonetimi/components/form/FormSayfaPicture.vue

@@ -9,7 +9,15 @@
           :data="file"
           @click="ReplaceImage"
           onlyPreview
-          :filePath="file.fileUrl" />
+          :filePath="file.fileUrl">
+          <template #actionButtons  v-if="!usersStore.isPanelUser">
+            <i
+              class="ico-c ico-btn ico-section back-grad-alert"
+              @click="DeleteImagePop(file)">
+              <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+            </i>
+          </template>
+        </file-list-item>
       </template>
       <template v-else>
         <div class="form-item form-item-picture clickable" @click="picturePanel = true">
@@ -43,17 +51,19 @@
 
   import { useDataStore } from '@/stores/dataStore'
   const dataStore = useDataStore()
-  import { useGlobalStore } from '@/stores/globalStore'
-  const globalStore = useGlobalStore()
   import { useValidationStore } from '@/stores/validationStore'
   const validationStore = useValidationStore()
   import { useSiteManagementPageStore } from '../../stores/siteManagementPageStore'
-  const siteManagementPageStore = useSiteManagementPageStore()  
+  const siteManagementPageStore = useSiteManagementPageStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useUsersStore } from '@/stores/usersStore'
+  const usersStore = useUsersStore()
 
   const picturePanel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
 
-  const file = reactive<Record<string,any>>({
+  const file = reactive<Record<string, any>>({
     title: '',
     fileUrl: ''
   })
@@ -108,6 +118,32 @@
       }
     }
   }
+
+  const DeleteImagePop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Resim Sil',
+      id: 'deleteimage',
+      content: 'Resmi silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Resmi Sil',
+          type: 'alert',
+          function: () => DeleteImage(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteImage = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('DocumentPage/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteimage')
+      await GetData()
+    }
+  }
+
   onBeforeMount(async () => {
     await GetData()
   })

src/module/site-yonetimi/views/PopupListe.vue

@@ -51,7 +51,7 @@
   </AdminLayout>
 </template>
 <script setup lang="ts">
-  import { ref, computed } from 'vue'
+  import { ref, onMounted, computed } from 'vue'
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import { Breadcrumb } from '@/components/global'
   import router from '@/router'
@@ -87,7 +87,7 @@
       title: 'Resim Url',
       computeHtml: (v: Record<string, any>) => {
         if (v.resimUrl !== null && v.resimUrl !== undefined) {
-          return globalStore.TableCellDocument(v.resimUrl)
+          return `<a href="${ v.resimUrl }" target="_blank" onclick="event.stopPropagation()"><img class="table-cell-image" src="${ v.resimUrl }" /></a>`
         }
       }
     },

src/module/site-yonetimi/views/SliderListe.vue

@@ -78,7 +78,7 @@
       title: 'Resim Url',
       computeHtml: (v: Record<string, any>) => {
         if (v.resimUrl !== null && v.resimUrl !== undefined) {
-          return globalStore.TableCellDocument(v.resimUrl)
+          return `<a href="${ v.resimUrl }" target="_blank" onclick="event.stopPropagation()"><img class="table-cell-image" src="${ v.resimUrl }" /></a>`
         }
       }
     },

src/module/uyeler/components/form/FormUyeDocuments.vue

@@ -16,7 +16,9 @@
     </div>
     <div class="form-part-content" v-if="customerDocumentStore.loaded">
       <template v-if="customerDocumentStore.customerDocumentsList.length > 0">
-        <div class="form-inner-comment waiting-d" v-if="customerDocumentStore.customerDocumentsList.length < 3">
+        <div
+          class="form-inner-comment waiting-d"
+          v-if="customerDocumentStore.customerDocumentsList.length < 3">
           En az
           <strong>Ticaret Sicil Gazetesi, Vergi Levhası, İmza Sirküleri</strong>
           sisteme yüklenmiş olmalıdır.
@@ -26,12 +28,26 @@
             :data="file"
             @click="EditDocument"
             :filePath="file.filePath"
-            :editable="usersStore.selectedUserApproveId === 3 || usersStore.selectedUserApproveId === 0"
-            title="title" />
+            :editable="
+              usersStore.isPanelUser ||
+              (!usersStore.isPanelUser &&
+                (usersStore.selectedUserApproveId === 3 ||
+                  usersStore.selectedUserApproveId === 0))
+            "
+            title="title">
+            <template #actionButtons v-if="usersStore.isPanelUser">
+              <i
+                class="ico-c ico-btn ico-section back-grad-alert"
+                @click="DeleteDocumentPop(file)">
+                <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+              </i>
+            </template>
+          </file-list-item>
         </template>
       </template>
       <template v-else>
-        <template v-if="!usersStore.isPanelUser && usersStore.selectedUserApproveId !== 5">
+        <template
+          v-if="!usersStore.isPanelUser && usersStore.selectedUserApproveId !== 5">
           <div class="form-inner-comment">
             <span>
               Eklenmiş dosya bulunamadı. Üstteki butonu kullanarak dosya ekleyebilirsiniz.
@@ -79,20 +95,21 @@
   </panel-wrapper>
 </template>
 <script setup lang="ts">
-  import { ref, onBeforeMount } from 'vue'
+  import { onBeforeMount } from 'vue'
 
   import PanelUserDocument from '../panel/PanelUserDocument.vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
 
-  import { useDataStore } from '@/stores/dataStore'
-  const dataStore = useDataStore()
   import { useUsersStore } from '@/stores/usersStore'
   const usersStore = useUsersStore()
-
   import { useCustomerDocumentStore } from '../../stores/customerDocumentStore'
   const customerDocumentStore = useCustomerDocumentStore()
   import { useCustomerDocumentService } from '../../service/customerDocumentService'
   const customerDocumentService = useCustomerDocumentService()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useDataStore } from '@/stores/dataStore'
+  const dataStore = useDataStore()
 
   const NewDocument = () => {
     customerDocumentStore.ResetForm()
@@ -106,6 +123,31 @@
     customerDocumentStore.documentPanel = true
   }
 
+  const DeleteDocumentPop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Doküman Sil',
+      id: 'deletedoc',
+      content: 'Dokümanı silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Doküman Sil',
+          type: 'alert',
+          function: () => DeleteDocument(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteDocument = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('AppUserDocument/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deletedoc')
+      await customerDocumentService.GetDocumentList()
+    }
+  }
+
   onBeforeMount(async () => {
     usersStore.SetSelectedUser()
 

src/module/uyeler/components/form/FormUyePicture.vue

@@ -1,49 +1,64 @@
 <template>
-  <div class='form-part'>
-    <div class='form-part-title'>
+  <div class="form-part">
+    <div class="form-part-title">
       <h4>Profil Resmi</h4>
     </div>
-    <div class='form-part-content'>
+    <div class="form-part-content">
       <template v-if="file.filePath !== '' && file.filePath !== null">
         <file-list-item
-          :data='file'
-          @click='ReplaceImage'
+          :data="file"
+          @click="ReplaceImage"
           onlyPreview
-          :filePath='file.filePath' />
+          :filePath="file.filePath">
+          <template
+            #actionButtons
+            v-if="
+              route.name === 'Profil' ||
+              (route.name === 'Profil' && !usersStore.isPanelUser)
+            ">
+            <i
+              class="ico-c ico-btn ico-section back-grad-alert"
+              @click="DeleteImagePop(file)">
+              <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+            </i>
+          </template>
+        </file-list-item>
       </template>
       <template v-else>
-        <template v-if="route.name === 'Profil' || (route.name === 'Profil' && !usersStore.isPanelUser)">
-          <div class='form-item form-item-picture clickable' @click='picturePanel = true'>
-            <div class='image-c'>
-              <i class='ico-c'>
+        <template
+          v-if="
+            route.name === 'Profil' ||
+            (route.name === 'Profil' && !usersStore.isPanelUser)
+          ">
+          <div class="form-item form-item-picture clickable" @click="picturePanel = true">
+            <div class="image-c">
+              <i class="ico-c">
                 <svg>
-                  <use href='@/assets/images/icons.svg#plus'></use>
+                  <use href="@/assets/images/icons.svg#plus"></use>
                 </svg>
               </i>
             </div>
           </div>
         </template>
         <template v-else>
-          <div class='form-inner-comment'>
-            Eklenmiş resim bulunamadı.
-          </div>
+          <div class="form-inner-comment">Eklenmiş resim bulunamadı.</div>
         </template>
       </template>
     </div>
   </div>
   <panel-wrapper
-    v-if='picturePanel'
-    v-model='picturePanel'
-    panel-title='Profil Resmi Ekle'>
+    v-if="picturePanel"
+    v-model="picturePanel"
+    panel-title="Profil Resmi Ekle">
     <template #panelContent>
       <panel-user-picture />
     </template>
     <template #footerButton>
-      <div class='button-c button-save' @click='FileUpload'>Ekle</div>
+      <div class="button-c button-save" @click="FileUpload">Ekle</div>
     </template>
   </panel-wrapper>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
   import { ref, reactive, onBeforeMount } from 'vue'
   import PanelUserPicture from '../panel/PanelUserPicture.vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
@@ -52,20 +67,13 @@
 
   const route = useRoute()
   import { useDataStore } from '@/stores/dataStore'
-
   const dataStore = useDataStore()
-  import { useGlobalStore } from '@/stores/globalStore'
-
-  const globalStore = useGlobalStore()
   import { useValidationStore } from '@/stores/validationStore'
-
   const validationStore = useValidationStore()
   import { useUsersStore } from '@/stores/usersStore'
-
   const usersStore = useUsersStore()
-  import { useCustomerStore } from '@/module/uyeler/stores/customerStore'
-
-  const customerStore = useCustomerStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
 
   const picturePanel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
@@ -82,7 +90,9 @@
   }
 
   const GetData = async () => {
-    let dt = await dataStore.dataGet('AppUserResim/AppUserId/' + usersStore.selectedUserId())
+    let dt = await dataStore.dataGet(
+      'AppUserResim/AppUserId/' + usersStore.selectedUserId()
+    )
     if (dt !== 'errorfalse') {
       Object.assign(file, dt)
       if (usersStore.selectedUserId() === usersStore.userId)
@@ -126,6 +136,32 @@
       }
     }
   }
+
+  const DeleteImagePop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Resim Sil',
+      id: 'deleteimage',
+      content: 'Resmi silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Resim Sil',
+          type: 'alert',
+          function: () => DeleteImage(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteImage = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('AppUserResim/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteimage')
+      await GetData()
+    }
+  }
+
   onBeforeMount(async () => {
     await GetData()
   })

src/stores/dataStore.ts

@@ -8,7 +8,7 @@ export const useDataStore = defineStore('dataStore', () => {
   const globalDataStore = useGlobalDataStore()
   const toastStore = useToastStore()
 
-  const siteBase = ref<string>('https://panelapi.cekilisevi.gov.tr/')
+  const siteBase = ref<string>(import.meta.env.VITE_API_URL)
   const apiBase = ref<string>('api/')
   const panelData = reactive<Record<string, any>>({})
   const pageData = reactive<Record<string, any>>({})
@@ -40,7 +40,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
 
       const response = await axios.get(apiBase.value + api, sendData)
-      //console.log('response --', api, response)
+      console.log('response --', api, response)
 
       if (data.full !== undefined && data.full) {
         return response
@@ -49,7 +49,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
-      //console.error('Hata oluştu -:', error)
+      console.error('Hata oluştu -:', error)
       return 'errorfalse'
     }
   }
@@ -86,7 +86,7 @@ export const useDataStore = defineStore('dataStore', () => {
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
 
-      //console.error('Hata oluştu:', error)
+      console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }
@@ -122,7 +122,7 @@ export const useDataStore = defineStore('dataStore', () => {
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
 
-      //console.error('Hata oluştu:', error)
+      console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }
@@ -156,7 +156,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
-      //console.error('Hata oluştu:', error)
+      console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }

vite.config.ts

@@ -6,10 +6,22 @@ import vueJsx from '@vitejs/plugin-vue-jsx'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue(), vueJsx()],
+  plugins: [
+    vue({
+      template: {
+        compilerOptions: {
+          comments: false
+        }
+      }
+    }),
+    vueJsx()
+  ],
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))
     }
+  },
+  esbuild: {
+    drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : []
   }
 })