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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2010-worker_phone_refactor
gitea/salix/2010-worker_phone_refactor This commit looks good Details

This commit is contained in:
Bernat Exposito Domenech 2020-01-20 11:03:56 +01:00
parent 0fe0596b3e 0355d9bc27
commit 1898337d08
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
print/core/filters/date.js
View File

@ -1,6 +1,6 @@
const Vue = require('vue'); const Vue = require('vue');
const strftime = require('strftime'); const strftime = require('strftime');
Vue.filter('date', function(value, specifiers) { Vue.filter('date', function(value, specifiers = '%d-%m-%Y') {
return strftime(specifiers, value); return strftime(specifiers, value);
}); });

2
print/templates/email/buyer-week-waste/buyer-week-waste.html
View File

@ -43,7 +43,7 @@
<tbody> <tbody>
<tr v-for="waste in wastes" v-bind:key="waste.buyer"> <tr v-for="waste in wastes" v-bind:key="waste.buyer">
<td class="font gray">{{waste.buyer}}</td> <td class="font gray">{{waste.buyer}}</td>
<td class="number">{{(waste.percentage / 100) | percentage(4, 4, locale)}}</td> <td class="number">{{(waste.percentage / 100) | percentage(2, 2, locale)}}</td>
<td class="number">{{waste.dwindle | currency('EUR', locale)}}</td> <td class="number">{{waste.dwindle | currency('EUR', locale)}}</td>
<td class="number">{{waste.total | currency('EUR', locale)}}</td> <td class="number">{{waste.total | currency('EUR', locale)}}</td>
</tr> </tr>

2
print/templates/email/buyer-week-waste/locale/es.yml
View File

@ -4,6 +4,6 @@ dear: Hola
description: A continuación se muestra la merma semanal a fecha de <strong>{0}</strong>. description: A continuación se muestra la merma semanal a fecha de <strong>{0}</strong>.
buyer: Comprador buyer: Comprador
percentage: Porcentaje percentage: Porcentaje
weakening: Mermas dwindle: Merma
total: Total total: Total
wasteDetailLink: 'Para ver el desglose de mermas haz clic en el siguiente enlace:' wasteDetailLink: 'Para ver el desglose de mermas haz clic en el siguiente enlace:'

2
print/templates/reports/delivery-note/delivery-note.html
View File

@ -231,7 +231,7 @@
<div class="header">{{$t('digitalSignature')}}</div> <div class="header">{{$t('digitalSignature')}}</div>
<div class="body centered"> <div class="body centered">
<img v-bind:src="dmsPath"/> <img v-bind:src="dmsPath"/>
<div>{{signature.created | date}}</div> <div>{{signature.created | date('%d-%m-%Y')}}</div>
</div> </div>
</div> </div>
</div> </div>