- Kapsam dışı piyango detayında bazı tablar kaldırıldı

- piyango liste kapsam dışı ise çekiliş tarihi olmayacak

.env.development

@@ -0,0 +1 @@
+VITE_API_URL=https://panelapi.cekilisevitest.gov.tr/

.env.localdev

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

.env.production

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

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/components/global/DataTable.vue

@@ -7,12 +7,12 @@
             <div class="table-head-content">Sıra No</div>
           </th>
           <template v-for="(headCell, h) in tableHeader">
-            <th :style="headCell.style || ''">
+            <th :style="[headCell.style || '']">
               <div
                 :class="[
                   'table-head-content',
                   headCell.sort !== undefined && headCell.sort ? 'clickable' : ''
-                ]"                
+                ]"
                 @click="SortColumn(headCell)">
                 <span>{{ headCell.title }}</span>
                 <template
@@ -47,13 +47,16 @@
               </div>
             </th>
           </template>
+          <th
+            :style="[rowActionStyle || '']"
+            v-if="rowActions !== undefined && rowActions.length > 0">
+            <div class="table-head-content">İşlemler</div>
+          </th>
         </tr>
       </thead>
       <tbody>
         <tr v-if="tableData.length === 0 && !isPreview">
-          <td :colspan="rowNumber ? tableHeader.length + 1 : tableHeader.length">
-            Veri bulunamadı
-          </td>
+          <td :colspan="ColSpan">Veri bulunamadı</td>
         </tr>
         <tr
           v-else
@@ -77,16 +80,37 @@
                   :name="'dataCell' + j"
                   :cellData="CellData(dataRow, dataCell.name)"
                   :cellIndex="j">
-                  {{
-                    dataCell.compute !== undefined
-                      ? dataCell.compute(dataRow)
-                      : dataRow[dataCell.name]
-                  }}
+                  <div class="table-inner-content">
+                    {{
+                      dataCell.compute !== undefined
+                        ? dataCell.compute(dataRow)
+                        : dataRow[dataCell.name]
+                    }}
+                  </div>
                 </slot>
               </td>
               <td v-else v-html="dataCell.computeHtml(dataRow)"></td>
             </template>
           </slot>
+          <td
+            v-if="rowActions !== undefined && rowActions.length > 0"
+            :class="[actionFixed ? 'action-fixed' : '']">
+            <template v-for="(action, ai) in rowActions">
+              <button
+                :class="[
+                  'button-c button-icon button-export',
+                  action.class !== undefined ? 'back-grad back-grad-' + action.class : ''
+                ]"
+                @click="LocalRowDataAction($event, action.action, dataRow, i)">
+                <i class="ico-c" v-if="action.icon !== undefined">
+                  <svg>
+                    <use :href="icourl + '#' + action.icon"></use>
+                  </svg>
+                </i>
+                <span class="panel-date">{{ action.text }}</span>
+              </button>
+            </template>
+          </td>
         </tr>
         <template
           v-if="
@@ -120,6 +144,7 @@
   import { ref, reactive, computed, watch } from 'vue'
   import type { Ref } from 'vue'
   import { useGlobalStore } from '@/stores/globalStore'
+  import icourl from '@/assets/images/icons.svg'
   const globalStore = useGlobalStore()
 
   interface ITableHead {
@@ -150,11 +175,15 @@
     rowNumber?: boolean
     totalValues?: Record<string, any>
     isPreview?: boolean
+    rowActions?: Record<string, any>[]
+    actionFixed?: boolean
+    rowActionStyle?: string
   }
   const props = withDefaults(defineProps<Props>(), {
     tableData: () => [],
     rowNumber: false,
-    isPreview: false
+    isPreview: false,
+    actionFixed: false
   })
 
   const emit = defineEmits(['update:sortData', 'update:pagination'])
@@ -186,9 +215,27 @@
     }
   })
 
+  const ColSpan = computed<number>(() => {
+    var span = props.tableHeader.length
+    if (props.rowNumber) span++
+    if (props.rowActions) span++
+    return span
+  })
   const LocalRowAction = (d: Record<string, any>) => {
     if (props.rowAction !== undefined) {
-      (props.rowAction! as Function)(d)
+      ;(props.rowAction! as Function)(d)
+    }
+  }
+
+  const LocalRowDataAction = (
+    e: Event,
+    action: Function | undefined,
+    dataRow: Record<string, any>,
+    i: number | string
+  ) => {
+    if (action !== undefined) {
+      e.stopImmediatePropagation()
+      action(dataRow, i)
     }
   }
 
@@ -223,3 +270,20 @@
     { deep: true }
   )
 </script>
+<style scoped>
+  .action-fixed {
+    position: absolute;
+    z-index: 9;
+    top: 0;
+    right: 0;
+  }
+  .table-inner-content {
+    max-height: 400px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 20;
+    line-clamp: 20;
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
+  }
+</style>

src/components/global/DialogItem.vue

