-
Id
Client
- Created
+ Created
Worker
State
{{::claim.created | date:'dd/MM/yyyy'}}
+ {{::claim.created | date:'dd/MM/yyyy'}}
- {{::action.sale.ticket.id | zeroFill:6}}
+ {{::action.sale.ticket.id}}
{{::action.claimBeggining.description}}
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
new file mode 100644
index 000000000..976ff7cf2
--- /dev/null
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -0,0 +1,145 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = function(Self) {
+ Self.remoteMethodCtx('createReceipt', {
+ description: 'Creates receipt and its compensation if necessary',
+ accepts: [{
+ arg: 'clientFk',
+ type: 'number',
+ description: 'The client id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'payed',
+ type: 'Date',
+ required: true
+ },
+ {
+ arg: 'companyFk',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'bankFk',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'amountPaid',
+ type: 'number',
+ required: true
+ },
+ {
+ arg: 'description',
+ type: 'string',
+ required: true
+ },
+ {
+ arg: 'compensationAccount',
+ type: 'any'
+ }],
+ returns: {
+ root: true,
+ type: 'Object'
+ },
+ http: {
+ verb: 'post',
+ path: '/:clientFk/createReceipt'
+ }
+ });
+
+ Self.createReceipt = async ctx => {
+ const models = Self.app.models;
+ const args = ctx.args;
+ const tx = await models.Address.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ delete args.ctx; // Remove unwanted properties
+ const newReceipt = await models.Receipt.create(args, options);
+ const clientOriginal = await models.Client.findById(args.clientFk);
+ const bank = await models.Bank.findById(args.bankFk);
+ const accountingType = await models.AccountingType.findById(bank.accountingTypeFk);
+
+ if (accountingType.code == 'compensation') {
+ if (!args.compensationAccount)
+ throw new UserError('Compensation account is empty');
+
+ const supplierCompensation = await models.Supplier.findOne({
+ where: {
+ account: args.compensationAccount
+ }
+ });
+ let clientCompensation = {};
+ if (!supplierCompensation) {
+ clientCompensation = await models.Client.findOne({
+ where: {
+ accountingAccount: args.compensationAccount
+ }
+ });
+ }
+ if (!supplierCompensation && !clientCompensation)
+ throw new UserError('Invalid account');
+
+ await Self.rawSql(
+ `CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
+ [
+ Date(),
+ args.compensationAccount,
+ args.bankFk,
+ accountingType.receiptDescription + args.compensationAccount,
+ args.amountPaid,
+ args.companyFk,
+ clientOriginal.accountingAccount
+ ],
+ options);
+ } else {
+ const description = `${clientOriginal.id} : ${clientOriginal.socialName} - ${accountingType.receiptDescription}`;
+ const [xdiarioNew] = await Self.rawSql(
+ `SELECT xdiario_new(?, CURDATE(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ledger;`,
+ [
+ null,
+ bank.account,
+ clientOriginal.accountingAccount,
+ description,
+ args.amountPaid,
+ 0,
+ 0,
+ '',
+ '',
+ null,
+ null,
+ false,
+ args.companyFk
+ ],
+ options);
+
+ await Self.rawSql(
+ `SELECT xdiario_new(?, CURDATE(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`,
+ [
+ xdiarioNew.ledger,
+ clientOriginal.accountingAccount,
+ bank.account,
+ description,
+ 0,
+ args.amountPaid,
+ 0,
+ '',
+ '',
+ null,
+ null,
+ false,
+ args.companyFk
+ ],
+ options);
+ }
+
+ await tx.commit();
+ return newReceipt;
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js
index c69c860c9..7444dff45 100644
--- a/modules/client/back/methods/client/lastActiveTickets.js
+++ b/modules/client/back/methods/client/lastActiveTickets.js
@@ -26,15 +26,25 @@ module.exports = Self => {
Self.lastActiveTickets = async(id, ticketId) => {
const ticket = await Self.app.models.Ticket.findById(ticketId);
const query = `
- SELECT t.id, t.shipped, a.name AS agencyName, w.name AS warehouseName, ad.city AS address
- FROM vn.ticket t
- JOIN vn.ticketState ts ON t.id = ts.ticketFk
- JOIN vn.agencyMode a ON t.agencyModeFk = a.id
- JOIN vn.warehouse w ON t.warehouseFk = w.id
- JOIN vn.address ad ON t.addressFk = ad.id
- WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0
- AND t.id <> ? AND t.warehouseFk = ?
- ORDER BY t.shipped
+ SELECT
+ t.id,
+ t.shipped,
+ a.name AS agencyName,
+ w.name AS warehouseName,
+ ad.nickname AS nickname,
+ ad.city AS city,
+ ad.postalCode AS postalCode,
+ ad.street AS street,
+ pr.name AS name
+ FROM ticket t
+ JOIN vn.ticketState ts ON t.id = ts.ticketFk
+ JOIN vn.agencyMode a ON t.agencyModeFk = a.id
+ JOIN vn.warehouse w ON t.warehouseFk = w.id
+ JOIN vn.address ad ON t.addressFk = ad.id
+ JOIN vn.province pr ON ad.provinceFk = pr.id
+ WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0
+ AND t.id <> ? AND t.warehouseFk = ?
+ ORDER BY t.shipped
LIMIT 10`;
return Self.rawSql(query, [id, ticketId, ticket.warehouseFk]);
diff --git a/modules/client/back/methods/client/specs/createReceipt.spec.js b/modules/client/back/methods/client/specs/createReceipt.spec.js
new file mode 100644
index 000000000..8d35064a2
--- /dev/null
+++ b/modules/client/back/methods/client/specs/createReceipt.spec.js
@@ -0,0 +1,184 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('Client createReceipt', () => {
+ const clientFk = 108;
+ const payed = Date();
+ const companyFk = 442;
+ const amountPaid = 12.50;
+ const description = 'Receipt description';
+ const activeCtx = {
+ accessToken: {userId: 5},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'}
+ }
+ }
+ };
+ const ctx = {req: activeCtx};
+ activeCtx.http.req.__ = value => {
+ return value;
+ };
+
+ beforeEach(() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
+ it('should create a new receipt', async() => {
+ const bankFk = 1;
+ ctx.args = {
+ clientFk: clientFk,
+ payed: payed,
+ companyFk: companyFk,
+ bankFk: bankFk,
+ amountPaid: amountPaid,
+ description: description
+ };
+
+ const receipt = await app.models.Client.createReceipt(ctx);
+ delete ctx.args.payed;
+
+ const till = await app.models.Till.findOne({
+ where: {
+ bankFk: bankFk,
+ in: amountPaid,
+ number: clientFk
+ }
+ });
+
+ expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+
+ // restores
+ await receipt.destroy();
+ await till.destroy();
+ });
+
+ it('should throw Compensation account is empty', async() => {
+ const bankFk = 3;
+
+ ctx.args = {
+ clientFk: clientFk,
+ payed: payed,
+ companyFk: companyFk,
+ bankFk: bankFk,
+ amountPaid: amountPaid,
+ description: description
+ };
+
+ try {
+ await app.models.Client.createReceipt(ctx);
+ } catch (e) {
+ error = e;
+ }
+
+ expect(error).toBeDefined();
+ expect(error.message).toEqual('Compensation account is empty');
+ });
+
+ it('should throw Invalid account if compensationAccount does not belongs to a client nor a supplier', async() => {
+ let error;
+ const bankFk = 3;
+ ctx.args = {
+ clientFk: clientFk,
+ payed: payed,
+ companyFk: companyFk,
+ bankFk: bankFk,
+ amountPaid: amountPaid,
+ description: description,
+ compensationAccount: 'non existing account'
+ };
+
+ try {
+ await app.models.Client.createReceipt(ctx);
+ } catch (e) {
+ error = e;
+ }
+
+ expect(error).toBeDefined();
+ expect(error.message).toEqual('Invalid account');
+ });
+
+ it('should create a new receipt with a compensation for a client', async() => {
+ const bankFk = 3;
+
+ ctx.args = {
+ clientFk: clientFk,
+ payed: payed,
+ companyFk: companyFk,
+ bankFk: bankFk,
+ amountPaid: amountPaid,
+ description: description,
+ compensationAccount: '4300000001'
+ };
+ const receipt = await app.models.Client.createReceipt(ctx);
+ const receiptCompensated = await app.models.Receipt.findOne({
+ where: {
+ clientFk: 1,
+ bankFk: ctx.args.bankFk
+ }
+ });
+
+ const till = await app.models.Till.findOne({
+ where: {
+ bankFk: bankFk,
+ in: amountPaid,
+ number: clientFk
+ }
+ });
+
+ delete ctx.args.payed;
+
+ expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+ expect(receipt.amountPaid).toEqual(-receiptCompensated.amountPaid);
+
+ // restores
+ await receipt.destroy();
+ await receiptCompensated.destroy();
+ await till.destroy();
+ });
+
+ it('should create a new receipt with a compensation for a supplier', async() => {
+ const bankFk = 3;
+
+ ctx.args = {
+ clientFk: clientFk,
+ payed: payed,
+ companyFk: companyFk,
+ bankFk: bankFk,
+ amountPaid: amountPaid,
+ description: description,
+ compensationAccount: '4100000001'
+ };
+ const receipt = await app.models.Client.createReceipt(ctx);
+
+ const paymentCompensated = await app.models.Payment.findOne({
+ where: {
+ clientFk: ctx.args.sale,
+ payed: ctx.args.payed,
+ amountPaid: ctx.args.amountPaid,
+ bankFk: ctx.args.bankFk
+ }
+ });
+
+ const till = await app.models.Till.findOne({
+ where: {
+ bankFk: ctx.args.bankFk,
+ in: amountPaid,
+ number: clientFk
+ }
+ });
+
+ delete ctx.args.payed;
+
+ expect(receipt).toEqual(jasmine.objectContaining(ctx.args));
+
+ expect(paymentCompensated.amountPaid).toEqual(paymentCompensated.amountPaid);
+
+ // restores
+ await receipt.destroy();
+ await paymentCompensated.destroy();
+ await till.destroy();
+ });
+});
diff --git a/modules/client/back/methods/client/specs/lastActiveTickets.spec.js b/modules/client/back/methods/client/specs/lastActiveTickets.spec.js
new file mode 100644
index 000000000..8d06e0584
--- /dev/null
+++ b/modules/client/back/methods/client/specs/lastActiveTickets.spec.js
@@ -0,0 +1,18 @@
+const app = require('vn-loopback/server/server');
+
+describe('Client last active tickets', () => {
+ it('should receive an array of last active tickets of Bruce Wayne', async() => {
+ const ticketId = 22;
+ const clientId = 109;
+ const warehouseId = 5;
+ const result = await app.models.Client.lastActiveTickets(clientId, ticketId, warehouseId);
+
+ const length = result.length;
+ const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
+
+ const properties = Object.keys(anyResult);
+
+ expect(properties.length).toEqual(9);
+ expect(result.length).toEqual(3);
+ });
+});
diff --git a/modules/client/back/methods/client/specs/updateAddress.spec.js b/modules/client/back/methods/client/specs/updateAddress.spec.js
index 6855d8e18..a30dcc96d 100644
--- a/modules/client/back/methods/client/specs/updateAddress.spec.js
+++ b/modules/client/back/methods/client/specs/updateAddress.spec.js
@@ -8,6 +8,7 @@ describe('Address updateAddress', () => {
const customAgentOneId = 1;
it('should throw the non uee member error if no incoterms is defined', async() => {
+ let err;
const ctx = {
args: {
provinceFk: provinceId,
@@ -26,6 +27,7 @@ describe('Address updateAddress', () => {
});
it('should throw a non uee member error if no customsAgent is defined', async() => {
+ let err;
const ctx = {
args: {
provinceFk: provinceId,
diff --git a/modules/client/back/model-config.json b/modules/client/back/model-config.json
index 340ddeb18..1f18f4963 100644
--- a/modules/client/back/model-config.json
+++ b/modules/client/back/model-config.json
@@ -104,6 +104,9 @@
"ClientDms": {
"dataSource": "vn"
},
+ "Till": {
+ "dataSource": "vn"
+ },
"CustomsAgent": {
"dataSource": "vn"
},
diff --git a/modules/client/back/models/XDiario.json b/modules/client/back/models/XDiario.json
new file mode 100644
index 000000000..be2d258f9
--- /dev/null
+++ b/modules/client/back/models/XDiario.json
@@ -0,0 +1,84 @@
+{
+ "name": "XDiario",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "XDiario"
+ }
+ },
+ "properties": {
+ "ASIEN": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "FECHA": {
+ "type": "date"
+ },
+ "SUBCTA": {
+ "type": "string"
+ },
+ "CONTRA": {
+ "type": "string"
+ },
+ "CONCEPTO": {
+ "type": "string"
+ },
+ "EURODEBE": {
+ "type": "number"
+ },
+ "EUROHABER": {
+ "type": "number"
+ },
+ "BASEEURO": {
+ "type": "number"
+ },
+ "SERIE": {
+ "type": "string"
+ },
+ "CAMBIO": {
+ "type": "number"
+ },
+ "DEBEME": {
+ "type": "number"
+ },
+ "HABERME": {
+ "type": "number"
+ },
+ "FACTURA": {
+ "type": "string"
+ },
+ "IVA": {
+ "type": "number"
+ },
+ "RECEQUIV": {
+ "type": "number"
+ },
+ "METAL": {
+ "type": "number"
+ },
+ "METALIMP": {
+ "type": "number"
+ },
+ "CLIENTE": {
+ "type": "string"
+ },
+ "METALEJE": {
+ "type": "string"
+ },
+ "AUXILIAR": {
+ "type": "string"
+ },
+ "MONEDAUSO": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "company": {
+ "type": "belongsTo",
+ "model": "Company",
+ "foreignKey": "empresa_id"
+ }
+ }
+}
+
\ No newline at end of file
diff --git a/modules/client/back/models/bank-entity.js b/modules/client/back/models/bank-entity.js
deleted file mode 100644
index 4cfa7fc91..000000000
--- a/modules/client/back/models/bank-entity.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = Self => {
- Self.validatesPresenceOf('name', {
- message: `Name cannot be blank`
- });
- Self.validatesPresenceOf('bic', {
- message: `Swift / BIC can't be empty`
- });
-};
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 1e500ab11..e1de363b2 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -1,4 +1,4 @@
-const request = require('request-promise-native');
+const got = require('got');
const UserError = require('vn-loopback/util/user-error');
const getFinalState = require('vn-loopback/util/hook').getFinalState;
const isMultiple = require('vn-loopback/util/hook').isMultiple;
@@ -30,6 +30,7 @@ module.exports = Self => {
require('../methods/client/createAddress')(Self);
require('../methods/client/updateAddress')(Self);
require('../methods/client/consumption')(Self);
+ require('../methods/client/createReceipt')(Self);
// Validations
@@ -226,36 +227,6 @@ module.exports = Self => {
await Self.app.models.ClientCredit.create(newCredit);
}
});
- const app = require('vn-loopback/server/server');
-
- app.on('started', function() {
- let account = app.models.Account;
-
- account.observe('before save', async ctx => {
- if (ctx.isNewInstance) return;
- ctx.hookState.oldInstance = JSON.parse(JSON.stringify(ctx.currentInstance));
- });
-
- account.observe('after save', async ctx => {
- let changes = ctx.data || ctx.instance;
- if (!ctx.isNewInstance && changes) {
- let oldData = ctx.hookState.oldInstance;
- let hasChanges = oldData.name != changes.name || oldData.active != changes.active;
- if (!hasChanges) return;
-
- let userId = ctx.options.accessToken.userId;
- let logRecord = {
- originFk: oldData.id,
- userFk: userId,
- action: 'update',
- changedModel: 'Account',
- oldInstance: {name: oldData.name, active: oldData.active},
- newInstance: {name: changes.name, active: changes.active}
- };
- await Self.app.models.ClientLog.create(logRecord);
- }
- });
- });
Self.observe('after save', async ctx => {
if (ctx.isNewInstance) return;
@@ -298,12 +269,62 @@ module.exports = Self => {
recipientId: instance.id,
recipient: instance.email
};
- await request.get(`${origin}/api/email/payment-update`, {
- qs: params
+ await got.get(`${origin}/api/email/payment-update`, {
+ query: params
});
}
+
+ const workerIdBefore = oldInstance.salesPersonFk;
+ const workerIdAfter = newInstance.salesPersonFk;
+ const assignmentChanged = workerIdBefore != workerIdAfter;
+ if (assignmentChanged)
+ await Self.notifyAssignment(instance, workerIdBefore, workerIdAfter);
});
+ // Send notification on client worker assignment
+ Self.notifyAssignment = async function notifyAssignment(client, previousWorkerId, currentWorkerId) {
+ const loopBackContext = LoopBackContext.getCurrentContext();
+ const httpCtx = {req: loopBackContext.active};
+ const httpRequest = httpCtx.req.http.req;
+ const $t = httpRequest.__;
+ const headers = httpRequest.headers;
+ const origin = headers.origin;
+ const models = Self.app.models;
+
+ let previousWorker = {name: $t('None')};
+ let currentWorker = {name: $t('None')};
+ if (previousWorkerId) {
+ const worker = await models.Worker.findById(previousWorkerId, {
+ include: {relation: 'user'}
+ });
+ previousWorker.user = worker && worker.user().name;
+ previousWorker.name = worker && worker.user().nickname;
+ }
+
+ if (currentWorkerId) {
+ const worker = await models.Worker.findById(currentWorkerId, {
+ include: {relation: 'user'}
+ });
+ currentWorker.user = worker && worker.user().name;
+ currentWorker.name = worker && worker.user().nickname;
+ }
+
+ const fullUrl = `${origin}/#!/client/${client.id}/basic-data`;
+ const message = $t('Client assignment has changed', {
+ clientId: client.id,
+ clientName: client.name,
+ url: fullUrl,
+ previousWorkerName: previousWorker.name,
+ currentWorkerName: currentWorker.name
+ });
+
+ if (previousWorkerId)
+ await models.Chat.send(httpCtx, `@${previousWorker.user}`, message);
+
+ if (currentWorkerId)
+ await models.Chat.send(httpCtx, `@${currentWorker.user}`, message);
+ };
+
async function validateCreditChange(ctx, finalState) {
let models = Self.app.models;
let userId = ctx.options.accessToken.userId;
@@ -340,4 +361,34 @@ module.exports = Self => {
if (count <= 0)
throw new UserError('The role cannot set this credit amount');
}
+
+ const app = require('vn-loopback/server/server');
+ app.on('started', function() {
+ let account = app.models.Account;
+
+ account.observe('before save', async ctx => {
+ if (ctx.isNewInstance) return;
+ ctx.hookState.oldInstance = JSON.parse(JSON.stringify(ctx.currentInstance));
+ });
+
+ account.observe('after save', async ctx => {
+ let changes = ctx.data || ctx.instance;
+ if (!ctx.isNewInstance && changes) {
+ let oldData = ctx.hookState.oldInstance;
+ let hasChanges = oldData.name != changes.name || oldData.active != changes.active;
+ if (!hasChanges) return;
+
+ let userId = ctx.options.accessToken.userId;
+ let logRecord = {
+ originFk: oldData.id,
+ userFk: userId,
+ action: 'update',
+ changedModel: 'Account',
+ oldInstance: {name: oldData.name, active: oldData.active},
+ newInstance: {name: changes.name, active: changes.active}
+ };
+ await Self.app.models.ClientLog.create(logRecord);
+ }
+ });
+ });
};
diff --git a/modules/client/back/models/receipt.js b/modules/client/back/models/receipt.js
index 6cc767e2c..36a4a8952 100644
--- a/modules/client/back/models/receipt.js
+++ b/modules/client/back/models/receipt.js
@@ -1,13 +1,43 @@
+const LoopBackContext = require('loopback-context');
+
module.exports = function(Self) {
require('../methods/receipt/filter')(Self);
+ Self.validateBinded('amountPaid', isNotZero, {
+ message: 'Amount cannot be zero',
+ allowNull: false,
+ allowBlank: false
+ });
+
+ function isNotZero(value) {
+ return !isNaN(value) && value != 0;
+ }
+
+ Self.validateAsync('companyFk', isOfficialCompany, {
+ message: 'Company has to be official'
+ });
+
+ async function isOfficialCompany(err, done) {
+ const hasCompany = await Self.app.models.Company.exists(this.companyFk);
+ if (!hasCompany) err();
+ done();
+ }
+
Self.observe('before save', async function(ctx) {
if (ctx.isNewInstance) {
- let token = ctx.options.accessToken;
- let userId = token && token.userId;
- let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
-
- ctx.instance.workerFk = worker.id;
+ const loopBackContext = LoopBackContext.getCurrentContext();
+ ctx.instance.workerFk = loopBackContext.active.accessToken.userId;
+ await Self.app.models.Till.create({
+ workerFk: ctx.instance.workerFk,
+ bankFk: ctx.instance.bankFk,
+ in: ctx.instance.amountPaid,
+ concept: ctx.instance.description,
+ dated: ctx.instance.payed,
+ serie: 'A',
+ isAccountable: true,
+ number: ctx.instance.clientFk,
+ companyFk: ctx.instance.companyFk
+ });
}
});
};
diff --git a/modules/client/back/models/receipt.json b/modules/client/back/models/receipt.json
index c953ae507..3207546a3 100644
--- a/modules/client/back/models/receipt.json
+++ b/modules/client/back/models/receipt.json
@@ -9,17 +9,19 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"amountPaid": {
- "type": "Number"
+ "type": "number",
+ "required": true
},
"amountUnpaid": {
- "type": "Number"
+ "type": "number"
},
"payed": {
- "type": "date"
+ "type": "date",
+ "required": true
},
"created": {
"type": "date"
@@ -31,7 +33,16 @@
"type": "string",
"mysql": {
"columnName": "invoiceFk"
- }
+ },
+ "required": true
+ },
+ "bankFk": {
+ "type": "number",
+ "required": true
+ },
+ "companyFk": {
+ "type": "number",
+ "required": true
}
},
"relations": {
diff --git a/modules/client/back/models/specs/client.spec.js b/modules/client/back/models/specs/client.spec.js
new file mode 100644
index 000000000..a9d479516
--- /dev/null
+++ b/modules/client/back/models/specs/client.spec.js
@@ -0,0 +1,54 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('Client Model', () => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ http: {
+ req: {
+ headers: {origin: 'http://localhost'},
+ [`__`]: value => {
+ return value;
+ }
+ }
+ }
+ };
+ const ctx = {req: activeCtx};
+ const chatModel = app.models.Chat;
+ const client = {id: 101, name: 'Bruce Banner'};
+ const previousWorkerId = 106; // DavidCharlesHaller
+ const currentWorkerId = 107; // HankPym
+
+ beforeEach(() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
+ describe('notifyAssignment()', () => {
+ it('should call to the Chat send() method for both workers', async() => {
+ spyOn(chatModel, 'send').and.callThrough();
+
+ await app.models.Client.notifyAssignment(client, previousWorkerId, currentWorkerId);
+
+ expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
+ expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+ });
+
+ it('should call to the Chat send() method for the previous worker', async() => {
+ spyOn(chatModel, 'send').and.callThrough();
+
+ await app.models.Client.notifyAssignment(client, null, currentWorkerId);
+
+ expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+ });
+
+ it('should call to the Chat send() method for the current worker', async() => {
+ spyOn(chatModel, 'send').and.callThrough();
+
+ await app.models.Client.notifyAssignment(client, previousWorkerId, null);
+
+ expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
+ });
+ });
+});
diff --git a/modules/client/back/models/till.json b/modules/client/back/models/till.json
new file mode 100644
index 000000000..06f021daf
--- /dev/null
+++ b/modules/client/back/models/till.json
@@ -0,0 +1,64 @@
+{
+ "name": "Till",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "till"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "dated": {
+ "type": "date",
+ "required": true
+ },
+ "isAccountable": {
+ "type": "boolean"
+ },
+ "serie": {
+ "type": "string",
+ "required": true
+ },
+ "number": {
+ "type": "number"
+ },
+ "concept": {
+ "type": "string",
+ "required": true
+ },
+ "in": {
+ "type": "number"
+ },
+ "out": {
+ "type": "number"
+ },
+ "created": {
+ "type": "date"
+ },
+ "isConciliate": {
+ "type": "boolean"
+ }
+ },
+ "relations": {
+ "bank": {
+ "type": "belongsTo",
+ "model": "Bank",
+ "foreignKey": "bankFk"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "Account",
+ "foreignKey": "workerFk"
+ },
+ "company": {
+ "type": "belongsTo",
+ "model": "Company",
+ "foreignKey": "companyFk"
+ }
+ }
+}
+
\ No newline at end of file
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index a2775164d..89ec3b049 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -6,19 +6,23 @@
auto-load="true"
url="Companies"
data="companies"
- order="code">
+ order="code"
+ required="true">
+ ng-model="$ctrl.receipt.payed"
+ required="true">
+ ng-model="$ctrl.receipt.companyFk"
+ required="true"
+ rule>
@@ -29,27 +33,51 @@
value-field="id"
fields="['accountingTypeFk']"
include="{relation: 'accountingType'}"
- ng-model="$ctrl.receipt.bankFk"
+ ng-model="$ctrl.bankFk"
search-function="{or: [{id: $search}, {bank: {like: '%'+ $search +'%'}}]}"
selection="$ctrl.bankSelection"
- order="id">
+ order="id"
+ required="true">
{{id}}: {{bank}}
+ required="true">
+ rule
+ required="true">
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 8b01cab4a..22426a269 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -6,10 +6,7 @@ class Controller extends Dialog {
super($element, $, $transclude);
this.receipt = {
- payed: new Date(),
- clientFk: this.$params.id,
- companyFk: this.vnConfig.companyFk,
- bankFk: this.vnConfig.bankFk
+ payed: new Date()
};
}
@@ -17,12 +14,9 @@ class Controller extends Dialog {
this.receipt.payed = value;
}
- set bankFk(value) {
- this.receipt.bankFk = value;
- }
-
set amountPaid(value) {
this.receipt.amountPaid = value;
+ this.amountToReturn = this.deliveredAmount - value;
}
get amountPaid() {
@@ -63,6 +57,30 @@ class Controller extends Dialog {
}
}
+ set deliveredAmount(value) {
+ this._deliveredAmount = value;
+ this.amountToReturn = value - this.receipt.amountPaid;
+ }
+
+ get deliveredAmount() {
+ return this._deliveredAmount;
+ }
+
+ get bankFk() {
+ if (!this.receipt.bankFk)
+ this.receipt.bankFk = this.vnConfig.bankFk;
+
+ return this.receipt.bankFk;
+ }
+
+ set bankFk(value) {
+ this.receipt.bankFk = value;
+ }
+
+ accountShortToStandard(value) {
+ this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+ }
+
getAmountPaid() {
const filter = {
where: {
@@ -80,7 +98,7 @@ class Controller extends Dialog {
if (response !== 'accept')
return super.responseHandler(response);
- return this.$http.post(`Receipts`, this.receipt)
+ return this.$http.post(`Clients/${this.clientFk}/createReceipt`, this.receipt)
.then(() => super.responseHandler(response))
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
index 9f85387c8..90015be19 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/modules/client/front/balance/create/index.spec.js
@@ -65,12 +65,30 @@ describe('Client', () => {
controller.$params = {id: 101};
- $httpBackend.expect('POST', `Receipts`).respond({id: 1});
+ $httpBackend.expect('POST', `Clients/101/createReceipt`).respond({id: 1});
controller.responseHandler('accept');
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
});
});
+
+ describe('deliveredAmount() setter', () => {
+ it('should set the deliveredAmount property', () => {
+ controller.amountPaid = 999;
+ controller.deliveredAmount = 1000;
+
+ expect(controller.amountToReturn).toEqual(1);
+ });
+ });
+
+ describe('accountShortToStandard()', () => {
+ it('should get de account in stardard format', () => {
+ const shortAccount = '4.3';
+ controller.accountShortToStandard(shortAccount);
+
+ expect(controller.receipt.compensationAccount).toEqual('4000000003');
+ });
+ });
});
});
diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html
index ac9c39d7f..468ac98c3 100644
--- a/modules/client/front/balance/index/index.html
+++ b/modules/client/front/balance/index/index.html
@@ -139,7 +139,8 @@
+ company-fk="$ctrl.companyId"
+ client-fk="$ctrl.$params.id">
diff --git a/modules/client/front/balance/locale/es.yml b/modules/client/front/balance/locale/es.yml
new file mode 100644
index 000000000..53750799c
--- /dev/null
+++ b/modules/client/front/balance/locale/es.yml
@@ -0,0 +1,2 @@
+Compensation: Compensación
+Cash: Efectivo
\ No newline at end of file
diff --git a/modules/client/front/consumption/index.html b/modules/client/front/consumption/index.html
index 1038d4a60..b2128ee11 100644
--- a/modules/client/front/consumption/index.html
+++ b/modules/client/front/consumption/index.html
@@ -64,12 +64,15 @@
{{::sale.shipped | date: 'dd/MM/yyyy'}}
-
+
+ {{::sale.concept}}
+
+
+ tabindex="-1">
{{::sale.quantity | dashIfEmpty}}
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 2ae9e0475..ac419aa40 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -82,7 +82,6 @@
value-field="id"
label="Previous client"
info="In case of a company succession, specify the grantor company"
- vn-acl="salesAssistant"
rule>
diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml
index 166bdbe1b..82cbb129e 100644
--- a/modules/client/front/locale/es.yml
+++ b/modules/client/front/locale/es.yml
@@ -57,4 +57,7 @@ Contacts: Contactos
Samples: Plantillas
Send sample: Enviar plantilla
Log: Historial
-Consumption: Consumo
\ No newline at end of file
+Consumption: Consumo
+Compensation Account: Cuenta para compensar
+Amount to return: Cantidad a devolver
+Delivered amount: Cantidad entregada
\ No newline at end of file
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 3e8f4f705..b1ec1f781 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -40,7 +40,7 @@
value="{{$ctrl.summary.mobile}}">
+ value="{{$ctrl.listEmails($ctrl.summary.email)}}">
{
+ Self.remoteMethodCtx('importBuys', {
+ description: 'Imports the buys from a list',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The entry id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'options',
+ type: 'object',
+ description: 'Callback options',
+ },
+ {
+ arg: 'ref',
+ type: 'string',
+ description: 'The buyed boxes ids',
+ },
+ {
+ arg: 'observation',
+ type: 'string',
+ description: 'The observation',
+ },
+ {
+ arg: 'buys',
+ type: ['Object'],
+ description: 'The buys',
+ }],
+ returns: {
+ type: ['Object'],
+ root: true
+ },
+ http: {
+ path: `/:id/importBuys`,
+ verb: 'POST'
+ }
+ });
+
+ Self.importBuys = async(ctx, id, options = {}) => {
+ const conn = Self.dataSource.connector;
+ const args = ctx.args;
+ const models = Self.app.models;
+
+ let tx;
+ if (!options.transaction) {
+ tx = await Self.beginTransaction({});
+ options.transaction = tx;
+ }
+
+ try {
+ const entry = await models.Entry.findById(id, null, options);
+ await entry.updateAttributes({
+ observation: args.observation,
+ ref: args.ref
+ }, options);
+
+ const buys = [];
+ for (let buy of args.buys) {
+ buys.push({
+ entryFk: entry.id,
+ itemFk: buy.itemFk,
+ stickers: 1,
+ quantity: 1,
+ packing: buy.packing,
+ grouping: buy.grouping,
+ buyingValue: buy.buyingValue,
+ packageFk: buy.packageFk
+ });
+ }
+
+ const createdBuys = await models.Buy.create(buys, options);
+ const buyIds = createdBuys.map(buy => buy.id);
+
+ let stmts = [];
+ let stmt;
+
+ stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc');
+ stmt = new ParameterizedSQL(
+ `CREATE TEMPORARY TABLE tmp.buyRecalc
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT ? AS id`, [buyIds]);
+
+ stmts.push(stmt);
+ stmts.push('CALL buy_recalcPrices()');
+
+ const sql = ParameterizedSQL.join(stmts, ';');
+ await conn.executeStmt(sql, options);
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/entry/back/methods/entry/importBuysPreview.js b/modules/entry/back/methods/entry/importBuysPreview.js
new file mode 100644
index 000000000..9d6662327
--- /dev/null
+++ b/modules/entry/back/methods/entry/importBuysPreview.js
@@ -0,0 +1,40 @@
+module.exports = Self => {
+ Self.remoteMethod('importBuysPreview', {
+ description: 'Calculates the preview buys for an entry import',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The entry id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'buys',
+ type: ['Object'],
+ description: 'The buys',
+ }],
+ returns: {
+ type: ['Object'],
+ root: true
+ },
+ http: {
+ path: `/:id/importBuysPreview`,
+ verb: 'GET'
+ }
+ });
+
+ Self.importBuysPreview = async(id, buys) => {
+ const models = Self.app.models;
+ for (let buy of buys) {
+ const packaging = await models.Packaging.findOne({
+ fields: ['id'],
+ where: {volume: {gte: buy.volume}},
+ order: 'volume ASC'
+ });
+ buy.packageFk = packaging.id;
+ }
+
+ return buys;
+ };
+};
diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index 10c41dd92..4c3536b8d 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -37,11 +37,11 @@ module.exports = Self => {
}, {
arg: 'active',
type: 'Boolean',
- description: 'Whether the the item is or not active',
+ description: 'Whether the item is or not active',
}, {
arg: 'visible',
type: 'Boolean',
- description: 'Whether the the item is or not visible',
+ description: 'Whether the item is or not visible',
}, {
arg: 'typeFk',
type: 'Integer',
@@ -78,6 +78,8 @@ module.exports = Self => {
return {'ic.id': value};
case 'salesPersonFk':
return {'it.workerFk': value};
+ case 'code':
+ return {'it.code': value};
case 'typeFk':
return {'i.typeFk': value};
case 'active':
@@ -103,6 +105,7 @@ module.exports = Self => {
i.id AS itemFk,
i.size,
i.density,
+ it.code,
i.typeFk,
i.family,
i.isActive,
diff --git a/modules/entry/back/methods/entry/specs/importBuys.spec.js b/modules/entry/back/methods/entry/specs/importBuys.spec.js
new file mode 100644
index 000000000..942ce0a0b
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/importBuys.spec.js
@@ -0,0 +1,82 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('entry import()', () => {
+ const buyerId = 35;
+ const companyId = 442;
+ const travelId = 1;
+ const supplierId = 1;
+ const activeCtx = {
+ accessToken: {userId: buyerId},
+ };
+
+ beforeAll(async done => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+
+ done();
+ });
+
+ it('should import the buy rows', async() => {
+ const expectedRef = '1, 2';
+ const expectedObservation = '123456';
+ const ctx = {
+ req: activeCtx,
+ args: {
+ observation: expectedObservation,
+ ref: expectedRef,
+ buys: [
+ {
+ itemFk: 1,
+ buyingValue: 5.77,
+ description: 'Bow',
+ grouping: 1,
+ packing: 1,
+ size: 1,
+ volume: 1200,
+ packageFk: '94'
+ },
+ {
+ itemFk: 4,
+ buyingValue: 2.16,
+ description: 'Arrow',
+ grouping: 1,
+ packing: 1,
+ size: 25,
+ volume: 1125,
+ packageFk: '94'
+ }
+ ]
+ }
+ };
+ const tx = await app.models.Entry.beginTransaction({});
+ try {
+ const options = {transaction: tx};
+ const newEntry = await app.models.Entry.create({
+ dated: new Date(),
+ supplierFk: supplierId,
+ travelFk: travelId,
+ companyFk: companyId,
+ observation: 'The entry',
+ ref: 'Entry ref'
+ }, options);
+
+ await app.models.Entry.importBuys(ctx, newEntry.id, options);
+
+ const updatedEntry = await app.models.Entry.findById(newEntry.id, null, options);
+ const entryBuys = await app.models.Buy.find({
+ where: {entryFk: newEntry.id}
+ }, options);
+
+ expect(updatedEntry.observation).toEqual(expectedObservation);
+ expect(updatedEntry.ref).toEqual(expectedRef);
+ expect(entryBuys.length).toEqual(2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
new file mode 100644
index 000000000..d286993ad
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
@@ -0,0 +1,41 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('entry importBuysPreview()', () => {
+ const entryId = 1;
+ beforeAll(async done => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+
+ done();
+ });
+
+ it('should return the buys with the calculated packageFk', async() => {
+ const expectedPackageFk = '3';
+ const buys = [
+ {
+ itemFk: 1,
+ buyingValue: 5.77,
+ description: 'Bow',
+ grouping: 1,
+ size: 1,
+ volume: 1200
+ },
+ {
+ itemFk: 4,
+ buyingValue: 2.16,
+ description: 'Arrow',
+ grouping: 1,
+ size: 25,
+ volume: 1125
+ }
+ ];
+
+ const result = await app.models.Entry.importBuysPreview(entryId, buys);
+ const randomIndex = Math.floor(Math.random() * result.length);
+ const buy = result[randomIndex];
+
+ expect(buy.packageFk).toEqual(expectedPackageFk);
+ });
+});
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 94dbe787d..f1a22fddd 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -2,4 +2,6 @@ module.exports = Self => {
require('../methods/entry/filter')(Self);
require('../methods/entry/getEntry')(Self);
require('../methods/entry/getBuys')(Self);
+ require('../methods/entry/importBuys')(Self);
+ require('../methods/entry/importBuysPreview')(Self);
};
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 40d6d29dd..78d3c5e4f 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -28,7 +28,7 @@
"type": "boolean"
},
"notes": {
- "type": "String"
+ "type": "string"
},
"isConfirmed": {
"type": "boolean"
diff --git a/modules/entry/front/buy/import/index.html b/modules/entry/front/buy/import/index.html
new file mode 100644
index 000000000..74b6c708a
--- /dev/null
+++ b/modules/entry/front/buy/import/index.html
@@ -0,0 +1,116 @@
+
+
+
diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js
new file mode 100644
index 000000000..9dc3418f0
--- /dev/null
+++ b/modules/entry/front/buy/import/index.js
@@ -0,0 +1,99 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ this.import = {
+ file: '',
+ invoice: null,
+ buys: []
+ };
+ }
+
+ onFileChange($event) {
+ const input = $event.target;
+ const file = input.files[0];
+
+ const reader = new FileReader();
+ reader.onload = event =>
+ this.fillData(event.target.result);
+ reader.readAsText(file, 'UTF-8');
+ }
+
+ fillData(raw) {
+ const data = JSON.parse(raw);
+ const [invoice] = data.invoices;
+
+ this.$.$applyAsync(() => {
+ this.import.observation = invoice.tx_awb;
+
+ const boxes = invoice.boxes;
+ const buys = [];
+ for (let box of boxes) {
+ const boxVolume = box.nu_length * box.nu_width * box.nu_height;
+ for (let product of box.products) {
+ const packing = product.nu_stems_bunch * product.nu_bunches;
+ buys.push({
+ description: product.nm_product,
+ size: product.nu_length,
+ packing: packing,
+ grouping: product.nu_stems_bunch,
+ buyingValue: parseFloat(product.mny_rate_stem),
+ volume: boxVolume
+ });
+ }
+ }
+
+ const boxesId = boxes.map(box => box.id_box);
+ this.import.ref = boxesId.join(', ');
+
+ this.fetchBuys(buys);
+ });
+ }
+
+ fetchBuys(buys) {
+ const params = {buys};
+ const query = `Entries/${this.entry.id}/importBuysPreview`;
+ this.$http.get(query, {params}).then(res => {
+ this.import.buys = res.data;
+ });
+ }
+
+ onSubmit() {
+ try {
+ const params = this.import;
+ const hasAnyEmptyRow = params.buys.some(buy => {
+ return buy.itemFk == null;
+ });
+
+ if (hasAnyEmptyRow)
+ throw new Error(`Some of the imported buys doesn't have an item`);
+
+ const query = `Entries/${this.entry.id}/importBuys`;
+ return this.$http.post(query, params)
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+ .then(() => this.$state.go('entry.card.buy.index'));
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ return false;
+ }
+ }
+
+ itemSearchFunc($search) {
+ return /^\d+$/.test($search)
+ ? {id: $search}
+ : {name: {like: '%' + $search + '%'}};
+ }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnEntryBuyImport', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ worker: '<'
+ }
+});
diff --git a/modules/entry/front/buy/import/index.spec.js b/modules/entry/front/buy/import/index.spec.js
new file mode 100644
index 000000000..126c7375f
--- /dev/null
+++ b/modules/entry/front/buy/import/index.spec.js
@@ -0,0 +1,145 @@
+import './index.js';
+
+describe('Entry', () => {
+ describe('Component vnEntryBuyImport', () => {
+ let controller;
+ let $httpParamSerializer;
+ let $httpBackend;
+
+ beforeEach(ngModule('entry'));
+
+ beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpParamSerializer_, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ $httpParamSerializer = _$httpParamSerializer_;
+ let $element = $compile(' {
+ it(`should call to the fillData() method`, () => {
+ controller.fetchBuys = jest.fn();
+
+ const rawData = `{
+ "invoices": [
+ {
+ "tx_awb": "123456",
+ "boxes": [
+ {
+ "id_box": 1,
+ "nu_length": 1,
+ "nu_width": 15,
+ "nu_height": 80,
+ "products": [
+ {
+ "nm_product": "Bow",
+ "nu_length": 1,
+ "nu_stems_bunch": 1,
+ "nu_bunches": 1,
+ "mny_rate_stem": 5.77
+ }
+
+ ]
+ },
+ {
+ "id_box": 2,
+ "nu_length": 25,
+ "nu_width": 1,
+ "nu_height": 45,
+ "products": [
+ {
+ "nm_product": "Arrow",
+ "nu_length": 25,
+ "nu_stems_bunch": 1,
+ "nu_bunches": 1,
+ "mny_rate_stem": 2.16
+ }
+ ]
+ }
+ ]
+ }
+ ]}`;
+ const expectedBuys = [
+ {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+ {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+ ];
+ controller.fillData(rawData);
+ controller.$.$apply();
+
+ const importData = controller.import;
+
+ expect(importData.observation).toEqual('123456');
+ expect(importData.ref).toEqual('1, 2');
+
+ expect(controller.fetchBuys).toHaveBeenCalledWith(expectedBuys);
+ });
+ });
+
+ describe('fetchBuys()', () => {
+ it(`should perform a query to fetch the buys data`, () => {
+ const buys = [
+ {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+ {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+ ];
+
+ const serializedParams = $httpParamSerializer({buys});
+ const query = `Entries/1/importBuysPreview?${serializedParams}`;
+ $httpBackend.expectGET(query).respond(200, buys);
+ controller.fetchBuys(buys);
+ $httpBackend.flush();
+
+ const importData = controller.import;
+
+ expect(importData.buys.length).toEqual(2);
+ });
+ });
+
+ describe('onSubmit()', () => {
+ it(`should throw an error when some of the rows doesn't have an item`, () => {
+ jest.spyOn(controller.vnApp, 'showError');
+
+ controller.import = {
+ observation: '123456',
+ ref: '1, 2',
+ buys: [
+ {'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+ {'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+ ]
+ };
+
+ controller.onSubmit();
+
+ expect(controller.vnApp.showError).toHaveBeenCalledWith(`Some of the imported buys doesn't have an item`);
+ });
+
+ it(`should perform a query to update columns`, () => {
+ jest.spyOn(controller.vnApp, 'showSuccess');
+ controller.$state.go = jest.fn();
+
+ controller.import = {
+ observation: '123456',
+ ref: '1, 2',
+ buys: [
+ {'itemFk': 10, 'buyingValue': 5.77, 'description': 'Bow', 'grouping': 1, 'packing': 1, 'size': 1, 'volume': 1200},
+ {'itemFk': 11, 'buyingValue': 2.16, 'description': 'Arrow', 'grouping': 1, 'packing': 1, 'size': 25, 'volume': 1125}
+ ]
+ };
+ const params = controller.import;
+
+ const query = `Entries/1/importBuys`;
+ $httpBackend.expectPOST(query, params).respond(200, params.buys);
+ controller.onSubmit();
+ $httpBackend.flush();
+
+ const importData = controller.import;
+
+ expect(importData.buys.length).toEqual(2);
+
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.$state.go).toHaveBeenCalledWith('entry.card.buy.index');
+ });
+ });
+ });
+});
diff --git a/modules/entry/front/buy/import/style.scss b/modules/entry/front/buy/import/style.scss
new file mode 100644
index 000000000..dba069616
--- /dev/null
+++ b/modules/entry/front/buy/import/style.scss
@@ -0,0 +1,5 @@
+vn-entry-buy-import {
+ .vn-table > tbody td:nth-child(1) {
+ width: 250px
+ }
+}
\ No newline at end of file
diff --git a/modules/entry/front/buy/index.html b/modules/entry/front/buy/index.html
deleted file mode 100644
index 8b1378917..000000000
--- a/modules/entry/front/buy/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
new file mode 100644
index 000000000..0ff11c8a6
--- /dev/null
+++ b/modules/entry/front/buy/index/index.html
@@ -0,0 +1,14 @@
+Quantity
Description
Size
- Tags
- Type
+ Tags
+ Type
Intrastat
Origin
Density
@@ -61,7 +61,7 @@
+ ui-sref="entry.card.buy.index({id: {{::buy.entryFk}}})">
{{::buy.size}}
-
+
+ {{::buy.name}}
+
+
+ tabindex="-1">
- {{::buy.type}}
+ {{::buy.code}}
{{::buy.intrastat}}
@@ -162,9 +165,13 @@
+ on-close="$ctrl.editedColumn = null">
+ Edit
+
+ {{::$ctrl.totalChecked}}
+
+ buy(s)
-
+
+ {{::line.item.name}}
+ tabindex="-1">
diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
new file mode 100644
index 000000000..20680f153
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -0,0 +1,171 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('filter', {
+ description: 'Find all instances of the model matched by filter from the data source.',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+ http: {source: 'query'}
+ },
+ {
+ arg: 'search',
+ type: 'string',
+ description: 'Searchs the invoiceOut by id',
+ http: {source: 'query'}
+ },
+ {
+ arg: 'supplierRef',
+ type: 'string',
+ description: 'The supplier reference'
+ },
+ {
+ arg: 'fi',
+ type: 'string',
+ description: 'The supplier fiscal id'
+ },
+ {
+ arg: 'serialNumber',
+ type: 'number',
+ description: 'The serial number'
+ },
+ {
+ arg: 'serial',
+ type: 'string',
+ description: 'The serial'
+ },
+ {
+ arg: 'amount',
+ type: 'number',
+ description: 'The amount'
+ },
+ {
+ arg: 'from',
+ type: 'date',
+ description: `The from date filter`
+ }, {
+ arg: 'to',
+ type: 'date',
+ description: `The to date filter`
+ },
+ {
+ arg: 'issued',
+ type: 'date',
+ description: 'The issued date'
+ },
+ {
+ arg: 'account',
+ type: 'number',
+ description: 'The account number'
+ },
+ {
+ arg: 'awbCode',
+ type: 'string',
+ description: 'The Air Waybill code'
+ },
+ {
+ arg: 'isBooked',
+ type: 'boolean',
+ description: 'Whether the the invoice is booked or not',
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/filter`,
+ verb: 'GET'
+ }
+ });
+
+ Self.filter = async(ctx, filter) => {
+ const conn = Self.dataSource.connector;
+ const args = ctx.args;
+
+ if (args && args.to) {
+ const dateTo = args.to;
+ dateTo.setHours(23, 59, 0, 0);
+ }
+
+ let where = buildFilter(ctx.args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? {'ii.id': value}
+ : {'s.name': {like: `%${value}%`}};
+ case 'from':
+ return {'ii.created': {gte: value}};
+ case 'to':
+ return {'ii.created': {lte: value}};
+ case 'account':
+ case 'fi':
+ return {[`s.${param}`]: value};
+ case 'supplierRef':
+ case 'serialNumber':
+ case 'serial':
+ case 'issued':
+ case 'isBooked':
+ return {[`ii.${param}`]: value};
+ case 'awbCode':
+ return {'awb.code': value};
+ }
+ });
+
+ filter = mergeFilters(filter, {where});
+
+ let stmts = [];
+ let stmt;
+
+ stmt = new ParameterizedSQL(
+ `SELECT
+ ii.id,
+ ii.serialNumber,
+ ii.serial,
+ ii.issued,
+ ii.isBooked,
+ ii.supplierRef,
+ ii.docFk AS dmsFk,
+ s.id AS supplierFk,
+ s.name AS supplierName,
+ s.account,
+ SUM(iid.amount) AS amount,
+ awb.code AS awbCode
+ FROM invoiceIn ii
+ JOIN supplier s ON s.id = ii.supplierFk
+ LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+ LEFT JOIN duaInvoiceIn dii ON dii.invoiceInFk = ii.id
+ LEFT JOIN dua d ON d.id = dii.duaFk
+ LEFT JOIN awb ON awb.id = d.awbFk
+ LEFT JOIN company co ON co.id = ii.companyFk`
+ );
+
+ const sqlWhere = conn.makeWhere(filter.where);
+
+ stmt.merge(sqlWhere);
+ stmt.merge(`GROUP BY ii.id`);
+
+ const amount = ctx.args.amount;
+ if (amount) {
+ stmt.merge({
+ sql: `HAVING SUM(iid.amount) = ?`,
+ params: [amount],
+ });
+ }
+
+ stmt.merge(conn.makePagination(filter));
+
+ let itemsIndex = stmts.push(stmt) - 1;
+
+ let sql = ParameterizedSQL.join(stmts, ';');
+ let result = await conn.executeStmt(sql);
+ return itemsIndex === 0 ? result : result[itemsIndex];
+ };
+};
+
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
new file mode 100644
index 000000000..13b54527b
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@@ -0,0 +1,111 @@
+const app = require('vn-loopback/server/server');
+
+describe('InvoiceIn filter()', () => {
+ it('should return the invoice in matching supplier name', async() => {
+ let ctx = {
+ args: {
+ search: 'Plants SL',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(5);
+ expect(result[0].supplierName).toEqual('Plants SL');
+ });
+
+ it('should return the invoice in matching supplier reference', async() => {
+ let ctx = {
+ args: {
+ supplierRef: '1241',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(1);
+ expect(result[0].supplierRef).toEqual('1241');
+ });
+
+ it('should return the invoice in matching the serial number', async() => {
+ let ctx = {
+ args: {
+ serialNumber: '1002',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(1);
+ expect(result[0].serialNumber).toEqual(1002);
+ });
+
+ it('should return the invoice in matching the account', async() => {
+ let ctx = {
+ args: {
+ account: '4000020002',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(5);
+ expect(result[0].account).toEqual('4000020002');
+ });
+
+ it('should return the invoice in matching the awb code', async() => {
+ let ctx = {
+ args: {
+ awbCode: '07546491432',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+ const firstRow = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstRow.id).toEqual(7);
+ expect(firstRow.awbCode).toEqual('07546491432');
+ });
+
+ it('should return the invoice in matching the amount', async() => {
+ let ctx = {
+ args: {
+ amount: '64.23',
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(1);
+ expect(result[0].amount).toEqual(64.23);
+ });
+
+ it('should return the invoice in matching "from" and "to"', async() => {
+ const from = new Date();
+ const to = new Date();
+ from.setHours(0, 0, 0, 0);
+ to.setHours(23, 59, 59, 999);
+ to.setDate(to.getDate() + 1);
+ const ctx = {
+ args: {from, to}
+ };
+
+ const result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(6);
+ });
+
+ it('should return the booked invoice in', async() => {
+ let ctx = {
+ args: {
+ isBooked: true,
+ }
+ };
+
+ let result = await app.models.InvoiceIn.filter(ctx);
+
+ expect(result.length).toEqual(6);
+ expect(result[0].isBooked).toBeTruthy();
+ });
+});
diff --git a/modules/invoiceIn/back/model-config.json b/modules/invoiceIn/back/model-config.json
new file mode 100644
index 000000000..7f95924a4
--- /dev/null
+++ b/modules/invoiceIn/back/model-config.json
@@ -0,0 +1,5 @@
+{
+ "InvoiceIn": {
+ "dataSource": "vn"
+ }
+}
diff --git a/modules/invoiceIn/back/models/invoice-in.js b/modules/invoiceIn/back/models/invoice-in.js
new file mode 100644
index 000000000..278843428
--- /dev/null
+++ b/modules/invoiceIn/back/models/invoice-in.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+ require('../methods/invoice-in/filter')(Self);
+};
diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
new file mode 100644
index 000000000..3310c4346
--- /dev/null
+++ b/modules/invoiceIn/back/models/invoice-in.json
@@ -0,0 +1,67 @@
+{
+ "name": "InvoiceIn",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "invoiceIn"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "Number",
+ "description": "Identifier"
+ },
+ "serialNumber": {
+ "type": "number"
+ },
+ "serial": {
+ "type": "string"
+ },
+ "issued": {
+ "type": "date"
+ },
+ "created": {
+ "type": "date"
+ },
+ "isBooked": {
+ "type": "boolean"
+ },
+ "booked": {
+ "type": "date"
+ },
+ "operated": {
+ "type": "date"
+ },
+ "dmsFk": {
+ "type": "number",
+ "mysql": {
+ "columnName": "docFk"
+ }
+ }
+ },
+ "relations": {
+ "company": {
+ "type": "belongsTo",
+ "model": "Company",
+ "foreignKey": "companyFk"
+ },
+ "supplier": {
+ "type": "belongsTo",
+ "model": "Supplier",
+ "foreignKey": "supplierFk"
+ },
+ "currency": {
+ "type": "belongsTo",
+ "model": "Currency",
+ "foreignKey": "currencyFk"
+ },
+ "dms": {
+ "type": "belongsTo",
+ "model": "Dms",
+ "foreignKey": "dmsFk"
+ }
+ }
+}
+
+
diff --git a/modules/invoiceIn/front/card/index.html b/modules/invoiceIn/front/card/index.html
new file mode 100644
index 000000000..aed88cbdd
--- /dev/null
+++ b/modules/invoiceIn/front/card/index.html
@@ -0,0 +1,5 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/invoiceIn/front/descriptor-popover/index.js b/modules/invoiceIn/front/descriptor-popover/index.js
new file mode 100644
index 000000000..97f46a32f
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor-popover/index.js
@@ -0,0 +1,9 @@
+import ngModule from '../module';
+import DescriptorPopover from 'salix/components/descriptor-popover';
+
+class Controller extends DescriptorPopover {}
+
+ngModule.vnComponent('vnInvoiceInDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
new file mode 100644
index 000000000..6b22dd62b
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -0,0 +1,36 @@
+import ngModule from '../module';
+import Descriptor from 'salix/components/descriptor';
+
+class Controller extends Descriptor {
+ get invoiceIn() {
+ return this.entity;
+ }
+
+ set invoiceIn(value) {
+ this.entity = value;
+ }
+
+ loadData() {
+ const filter = {
+ include: [
+ {
+ relation: 'company',
+ scope: {
+ fields: ['id', 'code']
+ }
+ }
+ ]
+ };
+
+ return this.getData(`InvoiceIns/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
+ }
+}
+
+ngModule.vnComponent('vnInvoiceInDescriptor', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ invoiceIn: '<'
+ }
+});
diff --git a/modules/invoiceIn/front/descriptor/index.spec.js b/modules/invoiceIn/front/descriptor/index.spec.js
new file mode 100644
index 000000000..df72f5b45
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor/index.spec.js
@@ -0,0 +1,26 @@
+import './index';
+
+describe('vnInvoiceInDescriptor', () => {
+ let controller;
+ let $httpBackend;
+
+ beforeEach(ngModule('invoiceIn'));
+
+ beforeEach(inject(($componentController, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ controller = $componentController('vnInvoiceInDescriptor', {$element: null});
+ }));
+
+ describe('loadData()', () => {
+ it(`should perform a get query to store the invoice in data into the controller`, () => {
+ const id = 1;
+ const response = {id: 1};
+
+ $httpBackend.expectGET(`InvoiceIns/${id}`).respond(response);
+ controller.id = id;
+ $httpBackend.flush();
+
+ expect(controller.invoiceIn).toEqual(response);
+ });
+ });
+});
diff --git a/modules/invoiceIn/front/index.js b/modules/invoiceIn/front/index.js
new file mode 100644
index 000000000..acb341c50
--- /dev/null
+++ b/modules/invoiceIn/front/index.js
@@ -0,0 +1,8 @@
+export * from './module';
+
+import './main';
+import './index/';
+import './search-panel';
+import './card';
+import './descriptor';
+import './descriptor-popover';
diff --git a/modules/invoiceIn/front/index/index.html b/modules/invoiceIn/front/index/index.html
new file mode 100644
index 000000000..c554dfd5f
--- /dev/null
+++ b/modules/invoiceIn/front/index/index.html
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+ ID
+ Supplier
+ Supplier ref.
+ Serial number
+ Serial
+ Account
+ Issued
+ Is booked
+ AWB
+ Amount
+
+
+
+
+ {{::invoiceIn.id}}
+
+
+ {{::invoiceIn.supplierName}}
+
+
+ {{::invoiceIn.supplierRef | dashIfEmpty}}
+ {{::invoiceIn.serialNumber}}
+ {{::invoiceIn.serial}}
+ {{::invoiceIn.account}}
+ {{::invoiceIn.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
+
+
+
+
+ {{::invoiceIn.awbCode}}
+ {{::invoiceIn.amount | currency:'EUR'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Filter by selection
+
+
+ Exclude selection
+
+
+ Remove filter
+
+
+ Remove all filters
+
+
+ Copy value
+
+
+
diff --git a/modules/invoiceIn/front/index/index.js b/modules/invoiceIn/front/index/index.js
new file mode 100644
index 000000000..4bb0fd6a4
--- /dev/null
+++ b/modules/invoiceIn/front/index/index.js
@@ -0,0 +1,42 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'issued':
+ return {'ii.issued': {
+ between: this.dateRange(value)}
+ };
+ case 'id':
+ case 'supplierFk':
+ case 'supplierRef':
+ case 'serialNumber':
+ case 'serial':
+ case 'created':
+ case 'isBooked':
+ return {[`ii.${param}`]: value};
+ case 'account':
+ case 'fi':
+ return {[`s.${param}`]: value};
+ case 'awbCode':
+ return {'awb.code': value};
+ default:
+ return {[param]: value};
+ }
+ }
+
+ dateRange(value) {
+ const minHour = new Date(value);
+ minHour.setHours(0, 0, 0, 0);
+ const maxHour = new Date(value);
+ maxHour.setHours(23, 59, 59, 59);
+
+ return [minHour, maxHour];
+ }
+}
+
+ngModule.vnComponent('vnInvoiceInIndex', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/invoiceIn/front/index/locale/es.yml b/modules/invoiceIn/front/index/locale/es.yml
new file mode 100644
index 000000000..e1b354316
--- /dev/null
+++ b/modules/invoiceIn/front/index/locale/es.yml
@@ -0,0 +1,6 @@
+Created: Fecha creación
+Issued: Fecha emisión
+Supplier ref.: Ref. proveedor
+Serial number: Num. serie
+Serial: Serie
+Is booked: Conciliada
\ No newline at end of file
diff --git a/modules/invoiceIn/front/locale/es.yml b/modules/invoiceIn/front/locale/es.yml
new file mode 100644
index 000000000..02501b14a
--- /dev/null
+++ b/modules/invoiceIn/front/locale/es.yml
@@ -0,0 +1,2 @@
+InvoiceIn: Facturas recibidas
+Search invoices in by reference: Buscar facturas recibidas por referencia
\ No newline at end of file
diff --git a/modules/invoiceIn/front/main/index.html b/modules/invoiceIn/front/main/index.html
new file mode 100644
index 000000000..2dc87b2ee
--- /dev/null
+++ b/modules/invoiceIn/front/main/index.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+ Regenerate invoice PDF
+
{{$ctrl.description}}
+{{$ctrl.description}}
{{$ctrl.descriptor.id | id}}
diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss
index afef37aa4..f51137620 100644
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@@ -11,8 +11,8 @@ vn-descriptor-content {
& > img[ng-src] {
min-height: 16em;
display: block;
- height: 100%;
- width: 100%;
+ width: 256px;
+ height: 256px;
}
vn-float-button {
diff --git a/front/salix/components/home/home.html b/front/salix/components/home/home.html
index ada51d76f..2904d7d70 100644
--- a/front/salix/components/home/home.html
+++ b/front/salix/components/home/home.html
@@ -1,20 +1,67 @@
+
+
diff --git a/front/salix/components/home/home.js b/front/salix/components/home/home.js
index 3da49a265..90eed2b30 100644
--- a/front/salix/components/home/home.js
+++ b/front/salix/components/home/home.js
@@ -9,6 +9,55 @@ export default class Controller extends Component {
this.$sce = $sce;
}
+ get modules() {
+ return this._modules;
+ }
+
+ set modules(value) {
+ this._modules = value;
+ this.getStarredModules();
+ }
+
+ countModules() {
+ this.starredCount = 0;
+ this.regularCount = 0;
+ this.modules.forEach(module => {
+ if (module.starred) this.starredCount ++;
+ else this.regularCount ++;
+ });
+ }
+
+ getStarredModules() {
+ this.$http.get('starredModules/getStarredModules')
+ .then(res => {
+ if (!res.data.length) return;
+
+ for (let starredModule of res.data) {
+ const module = this.modules.find(mod => mod.name === starredModule.moduleFk);
+ module.starred = true;
+ }
+ this.countModules();
+ });
+ }
+
+ toggleStarredModule(module, event) {
+ if (event.defaultPrevented) return;
+ event.preventDefault();
+ event.stopPropagation();
+
+ const params = {moduleName: module.name};
+ const query = `starredModules/toggleStarredModule`;
+ this.$http.post(query, params).then(res => {
+ if (res.data)
+ module.starred = true;
+ else
+ module.starred = false;
+
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ this.countModules();
+ });
+ }
+
getModuleName(mod) {
let getName = mod => {
let name = this.$t(mod.name);
diff --git a/front/salix/components/home/home.spec.js b/front/salix/components/home/home.spec.js
new file mode 100644
index 000000000..09cb7e39b
--- /dev/null
+++ b/front/salix/components/home/home.spec.js
@@ -0,0 +1,75 @@
+import './home';
+
+describe('Salix Component vnHome', () => {
+ let controller;
+ let $httpBackend;
+ let $scope;
+ let $element;
+
+ beforeEach(ngModule('salix'));
+
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _vnApp_, $window) => {
+ $httpBackend = _$httpBackend_;
+ $scope = $rootScope.$new();
+ $element = angular.element('
+ Favorites
+
+
+ You can set modules as favorites by clicking their icon
+
+Cash
+Compensation
+{{::sale.subName}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/entry/front/buy/index.js b/modules/entry/front/buy/index/index.js
similarity index 66%
rename from modules/entry/front/buy/index.js
rename to modules/entry/front/buy/index/index.js
index 00a8421fb..6cb27e022 100644
--- a/modules/entry/front/buy/index.js
+++ b/modules/entry/front/buy/index/index.js
@@ -1,7 +1,7 @@
-import ngModule from '../module';
+import ngModule from '../../module';
import Section from 'salix/components/section';
-ngModule.vnComponent('vnEntryBuy', {
+ngModule.vnComponent('vnEntryBuyIndex', {
template: require('./index.html'),
controller: Section,
bindings: {
diff --git a/modules/entry/front/buy/index/locale/es.yml b/modules/entry/front/buy/index/locale/es.yml
new file mode 100644
index 000000000..8f2be1e44
--- /dev/null
+++ b/modules/entry/front/buy/index/locale/es.yml
@@ -0,0 +1 @@
+Buy: Lineas de entrada
\ No newline at end of file
diff --git a/modules/entry/front/buy/locale/es.yml b/modules/entry/front/buy/locale/es.yml
index 8f2be1e44..c77587758 100644
--- a/modules/entry/front/buy/locale/es.yml
+++ b/modules/entry/front/buy/locale/es.yml
@@ -1 +1,6 @@
-Buy: Lineas de entrada
\ No newline at end of file
+reference: Referencia
+Observation: Observación
+Box: Embalaje
+Import buys: Importar compras
+Some of the imported buys doesn't have an item: Algunas de las compras importadas no tienen un artículo
+JSON files only: Solo ficheros JSON
\ No newline at end of file
diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js
index 14aecc8db..88700b166 100644
--- a/modules/entry/front/index.js
+++ b/modules/entry/front/index.js
@@ -13,4 +13,6 @@ import './card';
import './note';
import './summary';
import './log';
-import './buy';
+import './buy/index';
+import './buy/import';
+
diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html
index 6ab675d76..d34dfdbb2 100644
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@@ -37,8 +37,8 @@
{{::buy.subName}}
+
+
+
diff --git a/modules/invoiceIn/front/search-panel/index.js b/modules/invoiceIn/front/search-panel/index.js
new file mode 100644
index 000000000..a8e41b7ef
--- /dev/null
+++ b/modules/invoiceIn/front/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.vnComponent('vnInvoiceInSearchPanel', {
+ template: require('./index.html'),
+ controller: SearchPanel
+});
diff --git a/modules/invoiceIn/front/search-panel/locale/es.yml b/modules/invoiceIn/front/search-panel/locale/es.yml
new file mode 100644
index 000000000..57e2944ea
--- /dev/null
+++ b/modules/invoiceIn/front/search-panel/locale/es.yml
@@ -0,0 +1,2 @@
+Supplier fiscal id: CIF proveedor
+Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
\ No newline at end of file
diff --git a/modules/invoiceOut/back/methods/invoiceOut/book.js b/modules/invoiceOut/back/methods/invoiceOut/book.js
index 358de8fd5..af495c1f0 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/book.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/book.js
@@ -21,10 +21,20 @@ module.exports = Self => {
});
Self.book = async ref => {
- let ticketAddress = await Self.app.models.Ticket.findOne({where: {invoiceOut: ref}});
- let invoiceCompany = await Self.app.models.InvoiceOut.findOne({where: {ref: ref}});
- let [taxArea] = await Self.rawSql(`Select vn.addressTaxArea(?, ?) AS code`, [ticketAddress.address, invoiceCompany.company]);
+ const models = Self.app.models;
+ const ticketAddress = await models.Ticket.findOne({
+ where: {invoiceOut: ref}
+ });
+ const invoiceCompany = await models.InvoiceOut.findOne({
+ where: {ref: ref}
+ });
+ let query = 'SELECT vn.addressTaxArea(?, ?) AS code';
+ const [taxArea] = await Self.rawSql(query, [
+ ticketAddress.address,
+ invoiceCompany.company
+ ]);
- return Self.rawSql(`CALL vn.invoiceOutAgain(?, ?)`, [ref, taxArea.code]);
+ query = 'CALL vn.invoiceOutAgain(?, ?)';
+ return Self.rawSql(query, [ref, taxArea.code]);
};
};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createPdf.js b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
new file mode 100644
index 000000000..9bf4e93a3
--- /dev/null
+++ b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
@@ -0,0 +1,86 @@
+const fs = require('fs-extra');
+const got = require('got');
+const path = require('path');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('createPdf', {
+ description: 'Creates an invoice PDF',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ description: 'The invoice id',
+ http: {source: 'path'}
+ }
+ ],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/:id/createPdf`,
+ verb: 'POST'
+ }
+ });
+
+ Self.createPdf = async function(ctx, id, options) {
+ const models = Self.app.models;
+ const headers = ctx.req.headers;
+ const origin = headers.origin;
+ const authorization = headers.authorization;
+
+ if (process.env.NODE_ENV == 'test')
+ throw new UserError(`Action not allowed on the test environment`);
+
+ let tx;
+ let newOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(newOptions, options);
+
+ if (!newOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ newOptions.transaction = tx;
+ }
+
+ let fileSrc;
+ try {
+ const invoiceOut = await Self.findById(id, null, newOptions);
+ await invoiceOut.updateAttributes({
+ hasPdf: true
+ }, newOptions);
+
+ const response = got.stream(`${origin}/api/report/invoice`, {
+ query: {
+ authorization: authorization,
+ invoiceId: id
+ }
+ });
+
+ const invoiceYear = invoiceOut.created.getFullYear().toString();
+ const container = await models.InvoiceContainer.container(invoiceYear);
+ const rootPath = container.client.root;
+ const fileName = `${invoiceOut.ref}.pdf`;
+ fileSrc = path.join(rootPath, invoiceYear, fileName);
+
+ const writeStream = fs.createWriteStream(fileSrc);
+ writeStream.on('open', () => {
+ response.pipe(writeStream);
+ });
+
+ writeStream.on('finish', async function() {
+ writeStream.end();
+ });
+
+ if (tx) await tx.commit();
+
+ return invoiceOut;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ if (fs.existsSync(fileSrc))
+ await fs.unlink(fileSrc);
+ throw e;
+ }
+ };
+};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/filter.js b/modules/invoiceOut/back/methods/invoiceOut/filter.js
index 8b6d00763..58e8c5243 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/filter.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/filter.js
@@ -19,42 +19,56 @@ module.exports = Self => {
type: 'String',
description: 'Searchs the invoiceOut by id',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'clientFk',
type: 'Integer',
description: 'The client id',
http: {source: 'query'}
- }, {
+ },
+ {
+ arg: 'fi',
+ type: 'String',
+ description: 'The client fiscal id',
+ http: {source: 'query'}
+ },
+ {
arg: 'hasPdf',
type: 'Boolean',
description: 'Whether the the invoiceOut has PDF or not',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'amount',
type: 'Number',
description: 'The amount filter',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'min',
type: 'Number',
description: 'The minimun amount flter',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'max',
type: 'Number',
description: 'The maximun amount flter',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'issued',
type: 'Date',
description: 'The issued date filter',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'created',
type: 'Date',
description: 'The created date filter',
http: {source: 'query'}
- }, {
+ },
+ {
arg: 'dued',
type: 'Date',
description: 'The due date filter',
@@ -88,6 +102,8 @@ module.exports = Self => {
return {'i.created': value};
case 'clientFk':
return {'i.clientFk': value};
+ case 'fi':
+ return {'c.fi': value};
case 'amount':
case 'companyFk':
case 'issued':
diff --git a/modules/invoiceOut/back/methods/invoiceOut/regenerate.js b/modules/invoiceOut/back/methods/invoiceOut/regenerate.js
deleted file mode 100644
index fda12c3cb..000000000
--- a/modules/invoiceOut/back/methods/invoiceOut/regenerate.js
+++ /dev/null
@@ -1,51 +0,0 @@
-module.exports = Self => {
- Self.remoteMethodCtx('regenerate', {
- description: 'Sends an invoice to a regeneration queue',
- accessType: 'WRITE',
- accepts: [{
- arg: 'id',
- type: 'number',
- required: true,
- description: 'The invoiceOut id',
- http: {source: 'path'}
- }],
- returns: {
- type: 'object',
- root: true
- },
- http: {
- path: '/:id/regenerate',
- verb: 'POST'
- }
- });
-
- Self.regenerate = async(ctx, id) => {
- const userId = ctx.req.accessToken.userId;
- const models = Self.app.models;
- const invoiceReportFk = 30; // Should be deprecated
- const worker = await models.Worker.findOne({where: {userFk: userId}});
- const tx = await Self.beginTransaction({});
-
- try {
- let options = {transaction: tx};
-
- // Remove all invoice references from tickets
- const invoiceOut = await models.InvoiceOut.findById(id, null, options);
- await invoiceOut.updateAttributes({
- hasPdf: false
- });
-
- // Send to print queue
- await Self.rawSql(`
- INSERT INTO vn.printServerQueue (reportFk, param1, workerFk)
- VALUES (?, ?, ?)`, [invoiceReportFk, id, worker.id], options);
-
- await tx.commit();
-
- return invoiceOut;
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- };
-};
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js
new file mode 100644
index 000000000..3372411c1
--- /dev/null
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js
@@ -0,0 +1,26 @@
+const app = require('vn-loopback/server/server');
+const got = require('got');
+
+describe('InvoiceOut createPdf()', () => {
+ const userId = 1;
+ const ctx = {
+ req: {
+
+ accessToken: {userId: userId},
+ headers: {origin: 'http://localhost:5000'},
+ }
+ };
+
+ it('should create a new PDF file and set true the hasPdf property', async() => {
+ const invoiceId = 1;
+ const response = {
+ pipe: () => {},
+ on: () => {},
+ };
+ spyOn(got, 'stream').and.returnValue(response);
+
+ let result = await app.models.InvoiceOut.createPdf(ctx, invoiceId);
+
+ expect(result.hasPdf).toBe(true);
+ });
+});
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js
deleted file mode 100644
index 2d495ea0e..000000000
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('invoiceOut regenerate()', () => {
- const invoiceReportFk = 30;
- const invoiceOutId = 1;
-
- it('should check that the invoice has a PDF and is not in print generation queue', async() => {
- const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
- const [queue] = await app.models.InvoiceOut.rawSql(`
- SELECT COUNT(*) AS total
- FROM vn.printServerQueue
- WHERE reportFk = ?`, [invoiceReportFk]);
-
- expect(invoiceOut.hasPdf).toBeTruthy();
- expect(queue.total).toEqual(0);
- });
-
- it(`should mark the invoice as doesn't have PDF and add it to a print queue`, async() => {
- const ctx = {req: {accessToken: {userId: 5}}};
- const invoiceOut = await app.models.InvoiceOut.regenerate(ctx, invoiceOutId);
- const [queue] = await app.models.InvoiceOut.rawSql(`
- SELECT COUNT(*) AS total
- FROM vn.printServerQueue
- WHERE reportFk = ?`, [invoiceReportFk]);
-
- expect(invoiceOut.hasPdf).toBeFalsy();
- expect(queue.total).toEqual(1);
-
- // restores
- const invoiceOutToRestore = await app.models.InvoiceOut.findById(invoiceOutId);
- await invoiceOutToRestore.updateAttributes({hasPdf: true});
- await app.models.InvoiceOut.rawSql(`
- DELETE FROM vn.printServerQueue
- WHERE reportFk = ?`, [invoiceReportFk]);
- });
-});
diff --git a/modules/invoiceOut/back/model-config.json b/modules/invoiceOut/back/model-config.json
index f3492dbe6..e144ce80e 100644
--- a/modules/invoiceOut/back/model-config.json
+++ b/modules/invoiceOut/back/model-config.json
@@ -1,5 +1,8 @@
{
"InvoiceOut": {
"dataSource": "vn"
+ },
+ "InvoiceContainer": {
+ "dataSource": "invoiceStorage"
}
}
diff --git a/modules/invoiceOut/back/models/invoice-container.json b/modules/invoiceOut/back/models/invoice-container.json
new file mode 100644
index 000000000..5b713c0c4
--- /dev/null
+++ b/modules/invoiceOut/back/models/invoice-container.json
@@ -0,0 +1,10 @@
+{
+ "name": "InvoiceContainer",
+ "base": "Container",
+ "acls": [{
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }]
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/models/invoiceOut.js b/modules/invoiceOut/back/models/invoiceOut.js
index 8046f1dc4..e84a0495e 100644
--- a/modules/invoiceOut/back/models/invoiceOut.js
+++ b/modules/invoiceOut/back/models/invoiceOut.js
@@ -2,7 +2,7 @@ module.exports = Self => {
require('../methods/invoiceOut/filter')(Self);
require('../methods/invoiceOut/summary')(Self);
require('../methods/invoiceOut/download')(Self);
- require('../methods/invoiceOut/regenerate')(Self);
require('../methods/invoiceOut/delete')(Self);
require('../methods/invoiceOut/book')(Self);
+ require('../methods/invoiceOut/createPdf')(Self);
};
diff --git a/modules/invoiceOut/front/card/index.spec.js b/modules/invoiceOut/front/card/index.spec.js
new file mode 100644
index 000000000..2a8d576dc
--- /dev/null
+++ b/modules/invoiceOut/front/card/index.spec.js
@@ -0,0 +1,27 @@
+import './index.js';
+
+describe('vnInvoiceOut', () => {
+ let controller;
+ let $httpBackend;
+ let data = {id: 1, name: 'fooName'};
+
+ beforeEach(ngModule('invoiceOut'));
+
+ beforeEach(inject(($componentController, _$httpBackend_, $stateParams) => {
+ $httpBackend = _$httpBackend_;
+
+ let $element = angular.element('');
+ controller = $componentController('vnInvoiceOutCard', {$element});
+
+ $stateParams.id = data.id;
+ $httpBackend.whenRoute('GET', 'InvoiceOuts/:id').respond(data);
+ }));
+
+ it('should request data and set it on the controller', () => {
+ controller.reload();
+ $httpBackend.flush();
+
+ expect(controller.invoiceOut).toEqual(data);
+ });
+});
+
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index fe22e4dd8..b4c76d808 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -25,6 +25,14 @@
translate>
Book invoice
+
@@ -81,4 +89,12 @@
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.js b/modules/invoiceOut/front/descriptor/index.js
index cb4b131ac..3e859478d 100644
--- a/modules/invoiceOut/front/descriptor/index.js
+++ b/modules/invoiceOut/front/descriptor/index.js
@@ -22,6 +22,16 @@ class Controller extends Descriptor {
.then(() => this.vnApp.showSuccess(this.$t('InvoiceOut booked')));
}
+ createInvoicePdf() {
+ const invoiceId = this.invoiceOut.id;
+ return this.$http.post(`InvoiceOuts/${invoiceId}/createPdf`)
+ .then(() => {
+ const snackbarMessage = this.$t(
+ `The invoice PDF document has been regenerated`);
+ this.vnApp.showSuccess(snackbarMessage);
+ });
+ }
+
get filter() {
if (this.invoiceOut)
return JSON.stringify({refFk: this.invoiceOut.ref});
diff --git a/modules/invoiceOut/front/descriptor/index.spec.js b/modules/invoiceOut/front/descriptor/index.spec.js
new file mode 100644
index 000000000..c16900a0a
--- /dev/null
+++ b/modules/invoiceOut/front/descriptor/index.spec.js
@@ -0,0 +1,41 @@
+import './index';
+
+describe('vnInvoiceOutDescriptor', () => {
+ let controller;
+ let $httpBackend;
+ const invoiceOut = {id: 1};
+
+ beforeEach(ngModule('invoiceOut'));
+
+ beforeEach(inject(($componentController, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ controller = $componentController('vnInvoiceOutDescriptor', {$element: null});
+ }));
+
+ describe('createInvoicePdf()', () => {
+ it('should make a query and show a success snackbar', () => {
+ jest.spyOn(controller.vnApp, 'showSuccess');
+
+ controller.invoiceOut = invoiceOut;
+
+ $httpBackend.expectPOST(`InvoiceOuts/${invoiceOut.id}/createPdf`).respond();
+ controller.createInvoicePdf();
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+ });
+ });
+
+ describe('loadData()', () => {
+ it(`should perform a get query to store the invoice in data into the controller`, () => {
+ const id = 1;
+ const response = {id: 1};
+
+ $httpBackend.expectGET(`InvoiceOuts/${id}`).respond(response);
+ controller.id = id;
+ $httpBackend.flush();
+
+ expect(controller.invoiceOut).toEqual(response);
+ });
+ });
+});
diff --git a/modules/invoiceOut/front/descriptor/locale/es.yml b/modules/invoiceOut/front/descriptor/locale/es.yml
index e85be96bf..dd67660ee 100644
--- a/modules/invoiceOut/front/descriptor/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor/locale/es.yml
@@ -8,4 +8,6 @@ InvoiceOut deleted: Factura eliminada
Are you sure you want to delete this invoice?: Estas seguro de eliminar esta factura?
Book invoice: Asentar factura
InvoiceOut booked: Factura asentada
-Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
\ No newline at end of file
+Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+Regenerate invoice PDF: Regenerar PDF factura
+The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
\ No newline at end of file
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index 2d78f89a6..95693cc43 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -24,7 +24,7 @@
class="clickable vn-tr search-result"
ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
{{::invoiceOut.ref | dashIfEmpty}}
- {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}}
{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.companyCode | dashIfEmpty}}
- {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}
+
+
{
Self.downloadImages = async() => {
const models = Self.app.models;
+ const container = await models.TempContainer.container('salix-image');
+ const tempPath = path.join(container.client.root, container.name);
+ const maxAttempts = 3;
- try {
- const tempPath = path.join('/tmp/salix-image');
+ const images = await Self.find({
+ where: {attempts: {eq: maxAttempts}}
+ });
- // Create temporary path
- await fs.mkdir(tempPath, {recursive: true});
+ for (let image of images) {
+ const currentStamp = new Date().getTime();
+ const updatedStamp = image.updated.getTime();
+ const graceTime = Math.abs(currentStamp - updatedStamp);
+ const maxTTL = 3600 * 48 * 1000; // 48 hours in ms;
- const timer = setInterval(async() => {
- const image = await Self.findOne({
- where: {error: null, url: {neq: null}}
- });
+ if (graceTime >= maxTTL)
+ await Self.destroyById(image.itemFk);
+ }
- // Exit loop
- if (!image) return clearInterval(timer);
+ download();
- const srcFile = image.url.split('/').pop();
- const fileName = srcFile.split('.')[0];
- const file = `${fileName}.png`;
- const filePath = path.join(tempPath, file);
+ async function download() {
+ const image = await Self.findOne({
+ where: {url: {neq: null}, attempts: {lt: maxAttempts}},
+ order: 'priority, attempts, updated'
+ });
+
+ if (!image) return;
+
+ const srcFile = image.url;
+ const fileName = srcFile.replace(/\.|\/|:|\?|\\|=|%/g, '');
+ const file = `${fileName}.png`;
+ const filePath = path.join(tempPath, file);
+
+ https.get(image.url, async response => {
+ if (response.statusCode != 200) {
+ const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
+
+ return await errorHandler(image.itemFk, error, filePath);
+ }
const writeStream = fs.createWriteStream(filePath);
writeStream.on('open', () => {
- https.get(image.url, async response => {
- if (response.statusCode != 200) {
- const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
-
- return await errorHandler(image.itemFk, error, filePath);
- }
-
- response.pipe(writeStream);
- }).on('error', async error => {
- await errorHandler(image.itemFk, error, filePath);
- });
+ response.pipe(writeStream);
});
writeStream.on('error', async error => {
@@ -58,31 +68,44 @@ module.exports = Self => {
});
writeStream.on('finish', async function() {
+ writeStream.end();
+ });
+
+ writeStream.on('close', async function() {
try {
await models.Image.registerImage('catalog', filePath, fileName, image.itemFk);
await image.destroy();
+
+ download();
} catch (error) {
await errorHandler(image.itemFk, error, filePath);
}
});
- }, 1000);
- } catch (error) {
- throw new Error('Try-catch error: ', error);
+ }).on('error', async error => {
+ await errorHandler(image.itemFk, error, filePath);
+ });
}
async function errorHandler(rowId, error, filePath) {
try {
const row = await Self.findById(rowId);
- if (!row)
- throw new Error(`Could not update due error ${error}`);
+ if (!row) return;
- await row.updateAttribute('error', error);
+ if (row.attempts < maxAttempts) {
+ await row.updateAttributes({
+ error: error,
+ attempts: row.attempts + 1,
+ updated: new Date()
+ });
+ }
if (filePath && fs.existsSync(filePath))
await fs.unlink(filePath);
+
+ download();
} catch (err) {
- throw new Error(`ErrorHandler error: ${err}`);
+ throw new Error(`Image download failed: ${err}`);
}
}
};
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index f392dba87..eba0b0f91 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -44,6 +44,10 @@ module.exports = Self => {
arg: 'description',
type: 'String',
description: 'The item description',
+ }, {
+ arg: 'stemMultiplier',
+ type: 'Integer',
+ description: 'The item multiplier',
}
],
returns: {
@@ -80,16 +84,22 @@ module.exports = Self => {
: {or: [{'i.name': {like: `%${value}%`}}, codeWhere]};
case 'id':
return {'i.id': value};
- case 'description':
- return {'i.description': {like: `%${value}%`}};
- case 'categoryFk':
- return {'ic.id': value};
- case 'salesPersonFk':
- return {'t.workerFk': value};
- case 'typeFk':
- return {'i.typeFk': value};
case 'isActive':
return {'i.isActive': value};
+ case 'multiplier':
+ return {'i.stemMultiplier': value};
+ case 'typeFk':
+ return {'i.typeFk': value};
+ case 'category':
+ return {'ic.name': value};
+ case 'salesPersonFk':
+ return {'it.workerFk': value};
+ case 'origin':
+ return {'ori.code': value};
+ case 'niche':
+ return {'ip.code': value};
+ case 'intrastat':
+ return {'intr.description': value};
}
});
filter = mergeFilters(filter, {where});
@@ -98,7 +108,8 @@ module.exports = Self => {
let stmt;
stmt = new ParameterizedSQL(
- `SELECT i.id,
+ `SELECT
+ i.id,
i.image,
i.name,
i.description,
@@ -111,29 +122,30 @@ module.exports = Self => {
i.tag10, i.value10,
i.subName,
i.isActive,
- t.name type,
- t.workerFk buyerFk,
- u.name userName,
- intr.description AS intrastat,
i.stems,
- ori.code AS origin,
- ic.name AS category,
i.density,
i.stemMultiplier,
+ i.typeFk,
+ it.name AS typeName,
+ it.workerFk AS buyerFk,
+ u.name AS userName,
+ ori.code AS origin,
+ ic.name AS category,
+ intr.description AS intrastat,
b.grouping,
b.packing,
- itn.code AS niche, @visibleCalc
+ ip.code AS niche, @visibleCalc
FROM item i
- LEFT JOIN itemType t ON t.id = i.typeFk
- LEFT JOIN itemCategory ic ON ic.id = t.categoryFk
- LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN itemType it ON it.id = i.typeFk
+ LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN worker w ON w.id = it.workerFk
LEFT JOIN account.user u ON u.id = w.userFk
LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
LEFT JOIN producer pr ON pr.id = i.producerFk
LEFT JOIN origin ori ON ori.id = i.originFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = it.warehouseFk
LEFT JOIN vn.buy b ON b.id = lb.buy_id
- LEFT JOIN itemPlacement itn ON itn.itemFk = i.id AND itn.warehouseFk = t.warehouseFk`
+ LEFT JOIN itemPlacement ip ON ip.itemFk = i.id AND ip.warehouseFk = it.warehouseFk`
);
if (ctx.args.tags) {
diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js
index 26fc2a7dc..916757c46 100644
--- a/modules/item/back/methods/item/getBalance.js
+++ b/modules/item/back/methods/item/getBalance.js
@@ -20,8 +20,12 @@ module.exports = Self => {
});
Self.getBalance = async filter => {
- let where = filter.where;
+ const where = filter.where;
let [diary] = await Self.rawSql(`CALL vn.item_getBalance(?, ?)`, [where.itemFk, where.warehouseFk]);
+
+ for (const entry of diary)
+ if (entry.clientType === 'loses') entry.highlighted = true;
+
return diary;
};
};
diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
index 63e154b9e..6f22f637f 100644
--- a/modules/item/back/methods/item/lastEntriesFilter.js
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -12,7 +12,7 @@ module.exports = Self => {
description: 'itemFk, id'
}],
returns: {
- type: 'Array',
+ type: ['Object'],
root: true
},
http: {
@@ -40,12 +40,19 @@ module.exports = Self => {
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
+ 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
diff --git a/modules/item/back/methods/item/specs/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
new file mode 100644
index 000000000..671b8c103
--- /dev/null
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -0,0 +1,33 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('item getBalance()', () => {
+ it('should return the balance lines of a client type loses in which one has highlighted true', async() => {
+ const activeCtx = {
+ accessToken: {userId: 9},
+ };
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+
+ const losesClientId = 111;
+ const ticket = await app.models.Ticket.findById(7);
+ const originalClientId = ticket.clientFk;
+ await ticket.updateAttribute('clientFk', losesClientId);
+
+ const filter = {
+ where: {
+ itemFk: 1,
+ warehouseFk: 1
+ }
+ };
+ const results = await app.models.Item.getBalance(filter);
+
+ const result = results.find(element => element.clientType == 'loses');
+
+ expect(result.highlighted).toBe(true);
+
+ // restores
+ await ticket.updateAttribute('clientFk', originalClientId);
+ });
+});
diff --git a/modules/item/back/models/genus.js b/modules/item/back/models/genus.js
new file mode 100644
index 000000000..c105e06b4
--- /dev/null
+++ b/modules/item/back/models/genus.js
@@ -0,0 +1,9 @@
+let UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_DUP_ENTRY')
+ return new UserError(`This genus already exist`);
+ return err;
+ });
+};
diff --git a/modules/item/back/models/genus.json b/modules/item/back/models/genus.json
index 48eab3169..f18d8e4ae 100644
--- a/modules/item/back/models/genus.json
+++ b/modules/item/back/models/genus.json
@@ -3,26 +3,17 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "edi.genus"
+ "table": "vn.genus"
}
},
"properties": {
- "genus_id": {
+ "id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
- "latin_genus_name": {
+ "name": {
"type": "String"
- },
- "entry_date": {
- "type": "date"
- },
- "expiry_date": {
- "type": "date"
- },
- "change_date_time": {
- "type": "date"
}
},
"acls": [
diff --git a/modules/item/back/models/item-botanical.json b/modules/item/back/models/item-botanical.json
index 12248602d..541218145 100644
--- a/modules/item/back/models/item-botanical.json
+++ b/modules/item/back/models/item-botanical.json
@@ -16,9 +16,6 @@
"type": "Number",
"id": true,
"description": "Identifier"
- },
- "botanical": {
- "type": "String"
}
},
"relations": {
diff --git a/modules/item/back/models/item-image-queue.json b/modules/item/back/models/item-image-queue.json
index 6e248ac96..6d2d2441b 100644
--- a/modules/item/back/models/item-image-queue.json
+++ b/modules/item/back/models/item-image-queue.json
@@ -9,17 +9,25 @@
},
"properties": {
"itemFk": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"url": {
- "type": "String",
+ "type": "string",
"required": true
},
"error": {
- "type": "String",
- "required": true
+ "type": "string"
+ },
+ "attempts": {
+ "type": "number"
+ },
+ "created": {
+ "type": "date"
+ },
+ "updated": {
+ "type": "date"
}
},
"relations": {
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index d48e4e95d..4bef1c5f0 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -68,7 +68,8 @@
"stemMultiplier": {
"type": "number",
"description": "Multiplier"
- },"image": {
+ },
+ "image": {
"type": "string",
"description": "Image"
},
diff --git a/modules/item/back/models/specie.js b/modules/item/back/models/specie.js
new file mode 100644
index 000000000..e6a03f851
--- /dev/null
+++ b/modules/item/back/models/specie.js
@@ -0,0 +1,9 @@
+let UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_DUP_ENTRY')
+ return new UserError(`This specie already exist`);
+ return err;
+ });
+};
diff --git a/modules/item/back/models/specie.json b/modules/item/back/models/specie.json
index 1388be53b..c5a1f455e 100644
--- a/modules/item/back/models/specie.json
+++ b/modules/item/back/models/specie.json
@@ -3,33 +3,17 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "edi.specie"
+ "table": "vn.specie"
}
},
"properties": {
- "specie_id": {
+ "id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
- "latin_species_name": {
+ "name": {
"type": "String"
- },
- "entry_date": {
- "type": "date"
- },
- "expiry_date": {
- "type": "date"
- },
- "change_date_time": {
- "type": "date"
- }
- },
- "relations": {
- "genus": {
- "type": "belongsTo",
- "model": "Genus",
- "foreignKey": "genus_id"
}
},
"acls": [
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 3f049675c..cec7a063f 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -113,6 +113,12 @@
ng-model="$ctrl.item.stems"
rule>
+
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/botanical/index.js b/modules/item/front/botanical/index.js
index 3786cdb45..8ade0fd9d 100644
--- a/modules/item/front/botanical/index.js
+++ b/modules/item/front/botanical/index.js
@@ -1,9 +1,99 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+class Controller extends Section {
+ get item() {
+ return this._item;
+ }
-class Controller extends Section {}
+ set item(value) {
+ this._item = value;
+ if (value)
+ this.getBotanicalData();
+ }
+
+ showGenus(event) {
+ if (event.defaultPrevented) return;
+ event.preventDefault();
+
+ this.$.genus.show();
+ }
+
+ showSpecies(event) {
+ if (event.defaultPrevented) return;
+ event.preventDefault();
+
+ this.$.species.show();
+ }
+
+ onGenusAccept() {
+ try {
+ if (!this.data.name)
+ throw new Error(`The name of the genus can't be empty`);
+
+ this.$http.post(`genera`, this.data).then(res => {
+ this.vnApp.showMessage(this.$t('The genus has been created'));
+ this.emit('response', {$response: res.data});
+ this.onGenusResponse(res.data);
+ });
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ return false;
+ }
+ return true;
+ }
+
+ onSpeciesAccept() {
+ try {
+ if (!this.data.name)
+ throw new Error(`The name of the species can't be empty`);
+
+ this.$http.post(`species`, this.data).then(res => {
+ this.vnApp.showMessage(this.$t('The species has been created'));
+ this.emit('response', {$response: res.data});
+ this.onSpeciesResponse(res.data);
+ });
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ return false;
+ }
+ return true;
+ }
+
+ getBotanicalData() {
+ const filter = {
+ where: {itemFk: this.item.id}
+ };
+ const filterParams = encodeURIComponent(JSON.stringify(filter));
+ this.$http.get(`ItemBotanicals?filter=${filterParams}`).then(res => {
+ if (res.data[0])
+ this.botanical = res.data[0];
+
+ else
+ this.botanical = {itemFk: this.item.id};
+ });
+ }
+
+ onSubmit() {
+ this.$.watcher.check();
+ this.$http.patch(`ItemBotanicals`, this.botanical).then(() => {
+ this.$.watcher.notifySaved();
+ this.$.watcher.updateOriginalData();
+ });
+ }
+
+ onGenusResponse(response) {
+ this.botanical.genusFk = response.id;
+ }
+
+ onSpeciesResponse(response) {
+ this.botanical.specieFk = response.id;
+ }
+}
ngModule.vnComponent('vnItemBotanical', {
template: require('./index.html'),
+ bindings: {
+ item: '<'
+ },
controller: Controller
});
diff --git a/modules/item/front/botanical/index.spec.js b/modules/item/front/botanical/index.spec.js
new file mode 100644
index 000000000..afec83cfd
--- /dev/null
+++ b/modules/item/front/botanical/index.spec.js
@@ -0,0 +1,179 @@
+import './index.js';
+
+describe('vnItemBotanical', () => {
+ describe('Component vnItemBotanical', () => {
+ let $httpBackend;
+ let $scope;
+ let controller;
+ let vnApp;
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _vnApp_) => {
+ $httpBackend = _$httpBackend_;
+ vnApp = _vnApp_;
+ jest.spyOn(vnApp, 'showError');
+ $scope = $rootScope.$new();
+ const $element = angular.element('
+ label="{{$ctrl.item.tag5}}"
+ ng-if="$ctrl.item.value5"
+ value="{{$ctrl.item.value5}}">
+
+
+
+
+
+
diff --git a/modules/item/front/descriptor/style.scss b/modules/item/front/descriptor/style.scss
index 8b684a77b..e15fbae96 100644
--- a/modules/item/front/descriptor/style.scss
+++ b/modules/item/front/descriptor/style.scss
@@ -6,4 +6,4 @@ vn-item-descriptor {
width: 100%;
display: block;
}
-}
+}
\ No newline at end of file
diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html
index 3fdc9a9e4..7c210a26a 100644
--- a/modules/item/front/diary/index.html
+++ b/modules/item/front/diary/index.html
@@ -64,14 +64,16 @@
{{::sale.stateName | dashIfEmpty}}
{{::sale.reference | dashIfEmpty}}
-
- {{::sale.name | dashIfEmpty}}
-
-
- {{::sale.name | dashIfEmpty}}
+
+
+ {{::sale.name | dashIfEmpty}}
+
+
+ {{::sale.name | dashIfEmpty}}
+
{{::sale.in | dashIfEmpty}}
diff --git a/modules/item/front/fetched-tags/index.html b/modules/item/front/fetched-tags/index.html
index 6982ab6ac..472fa676b 100644
--- a/modules/item/front/fetched-tags/index.html
+++ b/modules/item/front/fetched-tags/index.html
@@ -1,8 +1,4 @@
- {{$ctrl.name}}
-
-
vn-horizontal {
align-items: center;
- & > vn-one {
- overflow: hidden;
- text-overflow: ellipsis;
- min-width: 80px;
- }
+ & > vn-auto {
+ flex-wrap: wrap;
- & > vn-one:nth-child(2) h3 {
- color: $color-font-secondary;
- text-transform: uppercase;
- line-height: initial;
- text-align: center;
- font-size: 1rem
+ & > .inline-tag {
+ margin: 1px;
+ }
}
& > vn-auto {
display: flex;
- padding-left: 6px;
- min-width: 192px;
& > .inline-tag {
- display: inline-block;
color: $color-font-secondary;
- margin-left: 6px;
text-align: center;
font-size: .75rem;
- height: 20px;
+ height: 12px;
padding: 1px;
- border-radius: 1px;
width: 64px;
min-width: 64px;
+ max-width: 64px;
+ flex: 1;
border: 1px solid $color-spacer;
&.empty {
@@ -44,22 +32,5 @@ vn-fetched-tags {
}
}
}
- @media screen and (max-width: 1600px) {
- flex-direction: column;
-
- & > vn-one {
- padding-bottom: 3px
- }
- & > vn-auto {
- white-space: initial;
- padding-left: 0;
- flex-wrap: wrap;
- justify-content: center;
-
- & > .inline-tag {
- margin: 1px;
- }
- }
- }
}
}
\ No newline at end of file
diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html
index 770405e3a..d709de814 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -22,13 +22,13 @@
model="model">
-
{{$ctrl.subName}}
-
+
- Item ID
- Item
+ Item ID
+ Description
Warehouse
P.P.U.
P.P.P.
@@ -40,7 +40,7 @@
-
+
-
-
-
-
-
+
+ {{price.name}}
+
+
+
+
-
-
-
- Id
- Grouping
- Packing
- Description
- Stems
- Size
- Niche
- Type
- Category
- Intrastat
- Origin
- Buyer
- Density
- Multiplier
- Active
-
-
-
-
-
- ![]()
-
-
-
- {{::item.id}}
-
-
- {{::item.grouping | dashIfEmpty}}
- {{::item.packing | dashIfEmpty}}
-
-
-
-
- {{::item.stems}}
- {{::item.size}}
- {{::item.niche}}
-
- {{::item.type}}
-
-
- {{::item.category}}
-
-
- {{::item.intrastat}}
-
- {{::item.origin}}
-
-
- {{::item.userName}}
-
-
- {{::item.density}}
- {{::item.stemMultiplier}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Id
+ Grouping
+ Packing
+ Description
+ Stems
+ Size
+ Niche
+ Type
+ Category
+ Intrastat
+ Origin
+ Buyer
+ Density
+ Multiplier
+ Active
+
+
+
+
+
+ ![]()
+
+
+
+ {{::item.id}}
+
+
+ {{::item.grouping | dashIfEmpty}}
+ {{::item.packing | dashIfEmpty}}
+
+ {{::item.name}}
+
+
+
+
+
+ {{::item.stems}}
+ {{::item.size}}
+ {{::item.niche}}
+
+ {{::item.typeName}}
+
+
+ {{::item.category}}
+
+
+ {{::item.intrastat}}
+
+ {{::item.origin}}
+
+
+ {{::item.userName}}
+
+
+ {{::item.density}}
+ {{::item.stemMultiplier}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,4 +127,31 @@
-
\ No newline at end of file
+
+
+
+
+ Filter by selection
+
+
+ Exclude selection
+
+
+ Remove filter
+
+
+ Remove all filters
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js
index cafa3e475..175beb88a 100644
--- a/modules/item/front/index/index.js
+++ b/modules/item/front/index/index.js
@@ -11,6 +11,36 @@ class Controller extends Section {
};
}
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'category':
+ return {'ic.name': value};
+ case 'salesPersonFk':
+ return {'it.workerFk': value};
+ case 'grouping':
+ return {'b.grouping': value};
+ case 'packing':
+ return {'b.packing': value};
+ case 'origin':
+ return {'ori.code': value};
+ case 'niche':
+ return {'ip.code': value};
+ case 'typeFk':
+ return {'i.typeFk': value};
+ case 'intrastat':
+ return {'intr.description': value};
+ case 'id':
+ case 'size':
+ case 'name':
+ case 'subname':
+ case 'isActive':
+ case 'density':
+ case 'stemMultiplier':
+ case 'stems':
+ return {[`i.${param}`]: value};
+ }
+ }
+
onCloneAccept(itemFk) {
return this.$http.post(`Items/${itemFk}/clone`)
.then(res => {
diff --git a/modules/item/front/index/style.scss b/modules/item/front/index/style.scss
index c3d65349e..b0b94c19d 100644
--- a/modules/item/front/index/style.scss
+++ b/modules/item/front/index/style.scss
@@ -21,9 +21,6 @@ vn-item-product {
vn-label-value:first-of-type section{
margin-top: 9px;
}
- vn-fetched-tags vn-horizontal{
- margin-top: 14px;
- }
}
vn-table {
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 4d8dea570..f0cb06521 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -72,7 +72,17 @@
{{::entry.stems | dashIfEmpty}}
{{::entry.quantity}}
- {{::entry.buyingValue | dashIfEmpty}}
+
+
+ {{::entry.cost | dashIfEmpty}}
+
+
{{::entry.weight | dashIfEmpty}}
{{::entry.packageFk | dashIfEmpty}}
{{::entry.supplier | dashIfEmpty}}
@@ -91,23 +101,28 @@
expr-builder="$ctrl.exprBuilder(param, value)">
+ ng-if="contextmenu.isFilterAllowed()"
+ ng-click="contextmenu.filterBySelection()">
Filter by selection
+ ng-if="contextmenu.isFilterAllowed()"
+ ng-click="contextmenu.excludeSelection()">
Exclude selection
+ ng-if="contextmenu.isFilterAllowed()"
+ ng-click="contextmenu.removeFilter()">
Remove filter
+ ng-click="contextmenu.removeAllFilters()">
Remove all filters
+
+ Copy value
+
\ No newline at end of file
diff --git a/modules/item/front/last-entries/locale/es.yml b/modules/item/front/last-entries/locale/es.yml
index 0eac6eaa6..f2917bb63 100644
--- a/modules/item/front/last-entries/locale/es.yml
+++ b/modules/item/front/last-entries/locale/es.yml
@@ -9,4 +9,7 @@ Ignored: Ignorado
Provider: Proveedor
Cube: Cubo
Price Per Unit: Precio Por Unidad
-Price Per Package: Precio Por Paquete
\ No newline at end of file
+Price Per Package: Precio Por Paquete
+Freight: Porte
+Package: Embalaje
+Comission: Comision
\ No newline at end of file
diff --git a/modules/item/front/locale/es.yml b/modules/item/front/locale/es.yml
index 8046fbafe..46e40e412 100644
--- a/modules/item/front/locale/es.yml
+++ b/modules/item/front/locale/es.yml
@@ -26,7 +26,8 @@ Intrastat code: Código intrastat
Warehouse: Almacén
Code: Código
State: Estado
-Species: Especie
+New species: Nueva especie
+New genus: Nuevo genus
Add tag: Añadir etiqueta
Remove tag: Quitar etiqueta
Add niche: Añadir nicho
diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index 10d5f9762..7d3a9f1a5 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -1,6 +1,6 @@
+
{{price.subName}}
+{{::item.subName}}
+
-
+