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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-08-02 14:04:56 +02:00
parent 8b7d2062c5 2105ccb92b
commit 8a9f69753a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/core/src/components/button/button.html
View File

@ -1,4 +1,4 @@
<button type="{{::$ctrl.type}}" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
<button type="{{::$ctrl.type}}" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored" ng-click="$ctrl.onClick()">
<span translate>{{$ctrl.label}}</span>
<vn-icon
icon="{{::$ctrl.icon}}"

3
client/core/src/components/button/button.js
View File

@ -16,7 +16,8 @@ ngModule.component('vnButton', {
bindings: {
label: '@?',
disabled: '<?',
icon: '@?'
icon: '@?',
onClick: '&'
}
});

6
client/ticket/src/sale/index.html
View File

@ -13,7 +13,7 @@
<vn-button
disabled="!$ctrl.isEditable"
label="Ok"
ng-click="$ctrl.onStateOkClick()">
on-click="$ctrl.onStateOkClick()">
</vn-button>
<vn-icon-menu
disabled="!$ctrl.isEditable"
@ -32,14 +32,14 @@
</vn-icon-menu>
<vn-button
disabled="!$ctrl.isChecked || !$ctrl.isEditable"
ng-click="$ctrl.showRemoveLinesDialog()"
on-click="$ctrl.showRemoveLinesDialog()"
vn-tooltip="Remove lines"
tooltip-position="up"
icon="delete">
</vn-button>
<vn-button
disabled="!$ctrl.isChecked || !$ctrl.isEditable"
ng-click="$ctrl.showTransferPopover($event);"
on-click="$ctrl.showTransferPopover($event);"
vn-tooltip="Transfer lines"
tooltip-position="right"
icon="call_split">