From 403f25a408926bfc9927e0af261b77a538072877 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Mon, 10 Dec 2018 15:34:48 +0100
Subject: [PATCH] =?UTF-8?q?#889=20Registro=20de=20pagos=20web=20m=C3=A1s?=
 =?UTF-8?q?=20intuitivo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/client/src/web-payment/index.html    | 32 ++++++++++++---------
 client/client/src/web-payment/index.js      |  1 +
 client/client/src/web-payment/locale/es.yml |  4 ++-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/client/client/src/web-payment/index.html b/client/client/src/web-payment/index.html
index fcebb3df0..bc3d81c7a 100644
--- a/client/client/src/web-payment/index.html
+++ b/client/client/src/web-payment/index.html
@@ -13,18 +13,33 @@
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
-                        <vn-th></vn-th>
+                        <vn-th>State</vn-th>
                         <vn-th field="id">Id</vn-th>
                         <vn-th field="amount" number>Amount</vn-th>
                         <vn-th field="created" default-order="DESC">Payed</vn-th>
-                        <vn-th></vn-th>
+                        <vn-th>Confirm</vn-th>
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="transaction in transactions">
+                        <vn-td style="width: 3em; text-align: center">
+                                <vn-icon
+                                vn-tooltip="{{$ctrl.getFormattedMessage(transaction)}}"
+                                ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)" 
+                                icon="clear">
+                            </vn-icon>
+                            <vn-icon
+                                vn-tooltip="Confirmed"
+                                ng-show="::(transaction.isConfirmed)" 
+                                icon="check">
+                            </vn-icon>
+                        </vn-td>
+                        <vn-td>{{::transaction.id}}</vn-td>
+                        <vn-td number>{{::transaction.amount | currency: '€':2}}</vn-td>
+                        <vn-td>{{::transaction.created | dateTime:'dd/MM/yyyy'}}</vn-td>
                         <vn-td style="width: 3em; text-align: center">
                             <vn-icon-button
-                                icon="check"
+                                icon="done_all"
                                 vn-acl="administrative"
                                 vn-acl-action="remove"
                                 vn-tooltip="Confirm transaction"
@@ -32,17 +47,6 @@
                                 ng-click="$ctrl.confirm(transaction)">
                             </vn-icon-button>
                         </vn-td>
-                        <vn-td>{{::transaction.id}}</vn-td>
-                        <vn-td number>{{::transaction.amount | currency: '€':2}}</vn-td>
-                        <vn-td>{{::transaction.created | dateTime:'dd/MM/yyyy'}}</vn-td>
-                        <vn-td  style="width: 1px">
-
-                            <vn-icon orange
-                                vn-tooltip="{{$ctrl.getFormattedMessage(transaction)}}"
-                                ng-show="::(transaction.errorMessage || transaction.responseMessage)" 
-                                icon="warning">
-                            </vn-icon>
-                        </vn-td>
                     </vn-tr>
                 </vn-tbody>
                 <vn-empty-rows ng-if="model.data.length === 0" translate>
diff --git a/client/client/src/web-payment/index.js b/client/client/src/web-payment/index.js
index 54ba6534b..0ec1a6858 100644
--- a/client/client/src/web-payment/index.js
+++ b/client/client/src/web-payment/index.js
@@ -1,4 +1,5 @@
 import ngModule from '../module';
+import './style.scss';
 
 class Controller {
     constructor($scope, $http, $stateParams) {
diff --git a/client/client/src/web-payment/locale/es.yml b/client/client/src/web-payment/locale/es.yml
index 656bfd32d..099ca359c 100644
--- a/client/client/src/web-payment/locale/es.yml
+++ b/client/client/src/web-payment/locale/es.yml
@@ -1,4 +1,6 @@
 Web Payment: Pago Web
 Confirmed: Confirmado
 Payed: Pagado
-Confirm transaction: Confirmar transacción
\ No newline at end of file
+Confirm transaction: Confirmar transacción
+Confirm: Confirmar
+State: Estado
\ No newline at end of file