formmuhasebeayarları

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

@@ -50,7 +50,7 @@
   </template>
 
   <div class="form-inner-comment success-d" v-if="piyangoStore.lotteryApprove === 4">
-    Başvuru onaylanmıştır.
+    Başvuruya izin verildi.
   </div>
   <div class="form-inner-comment alert-d" v-if="piyangoStore.lotteryApprove === 5">
     Başvuru uygun görülmemiştir.

src/module/cekilisler/stores/piyangoIkramiyeStore.ts

@@ -31,6 +31,7 @@ export const usePiyangoIkramiyeStore = defineStore('piyangoIkramiyeStore', () =>
   const refreshList = ref<boolean>(false)
   const ikramiyePanel = ref<boolean>(false)
   const loaded = ref<boolean>(false)
+  const totalIkramiyeValue = ref<number>(0)
 
   const totalIkramiyeValues = reactive<Record<string, any>>({
     yedekTalihliAdedi: 'toplamyedektalihli',
@@ -69,6 +70,7 @@ export const usePiyangoIkramiyeStore = defineStore('piyangoIkramiyeStore', () =>
     ikramiyePanel,
     loaded,
     totalIkramiyeValues,
+    totalIkramiyeValue,
     ResetForm,
     CalculateToplamDeger
   }

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

@@ -56,9 +56,7 @@
                     <td>Toplam İkramiye Bedeli:</td>
                     <td>
                       {{
-                        globalStore.toTrLocale(
+                        globalStore.toTrLocale(Number(piyangoIkramiyeStore.totalIkramiyeValue))
-                          Number(piyangoIkramiyeStore.totalIkramiyeValues.toplamDeger)
-                        )
                       }}
                     </td>
                   </tr>
@@ -72,10 +70,7 @@
                     <td>Toplam Bedel:</td>
                     <td>
                       {{
-                        globalStore.toTrLocale(
+                        globalStore.toTrLocale(Number(piyangoIkramiyeStore.totalIkramiyeValue) + calculatedKdv)
-                          Number(piyangoIkramiyeStore.totalIkramiyeValues.toplamDeger) +
-                            calculatedKdv
-                        )
                       }}
                     </td>
                   </tr>
@@ -135,7 +130,7 @@
   const calculatedBasvuruKdv = computed<number>(
     () =>
       (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) *
-        Number(muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani)) /
+        Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
       100
   )
 
@@ -183,20 +178,28 @@
       izinBedelOranlari.value = data
     }
   }
+  const GetIkramiyeTotalValues = async () => {
+    console.log(piyangoStore,"piyangoStore")
+    let data = await dataStore.dataGet('Ikramiye/Cekilis/' + piyangoStore.selectedLottery)
+    if (data !== 'errorfalse') {
+      piyangoIkramiyeStore.totalIkramiyeValue = data.toplamdeger
+    }
+  }
   const BasvuruBedeliDialog = () => {
+    console.log(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli)
+    console.log(calculatedBasvuruKdv.value)
+    console.log(Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + calculatedBasvuruKdv.value)
     dialogStore.CreateDialog({
       title: 'Başvuru Bedelini Muhasebeleştir',
       id: 'basvurubedelimuhasebelestir',
-      contentHtml: `<table class="table-bordered">
+      contentHtml: `<table class='table-bordered'>
                 <tbody>
                   <tr>
                     <td>Başvuru Bedeli:</td>
-                    <td>${globalStore.toTrLocale(
+                    <td>${globalStore.toTrLocale(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli)} ₺</td>
-                      muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
-                    )} ₺</td>
                   </tr>
                   <tr>
-                    <td>KDV %20):</td>
+                    <td>KDV (%${muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani}):</td>
                     <td>
                       ${globalStore.toTrLocale(calculatedBasvuruKdv.value)}
                     </td>
@@ -204,10 +207,7 @@
                   <tr>
                     <td>Toplam Bedel:</td>
                     <td>
-                      ${globalStore.toTrLocale(
+                      ${globalStore.toTrLocale(Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + calculatedBasvuruKdv.value)}
-                        Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) +
-                          calculatedBasvuruKdv.value
-                      )}
                     </td>
                   </tr>
                 </tbody>
@@ -244,6 +244,7 @@
 
   const OpenIzinBedeliModal = async () => {
     await GetIzinBedelOranlari()
+    await GetIkramiyeTotalValues()
     showIzinBedeliModal.value = true
     selectedOran.value = null
     selectedOranId.value = null
@@ -270,8 +271,7 @@
       selectedOran.value = null
     }
 
-    calculatedKdv.value =
+    calculatedKdv.value = (Number(piyangoIkramiyeStore.totalIkramiyeValue) * Number(selectedOran.value)) / 100
-      (Number(piyangoIkramiyeStore.totalIkramiyeValues) * Number(selectedOran!)) / 100
   }
 
   const IzinBedeliMuhasebelestir = async () => {

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

@@ -18,8 +18,8 @@
       <form-input
         required
         half
-        modelKey="BasvuruBedeliKdvOrani"
+        modelKey="basvuruBedeliKdvOrani"
-        v-model="muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani"
+        v-model="muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani"
         :invalidText="muhasebeSettingsValidationStore.invalidTexts.BasvuruBedeliKdvOrani"
         label="Başvuru Bedeli KDV Oranı"
         @keydown="validationStore.allowPrice"

src/module/muhasebe/validation/muhasebeSettingsValidationStore.ts

@@ -19,24 +19,24 @@ export const useMuhasebeSettingsValidationStore = defineStore(
       validationStore.IsFieldEmpty(
         muhasebeSettingsStore.muhasebeSettingsForm,
         invalidTexts,
-        'BasvuruBedeliKdvOrani',
+        'basvuruBedeliKdvOrani',
         'Lütfen izin bedeli oranını giriniz.'
       )
       if (
         !validationStore.checkEmpty(
-          muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani
+          muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani
         )
       ) {
         if (
-          Number(muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani) ===
+          Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani) ===
             0 ||
-          Number(muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani) > 100
+          Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani) > 100
         ) {
           isFormValid.value = false
-          invalidTexts['BasvuruBedeliKdvOrani'] =
+          invalidTexts['basvuruBedeliKdvOrani'] =
             'Lütfen 0-100 arasında bir değer giriniz.'
         } else {
-          delete invalidTexts['BasvuruBedeliKdvOrani']
+          delete invalidTexts['basvuruBedeliKdvOrani']
         }
       }
       validationStore.IsFieldEmpty(