Merge branch '1921-claim_detail_discount' of verdnatura/salix into dev

loopback/locale/en.json

@@ -56,5 +56,6 @@
 	"Value has an invalid format": "Value has an invalid format",
 	"The postcode doesn't exists. Ensure you put the correct format": "The postcode doesn't exists. Ensure you put the correct format",
 	"Can't create stowaway for this ticket": "Can't create stowaway for this ticket",
-	"Has deleted the ticket id": "Has deleted the ticket id [#{{id}}]({{{url}}})"
+	"Has deleted the ticket id": "Has deleted the ticket id [#{{id}}]({{{url}}})",
+	"Swift / BIC can't be empty": "Swift / BIC can't be empty"
 }

modules/claim/front/detail/index.html

@@ -57,11 +57,11 @@
                     <span class="link"
                         vn-tooltip="Edit discount"
                         ng-click="$ctrl.showEditPopover($event, saleClaimed)">
-                        {{::saleClaimed.sale.discount}} %
+                        {{saleClaimed.sale.discount}} %
                     </span>
                 </vn-td>
                 <vn-td number>
-                    {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
+                    {{$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
                 </vn-td>
                 <vn-td shrink>
                     <vn-icon-button
@@ -125,8 +125,9 @@
 <vn-popover 
     class="edit"
     vn-id="edit-popover"
-    on-open="$ctrl.getManaSalespersonMana()"
+    on-open="$ctrl.getSalespersonMana()"
     on-close="$ctrl.mana = null">
+    <div class="discount-popover">
         <vn-spinner
             ng-if="$ctrl.mana == null"
             style="padding: 1em;"
@@ -147,10 +148,11 @@
                     suffix="€">
                 </vn-input-number>
                 <div class="simulator">
-                <p class="simulatorTitle" translate>New price</p>
+                    <p class="simulatorTitle" translate>Total claimed price</p>
                     <p>{{$ctrl.newPrice | currency: 'EUR':2}}
                     </p>
                 </div>
             </div>
         </div>
+    </div>
 </vn-popover>

modules/claim/front/detail/index.js

@@ -128,25 +128,30 @@ class Controller {
         this.$.editPopover.show();
     }
 
-    getManaSalespersonMana() {
+    getSalespersonMana() {
         this.$http.get(`Tickets/${this.claim.ticketFk}/getSalesPersonMana`).then(res => {
             this.mana = res.data;
         });
     }
 
     updateDiscount() {
-        if (this.newDiscount != this.saleClaimed.sale.discount) {
-            const params = {salesIds: [this.saleClaimed.sale.id], newDiscount: this.newDiscount};
-            const query = `Tickets/${this.saleClaimed.sale.ticketFk}/updateDiscount`;
+        const claimedSale = this.saleClaimed.sale;
+        if (this.newDiscount != claimedSale.discount) {
+            const params = {salesIds: [claimedSale.id], newDiscount: this.newDiscount};
+            const query = `Tickets/${claimedSale.ticketFk}/updateDiscount`;
 
             this.$http.post(query, params).then(() => {
-                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+                claimedSale.discount = this.newDiscount;
+                this.calculateTotals();
                 this.clearDiscount();
-                this.$.model.refresh();
+
+                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
             }).catch(err => {
                 this.vnApp.showError(err.message);
             });
         }
+
+        this.$.editPopover.hide();
     }
 
     updateNewPrice() {

modules/claim/front/detail/index.spec.js

@@ -29,6 +29,9 @@ describe('claim', () => {
                 hide: () => {},
                 show: () => {}
             };
+            controller.$.editPopover = {
+                hide: () => {}
+            };
         }));
 
         describe('openAddSalesDialog()', () => {
@@ -110,16 +113,18 @@ describe('claim', () => {
 
 
                 spyOn(controller.vnApp, 'showSuccess');
+                spyOn(controller, 'calculateTotals');
                 spyOn(controller, 'clearDiscount');
-                spyOn(controller.$.model, 'refresh');
+                spyOn(controller.$.editPopover, 'hide');
 
                 $httpBackend.when('POST', 'Tickets/1/updateDiscount').respond({});
                 controller.updateDiscount();
                 $httpBackend.flush();
 
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+                expect(controller.calculateTotals).toHaveBeenCalledWith();
                 expect(controller.clearDiscount).toHaveBeenCalledWith();
-                expect(controller.$.model.refresh).toHaveBeenCalledWith();
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+                expect(controller.$.editPopover.hide).toHaveBeenCalledWith();
             });
         });
 

modules/claim/front/detail/locale/es.yml

@@ -7,3 +7,4 @@ Claimable sales from ticket: Lineas reclamables del ticket
 Detail: Detalles
 Add sale item: Añadir artículo
 Insuficient permisos: Permisos insuficientes
+Total claimed price: Precio total reclamado

modules/claim/front/detail/style.scss

@@ -1,28 +1,9 @@
 @import "variables";
 
-vn-claim-detail {
-    .vn-textfield {
-        margin: 0!important;
-        max-width: 100px;
-    }
-    vn-dialog[vn-id=addSales] {
-        tpl-body {
-            width: 950px;
-            div {
-                div.buttons {
-                    display: none;
-                }
-                vn-table{
-                    min-width: 950px;
-                }
-            }
-        }
-    }
-    vn-popover.edit {
-        div.popover {
-            width: 200px;
-        }
-        vn-horizontal.header {
+.vn-popover .discount-popover {
+    width: 16em;
+
+    .header {
         background-color: $color-main;
         color: $color-font-dark;
 
@@ -31,7 +12,7 @@ vn-claim-detail {
             margin: 0 auto;
         }
     }
-        p.simulatorTitle {
+    .simulatorTitle {
         margin-bottom: 0px;
         font-size:  12px;
         color: $color-main;
@@ -39,9 +20,8 @@ vn-claim-detail {
     vn-label-value {
         padding-bottom: 20px;
     }
-        div.simulator{
+    .simulator{
         text-align: center;
     }
-    }
 }
 

modules/client/front/billing-data/locale/es.yml

@@ -15,5 +15,4 @@ Received B2B VNL: Recibido B2B VNL
 Save: Guardar
 New bank entity: Nueva entidad bancaria
 Name can't be empty: El nombre no puede quedar vacío
-Swift / BIC can't be empty: El Swift / BIC no puede quedar vacío
 Entity Code: Código