Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-03 00:30:19 +03:00
parent ea27d34336
commit a4f4c2457f
29 changed files with 4522 additions and 752 deletions

View File

@@ -5,14 +5,17 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
state: () => ({
filters: {
selectedDate: new Date().toISOString().slice(0, 10),
excludeZeroBalance12: false,
excludeZeroBalance13: false,
cariSearch: '',
appliedCariSearch: '',
cariIlkGrup: [],
piyasa: [],
temsilci: [],
riskDurumu: [],
islemTipi: [],
ulke: []
ulke: [],
il: [],
ilce: []
},
rows: [],
loading: false,
@@ -25,26 +28,47 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
cariIlkGrupOptions: (state) => uniqueOptions(state.rows, 'cari_ilk_grup'),
piyasaOptions: (state) => uniqueOptions(state.rows, 'piyasa'),
temsilciOptions: (state) => uniqueOptions(state.rows, 'temsilci'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'ozellik03'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'risk_durumu'),
ulkeOptions: (state) => uniqueOptions(state.rows, 'ozellik05'),
ilOptions: (state) => uniqueOptions(state.rows, 'il'),
ilceOptions: (state) => uniqueOptions(state.rows, 'ilce'),
filteredRows: (state) => {
const selectedCariIlkGrup = new Set((state.filters.cariIlkGrup || []).map(v => normalizeText(v)))
const selectedPiyasa = new Set((state.filters.piyasa || []).map(v => normalizeText(v)))
const selectedTemsilci = new Set((state.filters.temsilci || []).map(v => normalizeText(v)))
const selectedRiskDurumu = new Set((state.filters.riskDurumu || []).map(v => normalizeText(v)))
const selectedUlke = new Set((state.filters.ulke || []).map(v => normalizeText(v)))
const selectedIl = new Set((state.filters.il || []).map(v => normalizeText(v)))
const selectedIlce = new Set((state.filters.ilce || []).map(v => normalizeText(v)))
const matchMulti = (selectedSet, value) => {
if (!selectedSet.size) return true
const normalized = normalizeText(value)
if (!normalized) return true
return selectedSet.has(normalized)
}
return state.rows.filter((row) => {
const bak12 = Number(row.bakiye_1_2) || 0
const bak13 = Number(row.bakiye_1_3) || 0
const usd12 = Number(row.usd_bakiye_1_2) || 0
const try12 = Number(row.tl_bakiye_1_2) || 0
const usd13 = Number(row.usd_bakiye_1_3) || 0
const try13 = Number(row.tl_bakiye_1_3) || 0
const cariSearchNeedle = normalizeText(state.filters.cariSearch || '')
const cariIlkGrupOk =
!state.filters.cariIlkGrup.length ||
state.filters.cariIlkGrup.includes(row.cari_ilk_grup)
matchMulti(selectedCariIlkGrup, row.cari_ilk_grup)
const piyasaOk =
!state.filters.piyasa.length ||
state.filters.piyasa.includes(row.piyasa)
matchMulti(selectedPiyasa, row.piyasa)
const temsilciOk =
!state.filters.temsilci.length ||
state.filters.temsilci.includes(row.temsilci)
matchMulti(selectedTemsilci, row.temsilci)
const riskDurumuOk =
!state.filters.riskDurumu.length ||
state.filters.riskDurumu.includes(row.ozellik03)
matchMulti(selectedRiskDurumu, row.risk_durumu)
const cariText = normalizeText([
row.ana_cari_kodu || '',
@@ -52,25 +76,22 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
row.cari_kodu || '',
row.cari_detay || ''
].join(' '))
const cariSearchNeedle = normalizeText(state.filters.appliedCariSearch || '')
const cariSearchOk =
!cariSearchNeedle ||
cariText.includes(cariSearchNeedle)
const ulkeOk =
!state.filters.ulke.length ||
state.filters.ulke.includes(row.ozellik05)
matchMulti(selectedUlke, row.ozellik05)
const ilOk =
matchMulti(selectedIl, row.il)
const ilceOk =
matchMulti(selectedIlce, row.ilce)
const islemTipiOk =
!state.filters.islemTipi.length ||
state.filters.islemTipi.some((t) => {
const bak12 = Number(row.bakiye_1_2) || 0
const bak13 = Number(row.bakiye_1_3) || 0
const usd12 = Number(row.usd_bakiye_1_2) || 0
const try12 = Number(row.tl_bakiye_1_2) || 0
const usd13 = Number(row.usd_bakiye_1_3) || 0
const try13 = Number(row.tl_bakiye_1_3) || 0
if (t === 'prbr_1_2') return bak12 !== 0
if (t === 'prbr_1_3') return bak13 !== 0
if (t === 'usd_1_2') return usd12 !== 0
@@ -80,7 +101,12 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
return false
})
return cariIlkGrupOk && piyasaOk && temsilciOk && riskDurumuOk && cariSearchOk && ulkeOk && islemTipiOk
const excludeZero12Ok = !state.filters.excludeZeroBalance12 || bak12 !== 0
const excludeZero13Ok = !state.filters.excludeZeroBalance13 || bak13 !== 0
return cariIlkGrupOk && piyasaOk && temsilciOk && riskDurumuOk &&
cariSearchOk && ulkeOk && ilOk && ilceOk && islemTipiOk &&
excludeZero12Ok && excludeZero13Ok
})
},
@@ -88,10 +114,10 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const grouped = new Map()
for (const row of this.filteredRows) {
const key = `${row.ana_cari_kodu || ''}||${row.ana_cari_adi || ''}`
const key = String(row.ana_cari_kodu || '').trim()
const current = grouped.get(key) || {
group_key: key,
ana_cari_kodu: row.ana_cari_kodu || '',
ana_cari_kodu: key,
ana_cari_adi: row.ana_cari_adi || '',
piyasa: '',
piyasa_set: new Set(),
@@ -104,8 +130,7 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
usd_bakiye_1_2: 0,
tl_bakiye_1_2: 0,
usd_bakiye_1_3: 0,
tl_bakiye_1_3: 0,
kalan_fatura_ortalama_vade_tarihi: ''
tl_bakiye_1_3: 0
}
current.usd_bakiye_1_2 += Number(row.usd_bakiye_1_2) || 0
@@ -113,6 +138,10 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
current.usd_bakiye_1_3 += Number(row.usd_bakiye_1_3) || 0
current.tl_bakiye_1_3 += Number(row.tl_bakiye_1_3) || 0
if (!String(current.ana_cari_adi || '').trim() && String(row.ana_cari_adi || '').trim()) {
current.ana_cari_adi = row.ana_cari_adi
}
const curr = String(row.cari_doviz || '').trim().toUpperCase() || 'N/A'
current.bakiye_1_2_map[curr] =
(Number(current.bakiye_1_2_map[curr]) || 0) + (Number(row.bakiye_1_2) || 0)
@@ -125,14 +154,7 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const temsilci = String(row.temsilci || '').trim()
if (temsilci) current.temsilci_set.add(temsilci)
if (
!current.kalan_fatura_ortalama_vade_tarihi &&
row.kalan_fatura_ortalama_vade_tarihi
) {
current.kalan_fatura_ortalama_vade_tarihi = row.kalan_fatura_ortalama_vade_tarihi
}
const risk = String(row.ozellik03 || '').trim()
const risk = String(row.risk_durumu || row.ozellik03 || '').trim()
if (risk) current.risk_set.add(risk)
const riskValues = Array.from(current.risk_set)
@@ -172,7 +194,7 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const { data } = await api.get('/finance/customer-balances', {
params: {
selected_date: this.filters.selectedDate,
cari_search: String(this.filters.appliedCariSearch || this.filters.cariSearch || '').trim()
cari_search: String(this.filters.cariSearch || '').trim()
}
})
this.rows = Array.isArray(data) ? data : []
@@ -195,26 +217,25 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
getDetailsByGroup (groupKey) {
return this.filteredRows.filter(r =>
`${r.ana_cari_kodu || ''}||${r.ana_cari_adi || ''}` === groupKey
String(r.ana_cari_kodu || '').trim() === String(groupKey || '').trim()
)
},
resetFilters () {
this.filters.excludeZeroBalance12 = false
this.filters.excludeZeroBalance13 = false
this.filters.cariSearch = ''
this.filters.appliedCariSearch = ''
this.filters.cariIlkGrup = []
this.filters.piyasa = []
this.filters.temsilci = []
this.filters.riskDurumu = []
this.filters.islemTipi = []
this.filters.ulke = []
this.filters.il = []
this.filters.ilce = []
this.defaultsInitialized = false
},
applyCariSearch () {
this.filters.appliedCariSearch = String(this.filters.cariSearch || '').trim()
},
selectAll (field, options) {
this.filters[field] = options.map(o => o.value)
},
@@ -224,10 +245,14 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
},
applyInitialFilterDefaults () {
const transferKey = normalizeText('transfer')
const excludedCariIlkGrup = new Set([
normalizeText('transfer'),
normalizeText('perakende'),
normalizeText('dtf')
])
this.filters.cariIlkGrup = this.cariIlkGrupOptions
.map(o => o.value)
.filter(v => normalizeText(v) !== transferKey)
.filter(v => !excludedCariIlkGrup.has(normalizeText(v)))
const excludedRisk = new Set([
normalizeText('avukat'),
@@ -260,3 +285,4 @@ function normalizeText (str) {
.replace(/[\u0300-\u036f]/g, '')
.trim()
}