From b0a60fc94a54cfc8a8e531901c8d85fe14a6ed1e Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Tue, 22 Jan 2019 10:31:12 +0100
Subject: [PATCH] #1023 claim.detail cantidad total parecer ser erronea

---
 modules/claim/front/detail/index.html | 66 ++++++++++++++-------------
 modules/claim/front/detail/index.js   | 17 +++++--
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html
index 857e1a93e..2c62a5abb 100644
--- a/modules/claim/front/detail/index.html
+++ b/modules/claim/front/detail/index.html
@@ -82,38 +82,42 @@
     </a>
 </vn-vertical>
 <!-- Add Lines Dialog -->
-<vn-dialog vn-id="add-sales">
+<vn-dialog vn-id="add-sales" class="modalForm">
     <tpl-body>
-        <h3><span translate>Claimable sales from ticket</span> {{$ctrl.claim.ticketFk}}</h3>
-        <vn-table>
-            <vn-thead>
-                <vn-tr>
-                    <vn-th number>Id</vn-th>
-                    <vn-th number>Landed</vn-th>
-                    <vn-th number>Quantity</vn-th>
-                    <vn-th number>Description</vn-th>
-                    <vn-th number>Price</vn-th>
-                    <vn-th number>Disc.</vn-th>
-                    <vn-th number>Total</vn-th>
-                </vn-tr>
-            </vn-thead>
-            <vn-tbody>
-                <vn-tr ng-repeat="sale in $ctrl.salesToClaim" class="clickable" ng-click="$ctrl.addClaimedSale($index)">
-                    <vn-td number>{{sale.saleFk}} {{$index}}</vn-td>
-                    <vn-td number>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
-                    <vn-td number>{{sale.quantity}}</vn-td>
-                    <vn-td number>{{sale.concept}}</vn-td>
-                    <vn-td number>{{sale.price | currency:'€':2}}</vn-td>
-                    <vn-td number>{{sale.discount}} %</vn-td>
-                    <vn-td number>
-                        {{(sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price))/100) | currency:'€':2}}
-                    </vn-td>
-                </vn-tr>
-            </vn-tbody>
-            <vn-empty-rows ng-if="$ctrl.salesToClaim.length === 0" translate>
-                No results
-            </vn-empty-rows>
-        </vn-table>
+        <vn-horizontal pad-medium class="header">
+            <h5><span translate>Claimable sales from ticket</span> {{$ctrl.claim.ticketFk}}</h5>
+        </vn-horizontal>
+        <vn-horizontal pad-medium>
+            <vn-table>
+                <vn-thead>
+                    <vn-tr>
+                        <vn-th number>Id</vn-th>
+                        <vn-th number>Landed</vn-th>
+                        <vn-th number>Quantity</vn-th>
+                        <vn-th number>Description</vn-th>
+                        <vn-th number>Price</vn-th>
+                        <vn-th number>Disc.</vn-th>
+                        <vn-th number>Total</vn-th>
+                    </vn-tr>
+                </vn-thead>
+                <vn-tbody>
+                    <vn-tr ng-repeat="sale in $ctrl.salesToClaim" class="clickable" ng-click="$ctrl.addClaimedSale($index)">
+                        <vn-td number>{{sale.saleFk}} {{$index}}</vn-td>
+                        <vn-td number>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td number>{{sale.quantity}}</vn-td>
+                        <vn-td number>{{sale.concept}}</vn-td>
+                        <vn-td number>{{sale.price | currency:'€':2}}</vn-td>
+                        <vn-td number>{{sale.discount}} %</vn-td>
+                        <vn-td number>
+                            {{(sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price))/100) | currency:'€':2}}
+                        </vn-td>
+                    </vn-tr>
+                </vn-tbody>
+                <vn-empty-rows ng-if="$ctrl.salesToClaim.length === 0" translate>
+                    No results
+                </vn-empty-rows>
+            </vn-table>
+        </vn-horizontal>
     </tpl-body>
 </vn-dialog>
 <vn-item-descriptor-popover
diff --git a/modules/claim/front/detail/index.js b/modules/claim/front/detail/index.js
index dfee80243..bec5e8c3d 100644
--- a/modules/claim/front/detail/index.js
+++ b/modules/claim/front/detail/index.js
@@ -24,6 +24,17 @@ class Controller {
         };
     }
 
+    set salesClaimed(value) {
+        this._salesClaimed = value;
+
+        if (value)
+            this.calculateTotals();
+    }
+
+    get salesClaimed() {
+        return this._salesClaimed;
+    }
+
     openAddSalesDialog() {
         this.getClaimableFromTicket();
         this.$.addSales.show();
@@ -71,9 +82,9 @@ class Controller {
     calculateTotals() {
         this.paidTotal = 0.0;
         this.claimedTotal = 0.0;
-        if (!this.salesClaimed) return;
+        if (!this._salesClaimed) return;
 
-        this.salesClaimed.forEach(sale => {
+        this._salesClaimed.forEach(sale => {
             let orgSale = sale.sale;
             this.paidTotal += this.getSaleTotal(orgSale);
             this.claimedTotal += sale.quantity * orgSale.price - ((orgSale.discount * (sale.quantity * orgSale.price)) / 100);
@@ -81,7 +92,7 @@ class Controller {
     }
 
     getSaleTotal(sale) {
-        return sale.quantity * sale.price - ((100 - sale.discount) / 100);
+        return (sale.quantity * sale.price) - ((100 - sale.discount) / 100);
     }
 
     // Item Descriptor