-
- {{ product.name }}
+
+
-
+ {{ myproduct.name }}
+
- {{ product.description }}
+ {{ myproduct.description }}
-
+
+
-
-
+
-
-
- € {{ product.price.toFixed(2) }}
+
+ € {{ myproduct.price.toFixed(2) }}
@@ -56,21 +55,23 @@
-
-
-
-
-
-
-
+
![Immagine Logo]()
- ![flag]()
- {{langrec.label}}
+ {{ langrec.label }}
@@ -108,16 +108,32 @@
icon="menu"
@click="rightDrawerOpen = !rightDrawerOpen">
+
- {{getnumItemsCart}}
+ {{ getnumItemsCart }}
+
+
+
+
+
+
+ {{ getnumOrdersCart }}
+
+
+
+
+ @click="rightDrawerOpen = !rightDrawerOpen" :icon="getMyImgforIcon" :color="getcolormenu">
+
@@ -152,33 +168,40 @@
style="height: 150px" alt="section page">
+
-
+
-
+
diff --git a/src/components/CShareWithUs/CShareWithUs.scss b/src/components/CShareWithUs/CShareWithUs.scss
new file mode 100755
index 0000000..e18023f
--- /dev/null
+++ b/src/components/CShareWithUs/CShareWithUs.scss
@@ -0,0 +1,18 @@
+.zoom_data{
+ font-size:1rem;
+ font-weight: bold;
+ text-shadow: .05rem .05rem .05rem #3d3d3d;
+ color: green;
+}
+
+.title {
+ font-weight: bold;
+}
+
+.id_conf{
+ font-weight: normal;
+}
+
+.note{
+ font-style: italic;
+}
diff --git a/src/components/CShareWithUs/CShareWithUs.ts b/src/components/CShareWithUs/CShareWithUs.ts
new file mode 100755
index 0000000..0bce41c
--- /dev/null
+++ b/src/components/CShareWithUs/CShareWithUs.ts
@@ -0,0 +1,224 @@
+import { Component, Prop, Watch } from 'vue-property-decorator'
+import { INotData, IParamsQuery, IShareWithUs } from '../../model/index'
+import { tools } from '../../store/Modules/tools'
+import { NotevoleStore } from '@store'
+import MixinBase from '@src/mixins/mixin-base'
+import { validationMixin } from 'vuelidate'
+import { validations } from '../CSignUpNotevole/CSignUp-validate'
+import { CTitleBanner } from '@components'
+import { CCardState } from '../CCardState'
+import { UserStore } from '../../store/Modules'
+import { GlobalStore } from '../../store'
+import { CCopyBtn } from '../CCopyBtn'
+
+import { date } from 'quasar'
+import objectId from '@src/js/objectId'
+
+@Component({
+ name: 'CShareWithUs',
+ components: { CTitleBanner, CCardState, CCopyBtn }
+})
+
+export default class CShareWithUs extends MixinBase {
+ public $t
+ public myshares: IShareWithUs[] = []
+ public mydescr: string = ''
+
+ get listasharewithus() {
+ return GlobalStore.state.sharewithus.sort((a, b) => b.numshared - a.numshared)
+ }
+
+ get listamyshare() {
+ return UserStore.state.my.profile.myshares
+ }
+
+ public myload() {
+ const sortBy = 'numshared'
+ const descending = 1
+ const myobj = {}
+ if (descending)
+ myobj[sortBy] = -1
+ else
+ myobj[sortBy] = 1
+
+ const params: IParamsQuery = {
+ table: 'sharewithus',
+ startRow: 0,
+ endRow: 10000,
+ filter: '',
+ filterand: '',
+ sortBy: myobj,
+ descending
+ }
+
+ console.log('myload', params)
+
+ GlobalStore.actions.loadTable(params).then((data) => {
+ GlobalStore.state.sharewithus = data.rows
+ })
+ }
+
+ public mounted() {
+ this.myload()
+ }
+
+ public recsharenow(mydescr): IShareWithUs {
+ return {
+ idapp: process.env.APP_ID,
+ description: mydescr,
+ userId: UserStore.state.my._id,
+ numshared: 0,
+ rating: 0
+ }
+ }
+
+ public add_newshare(mydescr) {
+ if (!mydescr)
+ return false
+ const recfound = UserStore.state.my.profile.myshares.find((rec) => rec.description.toLowerCase() === mydescr.toLowerCase())
+ if (!!recfound) {
+ tools.showNegativeNotif(this.$q, '"' + mydescr + '" è già presente!')
+ return false
+ }
+ UserStore.state.my.profile.myshares.push({ description: mydescr, rating: 5 })
+
+ const mydata = {
+ 'profile.myshares': UserStore.state.my.profile.myshares
+ }
+ tools.saveFieldToServer(this, 'users', UserStore.state.my._id, mydata)
+
+ const myrec = this.recsharenow(mydescr)
+
+ const updatedexistingrec = this.updaterecnow(mydescr, true)
+ if (!updatedexistingrec) {
+ tools.createNewRecord(this, 'sharewithus', myrec, false).then((myrecris) => {
+ GlobalStore.state.sharewithus.push(myrecris)
+ this.myload()
+ this.mydescr = ''
+ return true
+ })
+ }
+
+ }
+
+ public updaterecnow(mydescr, add) {
+ const recesistente = GlobalStore.state.sharewithus.find((rec) => rec.description.toLowerCase() === mydescr.toLowerCase())
+ const indrec = GlobalStore.state.sharewithus.findIndex((rec) => rec.description.toLowerCase() === mydescr.toLowerCase())
+ console.log('recesistente', recesistente)
+ if (recesistente) {
+ const mydatatosave = {
+ id: recesistente._id,
+ table: tools.TABSHAREWITHUS,
+ fieldsvalue: recesistente
+ }
+
+ if (add)
+ recesistente.numshared++
+ else {
+ if (recesistente.numshared <= 0)
+ return false
+ else
+ recesistente.numshared--
+ }
+
+ GlobalStore.actions.saveFieldValue(mydatatosave).then((myrecris) => {
+ if (myrecris) {
+ GlobalStore.state.sharewithus[indrec] = recesistente
+ this.myload()
+ }
+ this.mydescr = ''
+ })
+ return true
+ } else {
+ return false
+ }
+ }
+
+ public selected(value, shared) {
+ shared.numshared++
+ tools.saveFieldToServer(this, 'sharewithus', shared._id, { numshared: shared.numshared })
+
+ }
+
+ public checkifICanRemove(shared) {
+ // Controlla se questo è stato aggiunto da me
+ const recfound = GlobalStore.state.sharewithus.find((rec) => rec.description.toLowerCase() === shared.description.toLowerCase())
+ if (!!recfound)
+ return recfound.userId === UserStore.state.my._id
+ else
+ return true
+ }
+
+ public removeShared(shared) {
+ this.$q.dialog({
+ message: 'Vuoi cancellare "' + shared.description + '" dalla tua lista ?',
+ ok: {
+ label: this.$t('dialog.yes'),
+ push: true
+ },
+ cancel: {
+ label: this.$t('dialog.cancel')
+ },
+ title: this.$t('pages.sharedwithus')
+ }).onOk(async () => {
+
+ const descr = shared.description
+
+ // Aggiorna Record Personale
+ UserStore.state.my.profile.myshares = UserStore.state.my.profile.myshares.filter((rec) => rec.description !== descr)
+
+ const mydata = {
+ 'profile.myshares': UserStore.state.my.profile.myshares
+ }
+ tools.saveFieldToServer(this, 'users', UserStore.state.my._id, mydata)
+
+ const updatedexistingrec = this.updaterecnow(shared.description, false)
+ if (!updatedexistingrec) {
+ if (this.checkifICanRemove(shared)) {
+ const myrec = GlobalStore.state.sharewithus.find((rec) => rec.description.toLowerCase() === descr.toLowerCase())
+ if (!!myrec) {
+ GlobalStore.actions.DeleteRec({ table: tools.TABSHAREWITHUS, id: myrec._id })
+ .then((ris) => {
+ console.log('DELETEREC ris=', ris)
+ if (ris) {
+
+ // Aggiorna Array Globale
+ GlobalStore.state.sharewithus = GlobalStore.state.sharewithus.filter((rec) => rec.description !== descr)
+ this.myload()
+
+ console.log('GlobalStore.state.sharewithus', GlobalStore.state.sharewithus)
+ tools.showPositiveNotif(this.$q, this.$t('db.deletedrecord'))
+ }
+ })
+ }
+ }
+ }
+ }
+ )
+ }
+
+ public findrec(descr) {
+ if (UserStore.state.my.profile.myshares.length === 0)
+ return false
+ return UserStore.state.my.profile.myshares.find((rec) => rec.description.toLowerCase() === descr.toLowerCase())
+ }
+
+ public mycolorbtn(shared) {
+ if (this.findrec(shared.description)) {
+ return 'positive'
+ } else {
+ return 'primary'
+ }
+ }
+
+ public geticon(shared) {
+ if (this.findrec(shared.description))
+ return undefined
+ else
+ return 'fas fa-plus'
+ }
+
+ public getifdisable(shared) {
+ return this.findrec(shared.description)
+ }
+}
diff --git a/src/components/CShareWithUs/CShareWithUs.vue b/src/components/CShareWithUs/CShareWithUs.vue
new file mode 100755
index 0000000..4df9723
--- /dev/null
+++ b/src/components/CShareWithUs/CShareWithUs.vue
@@ -0,0 +1,91 @@
+
+
diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts
index 44c8cb5..b653931 100755
--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -18,6 +18,7 @@ import MixinUsers from '../../mixins/mixin-users'
import { CMyAvatar } from '../CMyAvatar'
import { CSigninNoreg } from '../CSigninNoreg'
import { CMyCart } from '@components'
+import { shared_consts } from '@src/common/shared_vuejs'
@Component({
name: 'Header',
@@ -62,6 +63,18 @@ export default class Header extends Vue {
return UserStore.state.isManager
}
+ get isSocio() {
+ return UserStore.state.my.profile.socio
+ }
+
+ get isSocioResidente() {
+ return UserStore.state.my.profile.socioresidente
+ }
+
+ get getcolormenu() {
+ return this.isSocio ? 'green-7' : 'white'
+ }
+
get isTutor() {
return UserStore.state.isTutor
}
@@ -120,19 +133,25 @@ export default class Header extends Vue {
}
get rightDrawerOpen() {
- return GlobalStore.state.RightDrawerOpen
+ return GlobalStore.state.rightDrawerOpen
+ }
+
+ set rightDrawerOpen(value) {
+ GlobalStore.state.rightDrawerOpen = value
+
+ if (GlobalStore.state.rightDrawerOpen)
+ GlobalStore.state.rightCartOpen = false
}
get rightCartOpen() {
return GlobalStore.state.rightCartOpen
}
- set rightDrawerOpen(value) {
- GlobalStore.state.RightDrawerOpen = value
- }
-
set rightCartOpen(value) {
GlobalStore.state.rightCartOpen = value
+
+ if (GlobalStore.state.rightCartOpen)
+ GlobalStore.state.rightDrawerOpen = false
}
get lang() {
@@ -195,11 +214,12 @@ export default class Header extends Vue {
// console.log('SSSSSSSS: ', value, oldValue)
const color = (value === 'online') ? 'positive' : 'warning'
+ const statoconn = this.$t('connection.conn') + ' ' + ((value === 'online') ? this.$t('connection.online') : this.$t('connection.offline'))
if (this.static_data.functionality.SHOW_IF_IS_SERVER_CONNECTION) {
if (!!oldValue) {
- tools.showNotif(this.$q, this.$t('connection') + ` {disc__value}`, {
+ tools.showNotif(this.$q, statoconn, {
color,
icon: 'wifi'
})
@@ -390,6 +410,15 @@ export default class Header extends Vue {
return 0
}
+ get getnumOrdersCart() {
+ // const arrorderscart = Products.state.orders.filter((rec) => rec.status < shared_consts.OrderStatus.RECEIVED)
+ const arrorderscart = Products.state.orders
+ if (!!arrorderscart) {
+ return arrorderscart.length
+ }
+ return 0
+ }
+
get getcart() {
return Products.state.cart
}
diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue
index 4a97089..af977f1 100755
--- a/src/components/Header/Header.vue
+++ b/src/components/Header/Header.vue
@@ -40,8 +40,8 @@
+
-
- {{ getSingleStorehouse() }}
+
@@ -78,9 +79,10 @@
+
+
+
+
+
+
+ {{ getSingleStorehouse() }}
+
+
+
+
+
+
+
diff --git a/src/components/CShareWithUs/index.ts b/src/components/CShareWithUs/index.ts
new file mode 100755
index 0000000..9636880
--- /dev/null
+++ b/src/components/CShareWithUs/index.ts
@@ -0,0 +1 @@
+export {default as CShareWithUs} from './CShareWithUs.vue'
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index 31cc33f..b8e5ef7 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -117,6 +117,7 @@ export default class CSignUp extends MixinBase {
if (!item.$error) {
return ''
}
+ console.log('item', item)
// console.log('errorMsg', cosa, item)
if (item.$params.email && !item.email) {
return this.$t('reg.err.email')
@@ -157,6 +158,8 @@ export default class CSignUp extends MixinBase {
}
} else if (cosa === 'username') {
// console.log(item);
+ console.log('username')
+ console.log(item.$error)
if (!item.isUnique) {
return this.$t('reg.err.duplicate_username')
}
@@ -176,9 +179,22 @@ export default class CSignUp extends MixinBase {
}
}
+ public changeemail(value) {
+ this.signup.email = tools.removespaces(this.signup.email)
+ this.signup.email = this.signup.email.toLowerCase()
+ this.$emit('update:value', this.signup.email)
+ }
+
+ public changeusername(value) {
+ this.signup.username = tools.removespaces(this.signup.username)
+ this.$emit('update:value', this.signup.username)
+ }
+
public submitOk() {
this.$v.signup.$touch()
+ this.signup.email = tools.removespaces(this.signup.email)
+ this.signup.email = this.signup.email.toLowerCase()
this.signup.username = tools.removespaces(this.signup.username)
this.duplicate_email = false
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index 5362506..1c314e4 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -14,6 +14,7 @@
v-model="signup.email"
rounded outlined
@blur="$v.signup.email.$touch"
+ @input="changeemail"
:error="$v.signup.email.$error"
:error-message="errorMsg('email', $v.signup.email)"
maxlength="50"
@@ -29,6 +30,7 @@
+
+
+
+
+ Scrivi cosa vorresti fare con noi:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ shared.description }}
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
{{ order.quantity }}
-
- € {{ (order.price * order.quantity).toFixed(2) }}
+ € {{ (order.price * order.quantity).toFixed(2) }}
-
+
{{getappname}}
- {{$t('msg.myDescriz')}} {{ getAppVersion() }}
+ {{ getappname }}
+ {{ $t('msg.myDescriz') }} {{ getAppVersion() }}
@@ -87,7 +87,7 @@
+
-
Area Personale
{{ Username }} - {{ myName }} [Admin]
- [Manager]
- [Tutor]
- [Trad]
+
+
+
+
diff --git a/src/rootgen/admin/sharewithus/sharewithus.scss b/src/rootgen/admin/sharewithus/sharewithus.scss
new file mode 100755
index 0000000..e69de29
diff --git a/src/rootgen/admin/sharewithus/sharewithus.ts b/src/rootgen/admin/sharewithus/sharewithus.ts
new file mode 100755
index 0000000..06eb0f8
--- /dev/null
+++ b/src/rootgen/admin/sharewithus/sharewithus.ts
@@ -0,0 +1,44 @@
+import Vue from 'vue'
+import { Component, Prop } from 'vue-property-decorator'
+import { GlobalStore, UserStore } from '@store'
+
+import { tools } from '../../../store/Modules/tools'
+import { toolsext } from '../../../store/Modules/toolsext'
+import { static_data } from '../../../db/static_data'
+import { Screen } from 'quasar'
+
+import { colTableShareWithUs, colTableStorehouse } from '@src/store/Modules/fieldsTable'
+
+import { CImgText } from '../../../components/CImgText/index'
+import { CCard, CGridTableRec, CMyPage, CTitleBanner } from '@components'
+import MixinMetaTags from '../../../mixins/mixin-metatags'
+import MixinBase from '@src/mixins/mixin-base'
+
+@Component({
+ mixins: [MixinBase],
+ components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec }
+})
+export default class ShareWithUsPage extends MixinMetaTags {
+ public pagination = {
+ sortBy: 'name',
+ descending: false,
+ page: 2,
+ rowsPerPage: 5
+ // rowsNumber: xx if getting data from a server
+ }
+
+ public selected = []
+ public dataPages = []
+
+ get getcolsharewithus() {
+ return colTableShareWithUs
+ }
+
+ public meta() {
+ return tools.metafunc(this)
+ }
+
+ get static_data() {
+ return static_data
+ }
+}
diff --git a/src/rootgen/admin/sharewithus/sharewithus.vue b/src/rootgen/admin/sharewithus/sharewithus.vue
new file mode 100755
index 0000000..30e302a
--- /dev/null
+++ b/src/rootgen/admin/sharewithus/sharewithus.vue
@@ -0,0 +1,27 @@
+
+
+ {{ setmeta({
+ title: 'Condividi',
+ description: "",
+ keywords: '' } ) }}
+
+
+
+
+
+
diff --git a/src/rootgen/admin/usersList/usersList.ts b/src/rootgen/admin/usersList/usersList.ts
index 6b877ea..2615833 100755
--- a/src/rootgen/admin/usersList/usersList.ts
+++ b/src/rootgen/admin/usersList/usersList.ts
@@ -74,8 +74,8 @@ export default class UsersList extends Vue {
if (static_data.functionality.ENABLE_REG_AYNI) {
return this.db_fieldsTable.colTableUsers
- } else if (static_data.functionality.ENABLE_REG_SIP) {
- return this.db_fieldsTable.colTableUsersSIP
+ } else if (static_data.functionality.ENABLE_REG_CNM) {
+ return this.db_fieldsTable.colTableUsersCNM
} else {
return this.db_fieldsTable.colTableUsersBase
}
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 4415291..581f4bf 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -28,6 +28,7 @@ const msg_it = {
come_aiutare: 'Cosa vorresti fare per aiutare il pianeta?',
},
otherpages: {
+ product: 'Prodotto',
sito_offline: 'Sito in Aggiornamento',
modifprof: 'Modifica Profilo',
biografia: 'Biografia',
@@ -52,8 +53,8 @@ const msg_it = {
listaflotte: 'Flotte',
},
manage: {
- menu: 'Gestione',
- manager: 'Gestore',
+ menu: 'Segreteria',
+ manager: 'Segreteria',
nessuno: 'Nessuno',
sendpushnotif: 'Invia Msg Push',
},
@@ -320,6 +321,8 @@ const msg_it = {
ritessitura: 'RITESSITURA',
},
reg: {
+ socio: 'Socio',
+ socioresidente: 'Residente',
volta: 'volta',
volte: 'volte',
registered: 'Registrato',
@@ -508,7 +511,11 @@ const msg_it = {
subscribed: 'Ora potrai ricevere i messaggi e le notifiche.',
newVersionAvailable: 'Aggiorna',
},
- connection: 'Connessione',
+ connection: {
+ conn: 'Connessione',
+ online: 'Attiva',
+ offline: 'Disattiva',
+ },
proj: {
newproj: 'Titolo Progetto',
newsubproj: 'Titolo Sotto-Progetto',
diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts
index 09c0acc..d5fcb3b 100755
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -44,7 +44,7 @@ const state: IGlobalState = {
mobileMode: false,
menuCollapse: true,
leftDrawerOpen: true,
- RightDrawerOpen: false,
+ rightDrawerOpen: false,
rightCartOpen: false,
stateConnection: stateConnDefault,
networkDataReceived: false,
@@ -83,7 +83,8 @@ const state: IGlobalState = {
mypage: [],
calzoom: [],
producers: [],
- storehouses: []
+ storehouses: [],
+ sharewithus: []
}
async function getConfig(id) {
@@ -204,6 +205,8 @@ namespace Getters {
return GlobalStore.state.producers
else if (table === 'storehouses')
return GlobalStore.state.storehouses
+ else if (table === 'sharewithus')
+ return GlobalStore.state.sharewithus
else if (table === 'paymenttypes')
return GlobalStore.state.paymenttypes
else if (table === 'bookings')
@@ -1093,8 +1096,9 @@ namespace Actions {
if (res.data.cart)
Products.state.cart = (res.data.cart) ? {...res.data.cart} : {}
else
- Products.state.cart = {}
+ Products.state.cart = { items: [], totalPrice: 0, totalQty: 0, userId: ''}
+ Products.state.orders = (res.data.orders) ? [...res.data.orders] : []
if (showall) {
GlobalStore.state.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : []
@@ -1121,7 +1125,7 @@ namespace Actions {
// Fai Logout
console.log('Fai Logout', 'islogged', islogged)
UserStore.actions.logout()
- GlobalStore.state.RightDrawerOpen = true
+ GlobalStore.state.rightDrawerOpen = true
return false
}
}
diff --git a/src/store/Modules/Products.ts b/src/store/Modules/Products.ts
index b9176f8..63d877d 100755
--- a/src/store/Modules/Products.ts
+++ b/src/store/Modules/Products.ts
@@ -1,11 +1,11 @@
-import { ICart, IOrder, IProduct, IProductsState } from 'model'
+import { ICart, IOrder, IOrderCart, IProduct, IProductsState } from 'model'
import { storeBuilder } from './Store/Store'
import Api from '@api'
import { tools } from './tools'
import { lists } from './lists'
import * as ApiTables from './ApiTables'
-import { GlobalStore, Todos, UserStore } from '@store'
+import { GlobalStore, Products, Todos, UserStore } from '@store'
import globalroutines from './../../globalroutines/index'
import { Mutation } from 'vuex-module-decorators'
import { serv_constants } from '@src/store/Modules/serv_constants'
@@ -15,10 +15,12 @@ import { costanti } from '@src/store/Modules/costanti'
import { IAction } from '@src/model'
import * as Types from '@src/store/Api/ApiTypes'
import { static_data } from '@src/db/static_data'
+import { shared_consts } from '@src/common/shared_vuejs'
const state: IProductsState = {
products: [],
- cart: null,
+ cart: { items: [], totalPrice: 0, totalQty: 0, userId: '' },
+ orders: []
}
// const listFieldsToChange: string [] = ['descr', 'statustodo', 'category', 'expiring_at', 'priority', 'id_prev', 'pos', 'enableExpiring', 'progress', 'phase', 'assigned_to_userId', 'hoursplanned', 'hoursworked', 'start_date', 'completed_at', 'themecolor', 'themebgcolor']
@@ -36,7 +38,7 @@ function createOrderByProduct(product: IProduct, order: IOrder): IOrder {
idapp: process.env.APP_ID,
idProduct: product._id,
idProducer: product.idProducer,
- status: tools.OrderStatus.IN_CART,
+ status: shared_consts.OrderStatus.IN_CART,
price: product.price,
color: product.color,
size: product.size,
@@ -71,7 +73,15 @@ namespace Getters {
return state.cart
}, 'getCart')
+ const getOrdersCart = b.read((stateparamf: IProductsState) => (tipoord: string): IOrderCart[] => {
+ if (tipoord === 'incorso')
+ return state.orders.filter((rec) => rec.status <= shared_consts.OrderStatus.CHECKOUT_CONFIRMED)
+ else
+ return state.orders.filter((rec) => rec.status < shared_consts.OrderStatus.RECEIVED && rec.status > shared_consts.OrderStatus.CHECKOUT_CONFIRMED)
+ }, 'getOrdersCart')
+
const existProductInCart = b.read((stateparamf: IProductsState) => (idproduct): boolean => {
+ // console.log('.state.cart.items', state.cart.items)
const ris = state.cart.items.filter((item) => item.order.idProduct === idproduct).reduce((sum, rec) => sum + 1, 0)
return ris > 0
}, 'existProductInCart')
@@ -83,18 +93,21 @@ namespace Getters {
const objproduct: IProduct = {
// _id: tools.getDateNow().toISOString(), // Create NEW
- descr: '',
idProducer: '',
idStorehouses: [],
producer: null,
storehouses: null,
+ code: '',
name: '',
+ description: '',
department: '',
category: '',
price: 0.0,
color: '',
size: '',
quantityAvailable: 0,
+ canBeShipped: false,
+ canBeBuyOnline: false,
weight: 0,
stars: 0,
date: tools.getDateNow(),
@@ -114,6 +127,9 @@ namespace Getters {
get getCart() {
return getCart()
},
+ get getOrdersCart() {
+ return getOrdersCart()
+ },
get existProductInCart() {
return existProductInCart()
},
@@ -151,9 +167,9 @@ namespace Actions {
state.products = []
}
- console.log('ARRAY PRODUCTS = ', state.products)
+ // console.log('ARRAY PRODUCTS = ', state.products)
if (process.env.DEBUG === '1') {
- console.log('dbLoad', 'state.products', state.products)
+ // console.log('dbLoad', 'state.products', state.products)
}
return res
@@ -169,6 +185,39 @@ namespace Actions {
return ris
}
+ async function loadProduct(context, { code }) {
+
+ console.log('loadProduct', code)
+
+ if (!static_data.functionality.ENABLE_ECOMMERCE)
+ return null
+
+ console.log('getProduct', 'code', code)
+
+ // if (UserStore.state.my._id === '') {
+ // return new Types.AxiosError(0, null, 0, '')
+ // }
+
+ let ris = null
+
+ ris = await Api.SendReq('/products/' + code, 'POST', { code })
+ .then((res) => {
+ console.log('product', res.data.product)
+ if (res.data.product) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
+ return res.data.product
+ } else {
+ return null
+ }
+ })
+ .catch((error) => {
+ console.log('error getProduct', error)
+ UserStore.mutations.setErrorCatch(error)
+ return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, tools.ERR_GENERICO, error)
+ })
+
+ return ris
+ }
+
async function loadCart(context) {
console.log('loadCart')
@@ -189,7 +238,7 @@ namespace Actions {
if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
state.cart = res.data.cart
} else {
- state.cart = null
+ state.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' }
}
return res
@@ -212,7 +261,7 @@ namespace Actions {
if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
state.cart = res.data.cart
} else {
- state.cart = null
+ state.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' }
}
return res
@@ -240,7 +289,7 @@ namespace Actions {
if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
state.cart = res.data.cart
} else {
- state.cart = null
+ state.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' }
}
return res
@@ -270,7 +319,7 @@ namespace Actions {
state.cart = res.data.cart
if (!!res.data.qty) {
// const ind = state.cart.items.findIndex((rec) => rec.order._id === order._id)
- // state.cart.items[ind].order.quantity = res.data.qty
+ // state.cart.items[ind].order.quantity = res.data.qty
return res.data.qty
}
@@ -288,11 +337,41 @@ namespace Actions {
return ris
}
+ async function UpdateStatusCart(context, { cart_id, status }) {
+
+ if (!static_data.functionality.ENABLE_ECOMMERCE)
+ return null
+
+ // console.log('addSubQtyToItem', 'userid=', UserStore.state.my._id, order)
+
+ let ris = null
+
+ ris = await Api.SendReq('/cart/' + UserStore.state.my._id + '/cartstatus', 'POST', { cart_id, status })
+ .then((res) => {
+
+ if (res.data.status === shared_consts.OrderStatus.CHECKOUT_CONFIRMED) {
+ ProductsModule.state.cart = {}
+ if (res.data.orders)
+ Products.state.orders = res.data.orders
+ }
+ return res.data.status
+ })
+ .catch((error) => {
+ console.log('error UpdateStatusCart', error)
+ UserStore.mutations.setErrorCatch(error)
+ return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, tools.ERR_GENERICO, error)
+ })
+
+ return ris
+ }
+
export const actions = {
// loadCart: b.dispatch(loadCart),
+ loadProduct: b.dispatch(loadProduct),
loadProducts: b.dispatch(loadProducts),
addToCart: b.dispatch(addToCart),
addSubQtyToItem: b.dispatch(addSubQtyToItem),
+ UpdateStatusCart: b.dispatch(UpdateStatusCart),
removeFromCart: b.dispatch(removeFromCart),
}
diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts
index 07a1e02..1ba98e7 100755
--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -45,6 +45,9 @@ export const DefaultUser: IUserFields = {
saw_and_accepted: false,
qualified: false,
qualified_2invitati: false,
+ socio: false,
+ socioresidente: false,
+ myshares: [],
},
downline: [],
calcstat: DefaultCalc,
@@ -54,7 +57,8 @@ export const DefaultUser: IUserFields = {
userId: '',
items: [],
totalPrice: 0,
- totalQty: 0
+ totalQty: 0,
+ note: '',
}
}
@@ -80,6 +84,9 @@ export const DefaultProfile: IUserProfile = {
saw_zoom_presentation: false,
ask_zoom_partecipato: false,
saw_and_accepted: false,
+ socio: false,
+ socioresidente: false,
+ myshares: [],
paymenttypes: [],
qualified: false,
qualified_2invitati: false,
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index d570f95..6414305 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -167,12 +167,19 @@ export const colTableProducer = [
AddCol({ name: 'name', label_trans: 'producer.name' }),
AddCol({ name: 'description', label_trans: 'producer.description' }),
AddCol({ name: 'referent', label_trans: 'producer.referent' }),
+ AddCol({ name: 'username', label_trans: 'producer.username' }),
AddCol({ name: 'region', label_trans: 'producer.region' }),
AddCol({ name: 'city', label_trans: 'producer.city' }),
AddCol({ name: 'img', label_trans: 'producer.img' }),
AddCol({ name: 'website', label_trans: 'producer.website' }),
]
+export const colTableShareWithUs = [
+ AddCol({ name: 'description', label_trans: 'share.description' }),
+ AddCol({ name: 'numshared', label_trans: 'share.numshared', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'rating', label_trans: 'share.rating', fieldtype: tools.FieldType.number }),
+]
+
export const colTableStorehouse = [
AddCol({ name: 'name', label_trans: 'store.name' }),
AddCol({ name: 'description', label_trans: 'store.description' }),
@@ -185,6 +192,7 @@ export const colTableStorehouse = [
]
export const colTableProducts = [
+ AddCol({ name: 'code', label_trans: 'products.code' }),
AddCol({ name: 'name', label_trans: 'products.name' }),
AddCol({ name: 'description', label_trans: 'products.description' }),
AddCol({ name: 'icon', label_trans: 'products.icon' }),
@@ -208,6 +216,8 @@ export const colTableProducts = [
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 }),
+ AddCol({ name: 'canBeShipped', label_trans: 'products.canBeShipped', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'canBeBuyOnline', label_trans: 'products.canBeBuyOnline', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'weight', label_trans: 'products.weight', fieldtype: tools.FieldType.number }),
AddCol({ name: 'stars', label_trans: 'products.stars', fieldtype: tools.FieldType.number }),
AddCol({ name: 'date', label_trans: 'products.date', fieldtype: tools.FieldType.date }),
@@ -723,6 +733,12 @@ export const fieldsTable = {
label_trans: 'reg.manage_telegram',
fieldtype: tools.FieldType.boolean
}),
+ AddCol({
+ name: 'profile.myshares',
+ field: 'profile',
+ subfield: 'myshares',
+ label_trans: 'reg.myshares'
+ }),
AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }),
AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),
AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: tools.FieldType.date }),
@@ -733,7 +749,7 @@ export const fieldsTable = {
AddCol(DuplicateRec)
],
- colTableUsersSIP: [
+ colTableUsersCNM: [
// AddCol({ name: '_id', label_trans: 'reg.id' }),
AddCol({ name: 'ind_order', label_trans: 'reg.ind_order' }),
AddCol({ name: 'sospeso', label_trans: 'reg.sospeso', fieldtype: tools.FieldType.boolean }),
@@ -744,7 +760,7 @@ export const fieldsTable = {
AddCol({ name: 'email', label_trans: 'reg.email' }),
AddCol({ name: 'made_gift', label_trans: 'reg.made_gift', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'note', label_trans: 'reg.note' }),
- AddCol({ name: 'aportador_solidario', label_trans: 'reg.aportador_solidario' }),
+ // AddCol({ name: 'aportador_solidario', label_trans: 'reg.aportador_solidario' }),
AddCol({ name: 'verified_email', label_trans: 'reg.verified_email', fieldtype: tools.FieldType.boolean }),
AddCol({
name: 'profile.special_req',
@@ -816,6 +832,20 @@ export const fieldsTable = {
label_trans: 'reg.manage_telegram',
fieldtype: tools.FieldType.boolean
}),
+ AddCol({
+ name: 'profile.socio',
+ field: 'profile',
+ subfield: 'socio',
+ label_trans: 'reg.socio',
+ fieldtype: tools.FieldType.boolean
+ }),
+ AddCol({
+ name: 'profile.socioresidente',
+ field: 'profile',
+ subfield: 'socioresidente',
+ label_trans: 'reg.socioresidente',
+ fieldtype: tools.FieldType.boolean
+ }),
AddCol({ name: 'profile.chisei', field: 'profile', subfield: 'chisei', label_trans: 'reg.chisei' }),
AddCol({
name: 'profile.iltuoimpegno',
@@ -827,7 +857,7 @@ export const fieldsTable = {
name: 'profile.come_aiutare',
field: 'profile',
subfield: 'come_aiutare',
- label_trans: 'reg.iltuoimpegno'
+ label_trans: 'reg.come_aiutare'
}),
AddCol({
name: 'profile.paymenttypes',
@@ -909,6 +939,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: (rec) => rec.name + ' (' + rec.city + ')'
},
+ {
+ value: 'sharewithus',
+ label: 'Condividi con Noi',
+ columns: colTableShareWithUs,
+ colkey: '_id',
+ collabel: 'description'
+ },
{
value: 'wheres',
label: 'Luoghi',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 819afa8..b746dc1 100755
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -112,6 +112,7 @@ export const tools = {
TABCALZOOM: 'calzoom',
TABTEMPLEMAIL: 'templemail',
TABOPZEMAIL: 'opzemail',
+ TABSHAREWITHUS: 'sharewithus',
MAX_CHARACTERS: 60,
projects: 'projects',
@@ -164,16 +165,6 @@ export const tools = {
PRIORITY_LOW: 0
},
- OrderStatus: {
- NONE: 0,
- IN_CART: 1,
- CHECKOUT_CONFIRMED: 2,
- PAYED: 3,
- DELIVEDED: 4,
- RECEIVED: 5,
- CANCELED: 10,
- },
-
Status: {
NONE: 0,
OPENED: 1,
@@ -1775,7 +1766,7 @@ export const tools = {
}
},
- async saveFieldToServer(myself: any, table, id, mydata) {
+ async saveFieldToServer(myself: any, table, id, mydata, notif = true) {
const mydatatosave = {
id,
table,
@@ -1785,7 +1776,8 @@ export const tools = {
GlobalStore.actions.saveFieldValue(mydatatosave).then((ris) => {
if (ris) {
- tools.showPositiveNotif(myself.$q, myself.$t('db.recupdated'))
+ if (notif)
+ tools.showPositiveNotif(myself.$q, myself.$t('db.recupdated'))
} else {
tools.showNegativeNotif(myself.$q, myself.$t('db.recfailed'))
}
@@ -1898,7 +1890,7 @@ export const tools = {
if (!(static_data.arrLangUsed.includes(mylang))) {
// console.log('non incluso ', mylang)
// mylang = static_data.arrLangUsed[0]
- mylang = 'enUs'
+ mylang = 'it'
// Metti come default
UserStore.mutations.setlang(mylang)
@@ -2620,7 +2612,7 @@ export const tools = {
if (GlobalStore.state.leftDrawerOpen)
myw -= 300
if (!this.isMobile())
- if (GlobalStore.state.RightDrawerOpen)
+ if (GlobalStore.state.rightDrawerOpen)
myw -= 300
maxh2 = (myw / coeff) + 20
@@ -3040,7 +3032,7 @@ export const tools = {
tools.showNotif(mythis.$q, mythis.$t('login.errato'), { color: 'negative', icon: 'notifications' })
mythis.iswaitingforRes = false
if (ispageLogin) {
- GlobalStore.state.RightDrawerOpen = true
+ GlobalStore.state.rightDrawerOpen = true
// mythis.$router.push('/signin')
}
})
@@ -3060,7 +3052,7 @@ export const tools = {
tools.showNotif(mythis.$q, mythis.$t('login.subaccount'), { color: 'negative', icon: 'notifications' })
mythis.iswaitingforRes = false
if (ispageLogin) {
- GlobalStore.state.RightDrawerOpen = true
+ GlobalStore.state.rightDrawerOpen = true
// mythis.$router.push('/signin')
}
})
@@ -3177,7 +3169,7 @@ export const tools = {
}
,
- async createNewRecord(mythis, table, data) {
+ async createNewRecord(mythis, table, data, withnotif = true) {
const mydata = {
table,
@@ -3187,10 +3179,12 @@ export const tools = {
return await
GlobalStore.actions.saveTable(mydata)
.then((record) => {
- if (record) {
- tools.showPositiveNotif(mythis.$q, mythis.$t('db.recupdated'))
- } else {
- tools.showNegativeNotif(mythis.$q, mythis.$t('db.recfailed'))
+ if (withnotif) {
+ if (record) {
+ tools.showPositiveNotif(mythis.$q, mythis.$t('db.recupdated'))
+ } else {
+ tools.showNegativeNotif(mythis.$q, mythis.$t('db.recfailed'))
+ }
}
return record
})
@@ -3208,7 +3202,7 @@ export const tools = {
}
if (withright)
- if (GlobalStore.state.RightDrawerOpen)
+ if (GlobalStore.state.rightDrawerOpen)
myw -= 300
return myw
diff --git a/src/validation/registereduser.ts b/src/validation/registereduser.ts
index 633a003..15bc98f 100755
--- a/src/validation/registereduser.ts
+++ b/src/validation/registereduser.ts
@@ -7,7 +7,7 @@ const VALIDATE_USER_URL = process.env.MONGODB_HOST + '/users/'
export function registereduser(userName: string) {
- let onSuccess = (res: AxiosResponse) => {
+ const onSuccess = (res: AxiosResponse) => {
return res.status !== PayloadMessageTypes.statusfound
}
diff --git a/src/views/ecommerce/checkOut/checkOut.ts b/src/views/ecommerce/checkOut/checkOut.ts
index 8fb6772..605721a 100755
--- a/src/views/ecommerce/checkOut/checkOut.ts
+++ b/src/views/ecommerce/checkOut/checkOut.ts
@@ -9,12 +9,17 @@ import { CDate } from '../../../components/CDate'
import { Action } from 'vuex'
import Products from '@src/store/Modules/Products'
import { CSingleCart } from '../../../components/CSingleCart'
+import { CTitleBanner } from '@components'
+import { tools } from '@src/store/Modules/tools'
+import { ICart } from '@src/model'
+import MixinBase from '@src/mixins/mixin-base'
+import { shared_consts } from '@src/common/shared_vuejs'
const namespace: string = 'Products'
@Component({
name: 'checkOut',
- components: { SingleProject, CProgress, CTodo, CDate, CSingleCart },
+ components: { SingleProject, CProgress, CTodo, CDate, CSingleCart, CTitleBanner },
filters: {
capitalize(value) {
if (!value) {
@@ -26,8 +31,14 @@ const namespace: string = 'Products'
}
})
-export default class CheckOut extends Vue {
+export default class CheckOut extends MixinBase {
public $q: any
+ public mycart: ICart = {}
+ public myrec: any[]
+ public note: string = ''
+
+ public conferma_carrello: boolean = false
+ public conferma_ordine: boolean = false
/*public $refs: {
singleproject: SingleProject[],
@@ -39,16 +50,110 @@ export default class CheckOut extends Vue {
return cart.items || null
}
+ get getCart() {
+ return Products.getters.getCart()
+ }
+
+ get getNote() {
+ const cart = Products.getters.getCart()
+ return cart.note
+ }
+
+ public change_field(fieldname) {
+ if (this.myrec[fieldname] !== this[fieldname]) {
+ this.myrec[fieldname] = this[fieldname]
+
+ const mydata = {
+ [fieldname]: this.myrec[fieldname]
+ }
+
+ const aggiorna = fieldname !== 'status'
+ tools.saveFieldToServer(this, 'carts', this.mycart._id, mydata, aggiorna)
+ }
+ }
+
get myTotalPrice() {
+ if (Products.state.cart && Products.state.cart.totalPrice) {
+ return Products.state.cart.totalPrice.toFixed(2)
+ } else {
+ return 0
+ }
+ }
+
+ get myTotalQty() {
if (Products.state.cart) {
- return Products.state.cart.totalPrice
+ return Products.state.cart.totalQty
} else {
return 0
}
}
public mounted() {
+ this.mycart = this.getCart
+ this.myrec = Object.keys(this.mycart)
+ this.note = this.mycart.note
+
+ console.log('myrec', this.myrec)
// Products.actions.loadCart()
}
+ public CanBeShipped() {
+ return Products.state.cart.items.filter((rec) => rec.order.product.canBeShipped).length
+ }
+
+ public CanBeBuyOnline() {
+ return Products.state.cart.items.filter((rec) => rec.order.product.canBeBuyOnline).length
+ }
+
+ get getnumsteps() {
+ let numsteps = 1
+
+ if (this.CanBeShipped())
+ numsteps++
+ if (this.CanBeBuyOnline())
+ numsteps++
+
+ return numsteps
+ }
+
+ public docheckout() {
+
+ // Può essere spedito?
+
+ if (this.CanBeShipped()) {
+ // mostra form di spedizione
+ }
+
+ if (this.CanBeBuyOnline()) {
+ // mostra form di acquisto Online
+ }
+ }
+
+ get nextstep() {
+ return 0
+ }
+
+ public completeOrder() {
+ this.$q.dialog({
+ message: 'Confermare l\'ordine di acquisto di ' + this.myTotalQty + ' prodotti ?',
+ ok: {
+ label: this.$t('dialog.yes'),
+ push: true
+ },
+ cancel: {
+ label: this.$t('dialog.cancel')
+ },
+ title: 'Ordine'
+ }).onOk(async () => {
+ const status = shared_consts.OrderStatus.CHECKOUT_CONFIRMED
+ const statusnow = await Products.actions.UpdateStatusCart({ cart_id: this.mycart._id, status })
+
+ if (statusnow === status) {
+ tools.showPositiveNotif(this.$q, 'Ordine Confermato')
+ }
+ // this.change_field('status')
+ // this.change_field('status')
+ })
+ }
+
}
diff --git a/src/views/ecommerce/checkOut/checkOut.vue b/src/views/ecommerce/checkOut/checkOut.vue
index f0fddec..31cfaed 100755
--- a/src/views/ecommerce/checkOut/checkOut.vue
+++ b/src/views/ecommerce/checkOut/checkOut.vue
@@ -1,17 +1,36 @@
+
{{ Username }} - {{ myName }}
-
+
@@ -204,6 +227,6 @@
diff --git a/src/components/Shen/CTesseraElettronica/CTesseraElettronica.ts b/src/components/Shen/CTesseraElettronica/CTesseraElettronica.ts
index 82a0a06..f97f025 100755
--- a/src/components/Shen/CTesseraElettronica/CTesseraElettronica.ts
+++ b/src/components/Shen/CTesseraElettronica/CTesseraElettronica.ts
@@ -27,6 +27,6 @@ export default class CTesseraElettronica extends Vue {
}
get rightDrawerOpen() {
- return GlobalStore.state.RightDrawerOpen
+ return GlobalStore.state.rightDrawerOpen
}
}
diff --git a/src/components/index.ts b/src/components/index.ts
index 5e96c23..1a50c34 100755
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -63,4 +63,5 @@ export * from './CMyFlotta'
export * from './CECommerce'
export * from './CSingleCart'
export * from './CMyCart'
+export * from './CShareWithUs'
export * from '../views/ecommerce/'
diff --git a/src/mixins/mixin-base.ts b/src/mixins/mixin-base.ts
index de7ea61..7ed67e1 100755
--- a/src/mixins/mixin-base.ts
+++ b/src/mixins/mixin-base.ts
@@ -9,6 +9,8 @@ import { fieldsTable } from '@src/store/Modules/fieldsTable'
import { CalendarStore } from '@store'
import MixinMetaTags from '@src/mixins/mixin-metatags'
+import { shared_consts } from '../common/shared_vuejs'
+
// You can declare a mixin as the same style as components.
@Component
export default class MixinBase extends MixinMetaTags {
@@ -36,6 +38,10 @@ export default class MixinBase extends MixinMetaTags {
return tools
}
+ get shared_consts() {
+ return shared_consts
+ }
+
public getValDb(keystr, serv, def?, table?, subkey?, id?) {
return tools.getValDb(keystr, serv, def, table, subkey, id)
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index fc7e0bc..af7269b 100755
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -70,7 +70,7 @@ export default class MixinUsers extends Vue {
get getMyImgforIcon() {
const ris = UserStore.getters.getImgByUsername(UserStore.state.my.username)
- return (ris !== '') ? 'img:statics/' + ris : 'fas fa-user-circle'
+ return (ris !== '') ? 'img:statics/' + ris : 'fas fa-user'
}
get getIconCart() {
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 66988cc..fa50872 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -2,7 +2,7 @@ import { IAction } from '@src/model/Projects'
import { Component } from 'vue-router/types/router'
import { lists } from '@src/store/Modules/lists'
import { IPaymentType } from '@src/model/UserStore'
-import { ICart, IProducer, IProduct, IStorehouse } from '@src/model/Products'
+import { ICart, IProducer, IProduct, IShareWithUs, IStorehouse } from '@src/model/Products'
export interface IPost {
title: string
@@ -149,7 +149,7 @@ export interface IGlobalState {
mobileMode: boolean
menuCollapse: boolean
leftDrawerOpen: boolean
- RightDrawerOpen: boolean
+ rightDrawerOpen: boolean
rightCartOpen: boolean
category: string
stateConnection: string
@@ -175,6 +175,7 @@ export interface IGlobalState {
calzoom: ICalZoom[],
producers: IProducer[],
storehouses: IStorehouse[],
+ sharewithus: IShareWithUs[],
autoplaydisc: number
}
@@ -345,6 +346,7 @@ export interface IFunctionality {
BOOKING_EVENTS?: boolean
ENABLE_REG_AYNI?: boolean
ENABLE_REG_SIP?: boolean
+ ENABLE_REG_CNM?: boolean
}
export interface IParamsQuery {
diff --git a/src/model/Products.ts b/src/model/Products.ts
index d74595d..0a36c2d 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -1,17 +1,20 @@
export interface IProduct {
_id?: any
- descr?: string,
idProducer?: string,
idStorehouses?: string[],
producer?: IProducer,
storehouses?: IStorehouse[],
+ code?: string,
name?: string,
+ description?: string,
department?: string,
category?: string,
price?: number,
color?: string,
size?: string,
quantityAvailable?: number,
+ canBeShipped?: boolean,
+ canBeBuyOnline?: boolean,
weight?: number,
stars?: number,
date?: Date,
@@ -51,6 +54,7 @@ export interface IOrder {
export interface IProductsState {
products: IProduct[]
cart: ICart
+ orders: IOrderCart[]
}
export interface IProducer {
@@ -59,6 +63,7 @@ export interface IProducer {
name?: string,
description?: string,
referent?: string,
+ username?: string,
region?: string,
city?: string,
img?: string,
@@ -85,4 +90,28 @@ export interface ICart {
totalQty?: number
totalPrice?: number
items?: IBaseOrder[]
+ note?: string
+ modify_at?: Date
+}
+
+export interface IOrderCart {
+ _id?: any
+ idapp?: string
+ numorder?: number
+ userId?: string
+ totalQty?: number
+ totalPrice?: number
+ items?: IBaseOrder[]
+ status?: number
+ note?: string
+ modify_at?: Date
+}
+
+export interface IShareWithUs {
+ _id?: any
+ idapp?: string
+ userId?: string
+ description?: string
+ numshared?: number
+ rating?: number
}
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 2952426..923ca46 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -1,5 +1,5 @@
import { IToken } from 'model/other'
-import { ICart } from '@src/model/Products'
+import { ICart, IOrderCart, IShareWithUs } from '@src/model/Products'
const enum ESexType {
None = 0,
@@ -33,6 +33,9 @@ export interface IUserProfile {
saw_and_accepted?: boolean
qualified?: boolean
qualified_2invitati?: boolean
+ myshares?: IShareWithUs[]
+ socio?: boolean
+ socioresidente?: boolean
}
export interface IPaymentType {
@@ -88,6 +91,7 @@ export interface IUserFields {
numinvitati?: number
numinvitatiattivi?: number
cart?: ICart
+ ordercart?: IOrderCart
}
/*
diff --git a/src/rootgen/admin/products/products.vue b/src/rootgen/admin/products/products.vue
index 7a9a09b..2dd1151 100755
--- a/src/rootgen/admin/products/products.vue
+++ b/src/rootgen/admin/products/products.vue
@@ -6,6 +6,7 @@
keywords: '' } ) }}
+
+
+ Admin
+ Socio
+ Residente
+ Segreteria
+ Tutor
+ Traduttrici
+
{{ $t('user.loggati') }}
{{
- $t('components.authentication.email_verification.verify_email') }}
+ $t('components.authentication.email_verification.verify_email')
+ }}
- {{$t('pages.profile')}}
+ {{ $t('pages.profile') }}
- {{$t('login.esci')}}
+ {{ $t('login.esci') }}
-
+
+
+
+
+
-
-
+
+
+
+
+
+
diff --git a/src/views/ecommerce/productInfo/index.ts b/src/views/ecommerce/productInfo/index.ts
new file mode 100755
index 0000000..7a92299
--- /dev/null
+++ b/src/views/ecommerce/productInfo/index.ts
@@ -0,0 +1 @@
+export {default as ProductInfo} from './ProductInfo.vue'
diff --git a/src/views/ecommerce/productInfo/productInfo.scss b/src/views/ecommerce/productInfo/productInfo.scss
new file mode 100755
index 0000000..9df13d3
--- /dev/null
+++ b/src/views/ecommerce/productInfo/productInfo.scss
@@ -0,0 +1,5 @@
+$heightBtn: 100%;
+
+.card .product-image {
+ height: 300px;
+}
diff --git a/src/views/ecommerce/productInfo/productInfo.ts b/src/views/ecommerce/productInfo/productInfo.ts
new file mode 100755
index 0000000..2af881a
--- /dev/null
+++ b/src/views/ecommerce/productInfo/productInfo.ts
@@ -0,0 +1,51 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import {
+ IAction,
+ IDrag, IProduct,
+ IProductsState, ITodo, ITodosState,
+ TypeProj
+} from '../../../model/index'
+import { SingleProject } from '../../../components/projects/SingleProject/index'
+import { CTodo } from '../../../components/todos/CTodo'
+
+import { tools } from '../../../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { lists } from '../../../store/Modules/lists'
+import * as ApiTables from '../../../store/Modules/ApiTables'
+
+import { GlobalStore, Projects, Todos } from '@store'
+import { UserStore } from '@store'
+
+import { Getter } from 'vuex-class'
+
+import { date, Screen } from 'quasar'
+import { CProgress } from '../../../components/CProgress'
+import { CDate } from '../../../components/CDate'
+import { RouteNames } from '@src/router/route-names'
+import { CProductCard } from '@src/components/CProductCard'
+import { Action } from 'vuex'
+import Products from '@src/store/Modules/Products'
+
+const namespace: string = 'Products'
+
+@Component({
+ name: 'ProductInfo',
+ components: { SingleProject, CProgress, CTodo, CDate, CProductCard }
+})
+
+export default class ProductInfo extends Vue {
+ public $q: any
+ public code: string = ''
+
+ public created() {
+ console.log('created productInfo')
+ console.log(this.$route)
+ if (!!this.$route.params.codprod) {
+ this.code = this.$route.params.codprod.toString()
+ }
+
+ console.log('this.code', this.code)
+ }
+}
diff --git a/src/views/ecommerce/productInfo/productInfo.vue b/src/views/ecommerce/productInfo/productInfo.vue
new file mode 100755
index 0000000..7b0505e
--- /dev/null
+++ b/src/views/ecommerce/productInfo/productInfo.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/ecommerce/productsList/productsList.vue b/src/views/ecommerce/productsList/productsList.vue
index 27f312e..62273ab 100755
--- a/src/views/ecommerce/productsList/productsList.vue
+++ b/src/views/ecommerce/productsList/productsList.vue
@@ -4,7 +4,7 @@
diff --git a/src/views/login/vreg/vreg.ts b/src/views/login/vreg/vreg.ts
index 772e871..4ee22d7 100755
--- a/src/views/login/vreg/vreg.ts
+++ b/src/views/login/vreg/vreg.ts
@@ -63,6 +63,6 @@ export default class Vreg extends Vue {
}
public openrighttoolbar() {
- GlobalStore.state.RightDrawerOpen = true
+ GlobalStore.state.rightDrawerOpen = true
}
}
+
+
+
diff --git a/src/views/ecommerce/orderInfo/index.ts b/src/views/ecommerce/orderInfo/index.ts
new file mode 100755
index 0000000..4eeb1c5
--- /dev/null
+++ b/src/views/ecommerce/orderInfo/index.ts
@@ -0,0 +1 @@
+export {default as orderInfo} from './orderInfo.vue'
diff --git a/src/views/ecommerce/orderInfo/orderInfo.scss b/src/views/ecommerce/orderInfo/orderInfo.scss
new file mode 100755
index 0000000..9df13d3
--- /dev/null
+++ b/src/views/ecommerce/orderInfo/orderInfo.scss
@@ -0,0 +1,5 @@
+$heightBtn: 100%;
+
+.card .product-image {
+ height: 300px;
+}
diff --git a/src/views/ecommerce/orderInfo/orderInfo.ts b/src/views/ecommerce/orderInfo/orderInfo.ts
new file mode 100755
index 0000000..1a81dd8
--- /dev/null
+++ b/src/views/ecommerce/orderInfo/orderInfo.ts
@@ -0,0 +1,149 @@
+import Vue from 'vue'
+import { Component, Watch } from 'vue-property-decorator'
+
+import { SingleProject } from '../../../components/projects/SingleProject/index'
+import { CTodo } from '../../../components/todos/CTodo'
+
+import { CProgress } from '../../../components/CProgress'
+import { CDate } from '../../../components/CDate'
+import { Action } from 'vuex'
+import Products from '@src/store/Modules/Products'
+import { CSingleCart } from '../../../components/CSingleCart'
+import { CTitleBanner } from '@components'
+import { tools } from '@src/store/Modules/tools'
+import { ICart, IOrderCart } from '@src/model'
+import MixinBase from '@src/mixins/mixin-base'
+import { shared_consts } from '@src/common/shared_vuejs'
+
+const namespace: string = 'Products'
+
+@Component({
+ name: 'checkOut',
+ components: { SingleProject, CProgress, CTodo, CDate, CSingleCart, CTitleBanner },
+ filters: {
+ capitalize(value) {
+ if (!value) {
+ return ''
+ }
+ value = value.toString()
+ return value.charAt(0).toUpperCase() + value.slice(1)
+ }
+ }
+})
+
+export default class OrderInfo extends MixinBase {
+ public $q: any
+ public myorderscart: IOrderCart[] = []
+ public myarrrec: any = {}
+
+ public conferma_carrello: boolean = false
+ public conferma_ordine: boolean = false
+
+ public taborders: string = 'incorso'
+ public columns = [
+ {
+ name: 'numorder',
+ required: true,
+ align: 'left',
+ label: 'Numero Ordine',
+ field: 'numorder',
+ sortable: true
+ },
+ {
+ name: 'created_at',
+ required: true,
+ align: 'center',
+ label: 'Effettuato il',
+ field: 'created_at',
+ sortable: true
+ },
+ {
+ name: 'items',
+ required: true,
+ label: 'Articoli',
+ field: 'items',
+ sortable: true
+ },
+ {
+ name: 'totalPrice',
+ required: true,
+ label: 'Totale',
+ field: 'totalPrice',
+ sortable: true
+ },
+ {
+ name: 'status',
+ align: 'center',
+ required: true,
+ label: 'Stato',
+ field: 'status',
+ sortable: true
+ }
+ ]
+
+ /*public $refs: {
+ singleproject: SingleProject[],
+ ctodo: CTodo
+ }*/
+
+ get getOrdersCart() {
+ return Products.getters.getOrdersCart(this.taborders)
+ }
+
+ public change_field(myorderid, fieldname) {
+ if (this.myarrrec[myorderid][fieldname] !== this[fieldname]) {
+ this.myarrrec[myorderid][fieldname] = this[fieldname]
+
+ const mydata = {
+ [fieldname]: this.myarrrec[myorderid][fieldname]
+ }
+
+ const aggiorna = fieldname !== 'status'
+ tools.saveFieldToServer(this, 'orderscart', myorderid, mydata, aggiorna)
+ }
+ }
+
+ public mounted() {
+ this.myorderscart = this.getOrdersCart
+ for (const ordercart of this.myorderscart) {
+ this.myarrrec[ordercart._id] = Object.keys(ordercart)
+ }
+ }
+
+ public CanBeShipped() {
+ return Products.state.cart.items.filter((rec) => rec.order.product.canBeShipped).length
+ }
+
+ public CanBeBuyOnline() {
+ return Products.state.cart.items.filter((rec) => rec.order.product.canBeBuyOnline).length
+ }
+
+ get getnumsteps() {
+ let numsteps = 1
+
+ if (this.CanBeShipped())
+ numsteps++
+ if (this.CanBeBuyOnline())
+ numsteps++
+
+ return numsteps
+ }
+
+ public docheckout() {
+
+ // Può essere spedito?
+
+ if (this.CanBeShipped()) {
+ // mostra form di spedizione
+ }
+
+ if (this.CanBeBuyOnline()) {
+ // mostra form di acquisto Online
+ }
+ }
+
+ get nextstep() {
+ return 0
+ }
+
+}
diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue
new file mode 100755
index 0000000..551582a
--- /dev/null
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
-
+
+
-
+ Totale: € {{ myTotalPrice }}
+
+
+
- Totale: € {{ myTotalPrice.toFixed(2) }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+ n. {{ props.row.numorder }}
+
+
+ {{ tools.getstrDateTime(props.row.created_at) }}
+
+
+
+
+ {{ props.row.totalPrice }} €
+
+
+ {{ props.row.status }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.order.product.name }} ({{ item.order.quantity }})
+
+ +
+
+
+
+
+
+
-