From 1d73d9f89da5dd74a38cbd12c2e71b4bb7beb0f2 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 11 Feb 2020 13:25:41 +0100
Subject: [PATCH 1/2] refactor campaing report

---
 modules/client/front/descriptor/index.html    | 33 ++++++++++++-
 modules/client/front/descriptor/index.js      | 20 ++++++--
 modules/client/front/descriptor/locale/es.yml |  3 +-
 .../campaign-metrics/campaign-metrics.html    | 46 ++++++++++++-------
 4 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index 722802c665..30777bcda1 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -70,4 +70,35 @@
 </div>
 <!-- SMS Dialog -->
 <vn-client-sms vn-id="sms" sms="$ctrl.newSMS"></vn-client-sms>
-<!-- SMS Dialog -->
\ No newline at end of file
+<!-- SMS Dialog -->
+<vn-dialog
+    vn-id="consumerReportDialog"
+    on-response="$ctrl.sendConsumerReport($response)">
+    <tpl-body>
+        <div>
+            <h5 style="text-align: center">
+                <span translate>From date</span>
+            </h5>
+            <vn-date-picker
+                vn-id="from"
+                vn-one
+                ng-model="$ctrl.from"
+                label="From hour"
+                vn-focus>
+            </vn-date-picker>
+            <h5 style="text-align: center">
+                <span translate>To date</span>
+            </h5>
+            <vn-date-picker
+                vn-id="to"
+                vn-one
+                ng-model="$ctrl.to"
+                label="To date">
+        </vn-date-picker>
+        </div>
+    </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+        <button response="accept" translate>Accept</button>
+    </tpl-buttons>
+</vn-dialog>
\ No newline at end of file
diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 332d87deba..3ef1e76162 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -2,12 +2,13 @@ import ngModule from '../module';
 import Component from 'core/lib/component';
 
 class Controller extends Component {
-    constructor($element, $) {
+    constructor($element, $, $httpParamSerializer) {
         super($element, $);
-
+        this.$httpParamSerializer = $httpParamSerializer;
         this.moreOptions = [
             {name: 'Simple ticket', callback: this.newTicket},
             {name: 'Send SMS', callback: this.showSMSDialog},
+            {name: 'Send consumer report', callback: this.showConsumerReportDialog}
         ];
     }
 
@@ -63,9 +64,22 @@ class Controller extends Component {
         };
         this.$.sms.open();
     }
+
+    showConsumerReportDialog() {
+        this.$.consumerReportDialog.show();
+    }
+
+    sendConsumerReport(response) {
+        if (response === 'accept') {
+            const data = {from: this.from, to: this.to, clientId: this.client.id};
+            const serializedParams = this.$httpParamSerializer(data);
+            const url = `api/report/campaign-metrics?${serializedParams}`;
+            window.open(url);
+        }
+    }
 }
 
-Controller.$inject = ['$element', '$scope'];
+Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
 
 ngModule.component('vnClientDescriptor', {
     template: require('./index.html'),
diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index 5ae6935d00..23cd397e55 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -1 +1,2 @@
-Simple ticket: Ticket simple
\ No newline at end of file
+Simple ticket: Ticket simple
+Sendconsumer report: Enviar informe de consumo
\ No newline at end of file
diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html
index 5e4bc7d086..7a0f30948f 100644
--- a/print/templates/reports/campaign-metrics/campaign-metrics.html
+++ b/print/templates/reports/campaign-metrics/campaign-metrics.html
@@ -57,27 +57,39 @@
                                 <table class="column-oriented">
                                     <thead>
                                         <tr>
-                                            <th class="number">{{$t('Code')}}</th>
+                                            <th>{{$t('Code')}}</th>
                                             <th class="number">{{$t('Quantity')}}</th>
                                             <th>{{$t('Concept')}}</th>
                                         </tr>
                                     </thead>
-                                    <tbody class="row-oriented bottom-line">
-                                        <tr v-for="sale in sales">
-                                            <td class="number">{{sale.itemFk}}</td>
-                                            <td class="number">{{Math.trunc(sale.subtotal)}}</td>
-                                            <td>
-                                                {{sale.concept}} <span class="font gray">{{sale.subName | uppercase}}</span>
-                                                <section>
-                                                    <span class="font gray">{{sale.tag5}}</span>
-                                                    <span>{{sale.value5}}</span>
-                                                    <span class="font gray">{{sale.tag6}}</span>
-                                                    <span>{{sale.value6}}</span>
-                                                    <span class="font gray">{{sale.tag7}}</span>
-                                                    <span>{{sale.value7}}</span>
-                                                </section>
-                                            </td>
-                                        </tr>
+                                    <tbody>
+                                        <template v-for="sale in sales">
+                                            <tr class="font bold">
+                                                <td>{{sale.itemFk}}</td>
+                                                <td class="number">{{Math.trunc(sale.subtotal)}}</td>
+                                                <td>{{sale.concept}}</td>
+                                            </tr>
+                                            <tr class="description">
+                                                <td class="centered">
+                                                    <div v-if="sale.value5">
+                                                        <strong class="font gray">{{sale.tag5}}</strong> 
+                                                        <span>{{sale.value5}}</span>
+                                                    </div>
+                                                </td>
+                                                <td class="centered">
+                                                    <div v-if="sale.value6">
+                                                        <strong class="font gray">{{sale.tag6}}</strong> 
+                                                        <span>{{sale.value6}}</span>
+                                                    </div>
+                                                </td>
+                                                <td class="centered">
+                                                    <div v-if="sale.value7">
+                                                        <strong class="font gray">{{sale.tag7}}</strong> 
+                                                        <span>{{sale.value7}}</span>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </template>
                                     </tbody>
                                 </table>
                             </div>

From 5375952778d19681089c9b8ba5648548a705c143 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 11 Feb 2020 13:52:05 +0100
Subject: [PATCH 2/2] translate

---
 modules/client/front/descriptor/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index 23cd397e55..293191ec59 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -1,2 +1,2 @@
 Simple ticket: Ticket simple
-Sendconsumer report: Enviar informe de consumo
\ No newline at end of file
+Send consumer report: Enviar informe de consumo
\ No newline at end of file