Merge remote-tracking branch 'origin/master'

2026-03-09 13:19:14 +03:00
parent 6df18ed14d
commit 0d303f0c0f
12 changed files with 382 additions and 280 deletions
--- a/ui/quasar.config.js.temporary.compiled.1772788258926.mjs
+++ b/ui/quasar.config.js.temporary.compiled.1772788258926.mjs
@@ -1,125 +0,0 @@
-/* eslint-disable */
-/**
- * THIS FILE IS GENERATED AUTOMATICALLY.
- * 1. DO NOT edit this file directly as it won't do anything.
- * 2. EDIT the original quasar.config file INSTEAD.
- * 3. DO NOT git commit this file. It should be ignored.
- *
- * This file is still here because there was an error in
- * the original quasar.config file and this allows you to
- * investigate the Node.js stack error.
- *
- * After you fix the original file, this file will be
- * deleted automatically.
- **/
-
-
-// quasar.config.js
-import { defineConfig } from "@quasar/app-webpack/wrappers";
-var quasar_config_default = defineConfig(() => {
-  const apiBaseUrl = (process.env.VITE_API_BASE_URL || "/api").trim();
-  return {
-    /* =====================================================
-       APP INFO
-    ===================================================== */
-    productName: "Baggi BSS",
-    productDescription: "Baggi Tekstil Business Support System",
-    /* =====================================================
-       BOOT FILES
-    ===================================================== */
-    boot: ["dayjs"],
-    /* =====================================================
-       GLOBAL CSS
-    ===================================================== */
-    css: ["app.css"],
-    /* =====================================================
-       ICONS / FONTS
-    ===================================================== */
-    extras: [
-      "roboto-font",
-      "material-icons"
-    ],
-    /* =====================================================
-       BUILD (PRODUCTION)
-    ===================================================== */
-    build: {
-      vueRouterMode: "hash",
-      env: {
-        VITE_API_BASE_URL: apiBaseUrl
-      },
-      esbuildTarget: {
-        browser: ["es2022", "firefox115", "chrome115", "safari14"],
-        node: "node20"
-      },
-      // Cache & performance
-      gzip: true,
-      preloadChunks: true
-    },
-    /* =====================================================
-       DEV SERVER (LOCAL)
-    ===================================================== */
-    devServer: {
-      server: { type: "http" },
-      port: 9e3,
-      open: true,
-      // DEV proxy (CORS'suz)
-      proxy: [
-        {
-          context: ["/api"],
-          target: "http://localhost:8080",
-          changeOrigin: true,
-          secure: false
-        }
-      ]
-    },
-    /* =====================================================
-       QUASAR FRAMEWORK
-    ===================================================== */
-    framework: {
-      config: {
-        notify: {
-          position: "top",
-          timeout: 2500
-        }
-      },
-      lang: "tr",
-      plugins: [
-        "Loading",
-        "Dialog",
-        "Notify"
-      ]
-    },
-    animations: [],
-    /* =====================================================
-       SSR / PWA (DISABLED)
-    ===================================================== */
-    ssr: {
-      prodPort: 3e3,
-      middlewares: ["render"],
-      pwa: false
-    },
-    pwa: {
-      workboxMode: "GenerateSW"
-    },
-    /* =====================================================
-       MOBILE / DESKTOP
-    ===================================================== */
-    capacitor: {
-      hideSplashscreen: true
-    },
-    electron: {
-      preloadScripts: ["electron-preload"],
-      inspectPort: 5858,
-      bundler: "packager",
-      builder: {
-        appId: "baggisowtfaresystem"
-      }
-    },
-    bex: {
-      extraScripts: []
-    }
-  };
-});
-export {
-  quasar_config_default as default
-};
--- a/ui/src/pages/AgingCustomerBalancelist.go.vue
+++ b/ui/src/pages/AgingCustomerBalancelist.go.vue
@@ -635,12 +635,8 @@ const canReadFinance = canRead('finance')
 const canExportFinance = canExport('finance')

 const islemTipiOptions = [
-  { label: '1_2 Bakiye Pr.Br', value: 'prbr_1_2' },
-  { label: '1_3 Bakiye Pr.Br', value: 'prbr_1_3' },
-  { label: '1_2 USD Bakiye', value: 'usd_1_2' },
-  { label: '1_2 TRY Bakiye', value: 'try_1_2' },
-  { label: '1_3 USD Bakiye', value: 'usd_1_3' },
-  { label: '1_3 TRY Bakiye', value: 'try_1_3' }
+  { label: '1_2', value: '1_2' },
+  { label: '1_3', value: '1_3' }
 ]

 const staticMoneyFields = ['usd_bakiye_1_2', 'tl_bakiye_1_2', 'usd_bakiye_1_3', 'tl_bakiye_1_3']
@@ -688,11 +684,7 @@ const metricDefs = {
  try_1_3: { name: 'tl_bakiye_1_3', label: '1_3 TRY_BAKIYE', field: 'tl_bakiye_1_3', align: 'center', sortable: true, sort: (a, b) => toNumericSortValue(a) - toNumericSortValue(b) }
 }

