Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -2689,7 +2689,7 @@ async function onModelChange(modelCode) {
|
||||
}
|
||||
|
||||
if (!bedenGrpKey) {
|
||||
const anaN = String(form.urunAnaGrubu || '')
|
||||
const anaNRaw = String(form.urunAnaGrubu || '')
|
||||
.normalize('NFD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.toLowerCase()
|
||||
@@ -2704,6 +2704,10 @@ async function onModelChange(modelCode) {
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.toLowerCase()
|
||||
.trim()
|
||||
const anaN =
|
||||
(katN.includes('yetiskin') && anaNRaw.includes('gomlek klasik'))
|
||||
? anaNRaw.replace('gomlek klasik', 'gomlek ata yaka')
|
||||
: anaNRaw
|
||||
|
||||
const hasGarsonMeta =
|
||||
anaN.includes('garson') ||
|
||||
@@ -2862,6 +2866,10 @@ const onSaveOrUpdateRow = async () => {
|
||||
|
||||
recalcVat: typeof recalcVat === 'function' ? recalcVat : null,
|
||||
resetEditor: typeof resetEditor === 'function' ? resetEditor : null,
|
||||
loadProductSizes: async () => {
|
||||
await orderStore.loadProductSizes(form, true, $q, productCache)
|
||||
await loadOrderInventory(true)
|
||||
},
|
||||
|
||||
// gerekiyorsa pass edebilirsin (store tarafında zaten optional)
|
||||
stockMap,
|
||||
@@ -2910,6 +2918,10 @@ const onSaveAndNextColor = async () => {
|
||||
form,
|
||||
recalcVat: typeof recalcVat === 'function' ? recalcVat : null,
|
||||
resetEditor: () => {},
|
||||
loadProductSizes: async () => {
|
||||
await orderStore.loadProductSizes(form, true, $q, productCache)
|
||||
await loadOrderInventory(true)
|
||||
},
|
||||
stockMap,
|
||||
$q
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user