diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 7f3e18d728..d0f818426c 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -120,5 +120,6 @@ "This item is not available": "This item is not available", "Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}", "The type of business must be filled in basic data": "The type of business must be filled in basic data", - "isWithoutNegatives": "isWithoutNegatives" + "isWithoutNegatives": "isWithoutNegatives", + "The worker has hours recorded that day": "The worker has hours recorded that day" } \ No newline at end of file diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 3d5c205bd6..18552a96c6 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -19,5 +19,10 @@ "Package cannot be blank": "Package cannot be blank", "State cannot be blank": "State cannot be blank", "Worker cannot be blank": "Worker cannot be blank", - "Agency cannot be blank": "Agency cannot be blank" + "Agency cannot be blank": "Agency cannot be blank", + "nickname": "nickname", + "shipped": "shipped", + "landed": "landed", + "isWithoutNegatives": "isWithoutNegatives", + "Changed this data from the ticket": "Changed this data from the ticket" } \ No newline at end of file diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index f0b112deea..807c17f00b 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -116,7 +116,6 @@ module.exports = Self => { const [salesAdvanceable] = await Self.rawSql(query, params, myOptions); const itemAdvanceable = new Map(); - console.log(salesAdvanceable); for (sale of salesAdvanceable) itemAdvanceable.set(sale.id, sale.advanceable); diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js index 8fe906bcfa..bc37e33cbc 100644 --- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js +++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js @@ -83,8 +83,8 @@ describe('sale priceDifference()', () => { const firstItem = result.items[0]; const secondtItem = result.items[1]; - expect(firstItem.available).toEqual(410); - expect(secondtItem.available).toEqual(1870); + expect(firstItem.advanceable).toEqual(440); + expect(secondtItem.advanceable).toEqual(1980); await tx.rollback(); } catch (e) { diff --git a/modules/ticket/front/basic-data/step-two/index.spec.js b/modules/ticket/front/basic-data/step-two/index.spec.js index fcd1d7e49e..0567785e98 100644 --- a/modules/ticket/front/basic-data/step-two/index.spec.js +++ b/modules/ticket/front/basic-data/step-two/index.spec.js @@ -73,12 +73,12 @@ describe('Ticket', () => { { item: 1, quantity: 2, - available: 1 + advanceable: 1 }, { item: 2, quantity: 1, - available: 5 + advanceable: 5 } ] }