diff --git a/4012824400047.jpg b/4012824400047.jpg new file mode 100644 index 00000000..250fe70d Binary files /dev/null and b/4012824400047.jpg differ diff --git a/4012824400092.jpg b/4012824400092.jpg new file mode 100644 index 00000000..f9ec8532 Binary files /dev/null and b/4012824400092.jpg differ diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index ccc8d1cc..7ea8ef9f 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -369,7 +369,7 @@ export default defineComponent({ emailOk = emailOk && tools.isEmail(val) } if (emailOk) { - risp = !tools.isEmailNoMicroZozz(val) || t('reg.err.invalid_email_micro') + // risp = !tools.isEmailNoMicroZozz(val) || t('reg.err.invalid_email_micro') } resolve(risp) diff --git a/src/model/Products.ts b/src/model/Products.ts index d4b7c5dc..9a6fa0fc 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -42,6 +42,7 @@ export interface IProduct { QuantitaPrenotateInAttesa?: number, stockQty: number, minBuyQty: number, + minStepQty?: number, maxBookableQty: number, bookableQty: number, canBeShipped?: boolean, @@ -115,6 +116,8 @@ export interface ICatProd { _id?: any name: string, img?: string, + icon?: string, + color?: string, } export interface IStorehouse { diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index e6645ab6..5f32466a 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -112,6 +112,7 @@ export interface IUserProfile { teleg_checkcode?: number paymenttypes?: IPaymentType[] manage_telegram?: boolean + admin_telegram?: boolean resplist?: any workerslist?: any dateofbirth?: Date|null diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index e8bb42c9..fcab4285 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -30,6 +30,7 @@ export default defineComponent({ const skipfirstrow = ref(true) const incaricamento = ref(false) + const checkAggiornaQta = ref(false) const cosafare = ref(shared_consts.Cmd.PRODUCTS) @@ -408,11 +409,14 @@ export default defineComponent({ strris += addfield(col, 'perc_iva', rec, false); col++; strris += addfield(col, 'price_acquistato', rec, true); col++; strris += addfield(col, 'minBuyQty', rec, false, true); col++; + strris += addfield(col, 'minStepQty', rec, false, true); col++; strris += addfield(col, 'cat_name', rec, false); col++; strris += addfield(col, 'producer_name', rec, false); col++; strris += addfield(col, 'provider_name', rec, false); col++; strris += addfield(col, 'magazzino_name', rec, false); col++; strris += addfield(col, 'bookableQty', rec, false, true); col++; + strris += addfield(col, 'sconto1', rec, false, true); col++; + strris += addfield(col, 'sconto2', rec, false, true); col++; strris += '} ' } else if (cmd === shared_consts.Cmd.CITIES_SERVER) { @@ -436,15 +440,16 @@ export default defineComponent({ if (cmd === shared_consts.Cmd.CITIES_SERVER) { userStore.importToServerCmd($q, t, cmd, null) } else if (cmd === shared_consts.Cmd.PRODUCTS) { + let options = { aggiornaStockQta: checkAggiornaQta.value } if (importasulserver.value) - userStore.importToServerCmd($q, t, cmd, strris) + userStore.importToServerCmd($q, t, cmd, { arrdata: strris, options }) } risultato = strris return risultato } - + function loadTextFromFile(ev: any) { console.log('ev', ev) const file = ev.target.files[0] @@ -464,8 +469,10 @@ export default defineComponent({ risultato.value = '' userStore.importToServerCmd($q, t, cosafare.value, null) } + function eseguiCmdProduct() { - userStore.importToServerCmd($q, t, cosafare.value, risultato.value) + let options = { aggiornaStockQta: checkAggiornaQta.value } + userStore.importToServerCmd($q, t, cosafare.value, { arrdata: risultato.value, options }) } function createProvLink() { @@ -511,6 +518,7 @@ export default defineComponent({ importasulserver, skipfirstrow, eseguiCmdProduct, + checkAggiornaQta, } } }) diff --git a/src/rootgen/admin/importdata/importdata.vue b/src/rootgen/admin/importdata/importdata.vue index aa34bbe4..e8414bbf 100755 --- a/src/rootgen/admin/importdata/importdata.vue +++ b/src/rootgen/admin/importdata/importdata.vue @@ -1,11 +1,11 @@