From 5a946af1ff9bf6e6800ffc7b12d8e5e19b6cf41f Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 15 Apr 2019 08:46:20 +0200
Subject: [PATCH 1/3] error when sending to a salesPerson pay-method changes
 #1338

---
 modules/client/back/models/client.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index dd0d61d9c2..66c875aa56 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -197,10 +197,11 @@ module.exports = Self => {
         if (payMethodChanged || ibanChanged || dueDayChanged) {
             const message = `La forma de pago del cliente con id ${instance.id} ha cambiado`;
             const salesPersonFk = instance.salesPersonFk;
+            const salesPerson = await Self.app.models.Worker.findById(salesPersonFk);
 
-            if (salesPersonFk) {
+            if (salesPerson) {
                 await Self.app.models.Message.send(ctx, {
-                    recipientFk: salesPersonFk,
+                    recipientFk: salesPerson.userFk,
                     message: message
                 });
             }

From fb517cb923079fbf676777d5545984613787eba1 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 16 Apr 2019 12:11:06 +0200
Subject: [PATCH 2/3] fixed catalog price popover

---
 modules/order/front/prices-popover/index.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/order/front/prices-popover/index.html b/modules/order/front/prices-popover/index.html
index 82df687077..def04cb168 100644
--- a/modules/order/front/prices-popover/index.html
+++ b/modules/order/front/prices-popover/index.html
@@ -48,11 +48,10 @@
                             <span> x {{::price.price | currency: 'EUR': 2}}</span>
                         </vn-one>
                         <vn-one>
-                            <vn-input-number
+                            <vn-input-number min="0"
                                 name="quantity"
                                 label="Qty."
-                                field="price.quantity"
-                                min="0"
+                                model="price.quantity"
                                 step="price.grouping"
                                 on-change="$ctrl.validate()">
                             </vn-input-number>

From 2ebc5de4414f849ae8b9bca3016f6b46d6236ec6 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 25 Apr 2019 13:22:49 +0200
Subject: [PATCH 3/3] Nginx now logs original proxy src/dst hosts

---
 front/nginx.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/front/nginx.conf b/front/nginx.conf
index d6205af1e8..84daf2ef2b 100644
--- a/front/nginx.conf
+++ b/front/nginx.conf
@@ -1,4 +1,12 @@
 
+set_real_ip_from 0.0.0.0/0;
+real_ip_header X-Forwarded-For;
+log_format upstreamlog
+	'[$time_local] $remote_addr -> $proxy_host:$upstream_addr '
+	'"$request" $status $body_bytes_sent '
+	'"$http_referer" "$http_user_agent"';
+access_log  /var/log/nginx/access.log upstreamlog;
+
 upstream back {
 	server back_1:3000;
 	server back_2:3000;