Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones

This commit is contained in:
Carlos Jimenez Ruiz 2020-03-09 15:01:36 +01:00
commit e111b9a2b5
2 changed files with 6 additions and 21 deletions

View File

@ -1,24 +1,8 @@
<a ng-if="$ctrl.links.btnOne" <a ng-repeat="button in $ctrl.links"
vn-tooltip="{{::$ctrl.links.btnOne.tooltip}}" vn-tooltip="{{::button.tooltip}}"
class="vn-button colored" class="vn-button colored"
ui-sref="{{::$ctrl.links.btnOne.state}}"> ui-sref="{{::button.state}}">
<vn-icon <vn-icon
icon="{{::$ctrl.links.btnOne.icon}}"> icon="{{::button.icon}}">
</vn-icon>
</a>
<a ng-if="$ctrl.links.btnTwo"
vn-tooltip="{{::$ctrl.links.btnTwo.tooltip}}"
class="vn-button colored"
ui-sref="{{::$ctrl.links.btnTwo.state}}">
<vn-icon
icon="{{::$ctrl.links.btnTwo.icon}}">
</vn-icon>
</a>
<a ng-if="$ctrl.links.btnThree"
vn-tooltip="{{::$ctrl.links.btnThree.tooltip}}"
class="vn-button colored"
ui-sref="{{::$ctrl.links.btnThree.state}}">
<vn-icon
icon="{{::$ctrl.links.btnThree.icon}}">
</vn-icon> </vn-icon>
</a> </a>

View File

@ -1,4 +1,5 @@
Price (PPU): Precio (Ud.) Price (PPU): Precio (Ud.)
New (PPU): Nuevo (Ud.) New (PPU): Nuevo (Ud.)
Difference: Diferencia Difference: Diferencia
Charge difference to: Cargar diferencia a Charge difference to: Cargar diferencia a
The ticket has been unrouted: El ticket ha sido desenrutado