From 5c9928c736560f89414971fdb545c069b2903ba5 Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Sat, 20 Jun 2026 01:26:15 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ui/src/pages/OrderPriceList.vue | 43 +++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/ui/src/pages/OrderPriceList.vue b/ui/src/pages/OrderPriceList.vue index 8f41e76..c6e667f 100644 --- a/ui/src/pages/OrderPriceList.vue +++ b/ui/src/pages/OrderPriceList.vue @@ -1479,6 +1479,13 @@ const visibleColumns = computed(() => allColumns.filter((c) => { return true })) +const printColumns = computed(() => allColumns.filter((c) => { + if (compactLeftColumnNameSet.has(c.name)) return true + if (/^(usd|eur|try)[1-6]$/.test(c.name)) return selectedPriceSet.value.has(c.name) + if (/^(usd|eur|try)[1-6]Campaign$/.test(c.name)) return selectedPriceSet.value.has(c.name.replace(/Campaign$/, '')) + return false +})) + const filteredRows = computed(() => { const campaignSet = selectedCampaignLabelSet.value const variantSet = selectedVariantCodeSet.value @@ -1649,7 +1656,7 @@ function exportFileStamp () { async function printVisibleRows () { const stamp = exportFileStamp() const title = `Fiyat_Listesi-${stamp}` - const cols = visibleColumns.value + const cols = printColumns.value const generatedAt = new Date().toLocaleString('tr-TR') const body = filteredRows.value.map((row) => `${cols.map((c) => { if (c.name === 'image') { @@ -1670,27 +1677,27 @@ async function printVisibleRows () { const html = `${escapeHtml(title)}