Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-04-16 15:18:44 +03:00
parent 1831c45a0c
commit 2d369e7d7d
40 changed files with 3477 additions and 97 deletions

View File

@@ -42,7 +42,7 @@
<q-date
v-model="dateFrom"
mask="YYYY-MM-DD"
locale="tr-TR"
:locale="dateLocale"
:options="isValidFromDate"
/>
</q-popup-proxy>
@@ -65,7 +65,7 @@
<q-date
v-model="dateTo"
mask="YYYY-MM-DD"
locale="tr-TR"
:locale="dateLocale"
:options="isValidToDate"
/>
</q-popup-proxy>
@@ -281,12 +281,18 @@ import { useStatementdetailStore } from 'src/stores/statementdetailStore'
import { useDownloadstpdfStore } from 'src/stores/downloadstpdfStore'
import dayjs from 'dayjs'
import { usePermission } from 'src/composables/usePermission'
import { useLocaleStore } from 'src/stores/localeStore'
import { getDateLocale } from 'src/i18n/dayjsLocale'
import { useI18n } from 'src/composables/useI18n'
const { canRead, canExport } = usePermission()
const canReadFinance = canRead('finance')
const canExportFinance = canExport('finance')
const $q = useQuasar()
const localeStore = useLocaleStore()
const { t } = useI18n()
const dateLocale = computed(() => getDateLocale(localeStore.locale))
const accountStore = useAccountStore()
const statementheaderStore = useStatementheaderStore()
@@ -360,7 +366,7 @@ function hasInvalidDateRange () {
function notifyInvalidDateRange () {
$q.notify({
type: 'warning',
message: '⚠️ Başlangıç tarihi bitiş tarihinden sonra olamaz.',
message: t('statement.invalidDateRange'),
position: 'top-right'
})
}
@@ -402,7 +408,7 @@ async function onFilterClick() {
if (!selectedCari.value || !dateFrom.value || !dateTo.value) {
$q.notify({
type: 'warning',
message: '⚠️ Lütfen cari ve tarih aralığını seçiniz.',
message: t('statement.selectFilters'),
position: 'top-right'
})
return
@@ -417,7 +423,7 @@ async function onFilterClick() {
startdate: dateFrom.value,
enddate: dateTo.value,
accountcode: selectedCari.value,
langcode: 'TR',
langcode: localeStore.backendLangCode,
parislemler: selectedMonType.value,
excludeopening: excludeOpening.value
})
@@ -483,7 +489,7 @@ function toggleFiltersCollapsed () {
function normalizeText (str) {
return (str || '')
.toString()
.toLocaleLowerCase('tr-TR') // Türkçe uyumlu
.toLocaleLowerCase(dateLocale.value)
.normalize('NFD') // aksan temizleme
.replace(/[\u0300-\u036f]/g, '')
.trim()
@@ -503,7 +509,7 @@ function resetFilters() {
/* Format */
function formatAmount(n) {
if (n == null || isNaN(n)) return '0,00'
return new Intl.NumberFormat('tr-TR', {
return new Intl.NumberFormat(dateLocale.value, {
minimumFractionDigits: 2,
maximumFractionDigits: 2
}).format(n)
@@ -562,7 +568,8 @@ async function handleDownload() {
selectedCari.value, // accountCode
dateFrom.value, // startDate
dateTo.value, // endDate
selectedMonType.value // <-- eklendi (['1','2'] veya ['1','3'])
selectedMonType.value, // <-- eklendi (['1','2'] veya ['1','3'])
localeStore.backendLangCode
)
console.log("[DEBUG] Storedan gelen result:", result)
@@ -608,7 +615,8 @@ async function CurrheadDownload() {
selectedCari.value, // accountCode
dateFrom.value, // startDate
dateTo.value, // endDate
selectedMonType.value // parasal işlem tipi (parislemler)
selectedMonType.value, // parasal işlem tipi (parislemler)
localeStore.backendLangCode
)
console.log("[DEBUG] CurrheadDownloadresult:", result)