shrink-datetime

db/dump/fixtures.sql

@@ -214,11 +214,12 @@ UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
 INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `ibanRequired`)
     VALUES 
-        (1, NULL,           'PayMethod one',            0,  001, 0),
+        (1, NULL,           'PayMethod one',            0,  001,    0),
-        (2, NULL,           'PayMethod two',            10, 001, 0),
+        (2, NULL,           'PayMethod two',            10, 001,    0),
-        (3, 'compensation', 'PayMethod three',          0,  001, 0),
+        (3, 'compensation', 'PayMethod three',          0,  001,    0),
-        (4, NULL,           'PayMethod with IBAN',      0,  001, 1),
+        (4, NULL,           'PayMethod with IBAN',      0,  001,    1),
-        (5, NULL,           'PayMethod five',           10, 001, 0);
+        (5, NULL,           'PayMethod five',           10, 001,    0),
+        (8,'wireTransfer',  'WireTransfer',             5,  001,    1);
 
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
     VALUES 

front/salix/components/log/index.html

@@ -8,7 +8,7 @@
                 <vn-tr>
                     <vn-th field="creationDate">Date</vn-th>
                     <vn-th field="userFk" class="expendable" shrink>Author</vn-th>
-                    <vn-th field="changedModel" class="expendable" shrink>Model</vn-th>
+                    <vn-th field="changedModel" class="expendable">Model</vn-th>
                     <vn-th field="action" class="expendable" shrink>Action</vn-th>
                     <vn-th field="changedModelValue" class="expendable">Name</vn-th>
                     <vn-th expand>Before</vn-th>
@@ -17,7 +17,7 @@
             </vn-thead>
             <vn-tbody>
                 <vn-tr ng-repeat="log in $ctrl.logs">
-                    <vn-td expand>
+                    <vn-td shrink-datetime>
                         {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
                         <div class="changes">
                             <div>

modules/client/back/models/pay-method.json

@@ -12,6 +12,9 @@
             "id": true,
             "description": "Identifier"
         },
