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

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

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/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/cekilisler/components/TabPiyangoTeminatDurumu.vue

@@ -22,20 +22,13 @@
         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 === 0 ||
-            piyangoStore.lotteryApprove === 1 ||
-            piyangoStore.lotteryApprove === 2 ||
-            piyangoStore.lotteryApprove === 3 ||
-            piyangoTeminatStore.isNew)
+          (piyangoStore.lotteryApprove === 3 || piyangoTeminatStore.isNew)
         " />
     </template>
     <template #footerButton>
@@ -50,7 +43,7 @@
   </panel-wrapper>
 </template>
 <script setup lang="ts">
-  import { ref, computed, onBeforeMount } from 'vue'
+  import { ref, computed,onBeforeMount } from 'vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
 
   import PanelPiyangoTeminatDurumu from './panel/PanelPiyangoTeminatDurumu.vue'
@@ -150,7 +143,10 @@
   ])
 
   const teminatAddAction = computed(() => {
-    if (!usersStore.isPanelUser) return NewTeminatDurum
+    if (
+      !usersStore.isPanelUser
+    )
+      return NewTeminatDurum
     else return ''
   })
 

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/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/panel/PanelPiyangoTeminatDurumuDisplay.vue

@@ -12,26 +12,14 @@
       @change="OnKeyup"
       :disabled="!usersStore.isPanelUser" />
 
-    <template
-      v-if="
-        piyangoTeminatStore.piyangoTeminatFormData.state === 2 ||
-        piyangoTeminatStore.piyangoTeminatFormData.state === 3
-      ">
+    <template v-if="piyangoTeminatStore.piyangoTeminatFormData.state === 2">
       <form-date
         type="date"
-        half
         modelKey="iadeTarihi"
         v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi"
         label="İlan Tarihi"
         :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeTarihi"
         @change="OnKeyup" />
-      <form-input
-        modelKey="iadeSayi"
-        v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeSayi"
-        half
-        label="Sayısı"
-        @keyup="OnKeyup"
-        :invalidText="piyangoTeminatValidationStore.invalidTexts.iadeSayi" />
       <form-file
         v-model="piyangoTeminatStore.piyangoTeminatFormData.iadeFile"
         elclass="panel-documents-item"

src/module/cekilisler/service/piyangoServices.ts

@@ -52,11 +52,6 @@ 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

@@ -48,9 +48,8 @@ export const usePiyangoTeminatService = defineStore('piyangoTeminatService', ()
       )
 
       if (usersStore.isPanelUser) {
-        if (piyangoTeminatStore.piyangoTeminatFormData.state === 1) {
+        if (piyangoTeminatStore.piyangoTeminatFormData.state !== 2) {
           piyangoTeminatStore.piyangoTeminatFormData.iadeTarihi = ''
-          piyangoTeminatStore.piyangoTeminatFormData.iadeSayi = ''
           piyangoTeminatStore.piyangoTeminatFormData.iadeFile = ''
         }
         dataForm.append(

src/module/cekilisler/stores/piyangoTeminatStore.ts

@@ -25,7 +25,6 @@ export const usePiyangoTeminatStore = defineStore('piyangoTeminatStore', () => {
     description: '',
     file: '',
     iadeTarihi: '',
-    iadeSayi: '',
     iadeFile: ''
   })
 

src/module/cekilisler/validation/piyangoTeminatValidationStore.ts

@@ -30,12 +30,6 @@ export const usePiyangoTeminatValidationStore = defineStore(
           'iadeTarihi',
           'Lütfen iade tarihini seçiniz.'
         )
-        validationStore.IsFieldEmpty(
-          piyangoTeminatStore.piyangoTeminatFormData,
-          invalidTexts,
-          'iadeSayi',
-          'Lütfen iade sayı no giriniz.'
-        )
       }
 
       validationStore.IsFieldEmpty(

src/module/cekilisler/views/PiyangoDetay.vue

@@ -60,13 +60,14 @@
 
   const CreateTabs = () => {
     if (
-      piyangoStore.lotteryApprove === 4 ||
+      (piyangoStore.lotteryApprove === 4 ||
         piyangoStore.lotteryApprove === 10 ||
         piyangoStore.lotteryApprove === 11 ||
         piyangoStore.lotteryApprove === 12 ||
         piyangoStore.lotteryApprove === 13 ||
         piyangoStore.lotteryApprove === 14 ||
-      usersStore.isPanelUser
+        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: {

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

@@ -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>`
         }
       }
     },