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

Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2020-05-22 15:20:55 +02:00
parent f6efa7160e
commit e9e7ae08f2
28 changed files with 90 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/claim/front/descriptor/index.html
View File

@ -2,11 +2,11 @@
module="claim"
description="$ctrl.claim.client.name">
<slot-menu>
<a class="vn-item"
ui-sref="ticket.create({clientFk: $ctrl.client.id})"
<vn-item
ng-click="$ctrl.showPickupOrder()"
translate>
Show Pickup order
</a>
</vn-item>
<vn-item
ng-click="confirmPickupOrder.show()"
translate>

4
modules/claim/front/descriptor/index.js
View File

@ -12,7 +12,7 @@ class Controller extends Descriptor {
showPickupOrder() {
this.showReport('claim-pickup-order', {
clientId: this.claim.clientFk,
recipientId: this.claim.clientFk,
claimId: this.claim.id
});
}
@ -20,7 +20,7 @@ class Controller extends Descriptor {
sendPickupOrder() {
return this.sendEmail('claim-pickup-order', {
recipient: this.claim.client.email,
clientId: this.claim.clientFk,
recipientId: this.claim.clientFk,
claimId: this.claim.id
});
}

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

@ -257,7 +257,7 @@ module.exports = Self => {
if (!instance.email) return;
const params = {
authorization: authorization,
clientId: instance.id,
recipientId: instance.id,
recipient: instance.email
};
await request.get(`${origin}/api/email/payment-update`, {

2
modules/client/front/descriptor/index.js
View File

@ -42,7 +42,7 @@ class Controller extends Descriptor {
onConsumerReportAccept() {
this.showReport('campaign-metrics', {
clientId: this.id,
recipientId: this.id,
from: this.from,
to: this.to,
});

2
modules/client/front/sample/create/index.js
View File

@ -61,7 +61,7 @@ class Controller extends Section {
send(isPreview, cb) {
const sampleType = this.$.sampleType.selection;
const params = {
clientId: this.$params.id,
recipientId: this.$params.id,
recipient: this.clientSample.recipient
};

1
modules/entry/front/descriptor/index.js
View File

@ -37,7 +37,6 @@ class Controller extends Descriptor {
showEntryReport() {
this.showReport('entry-order', {
clientId: this.vnConfig.storage.currentUserWorkerId,
entryId: this.entry.id
});
}

11
modules/route/front/descriptor/index.js
View File

@ -12,19 +12,16 @@ class Controller extends Descriptor {
showRouteReport() {
this.showReport('driver-route', {
clientId: this.vnConfig.storage.currentUserWorkerId,
routeId: this.id
});
}
sendRouteReport() {
const params = {
recipient: user.emailUser.email,
clientId: this.vnConfig.storage.currentUserWorkerId,
const workerUser = this.route.worker.user;
this.sendEmail('driver-route', {
recipient: workerUser.emailUser.email,
routeId: this.id
};
return this.$http.get(`email/driver-route`, {params})
.then(() => this.vnApp.showSuccess(this.$t('Report sent')));
});
}
updateVolume() {

4
modules/ticket/front/descriptor/index.js
View File

@ -102,15 +102,15 @@ class Controller extends Descriptor {
showDeliveryNote() {
this.showReport('delivery-note', {
clientId: this.ticket.client.id,
recipientId: this.ticket.client.id,
ticketId: this.id,
});
}
sendDeliveryNote() {
return this.sendEmail('delivery-note', {
recipientId: this.ticket.client.id,
recipient: this.ticket.client.email,
clientId: this.ticket.client.id,
ticketId: this.id
});
}

2
print/core/component.js
View File

@ -107,8 +107,6 @@ class Component {
* @return {Promise} Rendered component
*/
async render() {
const c = this.component();
console.log(c);
return renderer.renderToString(
this.component()
);

8
print/core/components/attachment/attachment.js
View File

@ -15,10 +15,10 @@ module.exports = {
const props = this.args;
let query = '';
for (let param in props) {
if (param instanceof Object) return;
if (query != '')
query += '&';
query += `${param}=${props[param]}`;
if (!(props[param] instanceof Object)) {
if (query != '') query += '&';
query += `${param}=${props[param]}`;
}
}
return query;

33
print/core/email.js
View File

@ -1,9 +1,8 @@
const path = require('path');
const smtp = require('./smtp');
const config = require('./config');
const Component = require('./component');
const Report = require('./report');
// const db = require('./database');
const config = require('./config');
if (!process.env.OPENSSL_CONF)
process.env.OPENSSL_CONF = '/etc/ssl/';
@ -20,32 +19,26 @@ class Email extends Component {
}
async getSubject() {
const lang = this.args.auth.lang;
const locale = this.locale.messages;
const userLocale = locale[lang];
const component = await this.component();
let locale = this.args.auth.locale;
if (!userLocale) {
if (this.args.recipientId)
locale = await component.getLocale(this.args.recipientId);
const messages = this.locale.messages;
const userTranslations = messages[locale];
if (!userTranslations) {
const fallbackLocale = config.i18n.fallbackLocale;
return locale[fallbackLocale].subject;
return messages[fallbackLocale].subject;
}
return userLocale.subject;
return userTranslations.subject;
}
/* async getLang() {
const clientId = this.args.clientId;
const lang = await db.findOne(`
SELECT lang FROM account.user
WHERE id = ?`, [clientId]).then(rows => {
return rows.lang;
});
this.lang = lang;
} */
async send() {
const instance = this.build();
const component = this.component();
const rendered = await this.render();
const attachments = [];
const getAttachments = async(componentPath, files) => {
@ -78,8 +71,6 @@ class Email extends Component {
if (this.attachments)
await getAttachments(this.path, this.attachments);
console.log(await component.getLang(101));
const localeSubject = await this.getSubject();
const options = {
to: this.args.recipient,

20
print/core/mixins/user-locale.js
View File

@ -4,33 +4,27 @@ const config = require('../config');
const fallbackLocale = config.i18n.fallbackLocale;
const userLocale = {
async serverPrefetch() {
/* if (this.clientId)
this.locale = await this.getLocale(this.clientId); */
if (this.auth)
this.$i18n.locale = this.auth.locale;
if (this.clientLang) {
if (this.auth)
this.$i18n.locale = this.auth.lang;
}
if (this.recipientId)
this.$i18n.locale = await this.getLocale(this.recipientId);
},
methods: {
getLang(clientId) {
getLocale(recipientId) {
return db.findOne(`
SELECT IF(u.lang IS NOT NULL, u.lang, LOWER(ct.code)) lang
FROM client c
JOIN country ct ON ct.id = c.countryFk
JOIN account.user u ON u.id = c.id
WHERE c.id = ?`, [clientId]).then(rows => {
WHERE c.id = ?`, [recipientId]).then(rows => {
if (rows)
return rows.lang;
else return fallbackLocale;
});
},
setLocale() {
this.$i18n.locale = this.auth.lang;
}
},
props: ['auth', 'clientId']
props: ['auth', 'recipientId']
};
Vue.mixin(userLocale);

2
print/core/router.js
View File

@ -40,7 +40,7 @@ module.exports = app => {
userId: auth.userId,
token: auth.id,
email: auth.email,
lang: auth.lang
locale: auth.lang
};
next();

2
print/methods/closure.js
View File

@ -29,7 +29,7 @@ module.exports = app => {
const args = {
ticketId: ticket.id,
clientId: ticket.clientFk,
recipientId: ticket.clientFk,
recipient: ticket.recipient
};
const email = new Email('delivery-note-link', args);

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

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

2
print/templates/email/campaign-metrics/campaign-metrics.js
View File

@ -10,7 +10,7 @@ module.exports = {
'email-footer': emailFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
},
from: {

4
print/templates/email/client-welcome/client-welcome.js
View File

@ -6,7 +6,7 @@ const emailFooter = new Component('email-footer');
module.exports = {
name: 'client-welcome',
async serverPrefetch() {
this.client = await this.fetchClient(this.clientId);
this.client = await this.fetchClient(this.recipientId);
},
methods: {
fetchClient(clientId) {
@ -29,7 +29,7 @@ module.exports = {
'email-footer': emailFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
}
}

4
print/templates/email/letter-debtor-nd/letter-debtor-nd.js
View File

@ -8,7 +8,7 @@ const attachments = require('./attachments.json');
module.exports = {
name: 'letter-debtor-nd',
async serverPrefetch() {
this.debtor = await this.fetchDebtor(this.clientId, this.companyId);
this.debtor = await this.fetchDebtor(this.recipientId, this.companyId);
if (!this.debtor)
throw new Error('Something went wrong');
@ -40,7 +40,7 @@ module.exports = {
authorization: {
required: true
},
clientId: {
recipientId: {
required: true
},
companyId: {

4
print/templates/email/letter-debtor-st/letter-debtor-st.js
View File

@ -8,7 +8,7 @@ const attachments = require('./attachments.json');
module.exports = {
name: 'letter-debtor-st',
async serverPrefetch() {
this.debtor = await this.fetchDebtor(this.clientId, this.companyId);
this.debtor = await this.fetchDebtor(this.recipientId, this.companyId);
if (!this.debtor)
throw new Error('Something went wrong');
@ -37,7 +37,7 @@ module.exports = {
'attachment': attachment.build()
},
props: {
clientId: {
recipientId: {
required: true
},
companyId: {

4
print/templates/email/payment-update/payment-update.js
View File

@ -6,7 +6,7 @@ const emailFooter = new Component('email-footer');
module.exports = {
name: 'payment-update',
async serverPrefetch() {
this.payMethod = await this.fetchPayMethod(this.clientId);
this.payMethod = await this.fetchPayMethod(this.recipientId);
if (!this.payMethod)
throw new Error('Something went wrong');
@ -34,7 +34,7 @@ module.exports = {
'email-footer': emailFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
}
}

36
print/templates/email/printer-setup/printer-setup.js
View File

@ -8,33 +8,27 @@ const attachments = require('./attachments.json');
module.exports = {
name: 'printer-setup',
async serverPrefetch() {
this.client = await this.fetchClient(this.clientId);
this.client = await this.fetchClient(this.recipientId);
},
data() {
return {attachments};
},
getClient() {
return this.clientId;
},
methods: {
fetchClient(clientId) {
return db.findOne(`
SELECT
c.id,
u.lang locale,
u.name AS userName,
c.email recipient,
CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
w.phone AS salesPersonPhone,
CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
FROM client c
JOIN account.user u ON u.id = c.id
LEFT JOIN worker w ON w.id = c.salesPersonFk
LEFT JOIN account.user wu ON wu.id = w.userFk
WHERE c.id = ?`, [clientId]);
},
getClient() {
return this.clientId;
SELECT
c.id,
u.lang locale,
u.name AS userName,
c.email recipient,
CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
w.phone AS salesPersonPhone,
CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
FROM client c
JOIN account.user u ON u.id = c.id
LEFT JOIN worker w ON w.id = c.salesPersonFk
LEFT JOIN account.user wu ON wu.id = w.userFk
WHERE c.id = ?`, [clientId]);
}
},
components: {
@ -43,7 +37,7 @@ module.exports = {
'attachment': attachment.build()
},
props: {
clientId: {
recipientId: {
required: true
}
}

2
print/templates/email/sepa-core/sepa-core.js
View File

@ -15,7 +15,7 @@ module.exports = {
'attachment': attachment.build()
},
props: {
clientId: {
recipientId: {
required: true
},
companyId: {

7
print/templates/reports/campaign-metrics/campaign-metrics.js
View File

@ -9,9 +9,8 @@ module.exports = {
this.to = new Date(this.to);
this.from = new Date(this.from);
this.client = await this.fetchClient(this.clientId);
this.sales = await this.fetchSales(this.clientId, this.from, this.to);
this.client = await this.fetchClient(this.recipientId);
this.sales = await this.fetchSales(this.recipientId, this.from, this.to);
if (!this.client)
throw new Error('Something went wrong');
@ -63,7 +62,7 @@ module.exports = {
'report-footer': reportFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
},
from: {

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

@ -88,10 +88,10 @@
<td>{{sale.itemFk}}</td>
<td class="number">{{sale.quantity}}</td>
<td width="50%">{{sale.concept}}</td>
<td class="number">{{sale.price | currency('EUR', locale)}}</td>
<td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered">{{(sale.discount / 100) | percentage}}</td>
<td class="centered">{{sale.vatType}}</td>
<td class="number">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', locale)}}</td>
<td class="number">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}</td>
</tr>
<tr class="description">
<td colspan="2" class="centered">
@ -125,7 +125,7 @@
<td colspan="6">
<span class="pull-right">{{$t('subtotal')}}</span>
</td>
<td class="number">{{getSubTotal() | currency('EUR', locale)}}</td>
<td class="number">{{getSubTotal() | currency('EUR', $i18n.locale)}}</td>
</tr>
</tfoot>
</table>
@ -149,13 +149,13 @@
<td>{{service.description}}</td>
<td class="number">{{service.quantity}}</td>
<td>{{service.taxDescription}}</td>
<td class="number">{{service.price | currency('EUR', locale)}}</td>
<td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="3"></td>
<td class="number">{{$t('total')}} {{serviceTotal | currency('EUR', locale)}}</td>
<td class="number">{{$t('total')}} {{serviceTotal | currency('EUR', $i18n.locale)}}</td>
</tr>
</tfoot>
</table>
@ -180,24 +180,24 @@
<tr v-for="tax in taxes">
<td width="45%">{{tax.name}}</td>
<td width="20%" class="number">
{{tax.Base | currency('EUR', locale)}}
{{tax.Base | currency('EUR', $i18n.locale)}}
</td>
<td>{{tax.vatPercent | percentage}}</td>
<td class="number">{{tax.tax | currency('EUR', locale)}}</td>
<td class="number">{{tax.tax | currency('EUR', $i18n.locale)}}</td>
</tr>
</tbody>
<tfoot>
<tr class="font bold">
<td width="45%">{{$t('subtotal')}}</td>
<td width="20%" class="number">
{{getTotalBase() | currency('EUR', locale)}}
{{getTotalBase() | currency('EUR', $i18n.locale)}}
</td>
<td></td>
<td class="number">{{getTotalTax()| currency('EUR', locale)}}</td>
<td class="number">{{getTotalTax()| currency('EUR', $i18n.locale)}}</td>
</tr>
<tr class="font bold">
<td colspan="2">{{$t('total')}}</td>
<td colspan="2" class="number">{{getTotal() | currency('EUR', locale)}}</td>
<td colspan="2" class="number">{{getTotal() | currency('EUR', $i18n.locale)}}</td>
</tr>
</tfoot>
</table>

2
print/templates/reports/driver-route/driver-route.html
View File

@ -141,7 +141,7 @@
</tr>
<tr>
<th class="font gray align-right">{{$t('import')}}</th>
<td>{{ticket.import | currency('EUR', locale)}}</td>
<td>{{ticket.import | currency('EUR', $i18n.locale)}}</td>
</tr>
</tbody>
</table>

6
print/templates/reports/entry-order/entry-order.html
View File

@ -77,8 +77,8 @@
<td class="number">{{buy.packing}}</td>
<td width="50%">{{buy.itemName}}</td>
<td width="10%" class="number">{{buy.quantity | number}}</td>
<td width="15%" class="number">{{buy.buyingValue | currency('EUR', locale)}}</td>
<td width="15%" class="number">{{buy.buyingValue * buy.quantity | currency('EUR', locale)}}</td>
<td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
<td width="15%" class="number">{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}</td>
</tr>
<tr class="description">
<td colspan="2">
@ -106,7 +106,7 @@
<td colspan="5">
<span class="pull-right">{{$t('total')}}</span>
</td>
<td class="number">{{getTotal() | currency('EUR', locale)}}</td>
<td class="number">{{getTotal() | currency('EUR', $i18n.locale)}}</td>
</tr>
</tfoot>
</table>

6
print/templates/reports/letter-debtor/letter-debtor.js
View File

@ -6,8 +6,8 @@ const reportFooter = new Component('report-footer');
module.exports = {
name: 'letter-debtor',
async serverPrefetch() {
this.client = await this.fetchClient(this.clientId);
this.sales = await this.fetchSales(this.clientId, this.companyId);
this.client = await this.fetchClient(this.recipientId);
this.sales = await this.fetchSales(this.recipientId, this.companyId);
if (!this.client)
throw new Error('Something went wrong');
@ -79,7 +79,7 @@ module.exports = {
'report-footer': reportFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
},
companyId: {

7
print/templates/reports/sepa-core/sepa-core.js
View File

@ -6,8 +6,8 @@ const reportFooter = new Component('report-footer');
const rptSepaCore = {
name: 'sepa-core',
async serverPrefetch() {
this.client = await this.fetchClient(this.clientId, this.companyId);
this.supplier = await this.fetchSupplier(this.clientId, this.companyId);
this.client = await this.fetchClient(this.recipientId, this.companyId);
this.supplier = await this.fetchSupplier(this.recipientId, this.companyId);
if (!this.client)
throw new Error('Something went wrong');
@ -67,7 +67,7 @@ const rptSepaCore = {
'report-footer': reportFooter.build()
},
props: {
clientId: {
recipientId: {
required: true
},
companyId: {
@ -76,5 +76,4 @@ const rptSepaCore = {
}
};
module.exports = rptSepaCore;