Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev

Reviewed-on: #1656
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

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;

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,

modules/item/back/models/item.json

@@ -125,6 +125,12 @@
         "minPrice": {
             "type": "number"
         },
+        "recycledPlastic": {
+            "type": "number"
+        },
+        "nonRecycledPlastic": {
+            "type": "number"
+        },
         "packingOut": {
             "type": "number"
         },

modules/item/front/basic-data/index.html

@@ -82,6 +82,8 @@
                 vn-name="expence"
                 initial-data="$ctrl.item.expense">
             </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
             <vn-autocomplete
                 data="originsData"
                 label="Origin"
@@ -91,21 +93,6 @@
                 vn-name="origin"
                 initial-data="$ctrl.item.origin">
             </vn-autocomplete>
-            <vn-textfield
-                label="Reference"
-                ng-model="$ctrl.item.comment"
-                vn-name="comment"
-                rule>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                min="0"
-                label="Relevancy"
-                ng-model="$ctrl.item.relevancy"
-                vn-name="relevancy"
-                rule>
-            </vn-input-number>
             <vn-input-number
                 min="0"
                 label="Size"
@@ -113,6 +100,21 @@
                 vn-name="size"
                 rule>
             </vn-input-number>
+            <vn-textfield
+                label="Reference"
+                ng-model="$ctrl.item.comment"
+                vn-name="comment"
+                rule>
+            </vn-textfield>
+            <vn-input-number
+                min="0"
+                label="Relevancy"
+                ng-model="$ctrl.item.relevancy"
+                vn-name="relevancy"
+                rule>
+            </vn-input-number>
+        </vn-horizontal>
+        <vn-horizontal>
             <vn-input-number
                 min="0"
                 label="stems"
@@ -126,22 +128,6 @@
                 ng-model="$ctrl.item.stemMultiplier"
                 vn-name="stemMultiplier">
             </vn-input-number>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                min="0"
-                label="Weight/Piece"
-                ng-model="$ctrl.item.weightByPiece"
-                vn-name="weightByPiece"
-                rule>
-            </vn-input-number>
-            <vn-input-number
-                min="0"
-                label="Units/Box"
-                ng-model="$ctrl.item.packingOut"
-                vn-name="packingOut"
-                rule>
-            </vn-input-number>
             <vn-autocomplete
                 label="Generic"
                 url="Items/withName"
@@ -167,6 +153,36 @@
                 </append>
             </vn-autocomplete>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-input-number
+                min="0"
+                label="Weight/Piece"
+                ng-model="$ctrl.item.weightByPiece"
+                vn-name="weightByPiece"
+                rule>
+            </vn-input-number>
+            <vn-input-number
+                min="0"
+                label="Units/Box"
+                ng-model="$ctrl.item.packingOut"
+                vn-name="packingOut"
+                rule>
+            </vn-input-number>
+            <vn-input-number
+                min="0"
+                label="Recycled Plastic"
+                ng-model="$ctrl.item.recycledPlastic"
+                vn-name="recycledPlastic"
+                rule>
+            </vn-input-number>
+            <vn-input-number
+                min="0"
+                label="Non recycled plastic"
+                ng-model="$ctrl.item.nonRecycledPlastic"
+                vn-name="nonRecycledPlastic"
+                rule>
+            </vn-input-number>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-textarea
                 label="Description"

modules/item/front/basic-data/locale/es.yml

@@ -1,7 +1,7 @@
 Reference: Referencia
-Full name calculates based on tags 1-3. Is not recommended to change it manually: >- 
+Full name calculates based on tags 1-3. Is not recommended to change it manually: >-
-  El nombre completo se calcula 
+  El nombre completo se calcula
-  basado en los tags 1-3. 
+  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
+Do photo: Hacer foto
+Recycled Plastic: Plástico reciclado
+Non recycled plastic: Plástico no reciclado

modules/item/front/summary/index.html

@@ -113,9 +113,21 @@
             <vn-label-value label="Weight/Piece"
                 value="{{$ctrl.summary.item.weightByPiece}}">
             </vn-label-value>
+            <vn-label-value label="Units/Box"
+                value="{{$ctrl.summary.item.packingOut}}">
+            </vn-label-value>
             <vn-label-value label="Expense"
                 value="{{$ctrl.summary.item.expense.name}}">
             </vn-label-value>
+            <vn-label-value label="Generic"
+                value="{{$ctrl.summary.item.genericFk}}">
+            </vn-label-value>
+            <vn-label-value label="Recycled Plastic"
+                value="{{$ctrl.summary.item.recycledPlastic}}">
+            </vn-label-value>
+            <vn-label-value label="Non recycled plastic"
+                value="{{$ctrl.summary.item.nonRecycledPlastic}}">
+            </vn-label-value>
         </vn-one>
         <vn-one name="tags">
             <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">