M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-02-21 22:30:09 +03:00
parent b70bbb780c
commit 612a6dc445
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
ui/quasar.config.js.temporary.compiled.1771698715736.mjs → ui/quasar.config.js.temporary.compiled.1771701092883.mjs
View File

17
ui/src/pages/OrderEntry.vue
View File

@@ -409,14 +409,11 @@
</div> </div>
<div <div
v-for="i2 in ( v-for="i2 in Math.max(0, 16 - (
16 -
(
(orderStore.schemaMap?.[row.grpKey]?.values?.length) || (orderStore.schemaMap?.[row.grpKey]?.values?.length) ||
(storeSchemaByKey[row.grpKey]?.values?.length) || (storeSchemaByKey[row.grpKey]?.values?.length) ||
(storeSchemaByKey.tak.values.length) (storeSchemaByKey.tak.values.length)
) ))"
)"
:key="'empty-' + i2" :key="'empty-' + i2"
class="cell beden ghost" class="cell beden ghost"
@@ -1359,6 +1356,11 @@ const groupedRows = computed(() => {
}) })
}) })
function toggleGroup(name) {
if (!name) return
groupOpen[name] = !(groupOpen[name] ?? true)
}
@@ -2641,7 +2643,10 @@ async function onModelChange(modelCode) {
let bedenGrpKey = null let bedenGrpKey = null
// ✅ Hard-match (senin ana gruplarına göre genişletebilirsin) // ✅ Hard-match (senin ana gruplarına göre genişletebilirsin)
if (ana.includes('pantolon') || kat.includes('pantolon')) { if ((ana.includes('garson') || kat.includes('garson') || kat.includes('yetiskin/garson') || ana.includes('yetiskin/garson')) &&
(ana.includes('ayakkabı') || ana.includes('ayakkabi') || kat.includes('ayakkabı') || kat.includes('ayakkabi'))) {
bedenGrpKey = 'ayk_garson'
} else if (ana.includes('pantolon') || kat.includes('pantolon')) {
bedenGrpKey = 'pan' bedenGrpKey = 'pan'
} else if (ana.includes('gömlek') || ana.includes('gomlek') || kat.includes('gömlek') || kat.includes('gomlek')) { } else if (ana.includes('gömlek') || ana.includes('gomlek') || kat.includes('gömlek') || kat.includes('gomlek')) {
bedenGrpKey = 'gom' bedenGrpKey = 'gom'

10
ui/src/stores/orderentryStore.js
View File

@@ -45,6 +45,7 @@ export function buildComboKey(row, beden) {
export const BEDEN_SCHEMA = [ export const BEDEN_SCHEMA = [
{ key: 'tak', title: 'TAKIM ELBISE', values: ['44','46','48','50','52','54','56','58','60','62','64','66','68','70','72','74'] }, { key: 'tak', title: 'TAKIM ELBISE', values: ['44','46','48','50','52','54','56','58','60','62','64','66','68','70','72','74'] },
{ key: 'ayk', title: 'AYAKKABI', values: ['39','40','41','42','43','44','45'] }, { key: 'ayk', title: 'AYAKKABI', values: ['39','40','41','42','43','44','45'] },
{ key: 'ayk_garson', title: 'AYAKKABI GARSON', values: ['22','23','24','25','26','27','28','29','30','31','32','33','34','35','STD'] },
{ key: 'yas', title: 'YAS', values: ['2','4','6','8','10','12','14'] }, { key: 'yas', title: 'YAS', values: ['2','4','6','8','10','12','14'] },
{ key: 'pan', title: 'PANTOLON', values: ['38','40','42','44','46','48','50','52','54','56','58','60','62','64','66','68'] }, { key: 'pan', title: 'PANTOLON', values: ['38','40','42','44','46','48','50','52','54','56','58','60','62','64','66','68'] },
{ key: 'gom', title: 'GOMLEK', values: ['XS','S','M','L','XL','2XL','3XL','4XL','5XL','6XL','7XL'] }, { key: 'gom', title: 'GOMLEK', values: ['XS','S','M','L','XL','2XL','3XL','4XL','5XL','6XL','7XL'] },
@@ -3442,6 +3443,15 @@ export function detectBedenGroup(bedenList, urunAnaGrubu = '', urunKategori = ''
? bedenList.map(v => (v || '').toString().trim().toUpperCase()) ? bedenList.map(v => (v || '').toString().trim().toUpperCase())
: [' '] : [' ']
const rawAna = (urunAnaGrubu || '').toString().toUpperCase()
const rawKat = (urunKategori || '').toString().toUpperCase()
const hasGarson = rawAna.includes('GARSON') || rawKat.includes('GARSON') ||
rawAna.includes('GARSON') || rawKat.includes('GARSON')
const hasAyakkabi = rawAna.includes('AYAKKABI') || rawKat.includes('AYAKKABI') ||
rawAna.includes('AYAKKABI') || rawKat.includes('AYAKKABI')
if (hasGarson && hasAyakkabi) return 'ayk_garson'
if (hasGarson) return 'yas'
// 🔸 Harfli beden varsa doğrudan "gom" (gömlek/üst giyim) // 🔸 Harfli beden varsa doğrudan "gom" (gömlek/üst giyim)
// STD/ONE SIZE aksbir için saklı kalsın. // STD/ONE SIZE aksbir için saklı kalsın.
const harfliBedenler = ['XS','S','M','L','XL','2XL','3XL','4XL','5XL','6XL','7XL'] const harfliBedenler = ['XS','S','M','L','XL','2XL','3XL','4XL','5XL','6XL','7XL']