@@ -19,7 +19,7 @@
             v-for="(button, i) in dialogData.buttons">
             <button
               :class="['button-c', 'button-' + button.type]"
-              @click="button.function(id, button.data)">
+              @click="LocalFunction(button.function, id, button.data)">
               {{ button.label }}
             </button>
           </template>
@@ -42,7 +42,7 @@
   const dialogStore = useDialogStore()
 
   export interface Props {
-    id: number
+    id: number | string
     dialogData: Record<string, any>
   }
   const props = withDefaults(defineProps<Props>(), {})
@@ -60,7 +60,13 @@
   const CreateData = () => {
     Object.assign(localData, props.dialogData)
   }
-
+  const LocalFunction = (
+    fun: Function | undefined,
+    id: string | number,
+    data: Record<string, any>
+  ) => {
+    if (fun !== undefined) fun(id, data)
+  }
   const CloseDialog = () => {
     delete dialogStore.dialogs[props.id]
   }

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/components/global/ListTableContent.vue

@@ -117,7 +117,10 @@
         v-model:pagination="localPagination"
         :rowNumber="rowNumber"
         :totalValues="localTotalValues"
-        :isPreview="isPreview" />
+        :isPreview="isPreview"
+        :rowActions="rowActions"
+        :actionFixed="actionFixed"
+        :rowActionStyle="rowActionStyle" />
     </slot>
   </div>
 
@@ -194,6 +197,9 @@
     rowNumber?: boolean
     totalValues?: Record<string, any>
     isPreview?: boolean
