Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas

e2e/helpers/selectors.js

@@ -625,6 +625,7 @@ export default {
         selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check',
         secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]',
         thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]',
+        fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]',
         deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]',
         transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]',
         moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input',

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -251,7 +251,6 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
         await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

loopback/locale/en.json

@@ -172,5 +172,6 @@
 	"Comment added to client": "Comment added to client",
 	"This ticket is already a refund": "This ticket is already a refund",
 	"A claim with that sale already exists": "A claim with that sale already exists",
-	"ASSIGN_ZONE_FIRST": "Assign zone first"
+	"Can't transfer claimed sales": "Can't transfer claimed sales",
+	"Invalid quantity": "Invalid quantity"
 }

modules/item/front/descriptor/index.html

@@ -115,7 +115,7 @@
             ng-model="$ctrl.warehouseFk"
             data="warehouses"
             show-field="name"
-            value="id">>
+            value="id">
         </vn-autocomplete>
     </tpl-body>
     <tpl-buttons>

modules/ticket/front/sale/index.html

@@ -491,7 +491,7 @@
 <vn-confirm
     vn-id="claimSure"
     message="Do you want to create a claim?"
-    on-accept="$ctrl.createClaim()">
+    on-accept="$ctrl.onCreateClaimAccepted()">
 </vn-confirm>
 
 <vn-menu vn-id="moreOptions">
@@ -513,7 +513,7 @@
     </vn-item>
     <vn-item translate
         name="claim"
-        ng-click="claimSure.show()"
+        ng-click="$ctrl.createClaim()"
         ng-if="$ctrl.isClaimable">
         Add claim
     </vn-item>

modules/ticket/front/sale/index.js

@@ -208,7 +208,7 @@ class Controller extends Section {
         if (pastDays >= this.ticketConfig[0].daysForWarningClaim)
             this.$.claimConfirm.show();
         else
-            this.onCreateClaimAccepted();
+            this.$.claimSure.show();
     }
 
     onCreateClaimAccepted() {