diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 0e4546b..61c2eb3 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -38,6 +38,9 @@ export const shared_consts = { FILTER_ASK_ZOOM_VISTO: 32768, FILTER_HOURS_MYLIST: 65536, FILTER_HOURS_ALL: 131072, + FILTER_MISSING_PAYMENT: 262144, + FILTER_TO_MAKE_MEMBERSHIP_CARD: 524288, + FILTER_MEMBERSHIP_CARD_OK: 1048576, REPORT_FILT_RESP: 1, REPORT_FILT_ATTIVITA: 2, diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index e320fc6..c1adaf7 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -59,6 +59,7 @@ export default class CEventsCalendar extends MixinEvents { public calendarView = 'month' public selectedDate = '' public tabeditor: string = 'details' + public showPrev: boolean = false public formDefault: IEvents = { title: '', details: '', @@ -136,6 +137,10 @@ export default class CEventsCalendar extends MixinEvents { return this } + get lists() { + return lists + } + set mythis(aa) { } @@ -895,6 +900,10 @@ export default class CEventsCalendar extends MixinEvents { return CalendarStore.state.operators } + get getInternalPagesArr() { + return CalendarStore.state.internalpages + } + get getWhereArr() { return CalendarStore.state.wheres } diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 1fbb181..66211c3 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1,14 +1,14 @@ diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index c3c737d..fd0b92d 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -44,6 +44,7 @@
€ {{ myproduct.price.toFixed(2) }} + {{ myproduct.after_price }}
diff --git a/src/components/CSignUpIscrizioneConacreis/CSignUpIscrizioneConacreis.ts b/src/components/CSignUpIscrizioneConacreis/CSignUpIscrizioneConacreis.ts index 1918503..32af9c9 100755 --- a/src/components/CSignUpIscrizioneConacreis/CSignUpIscrizioneConacreis.ts +++ b/src/components/CSignUpIscrizioneConacreis/CSignUpIscrizioneConacreis.ts @@ -144,6 +144,7 @@ export default class CSignUpIscrizioneConacreis extends MixinUsers { this.signup.residency_address = tools.CapitalizeAllWords(this.signup.residency_address) this.signup.residency_city = tools.CapitalizeAllWords(this.signup.residency_city) this.signup.residency_province = this.signup.residency_province.toUpperCase() + this.signup.born_province = this.signup.born_province.toUpperCase() this.duplicate_email = false this.duplicate_username = false @@ -183,13 +184,13 @@ export default class CSignUpIscrizioneConacreis extends MixinUsers { public selectcountry({ name, iso2, dialCode }) { // console.log(name, iso2, dialCode) - this.signup.residency_country = iso2 + this.signup.residency_country = name this.countryname = name } public selectcountryborn({ name, iso2, dialCode }) { // console.log(name, iso2, dialCode) - this.signup.born_country = iso2 + this.signup.born_country = name this.countryborn = name } diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts index 2b69685..8db1ba5 100755 --- a/src/model/Calendar.ts +++ b/src/model/Calendar.ts @@ -1,4 +1,4 @@ -import { IOperators } from '@src/model/GlobalStore' +import { IInternalPage, IMyPage, IOperators } from '@src/model/GlobalStore' export interface IEvents { _id?: any @@ -20,8 +20,11 @@ export interface IEvents { infoafterprice?: string teacher?: string teacher2?: string + teacher3?: string + teacher4?: string infoextra?: string linkpage?: string + pagefooter?: IInternalPage[] linkpdf?: string nobookable?: boolean lunchAvailable?: boolean @@ -34,6 +37,7 @@ export interface IEvents { internal?: boolean note?: string news?: boolean + facebook?: string canceled?: boolean deleted?: boolean dupId?: any @@ -82,6 +86,7 @@ export interface ICalendarState { eventlist: IEvents[] bookedevent: IBookedEvent[] operators: IOperators[] + internalpages: IMyPage[] wheres: IWheres[] contribtype: IContribtype[] // --------------- diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 5ebeec8..a74592f 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -52,6 +52,10 @@ export interface ITeachUname { username?: string } +export interface IInternalPage { + path?: string +} + export interface IResp { _id?: string username?: string @@ -89,6 +93,7 @@ export interface IMyPage { l_par?: number, l_child?: number, infooter?: boolean + internalpage?: boolean } export interface ISites { diff --git a/src/model/Products.ts b/src/model/Products.ts index 60c304e..4488d15 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -11,6 +11,7 @@ export interface IProduct { department?: string, category?: string, price?: number, + after_price?: string, color?: string, size?: string, quantityAvailable?: number, @@ -36,6 +37,7 @@ export interface IOrder { idProducer?: string idStorehouse?: string price?: number + after_price?: string color?: string size?: string quantity?: number diff --git a/src/model/signup-option.ts b/src/model/signup-option.ts index 0635eae..a8596f4 100755 --- a/src/model/signup-option.ts +++ b/src/model/signup-option.ts @@ -36,8 +36,10 @@ export interface ISignupIscrizioneConacreisOptions { accetta_carta_costituzionale_on?: boolean metodo_pagamento?: number iscrizione_compilata?: boolean + ha_pagato?: boolean codiceConacreis?: string annoTesseramento?: number + numTesseraInterna?: number motivazioni?: string competenze_professionalita?: string cosa_potrei_offrire?: string diff --git a/src/rootgen/admin/eventlist/eventlist.vue b/src/rootgen/admin/eventlist/eventlist.vue index e741d71..abe7b80 100755 --- a/src/rootgen/admin/eventlist/eventlist.vue +++ b/src/rootgen/admin/eventlist/eventlist.vue @@ -46,6 +46,8 @@
{{ getTeacherByUsername(event.teacher) }} - {{ getTeacherByUsername(event.teacher2) }} + - {{ getTeacherByUsername(event.teacher3) }} + - {{ getTeacherByUsername(event.teacher4) }}
diff --git a/src/rootgen/admin/iscritticonacreis/iscritticonacreis.ts b/src/rootgen/admin/iscritticonacreis/iscritticonacreis.ts index 7e1e884..81d6286 100755 --- a/src/rootgen/admin/iscritticonacreis/iscritticonacreis.ts +++ b/src/rootgen/admin/iscritticonacreis/iscritticonacreis.ts @@ -12,12 +12,15 @@ import MixinBase from '@src/mixins/mixin-base' import { IParamsQuery, ISignupIscrizioneConacreisOptions } from '@src/model' import { GlobalStore, UserStore } from '@store' import { ISignupConacreis } from '@src/components/CSignUpIscrizioneConacreis/CSignUpIscrizioneConacreis-validate' +import { shared_consts } from '@src/common/shared_vuejs' @Component({ mixins: [MixinBase], components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec } }) -export default class SitesPage extends MixinMetaTags { +export default class IscrittiConacreis extends MixinMetaTags { + public arrfilterand = [] + public myrec: ISignupIscrizioneConacreisOptions[] public pagination = { sortBy: 'name', descending: false, @@ -29,6 +32,26 @@ export default class SitesPage extends MixinMetaTags { public selected = [] public dataPages = [] + public myfilter = '' + + public mounted() { + this.arrfilterand = [ + { + label: 'Manca il pagamento', + value: shared_consts.FILTER_MISSING_PAYMENT + }, + { + label: 'Da Tesserare', + value: shared_consts.FILTER_TO_MAKE_MEMBERSHIP_CARD + }, + { + label: 'Tesserati', + value: shared_consts.FILTER_MEMBERSHIP_CARD_OK + }, + ] + + } + get getcolIscrittiConacreis() { return colTableIscrittiConacreis } @@ -55,7 +78,7 @@ export default class SitesPage extends MixinMetaTags { startRow: 0, endRow: 10000, filter: '', - filterand: '', + filterand: this.myfilter, sortBy: myobj, descending, userId: UserStore.state.my._id @@ -70,34 +93,39 @@ export default class SitesPage extends MixinMetaTags { public async exportLista() { - const myrec = await this.loadrec() + this.myrec = await this.loadrec() const sep = ';' let mystr = '' - mystr += 'anno' + sep + 'Num' + sep + 'Conacreis' + sep + 'data_richiesta_iscrizione' + sep + 'data_approvazione_iscrizione' + sep + 'nome' + sep + 'cognome' + sep + 'codice_fiscale' + sep + 'nazione' + sep + 'indirizzo' + sep + 'localita' + sep + 'Prov' + sep + 'cap' + sep + 'data_nascita' + sep + 'nazione_nascita' + sep + 'luogo_nascita' + sep + 'provincia_nascita' + sep + 'email' + sep + 'telefono' + sep + 'quota_versata' + '\n'; + mystr += 'anno' + sep + 'numero_tessera' + sep + 'Conacreis' + sep + 'data_richiesta_iscrizione' + sep + 'data_approvazione_iscrizione' + sep + + 'nome' + sep + 'cognome' + sep + 'codice_fiscale' + sep + 'partita_iva' + sep + 'nazione' + sep + 'indirizzo' + sep + + 'localita' + sep + 'Prov' + sep + 'cap' + sep + 'nazione_nascita' + sep + 'data_nascita' + sep + + 'luogo_nascita' + sep + 'provincia_nascita' + sep + 'email' + sep + 'telefono' + sep + 'quota_versata' + '\n' let index = 1 - for (const rec of myrec) { + for (const rec of this.myrec) { mystr += rec.annoTesseramento + sep - mystr += index + sep - mystr += rec.codiceConacreis + sep + mystr += (!!rec.numTesseraInterna ? rec.numTesseraInterna : ' ') + sep + mystr += (!!rec.codiceConacreis ? rec.codiceConacreis + sep : ' ') + sep mystr += tools.getstrDate(rec.dateofreg) + sep mystr += tools.getstrDate(rec.dateofapproved) + sep mystr += rec.name + sep mystr += rec.surname + sep mystr += rec.fiscalcode + sep - mystr += tools.getNationsByNationality(rec.residency_country) + sep + mystr += ' ' + sep // partita_iva + mystr += rec.residency_country + sep mystr += rec.residency_address + sep mystr += rec.residency_city + sep mystr += rec.residency_province + sep mystr += rec.residency_zipcode + sep + mystr += rec.born_country + sep mystr += tools.getstrDate(rec.dateofbirth) + sep - mystr += tools.getNationsByNationality(rec.born_country) + sep mystr += rec.born_city + sep mystr += rec.born_province + sep mystr += rec.email + sep mystr += rec.cell_phone + sep + mystr += (rec.ha_pagato ? 'si' : 'no') + sep // mystr += 'si' + sep // mystr += 'si' + sep mystr += '\n' @@ -107,4 +135,8 @@ export default class SitesPage extends MixinMetaTags { tools.copyStringToClipboard(this, mystr, false) } + public savefilter(filter) { + console.log('filter', filter) + this.myfilter = filter + } } diff --git a/src/rootgen/admin/iscritticonacreis/iscritticonacreis.vue b/src/rootgen/admin/iscritticonacreis/iscritticonacreis.vue index 655f53d..204867e 100755 --- a/src/rootgen/admin/iscritticonacreis/iscritticonacreis.vue +++ b/src/rootgen/admin/iscritticonacreis/iscritticonacreis.vue @@ -1,40 +1,48 @@ diff --git a/src/rootgen/admin/usersList/usersList.ts b/src/rootgen/admin/usersList/usersList.ts index 2615833..4027568 100755 --- a/src/rootgen/admin/usersList/usersList.ts +++ b/src/rootgen/admin/usersList/usersList.ts @@ -16,7 +16,7 @@ export default class UsersList extends Vue { public arrfilterand = [] public mounted() { - if (tools.appid() === '7') + if (tools.appid() === tools.IDAPP_AYNI) { this.arrfilterand = [ { label: 'Attivi', @@ -64,6 +64,7 @@ export default class UsersList extends Vue { } ] + } } get db_fieldsTable() { diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 3543bcd..a7e768f 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -428,14 +428,25 @@ const msg_it = { viceResp: "Vice Rrsponsabile", userslist: "Lista Persone", fiscalcode: "Codice Fiscale", + annoTesseramento: "Anno", + numTesseraInterna: "Tess", + codiceConacreis: "Conacreis", residency_address: "Indirizzo di Residenza", residency_city: "Città di Residenza", residency_province: "Provincia", residency_zipcode: "CAP", + residency_country: "Paese", + born_country: "Paese Nascita", + cell_phone: "Telefono", + dateofreg: "Registrato", + dateofapproved: "Approvato", dateofbirth: "Data di Nascita", born_city: "Città di Nascita", born_province: "Provincia di Nascita", nationality_born: "Paese di Nascita", + iscrizione_compilata: "Iscritto", + metodo_pagamento: "Pagam", + ha_pagato: "Quota Versata", newsletter_on: "Aggiungimi alla Newsletter", accetta_carta_costituzionale_on: "Ho letto ed Approvo il Progetto", iscriviti: "Iscriviti", @@ -615,11 +626,12 @@ const msg_it = { Lunch: 'Pranzo', Dinner: 'Cena', DinnerShared: 'Cena Condivisa', - selnumpeopleLunch: 'A Pranzo', - selnumpeopleDinner: 'A Cena', - selnumpeopleDinnerShared: 'Cena Condiv.', + selnumpeopleLunch: 'Prenotati per il Pranzo', + selnumpeopleDinner: 'Prenotati per la Cena', + selnumpeopleDinnerShared: 'Cena Condivisa', selnumpeople_short: 'Num', msgbooking: 'Messaggio da inviare', + writemsg: 'Scrivi qui se vuoi lasciare un messaggio', showpdf: 'Vedi PDF', bookingtextdefault: 'Prenoto per', bookingtextdefault_of: 'di', @@ -651,12 +663,19 @@ const msg_it = { contribtype: 'Tipo Contributo', price: 'Contributo', askinfo: 'Chiedi Info', + openpage: 'Apri Pagina', showpage: 'Vedi Pagina', infoafterprice: 'Note dopo la Quota', teacher: 'Insegnante', // teacherid - teacher2: 'Insegnante2', // teacherid2 + teacher2: 'Insegnante 2', // teacherid2 + teacher3: 'Insegnante 3', // teacherid2 + teacher4: 'Insegnante 4', // teacherid2 infoextra: 'InfoExtra', linkpage: 'WebSite', + facebook: 'Facebook', + pagefooter: 'Pagina di Footer', + pagefooter2: 'Pagina di Footer 2', + pagefooter3: 'Pagina di Footer 3', linkpdf: 'Link ad un PDF', nobookable: 'Non Prenotabile', internal: 'Evento Interno', diff --git a/src/statics/lang/pt.js b/src/statics/lang/pt.js index b814abf..4e3db3f 100755 --- a/src/statics/lang/pt.js +++ b/src/statics/lang/pt.js @@ -574,6 +574,7 @@ const msg_pt = { contribtype: 'Tipo Contributo', price: 'Contributo', askinfo: 'Chiedi Info', + openpage: 'Apri Pagina', showpage: 'Vedi Pagina', infoafterprice: 'Note dopo la Quota', teacher: 'Insegnante', // teacherid diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts index 61ac208..c59cd5d 100755 --- a/src/store/Modules/GlobalStore.ts +++ b/src/store/Modules/GlobalStore.ts @@ -190,6 +190,8 @@ namespace Getters { return CalendarStore.state.eventlist else if (table === 'operators') return CalendarStore.state.operators + else if (table === 'internalpages') + return CalendarStore.state.internalpages else if (table === 'wheres') return CalendarStore.state.wheres else if (table === 'contribtype') @@ -1144,13 +1146,14 @@ namespace Actions { CalendarStore.state.editable = false - return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID, 'GET', null) + return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + process.env.APP_VERSION, 'GET', null) .then((res) => { // console.log('____________________________ res', res) if (res.status === 200) { CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : [] CalendarStore.state.eventlist = (res.data.eventlist) ? res.data.eventlist : [] CalendarStore.state.operators = (res.data.operators) ? res.data.operators : [] + CalendarStore.state.internalpages = (res.data.internalpages) ? res.data.internalpages : [] CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : [] CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : [] GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : [] diff --git a/src/store/Modules/Products.ts b/src/store/Modules/Products.ts index e865200..409ce72 100755 --- a/src/store/Modules/Products.ts +++ b/src/store/Modules/Products.ts @@ -40,6 +40,7 @@ function createOrderByProduct(product: IProduct, order: IOrder): IOrder { idProducer: product.idProducer, status: shared_consts.OrderStatus.IN_CART, price: product.price, + after_price: product.after_price, color: product.color, size: product.size, weight: product.weight, diff --git a/src/store/Modules/Store/calendar/CalendarStore.ts b/src/store/Modules/Store/calendar/CalendarStore.ts index 1ba1b8b..70dea3c 100755 --- a/src/store/Modules/Store/calendar/CalendarStore.ts +++ b/src/store/Modules/Store/calendar/CalendarStore.ts @@ -19,6 +19,7 @@ const state: ICalendarState = { eventlist: [], bookedevent: [], operators: [], + internalpages: [], wheres: [], contribtype: [], // --------------- diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 17a61f7..9531141 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -97,6 +97,7 @@ export const colmsg_templates = [ export const colmypage = [ AddCol({ name: 'title', label_trans: 'pages.title' }), + AddCol({ name: 'path', label_trans: 'pages.path' }), AddCol({ name: 'img1', label_trans: 'pages.img1' }), AddCol({ name: 'content', label_trans: 'pages.contentfield', fieldtype: tools.FieldType.html }), AddCol({ name: 'video1', label_trans: 'pages.video1' }), @@ -111,7 +112,6 @@ export const colmypage = [ AddCol({ name: 'ratio3', label_trans: 'pages.ratio3' }), AddCol({ name: 'content4', label_trans: 'pages.content4', fieldtype: tools.FieldType.html }), AddCol({ name: 'lang', label_trans: 'pages.lang' }), - AddCol({ name: 'path', label_trans: 'pages.path' }), AddCol({ name: 'icon', label_trans: 'pages.icon' }), AddCol({ name: 'order', label_trans: 'pages.order', fieldtype: tools.FieldType.number }), AddCol({ name: 'keywords', label_trans: 'pages.keywords' }), @@ -128,6 +128,7 @@ export const colmypage = [ AddCol({ name: 'l_par', label_trans: 'pages.l_par', fieldtype: tools.FieldType.number }), AddCol({ name: 'l_child', label_trans: 'pages.l_child', fieldtype: tools.FieldType.number }), AddCol({ name: 'infooter', label_trans: 'pages.infooter', fieldtype: tools.FieldType.boolean }), + AddCol({ name: 'internalpage', label_trans: 'pages.internalpage', fieldtype: tools.FieldType.boolean }), AddCol(DeleteRec), AddCol(DuplicateRec) ] @@ -280,8 +281,15 @@ export const colTableSites = [ ] export const colTableIscrittiConacreis = [ + AddCol({ name: 'annoTesseramento', label_trans: 'reg.annoTesseramento', fieldtype: tools.FieldType.number }), + AddCol({ name: 'numTesseraInterna', label_trans: 'reg.numTesseraInterna', fieldtype: tools.FieldType.number }), + AddCol({ name: 'codiceConacreis', label_trans: 'reg.codiceConacreis', fieldtype: tools.FieldType.string }), + AddCol({ name: 'metodo_pagamento', label_trans: 'reg.metodo_pagamento', fieldtype: tools.FieldType.select, jointable: 'metodo_pagamento' }), + AddCol({ name: 'ha_pagato', label_trans: 'reg.ha_pagato', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: tools.FieldType.string }), AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: tools.FieldType.string }), + AddCol({ name: 'dateofreg', label_trans: 'reg.dateofreg', fieldtype: tools.FieldType.onlydate }), + AddCol({ name: 'dateofapproved', label_trans: 'reg.dateofapproved', fieldtype: tools.FieldType.onlydate }), AddCol({ name: 'email', label_trans: 'reg.email', fieldtype: tools.FieldType.string }), AddCol({ name: 'fiscalcode', label_trans: 'reg.fiscalcode', fieldtype: tools.FieldType.string }), AddCol({ name: 'residency_address', label_trans: 'reg.residency_address', fieldtype: tools.FieldType.string }), @@ -294,14 +302,9 @@ export const colTableIscrittiConacreis = [ AddCol({ name: 'born_province', label_trans: 'reg.born_province', fieldtype: tools.FieldType.string }), AddCol({ name: 'born_country', label_trans: 'reg.born_country', fieldtype: tools.FieldType.string }), AddCol({ name: 'cell_phone', label_trans: 'reg.cell_phone', fieldtype: tools.FieldType.string }), - AddCol({ name: 'newsletter_on', label_trans: 'reg.newsletter_on', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'iscrizione_compilata', label_trans: 'reg.iscrizione_compilata', fieldtype: tools.FieldType.boolean }), - AddCol({ name: 'metodo_pagamento', label_trans: 'reg.metodo_pagamento', fieldtype: tools.FieldType.number }), - AddCol({ name: 'dateofreg', label_trans: 'reg.dateofreg', fieldtype: tools.FieldType.onlydate }), - AddCol({ name: 'dateofapproved', label_trans: 'reg.dateofapproved', fieldtype: tools.FieldType.onlydate }), - AddCol({ name: 'codiceConacreis', label_trans: 'reg.codiceConacreis', fieldtype: tools.FieldType.string }), - AddCol({ name: 'annoTesseramento', label_trans: 'reg.annoTesseramento', fieldtype: tools.FieldType.number }), AddCol({ name: 'motivazioni', label_trans: 'reg.motivazioni', fieldtype: tools.FieldType.string }), + AddCol({ name: 'newsletter_on', label_trans: 'reg.newsletter_on', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'competenze_professionalita', label_trans: 'reg.competenze_professionalita', @@ -349,6 +352,7 @@ export const colTableProducts = [ // AddCol({ name: 'department', label_trans: 'products.department' }), AddCol({ name: 'category', label_trans: 'products.category' }), AddCol({ name: 'price', label_trans: 'products.price', fieldtype: tools.FieldType.number }), + AddCol({ name: 'after_price', label_trans: 'products.after_price' }), AddCol({ name: 'color', label_trans: 'products.color' }), AddCol({ name: 'size', label_trans: 'products.size' }), AddCol({ name: 'quantityAvailable', label_trans: 'products.quantityAvailable', fieldtype: tools.FieldType.number }), @@ -555,12 +559,33 @@ const colTableEvents = [ fieldtype: tools.FieldType.select, jointable: 'operators' }), + AddCol({ + name: 'teacher3', + label_trans: 'event.teacher3', + fieldtype: tools.FieldType.select, + jointable: 'operators' + }), + AddCol({ + name: 'teacher4', + label_trans: 'event.teacher4', + fieldtype: tools.FieldType.select, + jointable: 'operators' + }), AddCol({ name: 'infoextra', label_trans: 'event.infoextra' }), AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }), + AddCol({ name: 'facebook', label_trans: 'event.facebook' }), AddCol({ name: 'linkpdf', label_trans: 'event.linkpdf' }), AddCol({ name: 'note', label_trans: 'event.note' }), AddCol({ name: 'nobookable', label_trans: 'event.nobookable', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'internal', label_trans: 'event.internal', fieldtype: tools.FieldType.boolean }), + + AddCol({ + name: 'pagefooter', + label_trans: 'event.pagefooter', + fieldtype: tools.FieldType.multiselect, + jointable: 'internalpage' + }), + AddCol({ name: 'news', label_trans: 'event.news', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'canceled', label_trans: 'event.canceled', fieldtype: tools.FieldType.boolean }), AddCol({ name: 'deleted', label_trans: 'event.deleted', fieldtype: tools.FieldType.boolean }), @@ -672,6 +697,8 @@ export const fieldsTable = { return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI] else if (table === 'fieldstype') return tools.FieldTypeArr + else if (table === 'metodo_pagamento') + return tools.SelectMetodiPagamento else return GlobalStore.getters.getListByTable(table) @@ -1121,6 +1148,13 @@ export const fieldsTable = { colkey: 'username', collabel: (rec) => rec.name + ' ' + rec.surname }, + { + value: 'internalpages', + label: 'Pagine Interne', + columns: colmypage, + colkey: 'path', + collabel: 'title' + }, { value: 'products', label: 'Prodotti', @@ -1294,6 +1328,13 @@ export const fieldsTable = { collabel: 'label', noshow: true, }, + { + value: 'metodo_pagamento', + label: 'Metodi di Pagamento', + colkey: 'value', + collabel: 'label', + noshow: true, + }, { value: 'settings', label: 'Impostazioni', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 6dddaa8..7faebf6 100755 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -2732,7 +2732,7 @@ export const tools = { }, getDateNowEvent() { - return tools.addDays(tools.getDateNow(), -1) + return tools.addMinutes(tools.getDateNow(), -60 * 4) }, getDateNull() { return new Date(0) diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue index 7f05022..f19108a 100755 --- a/src/views/ecommerce/orderInfo/orderInfo.vue +++ b/src/views/ecommerce/orderInfo/orderInfo.vue @@ -87,6 +87,7 @@ {{ shared_consts.getStatusStr(props.row.status) }} + Bottone:
diff --git a/src/views/login/signup/signup.vue b/src/views/login/signup/signup.vue index f46b326..9afb8aa 100755 --- a/src/views/login/signup/signup.vue +++ b/src/views/login/signup/signup.vue @@ -1,6 +1,6 @@