diff --git a/emails/ecommerce/makeorder/it/html.pug b/emails/ecommerce/makeorder/it/html.pug
index 8efecf4..76f8801 100755
--- a/emails/ecommerce/makeorder/it/html.pug
+++ b/emails/ecommerce/makeorder/it/html.pug
@@ -55,76 +55,75 @@ html
tr
- td(class="whitespace", height="10")
- p
+ td
- - var totalPrice = orders.totalPrice
- - var note = orders.note
- - var index = 0
+ - var totalPrice = orders.totalPrice
+ - var note = orders.note
+ - var index = 0
- each rec in orders.items
- - var descr = rec.order.product.productInfo.name
- - var code = rec.order.product.productInfo.code
- - var img = dirimg + rec.order.product.productInfo.imagefile
- - var price = rec.order.price
- - var after_price = rec.order.after_price
- - var TotalPriceProduct = rec.order.TotalPriceProductstr
- if (rec.order.gasordine)
- - var gasordine = rec.order.gasordine.name
- else
- - var gasordine = ''
-
- - var qty = rec.order.quantity
- - var qtypreordered = rec.order.quantitypreordered
- if (rec.order.product.productInfo.sfuso && rec.order.product.productInfo.weight)
- - qtypreordered = qtypreordered * rec.order.product.productInfo.weight
- else if (rec.order.product.productInfo.weight)
- - qtypreordered = qtypreordered + ' x ' + rec.order.product.productInfo.weight
+ each rec in orders.items
+ - var descr = rec.order.product.productInfo.name
+ - var code = rec.order.product.productInfo.code
+ - var img = dirimg + rec.order.product.productInfo.imagefile
+ - var price = rec.order.price
+ - var after_price = rec.order.after_price
+ - var TotalPriceProduct = rec.order.TotalPriceProductstr
+ if (rec.order.gasordine)
+ - var gasordine = rec.order.gasordine.name
+ else
+ - var gasordine = ''
+
+ - var qty = rec.order.quantity
+ - var qtypreordered = rec.order.quantitypreordered
+ if (rec.order.product.productInfo.sfuso && rec.order.product.productInfo.weight)
+ - qtypreordered = qtypreordered * rec.order.product.productInfo.weight
+ else if (rec.order.product.productInfo.weight)
+ - qtypreordered = qtypreordered + ' x ' + rec.order.product.productInfo.weight
- - var unit = rec.order.product.productInfo.unitstr
- - index = index + 1
+ - var unit = rec.order.product.productInfo.unitstr
+ - index = index + 1
- table(cellpadding="0", cellspacing="0", width="100%", summary="", border="0", align="center")
- tr
- td(class="column", valign="center" width="40")
- p.boldhigh #{index}.
+ table(cellpadding="0", cellspacing="0", width="100%", summary="", border="0", align="center")
+ tr
+ td(class="column", valign="center" width="40")
+ p.boldhigh #{index}.
- td(class="column sectionArticleImage", valign="top" width="150")
- table(cellpadding="0", cellspacing="0", summary="", border="0")
- tr
- td
- img(src=baseimg + img, alt="", width="150")
- td(class="column", valign="top")
+ td(class="column sectionArticleImage", valign="top" width="150")
+ table(cellpadding="0", cellspacing="0", summary="", border="0")
+ tr
+ td
+ img(src=baseimg + img, alt="", width="150")
+ td(class="column", valign="top")
- table(cellpadding="0", cellspacing="0", summary="", border="0")
- if (qtypreordered > 0)
+ table(cellpadding="0", cellspacing="0", summary="", border="0")
+ if (qtypreordered > 0)
+ tr
+ td(class="sectionContent", valign="top")
+ p Gas Ordine: #{gasordine}
+ p
+ tr
+ td(class="sectionContentTitle boldhigh", valign="top")
+ p #{descr}
tr
td(class="sectionContent", valign="top")
- p Gas Ordine: #{gasordine}
- p
- tr
- td(class="sectionContentTitle boldhigh", valign="top")
- p #{descr}
- tr
- td(class="sectionContent", valign="top")
- p Codice: #{code}
- tr
- td(class="sectionContent", valign="top")
- p Prezzo: #{price} € #{after_price}
- if (qty > 0)
- td(class="sectionContent", valign="top")
- p Quantità: #{qty} #{unit}
- if (qtypreordered > 0)
- td(class="sectionContent", valign="top")
- p Quantità Prenotata: #{qtypreordered} #{unit}
- tr
- td(class="sectionContent", valign="top")
- p Totale: #{TotalPriceProduct} €
+ p Codice: #{code}
+ tr
+ td(class="sectionContent", valign="top")
+ p Prezzo: #{price} € #{after_price}
+ if (qty > 0)
+ td(class="sectionContent", valign="top")
+ p Quantità: #{qty} #{unit}
+ if (qtypreordered > 0)
+ td(class="sectionContent", valign="top")
+ p Quantità Prenotata: #{qtypreordered} #{unit}
+ tr
+ td(class="sectionContent", valign="top")
+ p Totale: #{TotalPriceProduct} €
- if (note)
- p Note Aggiuntive: #{note}
+ if (note)
+ p Note Aggiuntive: #{note}
- p.sectionContentTitle.boldhigh.sectionTotal Totale Ordine: #{totalPrice} €
+ p.sectionContentTitle.boldhigh.sectionTotal Totale Ordine: #{totalPrice} €
tr
td(class="whitespace", height="10")
diff --git a/emails/ecommerce/order_confirmed/it/html.pug b/emails/ecommerce/order_confirmed/it/html.pug
index ec28f8d..cd52468 100755
--- a/emails/ecommerce/order_confirmed/it/html.pug
+++ b/emails/ecommerce/order_confirmed/it/html.pug
@@ -52,7 +52,7 @@ html
if (miordconfirmed)
p!= miordconfirmed
else
- p Puoi pertanto venire a ritirarli direttamente in sede, negli orari che ti sono stati indicati.
+ p Puoi venire a ritirarli direttamente in sede, negli orari che ti sono stati indicati.
p
@@ -62,6 +62,7 @@ html
each rec in orders.items
- var descr = rec.order.product.productInfo.name
+ - var code = rec.order.product.productInfo.code
- var img = dirimg + rec.order.product.productInfo.imagefile
- var price = rec.order.product.price
- var after_price = rec.order.product.after_price
@@ -101,6 +102,9 @@ html
tr
td(class="sectionContentTitle boldhigh", valign="top")
p #{descr}
+ tr
+ td(class="sectionContent", valign="top")
+ p Codice: #{code}
tr
td(class="sectionContent", valign="top")
p Prezzo: #{price} € #{after_price}
diff --git a/src/server/models/catalog.js b/src/server/models/catalog.js
index 91785bb..d0be9e4 100755
--- a/src/server/models/catalog.js
+++ b/src/server/models/catalog.js
@@ -50,6 +50,7 @@ const CatalogSchema = new Schema({
},
editore: [{ type: String }],
+ editore_escludi: [{ type: String }],
descr_introduttiva: {
type: String,