verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-11-14 15:24:08 +01:00
parent a47dd521a4
commit 4f5c1404d7
3 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/selectors.js
View File

@ -472,7 +472,7 @@ export default {
zoneAutocomplete: 'vn-autocomplete[ng-model="$ctrl.zoneId"]', zoneAutocomplete: 'vn-autocomplete[ng-model="$ctrl.zoneId"]',
nextStepButton: 'vn-step-control .buttons > section:last-child vn-button', nextStepButton: 'vn-step-control .buttons > section:last-child vn-button',
finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]', finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]',
stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two > form > vn-card > vn-horizontal > table > tfoot > tr > td:nth-child(4)', stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two vn-tfoot > vn-tr > :nth-child(6)',
chargesReasonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.option"]', chargesReasonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.option"]',
}, },
ticketComponents: { ticketComponents: {

26
modules/ticket/front/basic-data/index.html
View File

@ -1,14 +1,12 @@
<div class="vn-w-md"> <vn-button-bar>
<vn-button-bar> <vn-step-control
<vn-step-control step-count="10"
step-count="10" steps="[
steps="[ {name: 'Basic data', state: 'ticket.card.basicData.stepOne'},
{name: 'Basic data', state: 'ticket.card.basicData.stepOne'}, {name: 'Price difference', state: 'ticket.card.basicData.stepTwo'},
{name: 'Price difference', state: 'ticket.card.basicData.stepTwo'}, {name: 'Charge', state: 'ticket.card.basicData.stepThree'}]"
{name: 'Charge', state: 'ticket.card.basicData.stepThree'}]" on-step-change="$ctrl.onStepChange(state)"
on-step-change="$ctrl.onStepChange(state)" on-step-end="$ctrl.onSubmit()">
on-step-end="$ctrl.onSubmit()"> </vn-step-control>
</vn-step-control> </vn-button-bar>
</vn-button-bar> <ui-view></ui-view>
<ui-view></ui-view>
</div>

80
modules/ticket/front/basic-data/step-two/index.html
View File

@ -1,40 +1,40 @@
<form name="form"> <vn-card class="vn-w-lg">
<vn-card class="vn-w-lg vn-pa-lg"> <vn-table>
<vn-table> <vn-thead>
<vn-thead> <vn-tr>
<vn-tr> <vn-th number>Item</vn-th>
<vn-th number>Item</vn-th> <vn-th style="text-align:center">Description</vn-th>
<vn-th style="text-align:center">Description</vn-th> <vn-th number>Quantity</vn-th>
<vn-th number>Quantity</vn-th> <vn-th number>Price (PPU)</vn-th>
<vn-th number>Price (PPU)</vn-th> <vn-th number>New price (PPU)</vn-th>
<vn-th number>New price (PPU)</vn-th> <vn-th number>Price difference</vn-th>
<vn-th number>Price difference</vn-th> </vn-tr>
</vn-tr> </vn-thead>
</vn-thead> <vn-tbody>
<vn-tbody> <vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
<vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id"> <vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td>
<vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td> <vn-td expand>
<vn-td expand> <vn-fetched-tags
<vn-fetched-tags max-length="6"
max-length="6" item="::sale.item"
item="::sale.item" name="::sale.concept">
name="::sale.concept"> </vn-fetched-tags>
</vn-fetched-tags> </vn-td>
</vn-td> <vn-td number>{{::sale.quantity}}</vn-td>
<vn-td number>{{::sale.quantity}}</vn-td> <vn-td number>{{::sale.price | currency: 'EUR': 2}}</vn-td>
<vn-td number>{{::sale.price | currency: 'EUR': 2}}</vn-td> <vn-td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</vn-td>
<vn-td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</vn-td> <vn-td number>{{::sale.component.difference | currency: 'EUR': 2}}</vn-td>
<vn-td number>{{::sale.component.difference | currency: 'EUR': 2}}</vn-td> </vn-tr>
</vn-tr> </vn-tbody>
</vn-tbody> <vn-tfoot>
<vn-tfoot> <vn-tr>
<vn-tr> <vn-td></vn-td>
<vn-td colspan="3"></vn-td> <vn-td></vn-td>
<vn-td number><strong>{{$ctrl.totalPrice | currency: 'EUR': 2}}</strong></vn-td> <vn-td></vn-td>
<vn-td number><strong>{{$ctrl.totalNewPrice | currency: 'EUR': 2}}</strong></vn-td> <vn-td number><strong>{{$ctrl.totalPrice | currency: 'EUR': 2}}</strong></vn-td>
<vn-td number><strong>{{$ctrl.totalPriceDifference | currency: 'EUR': 2}}</strong></vn-td> <vn-td number><strong>{{$ctrl.totalNewPrice | currency: 'EUR': 2}}</strong></vn-td>
</vn-tr> <vn-td number><strong>{{$ctrl.totalPriceDifference | currency: 'EUR': 2}}</strong></vn-td>
</vn-tfoot> </vn-tr>
</vn-table> </vn-tfoot>
</vn-card> </vn-table>
</form> </vn-card>