verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 50 Releases Wiki Activity

5241-virtual_pos #1399

Merged
joan merged 5 commits from 5241-virtual_pos into dev 2023-03-21 09:36:00 +00:00
Conversation 0 Commits 5 Files Changed 7 +36 -52
3 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3881e435f4 - Show all commits

0
modules/client/back/methods/client/getTransactions.js → modules/client/back/methods/client/transactions.js
View File

2
modules/client/back/models/client-methods.js
View File

@ -13,7 +13,7 @@ module.exports = Self => {
require('../methods/client/getCard')(Self); require('../methods/client/getCard')(Self);
require('../methods/client/getDebt')(Self); require('../methods/client/getDebt')(Self);
require('../methods/client/getMana')(Self); require('../methods/client/getMana')(Self);
require('../methods/client/getTransactions')(Self); require('../methods/client/transactions')(Self);
require('../methods/client/hasCustomerRole')(Self); require('../methods/client/hasCustomerRole')(Self);
require('../methods/client/isValidClient')(Self); require('../methods/client/isValidClient')(Self);
require('../methods/client/lastActiveTickets')(Self); require('../methods/client/lastActiveTickets')(Self);

86
modules/client/front/web-payment/index.html
View File

@ -1,55 +1,39 @@
<vn-crud-model <vn-crud-model vn-id="model" url="clients/transactions" link="{clientFk: $ctrl.$params.id}" limit="20"
vn-id="model" data="transactions" order="created DESC" auto-load="true">
url="clients/getTransactions"
link="{clientFk: $ctrl.$params.id}"
limit="20"
data="transactions"
order="created DESC"
auto-load="true">
</vn-crud-model> </vn-crud-model>
<vn-data-viewer <vn-data-viewer model="model" class="vn-w-md">
model="model"
class="vn-w-md">
<vn-card> <vn-card>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th shrink>State</vn-th> <vn-th shrink>State</vn-th>
<vn-th field="id" number>Id</vn-th> <vn-th field="id" number>Id</vn-th>
<vn-th field="created" expand>Date</vn-th> <vn-th field="created" expand>Date</vn-th>
<vn-th field="amount" number>Amount</vn-th> <vn-th field="amount" number>Amount</vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="transaction in transactions"> <vn-tr ng-repeat="transaction in transactions">
<vn-td shrink> <vn-td shrink>
<vn-icon <vn-icon vn-tooltip="{{::$ctrl.getFormattedMessage(transaction)}}"
vn-tooltip="{{::$ctrl.getFormattedMessage(transaction)}}" ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)"
ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)" icon="clear">
icon="clear"> </vn-icon>
</vn-icon> <vn-icon vn-tooltip="Confirmed" ng-show="::(transaction.isConfirmed)" icon="check">
<vn-icon </vn-icon>
vn-tooltip="Confirmed" </vn-td>
ng-show="::(transaction.isConfirmed)" <vn-td number>{{::transaction.id}}</vn-td>
icon="check"> <vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
</vn-icon> <vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td>
</vn-td> <vn-td shrink>
<vn-td number>{{::transaction.id}}</vn-td> <vn-icon-button icon="done_all" vn-acl="administrative" vn-acl-action="remove"
<vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td> translate-attr="{title: 'Confirm transaction'}" ng-show="::!transaction.isConfirmed"
<vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td> ng-click="$ctrl.confirm(transaction)">
<vn-td shrink> </vn-icon-button>
<vn-icon-button </vn-td>
icon="done_all" </vn-tr>
vn-acl="administrative" </vn-tbody>
vn-acl-action="remove" </vn-table>
translate-attr="{title: 'Confirm transaction'}"
ng-show="::!transaction.isConfirmed"
ng-click="$ctrl.confirm(transaction)">
</vn-icon-button>
</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>
</vn-card> </vn-card>
</vn-data-viewer> </vn-data-viewer>