+    rowActions?: Record<string, any>[]
+    actionFixed?: boolean
+    rowActionStyle?:string
   }
 
   const props = withDefaults(defineProps<Props>(), {
@@ -205,7 +211,8 @@
     export: true,
     search: true,
     rowNumber: false,
-    isPreview: false
+    isPreview: false,
+    actionFixed:false
   })
 
   const emit = defineEmits([
@@ -360,7 +367,7 @@
     searchForm.value = false
     mobileButtons.value = !mobileButtons.value
   }
-  const OpenSearchForm = (e: Event) => {    
+  const OpenSearchForm = (e: Event) => {
     searchFieldPos.value = ''
     if (globalStore.screenWidth <= globalStore.breakPoints.tabletp) {
       mobileButtons.value = false

src/components/global/dialogStore.ts

@@ -7,11 +7,13 @@ export const useDialogStore = defineStore('dialogStore', () => {
   const CreateDialog = (data: Record<string, any>) => {
     const rnd: number = Number(Math.floor(Math.random() * 10000000000))
 
-    dialogs[rnd] = {} as Record<string, any>
-    dialogs[rnd].id = rnd
-    dialogs[rnd].data = data
+    const localId = data.id || rnd
+
+    dialogs[localId] = {} as Record<string, any>
+    dialogs[localId].id = localId
+    dialogs[localId].data = data
   }
-  const CloseDialog = (id: number) => {
+  const CloseDialog = (id: number | string) => {
     delete dialogs[id]
   }
   return {

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/Header.vue

@@ -8,7 +8,7 @@
       </i>
       <a href="/" class="logo-header">
         <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
       </a>
     </div>

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',

src/module/auth/views/ForgotPassword.vue

@@ -4,7 +4,7 @@
       <div class="login-header">
         <div class="logo-header">
           <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
         </div>
         <h1>Şifremi Unuttum</h1>

src/module/auth/views/Login.vue

@@ -4,7 +4,7 @@
       <div class="login-header">
         <div class="logo-header">
           <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
         </div>
         <h1>Giriş Yap</h1>

src/module/auth/views/Register.vue

@@ -3,7 +3,7 @@
     <section class="section-login">
       <div class="login-header">
         <div class="logo-header">
-          <img src="@/assets/images/cekilisevi-logo-1.png" alt="MPI Çekiliş Evi" />
+          <img src="@/assets/images/cekilisevi-logo-n.png" alt="MPI Çekiliş Evi" />
         </div>
         <h1>Üye Ol</h1>
       </div>

src/module/cekilisler/components/TabPiyangoKatilimciListesi.vue

@@ -1,34 +1,34 @@
 <template>
-  <section class='section-list'>
+  <section class="section-list">
     <list-table-content
-      :tableHeader='tableHeader'
-      icon='draws'
-      title='Katılım Listesi'
-      listText='Katılımcı'
-      :rowAction='OpenUser'
+      :tableHeader="tableHeader"
+      icon="draws"
+      title="Katılım Listesi"
+      listText="Katılımcı"
+      :rowAction="OpenUser"
       :apiList="'Katilimci/ByCekilisId/' + piyangoStore.selectedLottery"
-      v-model:pagination='paginationData'
-      v-model:refresh='piyangoKatilimciStore.refreshPiyangoKatilimciList'>
+      v-model:pagination="paginationData"
+      v-model:refresh="piyangoKatilimciStore.refreshPiyangoKatilimciList">
       <template #extraButtons>
         <button
-          class='button-c'
-          @click='piyangoKatilimciService.CreateOnlineDraw'
-          v-if='
+          class="button-c"
+          @click="piyangoKatilimciService.CreateOnlineDraw"
+          v-if="
             paginationData.totalRecords > 0 &&
             usersStore.isPanelUser &&
-            !piyangoStore.lotteryDrawState  &&
+            !piyangoStore.lotteryDrawState &&
             piyangoStore.lotteryApprove === 4 &&
             piyangoStore.lotteryData.cekilisYontemiId === 2
-          '>
+          ">
           Online Çekiliş Düzenle
         </button>
-        <a href='/data/ornek-katilimci-listesi.xlsx' target='_blank' class='button-c'>
+        <a href="/data/ornek-katilimci-listesi.xlsx" target="_blank" class="button-c">
           Örnek Katılımcı Dosyası İndir
         </a>
         <button
-          class='button-c'
-          @click='AddNewDocument'
-          v-if='!usersStore.isPanelUser && !piyangoStore.lotteryDrawState'>
+          class="button-c"
+          @click="AddNewDocument"
+          v-if="!usersStore.isPanelUser && !piyangoStore.lotteryDrawState">
           Katılımcı Dosyası Yükle
         </button>
         <button
@@ -38,9 +38,8 @@
             paginationData.totalRecords > 0 &&
             usersStore.isPanelUser &&
             !piyangoStore.lotteryDrawState &&
-            (piyangoStore.lotteryApprove === 7 ||  piyangoStore.lotteryApprove === 14)
+            (piyangoStore.lotteryApprove === 7 || piyangoStore.lotteryApprove === 14)
           ">
-
           Tüm katılımcıları Sil
         </button>
         <button
@@ -51,20 +50,20 @@
       </template>
     </list-table-content>
     <panel-wrapper
-      v-if='piyangoKatilimciStore.katilimciFilePanel'
-      v-model='piyangoKatilimciStore.katilimciFilePanel'
-      panel-title='Katılımcı Dosyası Yükle'>
+      v-if="piyangoKatilimciStore.katilimciFilePanel"
+      v-model="piyangoKatilimciStore.katilimciFilePanel"
+      panel-title="Katılımcı Dosyası Yükle">
       <template #panelContent>
         <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">Yükle</button>
       </template>
     </panel-wrapper>
     <panel-wrapper
       wide
-      v-if='piyangoKatilimciStore.katilimciUserPanel'
-      v-model='piyangoKatilimciStore.katilimciUserPanel'
+      v-if="piyangoKatilimciStore.katilimciUserPanel"
+      v-model="piyangoKatilimciStore.katilimciUserPanel"
       :panel-title="
         piyangoKatilimciStore.isPiyangoKatilimciUserUpdate
           ? 'Katılımcı Düzenle'
@@ -73,11 +72,11 @@
       <template #panelContent>
         <panel-piyango-katilimci />
       </template>
-      <template #footerButton v-if='!usersStore.isPanelUser'>
+      <template #footerButton v-if="!usersStore.isPanelUser">
         <button
-          :disabled='!piyangoKatilimciValidationStore.userFormChanged'
-          class='button-c button-save'
-          @click='piyangoKatilimciService.SaveKatilimciUser'>
+          :disabled="!piyangoKatilimciValidationStore.userFormChanged"
+          class="button-c button-save"
+          @click="piyangoKatilimciService.SaveKatilimciUser">
           {{ piyangoKatilimciStore.isPiyangoKatilimciUserUpdate ? 'Kaydet' : 'Ekle' }}
         </button>
       </template>
@@ -94,23 +93,20 @@
           <div class="progress-bar">
             <div
               class="progress-fill"
-              :style="{ width: uploadProgressValue + '%' }"
-            ></div>
+              :style="{ width: uploadProgressValue + '%' }"></div>
           </div>
           <div class="progress-text">
             <template v-if="uploadProgressValue === 0">
               Dosya içeriği okunuyor, yükleme başlatılıyor...
             </template>
-            <template v-else>
-              {{ uploadProgressValue }}%
-            </template>
+            <template v-else>{{ uploadProgressValue }}%</template>
           </div>
         </div>
       </template>
     </panel-wrapper>
   </section>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
   import { ref, computed } from 'vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
   import PanelKatilimciDocument from '@/module/cekilisler/components/panel/PanelKatilimciDocument.vue'
@@ -146,8 +142,13 @@
   import { usePiyangoOnayService } from '../service/piyangoOnayService'
   const piyangoOnayService = usePiyangoOnayService()
 
-  import { connectToHub, onProgress, onInsertProgress, onCompleted, onError } from '../service/signalrService'
-
+  import {
+    connectToHub,
+    onProgress,
+    onInsertProgress,
+    onCompleted,
+    onError
+  } from '../service/signalrService'
 
   const uploadProgressValue = ref(0)
   const uploadProgressPanel = ref(false)
@@ -302,8 +303,11 @@
     })
 
     const formData = new FormData()
-    formData.append('excelFile', piyangoKatilimciStore.piyangoKatilimciFileFormData.excelFile)
-console.log( dataStore.panelData)
+    formData.append(
+      'excelFile',
+      piyangoKatilimciStore.piyangoKatilimciFileFormData.excelFile
+    )
+    console.log(dataStore.panelData)
     const response = await dataStore.dataPost(
       `Katilimci/ExcelleYukle/${piyangoStore.selectedLottery}?connectionId=${connectionId}`,
       {
@@ -341,6 +345,7 @@ console.log( dataStore.panelData)
   const DeleteAllButton = () => {
     dialogStore.CreateDialog({
       title: 'Tüm Katılımcıları Sil',
+      id: 'deletekatilimci',
       content:
         'Tüm katılımcıları silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
       closeText: 'Vazgeç',
@@ -348,19 +353,19 @@ console.log( dataStore.panelData)
         {
           label: 'Tüm katılımcıları Sil',
           type: 'alert',
-          function: DeleteAll
+          function: () => DeleteAll
         }
       ]
     })
   }
-  const DeleteAll = async (id: number) => {
+  const DeleteAll = async () => {
     var dt = await dataStore.dataDelete(
       'Katilimci/DeleteCekilisKatilimci/' + piyangoStore.selectedLottery
     )
 
     if (dt !== 'errorfalse') {
       piyangoKatilimciStore.refreshPiyangoKatilimciList = true
-      dialogStore.CloseDialog(id)
+      dialogStore.CloseDialog('deletekatilimci')
     }
   }
 
@@ -370,7 +375,6 @@ console.log( dataStore.panelData)
     piyangoOnayStore.piyangoOnayForm.aciklama = ''
     await piyangoOnayService.SaveOnayDurum()
   }
-
 </script>
 <style>
   .progress-container {
@@ -413,4 +417,4 @@ console.log( dataStore.panelData)
     font-size: 14px;
     text-align: center;
   }
-</style>
+</style>

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/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/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,9 +9,24 @@
       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">
+      <form-date
+        type="date"
+        modelKey="iadeTarihi"
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi"
+        label="İlan Tarihi"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeTarihi"
+        @change="OnKeyup" />
+      <form-file
+        v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeFile"
+        elclass="panel-documents-item"
+        :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeFile"
+        @change="OnKeyup" />
+    </template>
+    
     <form-display
       v-model="piyangoTeminatStore.piyangoTeminatFormData.amount"
       half
@@ -51,7 +66,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/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,19 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
         'description',
         piyangoTeminatStore.piyangoTeminatFormData.description
       )
+
+      if (usersStore.isPanelUser) {
+        if (piyangoTeminatStore.piyangoTeminatFormData.state !== 2) {
+          piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi = ''
+          piyangoTeminatStore.piyangoTeminatFormData.iadeFile = ''
+        }
+        dataForm.append(
+          'iadeTarihi',
+          String(piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi)
+        )
+        dataForm.append('iadeFile', piyangoTeminatStore.piyangoTeminatFormData.iadeFile)
+      }
+
       if (piyangoTeminatStore.isNew) {
         form = await dataStore.dataPost('TeminantStates/', {
           data: dataForm,
@@ -61,8 +77,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 +96,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/stores/piyangoTeminatStore.ts

@@ -23,7 +23,9 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
     cekilisId: piyangoStore.selectedLottery,
     kisiId: usersStore.userId,
     description: '',
-    file: ''
+    file: '',
+    iadeTarihi: '',
+    iadeFile: ''
   })
 
   const piyangoTeminatFormData = reactive<Record<string, any>>({})
@@ -31,7 +33,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 +44,7 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
       loaded.value = true
     }, 30)
   }
-  const RestoreFormData = () => {    
+  const RestoreFormData = () => {
     Object.assign(piyangoTeminatFormData, piyangoTeminatSafeFormData)
   }
   return {

src/module/cekilisler/validation/piyangoTeminatValidationStore.ts

@@ -24,6 +24,12 @@ export const usePiyangoTeminatValidationStore = defineStore(
           'state',
           'Lütfen işlem tipini seçiniz.'
         )
+        validationStore.IsFieldEmpty(
+          piyangoTeminatStore.piyangoTeminatFormData,
+          invalidTexts,
+          'iadeTarihi',
+          'Lütfen iade tarihini seçiniz.'
+        )
       }
 
       validationStore.IsFieldEmpty(

src/module/cekilisler/views/PiyangoDetay.vue

@@ -60,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' },
@@ -82,7 +83,7 @@
     }
     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' })
     }
   }

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/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/views/PopupListe.vue

@@ -1,75 +1,68 @@
 <template>
   <AdminLayout>
-    <Breadcrumb currentPageText='Popup Listesi' />
-    <section class='section-list'>
+    <Breadcrumb currentPageText="Popup Listesi" />
+    <section class="section-list">
       <list-table-content
-        :tableHeader='tableHeader'
-        :rowAction='updateAction'
-        :addAction='addAction'
-        icon='sitemanagement'
-        title='Popup Listesi'
-        listText='Popup'
-        :tableData='popups'
-        apiText='Popup Listesi'
-        apiList='Popup'
+        :tableHeader="tableHeader"
+        :rowAction="updateAction"
+        :addAction="addAction"
+        icon="sitemanagement"
+        title="Popup Listesi"
+        listText="Popup"
+        :tableData="popups"
+        apiText="Popup Listesi"
+        apiList="Popup"
         v-model:refresh="refresh"
-      />
+        :rowActions="rowActions"
+        :rowActionStyle="'width:10%;'" />
     </section>
     <panel-wrapper
-      v-if='panel'
-      v-model='panel'
-      :panel-title="
-      isUpdate
-        ? 'Popup Düzenle'
-        : 'Popup Ekle'
-    ">
+      v-if="panel"
+      v-model="panel"
+      :panel-title="isUpdate ? 'Popup Düzenle' : 'Popup Ekle'">
       <template #panelContent>
-        <form-input
-          v-model='panelPopup.baslik'
-          label='Başlık' />
-        <form-input
-          v-model='panelPopup.url'
-          label='Url' />
+        <form-input v-model="panelPopup.baslik" label="Başlık" />
+        <form-input v-model="panelPopup.url" label="Url" />
         <form-file
-          v-model='panelPopup.resimUrl'
-          label='Resim Url'
-          :fileTypes="['png','jpg','jpeg']"
-          elclass='panel-documents-item'
-          fileType='img' />
-        <div class='image-preview-wrapper' v-if='resimPreview'>
-          <img :src='resimPreview' alt='Seçilen Resim' />
+          v-model="panelPopup.resimUrl"
+          label="Resim Url"
+          :fileTypes="['png', 'jpg', 'jpeg']"
+          elclass="panel-documents-item"
+          fileType="img" />
+        <div class="image-preview-wrapper" v-if="resimPreview">
+          <img :src="resimPreview" alt="Seçilen Resim" />
         </div>
         <form-checkbox
-        :listData="Checker"
-        listText="label"
-        listVal="val"
-        v-model="panelPopup.durum" >
-        <template #checktext0>
-              <span>
-                Aktif
-              </span>
-        </template>
-      </form-checkbox>
+          :listData="Checker"
+          listText="label"
+          listVal="val"
+          v-model="panelPopup.durum">
+          <template #checktext0>
+            <span>Aktif</span>
+          </template>
+        </form-checkbox>
       </template>
       <template #footerButton>
-        <div class='button-c button-save' @click='save'>
+        <div class="button-c button-save" @click="save">
           {{ isUpdate ? 'Kaydet' : 'Ekle' }}
         </div>
       </template>
     </panel-wrapper>
   </AdminLayout>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
   import { ref, onMounted, computed } from 'vue'
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import { Breadcrumb } from '@/components/global'
   import router from '@/router'
   import { useDataStore } from '@/stores/dataStore'
   import PanelWrapper from '@/components/PanelWrapper.vue'
-    import { useGlobalStore } from '@/stores/globalStore'
+  import { useGlobalStore } from '@/stores/globalStore'
   const globalStore = useGlobalStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
 
-  const  Checker = ref([
+  const Checker = ref([
     {
       label: '',
       val: 'durum'
@@ -80,8 +73,8 @@
   const isUpdate = ref<boolean>(false)
 
   const refresh = ref<boolean>(false)
-  const panelPopup = ref<Record<string,any>>({})
-  const popups = ref<Record<string,any>[]>([])
+  const panelPopup = ref<Record<string, any>>({})
+  const popups = ref<Record<string, any>[]>([])
 
   const tableHeader = ref<Record<string, any>[]>([
     {
@@ -94,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>`
         }
       }
     },
@@ -106,16 +99,50 @@
       name: 'durum',
       title: 'Durum',
       computeHtml: (v: Record<string, any>): string => {
-          if (v.durum) {
-            return `<span class="back-grad back-grad-ok">
+        if (v.durum) {
+          return `<span class="back-grad back-grad-ok">
                 Aktif
               </strong>`
-          } else {
-            return ``
-          }
+        } else {
+          return ``
         }
+      }
     }
   ])
+
+  const DeleteRowPop = (data: Record<string, any>, i: number) => {
+    dialogStore.CreateDialog({
+      title: 'Popup Sil',
+      id: 'deletepop',
+      content: 'Popup silmek istediğinize emin misiniz?',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Popup Sil',
+          type: 'alert',
+          function: () => DeleteRow(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteRow = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('Popup/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deletepop')
+      refresh.value = true
+    }
+  }
+
+  const rowActions = ref<Record<string, any>[]>([
+    {
+      text: 'Sil',
+      class: 'alert',
+      action: DeleteRowPop
+    }
+  ])
+
   const resimPreview = computed(() => {
     if (!panelPopup.value.resimUrl) return null
 
@@ -127,7 +154,6 @@
     return URL.createObjectURL(panelPopup.value.resimUrl)
   })
 
-  
   const OpenMenu = (row: any) => {
     router.push('slider-yonetimi/' + row.id)
   }
@@ -136,29 +162,28 @@
     panelPopup.value = {
       baslik: '',
       resimUrl: '',
-      url:'',
+      url: '',
       durum: false
     }
     panel.value = true
-
   }
   const updateAction = (row: any) => {
-    panelPopup.value = popups.value.find(x => x.id == row.id) || {}
+    Object.assign(panelPopup.value,row)
     panel.value = true
     isUpdate.value = true
   }
 
   const save = async () => {
-    if (isUpdate.value)
-    {
+    if (isUpdate.value) {
       const formData = new FormData()
       formData.append('Baslik', panelPopup.value.baslik)
       formData.append('Durum', panelPopup.value.durum)
+      formData.append('Url', panelPopup.value.url)
       if (panelPopup.value.resimUrl instanceof File) {
         formData.append('ResimUrl', panelPopup.value.resimUrl)
       }
 
-      let update:any =  dataStore.dataPut('Popup/'+panelPopup.value.id,{
+      let update: any = dataStore.dataPut('Popup/' + panelPopup.value.id, {
         data: formData,
         headers: { 'Content-Type': 'multipart/form-data' }
       })
@@ -167,8 +192,7 @@
         isUpdate.value = false
         refresh.value = true
       }
-    }
-    else {
+    } else {
       let add = await dataStore.dataPost('Popup', {
         data: panelPopup.value,
         headers: { 'Content-Type': 'multipart/form-data' }
@@ -179,7 +203,6 @@
         refresh.value = true
       }
     }
-
   }
 </script>
 <style>
@@ -204,4 +227,4 @@
     object-fit: cover;
     border-radius: 8px;
   }
-</style>
+</style>

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

@@ -10,24 +10,64 @@
         listText="Sayfa"
         addRoute="yeni-sayfa"
         apiList="Page"
-        apiText="Sayfa Listesi" />
+        apiText="Sayfa Listesi"
+        :refresh="refresh"
+        :rowActions="rowActions"
+        :rowActionStyle="'width:10%;'" />
     </section>
   </AdminLayout>
 </template>
 <script setup lang="ts">
   import { ref } from 'vue'
   import AdminLayout from '@/layouts/AdminLayout.vue'
-  import { useGlobalStore } from '@/stores/globalStore'
-  const globalStore = useGlobalStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useDataStore } from '@/stores/dataStore'
+  const dataStore = useDataStore()
   import router from '@/router'
 
-  const tableHeader = ref<Record<string,any>[]>([
+  const tableHeader = ref<Record<string, any>[]>([
     {
       name: 'title',
       title: 'Sayfa Başlığı',
       sort: true
     }
   ])
+  const refresh = ref<boolean>(false)
+
+  const DeleteRowPop = (data: Record<string, any>, i: number) => {
+    dialogStore.CreateDialog({
+      title: 'Sayfa Sil',
+      id: 'deleteslider',
+      content: 'Sayfayı silmek istediğinize emin misiniz?',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Sil',
+          type: 'alert',
+          function: () => DeleteRow(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteRow = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('Page/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteslider')
+      refresh.value = true
+    }
+  }
+
+  const rowActions = ref<Record<string, any>[]>([
+    {
+      text: 'Sil',
+      class: 'alert',
+      action: () => DeleteRowPop
+    }
+  ])
+
   const pageDetail = (row: any) => {
     router.push('/sayfalar/detay/' + row.id)
   }

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

@@ -1,73 +1,66 @@
 <template>
   <AdminLayout>
-    <Breadcrumb currentPageText='Slider Listesi' />
-    <section class='section-list'>
+    <Breadcrumb currentPageText="Slider Listesi" />
+    <section class="section-list">
       <list-table-content
-        :tableHeader='tableHeader'
-        :rowAction='updateAction'
-        :addAction='addAction'
-        icon='sitemanagement'
-        title='Slider Listesi'
-        listText='Slider'
-        :tableData='sliders'
-        apiText='Slider Listesi'
-        apiList='Slider'
-        v-model:refresh='refresh'
-      />
+        :tableHeader="tableHeader"
+        :rowAction="updateAction"
+        :addAction="addAction"
+        icon="sitemanagement"
+        title="Slider Listesi"
+        listText="Slider"
+        :tableData="sliders"
+        apiText="Slider Listesi"
+        apiList="Slider"
+        v-model:refresh="refresh"
+        :rowActions="rowActions"
+        :rowActionStyle="'width:10%;'" />
     </section>
     <panel-wrapper
-      v-if='panel'
-      v-model='panel'
-      :panel-title="
-      isUpdate
-        ? 'Slider Düzenle'
-        : 'Slider Ekle'
-    ">
+      v-if="panel"
+      v-model="panel"
+      :panel-title="isUpdate ? 'Slider Düzenle' : 'Slider Ekle'">
       <template #panelContent>
-        <form-input
-          required
-          v-model='panelSlider.baslik'
-          label='Başlık' />
+        <form-input required v-model="panelSlider.baslik" label="Başlık" />
         <form-file
-          v-model='panelSlider.resimUrl'
-          label='Resim Url'
-          :fileTypes="['png','jpg','jpeg']"
-          elclass='panel-documents-item'
-          fileType='img' />
-        <div class='image-preview-wrapper' v-if='resimPreview'>
-          <img :src='resimPreview' alt='Seçilen Resim' />
+          v-model="panelSlider.resimUrl"
+          label="Resim Url"
+          :fileTypes="['png', 'jpg', 'jpeg']"
+          elclass="panel-documents-item"
+          fileType="img" />
+        <div class="image-preview-wrapper" v-if="resimPreview">
+          <img :src="resimPreview" alt="Seçilen Resim" />
         </div>
-        <form-input
-          required
-          v-model='panelSlider.url'
-          label='Url' />
-        <form-input
-          required
-          v-model='panelSlider.sira'
-          label='Sıra' />
+        <form-input required v-model="panelSlider.url" label="Url" />
+        <form-input required v-model="panelSlider.sira" label="Sıra" />
       </template>
       <template #footerButton>
-        <div class='button-c button-save' @click='save'>
+        <div class="button-c button-save" @click="save">
           {{ isUpdate ? 'Kaydet' : 'Ekle' }}
         </div>
       </template>
     </panel-wrapper>
   </AdminLayout>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
   import { ref, onMounted, computed } from 'vue'
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import { Breadcrumb } from '@/components/global'
   import router from '@/router'
   import { useDataStore } from '@/stores/dataStore'
   import PanelWrapper from '@/components/PanelWrapper.vue'
+  import { useDialogStore } from '@/components/global/dialogStore'
+  import { useGlobalStore } from '@/stores/globalStore'
+  const globalStore = useGlobalStore()
+
+  const dialogStore = useDialogStore()
 
   const dataStore = useDataStore()
   const panel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
   const refresh = ref<boolean>(false)
-  const panelSlider = ref<Record<string,any>>({})
-  const sliders = ref<Record<string,any>[]>([])
+  const panelSlider = ref<Record<string, any>>({})
+  const sliders = ref<Record<string, any>[]>([])
 
   const tableHeader = ref<Record<string, any>[]>([
     {
@@ -83,7 +76,11 @@
     {
       name: 'resimUrl',
       title: 'Resim Url',
-      sort: true
+      computeHtml: (v: Record<string, any>) => {
+        if (v.resimUrl !== null && v.resimUrl !== undefined) {
+          return `<a href="${ v.resimUrl }" target="_blank" onclick="event.stopPropagation()"><img class="table-cell-image" src="${ v.resimUrl }" /></a>`
+        }
+      }
     },
     {
       name: 'url',
@@ -91,6 +88,40 @@
       sort: true
     }
   ])
+
+  const DeleteRowPop = (data: Record<string, any>, i: number) => {
+    dialogStore.CreateDialog({
+      title: 'Slider Sil',
+      id: 'deleteslider',
+      content: 'Slider silmek istediğinize emin misiniz?',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Slider Sil',
+          type: 'alert',
+          function: () => DeleteRow(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteRow = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('Slider/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteslider')
+      refresh.value = true
+    }
+  }
+
+  const rowActions = ref<Record<string, any>[]>([
+    {
+      text: 'Sil',
+      class: 'alert',
+      action: DeleteRowPop
+    }
+  ])
+
   const resimPreview = computed(() => {
     if (!panelSlider.value.resimUrl) return null
 
@@ -100,8 +131,8 @@
 
     // Eğer dosya ise
     return URL.createObjectURL(panelSlider.value.resimUrl)
-  })  
-  
+  })
+
   const OpenMenu = (row: any) => {
     router.push('slider-yonetimi/' + row.id)
   }
@@ -114,10 +145,9 @@
       sira: 1
     }
     panel.value = true
-
   }
   const updateAction = (row: any) => {
-    panelSlider.value = sliders.value.find(x => x.id == row.id) || {}
+    panelSlider.value = sliders.value.find((x) => x.id == row.id) || {}
     panel.value = true
     isUpdate.value = true
   }
@@ -130,8 +160,7 @@
   }
 
   const save = async () => {
-    if (isUpdate.value)
-    {
+    if (isUpdate.value) {
       const formData = new FormData()
       formData.append('Baslik', panelSlider.value.baslik)
       formData.append('Url', panelSlider.value.url)
@@ -140,7 +169,7 @@
         formData.append('ResimUrl', panelSlider.value.resimUrl)
       }
 
-     let update:any =  dataStore.dataPut('Slider/'+panelSlider.value.id,{
+      let update: any = dataStore.dataPut('Slider/' + panelSlider.value.id, {
         data: formData,
         headers: { 'Content-Type': 'multipart/form-data' }
       })
@@ -149,8 +178,7 @@
         isUpdate.value = false
         refresh.value = true
       }
-    }
-    else {
+    } else {
       let add = await dataStore.dataPost('Slider/CreateSlider', {
         data: panelSlider.value,
         headers: { 'Content-Type': 'multipart/form-data' }
@@ -161,12 +189,7 @@
         refresh.value = true
       }
     }
-
   }
-
-  onMounted(() => {
-    loadSliders()
-  })
 </script>
 <style>
   .image-preview-wrapper {
@@ -190,4 +213,4 @@
     object-fit: cover;
     border-radius: 8px;
   }
-</style>
+</style>

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

@@ -13,7 +13,7 @@
           @click="OpenPreviewPanel"
           v-if="
             (route.name === 'Profil' && !usersStore.isPanelUser) ||
-            route.name === 'UyeYetkiliDetay' && loaded
+            (route.name === 'UyeYetkiliDetay'|| usersStore.selectedUserApproveId === 3) && loaded
           ">
           Önizleme
         </button>
@@ -21,9 +21,8 @@
     </div>
     <div class="form-part-content" v-if="loaded">
       <user-approve-states v-if="!isPreview && route.name !== 'UyeYetkiliYeni'" />
-
       <form-select
-        v-if="route.name === 'UyeYetkiliYeni'"
+        v-if="route.name === 'UyeYetkiliYeni' || usersStore.selectedUserApproveId === 3"
         label="Kullanıcı Tipi"
         :listData="yetkiliTipList"
         listText="baslik"
@@ -36,7 +35,6 @@
       <div class="form-item back-grad back-grad-grey" v-else>
         {{ uyeBilgileriStore.formData.basvuruTipi }}
       </div>
-
       <form-input
         type="email"
         half
@@ -430,8 +428,8 @@
   const SetYetkiliTipList = () => {
     Object.assign(yetkiliTipList.value, globalDataStore.customerTips)
 
-    let araciInd = yetkiliTipList.value.findIndex((p) => p.id === 23)
-    yetkiliTipList.value.splice(araciInd, 1)
+    // let araciInd = yetkiliTipList.value.findIndex((p) => p.id === 23)
+    // yetkiliTipList.value.splice(araciInd, 1)
   }
 
   const ilceDisabled = computed<boolean>(() => {

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

@@ -1,21 +1,26 @@
 <template>
-  <div class="form-part form-title">
-    <div class="form-title-buttons">
-      <div class="button-c button-save" @click="SendForApprove">Onaya Gönder</div>
+  <div class='form-part form-title'>
+    <div class='form-title-buttons'>
+      <div class='button-c button-save' @click='SendForApprove'>Onaya Gönder</div>
     </div>
   </div>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
   import { ref, reactive, onBeforeMount, computed } from 'vue'
   import { useRoute } from 'vue-router'
+
   const route = useRoute()
   import { useDataStore } from '@/stores/dataStore'
+
   const dataStore = useDataStore()
   import { useGlobalStore } from '@/stores/globalStore'
+
   const globalStore = useGlobalStore()
   import { useUsersStore } from '@/stores/usersStore'
+
   const usersStore = useUsersStore()
   import { useCustomerStore } from '../../stores/customerStore'
+
   const customerStore = useCustomerStore()
 
   const formData = reactive<Record<string, any>>({
@@ -39,9 +44,9 @@
     })
 
     if (form !== 'errorfalse') {
-      if (route.name === 'UyeDetay')
+      if (route.name === 'UyeDetay' || route.name === 'Profil') {
         usersStore.userApproveId = formData.onayDurumuIslemTipiId
-      else usersStore.userSubApproveId = formData.onayDurumuIslemTipiId
+      } else usersStore.userSubApproveId = formData.onayDurumuIslemTipiId
     }
   }
 </script>

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

@@ -1,30 +1,30 @@
 <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>
       <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">
+          <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">
+          <div class='form-inner-comment'>
             Eklenmiş resim bulunamadı.
           </div>
         </template>
@@ -32,39 +32,45 @@
     </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'
 
   import { useRoute } from 'vue-router'
+
   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()
 
   const picturePanel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
 
-  const file = reactive<Record<string,any>>({
+  const file = reactive<Record<string, any>>({
     title: '',
     filePath: ''
   })
@@ -75,7 +81,7 @@
     picturePanel.value = true
   }
 
-  const GetData = async () => {    
+  const GetData = async () => {
     let dt = await dataStore.dataGet('AppUserResim/AppUserId/' + usersStore.selectedUserId())
     if (dt !== 'errorfalse') {
       Object.assign(file, dt)

src/module/uyeler/stores/UyeBilgileriStore.ts

@@ -119,6 +119,7 @@ export const useUyeBilgileriStore = defineStore('uyeBilgileriStore', () => {
         delete formData[key]
       })
     }*/
+    ResetFormItems();
     formChanged.value = true
   }
 

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>>({})

vite.config.ts

@@ -11,5 +11,8 @@ export default defineConfig({
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))
     }
+  },
+  esbuild: {
+    drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : []
   }
 })