diff --git a/db/changes/233001/00-itemRecycle.sql b/db/changes/233001/00-itemRecycle.sql
new file mode 100644
index 000000000..c191e5d1c
--- /dev/null
+++ b/db/changes/233001/00-itemRecycle.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`item` ADD recycledPlastic INT NULL;
+ALTER TABLE `vn`.`item` ADD nonRecycledPlastic INT NULL;
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index c0b1cc0d9..d5de6a954 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -145,7 +145,7 @@ module.exports = Self => {
const stmts = [];
const stmt = new ParameterizedSQL(
- `SELECT
+ `SELECT
i.id,
i.image,
i.name,
@@ -164,6 +164,8 @@ module.exports = Self => {
i.stemMultiplier,
i.typeFk,
i.isFloramondo,
+ i.recycledPlastic,
+ i.nonRecycledPlastic,
pr.name AS producer,
it.name AS typeName,
it.workerFk AS buyerFk,
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 4a7e04002..e99dcd996 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -125,6 +125,12 @@
"minPrice": {
"type": "number"
},
+ "recycledPlastic": {
+ "type": "number"
+ },
+ "nonRecycledPlastic": {
+ "type": "number"
+ },
"packingOut": {
"type": "number"
},
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index a7e603bd1..fba4d679c 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -82,6 +82,8 @@
vn-name="expence"
initial-data="$ctrl.item.expense">
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
- El nombre completo se calcula
- basado en los tags 1-3.
+Full name calculates based on tags 1-3. Is not recommended to change it manually: >-
+ El nombre completo se calcula
+ basado en los tags 1-3.
No se recomienda cambiarlo manualmente
Is active: Activo
Expense: Gasto
@@ -13,4 +13,6 @@ Is shown at website, app that this item cannot travel (wreath, palms, ...): Se m
Multiplier: Multiplicador
Generic: Genérico
This item does need a photo: Este artículo necesita una foto
-Do photo: Hacer foto
\ No newline at end of file
+Do photo: Hacer foto
+Recycled Plastic: Plástico reciclado
+Non recycled plastic: Plástico no reciclado
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 46a2baef4..fcc267b4d 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -113,9 +113,21 @@
+
+
+
+
+
+
+
+