Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
gitea/salix/pipeline/head This commit is unstable
Details
This commit is contained in:
commit
32701794bc
|
|
@ -47,20 +47,22 @@ module.exports = Self => {
|
|||
for (let dms of dmsToDelete) {
|
||||
const pathHash = DmsContainer.getHash(dms.id);
|
||||
const dmsContainer = await DmsContainer.container(pathHash);
|
||||
const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
|
||||
try {
|
||||
const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
|
||||
await fs.unlink(dstFile);
|
||||
} catch (err) {
|
||||
continue;
|
||||
if (err.code != 'ENOENT')
|
||||
throw err;
|
||||
}
|
||||
|
||||
await dms.destroy(myOptions);
|
||||
|
||||
const dstFolder = path.join(dmsContainer.client.root, pathHash);
|
||||
try {
|
||||
await fs.rmdir(dstFolder);
|
||||
} catch (err) {
|
||||
continue;
|
||||
}
|
||||
|
||||
await dms.destroy(myOptions);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,12 +47,8 @@ module.exports = class Docker {
|
|||
if (ci) network = `--network="${networkName}"`;
|
||||
|
||||
log('Starting container...');
|
||||
const container = await this.execP(`
|
||||
docker run \
|
||||
${network} \
|
||||
--env RUN_CHOWN=${runChown} \
|
||||
-d ${dockerArgs} salix-db
|
||||
`);
|
||||
const container = await this.execP(
|
||||
`docker run ${network} --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
|
||||
this.id = container.stdout.trim();
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
|
|||
(3, 'Perdida', 'LOST');
|
||||
|
||||
|
||||
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
|
||||
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`)
|
||||
VALUES
|
||||
(1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'),
|
||||
(2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL),
|
||||
|
|
|
|||
|
|
@ -27518,7 +27518,7 @@ CREATE TABLE `expedition` (
|
|||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`agencyModeFk` int(11) NOT NULL,
|
||||
`ticketFk` int(10) NOT NULL,
|
||||
`isBox` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
|
||||
`freightItemFk` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
|
||||
`created` timestamp NULL DEFAULT current_timestamp(),
|
||||
`isRefund__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
|
||||
`isPickUp__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
|
||||
|
|
@ -27534,7 +27534,7 @@ CREATE TABLE `expedition` (
|
|||
`hasNewRoute` bit(1) NOT NULL DEFAULT b'0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `index1` (`agencyModeFk`),
|
||||
KEY `index2` (`isBox`),
|
||||
KEY `index2` (`freightItemFk`),
|
||||
KEY `index3` (`created`),
|
||||
KEY `index4` (`ticketFk`),
|
||||
KEY `expedition_fk3_idx` (`packagingFk`),
|
||||
|
|
@ -27567,7 +27567,7 @@ BEGIN
|
|||
|
||||
DECLARE vShipFk INT;
|
||||
|
||||
IF NEW.isBox > 0 THEN
|
||||
IF NEW.freightItemFk > 0 THEN
|
||||
|
||||
UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
|
||||
|
||||
|
|
@ -27638,7 +27638,7 @@ DELIMITER ;;
|
|||
BEGIN
|
||||
UPDATE ticket t
|
||||
SET packages = (SELECT COUNT(counter)-1
|
||||
FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.isBox)
|
||||
FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
|
||||
WHERE t.id = OLD.ticketFk;
|
||||
|
||||
END */;;
|
||||
|
|
@ -36287,7 +36287,7 @@ CREATE TABLE `sorter` (
|
|||
`created` datetime NOT NULL,
|
||||
`routeFk` int(10) unsigned NOT NULL,
|
||||
`ticketFk` int(10) NOT NULL,
|
||||
`isBox` int(11) DEFAULT 1,
|
||||
`freightItemFk` int(11) DEFAULT 1,
|
||||
`itemFk` int(11) DEFAULT NULL,
|
||||
`width` decimal(10,2) DEFAULT 0.00,
|
||||
`depth` decimal(10,2) DEFAULT 0.00,
|
||||
|
|
@ -44956,7 +44956,7 @@ BEGIN
|
|||
SELECT SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) INTO deliveryPrice
|
||||
FROM vn.ticket t
|
||||
LEFT JOIN expedition e ON e.ticketFk = t.id
|
||||
JOIN expeditionBoxVol ebv ON ebv.boxFk = e.isBox
|
||||
JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
|
||||
WHERE t.id = vTicketFk;
|
||||
|
||||
END IF;
|
||||
|
|
@ -46492,7 +46492,7 @@ BEGIN
|
|||
LEFT JOIN item i ON i.id = b.itemFk
|
||||
LEFT JOIN itemType it ON it.id = i.typeFk
|
||||
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||
LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox
|
||||
LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.freightItemFk
|
||||
JOIN volumeConfig vc ON TRUE
|
||||
WHERE b.id = vSelf;
|
||||
|
||||
|
|
@ -53229,7 +53229,7 @@ BEGIN
|
|||
INNER JOIN vn.ticketState ts ON ts.ticketFk = exp.ticketFk
|
||||
LEFT JOIN vn.address a ON t.addressFk = a.id
|
||||
LEFT JOIN vn.warehouse w ON t.warehouseFk = w.id
|
||||
WHERE t.routeFk = vRouteFk AND exp.isBox > 0;
|
||||
WHERE t.routeFk = vRouteFk AND exp.freightItemFk > 0;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||
|
|
@ -53760,7 +53760,7 @@ BEGIN
|
|||
GROUP BY sub.ticketFk
|
||||
) sub2 ON sub2.ticketFk = t.id
|
||||
LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk
|
||||
WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE
|
||||
WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
|
||||
ORDER BY r.created, t.priority DESC;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ng-transclude="prepend"
|
||||
class="prepend">
|
||||
</div>
|
||||
<div class="infix">
|
||||
<div class="infix" >
|
||||
<div class="fix prefix"></div>
|
||||
<div class="control">
|
||||
<section
|
||||
|
|
@ -13,8 +13,7 @@
|
|||
</section>
|
||||
<input
|
||||
type="file"
|
||||
accept="{{$ctrl.accept}}"
|
||||
style="display: none;">
|
||||
accept="{{$ctrl.accept}}">
|
||||
</input>
|
||||
</div>
|
||||
<div class="fix suffix"></div>
|
||||
|
|
|
|||
|
|
@ -4,4 +4,13 @@
|
|||
.value {
|
||||
cursor: pointer;
|
||||
}
|
||||
.control {
|
||||
& > input[type=file] {
|
||||
opacity: 0;
|
||||
}
|
||||
& > section {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -239,5 +239,6 @@
|
|||
"This route does not exists": "Esta ruta no existe",
|
||||
"Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
|
||||
"You don't have grant privilege": "No tienes privilegios para dar privilegios",
|
||||
"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario"
|
||||
"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
|
||||
"Empty data source": "Origen de datos vacio"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
const {Email} = require('vn-print');
|
||||
|
||||
module.exports = Self => {
|
||||
Self.remoteMethodCtx('balanceCompensationEmail', {
|
||||
description: 'Sends the debit balances compensation email with an attached PDF',
|
||||
accessType: 'WRITE',
|
||||
accepts: [
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'Number',
|
||||
required: true,
|
||||
description: 'The receipt id',
|
||||
http: { source: 'path' }
|
||||
}
|
||||
],
|
||||
returns: {
|
||||
type: ['object'],
|
||||
root: true
|
||||
},
|
||||
http: {
|
||||
path: '/:id/balance-compensation-email',
|
||||
verb: 'POST'
|
||||
}
|
||||
});
|
||||
|
||||
Self.balanceCompensationEmail = async (ctx, id) => {
|
||||
|
||||
const models = Self.app.models;
|
||||
const receipt = await models.Receipt.findById(id, {fields: ['clientFk']});
|
||||
const client = await models.Client.findById(receipt.clientFk, {fields:['email']});
|
||||
|
||||
const email = new Email('balance-compensation', {
|
||||
lang: ctx.req.getLocale(),
|
||||
recipient: client.email+',administracion@verdnatura.es',
|
||||
id
|
||||
});
|
||||
|
||||
return email.send();
|
||||
};
|
||||
};
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
const { Report } = require('vn-print');
|
||||
|
||||
module.exports = Self => {
|
||||
Self.remoteMethodCtx('balanceCompensationPdf', {
|
||||
description: 'Returns the the debit balances compensation pdf',
|
||||
accessType: 'READ',
|
||||
accepts: [
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'number',
|
||||
required: true,
|
||||
description: 'The receipt id',
|
||||
http: { source: 'path' }
|
||||
}
|
||||
],
|
||||
returns: [
|
||||
{
|
||||
arg: 'body',
|
||||
type: 'file',
|
||||
root: true
|
||||
}, {
|
||||
arg: 'Content-Type',
|
||||
type: 'String',
|
||||
http: {target: 'header'}
|
||||
}, {
|
||||
arg: 'Content-Disposition',
|
||||
type: 'String',
|
||||
http: {target: 'header'}
|
||||
}
|
||||
],
|
||||
http: {
|
||||
path: '/:id/balance-compensation-pdf',
|
||||
verb: 'GET'
|
||||
}
|
||||
});
|
||||
|
||||
Self.balanceCompensationPdf = async(ctx, id) => {
|
||||
const args = Object.assign({}, ctx.args);
|
||||
const params = {lang: ctx.req.getLocale()};
|
||||
|
||||
delete args.ctx;
|
||||
for (const param in args)
|
||||
params[param] = args[param];
|
||||
|
||||
const report = new Report('balance-compensation', params);
|
||||
const stream = await report.toPdfStream();
|
||||
|
||||
return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
|
||||
};
|
||||
};
|
||||
|
|
@ -2,6 +2,8 @@ const LoopBackContext = require('loopback-context');
|
|||
|
||||
module.exports = function(Self) {
|
||||
require('../methods/receipt/filter')(Self);
|
||||
require('../methods/receipt/balanceCompensationEmail')(Self);
|
||||
require('../methods/receipt/balanceCompensationPdf')(Self);
|
||||
require('../methods/receipt/receiptPdf')(Self);
|
||||
|
||||
Self.validateBinded('amountPaid', isNotZero, {
|
||||
|
|
|
|||
|
|
@ -121,9 +121,22 @@
|
|||
</vn-icon-button>
|
||||
</a>
|
||||
</vn-td>
|
||||
</vn-tr>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
<vn-td center shrink ng-if="!balance.isInvoice">
|
||||
<vn-icon-button
|
||||
vn-dialog="send_compensation"
|
||||
icon="outgoing_mail"
|
||||
title="{{'Send compensation' | translate}}">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
<vn-confirm
|
||||
vn-id="send_compensation"
|
||||
on-accept="$ctrl.sendEmail(balance)"
|
||||
question="Notify compensation"
|
||||
message="Send compensation">
|
||||
</vn-confirm>
|
||||
</vn-tr>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
</vn-card>
|
||||
</vn-data-viewer>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@ import ngModule from '../../module';
|
|||
import Section from 'salix/components/section';
|
||||
|
||||
class Controller extends Section {
|
||||
constructor($element, $) {
|
||||
constructor($element, $, vnEmail) {
|
||||
super($element, $);
|
||||
this.vnEmail = vnEmail;
|
||||
this.filter = {
|
||||
include: {
|
||||
relation: 'company',
|
||||
|
|
@ -54,45 +55,49 @@ class Controller extends Section {
|
|||
}
|
||||
})).then(() => this.getBalances());
|
||||
}
|
||||
|
||||
|
||||
getCurrentBalance() {
|
||||
const clientRisks = this.$.riskModel.data;
|
||||
const selectedCompany = this.companyId;
|
||||
const currentBalance = clientRisks.find(balance => {
|
||||
return balance.companyFk === selectedCompany;
|
||||
});
|
||||
|
||||
|
||||
return currentBalance && currentBalance.amount;
|
||||
}
|
||||
|
||||
|
||||
getBalances() {
|
||||
const balances = this.$.model.data;
|
||||
balances.forEach((balance, index) => {
|
||||
if (index === 0)
|
||||
balance.balance = this.getCurrentBalance();
|
||||
balance.balance = this.getCurrentBalance();
|
||||
if (index > 0) {
|
||||
let previousBalance = balances[index - 1];
|
||||
balance.balance = previousBalance.balance - (previousBalance.debit - previousBalance.credit);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
showInvoiceOutDescriptor(event, balance) {
|
||||
if (!balance.isInvoice) return;
|
||||
if (event.defaultPrevented) return;
|
||||
|
||||
|
||||
this.$.invoiceOutDescriptor.show(event.target, balance.id);
|
||||
}
|
||||
|
||||
|
||||
changeDescription(balance) {
|
||||
const params = {description: balance.description};
|
||||
const endpoint = `Receipts/${balance.id}`;
|
||||
this.$http.patch(endpoint, params)
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
|
||||
}
|
||||
|
||||
sendEmail(balance) {
|
||||
return this.vnEmail.send(`Receipts/${balance.id}/balance-compensation-email`);
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$element', '$scope'];
|
||||
Controller.$inject = ['$element', '$scope', 'vnEmail'];
|
||||
|
||||
ngModule.vnComponent('vnClientBalanceIndex', {
|
||||
template: require('./index.html'),
|
||||
|
|
|
|||
|
|
@ -8,4 +8,6 @@ Havings: Haber
|
|||
Balance: Balance
|
||||
Total by company: Total por empresa
|
||||
Download PDF: Descargar PDF
|
||||
BILL: N/FRA {{ref}}
|
||||
Send compensation: Enviar compensación
|
||||
BILL: N/FRA {{ref}}
|
||||
Notify compensation: ¿Desea informar de la compensación al cliente por correo?
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
url="Packagings"
|
||||
show-field="id"
|
||||
value-field="id"
|
||||
where="{isBox: true}"
|
||||
where="{freightItemFk: true}"
|
||||
ng-model="buy.packageFk"
|
||||
on-change="$ctrl.saveBuy(buy)">
|
||||
</vn-autocomplete>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
|||
`SELECT
|
||||
e.id,
|
||||
e.ticketFk,
|
||||
e.isBox,
|
||||
e.freightItemFk,
|
||||
e.workerFk,
|
||||
i1.name packageItemName,
|
||||
e.counter,
|
||||
|
|
@ -51,7 +51,7 @@ module.exports = Self => {
|
|||
FROM vn.expedition e
|
||||
LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
|
||||
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
|
||||
INNER JOIN vn.item i1 ON i1.id = e.isBox
|
||||
INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
|
||||
LEFT JOIN vn.packaging p ON p.id = e.packagingFk
|
||||
LEFT JOIN vn.item i3 ON i3.id = p.itemFk
|
||||
LEFT JOIN account.user u ON u.id = e.workerFk
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
const {Report} = require('vn-print');
|
||||
|
||||
module.exports = Self => {
|
||||
Self.remoteMethodCtx('collectionLabel', {
|
||||
description: 'Returns the collection label',
|
||||
accessType: 'READ',
|
||||
accepts: [
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'number',
|
||||
required: true,
|
||||
description: 'The ticket id',
|
||||
http: {source: 'path'}
|
||||
},
|
||||
],
|
||||
returns: [
|
||||
{
|
||||
arg: 'body',
|
||||
type: 'file',
|
||||
root: true
|
||||
}, {
|
||||
arg: 'Content-Type',
|
||||
type: 'String',
|
||||
http: {target: 'header'}
|
||||
}, {
|
||||
arg: 'Content-Disposition',
|
||||
type: 'String',
|
||||
http: {target: 'header'}
|
||||
}
|
||||
],
|
||||
http: {
|
||||
path: '/:id/collection-label',
|
||||
verb: 'GET'
|
||||
}
|
||||
});
|
||||
|
||||
Self.collectionLabel = async(ctx, id) => {
|
||||
const args = Object.assign({}, ctx.args);
|
||||
const params = {lang: ctx.req.getLocale()};
|
||||
|
||||
delete args.ctx;
|
||||
for (const param in args)
|
||||
params[param] = args[param];
|
||||
|
||||
const report = new Report('collection-label', params);
|
||||
const stream = await report.toPdfStream();
|
||||
|
||||
return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
|
||||
};
|
||||
};
|
||||
|
|
@ -188,7 +188,7 @@ module.exports = Self => {
|
|||
async function createSaleComponent(saleId, value, componentId, myOptions) {
|
||||
const models = Self.app.models;
|
||||
|
||||
return models.SaleComponent.create({
|
||||
return models.SaleComponent.upsert({
|
||||
saleFk: saleId,
|
||||
value: value,
|
||||
componentFk: componentId
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"type": "number",
|
||||
"description": "Identifier"
|
||||
},
|
||||
"isBox": {
|
||||
"freightItemFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"created": {
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
"freightItem": {
|
||||
"type": "belongsTo",
|
||||
"model": "Item",
|
||||
"foreignKey": "isBox"
|
||||
"foreignKey": "freightItemFk"
|
||||
},
|
||||
"packaging": {
|
||||
"type": "belongsTo",
|
||||
|
|
|
|||
|
|
@ -34,4 +34,5 @@ module.exports = function(Self) {
|
|||
require('../methods/ticket/closeByAgency')(Self);
|
||||
require('../methods/ticket/closeByRoute')(Self);
|
||||
require('../methods/ticket/isRoleAdvanced')(Self);
|
||||
require('../methods/ticket/collectionLabel')(Self);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,6 +5,13 @@
|
|||
|
||||
<vn-menu vn-id="menu">
|
||||
<vn-list>
|
||||
<vn-item
|
||||
vn-acl="administrative"
|
||||
vn-acl-action="remove"
|
||||
ng-click="transferClient.show()"
|
||||
translate>
|
||||
Transfer client
|
||||
</vn-item>
|
||||
<vn-item
|
||||
ng-click="addTurn.show()"
|
||||
vn-acl="buyer"
|
||||
|
|
@ -242,6 +249,36 @@
|
|||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
|
||||
<!-- Transfer Client popup -->
|
||||
|
||||
<vn-dialog
|
||||
vn-id="transferClient"
|
||||
title="transferClient"
|
||||
size="sm"
|
||||
on-accept="$ctrl.transferClient($client)">
|
||||
<tpl-body>
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
vn-id="client"
|
||||
required="true"
|
||||
url="Clients"
|
||||
label="Client"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
|
||||
ng-model="$ctrl.ticket.client.id"
|
||||
initial-data="$ctrl.ticket.client.id"
|
||||
order="id">
|
||||
<tpl-item>
|
||||
#{{id}} - {{::name}}
|
||||
</tpl-item>
|
||||
</vn-autocomplete>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<button response="accept" translate>Transfer client</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
|
||||
<!-- Send SMS popup -->
|
||||
<vn-ticket-sms
|
||||
vn-id="sms"
|
||||
|
|
|
|||
|
|
@ -95,6 +95,23 @@ class Controller extends Section {
|
|||
});
|
||||
}
|
||||
|
||||
transferClient() {
|
||||
this.$http.get(`Clients/${this.ticket.client.id}`).then(client => {
|
||||
const ticket = this.ticket;
|
||||
|
||||
const params =
|
||||
{
|
||||
clientFk: client.data.id,
|
||||
addressFk: client.data.defaultAddressFk,
|
||||
};
|
||||
|
||||
this.$http.patch(`Tickets/${ticket.id}`, params).then(() => {
|
||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||
this.reload();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
isTicketEditable() {
|
||||
if (!this.ticket) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -281,4 +281,17 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
|
|||
$httpBackend.flush();
|
||||
});
|
||||
});
|
||||
|
||||
describe('transferClient()', () => {
|
||||
it(`should perform two queries, a get to obtain the clientData and a patch to update the ticket`, () => {
|
||||
const client =
|
||||
{
|
||||
clientFk: 1101,
|
||||
addressFk: 1,
|
||||
};
|
||||
$httpBackend.expect('GET', `Clients/${ticket.client.id}`).respond(client);
|
||||
$httpBackend.expect('PATCH', `Tickets/${ticket.id}`).respond();
|
||||
controller.transferClient();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,4 +9,5 @@ Send CSV Delivery Note: Enviar albarán en CSV
|
|||
Send PDF Delivery Note: Enviar albarán en PDF
|
||||
Show Proforma: Ver proforma
|
||||
Refund all: Abonar todo
|
||||
The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
|
||||
The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
|
||||
Transfer client: Transferir cliente
|
||||
|
|
@ -22,4 +22,4 @@ SMS Pending payment: 'SMS Pago pendiente'
|
|||
Restore ticket: Restaurar ticket
|
||||
You are going to restore this ticket: Vas a restaurar este ticket
|
||||
Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
|
||||
Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
|
||||
Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
const Stylesheet = require(`vn-print/core/stylesheet`);
|
||||
|
||||
const path = require('path');
|
||||
const vnPrintPath = path.resolve('print');
|
||||
|
||||
module.exports = new Stylesheet([
|
||||
`${vnPrintPath}/common/css/spacing.css`,
|
||||
`${vnPrintPath}/common/css/misc.css`,
|
||||
`${vnPrintPath}/common/css/layout.css`,
|
||||
`${vnPrintPath}/common/css/email.css`])
|
||||
.mergeStyles();
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
[
|
||||
{
|
||||
"filename": "balance-compensation.pdf",
|
||||
"component": "balance-compensation"
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
<!DOCTYPE html>
|
||||
<html v-bind:lang="$i18n.locale">
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<title v-html="$t('subject')"></title>
|
||||
</head>
|
||||
<body>
|
||||
<table class="grid">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<!-- Empty block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block empty"></div>
|
||||
</div>
|
||||
<!-- Header block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block">
|
||||
<email-header v-bind="$props"></email-header>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block vn-pa-ml">
|
||||
<p>{{$t('description.instructions')}} {{client.name}}</p>
|
||||
<p>{{$t('description.attached')}}</p>
|
||||
<p>{{$t('description.response')}}</p>
|
||||
<p>{{$t('description.regards')}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Preview block -->
|
||||
<div class="grid-row" v-if="isPreview">
|
||||
<div class="grid-block vn-pa-ml">
|
||||
<attachment v-for="attachment in attachments"
|
||||
v-bind:key="attachment.filename"
|
||||
v-bind:attachment="attachment"
|
||||
v-bind:args="$props">
|
||||
</attachment>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Footer block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block">
|
||||
<email-footer v-bind="$props"></email-footer>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Empty block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block empty"></div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
const Component = require(`vn-print/core/component`);
|
||||
const emailHeader = new Component('email-header');
|
||||
const emailFooter = new Component('email-footer');
|
||||
const attachment = new Component('attachment');
|
||||
|
||||
|
||||
module.exports = {
|
||||
name: 'balance-compensation',
|
||||
async serverPrefetch() {
|
||||
this.client = await this.fetchClient(this.id);
|
||||
},
|
||||
methods: {
|
||||
fetchClient(id) {
|
||||
return this.findOneFromDef('client', [id]);
|
||||
},
|
||||
},
|
||||
components: {
|
||||
'email-header': emailHeader.build(),
|
||||
'email-footer': emailFooter.build(),
|
||||
'attachment': attachment.build()
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
attachments: [
|
||||
{
|
||||
filename: 'balance-compensation.pdf',
|
||||
type: 'pdf',
|
||||
path: `Receipts/${this.id}/balance-compensation-pdf`
|
||||
}
|
||||
]
|
||||
};
|
||||
},
|
||||
props: {
|
||||
id: {
|
||||
type: Number,
|
||||
required: true
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
subject: Compensación VerdNatura SL
|
||||
description:
|
||||
instructions: Buenos días,
|
||||
attached: Adjuntamos escrito para su confirmación
|
||||
response: Rogamos su respuesta a la mayor brevedad
|
||||
regards: Un saludo
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
SELECT
|
||||
c.name
|
||||
FROM client c
|
||||
JOIN receipt r ON r.clientFk = c.id
|
||||
WHERE r.id = ?;
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<!DOCTYPE html>
|
||||
<html v-bind:lang="$i18n.locale">
|
||||
|
||||
<body>
|
||||
<table class="grid">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<!-- Header block -->
|
||||
<report-header v-bind="$props">
|
||||
</report-header>
|
||||
<div class="grid-row">
|
||||
<div class="grid-block">
|
||||
<div class="columns">
|
||||
<div class="size50">
|
||||
<p style="text-align: right;">{{$t('Place')}} {{currentDate()}}</p>
|
||||
<h3 style="text-align: center; margin-top: 8%;">{{$t('Compensation') | uppercase}}</h3>
|
||||
<p style="margin-top: 8%;">{{$t('In one hand')}}:</p>
|
||||
<p style="text-align: justify;">{{company.name}} {{$t('CIF')}} {{company.nif}} {{$t('Home')}} {{company.street}}, {{company.city}}.</p>
|
||||
<p style="margin-top: 5%;">{{$t('In other hand')}}:</p>
|
||||
<p style="text-align: justify;">{{$t('Sr')}} {{client.name}} {{$t('NIF')}} {{client.fi}} {{$t('Home')}} {{client.street}}, {{client.city}}.</p>
|
||||
<h4 style="text-align: center;margin-top: 10%;">{{$t('Agree') | uppercase}}</h4>
|
||||
<p style="margin-top: 8%;text-align: justify;">{{$t('Date')}} {{client.payed | date('%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} € {{$t('From client')}} {{client.name}} {{$t('To client')}} {{company.name}}.</p>
|
||||
<p style="margin-top: 8%;">{{$t('Reception')}} <span style="color:blue">administracion@verdnatura.es</span></p>
|
||||
<div style="margin-top: 8%;"><small >{{$t('Greetings')}}</small></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- Footer block -->
|
||||
<report-footer id="pageFooter"
|
||||
v-bind="$props">
|
||||
</report-footer>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
const Component = require(`vn-print/core/component`);
|
||||
const reportHeader = new Component('report-header');
|
||||
const reportFooter = new Component('report-footer');
|
||||
|
||||
module.exports = {
|
||||
name: 'balance-compensation',
|
||||
async serverPrefetch() {
|
||||
this.client = await this.fetchClient(this.id);
|
||||
this.company = await this.fetchCompany(this.id);
|
||||
},
|
||||
methods: {
|
||||
fetchClient(id) {
|
||||
return this.findOneFromDef('client', [id]);
|
||||
},
|
||||
fetchCompany(id) {
|
||||
return this.findOneFromDef('company', [id]);
|
||||
},
|
||||
|
||||
currentDate() {
|
||||
const current = new Date();
|
||||
const date = `${current.getDate()}/${current.getMonth()+1}/${current.getFullYear()}`;
|
||||
return date;
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'report-header': reportHeader.build(),
|
||||
'report-footer': reportFooter.build()
|
||||
},
|
||||
props: {
|
||||
id: {
|
||||
type: Number,
|
||||
required: true,
|
||||
description: 'The receipt id'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
const Stylesheet = require(`vn-print/core/stylesheet`);
|
||||
|
||||
const path = require('path');
|
||||
const vnPrintPath = path.resolve('print');
|
||||
|
||||
module.exports = new Stylesheet([
|
||||
`${vnPrintPath}/common/css/spacing.css`,
|
||||
`${vnPrintPath}/common/css/misc.css`,
|
||||
`${vnPrintPath}/common/css/layout.css`,
|
||||
`${vnPrintPath}/common/css/report.css`,
|
||||
`${__dirname}/style.css`])
|
||||
.mergeStyles();
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
reportName: compensacion-saldo
|
||||
Place: Algemesí, a
|
||||
Compensation: Compensación de saldos deudores y acreedores
|
||||
In one hand: De una parte
|
||||
CIF: con CIF
|
||||
NIF: con NIF
|
||||
Home: y domicilio sito en
|
||||
In other hand: De la otra
|
||||
Sr: Don/Doña
|
||||
Agree: Acuerdan
|
||||
Date: En fecha de
|
||||
Compensate: se ha compensado el saldo de
|
||||
From client: del cliente/proveedor
|
||||
To client: con el cliente/proveedor
|
||||
Reception: Por favor, rogamos confirmen la recepción de esta compensación al email
|
||||
Greetings: Saludos cordiales,
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
SELECT
|
||||
c.name,
|
||||
c.socialName,
|
||||
c.street,
|
||||
c.fi,
|
||||
c.city,
|
||||
r.amountPaid,
|
||||
r.payed
|
||||
FROM client c
|
||||
JOIN receipt r ON r.clientFk = c.id
|
||||
JOIN supplier s ON c.fi = s.nif
|
||||
WHERE r.id = ?
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
SELECT
|
||||
s.name,
|
||||
s.nif,
|
||||
s.street,
|
||||
s.city
|
||||
FROM supplier s
|
||||
JOIN receipt r ON r.companyFk = s.id
|
||||
WHERE r.id = ?;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
const Stylesheet = require(`vn-print/core/stylesheet`);
|
||||
|
||||
const path = require('path');
|
||||
const vnPrintPath = path.resolve('print');
|
||||
|
||||
module.exports = new Stylesheet([
|
||||
`${vnPrintPath}/common/css/spacing.css`,
|
||||
`${vnPrintPath}/common/css/misc.css`,
|
||||
`${vnPrintPath}/common/css/layout.css`,
|
||||
`${vnPrintPath}/common/css/report.css`,
|
||||
`${__dirname}/style.css`])
|
||||
.mergeStyles();
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
html {
|
||||
font-family: "Roboto";
|
||||
margin-top: -7px;
|
||||
}
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
text-align: center;
|
||||
font-size: 26px;
|
||||
}
|
||||
#vertical {
|
||||
writing-mode: vertical-rl;
|
||||
height: 226px;
|
||||
margin-left: -13px;
|
||||
}
|
||||
.outline {
|
||||
border: 1px solid black;
|
||||
padding: 5px;
|
||||
}
|
||||
#nickname {
|
||||
font-size: 22px;
|
||||
}
|
||||
#agencyDescripton {
|
||||
font-size: 32px;
|
||||
font-weight: bold;
|
||||
}
|
||||
#bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
#barcode{
|
||||
width: 390px;
|
||||
}
|
||||
#shipped {
|
||||
font-weight: bold;
|
||||
}
|
||||
#ticketFk, #vertical {
|
||||
font-size: 34px;
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
<!DOCTYPE html>
|
||||
<html v-bind:lang="$i18n.locale">
|
||||
<body>
|
||||
<table v-for="labelData in labelsData" style="break-before: page;">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td rowspan="6"><span id="vertical">{{labelData.levelV}}</span></td>
|
||||
<td id="ticketFk" >{{labelData.ticketFk}} ⬸ {{labelData.clientFk}}</td>
|
||||
<td colspan="2" id="shipped">{{labelData.shipped}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="3"><div v-html="getBarcode(labelData.ticketFk)" id="barcode"></div></td>
|
||||
<td class="outline">{{labelData.workerCode}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="outline">{{labelData.labelCount}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="outline">{{labelData.size}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><div id="agencyDescripton">{{labelData.agencyDescription}}</div></td>
|
||||
<td id="bold">{{labelData.lineCount}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="nickname">{{labelData.nickName}}</td>
|
||||
<td id="bold">{{labelData.agencyHour}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
const jsBarcode = require('jsbarcode');
|
||||
const {DOMImplementation, XMLSerializer} = require('xmldom');
|
||||
const UserError = require('vn-loopback/util/user-error');
|
||||
|
||||
module.exports = {
|
||||
name: 'collection-label',
|
||||
props: {
|
||||
id: {
|
||||
type: Number,
|
||||
required: true,
|
||||
description: 'The ticket or collection id'
|
||||
}
|
||||
},
|
||||
async serverPrefetch() {
|
||||
let ticketIds;
|
||||
const res = await this.rawSqlFromDef('tickets', [this.id]);
|
||||
|
||||
if (res.length) {
|
||||
ticketIds = [];
|
||||
for (const row of res)
|
||||
ticketIds.push(row.ticketFk);
|
||||
} else
|
||||
ticketIds = [this.id];
|
||||
|
||||
this.labelsData = await this.rawSqlFromDef('labelsData', [ticketIds]);
|
||||
|
||||
if (!this.labelsData.length)
|
||||
throw new UserError('Empty data source');
|
||||
},
|
||||
methods: {
|
||||
getBarcode(id) {
|
||||
const xmlSerializer = new XMLSerializer();
|
||||
const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null);
|
||||
const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
|
||||
|
||||
jsBarcode(svgNode, id, {
|
||||
xmlDocument: document,
|
||||
format: 'code128',
|
||||
displayValue: false,
|
||||
width: 3.8,
|
||||
height: 110,
|
||||
});
|
||||
return xmlSerializer.serializeToString(svgNode);
|
||||
},
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1 @@
|
|||
reportName: labelCollection
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"width": "10.4cm",
|
||||
"height": "4.8cm",
|
||||
"margin": {
|
||||
"top": "0cm",
|
||||
"right": "0.5cm",
|
||||
"bottom": "0cm",
|
||||
"left": "0cm"
|
||||
},
|
||||
"printBackground": true
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
SELECT c.itemPackingTypeFk,
|
||||
CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
|
||||
CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.`level`) levelV,
|
||||
tc.ticketFk,
|
||||
LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
|
||||
am.name,
|
||||
t.clientFk,
|
||||
CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
|
||||
CAST(IF(ic.code = 'plant', CONCAT(MAX(i.`size`),' cm'), COUNT(*)) AS CHAR) size,
|
||||
w.code workerCode,
|
||||
tt.labelCount,
|
||||
IF(HOUR(t.shipped), TIME_FORMAT(t.shipped, '%H:%i'), TIME_FORMAT(zo.`hour`, '%H:%i')) agencyHour,
|
||||
DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
|
||||
COUNT(*) lineCount,
|
||||
t.nickName
|
||||
FROM vn.ticket t
|
||||
JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
|
||||
JOIN vn.collection c ON c.id = tc.collectionFk
|
||||
LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
|
||||
AND cc.wagon = tc.wagon
|
||||
AND cc.trainFk = c.trainFk
|
||||
JOIN vn.sale s ON s.ticketFk = t.id
|
||||
LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
|
||||
JOIN vn.item i ON i.id = s.itemFk
|
||||
JOIN vn.itemType it ON it.id = i.typeFk
|
||||
JOIN vn.itemCategory ic ON ic.id = it.categoryFk
|
||||
JOIN vn.worker w ON w.id = c.workerFk
|
||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
||||
LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
|
||||
LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
|
||||
LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
|
||||
LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
|
||||
WHERE tc.ticketFk IN (?)
|
||||
GROUP BY t.id
|
||||
ORDER BY cc.`code`;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
SELECT ticketFk
|
||||
FROM ticketCollection
|
||||
WHERE collectionFk = ?
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- Route ticket list -->
|
||||
<div class="no-page-break" v-for="ticket in route.tickets">
|
||||
<div v-if="route.tickets" v-for="ticket in route.tickets" class="no-page-break">
|
||||
<div>
|
||||
<table class="column-oriented repeatable">
|
||||
<thead>
|
||||
|
|
|
|||
Loading…
Reference in New Issue