+        "code": {
+            "type": "string"
+        },
         "name": {
             "type": "string",
             "required": true

modules/client/front/balance/index/index.html

@@ -47,7 +47,7 @@
             <vn-thead>
                 <vn-tr>
                     <vn-th expand>Date</vn-th>
-                    <vn-th expand>Creation date</vn-th>
+                    <vn-th>Creation date</vn-th>
                     <vn-th>Employee</vn-th>
                     <vn-th>Reference</vn-th>
                     <vn-th number>Bank</vn-th>
@@ -65,7 +65,7 @@
                             {{::balance.payed | date:'dd/MM/yyyy'}}
                         </span>
                     </vn-td>
-                    <vn-td expand>
+                    <vn-td shrink-datetime>
                         <span title="{{::balance.created | date:'dd/MM/yyyy HH:mm'}}">
                             {{::balance.created | date:'dd/MM/yyyy HH:mm'}}
                         </span>

modules/client/front/credit/index/index.html

@@ -22,7 +22,7 @@
         </vn-thead>
         <vn-tbody>
             <vn-tr ng-repeat="credit in credits track by credit.id">
-                <vn-td>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td shrink-datetime>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td>
                     <span 
                         ng-click="workerDescriptor.show($event, credit.worker.userFk)"

modules/client/front/dms/index/index.html

@@ -22,8 +22,8 @@
                 <vn-th expand>Description</vn-th>
                 <vn-th field="hasFile" shrink>Original</vn-th>
                 <vn-th shrink>File</vn-th>
-                <vn-th shrink>Employee</vn-th>
+                <vn-th>Employee</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
+                <vn-th field="created">Created</vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
@@ -70,7 +70,7 @@
                         ng-click="workerDescriptor.show($event, document.dms.workerFk)">
                         {{::document.dms.worker.user.name | dashIfEmpty}}
                     </span></vn-td>
-                <vn-td expand>
+                <vn-td shrink-datetime>
                     {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>

modules/client/front/greuge/index/index.html

@@ -36,7 +36,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="greuge in greuges">
-                        <vn-td expand>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-td>
+                        <vn-td shrink-datetime>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-td>
                         <vn-td>
                             <span title="{{::greuge.description}}">{{::greuge.description}}</span>
                         </vn-td>

modules/client/front/mandate/index.html

@@ -18,8 +18,8 @@
                 <vn-th field="id" number>Id</vn-th>
                 <vn-th field="companyFk">Company</vn-th>
                 <vn-th field="mandateTypeFk">Type</vn-th>
-                <vn-th field="created" expand>Register date</vn-th>
+                <vn-th field="created">Register date</vn-th>
-                <vn-th field="finished" expand>End date</vn-th>
+                <vn-th field="finished">End date</vn-th>
             </vn-tr>
         </vn-thead>
         <vn-tbody>
@@ -27,8 +27,8 @@
                 <vn-td number>{{::mandate.id}}</vn-td>
                 <vn-td>{{::mandate.company.code}}</vn-td>
                 <vn-td>{{::mandate.mandateType.name}}</vn-td>
-                <vn-td expand>{{::mandate.created | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}}</vn-td>
+                <vn-td shrink-datetime>{{::mandate.created | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}}</vn-td>
-                <vn-td expand>{{::mandate.finished | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}}</vn-td>
+                <vn-td shrink-datetime>{{::mandate.finished | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>

modules/client/front/sample/index/index.html

@@ -23,8 +23,8 @@
             </vn-thead>
             <vn-tbody>
                 <vn-tr ng-repeat="sample in samples">
-                    <vn-td>{{::sample.created | date:'dd/MM/yyyy HH:mm' }}</vn-td>
+                    <vn-td shrink-datetime>{{::sample.created | date:'dd/MM/yyyy HH:mm' }}</vn-td>
-                    <vn-td 
+                    <vn-td expand
                         title="{{::sample.type.description}}">
                         {{::sample.type.description}}
                     </vn-td>

modules/client/front/web-payment/index.html

@@ -36,7 +36,7 @@
                     </vn-icon>
                 </vn-td>
                 <vn-td number>{{::transaction.id}}</vn-td>
-                <vn-td expand>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td>
                 <vn-td shrink>
                     <vn-icon-button

modules/item/front/last-entries/index.html

@@ -25,7 +25,7 @@
                     <vn-tr>
                         <vn-th vn-tooltip="Ignored" center>Ig</vn-th>
                         <vn-th field="warehouseFk">Warehouse</vn-th>
-                        <vn-th field="landed" expand>Landed</vn-th>
+                        <vn-th field="landed">Landed</vn-th>
                         <vn-th number>Entry</vn-th>
                         <vn-th number vn-tooltip="Price Per Unit">P.P.U</vn-th>
                         <vn-th number vn-tooltip="Price Per Package">P.P.P</vn-th>
@@ -49,7 +49,7 @@
                             </vn-check>
                         </vn-td>
                         <vn-td title="{{::entry.warehouse| dashIfEmpty}}">{{::entry.warehouse| dashIfEmpty}}</vn-td>
-                        <vn-td expand>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <vn-td shrink-datetime>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                         <vn-td shrink>
                             <span
                                 vn-click-stop="entryDescriptor.show($event, entry.entryFk)"

modules/supplier/front/account/index.html

@@ -16,9 +16,11 @@
     <vn-card class="vn-pa-lg">
         <vn-horizontal ng-repeat="supplierAccount in $ctrl.supplierAccounts">
             <vn-textfield vn-three
+            vn-id="iban"
             ng-show="supplierAccount.iban || supplierAccount.iban == undefined"
             label="Iban"
             ng-model="supplierAccount.iban"
+            on-change="supplierAccount.bankEntityFk = supplierAccount.iban.slice(4,8)"
             rule>
             </vn-textfield>
             <vn-autocomplete vn-three
@@ -32,7 +34,8 @@
                 <vn-icon-button
                     icon="add_circle"
                     vn-tooltip="New bank entity"
-                    ng-click="$ctrl.showBankEntity($event, $index)">
+                    ng-click="$ctrl.showBankEntity($event, $index)"
+                    tabindex="-1">
                 </vn-icon-button>
             </append>
             <vn-textfield vn-three
@@ -70,3 +73,10 @@
     vn-id="bankEntity"
     on-response="$ctrl.onResponse($response)">
 </vn-new-bank-entity>
+
+<vn-confirm 
+    class="edit"
+    vn-id="payMethodToTransfer"
+    on-accept="$ctrl.onAddSave()"
+    message="Do you want to change the pay method to wire transfer?">
+</vn-confirm>

modules/supplier/front/account/index.js

@@ -10,6 +10,14 @@ class Controller extends Section {
                 fields: ['countryFk', 'id', 'name', 'bic']
             }
         };
+        const filter = {
+            where: {code: 'wireTransfer'}
+        };
+
+        this.$http.get(`payMethods/findOne`, {filter})
+            .then(res => {
+                this.wireTransferFk = res.data.id;
+            });
     }
 
     add() {
@@ -37,9 +45,22 @@ class Controller extends Section {
             .then(res => this.supplierAccount.bankEntityFk = res.data.id);
     }
 
+    onAddSave() {
+        const values = {
+            id: this.$params.id,
+            payMethodFk: this.wireTransferFk
+        };
+        const query = `Suppliers/${this.$params.id}`;
+        return this.$http.patch(query, values)
+            .then(this.$.watcher.notifySaved());
+    }
+
     onSubmit() {
         this.$.watcher.check();
         this.$.model.save().then(() => {
+            if (this.supplier.payMethodFk != this.wireTransferFk)
+                this.$.payMethodToTransfer.show();
+
             this.$.watcher.notifySaved();
             this.$.watcher.updateOriginalData();
             this.card.reload();

modules/supplier/front/account/locale/es.yml

@@ -3,3 +3,4 @@ swift: Swift BIC
 Add account: Añadir cuenta
 Beneficiary: Beneficiario
 Beneficiary information: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor
+Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?

modules/ticket/front/dms/index/index.html

@@ -21,7 +21,7 @@
                 <vn-th field="hasFile" shrink>Original</vn-th>
                 <vn-th shrink>File</vn-th>
                 <vn-th shrink>Employee</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
+                <vn-th field="created">Created</vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
@@ -69,7 +69,7 @@
                         {{::document.dms.worker.user.name | dashIfEmpty}}
                     </span>
                 </vn-td>
-                <vn-td expand>
+                <vn-td shrink-datetime>
                     {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>

modules/ticket/front/tracking/index/index.html

@@ -28,7 +28,7 @@
                         {{::tracking.worker.user.name || 'System' | translate}}
                     </span>
                 </vn-td>
-                <vn-td>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td shrink-datetime>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>

modules/worker/front/dms/index/index.html

@@ -20,7 +20,7 @@
                 <vn-th expand>Description</vn-th>
                 <vn-th field="hasFile" shrink>Original</vn-th>
                 <vn-th shrink>File</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
+                <vn-th field="created">Created</vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
                 <vn-th shrink></vn-th>
@@ -57,7 +57,7 @@
                         {{::document.file}}
                     </span>
                 </vn-td>
-                <vn-td expand>
+                <vn-td shrink-datetime>
                     {{::document.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>