diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 0df20f191..4506cc7bd 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -269,7 +269,7 @@ export default {
sale: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr',
firstSaleItemId: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
popoverDiaryButton: 'vn-ticket-summary vn-item-descriptor-popover vn-item-descriptor vn-icon[icon="icon-transaction"]',
- firstSaleQuantity: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(4)',
+ firstSaleQuantity: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(3)',
firstSaleDiscount: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(6)'
},
ticketsIndex: {
@@ -337,18 +337,18 @@ export default {
firstSaleQuantity: `vn-textfield[model="sale.quantity"]:nth-child(1) input`,
firstSaleQuantityClearInput: `vn-textfield[model="sale.quantity"] div.suffix > i`,
firstSaleID: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(4) > span',
- firstSalePrice: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(7)',
+ firstSalePrice: 'vn-ticket-sale:nth-child(1) vn-tr:nth-child(1) > vn-td:nth-child(7) > span',
firstSalePriceInput: 'vn-ticket-sale:nth-child(1) > vn-vertical > vn-popover.edit.dialog-summary.ng-isolate-scope.vn-popover.shown > div > div.content > div > vn-textfield',
- firstSaleDiscount: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(8)',
+ firstSaleDiscount: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(8) > span',
firstSaleDiscountInput: 'vn-ticket-sale:nth-child(1) vn-ticket-sale-edit-discount > div > vn-textfield > div > div > div.infix > input.ng-not-empty',
firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(9)',
firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)',
- firstSaleColour: `vn-ticket-sale vn-tr:nth-child(1) vn-td:nth-child(5) section:nth-child(1)`,
- firstSaleLength: `vn-ticket-sale vn-tr:nth-child(1) vn-td:nth-child(5) section:nth-child(3)`,
+ firstSaleColour: `vn-ticket-sale vn-tr:nth-child(1) vn-td:nth-child(6) section:nth-child(1)`,
+ firstSaleLength: `vn-ticket-sale vn-tr:nth-child(1) vn-td:nth-child(6) section:nth-child(3)`,
firstSaleCheckbox: `vn-ticket-sale vn-tr:nth-child(1) vn-check[field="sale.checked"] md-checkbox`,
secondSaleClaimIcon: 'vn-ticket-sale > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(2) > a > vn-icon',
- secondSaleColour: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(5) section:nth-child(5)`,
- secondSalePrice: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(7)`,
+ secondSaleColour: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(6) section:nth-child(5)`,
+ secondSalePrice: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(7) > span`,
secondSaleDiscount: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(8)`,
secondSaleImport: `vn-ticket-sale vn-tr:nth-child(2) vn-td:nth-child(9)`,
secondSaleText: `vn-table div > vn-tbody > vn-tr:nth-child(2)`,
diff --git a/e2e/paths/ticket-module/07_edit_sale.spec.js b/e2e/paths/ticket-module/07_edit_sale.spec.js
index 655f25cb3..9a0a3f35d 100644
--- a/e2e/paths/ticket-module/07_edit_sale.spec.js
+++ b/e2e/paths/ticket-module/07_edit_sale.spec.js
@@ -538,16 +538,16 @@ xdescribe('Ticket Edit sale path', () => {
describe('when state is preparation and loged as Production', () => {
it(`should not be able to edit the sale price`, async() => {
const result = await nightmare
- .waitToClick(selectors.ticketSales.firstSalePrice)
- .exists(selectors.ticketSales.firstSalePriceInput);
+ .wait(selectors.ticketSales.firstSaleID)
+ .exists(selectors.ticketSales.firstSalePrice);
expect(result).toBeFalsy();
});
it(`should not be able to edit the sale discount`, async() => {
const result = await nightmare
- .waitToClick(selectors.ticketSales.firstSaleDiscount)
- .exists(selectors.ticketSales.firstSaleDiscountInput);
+ .waitToClick(selectors.ticketSales.firstSaleID)
+ .exists(selectors.ticketSales.firstSaleDiscount);
expect(result).toBeFalsy();
});
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 82e6bff8c..8e4585a2a 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -62,8 +62,8 @@
Id
+ Quantity
Item
- Quantity
Price
Disc
Amount
@@ -94,7 +94,7 @@
icon="icon-reserve"
vn-tooltip="{{::$ctrl.$translate.instant('Reserved')}}">
-
+
-
-
-
-
{{sale.quantity}}
-
- {{sale.price | currency: 'EUR':2}}
+
+
+
+
+
+
+ {{sale.price | currency: 'EUR':2}}
+
{{sale.price | currency: 'EUR':2}}
-
- {{sale.discount}} %
+
+
+ {{sale.discount}} %
+
@@ -158,7 +158,7 @@
-
{{::sale.quantity}}
+
{{::sale.price | currency: 'EUR':2}}
{{::sale.discount}} %
{{::sale.quantity * sale.price | currency: 'EUR':2}}
@@ -123,8 +123,8 @@
Id
- Description
Quantity
+ Description
Price
Tax class
@@ -132,8 +132,8 @@
{{::service.id}}
- {{::service.description}}
{{::service.quantity}}
+ {{::service.description}}
{{::service.price}}
{{::service.taxClass.description}}