-const selectedMetricKeys = computed(() => {
-  const selected = store.filters.islemTipi || []
-  if (!selected.length) return [...Object.keys(metricDefs)]
-  return selected.filter((k) => k in metricDefs)
-})
+const selectedMetricKeys = computed(() => [...Object.keys(metricDefs)])

 const summaryColumns = computed(() => ([
  { name: 'expand', label: '', field: 'expand', align: 'center', sortable: false },
--- a/ui/src/pages/CustomerBalanceList.vue
+++ b/ui/src/pages/CustomerBalanceList.vue
@@ -538,12 +538,8 @@ const canReadFinance = canRead('finance')
 const canExportFinance = canExport('finance')

 const islemTipiOptions = [
-  { label: '1_2 Bakiye Pr.Br', value: 'prbr_1_2' },
-  { label: '1_3 Bakiye Pr.Br', value: 'prbr_1_3' },
-  { label: '1_2 USD Bakiye', value: 'usd_1_2' },
-  { label: '1_2 TRY Bakiye', value: 'try_1_2' },
-  { label: '1_3 USD Bakiye', value: 'usd_1_3' },
-  { label: '1_3 TRY Bakiye', value: 'try_1_3' }
+  { label: '1_2', value: '1_2' },
+  { label: '1_3', value: '1_3' }
 ]

 const staticMoneyFields = ['usd_bakiye_1_2', 'tl_bakiye_1_2', 'usd_bakiye_1_3', 'tl_bakiye_1_3']
@@ -590,11 +586,7 @@ const metricDefs = {
  try_1_3: { name: 'tl_bakiye_1_3', label: '1_3 TRY_BAKIYE', field: 'tl_bakiye_1_3', align: 'center', sortable: true, sort: (a, b) => toNumericSortValue(a) - toNumericSortValue(b) }
 }

-const selectedMetricKeys = computed(() => {
-  const selected = store.filters.islemTipi || []
-  if (!selected.length) return Object.keys(metricDefs)
-  return selected.filter((k) => k in metricDefs)
-})
+const selectedMetricKeys = computed(() => Object.keys(metricDefs))

 const summaryColumns = computed(() => ([
  { name: 'expand', label: '', field: 'expand', align: 'center', sortable: false },
--- a/ui/src/stores/accountAgingBalanceStore.js
+++ b/ui/src/stores/accountAgingBalanceStore.js
@@ -78,12 +78,8 @@ export const useAccountAgingBalanceStore = defineStore('accountAgingBalance', {
        const islemTipiOk =
          !state.filters.islemTipi.length ||
          state.filters.islemTipi.some((t) => {
-            if (t === 'prbr_1_2') return bak12 !== 0
-            if (t === 'prbr_1_3') return bak13 !== 0
-            if (t === 'usd_1_2') return usd12 !== 0
-            if (t === 'try_1_2') return try12 !== 0
-            if (t === 'usd_1_3') return usd13 !== 0
-            if (t === 'try_1_3') return try13 !== 0
+            if (t === '1_2') return bak12 !== 0 || usd12 !== 0 || try12 !== 0
+            if (t === '1_3') return bak13 !== 0 || usd13 !== 0 || try13 !== 0
            return false
          })

--- a/ui/src/stores/customerBalanceListStore.js
+++ b/ui/src/stores/customerBalanceListStore.js
@@ -92,12 +92,8 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
        const islemTipiOk =
          !state.filters.islemTipi.length ||
          state.filters.islemTipi.some((t) => {
-            if (t === 'prbr_1_2') return bak12 !== 0
-            if (t === 'prbr_1_3') return bak13 !== 0
-            if (t === 'usd_1_2') return usd12 !== 0
-            if (t === 'try_1_2') return try12 !== 0
-            if (t === 'usd_1_3') return usd13 !== 0
-            if (t === 'try_1_3') return try13 !== 0
+            if (t === '1_2') return bak12 !== 0 || usd12 !== 0 || try12 !== 0
+            if (t === '1_3') return bak13 !== 0 || usd13 !== 0 || try13 !== 0
            return false
          })

@@ -194,7 +190,15 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
        const { data } = await api.get('/finance/customer-balances', {
          params: {
            selected_date: this.filters.selectedDate,
-            cari_search: String(this.filters.cariSearch || '').trim()
+            cari_search: String(this.filters.cariSearch || '').trim(),
+            cari_ilk_grup: (this.filters.cariIlkGrup || []).join(','),
+            piyasa: (this.filters.piyasa || []).join(','),
+            temsilci: (this.filters.temsilci || []).join(','),
+            risk_durumu: (this.filters.riskDurumu || []).join(','),
+            islem_tipi: (this.filters.islemTipi || []).join(','),
+            ulke: (this.filters.ulke || []).join(','),
+            il: (this.filters.il || []).join(','),
+            ilce: (this.filters.ilce || []).join(',')
          }
        })
        this.rows = Array.isArray(data) ? data : []