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

3888-ticket.expedition_moveExpedition #1097

Merged
vicent merged 26 commits from 3888-ticket.expedition_moveExpedition into dev 2022-11-02 13:54:11 +00:00
Conversation 1 Commits 26 Files Changed 13 +98 -81
11 changed files with 98 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1f21fdeb65 - Show all commits

5
modules/claim/back/methods/claim/claimPickupEmail.js
View File

@ -1,8 +1,9 @@
const {Report, Email, smtp} = require('vn-print');
const {Email} = require('vn-print');
module.exports = Self => {
Self.remoteMethodCtx('claimPickupEmail', {
description: 'Sends the the claim pickup order email with an attached PDF',
accessType: 'WRITE',
accepts: [
{
arg: 'id',
@ -40,7 +41,7 @@ module.exports = Self => {
}
});
Self.claimPickupEmail = async(ctx, id) => {
Self.claimPickupEmail = async ctx => {
const args = Object.assign({}, ctx.args);
const params = {
recipient: args.recipient,

48
modules/client/back/methods/client/consumptionSendQueued.js
View File

@ -18,43 +18,43 @@ module.exports = Self => {
Self.consumptionSendQueued = async() => {
const queues = await Self.rawSql(`
SELECT
ccq.id,
id,
params
FROM clientConsumptionQueue
WHERE status = ''`);
for (const queue of queues) {
try {
const params = JSON.parse(queue.params);
const clients = await Self.rawSql(`
SELECT
c.id AS clientFk,
c.email AS clientEmail,
eu.email salesPersonEmail,
REPLACE(json_extract(params, '$.from'), '"', '') AS fromDate,
REPLACE(json_extract(params, '$.to'), '"', '') AS toDate
FROM clientConsumptionQueue ccq
JOIN client c ON (
JSON_SEARCH(
JSON_ARRAY(
json_extract(params, '$.clients')
)
, 'all', c.id) IS NOT NULL)
eu.email salesPersonEmail
FROM client c
JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
JOIN ticket t ON t.clientFk = c.id
JOIN sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
JOIN itemType it ON it.id = i.typeFk
WHERE status = ''
WHERE c.id IN(?)
AND it.isPackaging = FALSE
AND DATE(t.shipped) BETWEEN
REPLACE(json_extract(params, '$.from'), '"', '') AND
REPLACE(json_extract(params, '$.to'), '"', '')
GROUP BY c.id`);
AND DATE(t.shipped) BETWEEN ? AND ?
GROUP BY c.id`, [params.clients, params.from, params.to]);
for (const queue of queues) {
try {
for (const client of clients) {
const args = {
id: queue.clientFk,
recipient: queue.clientEmail,
replyTo: queue.salesPersonEmail,
from: queue.fromDate,
to: queue.toDate
id: client.clientFk,
recipient: client.clientEmail,
replyTo: client.salesPersonEmail,
from: params.from,
to: params.to
};
const email = new Email('campaign-metrics', args);
await email.send();
}
await Self.rawSql(`
UPDATE clientConsumptionQueue
@ -69,7 +69,7 @@ module.exports = Self => {
WHERE id = ?`,
[error.message, queue.id]);
throw e;
throw error;
}
}

5
modules/client/front/notification/index.js
View File

@ -77,15 +77,16 @@ export default class Controller extends Section {
onSendClientConsumption() {
const clientIds = this.checked.map(client => client.id);
const params = {
const data = {
clients: clientIds,
from: this.campaign.from,
to: this.campaign.to
};
const params = JSON.stringify(data);
this.$http.post('ClientConsumptionQueues', {params})
.then(() => this.$.filters.hide())
.then(() => this.vnApp.showSuccess(this.$t('Notifications sent!')));
.then(() => this.vnApp.showSuccess(this.$t('Notification sent!')));
}
exprBuilder(param, value) {

5
modules/client/front/notification/index.spec.js
View File

@ -69,15 +69,16 @@ describe('Client notification', () => {
data[0].$checked = true;
data[1].$checked = true;
const params = Object.assign({
const args = Object.assign({
clients: [1101, 1102]
}, controller.campaign);
const params = JSON.stringify(args);
$httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params);
controller.onSendClientConsumption();
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notifications sent!');
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notification sent!');
});
});

2
modules/item/front/diary/index.js
View File

@ -27,7 +27,7 @@ class Controller extends Section {
if (this.$params.warehouseFk)
this.warehouseFk = this.$params.warehouseFk;
else if (value)
this.warehouseFk = value.itemType.warehouseFk;
this.warehouseFk = this.vnConfig.warehouseFk;
if (this.$params.lineFk)
this.lineFk = this.$params.lineFk;

1
modules/route/back/methods/route/driverRouteEmail.js
View File

@ -3,6 +3,7 @@ const {Email} = require('vn-print');
module.exports = Self => {
Self.remoteMethodCtx('driverRouteEmail', {
description: 'Sends the driver route email with an attached PDF',
accessType: 'WRITE',
accepts: [
{
arg: 'id',

2
modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
View File

@ -29,7 +29,7 @@ module.exports = Self => {
Object.assign(myOptions, options);
const query =
`SELECT DISTINCT u.nickname
`SELECT DISTINCT u.id, u.nickname
FROM itemType it
JOIN worker w ON w.id = it.workerFk
JOIN account.user u ON u.id = w.id`;

1
modules/ticket/back/methods/ticket/closeAll.js
View File

@ -18,6 +18,7 @@ module.exports = Self => {
Self.closeAll = async() => {
const toDate = new Date();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
const todayMinDate = new Date();

40
modules/travel/front/extra-community/index.html
View File

@ -42,10 +42,10 @@
<th field="id" shrink>
<span translate>Id</span>
</th>
<th field="cargoSupplierFk" expand>
<th field="cargoSupplierFk">
<span translate>Supplier</span>
</th>
<th field="agencyModeFk" expand>
<th field="agencyModeFk">
<span translate>Agency</span>
</th>
<th field="ref">
@ -100,37 +100,37 @@
{{::travel.id}}
</span>
</td>
<td expand vn-click-stop>
<td class="multi-line" vn-click-stop>
<span
class="link"
ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)">
{{::travel.cargoSupplierNickname}}
</span>
</td>
<td expand>{{::travel.agencyModeName}}</td>
<td
name="reference"
expand
vn-click-stop>
<vn-textfield
class="dense td-editable"
<td>{{::travel.agencyModeName}}</td>
<td vn-click-stop>
<vn-td-editable name="reference" expand>
<text>{{travel.ref}}</text>
<field>
<vn-textfield class="dense" vn-focus
ng-model="travel.ref"
on-change="$ctrl.save(travel.id, {ref: value})">
</vn-textfield>
</vn-icon>
</field>
</vn-td-editable>
</td>
<td number>{{::travel.stickers}}</td>
<td
name="lockedKg"
expand
vn-click-stop>
<vn-input-number
number
class="td-editable number"
<td vn-click-stop>
<vn-td-editable name="lockedKg" expand style="text-align: right">
<text number>{{travel.kg}}</text>
<field>
<vn-input-number class="dense" vn-focus
ng-model="travel.kg"
on-change="$ctrl.save(travel.id, {kg: value})"
min="0">
</vn-input-number>
</field>
</vn-td-editable>
</td>
<td number>{{::travel.loadedKg}}</td>
<td number>{{::travel.volumeKg}}</td>
@ -150,7 +150,7 @@
{{::entry.id}}
</span>
</td>
<td>
<td class="multi-line">
<span
class="link"
ng-click="supplierDescriptor.show($event, entry.supplierFk)">
@ -158,7 +158,7 @@
</span>
</td>
<td></td>
<td expand>{{::entry.ref}}</td>
<td class="td-editable">{{::entry.ref}}</td>
<td number>{{::entry.stickers}}</td>
<td number></td>
<td number>{{::entry.loadedkg}}</td>

23
modules/travel/front/extra-community/style.scss
View File

@ -3,7 +3,6 @@
vn-travel-extra-community {
.header {
margin-bottom: 16px;
font-size: 1.25rem;
line-height: 1;
padding: 7px;
padding-bottom: 7px;
@ -16,6 +15,10 @@ vn-travel-extra-community {
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
.multi-line{
padding-top: 15px;
padding-bottom: 15px;
}
}
table[vn-droppable] {
@ -46,13 +49,19 @@ vn-travel-extra-community {
font-weight: bold;
}
.td-editable{
input{
font-size: 1.25rem!important;
}
.multi-line{
max-width: 200px;
word-wrap: normal;
white-space: normal;
}
.number *{
text-align: right;
vn-td-editable text {
background-color: transparent;
padding: 0;
border: 0;
border-bottom: 1px dashed $color-active;
border-radius: 0;
color: $color-active
}
}

3
modules/zone/back/methods/zone/getLeaves.js
View File

@ -59,6 +59,9 @@ module.exports = Self => {
}
const leaves = map.get(parentId);
const maxNodes = 250;
if (res.length <= maxNodes)
setLeaves(leaves);
return leaves || [];