| {{::line.quantity}} |
{{::line.stickers | dashIfEmpty}} |
- {{::line.packageFk | dashIfEmpty}} |
+ {{::line.packagingFk | dashIfEmpty}} |
{{::line.weight}} |
diff --git a/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js b/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
index a48664b30..4bba2498f 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
@@ -23,7 +23,7 @@ module.exports = Self => {
}
});
- Self.makePdfAndNotify = async function(ctx, id, printerFk) {
+ Self.makePdfAndNotify = async function(ctx, id, printerFk, options) {
const models = Self.app.models;
options = typeof options == 'object'
@@ -59,10 +59,10 @@ module.exports = Self => {
};
await Self.invoiceEmail(ctx, ref);
} catch (err) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = ctx.req.__('Mail not sent', {
clientId: client.id,
- clientUrl: `${origin}/#!/claim/${id}/summary`
+ clientUrl: `${url}claim/${id}/summary`
});
const salesPersonId = client.salesPersonFk;
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
index 6ecfe6015..22891f161 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
@@ -3,7 +3,7 @@ const LoopBackContext = require('loopback-context');
describe('InvoiceOut refund()', () => {
const userId = 5;
- const ctx = {req: {accessToken: userId}};
+ const ctx = {req: {accessToken: userId}, args: {}};
const withWarehouse = true;
const activeCtx = {
accessToken: {userId: userId},
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
new file mode 100644
index 000000000..04f6df299
--- /dev/null
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@@ -0,0 +1,68 @@
+
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('InvoiceOut tranferInvoice()', () => {
+ const activeCtx = {
+ accessToken: {userId: 5},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ const ctx = {req: activeCtx};
+
+ beforeEach(() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
+ it('should return the id of the created issued invoice', async() => {
+ const tx = await models.InvoiceOut.beginTransaction({});
+ const options = {transaction: tx};
+ const args = {
+ id: '1',
+ ref: 'T4444444',
+ newClientFk: 1,
+ cplusRectificationId: 1,
+ cplusInvoiceType477Id: 1,
+ invoiceCorrectionTypeId: 1
+ };
+ ctx.args = args;
+ try {
+ const result = await models.InvoiceOut.transferInvoice(
+ ctx,
+ options);
+
+ expect(result).toBeDefined();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an UserError when it is the same client', async() => {
+ const tx = await models.InvoiceOut.beginTransaction({});
+ const options = {transaction: tx};
+ const args = {
+ id: '1',
+ ref: 'T1111111',
+ newClientFk: 1101,
+ cplusRectificationId: 1,
+ cplusInvoiceType477Id: 1,
+ invoiceCorrectionTypeId: 1
+ };
+ ctx.args = args;
+ try {
+ await models.InvoiceOut.transferInvoice(
+ ctx,
+ options);
+ } catch (e) {
+ expect(e.message).toBe(`Select a different client`);
+ await tx.rollback();
+ }
+ });
+});
diff --git a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
new file mode 100644
index 000000000..8a0609b8d
--- /dev/null
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@@ -0,0 +1,111 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('transferInvoice', {
+ description: 'Transfer an issued invoice to another client',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'Issued invoice id'
+ },
+ {
+ arg: 'ref',
+ type: 'string',
+ required: true
+ },
+ {
+ arg: 'newClientFk',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'cplusRectificationId',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'cplusInvoiceType477Id',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'invoiceCorrectionTypeId',
+ type: 'number',
+ required: true
+ },
+ ],
+ returns: {
+ type: 'boolean',
+ root: true
+ },
+ http: {
+ path: '/transferInvoice',
+ verb: 'post'
+ }
+ });
+
+ Self.transferInvoice = async(ctx, options) => {
+ const models = Self.app.models;
+ const myOptions = {userId: ctx.req.accessToken.userId};
+ const args = ctx.args;
+ let tx;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const {clientFk} = await models.InvoiceOut.findById(args.id);
+
+ if (clientFk == args.newClientFk)
+ throw new UserError(`Select a different client`);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+ try {
+ const filterRef = {where: {refFk: args.ref}};
+ const tickets = await models.Ticket.find(filterRef, myOptions);
+ const ticketsIds = tickets.map(ticket => ticket.id);
+ await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
+
+ const filterTicket = {where: {ticketFk: {inq: ticketsIds}}};
+
+ const services = await models.TicketService.find(filterTicket, myOptions);
+ const servicesIds = services.map(service => service.id);
+
+ const sales = await models.Sale.find(filterTicket, myOptions);
+ const salesIds = sales.map(sale => sale.id);
+
+ const clonedTickets = await models.Sale.clone(ctx, salesIds, servicesIds, null, false, false, myOptions);
+ const clonedTicketIds = [];
+
+ for (const clonedTicket of clonedTickets) {
+ await clonedTicket.updateAttribute('clientFk', args.newClientFk, myOptions);
+ clonedTicketIds.push(clonedTicket.id);
+ }
+
+ const invoiceIds = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
+ const [invoiceId] = invoiceIds;
+
+ await models.InvoiceCorrection.create({
+ correctingFk: invoiceId,
+ correctedFk: args.id,
+ cplusRectificationTypeFk: args.cplusRectificationId,
+ cplusInvoiceType477Fk: args.cplusInvoiceType477Id,
+ invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
+ }, myOptions);
+
+ if (tx) {
+ await tx.commit();
+ await models.InvoiceOut.makePdfAndNotify(ctx, invoiceId, null);
+ }
+
+ return invoiceId;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/invoiceOut/back/model-config.json b/modules/invoiceOut/back/model-config.json
index 9e8b119ab..23246893b 100644
--- a/modules/invoiceOut/back/model-config.json
+++ b/modules/invoiceOut/back/model-config.json
@@ -31,5 +31,17 @@
},
"ZipConfig": {
"dataSource": "vn"
+ },
+ "CplusRectificationType": {
+ "dataSource": "vn"
+ },
+ "InvoiceCorrectionType": {
+ "dataSource": "vn"
+ },
+ "InvoiceCorrection": {
+ "dataSource": "vn"
+ },
+ "CplusInvoiceType477": {
+ "dataSource": "vn"
}
}
diff --git a/modules/invoiceOut/back/models/cplus-invoice-type-477.json b/modules/invoiceOut/back/models/cplus-invoice-type-477.json
new file mode 100644
index 000000000..840a9a7e4
--- /dev/null
+++ b/modules/invoiceOut/back/models/cplus-invoice-type-477.json
@@ -0,0 +1,19 @@
+{
+ "name": "CplusInvoiceType477",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "cplusInvoiceType477"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/models/cplus-rectification-type.json b/modules/invoiceOut/back/models/cplus-rectification-type.json
new file mode 100644
index 000000000..e7bfb957f
--- /dev/null
+++ b/modules/invoiceOut/back/models/cplus-rectification-type.json
@@ -0,0 +1,19 @@
+{
+ "name": "CplusRectificationType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "cplusRectificationType"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/models/invoice-correction-type.json b/modules/invoiceOut/back/models/invoice-correction-type.json
new file mode 100644
index 000000000..ad3f034ea
--- /dev/null
+++ b/modules/invoiceOut/back/models/invoice-correction-type.json
@@ -0,0 +1,19 @@
+{
+ "name": "InvoiceCorrectionType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "invoiceCorrectionType"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/models/invoice-correction.json b/modules/invoiceOut/back/models/invoice-correction.json
new file mode 100644
index 000000000..48bd172a6
--- /dev/null
+++ b/modules/invoiceOut/back/models/invoice-correction.json
@@ -0,0 +1,28 @@
+{
+ "name": "InvoiceCorrection",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "invoiceCorrection"
+ }
+ },
+ "properties": {
+ "correctingFk": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "correctedFk": {
+ "type": "number"
+ },
+ "cplusRectificationTypeFk": {
+ "type": "number"
+ },
+ "cplusInvoiceType477Fk": {
+ "type": "number"
+ },
+ "invoiceCorrectionTypeFk": {
+ "type": "number"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js
index d3aaf3b3d..ca77c856f 100644
--- a/modules/invoiceOut/back/models/invoice-out.js
+++ b/modules/invoiceOut/back/models/invoice-out.js
@@ -23,6 +23,7 @@ module.exports = Self => {
require('../methods/invoiceOut/getInvoiceDate')(Self);
require('../methods/invoiceOut/negativeBases')(Self);
require('../methods/invoiceOut/negativeBasesCsv')(Self);
+ require('../methods/invoiceOut/transferInvoice')(Self);
Self.filePath = async function(id, options) {
const fields = ['ref', 'issued'];
diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html
index 106f8e3cc..7d465f4ea 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@@ -1,3 +1,19 @@
+
+
+
+
+
+
+
+ Transfer invoice to...
+
Confirm
+
+
+
+
+
+
+
+ #{{id}} - {{::name}}
+
+
+
+
+ {{::description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index 38c3c9434..7d2644158 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -125,6 +125,22 @@ class Controller extends Section {
this.$state.go('ticket.card.sale', {id: refundTicket.id});
});
}
+
+ transferInvoice() {
+ const params = {
+ id: this.invoiceOut.id,
+ ref: this.invoiceOut.ref,
+ newClientFk: this.invoiceOut.client.id,
+ cplusRectificationId: this.cplusRectificationType,
+ cplusInvoiceType477Id: this.cplusInvoiceType477,
+ invoiceCorrectionTypeId: this.invoiceCorrectionType
+ };
+ this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
+ const invoiceId = res.data;
+ this.vnApp.showSuccess(this.$t('Invoice trasfered!'));
+ this.$state.go('invoiceOut.card.summary', {id: invoiceId});
+ });
+ }
}
Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail'];
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/en.yml b/modules/invoiceOut/front/descriptor-menu/locale/en.yml
index d299155d7..8fad5f25e 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/en.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/en.yml
@@ -1 +1,3 @@
The following refund tickets have been created: "The following refund tickets have been created: {{ticketIds}}"
+Transfer invoice to...: Transfer invoice to...
+Cplus Type: Cplus Type
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index 393efd58c..0f74b5fec 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -21,3 +21,5 @@ The invoice PDF document has been regenerated: El documento PDF de la factura ha
The email can't be empty: El correo no puede estar vacío
The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketIds}}"
Refund...: Abono...
+Transfer invoice to...: Transferir factura a...
+Cplus Type: Cplus Tipo
diff --git a/modules/invoiceOut/front/descriptor-menu/style.scss b/modules/invoiceOut/front/descriptor-menu/style.scss
index b68301961..9e4cf4297 100644
--- a/modules/invoiceOut/front/descriptor-menu/style.scss
+++ b/modules/invoiceOut/front/descriptor-menu/style.scss
@@ -21,4 +21,10 @@ vn-invoice-out-descriptor-menu {
font-size: 1.75rem;
}
}
-}
\ No newline at end of file
+
+}
+@media screen and (min-width: 1000px) {
+ .transferInvoice {
+ min-width: $width-md;
+ }
+}
diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
index 83a8fe7a2..5aafbb4f6 100644
--- a/modules/item/back/methods/item/lastEntriesFilter.js
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -29,44 +29,44 @@ module.exports = Self => {
Object.assign(myOptions, options);
const stmt = new ParameterizedSQL(
- `SELECT
- w.id AS warehouseFk,
- w.name AS warehouse,
- tr.landed,
- b.id AS buyFk,
- b.entryFk,
- b.isIgnored,
- b.price2,
- b.price3,
- b.stickers,
- b.packing,
- b.grouping,
- b.groupingMode,
- b.weight,
- i.stems,
- b.quantity,
- b.buyingValue +
- b.freightValue +
- b.comissionValue +
- b.packageValue AS cost,
- b.buyingValue,
- b.freightValue,
- b.comissionValue,
- b.packageValue,
- b.packageFk ,
- s.id AS supplierFk,
- s.name AS supplier
- FROM itemType it
- RIGHT JOIN (entry e
- LEFT JOIN supplier s ON s.id = e.supplierFk
- RIGHT JOIN buy b ON b.entryFk = e.id
- LEFT JOIN item i ON i.id = b.itemFk
- LEFT JOIN ink ON ink.id = i.inkFk
- LEFT JOIN travel tr ON tr.id = e.travelFk
- LEFT JOIN warehouse w ON w.id = tr.warehouseInFk
- LEFT JOIN origin o ON o.id = i.originFk
- ) ON it.id = i.typeFk
- LEFT JOIN edi.ekt ek ON b.ektFk = ek.id`);
+ `SELECT w.id AS warehouseFk,
+ w.name AS warehouse,
+ tr.landed,
+ b.id AS buyFk,
+ b.entryFk,
+ b.isIgnored,
+ b.price2,
+ b.price3,
+ b.stickers,
+ b.packing,
+ b.grouping,
+ b.groupingMode,
+ b.weight,
+ i.stems,
+ b.quantity,
+ b.buyingValue +
+ b.freightValue +
+ b.comissionValue +
+ b.packageValue AS cost,
+ b.buyingValue,
+ b.freightValue,
+ b.comissionValue,
+ b.packageValue,
+ b.packagingFk ,
+ s.id AS supplierFk,
+ s.name AS supplier
+ FROM itemType it
+ RIGHT JOIN (entry e
+ LEFT JOIN supplier s ON s.id = e.supplierFk
+ RIGHT JOIN buy b ON b.entryFk = e.id
+ LEFT JOIN item i ON i.id = b.itemFk
+ LEFT JOIN ink ON ink.id = i.inkFk
+ LEFT JOIN travel tr ON tr.id = e.travelFk
+ LEFT JOIN warehouse w ON w.id = tr.warehouseInFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ ) ON it.id = i.typeFk
+ LEFT JOIN edi.ekt ek ON b.ektFk = ek.id`
+ );
stmt.merge(conn.makeSuffix(filter));
return conn.executeStmt(stmt, myOptions);
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 34773e34c..61d05539e 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -47,6 +47,11 @@
"type": "belongsTo",
"model": "VnUser",
"foreignKey": "userFk"
+ },
+ "shelving": {
+ "type": "belongsTo",
+ "model": "Shelving",
+ "foreignKey": "shelvingFk"
}
}
}
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index e99dcd996..6db1f5efc 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -131,6 +131,9 @@
"nonRecycledPlastic": {
"type": "number"
},
+ "minQuantity": {
+ "type": "number"
+ },
"packingOut": {
"type": "number"
},
@@ -154,6 +157,10 @@
"mysql":{
"columnName": "doPhoto"
}
+ },
+ "minQuantity": {
+ "type": "number",
+ "description": "Min quantity"
}
},
"relations": {
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index fba4d679c..426c17800 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -33,6 +33,8 @@
rule
info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
+
+
+
+
+ {{::name}}
+
+ #{{::id}}
+
+
+
+
+
+
+
-
-
- {{::name}}
-
- #{{::id}}
-
-
-
-
-
-
-
+
+
Quantity
Cost
Kg.
- Cube
+ Cube
Provider
@@ -94,7 +94,7 @@
{{::entry.weight | dashIfEmpty}}
- {{::entry.packageFk | dashIfEmpty}}
+ {{::entry.packagingFk | dashIfEmpty}}
{{::entry.supplier | dashIfEmpty}}
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 0c6804838..31616f8a7 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -71,7 +71,7 @@ class Controller extends Section {
switch (param) {
case 'id':
case 'quantity':
- case 'packageFk':
+ case 'packagingFk':
return {[`b.${param}`]: value};
case 'supplierFk':
return {[`s.id`]: value};
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index c505b3a09..03c8db8ec 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -26,6 +26,7 @@
Ticket ID
Shipped
Description
+ Requester
Requested
Price
Atender
@@ -51,6 +52,13 @@
{{::request.description}}
+
+
+ {{::request.requesterName}}
+
+
{{::request.quantity}}
{{::request.price | currency: 'EUR':2}}
@@ -78,8 +86,8 @@
-
{{request.itemDescription}}
@@ -106,13 +114,13 @@
-
-
-
@@ -141,24 +149,24 @@
ng-click="contextmenu.filterBySelection()">
Filter by selection
-
Exclude selection
-
Remove filter
-
Remove all filters
-
Copy value
-
\ No newline at end of file
+
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 6ec738c7e..5fe84591f 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -128,6 +128,9 @@
+
+
diff --git a/modules/item/front/summary/locale/es.yml b/modules/item/front/summary/locale/es.yml
index 2e78841ae..80988c491 100644
--- a/modules/item/front/summary/locale/es.yml
+++ b/modules/item/front/summary/locale/es.yml
@@ -2,3 +2,4 @@ Barcode: Códigos de barras
Other data: Otros datos
Go to the item: Ir al artículo
WarehouseFk: Calculado sobre el almacén de {{ warehouseName }}
+Minimum sales quantity: Cantidad mínima de venta
diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js
index 0d83f9f4a..722f3e096 100644
--- a/modules/order/back/methods/order/catalogFilter.js
+++ b/modules/order/back/methods/order/catalogFilter.js
@@ -100,31 +100,32 @@ module.exports = Self => {
));
stmt = new ParameterizedSQL(`
- SELECT
- i.id,
- i.name,
- i.subName,
- i.image,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- i.tag8,
- i.value8,
- i.stars,
- tci.price,
- tci.available,
- w.lastName AS lastName,
- w.firstName,
- tci.priceKg,
- ink.hex
+ SELECT i.id,
+ i.name,
+ i.subName,
+ i.image,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.tag8,
+ i.value8,
+ i.stars,
+ tci.price,
+ tci.available,
+ w.lastName,
+ w.firstName,
+ tci.priceKg,
+ ink.hex,
+ i.minQuantity
FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk
JOIN vn.worker w on w.id = it.workerFk
- LEFT JOIN vn.ink ON ink.id = i.inkFk`);
+ LEFT JOIN vn.ink ON ink.id = i.inkFk
+ `);
// Apply order by tag
if (orderBy.isTag) {
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html
index fca728855..5d60211ed 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -8,12 +8,12 @@
![]()
-
{{::item.name}}
@@ -37,13 +37,28 @@
value="{{::item.value7}}">
-
-
+
+
+
+
+
+
+
+
+
+ {{::item.minQuantity}}
+
+
@@ -69,4 +84,4 @@
-
\ No newline at end of file
+
diff --git a/modules/order/front/catalog-view/locale/es.yml b/modules/order/front/catalog-view/locale/es.yml
index 82fe5e9e8..8fb3c7896 100644
--- a/modules/order/front/catalog-view/locale/es.yml
+++ b/modules/order/front/catalog-view/locale/es.yml
@@ -1 +1,2 @@
Order created: Orden creada
+Minimal quantity: Cantidad mínima
\ No newline at end of file
diff --git a/modules/order/front/catalog-view/style.scss b/modules/order/front/catalog-view/style.scss
index 87f70cde5..1e48745ca 100644
--- a/modules/order/front/catalog-view/style.scss
+++ b/modules/order/front/catalog-view/style.scss
@@ -44,4 +44,7 @@ vn-order-catalog {
height: 30px;
position: relative;
}
-}
\ No newline at end of file
+ .alert {
+ color: $color-alert;
+ }
+}
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index 3622ae932..218359992 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -48,8 +48,10 @@
-
+
+
diff --git a/modules/route/front/roadmap/summary/index.html b/modules/route/front/roadmap/summary/index.html
index e6b50601e..9fab0bf87 100644
--- a/modules/route/front/roadmap/summary/index.html
+++ b/modules/route/front/roadmap/summary/index.html
@@ -25,7 +25,10 @@
+ >
+
{
- Self.remoteMethod('addExpeditionState', {
+ Self.remoteMethodCtx('addExpeditionState', {
description: 'Update an expedition state',
accessType: 'WRITE',
accepts: [
@@ -12,18 +12,15 @@ module.exports = Self => {
description: 'Array of objects containing expeditionFk and stateCode'
}
],
- returns: {
- type: 'boolean',
- root: true
- },
http: {
path: `/addExpeditionState`,
verb: 'post'
}
});
- Self.addExpeditionState = async(expeditions, options) => {
+ Self.addExpeditionState = async(ctx, expeditions, options) => {
const models = Self.app.models;
+ const userId = ctx.req.accessToken.userId;
let tx;
const myOptions = {};
if (typeof options == 'object')
@@ -51,6 +48,7 @@ module.exports = Self => {
await models.ExpeditionState.create({
expeditionFk: expedition.expeditionFk,
typeFk,
+ userFk: userId,
}, myOptions);
}
diff --git a/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
index 819a43a60..6c7739006 100644
--- a/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
+++ b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
@@ -1,9 +1,9 @@
const models = require('vn-loopback/server/server').models;
describe('expeditionState addExpeditionState()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should update the expedition states', async() => {
const tx = await models.ExpeditionState.beginTransaction({});
-
try {
const options = {transaction: tx};
const payload = [
@@ -13,7 +13,7 @@ describe('expeditionState addExpeditionState()', () => {
},
];
- await models.ExpeditionState.addExpeditionState(payload, options);
+ await models.ExpeditionState.addExpeditionState(ctx, payload, options);
const expeditionState = await models.ExpeditionState.findOne({
where: {id: 5}
@@ -39,7 +39,7 @@ describe('expeditionState addExpeditionState()', () => {
stateCode: 'DUMMY'
}
];
- await models.ExpeditionState.addExpeditionState(payload, options);
+ await models.ExpeditionState.addExpeditionState(ctx, payload, options);
await tx.rollback();
} catch (e) {
@@ -62,7 +62,7 @@ describe('expeditionState addExpeditionState()', () => {
}
];
- await models.ExpeditionState.addExpeditionState(payload, options);
+ await models.ExpeditionState.addExpeditionState(ctx, payload, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/sale/clone.js b/modules/ticket/back/methods/sale/clone.js
new file mode 100644
index 000000000..a5ccb6de4
--- /dev/null
+++ b/modules/ticket/back/methods/sale/clone.js
@@ -0,0 +1,122 @@
+module.exports = Self => {
+ Self.clone = async(ctx, salesIds, servicesIds, withWarehouse, group, negative, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+ const newTickets = [];
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const salesFilter = {
+ where: {id: {inq: salesIds}},
+ include: {
+ relation: 'components',
+ scope: {
+ fields: ['saleFk', 'componentFk', 'value']
+ }
+ }
+ };
+ const sales = await models.Sale.find(salesFilter, myOptions);
+ let ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
+
+ const mappedTickets = new Map();
+
+ if (group) ticketsIds = [ticketsIds[0]];
+
+ for (let ticketId of ticketsIds) {
+ const newTicket = await createTicket(
+ ctx,
+ ticketId,
+ withWarehouse,
+ negative,
+ myOptions
+ );
+ newTickets.push(newTicket);
+ mappedTickets.set(ticketId, newTicket.id);
+ }
+
+ for (const sale of sales) {
+ const newTicketId = mappedTickets.get(sale.ticketFk);
+
+ const createdSale = await models.Sale.create({
+ ticketFk: newTicketId,
+ itemFk: sale.itemFk,
+ quantity: negative ? - sale.quantity : sale.quantity,
+ concept: sale.concept,
+ price: sale.price,
+ discount: sale.discount,
+ }, myOptions);
+
+ const components = sale.components();
+ for (const component of components)
+ component.saleFk = createdSale.id;
+
+ await models.SaleComponent.create(components, myOptions);
+ }
+
+ if (servicesIds && servicesIds.length) {
+ const servicesFilter = {
+ where: {id: {inq: servicesIds}}
+ };
+ const services = await models.TicketService.find(servicesFilter, myOptions);
+
+ for (const service of services) {
+ const newTicketId = mappedTickets.get(service.ticketFk);
+
+ await models.TicketService.create({
+ description: service.description,
+ quantity: negative ? - service.quantity : service.quantity,
+ price: service.price,
+ taxClassFk: service.taxClassFk,
+ ticketFk: newTicketId,
+ ticketServiceTypeFk: service.ticketServiceTypeFk,
+ }, myOptions);
+ }
+ }
+
+ if (tx) await tx.commit();
+
+ return newTickets;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+
+ async function createTicket(
+ ctx,
+ ticketId,
+ withWarehouse,
+ negative,
+ myOptions
+ ) {
+ const models = Self.app.models;
+ const now = Date.vnNew();
+
+ const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+ ctx.args.clientId = ticket.clientFk;
+ ctx.args.shipped = now;
+ ctx.args.landed = now;
+ ctx.args.warehouseId = withWarehouse ? ticket.warehouseFk : null;
+ ctx.args.companyId = ticket.companyFk;
+ ctx.args.addressId = ticket.addressFk;
+
+ const newTicket = await models.Ticket.new(ctx, myOptions);
+
+ if (negative) {
+ await models.TicketRefund.create({
+ originalTicketFk: ticketId,
+ refundTicketFk: newTicket.id
+ }, myOptions);
+ }
+
+ return newTicket;
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/sale/deleteSales.js b/modules/ticket/back/methods/sale/deleteSales.js
index 5d1463a66..0207815a9 100644
--- a/modules/ticket/back/methods/sale/deleteSales.js
+++ b/modules/ticket/back/methods/sale/deleteSales.js
@@ -1,5 +1,3 @@
-let UserError = require('vn-loopback/util/user-error');
-
module.exports = Self => {
Self.remoteMethodCtx('deleteSales', {
description: 'Deletes the selected sales',
@@ -70,11 +68,11 @@ module.exports = Self => {
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Deleted sales from ticket', {
ticketId: ticketId,
- ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
+ ticketUrl: `${url}ticket/${ticketId}/sale`,
deletions: deletions
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index 3c41aab1e..17b70f12b 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -5,7 +5,8 @@ module.exports = Self => {
accepts: [
{
arg: 'salesIds',
- type: ['number']
+ type: ['number'],
+ required: true
},
{
arg: 'servicesIds',
@@ -40,124 +41,23 @@ module.exports = Self => {
myOptions.transaction = tx;
}
- let refundTicket = null;
try {
- const refundAgencyMode = await models.AgencyMode.findOne({
- include: {
- relation: 'zones',
- scope: {
- limit: 1,
- field: ['id', 'name']
- }
- },
- where: {code: 'refund'}
- }, myOptions);
-
- const refoundZoneId = refundAgencyMode.zones()[0].id;
-
- if (salesIds) {
- const salesFilter = {
- where: {id: {inq: salesIds}},
- include: {
- relation: 'components',
- scope: {
- fields: ['saleFk', 'componentFk', 'value']
- }
- }
- };
- const sales = await models.Sale.find(salesFilter, myOptions);
- const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
-
- const now = Date.vnNew();
- const [firstTicketId] = ticketsIds;
-
- // eslint-disable-next-line max-len
- refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions);
-
- for (const sale of sales) {
- const createdSale = await models.Sale.create({
- ticketFk: refundTicket.id,
- itemFk: sale.itemFk,
- quantity: - sale.quantity,
- concept: sale.concept,
- price: sale.price,
- discount: sale.discount,
- }, myOptions);
-
- const components = sale.components();
- for (const component of components)
- component.saleFk = createdSale.id;
-
- await models.SaleComponent.create(components, myOptions);
- }
- }
-
- if (!refundTicket) {
- const servicesFilter = {
- where: {id: {inq: servicesIds}}
- };
- const services = await models.TicketService.find(servicesFilter, myOptions);
- const ticketsIds = [...new Set(services.map(service => service.ticketFk))];
-
- const now = Date.vnNew();
- const [firstTicketId] = ticketsIds;
-
- // eslint-disable-next-line max-len
- refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions);
- }
-
- if (servicesIds && servicesIds.length > 0) {
- const servicesFilter = {
- where: {id: {inq: servicesIds}}
- };
- const services = await models.TicketService.find(servicesFilter, myOptions);
- for (const service of services) {
- await models.TicketService.create({
- description: service.description,
- quantity: service.quantity,
- price: - service.price,
- taxClassFk: service.taxClassFk,
- ticketFk: refundTicket.id,
- ticketServiceTypeFk: service.ticketServiceTypeFk,
- }, myOptions);
- }
- }
-
- const query = `CALL vn.ticket_recalc(?, NULL)`;
- await Self.rawSql(query, [refundTicket.id], myOptions);
+ const refundsTicket = await models.Sale.clone(
+ ctx,
+ salesIds,
+ servicesIds,
+ withWarehouse,
+ false,
+ true,
+ myOptions
+ );
if (tx) await tx.commit();
- return refundTicket;
+ return refundsTicket[0];
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
-
- async function createTicketRefund(ticketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions) {
- const models = Self.app.models;
-
- const filter = {include: {relation: 'address'}};
- const ticket = await models.Ticket.findById(ticketId, filter, myOptions);
-
- const refundTicket = await models.Ticket.create({
- clientFk: ticket.clientFk,
- shipped: now,
- addressFk: ticket.address().id,
- agencyModeFk: refundAgencyMode.id,
- nickname: ticket.address().nickname,
- warehouseFk: withWarehouse ? ticket.warehouseFk : null,
- companyFk: ticket.companyFk,
- landed: now,
- zoneFk: refoundZoneId
- }, myOptions);
-
- await models.TicketRefund.create({
- refundTicketFk: refundTicket.id,
- originalTicketFk: ticket.id,
- }, myOptions);
-
- return refundTicket;
- }
};
diff --git a/modules/ticket/back/methods/sale/reserve.js b/modules/ticket/back/methods/sale/reserve.js
index 2dc368af6..36db791fc 100644
--- a/modules/ticket/back/methods/sale/reserve.js
+++ b/modules/ticket/back/methods/sale/reserve.js
@@ -1,6 +1,3 @@
-
-let UserError = require('vn-loopback/util/user-error');
-
module.exports = Self => {
Self.remoteMethodCtx('reserve', {
description: 'Change the state of a ticket',
@@ -65,7 +62,8 @@ module.exports = Self => {
promises.push(reservedSale);
- changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity}) ${$t('State')}: ${$t(oldState)} ➔ *${$t(newState)}*`;
+ changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity})
+ ${$t('State')}: ${$t(oldState)} ➔ *${$t(newState)}*`;
}
}
@@ -87,11 +85,11 @@ module.exports = Self => {
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Changed sale reserved state', {
ticketId: ticketId,
- ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
+ ticketUrl: `${url}ticket/${ticketId}/sale`,
changes: changesMade
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
diff --git a/modules/ticket/back/methods/sale/specs/refund.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
index b81f7f84d..08eb1fabd 100644
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -3,7 +3,7 @@ const LoopBackContext = require('loopback-context');
describe('Sale refund()', () => {
const userId = 5;
- const ctx = {req: {accessToken: userId}};
+ const ctx = {req: {accessToken: userId}, args: {}};
const activeCtx = {
accessToken: {userId},
};
@@ -40,6 +40,7 @@ describe('Sale refund()', () => {
try {
const options = {transaction: tx};
+ const ticketsBefore = await models.Ticket.find({}, options);
const ticket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
@@ -61,12 +62,13 @@ describe('Sale refund()', () => {
}
]
}, options);
-
+ const ticketsAfter = await models.Ticket.find({}, options);
const salesLength = refundedTicket.ticketSales().length;
const componentsLength = refundedTicket.ticketSales()[0].components().length;
expect(refundedTicket).toBeDefined();
- expect(salesLength).toEqual(2);
+ expect(salesLength).toEqual(1);
+ expect(ticketsBefore.length).toEqual(ticketsAfter.length - 2);
expect(componentsLength).toEqual(4);
await tx.rollback();
diff --git a/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js b/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
deleted file mode 100644
index 8064ea30b..000000000
--- a/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
+++ /dev/null
@@ -1,162 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
-
-describe('sale updateQuantity()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
-
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
-
- it('should throw an error if the quantity is greater than it should be', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- const tx = await models.Sale.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
-
- await models.Sale.updateQuantity(ctx, 17, 99, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- error = e;
- }
-
- expect(error).toEqual(new Error('The new quantity should be smaller than the old one'));
- });
-
- it('should add quantity if the quantity is greater than it should be and is role advanced', async() => {
- const tx = await models.Sale.beginTransaction({});
- const saleId = 17;
- const buyerId = 35;
- const ctx = {
- req: {
- accessToken: {userId: buyerId},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
-
- try {
- const options = {transaction: tx};
-
- const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
-
- expect(isRoleAdvanced).toEqual(true);
-
- const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(originalLine.quantity).toEqual(30);
-
- const newQuantity = originalLine.quantity + 1;
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-
- it('should update the quantity of a given sale current line', async() => {
- const tx = await models.Sale.beginTransaction({});
- const saleId = 25;
- const newQuantity = 4;
-
- try {
- const options = {transaction: tx};
-
- const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(originalLine.quantity).toEqual(20);
-
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-
- it('should throw an error if the quantity is negative and it is not a refund ticket', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- const saleId = 17;
- const newQuantity = -10;
-
- const tx = await models.Sale.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
-
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- error = e;
- }
-
- expect(error).toEqual(new Error('You can only add negative amounts in refund tickets'));
- });
-
- it('should update a negative quantity when is a ticket refund', async() => {
- const tx = await models.Sale.beginTransaction({});
- const saleId = 13;
- const newQuantity = -10;
-
- try {
- const options = {transaction: tx};
-
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-});
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index 62e4ebd42..191fd09e3 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -1,5 +1,3 @@
-let UserError = require('vn-loopback/util/user-error');
-
module.exports = Self => {
Self.remoteMethodCtx('updatePrice', {
description: 'Changes the price of a sale',
@@ -100,7 +98,7 @@ module.exports = Self => {
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Changed sale price', {
ticketId: sale.ticket().id,
itemId: sale.itemFk,
@@ -108,8 +106,8 @@ module.exports = Self => {
quantity: sale.quantity,
oldPrice: oldPrice,
newPrice: newPrice,
- ticketUrl: `${origin}/#!/ticket/${sale.ticket().id}/sale`,
- itemUrl: `${origin}/#!/item/${sale.itemFk}/summary`
+ ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
+ itemUrl: `${url}item/${sale.itemFk}/summary`
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index edbc34e42..1a497da24 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -1,4 +1,3 @@
-let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('updateQuantity', {
@@ -64,32 +63,22 @@ module.exports = Self => {
const sale = await models.Sale.findById(id, filter, myOptions);
- const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
- if (newQuantity > sale.quantity && !isRoleAdvanced)
- throw new UserError('The new quantity should be smaller than the old one');
-
- const ticketRefund = await models.TicketRefund.findOne({
- where: {refundTicketFk: sale.ticketFk},
- fields: ['id']}
- , myOptions);
- if (newQuantity < 0 && !ticketRefund)
- throw new UserError('You can only add negative amounts in refund tickets');
-
const oldQuantity = sale.quantity;
const result = await sale.updateAttributes({quantity: newQuantity}, myOptions);
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Changed sale quantity', {
ticketId: sale.ticket().id,
itemId: sale.itemFk,
concept: sale.concept,
oldQuantity: oldQuantity,
newQuantity: newQuantity,
- ticketUrl: `${origin}/#!/ticket/${sale.ticket().id}/sale`,
- itemUrl: `${origin}/#!/item/${sale.itemFk}/summary`
+ ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
+ itemUrl: `${url}item/${sale.itemFk}/summary`
});
+
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index 9cd7f4d68..00310f33c 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -84,7 +84,7 @@ module.exports = Self => {
const query = `CALL vn.sale_calculateComponent(?, NULL)`;
await Self.rawSql(query, [sale.id], myOptions);
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const requesterId = request.requesterFk;
const message = $t('Bought units from buy request', {
@@ -92,8 +92,8 @@ module.exports = Self => {
concept: sale.concept,
itemId: sale.itemFk,
ticketId: sale.ticketFk,
- url: `${origin}/#!/ticket/${sale.ticketFk}/summary`,
- urlItem: `${origin}/#!/item/${sale.itemFk}/summary`
+ url: `${url}ticket/${sale.ticketFk}/summary`,
+ urlItem: `${url}item/${sale.itemFk}/summary`
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
diff --git a/modules/ticket/back/methods/ticket-request/deny.js b/modules/ticket/back/methods/ticket-request/deny.js
index 92f020083..44f1e48a1 100644
--- a/modules/ticket/back/methods/ticket-request/deny.js
+++ b/modules/ticket/back/methods/ticket-request/deny.js
@@ -50,12 +50,12 @@ module.exports = Self => {
const request = await Self.app.models.TicketRequest.findById(ctx.args.id, null, myOptions);
await request.updateAttributes(params, myOptions);
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const requesterId = request.requesterFk;
const message = $t('Deny buy request', {
ticketId: request.ticketFk,
- url: `${origin}/#!/ticket/${request.ticketFk}/request/index`,
+ url: `${url}ticket/${request.ticketFk}/request/index`,
observation: params.response
});
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index f27ea5018..10aaf02e5 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -99,6 +99,8 @@ module.exports = Self => {
switch (value) {
case 'pending':
return {'tr.isOk': null};
+ case 'accepted':
+ return {'tr.isOk': 1};
default:
return {'tr.isOk': value};
}
@@ -122,8 +124,7 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
const stmt = new ParameterizedSQL(
- `SELECT
- tr.id,
+ `SELECT tr.id,
tr.ticketFk,
tr.quantity,
tr.price,
@@ -133,18 +134,19 @@ module.exports = Self => {
tr.saleFk,
tr.requesterFk,
tr.isOk,
- s.quantity AS saleQuantity,
+ s.quantity saleQuantity,
s.itemFk,
- i.name AS itemDescription,
+ i.name itemDescription,
t.shipped,
- DATE(t.shipped) AS shippedDate,
+ DATE(t.shipped) shippedDate,
t.nickname,
t.warehouseFk,
t.clientFk,
- w.name AS warehouse,
- u.nickname AS salesPersonNickname,
- ua.name AS attenderName,
- c.salesPersonFk
+ w.name warehouse,
+ u.nickname salesPersonNickname,
+ ua.name attenderName,
+ c.salesPersonFk,
+ ua2.name requesterName
FROM ticketRequest tr
LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk
LEFT JOIN ticket t ON t.id = tr.ticketFk
@@ -155,7 +157,8 @@ module.exports = Self => {
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.id
LEFT JOIN worker wka ON wka.id = tr.attenderFk
- LEFT JOIN account.user ua ON ua.id = wka.id`);
+ LEFT JOIN account.user ua ON ua.id = wka.id
+ LEFT JOIN account.user ua2 ON ua2.id = tr.requesterFk`);
stmt.merge(conn.makeSuffix(filter));
return conn.executeStmt(stmt, myOptions);
diff --git a/modules/ticket/back/methods/ticket-tracking/setDelivered.js b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
index df482fd01..d3cdb192f 100644
--- a/modules/ticket/back/methods/ticket-tracking/setDelivered.js
+++ b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
@@ -47,7 +47,7 @@ module.exports = Self => {
const promises = [];
for (const id of ticketIds) {
- const promise = models.TicketTracking.changeState(ctx, {
+ const promise = await models.Ticket.state(ctx, {
stateFk: state.id,
workerFk: worker.id,
ticketFk: id
diff --git a/modules/ticket/back/methods/ticket/addSale.js b/modules/ticket/back/methods/ticket/addSale.js
index cbf884273..826de6e12 100644
--- a/modules/ticket/back/methods/ticket/addSale.js
+++ b/modules/ticket/back/methods/ticket/addSale.js
@@ -1,5 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
-
module.exports = Self => {
Self.remoteMethodCtx('addSale', {
description: 'Inserts a new sale for the current ticket',
@@ -63,17 +61,6 @@ module.exports = Self => {
}
}, myOptions);
- const itemInfo = await models.Item.getVisibleAvailable(
- itemId,
- ticket.warehouseFk,
- ticket.shipped,
- myOptions
- );
-
- const isPackaging = item.family == 'EMB';
- if (!isPackaging && itemInfo.available < quantity)
- throw new UserError(`This item is not available`);
-
const newSale = await models.Sale.create({
ticketFk: id,
itemFk: item.id,
@@ -94,11 +81,11 @@ module.exports = Self => {
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Added sale to ticket', {
ticketId: id,
- ticketUrl: `${origin}/#!/ticket/${id}/sale`,
+ ticketUrl: `${url}ticket/${id}/sale`,
addition: addition
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index 8aad8959b..f7c36f108 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -237,7 +237,7 @@ module.exports = Self => {
const salesPersonId = originalTicket.client().salesPersonFk;
if (salesPersonId) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
let changesMade = '';
for (let change in newProperties) {
@@ -249,7 +249,7 @@ module.exports = Self => {
const message = $t('Changed this data from the ticket', {
ticketId: args.id,
- ticketUrl: `${origin}/#!/ticket/${args.id}/sale`,
+ ticketUrl: `${url}ticket/${args.id}/sale`,
changes: changesMade
});
await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
diff --git a/modules/ticket/back/methods/ticket/getTicketsAdvance.js b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
index ec9314db2..ab40b9559 100644
--- a/modules/ticket/back/methods/ticket/getTicketsAdvance.js
+++ b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
@@ -28,32 +28,27 @@ module.exports = Self => {
{
arg: 'ipt',
type: 'string',
- description: 'Origin Item Packaging Type',
- required: false
+ description: 'Origin Item Packaging Type'
},
{
arg: 'futureIpt',
type: 'string',
- description: 'Destination Item Packaging Type',
- required: false
+ description: 'Destination Item Packaging Type'
},
{
arg: 'id',
type: 'number',
- description: 'Origin id',
- required: false
+ description: 'Origin id'
},
{
arg: 'futureId',
type: 'number',
- description: 'Destination id',
- required: false
+ description: 'Destination id'
},
{
arg: 'isFullMovable',
type: 'boolean',
- description: 'True when lines and stock of origin are equal',
- required: false
+ description: 'True when lines and stock of origin are equal'
},
{
arg: 'filter',
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index ca1bf15fb..fa3ee93af 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -77,9 +77,10 @@ module.exports = function(Self) {
if (tx) await tx.rollback();
throw e;
}
-
- for (const invoiceId of invoicesIds)
- await models.InvoiceOut.makePdfAndNotify(ctx, invoiceId, null);
+ if (tx) {
+ for (const invoiceId of invoicesIds)
+ await models.InvoiceOut.makePdfAndNotify(ctx, invoiceId, null);
+ }
return invoicesIds;
};
diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js
index 3c0da077f..1106cef06 100644
--- a/modules/ticket/back/methods/ticket/merge.js
+++ b/modules/ticket/back/methods/ticket/merge.js
@@ -25,7 +25,7 @@ module.exports = Self => {
Self.merge = async(ctx, tickets, options) => {
const httpRequest = ctx.req;
const $t = httpRequest.__;
- const origin = httpRequest.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const models = Self.app.models;
const myOptions = {};
let tx;
@@ -40,8 +40,8 @@ module.exports = Self => {
try {
for (let ticket of tickets) {
- const originFullPath = `${origin}/#!/ticket/${ticket.originId}/summary`;
- const destinationFullPath = `${origin}/#!/ticket/${ticket.destinationId}/summary`;
+ const originFullPath = `${url}ticket/${ticket.originId}/summary`;
+ const destinationFullPath = `${url}ticket/${ticket.destinationId}/summary`;
const message = $t('Ticket merged', {
originDated: dateUtil.toString(new Date(ticket.originShipped)),
destinationDated: dateUtil.toString(new Date(ticket.destinationShipped)),
diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js
index b461fb26d..288d38d77 100644
--- a/modules/ticket/back/methods/ticket/new.js
+++ b/modules/ticket/back/methods/ticket/new.js
@@ -48,7 +48,7 @@ module.exports = Self => {
description: `The route id filter`
}],
returns: {
- type: 'number',
+ type: 'object',
root: true
},
http: {
@@ -96,7 +96,7 @@ module.exports = Self => {
if (address.client().type().code === 'normal' && (!agencyMode || agencyMode.code != 'refund')) {
const canCreateTicket = await models.Client.canCreateTicket(args.clientId, myOptions);
if (!canCreateTicket)
- throw new UserError(`You can't create a ticket for a inactive client`);
+ throw new UserError(`You can't create a ticket for an inactive client`);
}
if (!args.shipped && args.landed) {
diff --git a/modules/ticket/back/methods/ticket/refund.js b/modules/ticket/back/methods/ticket/refund.js
index c99b6aa83..758384ae2 100644
--- a/modules/ticket/back/methods/ticket/refund.js
+++ b/modules/ticket/back/methods/ticket/refund.js
@@ -39,7 +39,6 @@ module.exports = Self => {
try {
const filter = {where: {ticketFk: {inq: ticketsIds}}};
-
const sales = await models.Sale.find(filter, myOptions);
const salesIds = sales.map(sale => sale.id);
diff --git a/modules/ticket/back/methods/ticket/restore.js b/modules/ticket/back/methods/ticket/restore.js
index 722c3294e..e268c3891 100644
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@@ -48,10 +48,10 @@ module.exports = Self => {
// Send notification to salesPerson
const salesPersonId = ticket.client().salesPersonFk;
if (salesPersonId) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t(`I have restored the ticket id`, {
id: id,
- url: `${origin}/#!/ticket/${id}/summary`
+ url: `${url}ticket/${id}/summary`
});
await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
}
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index fcd9972fe..9a9fd9056 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -119,10 +119,10 @@ module.exports = Self => {
// Send notification to salesPerson
const salesPersonUser = ticket.client().salesPersonUser();
if (salesPersonUser && sales.length) {
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const message = $t(`I have deleted the ticket id`, {
id: id,
- url: `${origin}/#!/ticket/${id}/summary`
+ url: `${url}ticket/${id}/summary`
});
await models.Chat.send(ctx, `@${salesPersonUser.name}`, message);
}
@@ -146,7 +146,8 @@ module.exports = Self => {
JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
JOIN vn.sale s ON s.id = sgd.saleFk
- WHERE s.ticketFk = ?;`, [ticket.id], myOptions);
+ WHERE s.ticketFk = ?;`, [ticket.id], myOptions
+ );
if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/specs/new.spec.js b/modules/ticket/back/methods/ticket/specs/new.spec.js
index 0a2f93bc4..9aa073a7b 100644
--- a/modules/ticket/back/methods/ticket/specs/new.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/new.spec.js
@@ -30,7 +30,7 @@ describe('ticket new()', () => {
await tx.rollback();
}
- expect(error).toEqual(new UserError(`You can't create a ticket for a inactive client`));
+ expect(error).toEqual(new UserError(`You can't create a ticket for an inactive client`));
});
it('should throw an error if the address doesnt exist', async() => {
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket/specs/state.spec.js
similarity index 87%
rename from modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
rename to modules/ticket/back/methods/ticket/specs/state.spec.js
index 175bc4e4b..9b5e80165 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/state.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
-describe('ticket changeState()', () => {
+describe('ticket state()', () => {
const salesPersonId = 18;
const employeeId = 1;
const productionId = 49;
@@ -47,7 +47,7 @@ describe('ticket changeState()', () => {
activeCtx.accessToken.userId = salesPersonId;
const params = {ticketFk: 2, stateFk: 3};
- await models.TicketTracking.changeState(ctx, params, options);
+ await models.Ticket.state(ctx, params, options);
await tx.rollback();
} catch (e) {
@@ -69,7 +69,7 @@ describe('ticket changeState()', () => {
activeCtx.accessToken.userId = employeeId;
const params = {ticketFk: 11, stateFk: 13};
- await models.TicketTracking.changeState(ctx, params, options);
+ await models.Ticket.state(ctx, params, options);
await tx.rollback();
} catch (e) {
@@ -80,7 +80,8 @@ describe('ticket changeState()', () => {
expect(error.code).toBe('ACCESS_DENIED');
});
- it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => {
+ it('should be able to create a ticket tracking line for a not' +
+ ' editable ticket if the user has the production role', async() => {
const tx = await models.TicketTracking.beginTransaction({});
try {
@@ -91,7 +92,7 @@ describe('ticket changeState()', () => {
activeCtx.accessToken.userId = productionId;
const params = {ticketFk: ticket.id, stateFk: 3};
- const ticketTracking = await models.TicketTracking.changeState(ctx, params, options);
+ const ticketTracking = await models.Ticket.state(ctx, params, options);
expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk);
expect(ticketTracking.__data.stateFk).toBe(params.stateFk);
@@ -105,7 +106,8 @@ describe('ticket changeState()', () => {
}
});
- it('should update the ticket tracking line when the user is salesperson, uses the state assigned and a valid worker id', async() => {
+ it('should update the ticket tracking line when the user is salesperson,' +
+ ' uses the state assigned and a valid worker id', async() => {
const tx = await models.TicketTracking.beginTransaction({});
try {
@@ -115,7 +117,7 @@ describe('ticket changeState()', () => {
const ctx = {req: {accessToken: {userId: 18}}};
const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
const params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
- const res = await models.TicketTracking.changeState(ctx, params, options);
+ const res = await models.Ticket.state(ctx, params, options);
expect(res.__data.ticketFk).toBe(params.ticketFk);
expect(res.__data.stateFk).toBe(params.stateFk);
diff --git a/modules/ticket/back/methods/ticket-tracking/changeState.js b/modules/ticket/back/methods/ticket/state.js
similarity index 94%
rename from modules/ticket/back/methods/ticket-tracking/changeState.js
rename to modules/ticket/back/methods/ticket/state.js
index dbef8762e..01bfbba20 100644
--- a/modules/ticket/back/methods/ticket-tracking/changeState.js
+++ b/modules/ticket/back/methods/ticket/state.js
@@ -1,7 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethodCtx('changeState', {
+ Self.remoteMethodCtx('state', {
description: 'Change the state of a ticket',
accessType: 'WRITE',
accepts: [
@@ -18,12 +18,12 @@ module.exports = Self => {
root: true
},
http: {
- path: `/changeState`,
+ path: `/state`,
verb: 'POST'
}
});
- Self.changeState = async(ctx, params, options) => {
+ Self.state = async(ctx, params, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 1124f7ec7..54306510c 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -66,7 +66,7 @@ module.exports = Self => {
const ticket = await models.Ticket.findById(id);
const canCreateTicket = await models.Client.canCreateTicket(ticket.clientFk);
if (!canCreateTicket)
- throw new UserError(`You can't create a ticket for a inactive client`);
+ throw new UserError(`You can't create a ticket for an inactive client`);
ticketId = await cloneTicket(originalTicket, myOptions);
}
@@ -138,14 +138,15 @@ module.exports = Self => {
// Update original sale
const rest = originalSale.quantity - sale.quantity;
query = `UPDATE sale
- SET quantity = ?
+ SET quantity = ?,
+ originalQuantity = ?
WHERE id = ?`;
- await Self.rawSql(query, [rest, sale.id], options);
+ await Self.rawSql(query, [rest, rest, sale.id], options);
// Clone sale with new quantity
- query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed,
+ query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, discount, priceFixed,
reserved, isPicked, isPriceFixed, isAdded)
- SELECT itemFk, ?, concept, ?, originalQuantity, price, discount, priceFixed,
+ SELECT itemFk, ?, concept, ?, price, discount, priceFixed,
reserved, isPicked, isPriceFixed, isAdded
FROM sale
WHERE id = ?`;
diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index e092ee4ed..2e8bec27a 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -165,11 +165,10 @@ module.exports = Self => {
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
- const origin = ctx.req.headers.origin;
-
+ const url = await Self.app.models.Url.getUrl();
const message = $t('Changed sale discount', {
ticketId: id,
- ticketUrl: `${origin}/#!/ticket/${id}/sale`,
+ ticketUrl: `${url}ticket/${id}/sale`,
changes: changesMade
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
diff --git a/modules/ticket/back/models/expeditionScan.json b/modules/ticket/back/models/expeditionScan.json
index 1db2c1238..7b95eff1e 100644
--- a/modules/ticket/back/models/expeditionScan.json
+++ b/modules/ticket/back/models/expeditionScan.json
@@ -8,17 +8,16 @@
"properties": {
"id": {
"type": "number",
- "description": "Identifier"
+ "description": "Identifier",
+ "id": true
},
"expeditionFk": {
"type": "number",
- "description": "Identifier",
- "id": true
+ "description": "Identifier"
},
"palletFk": {
"type": "number",
- "description": "Identifier",
- "id": true
+ "description": "Identifier"
},
"scanned": {
"type": "date",
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index ae247fc24..3589eac4b 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -1,3 +1,6 @@
+const UserError = require('vn-loopback/util/user-error');
+const LoopBackContext = require('loopback-context');
+
module.exports = Self => {
require('../methods/sale/getClaimableFromTicket')(Self);
require('../methods/sale/reserve')(Self);
@@ -9,8 +12,107 @@ module.exports = Self => {
require('../methods/sale/refund')(Self);
require('../methods/sale/canEdit')(Self);
require('../methods/sale/usesMana')(Self);
+ require('../methods/sale/clone')(Self);
Self.validatesPresenceOf('concept', {
message: `Concept cannot be blank`
});
+
+ Self.observe('before save', async ctx => {
+ const models = Self.app.models;
+ const changes = ctx.data || ctx.instance;
+ const instance = ctx.currentInstance;
+
+ const newQuantity = changes?.quantity;
+ if (newQuantity == null) return;
+
+ const loopBackContext = LoopBackContext.getCurrentContext();
+ ctx.req = loopBackContext.active;
+ if (await models.ACL.checkAccessAcl(ctx, 'Sale', 'canForceQuantity', 'WRITE')) return;
+
+ const ticketId = changes?.ticketFk || instance?.ticketFk;
+ const itemId = changes?.itemFk || instance?.itemFk;
+ const oldQuantity = instance?.quantity ?? null;
+ const quantityAdded = newQuantity - oldQuantity;
+ const isReduction = oldQuantity && newQuantity <= oldQuantity;
+
+ const ticket = await models.Ticket.findById(
+ ticketId,
+ {
+ fields: ['id', 'clientFk', 'warehouseFk', 'addressFk', 'agencyModeFk', 'shipped', 'landed'],
+ include: {
+ relation: 'client',
+ scope: {
+ fields: ['id', 'clientTypeFk'],
+ include: {
+ relation: 'type',
+ scope: {
+ fields: ['code', 'description']
+ }
+ }
+ }
+ }
+ },
+ ctx.options);
+ if (ticket?.client()?.type()?.code === 'loses') return;
+
+ const isRefund = await models.TicketRefund.findOne({
+ fields: ['id'],
+ where: {refundTicketFk: ticketId}
+ }, ctx.options);
+ if (isRefund) return;
+
+ if (newQuantity < 0)
+ throw new UserError('You can only add negative amounts in refund tickets');
+
+ const item = await models.Item.findOne({
+ fields: ['family', 'minQuantity'],
+ where: {id: itemId},
+ }, ctx.options);
+ if (item.family == 'EMB') return;
+
+ if (await models.ACL.checkAccessAcl(ctx, 'Sale', 'isInPreparing', '*')) return;
+
+ await models.Sale.rawSql(`CALL catalog_calcFromItem(?,?,?,?)`, [
+ ticket.landed,
+ ticket.addressFk,
+ ticket.agencyModeFk,
+ itemId
+ ],
+ ctx.options);
+
+ const [itemInfo] = await models.Sale.rawSql(`SELECT available FROM tmp.ticketCalculateItem`, null, ctx.options);
+ const available = itemInfo?.available;
+
+ if ((!isReduction && !available) || available < quantityAdded)
+ throw new UserError(`This item is not available`);
+
+ if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return;
+
+ if (newQuantity < item.minQuantity && newQuantity != available)
+ throw new UserError('The amount cannot be less than the minimum');
+
+ if (ctx.isNewInstance || isReduction) return;
+
+ const [saleGrouping] = await models.Sale.rawSql(`
+ SELECT t.price newPrice
+ FROM tmp.ticketComponentPrice t
+ ORDER BY (t.grouping <= ?) DESC, t.grouping ASC
+ LIMIT 1`,
+ [quantityAdded],
+ ctx.options);
+
+ await models.Sale.rawSql(`
+ DROP TEMPORARY TABLE IF EXISTS
+ tmp.ticketCalculateItem,
+ tmp.ticketComponentPrice,
+ tmp.ticketComponent,
+ tmp.ticketLot,
+ tmp.zoneGetShipped;
+ `, null, ctx.options);
+
+ if (!saleGrouping?.newPrice || saleGrouping.newPrice > instance.price)
+ throw new UserError('The price of the item changed');
+ });
};
+
diff --git a/modules/ticket/back/models/specs/sale.spec.js b/modules/ticket/back/models/specs/sale.spec.js
new file mode 100644
index 000000000..4af44c991
--- /dev/null
+++ b/modules/ticket/back/models/specs/sale.spec.js
@@ -0,0 +1,361 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
+
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('sale model ', () => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ function getActiveCtx(userId) {
+ return {
+ active: {
+ accessToken: {userId},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ }
+ };
+ }
+
+ describe('quantity field ', () => {
+ it('should add quantity if the quantity is greater than it should be and is role advanced', async() => {
+ const saleId = 17;
+ const buyerId = 35;
+ const ctx = {
+ req: {
+ accessToken: {userId: buyerId},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const tx = await models.Sale.beginTransaction({});
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(buyerId));
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
+ SELECT 100 as available;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ try {
+ const options = {transaction: tx};
+
+ const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
+
+ expect(isRoleAdvanced).toEqual(true);
+
+ const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+
+ expect(originalLine.quantity).toEqual(30);
+
+ const newQuantity = originalLine.quantity + 1;
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+
+ expect(modifiedLine.quantity).toEqual(newQuantity);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should update the quantity of a given sale current line', async() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+
+ const tx = await models.Sale.beginTransaction({});
+ const saleId = 25;
+ const newQuantity = 4;
+
+ try {
+ const options = {transaction: tx};
+
+ const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+
+ expect(originalLine.quantity).toEqual(20);
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+
+ expect(modifiedLine.quantity).toEqual(newQuantity);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an error if the quantity is negative and it is not a refund ticket', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const saleId = 17;
+ const newQuantity = -10;
+
+ const tx = await models.Sale.beginTransaction({});
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error('You can only add negative amounts in refund tickets'));
+ });
+
+ it('should update a negative quantity when is a ticket refund', async() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+
+ const tx = await models.Sale.beginTransaction({});
+ const saleId = 13;
+ const newQuantity = -10;
+
+ try {
+ const options = {transaction: tx};
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+
+ expect(modifiedLine.quantity).toEqual(newQuantity);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an error if the quantity is less than the minimum quantity of the item', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const tx = await models.Sale.beginTransaction({});
+ const itemId = 2;
+ const saleId = 17;
+ const minQuantity = 30;
+ const newQuantity = minQuantity - 1;
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const item = await models.Item.findById(itemId, null, options);
+ await item.updateAttribute('minQuantity', minQuantity, options);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
+ SELECT 100 as available;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error('The amount cannot be less than the minimum'));
+ });
+
+ it('should change quantity if has minimum quantity and new quantity is equal than item available', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const tx = await models.Sale.beginTransaction({});
+ const itemId = 2;
+ const saleId = 17;
+ const minQuantity = 30;
+ const newQuantity = minQuantity - 1;
+
+ try {
+ const options = {transaction: tx};
+
+ const item = await models.Item.findById(itemId, null, options);
+ await item.updateAttribute('minQuantity', minQuantity, options);
+
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
+ SELECT ${newQuantity} as available;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ describe('newPrice', () => {
+ it('should increase quantity if you have enough available and the new price is the same as the previous one', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const tx = await models.Sale.beginTransaction({});
+ const itemId = 2;
+ const saleId = 17;
+ const minQuantity = 30;
+ const newQuantity = 31;
+
+ try {
+ const options = {transaction: tx};
+
+ const item = await models.Item.findById(itemId, null, options);
+ await item.updateAttribute('minQuantity', minQuantity, options);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 7.07 as price;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should increase quantity when the new price is lower than the previous one', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const tx = await models.Sale.beginTransaction({});
+ const itemId = 2;
+ const saleId = 17;
+ const minQuantity = 30;
+ const newQuantity = 31;
+
+ try {
+ const options = {transaction: tx};
+
+ const item = await models.Item.findById(itemId, null, options);
+ await item.updateAttribute('minQuantity', minQuantity, options);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 1 as price;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw error when increase quantity and the new price is higher than the previous one', async() => {
+ const ctx = {
+ req: {
+ accessToken: {userId: 1},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+ const tx = await models.Sale.beginTransaction({});
+ const itemId = 2;
+ const saleId = 17;
+ const minQuantity = 30;
+ const newQuantity = 31;
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const item = await models.Item.findById(itemId, null, options);
+ await item.updateAttribute('minQuantity', minQuantity, options);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 100000 as price;`;
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, options);
+ });
+
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error('The price of the item changed'));
+ });
+ });
+ });
+});
diff --git a/modules/ticket/back/models/ticket-collection.json b/modules/ticket/back/models/ticket-collection.json
index e941ac2ce..4bd34f08e 100644
--- a/modules/ticket/back/models/ticket-collection.json
+++ b/modules/ticket/back/models/ticket-collection.json
@@ -10,6 +10,9 @@
"id": {
"id": true,
"type": "number"
+ },
+ "usedShelves": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-tracking.js b/modules/ticket/back/models/ticket-tracking.js
index 2e6d3403e..92e046d3e 100644
--- a/modules/ticket/back/models/ticket-tracking.js
+++ b/modules/ticket/back/models/ticket-tracking.js
@@ -1,5 +1,4 @@
module.exports = function(Self) {
- require('../methods/ticket-tracking/changeState')(Self);
require('../methods/ticket-tracking/setDelivered')(Self);
Self.validatesPresenceOf('stateFk', {message: 'State cannot be blank'});
diff --git a/modules/ticket/back/models/ticket.js b/modules/ticket/back/models/ticket.js
index ea068ef8a..1930765fb 100644
--- a/modules/ticket/back/models/ticket.js
+++ b/modules/ticket/back/models/ticket.js
@@ -1,4 +1,4 @@
module.exports = Self => {
- // Methods
require('./ticket-methods')(Self);
+ require('../methods/ticket/state')(Self);
};
diff --git a/modules/ticket/front/advance-search-panel/index.js b/modules/ticket/front/advance-search-panel/index.js
index 8ddbe78d4..218fb14d3 100644
--- a/modules/ticket/front/advance-search-panel/index.js
+++ b/modules/ticket/front/advance-search-panel/index.js
@@ -16,8 +16,8 @@ class Controller extends SearchPanel {
this.$http.get('ItemPackingTypes', {filter}).then(res => {
for (let ipt of res.data) {
itemPackingTypes.push({
- code: ipt.code,
- description: this.$t(ipt.description)
+ description: this.$t(ipt.description),
+ code: ipt.code
});
}
this.itemPackingTypes = itemPackingTypes;
diff --git a/modules/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index e6f16c965..a6cf8face 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -81,6 +81,9 @@
Liters
|
+
+ Zone
+ |
Not Movable
|
@@ -155,6 +158,7 @@
|
{{::ticket.futureLiters | dashIfEmpty}} |
+ {{::ticket.futureZoneName | dashIfEmpty}} |
{{::ticket.notMovableLines | dashIfEmpty}} |
{{::ticket.futureLines | dashIfEmpty}} |
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index 0cec41227..389bcdf14 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -15,28 +15,22 @@ export default class Controller extends Section {
{
field: 'state',
searchable: false
- },
- {
+ }, {
field: 'futureState',
searchable: false
- },
- {
+ }, {
field: 'totalWithVat',
searchable: false
- },
- {
+ }, {
field: 'futureTotalWithVat',
searchable: false
- },
- {
+ }, {
field: 'shipped',
searchable: false
- },
- {
+ }, {
field: 'futureShipped',
searchable: false
- },
- {
+ }, {
field: 'ipt',
autocomplete: {
url: 'ItemPackingTypes',
@@ -44,8 +38,7 @@ export default class Controller extends Section {
showField: 'description',
valueField: 'code'
}
- },
- {
+ }, {
field: 'futureIpt',
autocomplete: {
url: 'ItemPackingTypes',
@@ -53,6 +46,11 @@ export default class Controller extends Section {
showField: 'description',
valueField: 'code'
}
+ }, {
+ field: 'futureZoneFk',
+ autocomplete: {
+ url: 'Zones',
+ }
},
]
};
@@ -158,37 +156,21 @@ export default class Controller extends Section {
exprBuilder(param, value) {
switch (param) {
case 'id':
- return {'id': value};
case 'futureId':
- return {'futureId': value};
case 'liters':
- return {'liters': value};
- case 'lines':
- return {'lines': value};
case 'futureLiters':
- return {'futureLiters': value};
+ case 'lines':
case 'futureLines':
- return {'futureLines': value};
- case 'ipt':
- return {or:
- [
- {'ipt': {like: `%${value}%`}},
- {'ipt': null}
- ]
- };
- case 'futureIpt':
- return {or:
- [
- {'futureIpt': {like: `%${value}%`}},
- {'futureIpt': null}
- ]
- };
case 'totalWithVat':
- return {'totalWithVat': value};
case 'futureTotalWithVat':
- return {'futureTotalWithVat': value};
+ case 'futureZone':
case 'notMovableLines':
- return {'notMovableLines': value};
+ case 'futureZoneFk':
+ return {[param]: value};
+ case 'ipt':
+ return {'ipt': {like: `%${value}%`}};
+ case 'futureIpt':
+ return {'futureIpt': {like: `%${value}%`}};
}
}
}
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index d1f39fd19..18db8c147 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -201,7 +201,7 @@ class Controller extends Section {
sendImportSms() {
const params = {
ticketId: this.id,
- created: this.ticket.updated
+ shipped: this.ticket.shipped
};
this.showSMSDialog({
message: this.$t('Minimum is needed', params)
diff --git a/modules/ticket/front/descriptor/locale/en.yml b/modules/ticket/front/descriptor/locale/en.yml
index 8eed2265d..698d699d7 100644
--- a/modules/ticket/front/descriptor/locale/en.yml
+++ b/modules/ticket/front/descriptor/locale/en.yml
@@ -1,3 +1,3 @@
Make a payment: "Verdnatura communicates:\rYour order is pending of payment.\rPlease, enter the web page and make the payment with card.\rThank you."
-Minimum is needed: "Verdnatura communicates:\rA minimum import of 50€ (Without BAT) is needed for your order {{ticketId}} from date {{created | date: 'dd/MM/yyyy'}} to receive it with no extra fees."
+Minimum is needed: "Verdnatura communicates:\rA minimum import of 50€ (Without BAT) is needed for your order {{ticketId}} from date {{shipped | date: 'dd/MM/yyyy'}} to receive it with no extra fees."
Send changes: "Verdnatura communicates:\rOrder {{ticketId}} date {{created | date: 'dd/MM/yyyy'}}\r{{changes}}"
diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml
index 86b1a6b57..b809c1b83 100644
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@@ -3,8 +3,8 @@ Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Show pallet report: Ver hoja de pallet
Change shipped hour: Cambiar hora de envío
Shipped hour: Hora de envío
-Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
-Minimum is needed: "Verdnatura le recuerda:\rEs necesario un importe mínimo de 50€ (Sin IVA) en su pedido {{ticketId}} del día {{created | date: 'dd/MM/yyyy'}} para recibirlo sin portes adicionales."
+Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectúe el pago con tarjeta.\rMuchas gracias."
+Minimum is needed: "Verdnatura le recuerda:\rEs necesario un importe mínimo de 50€ (Sin IVA) en su pedido {{ticketId}} del día {{shipped | date: 'dd/MM/yyyy'}} para recibirlo sin portes adicionales."
Ticket invoiced: Ticket facturado
Make invoice: Crear factura
Regenerate invoice PDF: Regenerar PDF factura
diff --git a/modules/ticket/front/index/locale/es.yml b/modules/ticket/front/index/locale/es.yml
index afa3d654e..89828d4d9 100644
--- a/modules/ticket/front/index/locale/es.yml
+++ b/modules/ticket/front/index/locale/es.yml
@@ -18,3 +18,4 @@ Multiple invoice: Factura múltiple
Make invoice...: Crear factura...
Invoice selected tickets: Facturar tickets seleccionados
Are you sure to invoice tickets: ¿Seguro que quieres facturar {{ticketsAmount}} tickets?
+Rounding: Redondeo
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index b10df317b..262395d16 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -15,7 +15,7 @@
+ on-change="$ctrl.state(value)">
-
+
{
- this.currentWorkerMana = res.data;
- });
}
getUsesMana() {
@@ -179,9 +171,9 @@ class Controller extends Section {
this.card.reload();
}
- changeState(value) {
+ state(value) {
const params = {ticketFk: this.$params.id, code: value};
- return this.$http.post('TicketTrackings/changeState', params).then(() => {
+ return this.$http.post('Tickets/state', params).then(() => {
this.vnApp.showSuccess(this.$t('Data saved!'));
this.card.reload();
}).finally(() => this.resetChanges());
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index 9da8e6e7c..70781eb58 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -120,12 +120,10 @@ describe('Ticket', () => {
const expectedAmount = 250;
$httpBackend.expect('GET', 'Tickets/1/getSalesPersonMana').respond(200, expectedAmount);
$httpBackend.expect('GET', 'Sales/usesMana').respond(200);
- $httpBackend.expect('GET', 'WorkerManas/getCurrentWorkerMana').respond(200, expectedAmount);
controller.getMana();
$httpBackend.flush();
expect(controller.edit.mana).toEqual(expectedAmount);
- expect(controller.currentWorkerMana).toEqual(expectedAmount);
});
});
@@ -230,15 +228,16 @@ describe('Ticket', () => {
});
});
- describe('changeState()', () => {
- it('should make an HTTP post query, then call the showSuccess(), reload() and resetChanges() methods', () => {
+ describe('state()', () => {
+ it('should make an HTTP post query, then call the showSuccess(),' +
+ ' reload() and resetChanges() methods', () => {
jest.spyOn(controller.card, 'reload').mockReturnThis();
jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
jest.spyOn(controller, 'resetChanges').mockReturnThis();
const expectedParams = {ticketFk: 1, code: 'OK'};
- $httpBackend.expect('POST', `TicketTrackings/changeState`, expectedParams).respond(200);
- controller.changeState('OK');
+ $httpBackend.expect('POST', `Tickets/state`, expectedParams).respond(200);
+ controller.state('OK');
$httpBackend.flush();
expect(controller.card.reload).toHaveBeenCalledWith();
@@ -248,7 +247,8 @@ describe('Ticket', () => {
});
describe('removeSales()', () => {
- it('should make an HTTP post query, then call the showSuccess(), removeSelectedSales() and resetChanges() methods', () => {
+ it('should make an HTTP post query, then call the showSuccess(),' +
+ ' removeSelectedSales() and resetChanges() methods', () => {
jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
jest.spyOn(controller, 'removeSelectedSales').mockReturnThis();
jest.spyOn(controller, 'resetChanges').mockReturnThis();
@@ -354,7 +354,8 @@ describe('Ticket', () => {
});
describe('updatePrice()', () => {
- it('should make an HTTP POST query, update the sale price and then call to the resetChanges() method', () => {
+ it('should make an HTTP POST query, update the sale price ' +
+ 'and then call to the resetChanges() method', () => {
jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
jest.spyOn(controller, 'resetChanges').mockReturnThis();
@@ -420,7 +421,8 @@ describe('Ticket', () => {
expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
});
- it('should not call to the updateDiscount() method and then to the editDiscountDialog hide() method', () => {
+ it('should not call to the updateDiscount() method and then' +
+ ' to the editDiscountDialog hide() method', () => {
jest.spyOn(controller, 'updateDiscount').mockReturnThis();
const firstSelectedSale = controller.sales[0];
@@ -446,7 +448,8 @@ describe('Ticket', () => {
});
describe('updateDiscount()', () => {
- it('should make an HTTP POST query, update the sales discount and then call to the resetChanges() method', () => {
+ it('should make an HTTP POST query, update the sales discount ' +
+ 'and then call to the resetChanges() method', () => {
jest.spyOn(controller, 'resetChanges').mockReturnThis();
jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index bc288a8a2..5128873c4 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -29,7 +29,7 @@
disabled="watcher.dataChanged() || !$ctrl.checkeds.length"
label="Pay"
ng-click="$ctrl.createRefund()"
- vn-acl="invoicing, claimManager, salesAssistant"
+ vn-acl="invoicing, claimManager, salesAssistant, buyer"
vn-acl-action="remove">
@@ -37,7 +37,9 @@
+ disabled="!service.id"
+ vn-acl="invoicing, claimManager, salesAssistant, buyer"
+ vn-acl-action="remove">
+ step="0.01"
+ min="0">
+ on-change="$ctrl.state(value)">
+ >
+
+ >
+
+ ng-if="$ctrl.summary.client.phone != null">
+
+ ng-if="$ctrl.summary.client.mobile != null">
+
@@ -202,7 +212,7 @@
{{::sale.quantity}}
- {{::sale.item.name}}
+ {{::sale.concept}}
{{::sale.item.subName}}
diff --git a/modules/ticket/front/summary/index.js b/modules/ticket/front/summary/index.js
index 60394b5b3..9d161f63e 100644
--- a/modules/ticket/front/summary/index.js
+++ b/modules/ticket/front/summary/index.js
@@ -59,13 +59,12 @@ class Controller extends Summary {
this.$.invoiceOutDescriptor.show(event.target, this.summary.invoiceOut.id);
}
- changeState(value) {
+ state(value) {
const params = {
ticketFk: 'id' in this.ticket ? this.ticket.id : this.$params.id,
code: value
};
-
- this.$http.post(`TicketTrackings/changeState`, params)
+ this.$http.post(`Tickets/state`, params)
.then(() => {
if ('id' in this.$params) this.reload();
})
diff --git a/modules/ticket/front/summary/index.spec.js b/modules/ticket/front/summary/index.spec.js
index 599da73ae..6837bfd54 100644
--- a/modules/ticket/front/summary/index.spec.js
+++ b/modules/ticket/front/summary/index.spec.js
@@ -43,15 +43,15 @@ describe('Ticket', () => {
});
});
- describe('changeState()', () => {
+ describe('state()', () => {
it('should change the state', () => {
jest.spyOn(controller.vnApp, 'showSuccess');
const value = 'myTicketState';
let res = {id: 1, nickname: 'myNickname'};
$httpBackend.when('GET', `Tickets/1/summary`).respond(200, res);
- $httpBackend.expectPOST(`TicketTrackings/changeState`).respond(200, 'ok');
- controller.changeState(value);
+ $httpBackend.expectPOST(`Tickets/state`).respond(200, 'ok');
+ controller.state(value);
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
diff --git a/modules/ticket/front/summary/style.scss b/modules/ticket/front/summary/style.scss
index e92ff0d42..2f52de65e 100644
--- a/modules/ticket/front/summary/style.scss
+++ b/modules/ticket/front/summary/style.scss
@@ -47,4 +47,9 @@ vn-ticket-summary .summary {
}
}
}
+
+ vn-icon.tel {
+ font-size: 1.1em;
+ vertical-align: bottom;
+ }
}
\ No newline at end of file
diff --git a/modules/ticket/front/tracking/edit/index.html b/modules/ticket/front/tracking/edit/index.html
index bff8e71b1..47f367007 100644
--- a/modules/ticket/front/tracking/edit/index.html
+++ b/modules/ticket/front/tracking/edit/index.html
@@ -1,4 +1,4 @@
-
+
{
+ this.$http.post(`Tickets/state`, this.params).then(() => {
this.$.watcher.updateOriginalData();
this.card.reload();
this.vnApp.showSuccess(this.$t('Data saved!'));
diff --git a/modules/ticket/front/tracking/edit/index.spec.js b/modules/ticket/front/tracking/edit/index.spec.js
index 1ba5912b5..9d9aa7983 100644
--- a/modules/ticket/front/tracking/edit/index.spec.js
+++ b/modules/ticket/front/tracking/edit/index.spec.js
@@ -61,7 +61,7 @@ describe('Ticket', () => {
jest.spyOn(controller.vnApp, 'showSuccess');
jest.spyOn(controller.$state, 'go');
- $httpBackend.expectPOST(`TicketTrackings/changeState`, controller.params).respond({});
+ $httpBackend.expectPOST(`Tickets/state`, controller.params).respond({});
controller.onSubmit();
$httpBackend.flush();
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 388ba52a1..488297318 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -132,12 +132,18 @@ module.exports = Self => {
s.nickname AS cargoSupplierNickname,
s.name AS supplierName,
CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
- CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
+ CAST(
+ SUM(
+ vc.aerealVolumetricDensity *
+ b.stickers *
+ IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
+ ) as DECIMAL(10,0)
+ ) as volumeKg
FROM travel t
LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
LEFT JOIN entry e ON e.travelFk = t.id
LEFT JOIN buy b ON b.entryFk = e.id
- LEFT JOIN packaging pkg ON pkg.id = b.packageFk
+ LEFT JOIN packaging pkg ON pkg.id = b.packagingFk
LEFT JOIN item i ON i.id = b.itemFk
LEFT JOIN itemType it ON it.id = i.typeFk
JOIN warehouse w ON w.id = t.warehouseInFk
@@ -169,11 +175,17 @@ module.exports = Self => {
e.evaNotes,
e.invoiceAmount,
CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
- CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
+ CAST(
+ SUM(
+ vc.aerealVolumetricDensity *
+ b.stickers *
+ IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
+ ) AS DECIMAL(10,0)
+ ) as volumeKg
FROM tmp.travel tr
JOIN entry e ON e.travelFk = tr.id
JOIN buy b ON b.entryFk = e.id
- JOIN packaging pkg ON pkg.id = b.packageFk
+ JOIN packaging pkg ON pkg.id = b.packagingFk
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk
JOIN supplier s ON s.id = e.supplierFk
diff --git a/modules/travel/back/methods/travel/getEntries.js b/modules/travel/back/methods/travel/getEntries.js
index 71bb0d8fb..50088ccfa 100644
--- a/modules/travel/back/methods/travel/getEntries.js
+++ b/modules/travel/back/methods/travel/getEntries.js
@@ -47,7 +47,7 @@ module.exports = Self => {
LEFT JOIN vn.buy b ON b.entryFk = e.id
LEFT JOIN vn.supplier s ON e.supplierFk = s.id
JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN vn.packaging p ON p.id = b.packageFk
+ LEFT JOIN vn.packaging p ON p.id = b.packagingFk
JOIN vn.packaging pcc ON pcc.id = 'cc'
JOIN vn.packaging ppallet ON ppallet.id = 'pallet 100'
JOIN vn.packagingConfig pconfig
diff --git a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js b/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
deleted file mode 100644
index fa34af475..000000000
--- a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = Self => {
- Self.remoteMethodCtx('getCurrentWorkerMana', {
- description: 'Returns the mana of the logged worker',
- accessType: 'READ',
- accepts: [],
- returns: {
- type: 'number',
- root: true
- },
- http: {
- path: `/getCurrentWorkerMana`,
- verb: 'GET'
- }
- });
-
- Self.getCurrentWorkerMana = async ctx => {
- let userId = ctx.req.accessToken.userId;
-
- let workerMana = await Self.app.models.WorkerMana.findOne({
- where: {workerFk: userId},
- fields: 'amount'
- });
-
- return workerMana ? workerMana.amount : 0;
- };
-};
diff --git a/modules/worker/back/methods/worker-mana/specs/getCurrentWorkerMana.spec.js b/modules/worker/back/methods/worker-mana/specs/getCurrentWorkerMana.spec.js
deleted file mode 100644
index 8d626e720..000000000
--- a/modules/worker/back/methods/worker-mana/specs/getCurrentWorkerMana.spec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('workerMana getCurrentWorkerMana()', () => {
- it('should get the mana of the logged worker', async() => {
- let mana = await app.models.WorkerMana.getCurrentWorkerMana({req: {accessToken: {userId: 18}}});
-
- expect(mana).toEqual(124);
- });
-
- it('should return 0 if the user doesnt uses mana', async() => {
- let mana = await app.models.WorkerMana.getCurrentWorkerMana({req: {accessToken: {userId: 9}}});
-
- expect(mana).toEqual(0);
- });
-});
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 2c5143612..6f67bbea3 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -66,46 +66,36 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate');
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate');
+ const destroyAllWhere = {
+ timed: {between: [started, ended]},
+ isSendMail: true
+ };
+ const updateAllWhere = {
+ year: args.year,
+ week: args.week
+ };
+
+ const tmpUserSQL = `
+ CREATE OR REPLACE TEMPORARY TABLE tmp.user
+ SELECT id as userFk
+ FROM vn.worker`;
+ let tmpUser = new ParameterizedSQL(tmpUserSQL);
+
if (args.workerId) {
- await models.WorkerTimeControl.destroyAll({
- userFk: args.workerId,
- timed: {between: [started, ended]},
- isSendMail: true
- }, myOptions);
-
- const where = {
- workerFk: args.workerId,
- year: args.year,
- week: args.week
- };
- await models.WorkerTimeControlMail.updateAll(where, {
- updated: Date.vnNew(), state: 'SENDED'
- }, myOptions);
-
- stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
- stmts.push(stmt);
- stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE tmp.`user` SELECT id userFk FROM account.user WHERE id = ?', [args.workerId]);
- stmts.push(stmt);
- } else {
- await models.WorkerTimeControl.destroyAll({
- timed: {between: [started, ended]},
- isSendMail: true
- }, myOptions);
-
- const where = {
- year: args.year,
- week: args.week
- };
- await models.WorkerTimeControlMail.updateAll(where, {
- updated: Date.vnNew(), state: 'SENDED'
- }, myOptions);
-
- stmt = new ParameterizedSQL('DROP TEMPORARY TABLE IF EXISTS tmp.`user`');
- stmts.push(stmt);
- stmt = new ParameterizedSQL('CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user` SELECT id as userFk FROM vn.worker w JOIN account.`user` u ON u.id = w.id WHERE id IS NOT NULL');
- stmts.push(stmt);
+ destroyAllWhere.userFk = args.workerId;
+ updateAllWhere.workerFk = args.workerId;
+ tmpUser = new ParameterizedSQL(tmpUserSQL + ' WHERE id = ?', [args.workerId]);
}
+ await models.WorkerTimeControl.destroyAll(destroyAllWhere, myOptions);
+
+ await models.WorkerTimeControlMail.updateAll(updateAllWhere, {
+ updated: Date.vnNew(),
+ state: 'SENDED'
+ }, myOptions);
+
+ stmts.push(tmpUser);
+
stmt = new ParameterizedSQL(
`CALL vn.timeControl_calculate(?, ?)
`, [started, ended]);
diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
index e90c849b7..42ec6290a 100644
--- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
@@ -14,7 +14,6 @@ describe('workerTimeControl add/delete timeEntry()', () => {
const tuesday = 2;
const thursday = 4;
const friday = 5;
- const saturday = 6;
const sunday = 7;
const activeCtx = {
accessToken: {userId: 50},
@@ -200,15 +199,15 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
describe('WorkerTimeControl_clockIn calls', () => {
- it('should fail to add a time entry if the target user has an absence that day', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
+ let workerId;
+ beforeEach(() => {
activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
+ workerId = hankPymId;
+ });
+ it('should fail to add a time entry if the target user has an absence that day', async() => {
const date = Date.vnNew();
- date.setDate(date.getDate() - 16);
date.setHours(8, 0, 0);
- let error;
-
+ date.setDate(date.getDate() - 16);
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
try {
@@ -225,15 +224,12 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
it('should fail to add a time entry for a worker without an existing contract', async() => {
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
const date = Date.vnNew();
date.setFullYear(date.getFullYear() - 2);
- let error;
const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
try {
- const options = {transaction: tx};
ctx.args = {timed: date, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
@@ -246,19 +242,39 @@ describe('workerTimeControl add/delete timeEntry()', () => {
expect(error.message).toBe(`No hay un contrato en vigor`);
});
+ it('should fail to add a time entry for a worker without an existing contract', async() => {
+ let date = Date.vnNew();
+ date.setDate(date.getDate() - 2);
+ let error;
+
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+ date.setHours(0, 0, 0);
+ ctx.args = {timed: date, direction: 'in'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ try {
+ date.setHours(20,0, 1);
+ ctx.args = {timed: date, direction: 'out'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toBe(`Superado el tiempo máximo entre entrada y salida`);
+ });
+
describe('direction errors', () => {
+ let date = Date.vnNew();
+ date.setDate(date.getDate() - 1);
+ let error;
it('should throw an error when trying "in" direction twice', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
- date = weekDay(date, monday);
- let error;
-
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
+
date.setHours(8, 0, 0);
ctx.args = {timed: date, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
@@ -278,21 +294,13 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
it('should throw an error when trying "in" direction after insert "in" and "middle"', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
- date = weekDay(date, monday);
- let error;
-
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
date.setHours(8, 0, 0);
ctx.args = {timed: date, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
date.setHours(9, 0, 0);
ctx.args = {timed: date, direction: 'middle'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
@@ -312,15 +320,6 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
it('Should throw an error when trying "out" before closing a "middle" couple', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
- date = weekDay(date, monday);
- let error;
-
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
@@ -346,15 +345,6 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
it('should throw an error when trying "middle" after "out"', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
- date = weekDay(date, monday);
- let error;
-
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
@@ -380,15 +370,6 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
it('should throw an error when trying "out" direction twice', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
- date = weekDay(date, monday);
- let error;
-
const tx = await models.WorkerTimeControl.beginTransaction({});
const options = {transaction: tx};
@@ -415,14 +396,12 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
describe('12h rest', () => {
+ activeCtx.accessToken.userId = salesBossId;
+ const workerId = hankPymId;
it('should throw an error when the 12h rest is not fulfilled yet', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
-
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
+ date.setDate(date.getDate() - 2);
date = weekDay(date, monday);
let error;
@@ -448,16 +427,12 @@ describe('workerTimeControl add/delete timeEntry()', () => {
error = e;
}
- expect(error.message).toBe(`Descanso diario 12h.`);
+ expect(error.message).toBe(`Descanso diario`);
});
it('should not fail as the 12h rest is fulfilled', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
+ date.setDate(date.getDate() - 2);
date = weekDay(date, monday);
let error;
@@ -488,13 +463,12 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
describe('for 3500kg drivers with enforced 9h rest', () => {
+ activeCtx.accessToken.userId = salesBossId;
+ const workerId = jessicaJonesId;
it('should throw an error when the 9h enforced rest is not fulfilled', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = jessicaJonesId;
let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
+ date.setDate(date.getDate() - 2);
date = weekDay(date, monday);
let error;
@@ -520,16 +494,13 @@ describe('workerTimeControl add/delete timeEntry()', () => {
error = e;
}
- expect(error.message).toBe(`Descanso diario 9h.`);
+ expect(error.message).toBe(`Descanso diario`);
});
it('should not fail when the 9h enforced rest is fulfilled', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = jessicaJonesId;
-
+
let date = Date.vnNew();
- date.setDate(date.getDate() - 21);
+ date.setDate(date.getDate() - 2);
date = weekDay(date, monday);
let error;
@@ -559,14 +530,11 @@ describe('workerTimeControl add/delete timeEntry()', () => {
});
});
- describe('for 36h weekly rest', () => {
- it('should throw an error when the 36h weekly rest is not fulfilled', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
+ describe('for 72h weekly rest', () => {
+
+ it('should throw an error when work 11 consecutive days', async() => {
let date = Date.vnNew();
- date.setMonth(date.getMonth() - 2);
+ date.setMonth(date.getMonth() - 1);
date.setDate(1);
let error;
@@ -576,66 +544,24 @@ describe('workerTimeControl add/delete timeEntry()', () => {
await populateWeek(date, monday, sunday, ctx, workerId, options);
date = nextWeek(date);
await populateWeek(date, monday, thursday, ctx, workerId, options);
- date = weekDay(date, friday);
- date.setHours(7, 59, 0);
- ctx.args = {timed: date, direction: 'in'};
- await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
-
try {
- date.setHours(8, 1, 0);
- ctx.args = {timed: date, direction: 'out'};
- await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- error = e;
- }
-
- expect(error.message).toBe(`Descanso semanal 36h. / 72h.`);
- });
-
- it('should throw an error when the 36h weekly rest is not fulfilled again', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
-
- let date = Date.vnNew();
- date.setMonth(date.getMonth() - 2);
- date.setDate(1);
- let error;
-
- const tx = await models.WorkerTimeControl.beginTransaction({});
- const options = {transaction: tx};
-
- await populateWeek(date, monday, sunday, ctx, workerId, options);
- date = nextWeek(date);
- await populateWeek(date, monday, thursday, ctx, workerId, options);
-
- try {
- date = weekDay(date, saturday);
- date.setHours(3, 59, 0);
+ date = weekDay(date, friday);
+ date.setHours(10, 0, 1);
ctx.args = {timed: date, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
-
await tx.rollback();
} catch (e) {
await tx.rollback();
error = e;
}
- expect(error.message).toBe(`Descanso semanal 36h. / 72h.`);
+ expect(error.message).toBe(`Descanso semanal`);
});
- });
- describe('for 72h weekly rest', () => {
- it('should throw when the 72h weekly rest is not fulfilled yet', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- activeCtx.accessToken.userId = salesBossId;
- const workerId = hankPymId;
+ it('should throw an error when the 72h weekly rest is not fulfilled', async() => {
let date = Date.vnNew();
- date.setMonth(date.getMonth() - 2);
+ date.setMonth(date.getMonth() - 1);
date.setDate(1);
let error;
@@ -645,32 +571,263 @@ describe('workerTimeControl add/delete timeEntry()', () => {
await populateWeek(date, monday, sunday, ctx, workerId, options);
date = nextWeek(date);
await populateWeek(date, monday, thursday, ctx, workerId, options);
- date = nextWeek(date);
- await populateWeek(date, monday, friday, ctx, workerId, options);
- date = nextWeek(date);
- await populateWeek(date, monday, saturday, ctx, workerId, options);
- date = nextWeek(date);
- await populateWeek(date, monday, saturday, ctx, workerId, options);
- date = lastWeek(date);
try {
date = weekDay(date, sunday);
- date.setHours(8, 0, 0);
+ date.setHours(17, 59, 0);
ctx.args = {timed: date, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
-
await tx.rollback();
} catch (e) {
await tx.rollback();
error = e;
}
- expect(error.message).toBe(`Descanso semanal 36h. / 72h.`);
+ expect(error.message).toBe(`Descanso semanal`);
+ });
+
+ it('should throw an error when the 72h weekly rest is fulfilled', async() => {
+
+ let date = Date.vnNew();
+ date.setMonth(date.getMonth() - 1);
+ date.setDate(1);
+ let error;
+
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ await populateWeek(date, monday, sunday, ctx, workerId, options);
+ date = nextWeek(date);
+ await populateWeek(date, monday, thursday, ctx, workerId, options);
+
+ try {
+ date = weekDay(date, sunday);
+ date.setHours(18, 00, 0);
+ ctx.args = {timed: date, direction: 'in'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).not.toBeDefined;
+ });
+ });
+
+ describe('WorkerTimeControl_calculate calls', () => {
+ let dated = Date.vnNew();
+ dated.setDate(dated.getDate() - 7);
+ dated = new Date(weekDay(dated, monday));
+ const end = new Date(dated);
+ end.setDate(end.getDate() + 1);
+
+ it(`should return today's worked 8 hours without break`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28800);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 15min break and work time consecutive less than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(14, 59, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(15, 14, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28800);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 15min break and work time consecutive greater than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(15, 0, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(15, 15, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28800);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 25min break and work time consecutive less than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(14, 59, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(15, 24, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28500);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 25min break and work time consecutive greater than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(15, 0, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(15, 25, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28500);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 60min break and work time consecutive less than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(14, 59, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(15, 59, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(25200);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it(`should return today's worked hours with 60min break and work time consecutive greater than 5h`, async() => {
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await populateWeek(dated, monday, monday, ctx, hankPymId, options);
+ dated.setHours(15, 0, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+ dated.setHours(16, 0, 0);
+ await addTimeEntry(ctx, dated, 'middle', hankPymId, options);
+
+ const start = new Date(dated - 1);
+ start.setHours(0, 0, 0);
+ await models.WorkerTimeControl.rawSql('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+ hankPymId,
+ start,
+ end
+ ], options);
+
+ let [timeControlCalculateTable] = await models.WorkerTimeControl.rawSql('SELECT * FROM tmp.timeControlCalculate', null, options);
+
+ expect(timeControlCalculateTable.timeWorkSeconds).toEqual(26400);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
});
});
+async function addTimeEntry(ctx, dated, direction, userId, option) {
+ ctx.args = {timed: dated, direction};
+ await models.WorkerTimeControl.addTimeEntry(ctx, userId, option);
+}
+
function weekDay(date, dayToSet) {
const currentDay = date.getDay();
const distance = dayToSet - currentDay;
@@ -704,10 +861,10 @@ async function populateWeek(date, dayStart, dayEnd, ctx, workerId, options) {
dateEnd.setDate(dateStart.getDate() + dayEnd);
for (let i = dayStart; i <= dayEnd; i++) {
- dateStart.setHours(8, 0, 0);
+ dateStart.setHours(10, 0, 0);
ctx.args = {timed: dateStart, direction: 'in'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
- dateStart.setHours(16, 0, 0);
+ dateStart.setHours(18, 0, 0);
ctx.args = {timed: dateStart, direction: 'out'};
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
dateStart.setDate(dateStart.getDate() + 1);
diff --git a/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js b/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
new file mode 100644
index 000000000..3b5b2b73f
--- /dev/null
+++ b/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
@@ -0,0 +1,103 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('updateWorkerTimeControlMail()', () => {
+ it('should update WorkerTimeControlMail if exist record', async() => {
+ const tx = await models.WorkerTimeControlMail.beginTransaction({});
+ const args = {
+ workerId: 9,
+ week: 50,
+ year: 2000,
+ state: 'CONFIRMED'
+ };
+ const ctx = {args};
+
+ try {
+ const options = {transaction: tx};
+ const beforeMail = await models.WorkerTimeControlMail.findOne({
+ where: {
+ workerFk: args.workerId,
+ year: args.year,
+ week: args.week,
+ }
+ }, options);
+ await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+ const afterMail = await models.WorkerTimeControlMail.findOne({
+ where: {
+ workerFk: args.workerId,
+ year: args.year,
+ week: args.week,
+ }
+ }, options);
+
+ expect(beforeMail.state).toEqual('SENDED');
+ expect(afterMail.state).toEqual(args.state);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should insert WorkerTimeControlMail if exist record', async() => {
+ const tx = await models.WorkerTimeControlMail.beginTransaction({});
+ const args = {
+ workerId: 1,
+ week: 51,
+ year: 2000,
+ state: 'SENDED'
+ };
+ const ctx = {args};
+
+ try {
+ const options = {transaction: tx};
+ const beforeMail = await models.WorkerTimeControlMail.find({
+ where: {
+ workerFk: args.workerId,
+ year: args.year,
+ week: args.week,
+ }
+ }, options);
+ await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+ const afterMail = await models.WorkerTimeControlMail.find({
+ where: {
+ workerFk: args.workerId,
+ year: args.year,
+ week: args.week,
+ }
+ }, options);
+
+ expect(beforeMail).toEqual([]);
+ expect(afterMail.length).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw error if not exist any record in this week', async() => {
+ const tx = await models.WorkerTimeControlMail.beginTransaction({});
+ const ctx = {args: {
+ workerId: 1,
+ week: 1,
+ year: 0,
+ state: 'SENDED'
+ }};
+
+ let error;
+ try {
+ const options = {transaction: tx};
+ await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`There aren't records for this week`);
+ });
+});
+
diff --git a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
index 6fe30de91..3594f05fe 100644
--- a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
+++ b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
@@ -40,30 +40,39 @@ module.exports = Self => {
Self.updateWorkerTimeControlMail = async(ctx, options) => {
const models = Self.app.models;
const args = ctx.args;
-
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
- const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
+ const [sent] = await models.WorkerTimeControlMail.find({
where: {
- workerFk: args.workerId,
year: args.year,
- week: args.week
- }
+ week: args.week,
+ },
+ limit: 1
}, myOptions);
- if (!workerTimeControlMail) throw new UserError(`There aren't records for this week`);
+ if (!sent) throw new UserError(`There aren't records for this week`);
- await workerTimeControlMail.updateAttributes({
- state: args.state,
- reason: args.reason || null
- }, myOptions);
+ const workerTimeControlMail = await models.WorkerTimeControlMail.upsertWithWhere(
+ {
+ year: args.year,
+ week: args.week,
+ workerFk: args.workerId
+ },
+ {
+ state: args.state,
+ reason: args.workerId,
+ year: args.year,
+ week: args.week,
+ workerFk: args.workerId
+ },
+ myOptions);
if (args.state == 'SENDED') {
await workerTimeControlMail.updateAttributes({
- sendedCounter: workerTimeControlMail.sendedCounter + 1
+ sendedCounter: workerTimeControlMail.sendedCounter ? workerTimeControlMail.sendedCounter + 1 : 1
}, myOptions);
}
};
diff --git a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
index 3203dea82..816a1d22b 100644
--- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
+++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
@@ -61,9 +61,8 @@ module.exports = Self => {
const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
ctx.args.url = url;
- await Self.sendTemplate(ctx, 'weekly-hour-record');
-
- return models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
+ await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
+ return Self.sendTemplate(ctx, 'weekly-hour-record');
};
function getMondayDateFromYearWeek(yearNumber, weekNumber) {
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index cb2cf8330..d628d0a2b 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -109,13 +109,13 @@ module.exports = Self => {
const absenceType = await models.AbsenceType.findById(args.absenceTypeId, null, myOptions);
const account = await models.VnUser.findById(userId, null, myOptions);
const subordinated = await models.VnUser.findById(id, null, myOptions);
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const body = $t('Created absence', {
author: account.nickname,
employee: subordinated.nickname,
absenceType: absenceType.name,
dated: formatDate(args.dated),
- workerUrl: `${origin}/#!/worker/${id}/calendar`
+ workerUrl: `${url}worker/${id}/calendar`
});
await models.Mail.create({
subject: $t('Absence change notification on the labour calendar'),
diff --git a/modules/worker/back/methods/worker/deleteAbsence.js b/modules/worker/back/methods/worker/deleteAbsence.js
index c315f5178..b71d077a4 100644
--- a/modules/worker/back/methods/worker/deleteAbsence.js
+++ b/modules/worker/back/methods/worker/deleteAbsence.js
@@ -60,13 +60,13 @@ module.exports = Self => {
const absenceType = await models.AbsenceType.findById(absence.dayOffTypeFk, null, myOptions);
const account = await models.VnUser.findById(userId, null, myOptions);
const subordinated = await models.VnUser.findById(labour.workerFk, null, myOptions);
- const origin = ctx.req.headers.origin;
+ const url = await Self.app.models.Url.getUrl();
const body = $t('Deleted absence', {
author: account.nickname,
employee: subordinated.nickname,
absenceType: absenceType.name,
dated: formatDate(absence.dated),
- workerUrl: `${origin}/#!/worker/${id}/calendar`
+ workerUrl: `${url}worker/${id}/calendar`
});
await models.Mail.create({
subject: $t('Absence change notification on the labour calendar'),
diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
index 199a3be62..5316daf01 100644
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@@ -223,19 +223,16 @@ module.exports = Self => {
const user = await models.VnUser.findById(client.id, null, myOptions);
await user.updateAttribute('email', args.email, myOptions);
- await models.Worker.rawSql(
- 'CALL vn.workerCreate(?, ?, ?, ?, ?, ?, ?)',
- [
- args.firstName,
- args.lastNames,
- args.code,
- args.bossFk,
- client.id,
- args.fi,
- args.birth,
- ],
- myOptions
- );
+ await models.Worker.create({
+ id: client.id,
+ code: args.code,
+ firstName: args.firstName,
+ lastName: args.lastNames,
+ bossFk: args.bossFk,
+ fi: args.fi,
+ birth: args.birth,
+
+ }, myOptions);
if (tx) await tx.commit();
} catch (error) {
diff --git a/modules/worker/back/methods/worker/search.js b/modules/worker/back/methods/worker/search.js
index cd0a466ea..7fe9e0666 100644
--- a/modules/worker/back/methods/worker/search.js
+++ b/modules/worker/back/methods/worker/search.js
@@ -46,7 +46,7 @@ module.exports = Self => {
SELECT DISTINCT w.id, w.code, u.name, u.nickname, u.active, b.departmentFk
FROM worker w
JOIN account.user u ON u.id = w.id
- JOIN business b ON b.workerFk = w.id
+ LEFT JOIN business b ON b.workerFk = w.id
) w`);
stmt.merge(conn.makeSuffix(filter));
diff --git a/modules/worker/back/methods/worker/setPassword.js b/modules/worker/back/methods/worker/setPassword.js
new file mode 100644
index 000000000..43d3d946f
--- /dev/null
+++ b/modules/worker/back/methods/worker/setPassword.js
@@ -0,0 +1,48 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+ Self.remoteMethodCtx('setPassword', {
+ description: 'Set a new password',
+ accepts: [
+ {
+ arg: 'workerFk',
+ type: 'number',
+ required: true,
+ description: 'The worker id',
+ },
+ {
+ arg: 'newPass',
+ type: 'String',
+ required: true,
+ description: 'The new worker password'
+ }
+ ],
+ http: {
+ path: `/:id/setPassword`,
+ verb: 'PATCH'
+ }
+ });
+ Self.setPassword = async(ctx, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ const {args} = ctx;
+ let tx;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+ try {
+ const isSubordinate = await models.Worker.isSubordinate(ctx, args.workerFk, myOptions);
+ if (!isSubordinate) throw new UserError('You don\'t have enough privileges.');
+
+ await models.VnUser.setPassword(args.workerFk, args.newPass, myOptions);
+ await models.VnUser.updateAll({id: args.workerFk}, {emailVerified: true}, myOptions);
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/worker/back/methods/worker/specs/setPassword.spec.js b/modules/worker/back/methods/worker/specs/setPassword.spec.js
new file mode 100644
index 000000000..fbb403b24
--- /dev/null
+++ b/modules/worker/back/methods/worker/specs/setPassword.spec.js
@@ -0,0 +1,61 @@
+const UserError = require('vn-loopback/util/user-error');
+
+const models = require('vn-loopback/server/server').models;
+
+describe('worker setPassword()', () => {
+ let ctx;
+ beforeAll(() => {
+ ctx = {
+ req: {
+ accessToken: {},
+ headers: {origin: 'http://localhost'}
+ },
+ args: {workerFk: 9}
+ };
+ });
+
+ beforeEach(() => {
+ ctx.req.accessToken.userId = 20;
+ ctx.args.newPass = 'H3rn4d3z#';
+ });
+
+ it('should change the password', async() => {
+ const tx = await models.Worker.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ await models.Worker.setPassword(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an error: Password does not meet requirements', async() => {
+ const tx = await models.Collection.beginTransaction({});
+ ctx.args.newPass = 'Hi';
+ try {
+ const options = {transaction: tx};
+ await models.Worker.setPassword(ctx, options);
+ await tx.rollback();
+ } catch (e) {
+ expect(e.sqlMessage).toEqual('Password does not meet requirements');
+ await tx.rollback();
+ }
+ });
+
+ it('should throw an error: You don\'t have enough privileges.', async() => {
+ ctx.req.accessToken.userId = 5;
+ const tx = await models.Collection.beginTransaction({});
+ try {
+ const options = {transaction: tx};
+ await models.Worker.setPassword(ctx, options);
+ await tx.rollback();
+ } catch (e) {
+ expect(e).toEqual(new UserError(`You don't have enough privileges.`));
+ await tx.rollback();
+ }
+ });
+});
diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index 2417078e1..6da3945fc 100644
--- a/modules/worker/back/models/operator.json
+++ b/modules/worker/back/models/operator.json
@@ -33,6 +33,16 @@
"type": "belongsTo",
"model": "Sector",
"foreignKey": "sectorFk"
+ },
+ "train": {
+ "type": "belongsTo",
+ "model": "Train",
+ "foreignKey": "trainFk"
+ },
+ "printer": {
+ "type": "belongsTo",
+ "model": "Printer",
+ "foreignKey": "labelerFk"
}
}
}
diff --git a/modules/worker/back/models/worker-mana.js b/modules/worker/back/models/worker-mana.js
deleted file mode 100644
index 99a0f7694..000000000
--- a/modules/worker/back/models/worker-mana.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = Self => {
- require('../methods/worker-mana/getCurrentWorkerMana')(Self);
-};
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index ccae3a6e6..985d83e9f 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -18,6 +18,7 @@ module.exports = Self => {
require('../methods/worker/allocatePDA')(Self);
require('../methods/worker/search')(Self);
require('../methods/worker/isAuthorized')(Self);
+ require('../methods/worker/setPassword')(Self);
Self.validatesUniquenessOf('locker', {
message: 'This locker has already been assigned'
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index bea86d14d..1a777fffe 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -44,6 +44,18 @@
},
"code": {
"type" : "string"
+ },
+ "locker": {
+ "type" : "number"
+ },
+ "fi": {
+ "type" : "string"
+ },
+ "birth": {
+ "type" : "date"
+ },
+ "isF11Allowed": {
+ "type" : "boolean"
}
},
"relations": {
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index b8b533c5d..9a40e31c2 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -8,7 +8,7 @@ class Controller extends ModuleCard {
{
relation: 'user',
scope: {
- fields: ['name'],
+ fields: ['name', 'emailVerified'],
include: {
relation: 'emailUser',
scope: {
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 05e883533..aa6b80300 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -11,6 +11,9 @@
? 'Click to allow the user to be disabled'
: 'Click to exclude the user from getting disabled'}}
+
+ Change password
+
@@ -28,11 +31,17 @@
+ >
+
+ >
+
@@ -66,4 +75,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 0214f8500..13ffa6f2f 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -1,6 +1,6 @@
import ngModule from '../module';
import Descriptor from 'salix/components/descriptor';
-
+const UserError = require('vn-loopback/util/user-error');
class Controller extends Descriptor {
constructor($element, $, $rootScope) {
super($element, $);
@@ -13,9 +13,11 @@ class Controller extends Descriptor {
set worker(value) {
this.entity = value;
-
if (value)
this.getIsExcluded();
+
+ if (this.entity && !this.entity.user.emailVerified)
+ this.getPassRequirements();
}
getIsExcluded() {
@@ -39,7 +41,7 @@ class Controller extends Descriptor {
{
relation: 'user',
scope: {
- fields: ['name'],
+ fields: ['name', 'emailVerified'],
include: {
relation: 'emailUser',
scope: {
@@ -67,10 +69,29 @@ class Controller extends Descriptor {
}
]
};
-
return this.getData(`Workers/${this.id}`, {filter})
.then(res => this.entity = res.data);
}
+
+ getPassRequirements() {
+ this.$http.get('UserPasswords/findOne')
+ .then(res => {
+ this.passRequirements = res.data;
+ });
+ }
+
+ setPassword() {
+ if (!this.newPassword)
+ throw new UserError(`You must enter a new password`);
+ if (this.newPassword != this.repeatPassword)
+ throw new UserError(`Passwords don't match`);
+ this.$http.patch(
+ `Workers/${this.entity.id}/setPassword`,
+ {workerFk: this.entity.id, newPass: this.newPassword}
+ ) .then(() => {
+ this.vnApp.showSuccess(this.$translate.instant('Password changed!'));
+ });
+ }
}
Controller.$inject = ['$element', '$scope', '$rootScope'];
diff --git a/modules/worker/front/descriptor/index.spec.js b/modules/worker/front/descriptor/index.spec.js
index dfb800415..d158a9e8e 100644
--- a/modules/worker/front/descriptor/index.spec.js
+++ b/modules/worker/front/descriptor/index.spec.js
@@ -23,4 +23,24 @@ describe('vnWorkerDescriptor', () => {
expect(controller.worker).toEqual(response);
});
});
+
+ describe('setPassword()', () => {
+ it('should throw an error: You must enter a new password', () => {
+ try {
+ controller.setPassword();
+ } catch (error) {
+ expect(error.message).toEqual('You must enter a new password');
+ }
+ });
+
+ it('should throw an error: Passwords don\'t match', () => {
+ controller.newPassword = 'aaa';
+ controller.repeatPassword = 'bbb';
+ try {
+ controller.setPassword();
+ } catch (error) {
+ expect(error.message).toEqual('Passwords don\'t match');
+ }
+ });
+ });
});
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index 8fad2c0df..5c03dc8de 100644
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@@ -20,4 +20,5 @@ import './dms/create';
import './dms/edit';
import './note/index';
import './note/create';
+import './notifications';
diff --git a/modules/worker/front/notifications/index.html b/modules/worker/front/notifications/index.html
new file mode 100644
index 000000000..7fb3b870e
--- /dev/null
+++ b/modules/worker/front/notifications/index.html
@@ -0,0 +1,2 @@
+
+
diff --git a/modules/worker/front/notifications/index.js b/modules/worker/front/notifications/index.js
new file mode 100644
index 000000000..622892979
--- /dev/null
+++ b/modules/worker/front/notifications/index.js
@@ -0,0 +1,21 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ }
+
+ async $onInit() {
+ const url = await this.vnApp.getUrl(`worker/${this.$params.id}/notifications`);
+ window.open(url).focus();
+ }
+}
+
+ngModule.vnComponent('vnWorkerNotifications', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ ticket: '<'
+ }
+});
diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json
index 7906b1f45..489b4346a 100644
--- a/modules/worker/front/routes.json
+++ b/modules/worker/front/routes.json
@@ -15,6 +15,7 @@
{"state": "worker.card.timeControl", "icon": "access_time"},
{"state": "worker.card.calendar", "icon": "icon-calendar"},
{"state": "worker.card.pda", "icon": "phone_android"},
+ {"state": "worker.card.notifications", "icon": "notifications"},
{"state": "worker.card.pbx", "icon": "icon-pbx"},
{"state": "worker.card.dms.index", "icon": "cloud_upload"},
{
@@ -112,6 +113,14 @@
"params": {
"worker": "$ctrl.worker"
}
+ }, {
+ "url": "/notifications",
+ "state": "worker.card.notifications",
+ "component": "vn-worker-notifications",
+ "description": "Notifications",
+ "params": {
+ "worker": "$ctrl.worker"
+ }
}, {
"url": "/time-control?timestamp",
"state": "worker.card.timeControl",
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 0f34f4df8..ff464aa79 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -42,14 +42,21 @@
{{::worker.boss.name}}
-
+
+
-
+
+
+ >
+
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index f1e4b8b59..0e7f46c7c 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -1,6 +1,5 @@
import ngModule from '../module';
import Summary from 'salix/components/summary';
-
class Controller extends Summary {
get worker() {
return this._worker;
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index b77acbddc..c34a1e3ca 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -79,30 +79,32 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ vn-tooltip="{{$ctrl.state ? 'Resend' : 'Send'}} email of this week to the user"
+ ng-if="$ctrl.isHr && $ctrl.state != 'CONFIRMED' && $ctrl.canResend">
{{service.price | currency('EUR', $i18n.locale)}} |
|
{{service.taxDescription}} |
- {{service.price | currency('EUR', $i18n.locale)}} |
+ {{service.total | currency('EUR', $i18n.locale)}} |
|