Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
3c37f0e993
|
|
@ -3,15 +3,23 @@ const app = require('vn-loopback/server/server');
|
|||
describe('account login()', () => {
|
||||
describe('when credentials are correct', () => {
|
||||
it('should return the token', async() => {
|
||||
let response = await app.models.Account.login('employee', 'nightmare');
|
||||
let login = await app.models.Account.login('salesAssistant', 'nightmare');
|
||||
let accessToken = await app.models.AccessToken.findById(login.token);
|
||||
let ctx = {req: {accessToken: accessToken}};
|
||||
|
||||
expect(response.token).toBeDefined();
|
||||
expect(login.token).toBeDefined();
|
||||
|
||||
await app.models.Account.logout(ctx);
|
||||
});
|
||||
|
||||
it('should return the token if the user doesnt exist but the client does', async() => {
|
||||
let response = await app.models.Account.login('PetterParker', 'nightmare');
|
||||
let login = await app.models.Account.login('PetterParker', 'nightmare');
|
||||
let accessToken = await app.models.AccessToken.findById(login.token);
|
||||
let ctx = {req: {accessToken: accessToken}};
|
||||
|
||||
expect(response.token).toBeDefined();
|
||||
expect(login.token).toBeDefined();
|
||||
|
||||
await app.models.Account.logout(ctx);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('account logout()', () => {
|
||||
it('should logout and remove token after valid login', async() => {
|
||||
let loginResponse = await app.models.Account.login('employee', 'nightmare');
|
||||
let loginResponse = await app.models.Account.login('buyer', 'nightmare');
|
||||
let accessToken = await app.models.AccessToken.findById(loginResponse.token);
|
||||
let ctx = {req: {accessToken: accessToken}};
|
||||
|
||||
let response = await app.models.Account.logout(ctx);
|
||||
let afterToken = await app.models.AccessToken.findById(loginResponse.token);
|
||||
let logoutResponse = await app.models.Account.logout(ctx);
|
||||
let tokenAfterLogout = await app.models.AccessToken.findById(loginResponse.token);
|
||||
|
||||
expect(response).toBeTruthy();
|
||||
expect(afterToken).toBeNull();
|
||||
expect(logoutResponse).toBeTrue();
|
||||
expect(tokenAfterLogout).toBeNull();
|
||||
});
|
||||
|
||||
it('should throw a 401 error when token is invalid', async() => {
|
||||
|
|
|
|||
|
|
@ -1,55 +1,17 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('chat sendCheckingPresence()', () => {
|
||||
const departmentId = 23;
|
||||
const workerId = 107;
|
||||
let timeEntry;
|
||||
|
||||
afterAll(async done => {
|
||||
const department = await app.models.Department.findById(departmentId);
|
||||
await department.updateAttribute('chatName', null);
|
||||
await app.models.WorkerTimeControl.destroyById(timeEntry.id);
|
||||
done();
|
||||
});
|
||||
|
||||
it(`should call to send() method with the worker username when no department channel is specified
|
||||
and then return a "Fake notification sent" as response`, async() => {
|
||||
const ctx = {req: {accessToken: {userId: 1}}};
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'send').and.callThrough();
|
||||
|
||||
const response = await chatModel.sendCheckingPresence(ctx, workerId, 'I changed something');
|
||||
|
||||
expect(response.statusCode).toEqual(200);
|
||||
expect(response.message).toEqual('Fake notification sent');
|
||||
expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', 'I changed something');
|
||||
});
|
||||
|
||||
it(`should call to send() method with the worker department channel if is specified
|
||||
and then return a "Fake notification sent" as response`, async() => {
|
||||
const ctx = {req: {accessToken: {userId: 1}}};
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'send').and.callThrough();
|
||||
|
||||
const department = await app.models.Department.findById(departmentId);
|
||||
await department.updateAttribute('chatName', 'cooler');
|
||||
|
||||
const response = await chatModel.sendCheckingPresence(ctx, workerId, 'I changed something');
|
||||
|
||||
expect(response.statusCode).toEqual(200);
|
||||
expect(response.message).toEqual('Fake notification sent');
|
||||
expect(chatModel.send).toHaveBeenCalledWith(ctx, '#cooler', '@HankPym => I changed something');
|
||||
});
|
||||
|
||||
it(`should call to send() method with the worker username when the worker is working`, async() => {
|
||||
const ctx = {req: {accessToken: {userId: 1}}};
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'send').and.callThrough();
|
||||
|
||||
const today = new Date();
|
||||
today.setHours(6, 0);
|
||||
const ctx = {req: {accessToken: {userId: 1}}};
|
||||
const chatModel = app.models.Chat;
|
||||
const departmentId = 23;
|
||||
const workerId = 107;
|
||||
|
||||
timeEntry = await app.models.WorkerTimeControl.create({
|
||||
it(`should call send() method with the worker name if he's currently working then return a response`, async() => {
|
||||
spyOn(chatModel, 'send').and.callThrough();
|
||||
|
||||
const timeEntry = await app.models.WorkerTimeControl.create({
|
||||
userFk: workerId,
|
||||
timed: today,
|
||||
manual: false,
|
||||
|
|
@ -61,5 +23,24 @@ describe('chat sendCheckingPresence()', () => {
|
|||
expect(response.statusCode).toEqual(200);
|
||||
expect(response.message).toEqual('Fake notification sent');
|
||||
expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', 'I changed something');
|
||||
|
||||
// restores
|
||||
await app.models.WorkerTimeControl.destroyById(timeEntry.id);
|
||||
});
|
||||
|
||||
it(`should call to send() method with the worker department channel if he's not currently working then return a response`, async() => {
|
||||
spyOn(chatModel, 'send').and.callThrough();
|
||||
|
||||
const department = await app.models.Department.findById(departmentId);
|
||||
await department.updateAttribute('chatName', 'cooler');
|
||||
|
||||
const response = await chatModel.sendCheckingPresence(ctx, workerId, 'I changed something');
|
||||
|
||||
expect(response.statusCode).toEqual(200);
|
||||
expect(response.message).toEqual('Fake notification sent');
|
||||
expect(chatModel.send).toHaveBeenCalledWith(ctx, '#cooler', '@HankPym => I changed something');
|
||||
|
||||
// restores
|
||||
await department.updateAttribute('chatName', null);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('updateCollectionSale()', () => {
|
||||
// #2495 updateCollectionSale reparar polución de unitarios
|
||||
xdescribe('updateCollectionSale()', () => {
|
||||
it('return a new collection', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 106}}};
|
||||
let response = await app.models.Collection.updateCollectionSale(ctx, 1, 5, 5, 5, 1, 4, false, 'UXN', 1, 1);
|
||||
|
|
|
|||
|
|
@ -110,13 +110,15 @@ BEGIN
|
|||
SELECT `name` FROM `user` WHERE id = OLD.id;
|
||||
END$$
|
||||
|
||||
CREATE TRIGGER role_beforeInsert
|
||||
DROP TRIGGER IF EXISTS account.role_beforeInsert$$
|
||||
CREATE DEFINER=`root`@`%` TRIGGER role_beforeInsert
|
||||
BEFORE INSERT ON `role` FOR EACH ROW
|
||||
BEGIN
|
||||
CALL role_checkName(NEW.`name`);
|
||||
END$$
|
||||
END
|
||||
|
||||
CREATE TRIGGER role_beforeUpdate
|
||||
DROP TRIGGER IF EXISTS account.role_beforeUpdate$$
|
||||
CREATE DEFINER=`root`@`%` TRIGGER role_beforeUpdate
|
||||
BEFORE UPDATE ON `role` FOR EACH ROW
|
||||
BEGIN
|
||||
IF !(NEW.`name` <=> OLD.`name`) THEN
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
DROP PROCEDURE IF EXISTS account.role_checkName;
|
||||
|
||||
DELIMITER $$
|
||||
CREATE PROCEDURE account.role_checkName(vRoleName VARCHAR(255))
|
||||
CREATE DEFINER=`root`@`%` PROCEDURE account.role_checkName(vRoleName VARCHAR(255))
|
||||
BEGIN
|
||||
/**
|
||||
* Checks that role name meets the necessary syntax requirements, otherwise it
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
UPDATE `salix`.`ACL` SET `principalId` = 'deliveryBoss' WHERE (`id` = '194');
|
||||
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Town', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
|
||||
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Province', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -2116,4 +2116,18 @@ INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`)
|
|||
(1, 23),
|
||||
(2, 1);
|
||||
|
||||
INSERT INTO `vn`.`campaign`(`code`, `dated`)
|
||||
VALUES
|
||||
('valentinesDay', CONCAT(YEAR(CURDATE()), '-02-14')),
|
||||
('valentinesDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-02-14')),
|
||||
('valentinesDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-02-14')),
|
||||
('valentinesDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -3 YEAR)), '-02-14')),
|
||||
('mothersDay', CONCAT(YEAR(CURDATE()), '-05-05')),
|
||||
('mothersDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-05-05')),
|
||||
('mothersDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-05-05')),
|
||||
('mothersDay', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -3 YEAR)), '-05-05')),
|
||||
('allSaints', CONCAT(YEAR(CURDATE()), '-11-01')),
|
||||
('allSaints', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-11-01')),
|
||||
('allSaints', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-11-01')),
|
||||
('allSaints', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -3 YEAR)), '-11-01'));
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -82,3 +82,10 @@ TABLES=(
|
|||
workcenter
|
||||
)
|
||||
dump_tables ${TABLES[@]}
|
||||
|
||||
TABLES=(
|
||||
sage
|
||||
TiposIva
|
||||
TiposTransacciones
|
||||
)
|
||||
dump_tables ${TABLES[@]}
|
||||
|
|
@ -9,6 +9,7 @@ SCHEMAS=(
|
|||
nst
|
||||
pbx
|
||||
postgresql
|
||||
sage
|
||||
salix
|
||||
stock
|
||||
util
|
||||
|
|
|
|||
|
|
@ -42,13 +42,24 @@ export default {
|
|||
taxNumber: 'vn-client-create vn-textfield[ng-model="$ctrl.client.fi"]',
|
||||
socialName: 'vn-client-create vn-textfield[ng-model="$ctrl.client.socialName"]',
|
||||
street: 'vn-client-create vn-textfield[ng-model="$ctrl.client.street"]',
|
||||
addPostCode: 'vn-client-create vn-datalist[ng-model="$ctrl.client.postcode"] vn-icon-button[icon="add_circle"]',
|
||||
addProvince: 'vn-autocomplete[ng-model="$ctrl.location.provinceFk"] vn-icon-button[icon="add_circle"]',
|
||||
addCity: 'vn-autocomplete[ng-model="$ctrl.location.townFk"] vn-icon-button[icon="add_circle"]',
|
||||
newProvinceName: 'vn-textfield[ng-model="$ctrl.province.name"]',
|
||||
newCityName: 'vn-textfield[ng-model="$ctrl.city.name"]',
|
||||
newCityProvince: 'vn-autocomplete[ng-model="$ctrl.city.provinceFk"]',
|
||||
newPostcode: 'vn-textfield[ng-model="$ctrl.location.code"]',
|
||||
postcode: 'vn-client-create vn-datalist[ng-model="$ctrl.client.postcode"]',
|
||||
city: 'vn-client-create vn-datalist[ng-model="$ctrl.client.city"]',
|
||||
province: 'vn-client-create vn-autocomplete[ng-model="$ctrl.client.provinceFk"]',
|
||||
province: 'vn-autocomplete[ng-model="$ctrl.client.provinceFk"]',
|
||||
country: 'vn-client-create vn-autocomplete[ng-model="$ctrl.client.countryFk"]',
|
||||
dialogCountry: 'vn-autocomplete[ng-model="$ctrl.province.countryFk"]',
|
||||
userName: 'vn-client-create vn-textfield[ng-model="$ctrl.client.userName"]',
|
||||
email: 'vn-client-create vn-textfield[ng-model="$ctrl.client.email"]',
|
||||
salesPerson: 'vn-client-create vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
|
||||
saveNewProvicenButton: '#saveProvince',
|
||||
saveNewCityButton: '#saveCity',
|
||||
saveNewPoscode: '#savePostcode',
|
||||
createButton: 'vn-client-create button[type=submit]'
|
||||
},
|
||||
clientDescriptor: {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ describe('Client create path', () => {
|
|||
beforeAll(async() => {
|
||||
browser = await getBrowser();
|
||||
page = browser.page;
|
||||
await page.loginAndModule('employee', 'client');
|
||||
await page.loginAndModule(' deliveryBoss', 'client');
|
||||
});
|
||||
|
||||
afterAll(async() => {
|
||||
|
|
@ -45,14 +45,40 @@ describe('Client create path', () => {
|
|||
expect(message.text).toBe('Some fields are invalid');
|
||||
});
|
||||
|
||||
it(`should create a new province`, async() => {
|
||||
await page.waitToClick(selectors.createClientView.addPostCode);
|
||||
await page.waitToClick(selectors.createClientView.addProvince);
|
||||
await page.write(selectors.createClientView.newProvinceName, 'Massachusetts');
|
||||
await page.autocompleteSearch(selectors.createClientView.dialogCountry, 'España');
|
||||
await page.waitToClick(selectors.createClientView.saveNewProvicenButton);
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
expect(message.text).toBe('The province has been created');
|
||||
});
|
||||
|
||||
it(`should create a new city`, async() => {
|
||||
await page.waitToClick(selectors.createClientView.addCity);
|
||||
await page.write(selectors.createClientView.newCityName, 'Boston');
|
||||
await page.autocompleteSearch(selectors.createClientView.newCityProvince, 'Massachusetts');
|
||||
await page.waitToClick(selectors.createClientView.saveNewCityButton);
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
expect(message.text).toBe('The city has been created');
|
||||
});
|
||||
|
||||
it(`should create a new post code`, async() => {
|
||||
await page.write(selectors.createClientView.newPostcode, '61616');
|
||||
await page.waitToClick(selectors.createClientView.saveNewPoscode);
|
||||
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
expect(message.text).toBe('The postcode has been created. You can save the data now');
|
||||
});
|
||||
|
||||
it(`should attempt to create a new user with all it's data but wrong email`, async() => {
|
||||
await page.write(selectors.createClientView.name, 'Carol Danvers');
|
||||
await page.write(selectors.createClientView.socialName, 'AVG tax');
|
||||
await page.write(selectors.createClientView.street, 'Many places');
|
||||
await page.autocompleteSearch(selectors.createClientView.country, 'España');
|
||||
await page.autocompleteSearch(selectors.createClientView.province, 'Province one');
|
||||
await page.write(selectors.createClientView.city, 'Valencia');
|
||||
await page.write(selectors.createClientView.postcode, '46000');
|
||||
await page.clearInput(selectors.createClientView.email);
|
||||
await page.write(selectors.createClientView.email, 'incorrect email format');
|
||||
await page.waitToClick(selectors.createClientView.createButton);
|
||||
|
|
@ -82,14 +108,14 @@ describe('Client create path', () => {
|
|||
const clientCountry = await page
|
||||
.waitToGetProperty(selectors.createClientView.country, 'value');
|
||||
|
||||
expect(clientCity).toEqual('Valencia');
|
||||
expect(clientProvince).toContain('Province one');
|
||||
expect(clientCity).toEqual('Boston');
|
||||
expect(clientProvince).toContain('Massachusetts');
|
||||
expect(clientCountry).toEqual('España');
|
||||
});
|
||||
|
||||
it(`should create a new user with all correct data`, async() => {
|
||||
await page.clearInput(selectors.createClientView.postcode);
|
||||
await page.write(selectors.createClientView.postcode, '46000');
|
||||
await page.write(selectors.createClientView.postcode, '61616');
|
||||
await page.waitToClick(selectors.createClientView.createButton);
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ describe('Item regularize path', () => {
|
|||
expect(userLocalWarehouse).toContain('Warehouse Four');
|
||||
});
|
||||
|
||||
it('should search for an specific item', async() => {
|
||||
it('should search for a specific item', async() => {
|
||||
await page.accessToSearchResult('Ranged weapon pistol 9mm');
|
||||
await page.waitForState('item.card.summary');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ describe('Entry create path', () => {
|
|||
await page.autocompleteSearch(selectors.entryIndex.newEntryCompany, 'ORN');
|
||||
|
||||
await page.waitToClick(selectors.entryIndex.saveNewEntry);
|
||||
await page.waitFor(500);
|
||||
await page.waitForNavigation({
|
||||
waitUntil: 'load',
|
||||
});
|
||||
await page.waitForState('entry.card.basicData');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -95,9 +95,7 @@ async function launchBackTest(done) {
|
|||
|
||||
let options = {
|
||||
errorOnFail: false,
|
||||
config: {
|
||||
random: false
|
||||
}
|
||||
config: {}
|
||||
};
|
||||
|
||||
if (argv.ci) {
|
||||
|
|
|
|||
|
|
@ -2,41 +2,37 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('Model crud()', () => {
|
||||
let insertId;
|
||||
let ItemBarcode = app.models.ItemBarcode;
|
||||
const barcodeModel = app.models.ItemBarcode;
|
||||
|
||||
it('should inherit crud method from VnModel', () => {
|
||||
expect(ItemBarcode.crud).toBeDefined();
|
||||
expect(barcodeModel.crud).toBeDefined();
|
||||
});
|
||||
|
||||
it('should create a new instance', async() => {
|
||||
let data = {code: '500', itemFk: '1'};
|
||||
let creates = [data];
|
||||
it('should create, edit and delete an instance', async() => {
|
||||
let barcodeData = {code: '500', itemFk: '1'};
|
||||
let creates = [barcodeData];
|
||||
|
||||
await ItemBarcode.crud(null, null, creates);
|
||||
let instance = await ItemBarcode.findOne({where: data});
|
||||
await barcodeModel.crud(null, null, creates);
|
||||
let instance = await barcodeModel.findOne({where: barcodeData});
|
||||
insertId = instance.id;
|
||||
|
||||
expect(instance).not.toEqual(null);
|
||||
expect(instance.code).toEqual('500');
|
||||
});
|
||||
|
||||
it('should update the instance', async() => {
|
||||
let updates = [{
|
||||
where: {id: insertId},
|
||||
data: {code: '501', itemFk: 1}
|
||||
}];
|
||||
|
||||
await ItemBarcode.crud(null, updates);
|
||||
let instance = await ItemBarcode.findById(insertId);
|
||||
await barcodeModel.crud(null, updates);
|
||||
let editedInstance = await barcodeModel.findById(insertId);
|
||||
|
||||
expect(instance.code).toEqual('501');
|
||||
});
|
||||
expect(editedInstance.code).toEqual('501');
|
||||
|
||||
it('should delete the created instance', async() => {
|
||||
let deletes = [insertId];
|
||||
await ItemBarcode.crud(deletes);
|
||||
let instance = await ItemBarcode.findById(insertId);
|
||||
await barcodeModel.crud(deletes);
|
||||
let deletedInstance = await barcodeModel.findById(insertId);
|
||||
|
||||
expect(instance).toEqual(null);
|
||||
expect(deletedInstance).toEqual(null);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -57,12 +57,12 @@
|
|||
"The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
|
||||
"Can't create stowaway for this ticket": "Can't create stowaway for this ticket",
|
||||
"Swift / BIC can't be empty": "Swift / BIC can't be empty",
|
||||
"MESSAGE_BOUGHT_UNITS": "Bought {{quantity}} units of {{concept}} (#{{itemId}}) for the ticket id [#{{ticketId}}]({{{url}}})",
|
||||
"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} (#{{clientId}})]({{{url}}}) to *{{credit}} €*",
|
||||
"MESSAGE_CHANGED_PAYMETHOD": "I have changed the pay method for client [{{clientName}} (#{{clientId}})]({{{url}}})",
|
||||
"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} (#{{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [#{{ticketId}}]({{{ticketUrl}}})",
|
||||
"Claim will be picked": "The product from the claim (#{{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
|
||||
"This ticket is not an stowaway anymore": "The ticket id [#{{ticketId}}]({{{ticketUrl}}}) is not an stowaway anymore",
|
||||
"MESSAGE_BOUGHT_UNITS": "Bought {{quantity}} units of {{concept}} ({{itemId}}) for the ticket id [{{ticketId}}]({{{url}}})",
|
||||
"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
|
||||
"MESSAGE_CHANGED_PAYMETHOD": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
|
||||
"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
|
||||
"Claim will be picked": "The product from the claim ({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
|
||||
"This ticket is not an stowaway anymore": "The ticket id [{{ticketId}}]({{{ticketUrl}}}) is not an stowaway anymore",
|
||||
"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
|
||||
"Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
|
||||
"Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
|
||||
|
|
@ -70,6 +70,7 @@
|
|||
"NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
|
||||
"Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
|
||||
"Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
|
||||
"I have deleted the ticket id": "I have deleted the ticket id [#{{id}}]({{{url}}})",
|
||||
"I have restored the ticket id": "I have restored the ticket id [#{{id}}]({{{url}}})"
|
||||
"I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
|
||||
"I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
|
||||
"Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): ```{{{changes}}}```"
|
||||
}
|
||||
|
|
@ -121,12 +121,12 @@
|
|||
"Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
|
||||
"Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
|
||||
"Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
|
||||
"MESSAGE_BOUGHT_UNITS": "Se ha comprado {{quantity}} unidades de {{concept}} (#{{itemId}}) para el ticket id [#{{ticketId}}]({{{url}}})",
|
||||
"MESSAGE_BOUGHT_UNITS": "Se ha comprado {{quantity}} unidades de {{concept}} (#{{itemId}}) para el ticket id [{{ticketId}}]({{{url}}})",
|
||||
"MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} (#{{clientId}})]({{{url}}}) a *{{credit}} €*",
|
||||
"MESSAGE_CHANGED_PAYMETHOD": "He cambiado la forma de pago del cliente [{{clientName}} (#{{clientId}})]({{{url}}})",
|
||||
"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} (#{{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [#{{ticketId}}]({{{ticketUrl}}})",
|
||||
"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} (#{{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
|
||||
"Claim will be picked": "Se recogerá el género de la reclamación (#{{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
|
||||
"This ticket is not an stowaway anymore": "El ticket id [#{{ticketId}}]({{{ticketUrl}}}) ha dejado de ser un polizón",
|
||||
"This ticket is not an stowaway anymore": "El ticket id [{{ticketId}}]({{{ticketUrl}}}) ha dejado de ser un polizón",
|
||||
"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
|
||||
"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
|
||||
"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
|
||||
|
|
@ -146,7 +146,8 @@
|
|||
"Absence change notification on the labour calendar": "Notificacion de cambio de ausencia en el calendario laboral",
|
||||
"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
|
||||
"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
|
||||
"I have deleted the ticket id": "He eliminado el ticket id [#{{id}}]({{{url}}})",
|
||||
"I have restored the ticket id": "He restaurado el ticket id [#{{id}}]({{{url}}})",
|
||||
"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación"
|
||||
"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
|
||||
"I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
|
||||
"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
|
||||
"Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): ```{{{changes}}}```"
|
||||
}
|
||||
|
|
@ -1,26 +1,35 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('claimBeginning', () => {
|
||||
const salesAssistantId = 21;
|
||||
let ticket;
|
||||
let refundTicketSales;
|
||||
let salesInsertedInClaimEnd;
|
||||
|
||||
afterAll(async() => {
|
||||
let promises = [];
|
||||
promises.push(app.models.Ticket.destroyById(ticket.id));
|
||||
const activeCtx = {
|
||||
accessToken: {userId: salesAssistantId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
promises.push(app.models.Ticket.rawSql(`DELETE FROM vn.orderTicket WHERE ticketFk ='${ticket.id}';`));
|
||||
afterAll(async done => {
|
||||
try {
|
||||
await app.models.Ticket.destroyById(ticket.id);
|
||||
await app.models.Ticket.rawSql(`DELETE FROM vn.orderTicket WHERE ticketFk ='${ticket.id}';`);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
await Promise.all(promises);
|
||||
done();
|
||||
});
|
||||
|
||||
describe('importToNewRefundTicket()', () => {
|
||||
it('should create a new ticket with negative sales and insert the negative sales into claimEnd', async() => {
|
||||
let ctxOfSalesAssistant = {req: {accessToken: {userId: 21}}};
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
let claimId = 1;
|
||||
ticket = await app.models.ClaimBeginning.importToNewRefundTicket(ctxOfSalesAssistant, claimId);
|
||||
|
||||
await app.models.Ticket.findById(ticket.id);
|
||||
ticket = await app.models.ClaimBeginning.importToNewRefundTicket(ctx, claimId);
|
||||
|
||||
refundTicketSales = await app.models.Sale.find({where: {ticketFk: ticket.id}});
|
||||
salesInsertedInClaimEnd = await app.models.ClaimEnd.find({where: {claimFk: claimId}});
|
||||
|
|
|
|||
|
|
@ -1,14 +1,6 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('Claim createFromSales()', () => {
|
||||
let createdClaimFk;
|
||||
|
||||
afterAll(async done => {
|
||||
await app.models.Claim.destroyById(createdClaimFk);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
const ticketId = 2;
|
||||
const newSale = [{
|
||||
id: 3,
|
||||
|
|
@ -27,10 +19,16 @@ describe('Claim createFromSales()', () => {
|
|||
expect(claimBeginning.saleFk).toEqual(newSale[0].id);
|
||||
expect(claimBeginning.quantity).toEqual(newSale[0].quantity);
|
||||
|
||||
createdClaimFk = claim.id;
|
||||
const createdClaimId = claim.id;
|
||||
|
||||
// restores
|
||||
await app.models.Claim.destroyById(createdClaimId);
|
||||
});
|
||||
|
||||
it('should not be able to create a claim if exists that sale', async() => {
|
||||
let claim = await app.models.Claim.createFromSales(ctx, ticketId, newSale);
|
||||
const createdClaimId = claim.id;
|
||||
|
||||
let error;
|
||||
|
||||
await app.models.Claim.createFromSales(ctx, ticketId, newSale)
|
||||
|
|
@ -40,5 +38,8 @@ describe('Claim createFromSales()', () => {
|
|||
});
|
||||
|
||||
expect(error.toString()).toContain(`A claim with that sale already exists`);
|
||||
|
||||
// restores
|
||||
await app.models.Claim.destroyById(createdClaimId);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,31 +1,6 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('regularizeClaim()', () => {
|
||||
const claimFk = 1;
|
||||
const pendentState = 1;
|
||||
const resolvedState = 3;
|
||||
const trashDestination = 2;
|
||||
const okDestination = 1;
|
||||
const trashAddress = 12;
|
||||
let claimEnds = [];
|
||||
let trashTicket;
|
||||
|
||||
afterAll(async done => {
|
||||
let claim = await app.models.Claim.findById(claimFk);
|
||||
await claim.updateAttributes({
|
||||
claimStateFk: pendentState,
|
||||
hasToPickUp: false
|
||||
});
|
||||
await app.models.Ticket.destroyById(trashTicket.id);
|
||||
|
||||
claimEnds.forEach(async line => {
|
||||
await line.destroy();
|
||||
});
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should send a chat message with value "Trash" and then change claim state to resolved', async() => {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 18},
|
||||
|
|
@ -37,6 +12,36 @@ describe('regularizeClaim()', () => {
|
|||
};
|
||||
|
||||
const chatModel = app.models.Chat;
|
||||
const claimFk = 1;
|
||||
const pendentState = 1;
|
||||
const resolvedState = 3;
|
||||
const trashDestination = 2;
|
||||
const okDestination = 1;
|
||||
const trashAddress = 12;
|
||||
let claimEnds = [];
|
||||
let trashTicket;
|
||||
|
||||
afterEach(async done => {
|
||||
try {
|
||||
let claim = await app.models.Claim.findById(claimFk);
|
||||
await claim.updateAttributes({
|
||||
claimStateFk: pendentState,
|
||||
hasToPickUp: false
|
||||
});
|
||||
|
||||
for (claimEnd of claimEnds)
|
||||
await claimEnd.destroy();
|
||||
|
||||
if (trashTicket)
|
||||
await app.models.Ticket.destroyById(trashTicket.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should send a chat message with value "Trash" and then change claim state to resolved', async() => {
|
||||
spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
|
||||
|
||||
claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, {
|
||||
|
|
@ -61,23 +66,16 @@ describe('regularizeClaim()', () => {
|
|||
});
|
||||
|
||||
it('should send a chat message with value "Bueno" and then change claim state to resolved', async() => {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 18},
|
||||
headers: {origin: 'http://localhost'}
|
||||
}
|
||||
};
|
||||
ctx.req.__ = (value, params) => {
|
||||
return params.nickname;
|
||||
};
|
||||
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
|
||||
|
||||
claimEnds.forEach(async claimEnd => {
|
||||
claimEnd.updateAttributes({claimDestinationFk: okDestination});
|
||||
claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, {
|
||||
claimFk: claimFk,
|
||||
ticketFk: 1
|
||||
});
|
||||
|
||||
for (claimEnd of claimEnds)
|
||||
await claimEnd.updateAttributes({claimDestinationFk: okDestination});
|
||||
|
||||
await app.models.Claim.regularizeClaim(ctx, claimFk);
|
||||
|
||||
expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
|
||||
|
|
@ -85,23 +83,16 @@ describe('regularizeClaim()', () => {
|
|||
});
|
||||
|
||||
it('should send a chat message to the salesPerson when claim isPickUp is enabled', async() => {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 18},
|
||||
headers: {origin: 'http://localhost'}
|
||||
}
|
||||
};
|
||||
ctx.req.__ = (value, params) => {
|
||||
return params.nickname;
|
||||
};
|
||||
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
|
||||
|
||||
claimEnds.forEach(async claimEnd => {
|
||||
claimEnd.updateAttributes({claimDestinationFk: okDestination});
|
||||
claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, {
|
||||
claimFk: claimFk,
|
||||
ticketFk: 1
|
||||
});
|
||||
|
||||
for (claimEnd of claimEnds)
|
||||
await claimEnd.updateAttributes({claimDestinationFk: okDestination});
|
||||
|
||||
await app.models.Claim.regularizeClaim(ctx, claimFk);
|
||||
|
||||
expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('Update Claim', () => {
|
||||
let newDate = new Date();
|
||||
let newInstance;
|
||||
let original = {
|
||||
const originalData = {
|
||||
ticketFk: 3,
|
||||
clientFk: 101,
|
||||
ticketCreated: newDate,
|
||||
|
|
@ -14,22 +13,11 @@ describe('Update Claim', () => {
|
|||
observation: 'observation'
|
||||
};
|
||||
|
||||
beforeAll(async done => {
|
||||
newInstance = await app.models.Claim.create(original);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
await app.models.Claim.destroyById(newInstance.id);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it(`should throw an error as the user doesn't have rights`, async() => {
|
||||
let newClaim = await app.models.Claim.create(originalData);
|
||||
const forbiddenState = 3;
|
||||
const salesPersonId = 18;
|
||||
let ctx = {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {
|
||||
userId: salesPersonId
|
||||
|
|
@ -40,18 +28,23 @@ describe('Update Claim', () => {
|
|||
observation: 'valid observation'
|
||||
}
|
||||
};
|
||||
await app.models.Claim.updateClaim(ctx, newInstance.id)
|
||||
await app.models.Claim.updateClaim(ctx, newClaim.id)
|
||||
.catch(e => {
|
||||
error = e;
|
||||
});
|
||||
|
||||
expect(error.message).toEqual(`You don't have enough privileges to change that field`);
|
||||
|
||||
// restores
|
||||
await app.models.Claim.destroyById(newClaim.id);
|
||||
});
|
||||
|
||||
it(`should success to update the claim within privileges `, async() => {
|
||||
let newClaim = await app.models.Claim.create(originalData);
|
||||
|
||||
const correctState = 4;
|
||||
const salesPersonId = 18;
|
||||
let ctx = {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {
|
||||
userId: salesPersonId
|
||||
|
|
@ -63,14 +56,18 @@ describe('Update Claim', () => {
|
|||
hasToPickUp: false
|
||||
}
|
||||
};
|
||||
await app.models.Claim.updateClaim(ctx, newInstance.id);
|
||||
await app.models.Claim.updateClaim(ctx, newClaim.id,);
|
||||
|
||||
let claimUpdated = await app.models.Claim.findById(newInstance.id);
|
||||
let updatedClaim = await app.models.Claim.findById(newClaim.id);
|
||||
|
||||
expect(claimUpdated.observation).toEqual(ctx.args.observation);
|
||||
expect(updatedClaim.observation).toEqual(ctx.args.observation);
|
||||
|
||||
// restores
|
||||
await app.models.Claim.destroyById(newClaim.id);
|
||||
});
|
||||
|
||||
it('should change some sensible fields as salesAssistant', async() => {
|
||||
let newClaim = await app.models.Claim.create(originalData);
|
||||
const chatModel = app.models.Chat;
|
||||
spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
|
||||
|
||||
|
|
@ -90,13 +87,16 @@ describe('Update Claim', () => {
|
|||
ctx.req.__ = (value, params) => {
|
||||
return params.nickname;
|
||||
};
|
||||
await app.models.Claim.updateClaim(ctx, newInstance.id);
|
||||
await app.models.Claim.updateClaim(ctx, newClaim.id);
|
||||
|
||||
let claimUpdated = await app.models.Claim.findById(newInstance.id);
|
||||
let updatedClaim = await app.models.Claim.findById(newClaim.id);
|
||||
|
||||
expect(claimUpdated.observation).toEqual(ctx.args.observation);
|
||||
expect(claimUpdated.claimStateFk).toEqual(ctx.args.claimStateFk);
|
||||
expect(claimUpdated.workerFk).toEqual(ctx.args.workerFk);
|
||||
expect(updatedClaim.observation).toEqual(ctx.args.observation);
|
||||
expect(updatedClaim.claimStateFk).toEqual(ctx.args.claimStateFk);
|
||||
expect(updatedClaim.workerFk).toEqual(ctx.args.workerFk);
|
||||
expect(chatModel.sendCheckingPresence).toHaveBeenCalled();
|
||||
|
||||
// restores
|
||||
await app.models.Claim.destroyById(newClaim.id);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ describe('Client activeWorkersWithRole', () => {
|
|||
|
||||
let isSalesPerson = await app.models.Account.hasRole(result[0].id, 'salesPerson');
|
||||
|
||||
expect(result.length).toEqual(16);
|
||||
expect(result.length).toEqual(17);
|
||||
expect(isSalesPerson).toBeTruthy();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,6 @@ describe('Address createAddress', () => {
|
|||
const provinceId = 5;
|
||||
const incotermsId = 'FAS';
|
||||
const customAgentOneId = 1;
|
||||
let address;
|
||||
let client;
|
||||
|
||||
afterAll(async done => {
|
||||
await client.updateAttributes({defaultAddressFk: 1});
|
||||
await address.destroy();
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw a non uee member error if no incoterms is defined', async() => {
|
||||
const expectedResult = 'My edited address';
|
||||
|
|
@ -49,7 +40,6 @@ describe('Address createAddress', () => {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
try {
|
||||
await app.models.Client.createAddress(ctx, clientId);
|
||||
} catch (e) {
|
||||
|
|
@ -61,7 +51,7 @@ describe('Address createAddress', () => {
|
|||
});
|
||||
|
||||
it('should verify that client defaultAddressFk is untainted', async() => {
|
||||
client = await app.models.Client.findById(clientId);
|
||||
const client = await app.models.Client.findById(clientId);
|
||||
|
||||
expect(client.defaultAddressFk).toEqual(1);
|
||||
});
|
||||
|
|
@ -79,9 +69,13 @@ describe('Address createAddress', () => {
|
|||
}
|
||||
};
|
||||
|
||||
address = await app.models.Client.createAddress(ctx, clientId);
|
||||
client = await app.models.Client.findById(clientId);
|
||||
const address = await app.models.Client.createAddress(ctx, clientId);
|
||||
const client = await app.models.Client.findById(clientId);
|
||||
|
||||
expect(client.defaultAddressFk).toEqual(address.id);
|
||||
|
||||
// restores
|
||||
await client.updateAttributes({defaultAddressFk: 1});
|
||||
await address.destroy();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,13 +4,20 @@ describe('Client Create', () => {
|
|||
const clientName = 'Wade';
|
||||
const AccountName = 'Deadpool';
|
||||
|
||||
afterAll(async done => {
|
||||
afterEach(async done => {
|
||||
let address = await app.models.Address.findOne({where: {nickname: clientName}});
|
||||
let client = await app.models.Client.findOne({where: {name: clientName}});
|
||||
let account = await app.models.Account.findOne({where: {name: AccountName}});
|
||||
|
||||
if (address && client && account) {
|
||||
try {
|
||||
await app.models.Address.destroyById(address.id);
|
||||
await app.models.Client.destroyById(client.id);
|
||||
await app.models.Account.destroyById(account.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
|
@ -46,13 +53,8 @@ describe('Client Create', () => {
|
|||
expect(client.socialName).toEqual(newAccount.socialName);
|
||||
});
|
||||
|
||||
it('should find an existing account', async() => {
|
||||
let account = await app.models.Account.findOne({where: {name: newAccount.userName}});
|
||||
|
||||
expect(account.name).toEqual(newAccount.userName);
|
||||
});
|
||||
|
||||
it('should not be able to create a user if exists', async() => {
|
||||
await app.models.Client.createWithUser(newAccount);
|
||||
try {
|
||||
let client = await app.models.Client.createWithUser(newAccount);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ describe('Client listWorkers', () => {
|
|||
.then(result => {
|
||||
let amountOfEmployees = Object.keys(result).length;
|
||||
|
||||
expect(amountOfEmployees).toEqual(51);
|
||||
expect(amountOfEmployees).toEqual(53);
|
||||
done();
|
||||
})
|
||||
.catch(done.fail);
|
||||
|
|
|
|||
|
|
@ -6,26 +6,11 @@ describe('Address updateAddress', () => {
|
|||
const provinceId = 5;
|
||||
const incotermsId = 'FAS';
|
||||
const customAgentOneId = 1;
|
||||
let oldAddress;
|
||||
let address;
|
||||
|
||||
afterAll(async done => {
|
||||
await address.updateAttributes({
|
||||
nickname: oldAddress.nickname,
|
||||
provinceFk: 1,
|
||||
customsAgentFk: null,
|
||||
incotermsFk: null
|
||||
});
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw a non uee member error if no incoterms is defined', async() => {
|
||||
const expectedResult = 'My edited address';
|
||||
it('should throw the non uee member error if no incoterms is defined', async() => {
|
||||
const ctx = {
|
||||
args: {
|
||||
provinceFk: provinceId,
|
||||
nickname: expectedResult,
|
||||
customsAgentFk: customAgentOneId
|
||||
}
|
||||
};
|
||||
|
|
@ -41,16 +26,13 @@ describe('Address updateAddress', () => {
|
|||
});
|
||||
|
||||
it('should throw a non uee member error if no customsAgent is defined', async() => {
|
||||
const expectedResult = 'My edited address';
|
||||
const ctx = {
|
||||
args: {
|
||||
provinceFk: provinceId,
|
||||
nickname: expectedResult,
|
||||
incotermsFk: incotermsId
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
try {
|
||||
await app.models.Client.updateAddress(ctx, clientId, addressId);
|
||||
} catch (e) {
|
||||
|
|
@ -72,13 +54,21 @@ describe('Address updateAddress', () => {
|
|||
}
|
||||
};
|
||||
|
||||
oldAddress = await app.models.Address.findById(addressId);
|
||||
let oldAddress = await app.models.Address.findById(addressId);
|
||||
|
||||
await app.models.Client.updateAddress(ctx, clientId, addressId);
|
||||
|
||||
address = await app.models.Address.findById(addressId);
|
||||
let address = await app.models.Address.findById(addressId);
|
||||
|
||||
expect(address.nickname).toEqual(expectedResult);
|
||||
|
||||
// restores
|
||||
await address.updateAttributes({
|
||||
nickname: oldAddress.nickname,
|
||||
provinceFk: oldAddress.provinceFk,
|
||||
customsAgentFk: null,
|
||||
incotermsFk: null
|
||||
});
|
||||
});
|
||||
|
||||
it('should update the address', async() => {
|
||||
|
|
@ -96,5 +86,13 @@ describe('Address updateAddress', () => {
|
|||
address = await app.models.Address.findById(addressId);
|
||||
|
||||
expect(address.nickname).toEqual(expectedResult);
|
||||
|
||||
// restores
|
||||
await address.updateAttributes({
|
||||
nickname: oldAddress.nickname,
|
||||
provinceFk: oldAddress.provinceFk,
|
||||
customsAgentFk: null,
|
||||
incotermsFk: null
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ const app = require('vn-loopback/server/server');
|
|||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('Client createWithInsurance', () => {
|
||||
let classificationId;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: 101},
|
||||
http: {
|
||||
|
|
@ -16,12 +15,6 @@ describe('Client createWithInsurance', () => {
|
|||
return value;
|
||||
};
|
||||
|
||||
afterAll(async done => {
|
||||
await app.models.CreditClassification.destroyById(classificationId);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should verify the classifications and insurances are untainted', async() => {
|
||||
let classifications = await app.models.CreditClassification.find();
|
||||
let insurances = await app.models.CreditInsurance.find();
|
||||
|
|
@ -57,8 +50,6 @@ describe('Client createWithInsurance', () => {
|
|||
});
|
||||
let result = await app.models.CreditClassification.createWithInsurance(data, ctx);
|
||||
|
||||
classificationId = result.id;
|
||||
|
||||
expect(result.client).toEqual(101);
|
||||
|
||||
let classifications = await app.models.CreditClassification.find();
|
||||
|
|
@ -66,5 +57,8 @@ describe('Client createWithInsurance', () => {
|
|||
|
||||
expect(classifications.length).toEqual(6);
|
||||
expect(insurances.length).toEqual(4);
|
||||
|
||||
// restore
|
||||
await app.models.CreditClassification.destroyById(result.id);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -153,9 +153,9 @@
|
|||
</form>
|
||||
|
||||
<!-- New postcode dialog -->
|
||||
<vn-client-postcode vn-id="postcode"
|
||||
<vn-geo-postcode vn-id="postcode"
|
||||
on-response="$ctrl.onResponse($response)">
|
||||
</vn-client-postcode>
|
||||
</vn-geo-postcode>
|
||||
|
||||
<!-- Create custom agent dialog -->
|
||||
<vn-dialog class="edit"
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@ export default class Controller extends Section {
|
|||
|
||||
onResponse(response) {
|
||||
this.address.postalCode = response.code;
|
||||
this.address.city = response.city;
|
||||
this.address.provinceFk = response.provinceFk;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -191,9 +191,9 @@
|
|||
</form>
|
||||
|
||||
<!-- New postcode dialog -->
|
||||
<vn-client-postcode vn-id="postcode"
|
||||
<vn-geo-postcode vn-id="postcode"
|
||||
on-response="$ctrl.onResponse($response)">
|
||||
</vn-client-postcode>
|
||||
</vn-geo-postcode>
|
||||
|
||||
<!-- Create custom agent dialog -->
|
||||
<vn-dialog class="edit"
|
||||
|
|
|
|||
|
|
@ -78,6 +78,8 @@ export default class Controller extends Section {
|
|||
|
||||
onResponse(response) {
|
||||
this.address.postalCode = response.code;
|
||||
this.address.city = response.city;
|
||||
this.address.provinceFk = response.provinceFk;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,6 @@
|
|||
insert-mode="true"
|
||||
form="form">
|
||||
</vn-watcher>
|
||||
<vn-crud-model
|
||||
auto-load="true"
|
||||
url="Towns/location"
|
||||
data="townLocations"
|
||||
order="name">
|
||||
</vn-crud-model>
|
||||
<form name="form" vn-http-submit="$ctrl.onSubmit()" class="vn-w-md">
|
||||
<vn-card class="vn-pa-lg">
|
||||
<vn-horizontal>
|
||||
|
|
@ -82,7 +76,7 @@
|
|||
label="City"
|
||||
ng-model="$ctrl.client.city"
|
||||
selection="$ctrl.town"
|
||||
data="townsLocation"
|
||||
url="Towns/location"
|
||||
fields="['id', 'name', 'provinceFk']"
|
||||
value-field="name">
|
||||
<tpl-item>
|
||||
|
|
@ -136,7 +130,7 @@
|
|||
</vn-button-bar>
|
||||
</form>
|
||||
<!-- New postcode dialog -->
|
||||
<vn-client-postcode
|
||||
<vn-geo-postcode
|
||||
vn-id="postcode"
|
||||
on-response="$ctrl.onResponse($response)">
|
||||
</vn-client-postcode>
|
||||
</vn-geo-postcode>
|
||||
|
|
@ -81,6 +81,9 @@ export default class Controller extends Section {
|
|||
|
||||
onResponse(response) {
|
||||
this.client.postcode = response.code;
|
||||
this.client.city = response.city;
|
||||
this.client.provinceFk = response.provinceFk;
|
||||
this.client.countryFk = response.countryFk;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@
|
|||
on-accept="$ctrl.onAcceptDuplication()">
|
||||
</vn-confirm>
|
||||
<!-- New postcode dialog -->
|
||||
<vn-client-postcode
|
||||
<vn-geo-postcode
|
||||
vn-id="postcode"
|
||||
on-response="$ctrl.onResponse($response)">
|
||||
</vn-client-postcode>
|
||||
</vn-geo-postcode>
|
||||
|
|
@ -159,6 +159,9 @@ export default class Controller extends Section {
|
|||
|
||||
onResponse(response) {
|
||||
this.client.postcode = response.code;
|
||||
this.client.city = response.city;
|
||||
this.client.provinceFk = response.provinceFk;
|
||||
this.client.countryFk = response.countryFk;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ import './web-payment';
|
|||
import './log';
|
||||
import './sms';
|
||||
import './postcode';
|
||||
import './postcode/province';
|
||||
import './postcode/city';
|
||||
import './dms/index';
|
||||
import './dms/create';
|
||||
import './dms/edit';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
<vn-dialog class="edit"
|
||||
vn-id="cityDialog"
|
||||
on-open="$ctrl.onOpen()"
|
||||
on-accept="$ctrl.onAccept()"
|
||||
message="New city">
|
||||
<tpl-body>
|
||||
<p translate>Please, ensure you put the correct data!</p>
|
||||
<vn-horizontal>
|
||||
<vn-textfield vn-one
|
||||
vn-focus
|
||||
ng-model="$ctrl.city.name"
|
||||
label="Name">
|
||||
</vn-textfield>
|
||||
<vn-autocomplete vn-one
|
||||
ng-model="$ctrl.city.provinceFk"
|
||||
url="Provinces"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
label="Province">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||
<button id="saveCity" response="accept" translate>Save</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
import ngModule from '../../module';
|
||||
import Component from 'core/lib/component';
|
||||
|
||||
class Controller extends Component { // Comprobar funcionamiento añadir ciudad
|
||||
open($event) {
|
||||
if ($event.defaultPrevented) return;
|
||||
|
||||
this.$.cityDialog.show();
|
||||
$event.preventDefault();
|
||||
}
|
||||
|
||||
onAccept() {
|
||||
try {
|
||||
if (!this.city.name)
|
||||
throw new Error(`The city name can't be empty`);
|
||||
if (!this.city.provinceFk)
|
||||
throw new Error(`The province can't be empty`);
|
||||
|
||||
this.$http.patch(`towns`, this.city).then(res => {
|
||||
this.vnApp.showMessage(this.$t('The city has been created'));
|
||||
this.emit('response', {$response: res.data});
|
||||
});
|
||||
} catch (e) {
|
||||
this.vnApp.showError(this.$t(e.message));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnGeoCity', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
data: '<',
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import './index';
|
||||
|
||||
describe('Client', () => {
|
||||
describe('Component vnGeoCity', () => {
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
let $scope;
|
||||
|
||||
beforeEach(ngModule('client'));
|
||||
|
||||
beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => {
|
||||
$httpBackend = _$httpBackend_;
|
||||
$scope = $rootScope.$new();
|
||||
const $element = angular.element('<vn-dialog></vn-dialog>');
|
||||
controller = $componentController('vnGeoCity', {$element, $scope});
|
||||
controller.client = {id: 101};
|
||||
}));
|
||||
|
||||
describe('onAccept()', () => {
|
||||
it('should perform a POST query and show a success snackbar', () => {
|
||||
let params = {name: 'Gotham City', provinceFk: 1};
|
||||
controller.city = {name: 'Gotham City', provinceFk: 1};
|
||||
|
||||
jest.spyOn(controller.vnApp, 'showMessage');
|
||||
$httpBackend.expect('PATCH', `towns`, params).respond(200, params);
|
||||
|
||||
controller.onAccept();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('The city has been created');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
vn-focus
|
||||
vn-id="postcode"
|
||||
label="Postcode"
|
||||
ng-model="$ctrl.data.code"
|
||||
ng-model="$ctrl.location.code"
|
||||
required="true">
|
||||
</vn-textfield>
|
||||
<vn-autocomplete vn-one
|
||||
|
|
@ -19,23 +19,39 @@
|
|||
url="Towns/location"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
ng-model="$ctrl.data.townFk"
|
||||
ng-model="$ctrl.location.townFk"
|
||||
selection="$ctrl.townSelection"
|
||||
required="true">
|
||||
<append>
|
||||
<vn-icon-button
|
||||
icon="add_circle"
|
||||
vn-tooltip="New city"
|
||||
ng-click="city.open($event)"
|
||||
vn-acl="deliveryBoss"
|
||||
vn-acl-action="remove">
|
||||
</vn-icon-button>
|
||||
</append>
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-autocomplete vn-one
|
||||
disabled="true"
|
||||
ng-model="$ctrl.data.provinceFk"
|
||||
ng-model="$ctrl.location.provinceFk"
|
||||
url="Provinces"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
label="Province">
|
||||
<append>
|
||||
<vn-icon-button
|
||||
icon="add_circle"
|
||||
vn-tooltip="New province"
|
||||
ng-click="province.open($event)"
|
||||
vn-acl="deliveryBoss"
|
||||
vn-acl-action="remove">
|
||||
</vn-icon-button>
|
||||
</append>
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete vn-one
|
||||
disabled="true"
|
||||
ng-model="$ctrl.data.countryFk"
|
||||
ng-model="$ctrl.location.countryFk"
|
||||
url="Countries"
|
||||
show-field="country"
|
||||
value-field="id"
|
||||
|
|
@ -45,6 +61,16 @@
|
|||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||
<button response="accept" translate>Save</button>
|
||||
<button id= "savePostcode" response="accept" translate>Save</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
<!-- New province dialog -->
|
||||
<vn-geo-province
|
||||
vn-id="province"
|
||||
on-response="$ctrl.onProvinceResponse($response)">
|
||||
</vn-geo-province>
|
||||
<!-- New city dialog -->
|
||||
<vn-geo-city
|
||||
vn-id="city"
|
||||
on-response="$ctrl.onCityResponse($response)">
|
||||
</vn-geo-city>
|
||||
|
|
@ -15,8 +15,9 @@ class Controller extends Component {
|
|||
const province = selection.province;
|
||||
const country = province.country;
|
||||
|
||||
this.data.provinceFk = province.id;
|
||||
this.data.countryFk = country.id;
|
||||
this.location.city = selection.name;
|
||||
this.location.provinceFk = province.id;
|
||||
this.location.countryFk = country.id;
|
||||
}
|
||||
|
||||
open() {
|
||||
|
|
@ -24,19 +25,35 @@ class Controller extends Component {
|
|||
}
|
||||
|
||||
onOpen() {
|
||||
this.location = {};
|
||||
this.$.postcode.focus();
|
||||
}
|
||||
|
||||
onProvinceResponse(response) {
|
||||
this.location.provinceFk = response.id;
|
||||
this.location.countryFk = response.countryFk;
|
||||
}
|
||||
|
||||
onCityResponse(response) {
|
||||
this.location.townFk = response.id;
|
||||
this.location.provinceFk = response.provinceFk;
|
||||
this.location.countryFk = response.countryFk;
|
||||
}
|
||||
|
||||
onAccept() {
|
||||
try {
|
||||
if (!this.data.code)
|
||||
if (!this.location.code)
|
||||
throw new Error(`The postcode can't be empty`);
|
||||
if (!this.data.townFk)
|
||||
if (!this.location.townFk)
|
||||
throw new Error(`The town can't be empty`);
|
||||
if (!this.location.provinceFk)
|
||||
throw new Error(`The province can't be empty`);
|
||||
if (!this.location.provinceFk)
|
||||
throw new Error(`The country can't be empty`);
|
||||
|
||||
this.$http.patch(`postcodes`, this.data).then(res => {
|
||||
this.vnApp.showMessage(this.$t('The postcode has been saved'));
|
||||
this.emit('response', {$response: res.data});
|
||||
this.$http.patch(`postcodes`, this.location).then(() => {
|
||||
this.vnApp.showMessage(this.$t('The postcode has been created. You can save the data now'));
|
||||
this.emit('response', {$response: this.location});
|
||||
});
|
||||
} catch (e) {
|
||||
this.vnApp.showError(this.$t(e.message));
|
||||
|
|
@ -46,7 +63,7 @@ class Controller extends Component {
|
|||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnClientPostcode', {
|
||||
ngModule.vnComponent('vnGeoPostcode', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import './index';
|
||||
|
||||
describe('Client', () => {
|
||||
describe('Component vnClientPostcode', () => {
|
||||
describe('Component vnGeoPostcode', () => {
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
let $scope;
|
||||
|
|
@ -12,14 +12,14 @@ describe('Client', () => {
|
|||
$httpBackend = _$httpBackend_;
|
||||
$scope = $rootScope.$new();
|
||||
const $element = angular.element('<vn-dialog></vn-dialog>');
|
||||
controller = $componentController('vnClientPostcode', {$element, $scope});
|
||||
controller = $componentController('vnGeoPostcode', {$element, $scope});
|
||||
controller.client = {id: 101};
|
||||
}));
|
||||
|
||||
describe('onAccept()', () => {
|
||||
it('should perform a POST query and show a success snackbar', () => {
|
||||
let params = {townFk: 1, provinceFk: 1, countryFk: 1, code: '46460'};
|
||||
controller.data = {townFk: 1, provinceFk: 1, countryFk: 1, code: '46460'};
|
||||
controller.location = {townFk: 1, provinceFk: 1, countryFk: 1, code: '46460'};
|
||||
|
||||
jest.spyOn(controller.vnApp, 'showMessage');
|
||||
$httpBackend.expect('PATCH', `postcodes`, params).respond(200, params);
|
||||
|
|
@ -27,7 +27,7 @@ describe('Client', () => {
|
|||
controller.onAccept();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('The postcode has been saved');
|
||||
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('The postcode has been created. You can save the data now');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
New postcode: Nuevo código postal
|
||||
New city: Nueva ciudad
|
||||
New province: Nueva provincia
|
||||
Please, ensure you put the correct data!: ¡Por favor, asegúrate de poner los datos correctos!
|
||||
The postcode can't be empty: El código postal no puede quedar vacío
|
||||
The town can't be empty: La población no puede quedar vacía
|
||||
The postcode has been saved: El código postal ha sido guardado
|
||||
The province can't be empty: La provincia no puede quedar vacía
|
||||
The country can't be empty: El país no puede quedar vacío
|
||||
The postcode has been created. You can save the data now: Se ha creado el código postal. Ahora puedes guardar los datos
|
||||
The city has been created: Se ha creado la ciudad
|
||||
The province has been created: Se ha creado la provincia
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
<vn-dialog class="edit"
|
||||
vn-id="provinceDialog"
|
||||
on-open="$ctrl.onOpen()"
|
||||
on-accept="$ctrl.onAccept()"
|
||||
message="New province">
|
||||
<tpl-body>
|
||||
<p translate>Please, ensure you put the correct data!</p>
|
||||
<vn-horizontal>
|
||||
<vn-textfield vn-one
|
||||
vn-focus
|
||||
ng-model="$ctrl.province.name"
|
||||
label="Name">
|
||||
</vn-textfield>
|
||||
<vn-autocomplete vn-one
|
||||
ng-model="$ctrl.province.countryFk"
|
||||
url="Countries"
|
||||
show-field="country"
|
||||
value-field="id"
|
||||
label="Country">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||
<button id="saveProvince" response="accept" translate>Save</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
import ngModule from '../../module';
|
||||
import Component from 'core/lib/component';
|
||||
|
||||
class Controller extends Component {
|
||||
open($event) {
|
||||
if ($event.defaultPrevented) return;
|
||||
|
||||
this.$.provinceDialog.show();
|
||||
$event.preventDefault();
|
||||
}
|
||||
|
||||
onAccept() {
|
||||
try {
|
||||
if (!this.province.name)
|
||||
throw new Error(`The province name can't be empty`);
|
||||
if (!this.province.countryFk)
|
||||
throw new Error(`The country can't be empty`);
|
||||
|
||||
this.$http.patch(`provinces`, this.province).then(res => {
|
||||
this.vnApp.showMessage(this.$t('The province has been created'));
|
||||
this.emit('response', {$response: res.data});
|
||||
});
|
||||
} catch (e) {
|
||||
this.vnApp.showError(this.$t(e.message));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnGeoProvince', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
data: '<',
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import './index';
|
||||
|
||||
describe('Client', () => {
|
||||
describe('Component vnGeoProvince', () => {
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
let $scope;
|
||||
|
||||
beforeEach(ngModule('client'));
|
||||
|
||||
beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => {
|
||||
$httpBackend = _$httpBackend_;
|
||||
$scope = $rootScope.$new();
|
||||
const $element = angular.element('<vn-dialog></vn-dialog>');
|
||||
controller = $componentController('vnGeoProvince', {$element, $scope});
|
||||
controller.client = {id: 101};
|
||||
}));
|
||||
|
||||
describe('onAccept()', () => {
|
||||
it('should perform a POST query and show a success snackbar', () => {
|
||||
let params = {name: 'New Jersey', countryFk: 1};
|
||||
controller.province = {name: 'New Jersey', countryFk: 1};
|
||||
|
||||
jest.spyOn(controller.vnApp, 'showMessage');
|
||||
$httpBackend.expect('PATCH', `provinces`, params).respond(200, params);
|
||||
|
||||
controller.onAccept();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('The province has been created');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
@import "variables";
|
||||
|
||||
vn-client-postcode {
|
||||
vn-geo-postcode {
|
||||
vn-dialog {
|
||||
p {
|
||||
color: $color-alert
|
||||
|
|
|
|||
|
|
@ -137,3 +137,4 @@ describe('Buy latests buys filter()', () => {
|
|||
expect(results.length).toBe(1);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -143,6 +143,9 @@
|
|||
</vn-fetched-tags>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="empty-row">
|
||||
<td colspan="10"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</vn-auto>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,18 @@ vn-entry-summary .summary {
|
|||
background-color: lighten($color-marginal, 10%);
|
||||
}
|
||||
|
||||
tbody {
|
||||
border: 2px solid $color-marginal;
|
||||
tbody tr:nth-child(1) {
|
||||
border-top: 1px solid $color-marginal;
|
||||
}
|
||||
|
||||
tbody tr:nth-child(1),
|
||||
tbody tr:nth-child(2) {
|
||||
border-left: 1px solid $color-marginal;
|
||||
border-right: 1px solid $color-marginal
|
||||
}
|
||||
|
||||
tbody tr:nth-child(3) {
|
||||
height: inherit
|
||||
}
|
||||
|
||||
tr {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
module.exports = Self => {
|
||||
Self.remoteMethod('book', {
|
||||
description: 'Book a invoiceOut',
|
||||
description: 'Book an invoiceOut',
|
||||
accessType: 'WRITE',
|
||||
accepts: {
|
||||
arg: 'ref',
|
||||
|
|
|
|||
|
|
@ -2,38 +2,31 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('invoiceOut book()', () => {
|
||||
const invoiceOutId = 5;
|
||||
let bookedDate;
|
||||
let OriginalInvoiceOut;
|
||||
let updatedInvoiceOut;
|
||||
|
||||
afterAll(async done => {
|
||||
updatedInvoiceOut.updateAttributes({
|
||||
booked: OriginalInvoiceOut.booked,
|
||||
hasPdf: OriginalInvoiceOut.hasPdf,
|
||||
amount: OriginalInvoiceOut.amount
|
||||
});
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should check that invoice out booked is untainted', async() => {
|
||||
const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
|
||||
bookedDate = invoiceOut.booked;
|
||||
|
||||
expect(invoiceOut.booked).toBeDefined();
|
||||
expect(invoiceOut.hasPdf).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should confirm the book property have been updated`, async() => {
|
||||
OriginalInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
let invoiceOutRef = OriginalInvoiceOut.ref;
|
||||
it('should update the booked property', async() => {
|
||||
const originalInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
const bookedDate = originalInvoiceOut.booked;
|
||||
const invoiceOutRef = originalInvoiceOut.ref;
|
||||
|
||||
await app.models.InvoiceOut.book(invoiceOutRef);
|
||||
|
||||
updatedInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
const updatedInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
|
||||
expect(updatedInvoiceOut.booked).not.toEqual(bookedDate);
|
||||
expect(updatedInvoiceOut.hasPdf).toBeFalsy();
|
||||
|
||||
// restores
|
||||
await updatedInvoiceOut.updateAttributes({
|
||||
booked: originalInvoiceOut.booked,
|
||||
hasPdf: originalInvoiceOut.hasPdf,
|
||||
amount: originalInvoiceOut.amount
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,20 +1,14 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('invoiceOut delete()', () => {
|
||||
const invoiceOutId = 2;
|
||||
let originalInvoiceOut;
|
||||
let originalTicket;
|
||||
|
||||
afterAll(async done => {
|
||||
const newInvoiceOut = await app.models.InvoiceOut.create(originalInvoiceOut);
|
||||
await newInvoiceOut.updateAttribute('ref', originalInvoiceOut.ref);
|
||||
|
||||
const promises = [];
|
||||
promises.push(originalTicket.updateAttribute('refFk', newInvoiceOut.ref));
|
||||
Promise.all(promises);
|
||||
|
||||
done();
|
||||
});
|
||||
const userId = 106;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
|
||||
it('should check that there is one ticket in the target invoiceOut', async() => {
|
||||
const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
|
|
@ -25,6 +19,9 @@ describe('invoiceOut delete()', () => {
|
|||
});
|
||||
|
||||
it(`should delete the target invoiceOut then check the ticket doesn't have a refFk anymore`, async() => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
originalInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
await app.models.InvoiceOut.delete(invoiceOutId);
|
||||
originalTicket = await app.models.Ticket.findById(3);
|
||||
|
|
@ -32,5 +29,10 @@ describe('invoiceOut delete()', () => {
|
|||
|
||||
expect(deletedInvoiceOut).toBeNull();
|
||||
expect(originalTicket.refFk).toBeNull();
|
||||
|
||||
// restores
|
||||
const restoredInvoiceOut = await app.models.InvoiceOut.create(originalInvoiceOut);
|
||||
await restoredInvoiceOut.updateAttribute('ref', originalInvoiceOut.ref);
|
||||
await originalTicket.updateAttribute('refFk', restoredInvoiceOut.ref);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,16 +4,6 @@ describe('invoiceOut regenerate()', () => {
|
|||
const invoiceReportFk = 30;
|
||||
const invoiceOutId = 1;
|
||||
|
||||
afterAll(async done => {
|
||||
const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId);
|
||||
await invoiceOut.updateAttributes({hasPdf: true});
|
||||
await app.models.InvoiceOut.rawSql(`
|
||||
DELETE FROM vn.printServerQueue
|
||||
WHERE reportFk = ?`, [invoiceReportFk]);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
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(`
|
||||
|
|
@ -35,5 +25,12 @@ describe('invoiceOut regenerate()', () => {
|
|||
|
||||
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]);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,22 +2,12 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('item getWasteDetail()', () => {
|
||||
it('should check for the waste breakdown for every worker', async() => {
|
||||
let result = await app.models.Item.getWasteDetail();
|
||||
const result = await app.models.Item.getWasteDetail();
|
||||
|
||||
const firstBuyer = result[0].buyer;
|
||||
const firstBuyerLines = result[0].lines;
|
||||
const secondBuyer = result[1].buyer;
|
||||
const secondBuyerLines = result[1].lines;
|
||||
const thirdBuyer = result[2].buyer;
|
||||
const thirdBuyerLines = result[2].lines;
|
||||
const length = result.length;
|
||||
const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
|
||||
|
||||
expect(result.length).toEqual(3);
|
||||
expect(firstBuyer).toEqual('CharlesXavier');
|
||||
expect(firstBuyerLines.length).toEqual(4);
|
||||
expect(secondBuyer).toEqual('HankPym');
|
||||
expect(secondBuyerLines.length).toEqual(3);
|
||||
|
||||
expect(thirdBuyer).toEqual('DavidCharlesHaller');
|
||||
expect(thirdBuyerLines.length).toEqual(3);
|
||||
expect(anyResult.buyer).toMatch(/(CharlesXavier|HankPym|DavidCharlesHaller)/);
|
||||
expect(anyResult.lines.length).toBeGreaterThanOrEqual(3);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@ describe('item new()', () => {
|
|||
let item;
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
let sql = 'DELETE FROM vn.itemLog WHERE originFk = ?';
|
||||
await app.models.Item.rawSql(sql, [item.id]);
|
||||
|
||||
sql = 'DELETE FROM vn.item WHERE id = ?';
|
||||
await app.models.Item.rawSql(sql, [item.id]);
|
||||
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('item updateTaxes()', () => {
|
||||
afterAll(async done => {
|
||||
let taxesInFixtures = [{id: 3, taxClassFk: 1}];
|
||||
|
||||
await app.models.Item.updateTaxes(taxesInFixtures);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw an error if the taxClassFk is blank', async() => {
|
||||
let error;
|
||||
let taxes = [{id: 3, taxClassFk: undefined}];
|
||||
|
|
@ -29,14 +23,12 @@ describe('item updateTaxes()', () => {
|
|||
|
||||
let taxes = [{id: 3, taxClassFk: 2}];
|
||||
|
||||
let result = await app.models.Item.updateTaxes(taxes);
|
||||
|
||||
expect(result).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should confirm the tax class was updated', async() => {
|
||||
let taxCountry = await app.models.ItemTaxCountry.findById(3);
|
||||
await app.models.Item.updateTaxes(taxes);
|
||||
taxCountry = await app.models.ItemTaxCountry.findById(3);
|
||||
|
||||
expect(taxCountry.taxClassFk).toEqual(2);
|
||||
|
||||
// restores
|
||||
await app.models.Item.updateTaxes(taxesInFixtures);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ describe('order filter()', () => {
|
|||
});
|
||||
|
||||
expect(hasEmptyLines).toBeFalsy();
|
||||
|
||||
ctx.args = {showEmpty: null};
|
||||
});
|
||||
|
||||
it('should return the orders matching the showEmpty on true', async() => {
|
||||
|
|
@ -50,5 +52,7 @@ describe('order filter()', () => {
|
|||
});
|
||||
|
||||
expect(hasEmptyLines).toBeTruthy();
|
||||
|
||||
ctx.args = {showEmpty: null};
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,18 +14,9 @@ describe('route guessPriority()', () => {
|
|||
done();
|
||||
});
|
||||
|
||||
it('should confirm the tickets in the target route have no priority yet', async() => {
|
||||
it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => {
|
||||
routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}});
|
||||
|
||||
expect(routeTicketsToRestore.length).toEqual(2);
|
||||
|
||||
expect(routeTicketsToRestore[0].id).toEqual(23);
|
||||
expect(routeTicketsToRestore[0].priority).toBeNull();
|
||||
expect(routeTicketsToRestore[1].id).toEqual(24);
|
||||
expect(routeTicketsToRestore[1].priority).toBeNull();
|
||||
});
|
||||
|
||||
it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => {
|
||||
await app.models.Route.guessPriority(targetRouteId);
|
||||
let routeTickets = await app.models.Ticket.find({where: {routeFk: targetRouteId}, fields: ['id', 'priority']});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +1,43 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('route updateVolume()', () => {
|
||||
const routeId = 1;
|
||||
const workerFk = 9;
|
||||
const ctx = {req: {accessToken: {userId: workerFk}}};
|
||||
let originalRoute;
|
||||
let ticketToRestore;
|
||||
let logIdToDestroy;
|
||||
const userId = 50;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
afterAll(async done => {
|
||||
await originalRoute.updateAttributes({m3: 1.8});
|
||||
await ticketToRestore.updateAttributes({routeFk: null});
|
||||
await app.models.RouteLog.destroyById(logIdToDestroy);
|
||||
done();
|
||||
it('should confirm the route volume is updated and logged when a ticket is added', async() => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
const route = await app.models.Route.findById(routeId);
|
||||
|
||||
it('should confirm the original volume of the route is the expected', async() => {
|
||||
originalRoute = await app.models.Route.findById(routeId);
|
||||
expect(route.m3).toEqual(1.8);
|
||||
|
||||
expect(originalRoute.m3).toEqual(1.8);
|
||||
});
|
||||
const ticket = await app.models.Ticket.findById(14);
|
||||
|
||||
it('should confirm the route volume is updated when a ticket is added', async() => {
|
||||
ticketToRestore = await app.models.Ticket.findById(14);
|
||||
let updatedTicket = await app.models.Ticket.findById(14);
|
||||
|
||||
await updatedTicket.updateAttributes({routeFk: routeId});
|
||||
await ticket.updateAttributes({routeFk: routeId});
|
||||
await app.models.Route.updateVolume(ctx, routeId);
|
||||
|
||||
let updatedRoute = await app.models.Route.findById(routeId);
|
||||
const updatedRoute = await app.models.Route.findById(routeId);
|
||||
|
||||
expect(updatedRoute.m3).not.toEqual(originalRoute.m3);
|
||||
expect(updatedRoute.m3).not.toEqual(route.m3);
|
||||
|
||||
const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
|
||||
|
||||
const m3Log = logs.filter(log => {
|
||||
return log.newInstance.m3 === updatedRoute.m3;
|
||||
});
|
||||
|
||||
it('should confirm the change is logged', async() => {
|
||||
let logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
|
||||
|
||||
let m3Log = logs.filter(log => {
|
||||
return log.newInstance.m3 === 1.9;
|
||||
});
|
||||
logIdToDestroy = m3Log[0].id;
|
||||
const logIdToDestroy = m3Log[0].id;
|
||||
|
||||
expect(m3Log.length).toEqual(1);
|
||||
|
||||
// restores
|
||||
await ticket.updateAttributes({routeFk: null});
|
||||
await route.updateAttributes({m3: 1.8});
|
||||
await app.models.RouteLog.destroyById(logIdToDestroy);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('ticket listPackaging()', () => {
|
||||
it('should call the listPackaging method and return the response', async() => {
|
||||
it('should return the packaging', async() => {
|
||||
let filter = {where: {packagingFk: 1}};
|
||||
let response = await app.models.Packaging.listPackaging(filter);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ describe('ticket listSaleTracking()', () => {
|
|||
let filter = {where: {ticketFk: 1}};
|
||||
let result = await app.models.SaleTracking.listSaleTracking(filter);
|
||||
|
||||
expect(result[0].concept).toEqual('Ranged weapon longbow 2m');
|
||||
expect(result.length).toEqual(4);
|
||||
});
|
||||
|
||||
it(`should call the listSaleTracking method and return zero if doesn't have lines`, async() => {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,16 @@ const app = require('vn-loopback/server/server');
|
|||
|
||||
describe('sale deleteSales()', () => {
|
||||
let sale;
|
||||
let newsale;
|
||||
let newSale;
|
||||
|
||||
beforeAll(async done => {
|
||||
try {
|
||||
sale = await app.models.Sale.findOne({where: {id: 9}});
|
||||
sale.id = null;
|
||||
newsale = await app.models.Sale.create(sale);
|
||||
newSale = await app.models.Sale.create(sale);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
|
@ -28,10 +32,10 @@ describe('sale deleteSales()', () => {
|
|||
expect(error).toEqual(new Error(`The sales of this ticket can't be modified`));
|
||||
});
|
||||
|
||||
it('should delete the sales', async() => {
|
||||
it('should delete the sale', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
|
||||
const sales = [{id: newsale.id, instance: 0}];
|
||||
const sales = [{id: newSale.id, instance: 0}];
|
||||
const ticketId = 16;
|
||||
|
||||
let res = await app.models.Sale.deleteSales(ctx, sales, ticketId);
|
||||
|
|
@ -16,14 +16,6 @@ describe('sale updatePrice()', () => {
|
|||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
await originalSale.save();
|
||||
await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
|
||||
await originalSalesPersonMana.save();
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw an error if the ticket is not editable', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
let immutableSaleId = 1;
|
||||
|
|
@ -43,36 +35,49 @@ describe('sale updatePrice()', () => {
|
|||
let price = '';
|
||||
|
||||
await app.models.Sale.updatePrice(ctx, saleId, price);
|
||||
let saleUpdated = await app.models.Sale.findById(saleId);
|
||||
let updatedSale = await app.models.Sale.findById(saleId);
|
||||
|
||||
expect(saleUpdated.price).toEqual(0);
|
||||
expect(updatedSale.price).toEqual(0);
|
||||
|
||||
// restores
|
||||
await originalSale.updateAttributes(originalSale);
|
||||
await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
|
||||
await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
|
||||
});
|
||||
|
||||
it('should now set price as a decimal number in a string', async() => {
|
||||
it('should now set price as a number in a string', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
let price = '8';
|
||||
|
||||
await app.models.Sale.updatePrice(ctx, saleId, price);
|
||||
let saleUpdated = await app.models.Sale.findById(saleId);
|
||||
let updatedSale = await app.models.Sale.findById(saleId);
|
||||
|
||||
expect(saleUpdated.price).toEqual(8);
|
||||
expect(updatedSale.price).toEqual(8);
|
||||
|
||||
// restores
|
||||
await originalSale.updateAttributes(originalSale);
|
||||
await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
|
||||
await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
|
||||
});
|
||||
|
||||
it('should set price as a decimal number and check the sale has the mana component', async() => {
|
||||
it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
let price = 5.4;
|
||||
|
||||
await app.models.Sale.updatePrice(ctx, saleId, price);
|
||||
let saleUpdated = await app.models.Sale.findById(saleId);
|
||||
let updatedSale = await app.models.Sale.findById(saleId);
|
||||
createdSaleComponent = await app.models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponentId}});
|
||||
|
||||
expect(saleUpdated.price).toBe(price);
|
||||
expect(updatedSale.price).toBe(price);
|
||||
expect(createdSaleComponent.value).toEqual(-2.04);
|
||||
});
|
||||
|
||||
it('should check that the mana of salesPerson changed', async() => {
|
||||
let updatedSalesPersonMana = await app.models.WorkerMana.findById(18);
|
||||
|
||||
expect(updatedSalesPersonMana.amount).not.toEqual(originalSalesPersonMana.amount);
|
||||
|
||||
// restores
|
||||
await originalSale.updateAttributes(originalSale);
|
||||
await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
|
||||
await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ describe('ticket editableStates()', () => {
|
|||
expect(deliveredState).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should returns the expected states by a specific role`, async() => {
|
||||
it(`should return the expected states by a specific role`, async() => {
|
||||
const productionRole = 18;
|
||||
const ctx = {req: {accessToken: {userId: productionRole}}};
|
||||
let result = await app.models.State.editableStates(ctx, filter);
|
||||
|
|
|
|||
|
|
@ -48,19 +48,15 @@ module.exports = Self => {
|
|||
include: {relation: 'ticket'}
|
||||
}, options);
|
||||
|
||||
const res = await models.Item.getVisibleAvailable(ctx.args.itemFk, request.ticket().warehouseFk, request.ticket().shipped);
|
||||
const itemStock = await models.Item.getVisibleAvailable(ctx.args.itemFk, request.ticket().warehouseFk, request.ticket().shipped);
|
||||
const isAvailable = itemStock.available > 0;
|
||||
|
||||
if (res.available < 0)
|
||||
if (!isAvailable)
|
||||
throw new UserError(`This item is not available`);
|
||||
|
||||
if (request.saleFk) {
|
||||
sale = await models.Sale.findById(request.saleFk, null, options);
|
||||
await sale.updateAttributes({
|
||||
itemFk: ctx.args.itemFk,
|
||||
quantity: ctx.args.quantity,
|
||||
concept: item.name,
|
||||
}, options);
|
||||
} else {
|
||||
if (request.saleFk)
|
||||
throw new UserError(`This request already contains a sale`);
|
||||
|
||||
sale = await models.Sale.create({
|
||||
ticketFk: request.ticketFk,
|
||||
itemFk: ctx.args.itemFk,
|
||||
|
|
@ -72,7 +68,6 @@ module.exports = Self => {
|
|||
itemFk: sale.itemFk,
|
||||
isOk: true
|
||||
}, options);
|
||||
}
|
||||
|
||||
query = `CALL vn.sale_calculateComponent(?, NULL)`;
|
||||
await Self.rawSql(query, [sale.id], options);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('ticket-request confirm()', () => {
|
||||
let originalRequest;
|
||||
let originalSale;
|
||||
let createdSaleId;
|
||||
// #2512 confirm.spec pollutes other tests
|
||||
xdescribe('ticket-request confirm()', () => {
|
||||
let ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 9},
|
||||
|
|
@ -14,13 +12,6 @@ describe('ticket-request confirm()', () => {
|
|||
return value;
|
||||
};
|
||||
|
||||
afterAll(async done => {
|
||||
await originalRequest.updateAttributes(originalRequest);
|
||||
await originalSale.updateAttributes(originalSale);
|
||||
await app.models.Sale.destroyById(createdSaleId);
|
||||
done();
|
||||
});
|
||||
|
||||
it(`should throw an error if the item doesn't exist`, async() => {
|
||||
ctx.args = {itemFk: 999};
|
||||
|
||||
|
|
@ -56,9 +47,8 @@ describe('ticket-request confirm()', () => {
|
|||
expect(error.message).toEqual(`This item is not available`);
|
||||
});
|
||||
|
||||
it(`should update the sale details if the request already contains a sale id`, async() => {
|
||||
it(`should throw if there's a sale id`, async() => {
|
||||
const requestId = 4;
|
||||
const saleId = 11;
|
||||
const itemId = 1;
|
||||
const quantity = 10;
|
||||
|
||||
|
|
@ -68,17 +58,30 @@ describe('ticket-request confirm()', () => {
|
|||
quantity: quantity
|
||||
};
|
||||
|
||||
originalRequest = await app.models.TicketRequest.findById(requestId);
|
||||
originalSale = await app.models.Sale.findById(saleId);
|
||||
|
||||
const request = await app.models.TicketRequest.findById(requestId);
|
||||
await request.updateAttributes({saleFk: saleId});
|
||||
|
||||
expect(request.saleFk).toBeNull();
|
||||
|
||||
await request.updateAttributes({saleFk: 2});
|
||||
|
||||
ctx.args = {
|
||||
itemFk: itemId,
|
||||
id: requestId,
|
||||
quantity: quantity
|
||||
};
|
||||
|
||||
let error;
|
||||
|
||||
try {
|
||||
await app.models.TicketRequest.confirm(ctx);
|
||||
} catch (err) {
|
||||
error = err;
|
||||
}
|
||||
|
||||
let updatedSale = await app.models.Sale.findById(saleId);
|
||||
expect(error.message).toEqual(`This request already contains a sale`);
|
||||
|
||||
expect(updatedSale.itemFk).toEqual(itemId);
|
||||
expect(updatedSale.quantity).toEqual(quantity);
|
||||
// restores
|
||||
await request.updateAttributes({saleFk: null});
|
||||
});
|
||||
|
||||
it(`should create a new sale for the the request if there's no sale id`, async() => {
|
||||
|
|
@ -86,6 +89,8 @@ describe('ticket-request confirm()', () => {
|
|||
const itemId = 1;
|
||||
const quantity = 10;
|
||||
|
||||
const originalRequest = await app.models.TicketRequest.findById(requestId);
|
||||
|
||||
ctx.args = {
|
||||
itemFk: itemId,
|
||||
id: requestId,
|
||||
|
|
@ -96,11 +101,19 @@ describe('ticket-request confirm()', () => {
|
|||
await request.updateAttributes({saleFk: null});
|
||||
await app.models.TicketRequest.confirm(ctx);
|
||||
|
||||
let updatedRequest = await app.models.TicketRequest.findById(requestId);
|
||||
createdSaleId = updatedRequest.saleFk;
|
||||
const updatedRequest = await app.models.TicketRequest.findById(requestId);
|
||||
const createdSaleId = updatedRequest.saleFk;
|
||||
|
||||
expect(updatedRequest.saleFk).toEqual(createdSaleId);
|
||||
expect(updatedRequest.isOk).toEqual(true);
|
||||
expect(updatedRequest.itemFk).toEqual(itemId);
|
||||
|
||||
// restores
|
||||
await originalRequest.updateAttributes(originalRequest);
|
||||
await app.models.Sale.destroyById(createdSaleId);
|
||||
|
||||
await app.models.Item.rawSql(`
|
||||
TRUNCATE TABLE cache.last_buy
|
||||
`);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,24 +1,58 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('ticket changeState()', () => {
|
||||
const salesPersonId = 18;
|
||||
const employeeId = 1;
|
||||
const productionId = 49;
|
||||
let activeCtx = {
|
||||
accessToken: {userId: 9},
|
||||
};
|
||||
let ctx = {req: activeCtx};
|
||||
let ticket;
|
||||
|
||||
beforeAll(async done => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
beforeEach(async done => {
|
||||
try {
|
||||
let originalTicket = await app.models.Ticket.findOne({where: {id: 16}});
|
||||
originalTicket.id = null;
|
||||
ticket = await app.models.Ticket.create(originalTicket);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterEach(async done => {
|
||||
try {
|
||||
await app.models.Ticket.destroyById(ticket.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
await app.models.Ticket.destroyById(ticket.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw if the ticket is not editable and the user isnt production', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
activeCtx.accessToken.userId = salesPersonId;
|
||||
let params = {ticketFk: 2, stateFk: 3};
|
||||
|
||||
let errCode;
|
||||
|
|
@ -32,7 +66,7 @@ describe('ticket changeState()', () => {
|
|||
});
|
||||
|
||||
it('should throw an error if a worker with employee role attemps to a forbidden state', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 1}}};
|
||||
activeCtx.accessToken.userId = employeeId;
|
||||
let params = {ticketFk: 11, stateFk: 13};
|
||||
|
||||
let errCode;
|
||||
|
|
@ -46,29 +80,21 @@ describe('ticket changeState()', () => {
|
|||
});
|
||||
|
||||
it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 49}}};
|
||||
activeCtx.accessToken.userId = productionId;
|
||||
let params = {ticketFk: ticket.id, stateFk: 3};
|
||||
|
||||
let res = await app.models.TicketTracking.changeState(ctx, params);
|
||||
let ticketTracking = await app.models.TicketTracking.changeState(ctx, params);
|
||||
|
||||
expect(res.__data.ticketFk).toBe(params.ticketFk);
|
||||
expect(res.__data.stateFk).toBe(params.stateFk);
|
||||
expect(res.__data.workerFk).toBe(49);
|
||||
expect(res.__data.id).toBeDefined();
|
||||
expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk);
|
||||
expect(ticketTracking.__data.stateFk).toBe(params.stateFk);
|
||||
expect(ticketTracking.__data.workerFk).toBe(49);
|
||||
expect(ticketTracking.__data.id).toBeDefined();
|
||||
|
||||
// restores
|
||||
await app.models.TicketTracking.destroyById(ticketTracking.__data.id);
|
||||
});
|
||||
|
||||
it('should return an array with the created ticket tracking line', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 49}}};
|
||||
let params = {ticketFk: ticket.id, stateFk: 3};
|
||||
let res = await app.models.TicketTracking.changeState(ctx, params);
|
||||
|
||||
expect(res.__data.ticketFk).toBe(params.ticketFk);
|
||||
expect(res.__data.stateFk).toBe(params.stateFk);
|
||||
expect(res.__data.workerFk).toBe(49);
|
||||
expect(res.__data.id).toBeDefined();
|
||||
});
|
||||
|
||||
it('should return an array with the created ticket tracking line when the user is salesperson, uses the state assigned and thes a workerFk given', async() => {
|
||||
it('should update the ticket tracking line when the user is salesperson, uses the state assigned and a valid worker id', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
let assignedState = await app.models.State.findOne({where: {code: 'PICKER_DESIGNED'}});
|
||||
let params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
|
||||
|
|
|
|||
|
|
@ -1,24 +1,42 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('ticket setDelivered()', () => {
|
||||
const userId = 50;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
|
||||
let ticketOne;
|
||||
let ticketTwo;
|
||||
|
||||
beforeAll(async done => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
try {
|
||||
let originalTicketOne = await app.models.Ticket.findById(8);
|
||||
let originalTicketTwo = await app.models.Ticket.findById(10);
|
||||
|
||||
originalTicketOne.id = null;
|
||||
originalTicketTwo.id = null;
|
||||
|
||||
ticketOne = await app.models.Ticket.create(originalTicketOne);
|
||||
ticketTwo = await app.models.Ticket.create(originalTicketTwo);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
await app.models.Ticket.destroyById(ticketOne.id);
|
||||
await app.models.Ticket.destroyById(ticketTwo.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
|
@ -31,6 +49,8 @@ describe('ticket setDelivered()', () => {
|
|||
let state = await app.models.TicketTracking.setDelivered(ctx, params);
|
||||
|
||||
expect(state.id).toEqual(delivered.id);
|
||||
});
|
||||
});
|
||||
|
||||
// restores
|
||||
await app.models.TicketTracking.destroyById(state.id);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ module.exports = Self => {
|
|||
companyFk, shipped, landed, isDeleted, option) => {
|
||||
const userId = ctx.req.accessToken.userId;
|
||||
const models = Self.app.models;
|
||||
const $t = ctx.req.__; // $translate
|
||||
const isEditable = await models.Ticket.isEditable(ctx, id);
|
||||
|
||||
if (!isEditable)
|
||||
|
|
@ -88,29 +89,26 @@ module.exports = Self => {
|
|||
if (!zoneShipped || zoneShipped.zoneFk != zoneFk)
|
||||
throw new UserError(`You don't have privileges to change the zone`);
|
||||
}
|
||||
const originalTicket = await models.Ticket.findById(id, {fields:
|
||||
['id', 'clientFk', 'agencyModeFk', 'addressFk', 'zoneFk',
|
||||
const originalTicket = await models.Ticket.findById(id, {
|
||||
include: {
|
||||
relation: 'client',
|
||||
scope: {
|
||||
fields: 'salesPersonFk'
|
||||
}
|
||||
},
|
||||
fields: ['id', 'clientFk', 'agencyModeFk', 'addressFk', 'zoneFk',
|
||||
'warehouseFk', 'companyFk', 'shipped', 'landed', 'isDeleted']
|
||||
});
|
||||
const updatedTicket = Object.assign({}, ctx.args);
|
||||
delete updatedTicket.ctx;
|
||||
delete updatedTicket.option;
|
||||
|
||||
// Force unroute
|
||||
const hasToBeUnrouted = true;
|
||||
const propertiesChange = diff(originalTicket, updatedTicket);
|
||||
const changedProperties = diff(originalTicket, updatedTicket);
|
||||
|
||||
let logRecord = {
|
||||
originFk: id,
|
||||
userFk: userId,
|
||||
action: 'update',
|
||||
changedModel: 'Ticket',
|
||||
changedModelId: id,
|
||||
oldInstance: originalTicket,
|
||||
newInstance: propertiesChange
|
||||
};
|
||||
|
||||
let query = 'CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
|
||||
let res = await Self.rawSql(query, [
|
||||
const query = 'CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
|
||||
const res = await Self.rawSql(query, [
|
||||
id,
|
||||
clientFk,
|
||||
agencyModeFk,
|
||||
|
|
@ -125,7 +123,45 @@ module.exports = Self => {
|
|||
option
|
||||
]);
|
||||
|
||||
await models.TicketLog.create(logRecord);
|
||||
await models.TicketLog.create({
|
||||
originFk: id,
|
||||
userFk: userId,
|
||||
action: 'update',
|
||||
changedModel: 'Ticket',
|
||||
changedModelId: id,
|
||||
oldInstance: originalTicket,
|
||||
newInstance: changedProperties
|
||||
});
|
||||
|
||||
const salesPersonId = originalTicket.client().salesPersonFk;
|
||||
if (salesPersonId) {
|
||||
const origin = ctx.req.headers.origin;
|
||||
|
||||
let changesMade = '';
|
||||
for (let change in changedProperties) {
|
||||
let value = changedProperties[change];
|
||||
if (value instanceof Date) {
|
||||
value = new Intl.DateTimeFormat('es', {
|
||||
year: '2-digit',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit'
|
||||
}).format(value);
|
||||
}
|
||||
|
||||
changesMade += `${change}: ${value}\r\n`;
|
||||
}
|
||||
|
||||
const message = $t('Changed this data from the ticket', {
|
||||
ticketId: id,
|
||||
ticketUrl: `${origin}/#!/ticket/${id}/summary`,
|
||||
changes: changesMade
|
||||
});
|
||||
await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
|
||||
}
|
||||
|
||||
return res;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -87,15 +87,14 @@ module.exports = Self => {
|
|||
const map = new Map();
|
||||
|
||||
// Sale price component, one per sale
|
||||
difComponents.forEach(difComponent => {
|
||||
for (difComponent of difComponents)
|
||||
map.set(difComponent.saleFk, difComponent);
|
||||
});
|
||||
|
||||
function round(value) {
|
||||
return Math.round(value * 100) / 100;
|
||||
}
|
||||
|
||||
salesObj.items.forEach(sale => {
|
||||
for (sale of salesObj.items) {
|
||||
const difComponent = map.get(sale.id);
|
||||
|
||||
if (difComponent) {
|
||||
|
|
@ -110,7 +109,7 @@ module.exports = Self => {
|
|||
|
||||
salesObj.totalUnitPrice += sale.price;
|
||||
salesObj.totalUnitPrice = round(salesObj.totalUnitPrice);
|
||||
});
|
||||
}
|
||||
|
||||
return salesObj;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('ticket componentUpdate()', () => {
|
||||
const ticketId = 11;
|
||||
const userID = 101;
|
||||
const ticketID = 11;
|
||||
const today = new Date();
|
||||
const tomorrow = new Date();
|
||||
tomorrow.setDate(tomorrow.getDate() + 1);
|
||||
|
|
@ -13,6 +14,7 @@ describe('ticket componentUpdate()', () => {
|
|||
let componentOfSaleEight;
|
||||
|
||||
beforeAll(async done => {
|
||||
try {
|
||||
let deliveryComponenet = await app.models.Component.findOne({where: {code: 'delivery'}});
|
||||
deliveryComponentId = deliveryComponenet.id;
|
||||
componentOfSaleSeven = `SELECT value FROM vn.saleComponent WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
|
||||
|
|
@ -23,29 +25,39 @@ describe('ticket componentUpdate()', () => {
|
|||
|
||||
[componentValue] = await app.models.SaleComponent.rawSql(componentOfSaleEight);
|
||||
secondvalueBeforeChange = componentValue.value;
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should change the agencyMode to modify the sale components value', async() => {
|
||||
const clientId = 102;
|
||||
const addressId = 122;
|
||||
const agencyModeId = 8;
|
||||
const warehouseId = 1;
|
||||
const zoneId = 5;
|
||||
it('should change the agencyMode to modify the sale components value and then undo the changes', async() => {
|
||||
const clientID = 102;
|
||||
const addressID = 122;
|
||||
const agencyModeID = 8;
|
||||
const warehouseID = 1;
|
||||
const zoneID = 5;
|
||||
const shipped = today;
|
||||
const companyId = 442;
|
||||
const companyID = 442;
|
||||
const isDeleted = false;
|
||||
const landed = tomorrow;
|
||||
const option = 1;
|
||||
|
||||
let ctx = {
|
||||
args: {clientFk: 102,
|
||||
agencyModeFk: 8},
|
||||
req: {accessToken: {userId: 101}}};
|
||||
args: {clientFk: clientID,
|
||||
agencyModeFk: agencyModeID},
|
||||
req: {
|
||||
accessToken: {userId: userID},
|
||||
headers: {origin: 'http://localhost'},
|
||||
__: (value, params) => {
|
||||
return params.nickname;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
await app.models.Ticket.componentUpdate(ctx, ticketId, clientId, agencyModeId, addressId,
|
||||
zoneId, warehouseId, companyId, shipped, landed, isDeleted, option);
|
||||
await app.models.Ticket.componentUpdate(ctx, ticketID, clientID, agencyModeID, addressID,
|
||||
zoneID, warehouseID, companyID, shipped, landed, isDeleted, option);
|
||||
|
||||
[componentValue] = await app.models.SaleComponent.rawSql(componentOfSaleSeven);
|
||||
let firstvalueAfterChange = componentValue.value;
|
||||
|
|
@ -55,33 +67,32 @@ describe('ticket componentUpdate()', () => {
|
|||
|
||||
expect(firstvalueBeforeChange).not.toEqual(firstvalueAfterChange);
|
||||
expect(secondvalueBeforeChange).not.toEqual(secondvalueAfterChange);
|
||||
});
|
||||
|
||||
it('should change the agencyMode to go back to the originals sale components value', async() => {
|
||||
const clientId = 102;
|
||||
const addressId = 122;
|
||||
const agencyModeId = 7;
|
||||
const warehouseId = 1;
|
||||
const zoneId = 3;
|
||||
const shipped = today;
|
||||
const companyId = 442;
|
||||
const isDeleted = false;
|
||||
const landed = tomorrow;
|
||||
const option = 1;
|
||||
// restores
|
||||
const restores = {
|
||||
clientID: 102,
|
||||
addressID: 122,
|
||||
agencyModeID: 7,
|
||||
warehouseID: 1,
|
||||
zoneID: 3,
|
||||
shipped: today,
|
||||
companyID: 442,
|
||||
isDeleted: false,
|
||||
landed: tomorrow,
|
||||
option: 1,
|
||||
};
|
||||
|
||||
let ctx = {
|
||||
args: {clientFk: 102,
|
||||
agencyModeFk: 7},
|
||||
req: {accessToken: {userId: 101}}};
|
||||
ctx.clientFk = restores.clientID;
|
||||
ctx.agencyModeFk = restores.agencyModeID;
|
||||
|
||||
await app.models.Ticket.componentUpdate(ctx, ticketId, clientId, agencyModeId, addressId,
|
||||
zoneId, warehouseId, companyId, shipped, landed, isDeleted, option);
|
||||
await app.models.Ticket.componentUpdate(ctx, ticketID, restores.clientID, restores.agencyModeID, restores.addressID,
|
||||
restores.zoneID, restores.warehouseID, restores.companyID, restores.shipped, restores.landed, restores.isDeleted, restores.option);
|
||||
|
||||
[componentValue] = await app.models.SaleComponent.rawSql(componentOfSaleSeven);
|
||||
let firstvalueAfterChange = componentValue.value;
|
||||
firstvalueAfterChange = componentValue.value;
|
||||
|
||||
[componentValue] = await app.models.SaleComponent.rawSql(componentOfSaleEight);
|
||||
let secondvalueAfterChange = componentValue.value;
|
||||
secondvalueAfterChange = componentValue.value;
|
||||
|
||||
expect(firstvalueBeforeChange).toEqual(firstvalueAfterChange);
|
||||
expect(secondvalueBeforeChange).toEqual(secondvalueAfterChange);
|
||||
|
|
|
|||
|
|
@ -13,90 +13,52 @@ describe('ticket deleteStowaway()', () => {
|
|||
return params.nickname;
|
||||
};
|
||||
|
||||
afterAll(async() => {
|
||||
await app.models.Stowaway.rawSql(
|
||||
`CALL ticketStateUpdate(?, ?)`, [shipId, 'OK']);
|
||||
await app.models.Stowaway.rawSql(
|
||||
`CALL ticketStateUpdate(?, ?)`, [stowawayId, 'FREE']);
|
||||
});
|
||||
|
||||
it('should create an stowaway', async() => {
|
||||
it(`should create an stowaway, delete it and see the states of both stowaway and ship go back to the last states`, async() => {
|
||||
await app.models.Stowaway.rawSql(`
|
||||
INSERT INTO stowaway (id, shipFk) VALUES (?, ?)
|
||||
`, [stowawayId, shipId]);
|
||||
await app.models.Stowaway.rawSql(
|
||||
`CALL ticketStateUpdate(?, ?)`, [shipId, 'BOARDING']);
|
||||
await app.models.Stowaway.rawSql(
|
||||
`CALL ticketStateUpdate(?, ?)`, [stowawayId, 'BOARDING']);
|
||||
|
||||
const stowawayExists = await app.models.Stowaway.count({id: stowawayId, shipFk: shipId});
|
||||
let createdStowaways = await app.models.Stowaway.count({id: stowawayId, shipFk: shipId});
|
||||
|
||||
expect(stowawayExists).toEqual(1);
|
||||
});
|
||||
expect(createdStowaways).toEqual(1);
|
||||
|
||||
it('should confirm that the ship ticket is on "BOARDING" state', async() => {
|
||||
const shipState = await app.models.TicketLastState.findOne({
|
||||
let shipState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: shipId
|
||||
}
|
||||
});
|
||||
let stowawayState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: stowawayId
|
||||
}
|
||||
});
|
||||
|
||||
expect(shipState.name).toEqual('Embarcando');
|
||||
});
|
||||
expect(stowawayState.name).toEqual('Embarcando');
|
||||
|
||||
it('should delete the stowaway from the ship ticket', async() => {
|
||||
await app.models.Ticket.deleteStowaway(ctx, shipId);
|
||||
await app.models.Ticket.deleteStowaway(ctx, stowawayId);
|
||||
|
||||
const stowawayExists = await app.models.Stowaway.count({id: stowawayId, shipFk: shipId});
|
||||
createdStowaways = await app.models.Stowaway.count({id: stowawayId, shipFk: shipId});
|
||||
|
||||
expect(stowawayExists).toEqual(0);
|
||||
});
|
||||
expect(createdStowaways).toEqual(0);
|
||||
|
||||
it('should confirm that the ship ticket is not on "BOARDING" state anymore', async() => {
|
||||
const shipState = await app.models.TicketLastState.findOne({
|
||||
shipState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: shipId
|
||||
}
|
||||
});
|
||||
stowawayState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: stowawayId
|
||||
}
|
||||
});
|
||||
|
||||
expect(shipState.name).toEqual('OK');
|
||||
});
|
||||
|
||||
it('should create again an stowaway', async() => {
|
||||
await app.models.Stowaway.rawSql(`
|
||||
INSERT INTO stowaway (id, shipFk) VALUES (?, ?)
|
||||
`, [shipId, stowawayId]);
|
||||
await app.models.Stowaway.rawSql(
|
||||
`CALL ticketStateUpdate(?, ?)`, [stowawayId, 'BOARDING']);
|
||||
|
||||
const stowawayExists = await app.models.Stowaway.count({id: shipId, shipFk: stowawayId});
|
||||
|
||||
expect(stowawayExists).toEqual(1);
|
||||
});
|
||||
|
||||
it('should confirm that the stowaway ticket is on "BOARDING" state', async() => {
|
||||
const shipState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: stowawayId
|
||||
}
|
||||
});
|
||||
|
||||
expect(shipState.name).toEqual('Embarcando');
|
||||
});
|
||||
|
||||
it('should delete the stowaway from the stowaway ticket', async() => {
|
||||
await app.models.Ticket.deleteStowaway(ctx, stowawayId);
|
||||
|
||||
const stowawayExists = await app.models.Stowaway.count({id: shipId, shipFk: stowawayId});
|
||||
|
||||
expect(stowawayExists).toEqual(0);
|
||||
});
|
||||
|
||||
it('should confirm that the stowaway ticket is not on "BOARDING" state anymore', async() => {
|
||||
const shipState = await app.models.TicketLastState.findOne({
|
||||
where: {
|
||||
ticketFk: stowawayId
|
||||
}
|
||||
});
|
||||
|
||||
expect(shipState.name).toEqual('Libre');
|
||||
expect(stowawayState.name).toEqual('Libre');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@ describe('ticket filter()', () => {
|
|||
const ctx = {req: {accessToken: {userId: 9}}, args: {}};
|
||||
const filter = {order: 'id DESC'};
|
||||
const result = await app.models.Ticket.filter(ctx, filter);
|
||||
const ticketId = result[0].id;
|
||||
|
||||
expect(ticketId).toEqual(24);
|
||||
expect(result.length).toEqual(24);
|
||||
});
|
||||
|
||||
it('should return the tickets matching the problems on true', async() => {
|
||||
|
|
@ -71,7 +70,7 @@ describe('ticket filter()', () => {
|
|||
const length = result.length;
|
||||
const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
|
||||
|
||||
expect(result.length).toEqual(7);
|
||||
expect(length).toEqual(7);
|
||||
expect(anyResult.state).toMatch(/(Libre|Arreglar)/);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,25 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('ticket makeInvoice()', () => {
|
||||
const userId = 19;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
let invoice;
|
||||
let ticketId = 11;
|
||||
const okState = 3;
|
||||
|
||||
beforeAll(async done => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
let ticket = await app.models.Ticket.findById(11);
|
||||
await ticket.updateAttributes({refFk: null});
|
||||
|
||||
|
|
@ -22,20 +36,18 @@ describe('ticket makeInvoice()', () => {
|
|||
|
||||
let invoiceOut = await app.models.InvoiceOut.findById(invoice.invoiceFk);
|
||||
await invoiceOut.destroy();
|
||||
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
done();
|
||||
});
|
||||
|
||||
it('should invoice a ticket', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
it('should invoice a ticket, then try again to fail', async() => {
|
||||
invoice = await app.models.Ticket.makeInvoice(ctx, ticketId);
|
||||
|
||||
expect(invoice.invoiceFk).toBeDefined();
|
||||
expect(invoice.serial).toEqual('T');
|
||||
});
|
||||
|
||||
it('should not invoice an already invoiced ticket', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
let error;
|
||||
|
||||
await app.models.Ticket.makeInvoice(ctx, ticketId).catch(e => {
|
||||
|
|
@ -43,5 +55,7 @@ describe('ticket makeInvoice()', () => {
|
|||
}).finally(() => {
|
||||
expect(error.message).toEqual(`This ticket can't be invoiced`);
|
||||
});
|
||||
|
||||
expect(error).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,20 +1,24 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
const models = app.models;
|
||||
|
||||
describe('ticket restore()', () => {
|
||||
const employeeUser = 110;
|
||||
const ctx = {
|
||||
req: {
|
||||
const activeCtx = {
|
||||
accessToken: {userId: employeeUser},
|
||||
headers: {
|
||||
origin: 'http://localhost:5000'
|
||||
},
|
||||
__: () => {}
|
||||
}
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
let createdTicket;
|
||||
|
||||
beforeEach(async done => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
try {
|
||||
const sampleTicket = await models.Ticket.findById(11);
|
||||
sampleTicket.id = undefined;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
const models = app.models;
|
||||
|
||||
describe('ticket setDeleted()', () => {
|
||||
it('should throw an error if the given ticket has a claim', async() => {
|
||||
const ticketId = 16;
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 106},
|
||||
headers: {
|
||||
origin: 'http://localhost:5000'
|
||||
},
|
||||
__: () => {}
|
||||
}
|
||||
const userId = 106;
|
||||
const employeeUser = 110;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
|
||||
it('should throw an error if the given ticket has a claim', async() => {
|
||||
const ctx = {req: activeCtx};
|
||||
const ticketId = 16;
|
||||
let error;
|
||||
|
||||
try {
|
||||
|
|
@ -26,7 +25,9 @@ describe('ticket setDeleted()', () => {
|
|||
});
|
||||
|
||||
it('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => {
|
||||
const employeeUser = 110;
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: employeeUser},
|
||||
|
|
@ -96,7 +97,8 @@ describe('ticket setDeleted()', () => {
|
|||
expect(stowaway).toBeNull();
|
||||
expect(stowawayTicketState.code).toEqual('FIXING');
|
||||
|
||||
await shipTicket.destroy();
|
||||
await stowawayTicket.destroy();
|
||||
// restores
|
||||
await models.Ticket.destroyById(shipTicket.id);
|
||||
await models.Ticket.destroyById(stowawayTicket.id);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('sale transferSales()', () => {
|
||||
let createdTicketId;
|
||||
const userId = 101;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
let createdTicketsIds = [];
|
||||
|
||||
afterAll(async done => {
|
||||
beforeAll(() => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(async done => {
|
||||
if (createdTicketsIds.length) {
|
||||
try {
|
||||
createdTicketsIds.forEach(async createdTicketId => {
|
||||
await app.models.Ticket.destroyById(createdTicketId);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should throw an error as the ticket is not editable', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
let error;
|
||||
|
||||
const currentTicketId = 1;
|
||||
|
|
@ -29,7 +47,6 @@ describe('sale transferSales()', () => {
|
|||
});
|
||||
|
||||
it('should throw an error if the receiving ticket is not editable', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
let error;
|
||||
|
||||
const currentTicketId = 16;
|
||||
|
|
@ -45,60 +62,41 @@ describe('sale transferSales()', () => {
|
|||
expect(error).toBeDefined();
|
||||
});
|
||||
|
||||
it('should transfer the sales from one ticket to a new one', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
let currentTicket = await app.models.Ticket.findById(11);
|
||||
let originalTicketSales = await app.models.Ticket.getSales(currentTicket.id);
|
||||
salesToRestone = originalTicketSales;
|
||||
it('should transfer the sales from one ticket to a new one then send them back and delete the created ticket', async() => {
|
||||
const formerTicketId = 11;
|
||||
let createdTicketId = undefined;
|
||||
|
||||
expect(originalTicketSales.length).toEqual(2);
|
||||
let formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
|
||||
const currentTicketId = currentTicket.id;
|
||||
const receiverTicketId = undefined;
|
||||
expect(formerTicketSales.length).toEqual(2);
|
||||
|
||||
let createdTicket = await app.models.Ticket.transferSales(
|
||||
ctx, currentTicketId, receiverTicketId, originalTicketSales);
|
||||
ctx, formerTicketId, createdTicketId, formerTicketSales);
|
||||
|
||||
createdTicketId = createdTicket.id;
|
||||
createdTicketsIds.push(createdTicket.id);
|
||||
createdTicketsIds.push(createdTicketId);
|
||||
|
||||
originalTicketSales = await app.models.Ticket.getSales(currentTicket.id);
|
||||
receiverTicketSales = await app.models.Ticket.getSales(createdTicket.id);
|
||||
formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
|
||||
expect(originalTicketSales.length).toEqual(0);
|
||||
expect(receiverTicketSales.length).toEqual(2);
|
||||
});
|
||||
|
||||
it('should transfer back the sales and set the created ticket as deleted', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
const currentTicket = await app.models.Ticket.findById(createdTicketId);
|
||||
const receiverTicketId = 11;
|
||||
|
||||
let createdTicket = await app.models.Ticket.findById(createdTicketId);
|
||||
let createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
let receiverTicketSales = await app.models.Ticket.getSales(receiverTicketId);
|
||||
|
||||
const currentTicketId = currentTicket.id;
|
||||
const sales = createdTicketSales;
|
||||
|
||||
expect(createdTicket.isDeleted).toBeFalsy();
|
||||
expect(formerTicketSales.length).toEqual(0);
|
||||
expect(createdTicketSales.length).toEqual(2);
|
||||
expect(receiverTicketSales.length).toEqual(0);
|
||||
|
||||
await app.models.Ticket.transferSales(
|
||||
ctx, currentTicketId, receiverTicketId, sales);
|
||||
ctx, createdTicketId, formerTicketId, createdTicketSales);
|
||||
|
||||
formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
|
||||
createdTicket = await app.models.Ticket.findById(createdTicketId);
|
||||
createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
receiverTicketSales = await app.models.Ticket.getSales(receiverTicketId);
|
||||
|
||||
expect(createdTicket.isDeleted).toBeTruthy();
|
||||
expect(formerTicketSales.length).toEqual(2);
|
||||
expect(createdTicketSales.length).toEqual(0);
|
||||
expect(receiverTicketSales.length).toEqual(2);
|
||||
});
|
||||
|
||||
describe('sale transferPartialSales()', () => {
|
||||
it('should throw an error in the quantity to transfer exceeds the amount from the original sale', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
let error;
|
||||
let currentTicket = await app.models.Ticket.findById(11);
|
||||
let currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
|
||||
|
|
@ -119,44 +117,51 @@ describe('sale transferSales()', () => {
|
|||
});
|
||||
|
||||
it('should transfer two sales to a new ticket but one shall be partial', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 101}}};
|
||||
const originalTicketId = 11;
|
||||
const receiverTicketId = undefined;
|
||||
const formerTicketId = 11;
|
||||
let createdTicketId = undefined;
|
||||
|
||||
let currentTicketSales = await app.models.Ticket.getSales(originalTicketId);
|
||||
let formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
|
||||
const originalPartialSaleId = currentTicketSales[0].id;
|
||||
const originalCompleteSaleId = currentTicketSales[1].id;
|
||||
let originalQuantity = currentTicketSales[0].quantity;
|
||||
currentTicketSales[0].quantity = 1;
|
||||
const partialSaleId = formerTicketSales[0].id;
|
||||
const completeSaleId = formerTicketSales[1].id;
|
||||
let partialSaleTotalQuantity = formerTicketSales[0].quantity;
|
||||
|
||||
expect(partialSaleTotalQuantity).toEqual(15);
|
||||
|
||||
formerTicketSales[0].quantity = 1;
|
||||
|
||||
let createdTicket = await app.models.Ticket.transferSales(
|
||||
ctx, originalTicketId, receiverTicketId, currentTicketSales);
|
||||
ctx, formerTicketId, createdTicketId, formerTicketSales);
|
||||
|
||||
createdTicketId = createdTicket.id;
|
||||
createdTicketsIds.push(createdTicket.id);
|
||||
|
||||
currentTicketSales = await app.models.Ticket.getSales(originalTicketId);
|
||||
receiverTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
|
||||
|
||||
const [createdPartialSale] = receiverTicketSales.filter(sale => {
|
||||
return sale.id != originalCompleteSaleId;
|
||||
const [createdPartialSale] = createdTicketSales.filter(sale => {
|
||||
return sale.id != completeSaleId;
|
||||
});
|
||||
|
||||
expect(currentTicketSales.length).toEqual(1);
|
||||
expect(currentTicketSales[0].quantity).toEqual(originalQuantity -= 1);
|
||||
expect(receiverTicketSales.length).toEqual(2);
|
||||
expect(formerTicketSales.length).toEqual(1);
|
||||
expect(formerTicketSales[0].quantity).toEqual(partialSaleTotalQuantity - 1);
|
||||
expect(createdTicketSales.length).toEqual(2);
|
||||
expect(createdPartialSale.quantity).toEqual(1);
|
||||
|
||||
let saleToRestore = await app.models.Sale.findById(originalPartialSaleId);
|
||||
await saleToRestore.updateAttribute('quantity', originalQuantity);
|
||||
let saleToRestore = await app.models.Sale.findById(partialSaleId);
|
||||
await saleToRestore.updateAttribute('quantity', partialSaleTotalQuantity);
|
||||
|
||||
let saleToReturnToTicket = await app.models.Sale.findById(originalCompleteSaleId);
|
||||
await saleToReturnToTicket.updateAttribute('ticketFk', originalTicketId);
|
||||
let saleToReturnToTicket = await app.models.Sale.findById(completeSaleId);
|
||||
await saleToReturnToTicket.updateAttribute('ticketFk', formerTicketId);
|
||||
|
||||
currentTicketSales = await app.models.Ticket.getSales(originalTicketId);
|
||||
formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
|
||||
|
||||
expect(currentTicketSales.length).toEqual(2);
|
||||
const [returningPartialSale] = formerTicketSales.filter(sale => {
|
||||
return sale.id == partialSaleId;
|
||||
});
|
||||
|
||||
expect(returningPartialSale.quantity).toEqual(partialSaleTotalQuantity);
|
||||
expect(formerTicketSales.length).toEqual(2);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ describe('sale updateDiscount()', () => {
|
|||
let salesPersonMana;
|
||||
|
||||
beforeAll(async done => {
|
||||
try {
|
||||
originalSale = await app.models.Sale.findById(originalSaleId);
|
||||
let manaDiscount = await app.models.Component.findOne({where: {code: 'buyerDiscount'}});
|
||||
componentId = manaDiscount.id;
|
||||
|
|
@ -14,14 +15,21 @@ describe('sale updateDiscount()', () => {
|
|||
let ticket = await app.models.Ticket.findById(originalSale.ticketFk);
|
||||
let client = await app.models.Client.findById(ticket.clientFk);
|
||||
salesPersonMana = await app.models.WorkerMana.findById(client.salesPersonFk);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
await originalSale.save();
|
||||
await app.models.SaleComponent.updateAll({componentFk: componentId, saleFk: originalSaleId}, {value: 0});
|
||||
await salesPersonMana.save();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
const userId = 9;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
describe('ticket updateEditableTicket()', () => {
|
||||
const validTicketId = 12;
|
||||
|
|
@ -7,7 +14,6 @@ describe('ticket updateEditableTicket()', () => {
|
|||
const originalData = {addressFk: 123};
|
||||
|
||||
afterAll(async done => {
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
await app.models.Ticket.updateEditableTicket(ctx, validTicketId, originalData);
|
||||
|
||||
done();
|
||||
|
|
@ -15,7 +21,6 @@ describe('ticket updateEditableTicket()', () => {
|
|||
|
||||
it('should now throw an error if the ticket is not editable', async() => {
|
||||
let error;
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
|
||||
await app.models.Ticket.updateEditableTicket(ctx, invalidTicketId, data).catch(e => {
|
||||
error = e;
|
||||
|
|
@ -27,8 +32,9 @@ describe('ticket updateEditableTicket()', () => {
|
|||
});
|
||||
|
||||
it('should edit the ticket address', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 9}}};
|
||||
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
await app.models.Ticket.updateEditableTicket(ctx, validTicketId, data);
|
||||
|
||||
let updatedTicket = await app.models.Ticket.findById(validTicketId);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
module.exports = Self => {
|
||||
require('../methods/ticket/changeWorker')(Self);
|
||||
require('../methods/ticket/getVolume')(Self);
|
||||
|
|
@ -35,13 +37,16 @@ module.exports = Self => {
|
|||
require('../methods/ticket/getComponentsSum')(Self);
|
||||
|
||||
Self.observe('before save', async function(ctx) {
|
||||
const loopBackContext = LoopBackContext.getCurrentContext();
|
||||
const httpCtx = loopBackContext.active;
|
||||
|
||||
if (ctx.isNewInstance) return;
|
||||
|
||||
let changes = ctx.data || ctx.instance;
|
||||
|
||||
if (changes.routeFk === null && ctx.currentInstance.routeFk != null) {
|
||||
let instance = JSON.parse(JSON.stringify(ctx.currentInstance));
|
||||
let userId = ctx.options.accessToken.userId;
|
||||
let userId = httpCtx.accessToken.userId;
|
||||
let logRecord = {
|
||||
originFk: ctx.currentInstance.routeFk,
|
||||
userFk: userId,
|
||||
|
|
|
|||
|
|
@ -56,8 +56,16 @@ class Controller extends Component {
|
|||
set warehouseId(value) {
|
||||
if (value != this.ticket.warehouseFk) {
|
||||
this.ticket.warehouseFk = value;
|
||||
|
||||
this.getShipped({
|
||||
landed: this.ticket.landed,
|
||||
addressFk: this.ticket.addressFk,
|
||||
agencyModeFk: this.ticket.agencyModeFk,
|
||||
warehouseFk: value
|
||||
}).then(() => {
|
||||
if (this.zoneId == null)
|
||||
this.ticket.agencyModeFk = null;
|
||||
this.ticket.zoneFk = null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -177,8 +185,8 @@ class Controller extends Component {
|
|||
);
|
||||
}
|
||||
|
||||
let query = `tickets/${this.ticket.id}/priceDifference`;
|
||||
let params = {
|
||||
const query = `tickets/${this.ticket.id}/priceDifference`;
|
||||
const params = {
|
||||
landed: this.ticket.landed,
|
||||
addressId: this.ticket.addressFk,
|
||||
agencyModeId: this.ticket.agencyModeFk,
|
||||
|
|
@ -202,9 +210,13 @@ class Controller extends Component {
|
|||
* Returns a landing date
|
||||
*/
|
||||
getLanded(params) {
|
||||
const validParams = this.shipped && this.addressId
|
||||
&& this.agencyModeId && this.warehouseId;
|
||||
if (!validParams) return this.$q.resolve();
|
||||
|
||||
this.ticket.zoneFk = null;
|
||||
const query = `Agencies/getLanded`;
|
||||
this.$http.get(query, {params}).then(res => {
|
||||
return this.$http.get(query, {params}).then(res => {
|
||||
if (res.data) {
|
||||
this.ticket.zoneFk = res.data.zoneFk;
|
||||
this.ticket.landed = res.data.landed;
|
||||
|
|
@ -221,9 +233,13 @@ class Controller extends Component {
|
|||
* Returns a shipment date
|
||||
*/
|
||||
getShipped(params) {
|
||||
const validParams = this.landed && this.addressId
|
||||
&& this.agencyModeId && this.warehouseId;
|
||||
if (!validParams) return this.$q.resolve();
|
||||
|
||||
this.ticket.zoneFk = null;
|
||||
const query = `Agencies/getShipped`;
|
||||
this.$http.get(query, {params}).then(res => {
|
||||
return this.$http.get(query, {params}).then(res => {
|
||||
if (res.data) {
|
||||
this.ticket.zoneFk = res.data.zoneFk;
|
||||
this.ticket.landed = params.landed;
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ describe('Ticket', () => {
|
|||
warehouseFk: 1
|
||||
};
|
||||
const serializedParams = $httpParamSerializer(params);
|
||||
controller.ticket.shipped = shipped;
|
||||
|
||||
$httpBackend.expect('GET', `Agencies/getLanded?${serializedParams}`).respond(200, expectedResult);
|
||||
controller.getLanded(params);
|
||||
|
|
@ -344,6 +345,7 @@ describe('Ticket', () => {
|
|||
warehouseFk: 1
|
||||
};
|
||||
const serializedParams = $httpParamSerializer(params);
|
||||
controller.ticket.landed = landed;
|
||||
|
||||
$httpBackend.expect('GET', `Agencies/getShipped?${serializedParams}`).respond(200, expectedResult);
|
||||
controller.getShipped(params);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ describe('Termograph createThermograph()', () => {
|
|||
done();
|
||||
});
|
||||
|
||||
it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => {
|
||||
it(`should be able to create just once a thermograph which is saved in both thermograph and travelThermograph`, async() => {
|
||||
let createdTravelThermograpth = await models.TravelThermograph.findOne({where: {thermographFk: thermographId}});
|
||||
|
||||
expect(createdTravelThermograpth).toBeNull();
|
||||
|
|
@ -32,9 +32,7 @@ describe('Termograph createThermograph()', () => {
|
|||
|
||||
expect(createdTravelThermograpth.warehouseFk).toEqual(warehouseId);
|
||||
expect(createdTravelThermograpth.temperature).toEqual(temperature);
|
||||
});
|
||||
|
||||
it(`should not be able to created duplicated entries`, async() => {
|
||||
let error;
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,37 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('workerTimeControl add/delete timeEntry()', () => {
|
||||
const HHRRId = 37;
|
||||
const teamBossId = 13;
|
||||
const employeeId = 1;
|
||||
let activeCtx = {
|
||||
accessToken: {userId: 50},
|
||||
};
|
||||
let ctx = {req: activeCtx};
|
||||
|
||||
describe('workerTimeControl addTimeEntry()', () => {
|
||||
let timeEntry;
|
||||
let createdTimeEntry;
|
||||
|
||||
afterEach(async() => {
|
||||
if (createdTimeEntry) {
|
||||
try {
|
||||
await app.models.WorkerTimeControl.destroyById(createdTimeEntry.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
beforeAll(() => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
});
|
||||
|
||||
it('should fail to add a time entry if the target user is not a subordinate', async() => {
|
||||
activeCtx.accessToken.userId = employeeId;
|
||||
let error;
|
||||
let ctx = {req: {accessToken: {userId: 1}}};
|
||||
let data = {
|
||||
workerFk: 2,
|
||||
timed: new Date()
|
||||
|
|
@ -24,8 +49,8 @@ describe('workerTimeControl addTimeEntry()', () => {
|
|||
});
|
||||
|
||||
it('should fail to add if the current and the target user are the same and is not team boss', async() => {
|
||||
activeCtx.accessToken.userId = employeeId;
|
||||
let error;
|
||||
let ctx = {req: {accessToken: {userId: 1}}};
|
||||
let data = {
|
||||
workerFk: 1,
|
||||
timed: new Date()
|
||||
|
|
@ -42,12 +67,11 @@ describe('workerTimeControl addTimeEntry()', () => {
|
|||
expect(error.message).toBe(`You don't have enough privileges`);
|
||||
});
|
||||
|
||||
it('should add if the current user is team boss and the target user is a subordinate', async() => {
|
||||
todayAtSix = new Date();
|
||||
it('should add if the current user is team boss and the target user is a himself', async() => {
|
||||
activeCtx.accessToken.userId = teamBossId;
|
||||
let todayAtSix = new Date();
|
||||
todayAtSix.setHours(18, 30, 0, 0);
|
||||
|
||||
let teamBossId = 13;
|
||||
let ctx = {req: {accessToken: {userId: teamBossId}}};
|
||||
let data = {
|
||||
workerFk: teamBossId,
|
||||
timed: todayAtSix
|
||||
|
|
@ -60,10 +84,20 @@ describe('workerTimeControl addTimeEntry()', () => {
|
|||
expect(createdTimeEntry).toBeDefined();
|
||||
});
|
||||
|
||||
it('should try but fail to delete the created time entry for the team boss as team boss', async() => {
|
||||
it('should try but fail to delete his own time entry', async() => {
|
||||
activeCtx.accessToken.userId = teamBossId;
|
||||
let error;
|
||||
let teamBossId = 13;
|
||||
let ctx = {req: {accessToken: {userId: teamBossId}}};
|
||||
let todayAtSeven = new Date();
|
||||
todayAtSeven.setHours(19, 30, 0, 0);
|
||||
|
||||
let data = {
|
||||
workerFk: teamBossId,
|
||||
timed: todayAtSeven
|
||||
};
|
||||
|
||||
timeEntry = await app.models.WorkerTimeControl.addTimeEntry(ctx, data);
|
||||
|
||||
createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
|
||||
|
||||
try {
|
||||
await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id);
|
||||
|
|
@ -77,13 +111,23 @@ describe('workerTimeControl addTimeEntry()', () => {
|
|||
});
|
||||
|
||||
it('should delete the created time entry for the team boss as HHRR', async() => {
|
||||
let HHRRId = 37;
|
||||
let ctx = {req: {accessToken: {userId: HHRRId}}};
|
||||
activeCtx.accessToken.userId = HHRRId;
|
||||
|
||||
let todayAtFive = new Date();
|
||||
todayAtFive.setHours(17, 30, 0, 0);
|
||||
|
||||
let data = {
|
||||
workerFk: teamBossId,
|
||||
timed: todayAtFive
|
||||
};
|
||||
|
||||
timeEntry = await app.models.WorkerTimeControl.addTimeEntry(ctx, data);
|
||||
|
||||
createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
|
||||
|
||||
expect(createdTimeEntry).toBeDefined();
|
||||
|
||||
ctx.req.accessToken.userId = HHRRId;
|
||||
await app.models.WorkerTimeControl.deleteTimeEntry(ctx, timeEntry.id);
|
||||
await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id);
|
||||
|
||||
createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
|
||||
|
||||
|
|
|
|||
|
|
@ -37,9 +37,12 @@ module.exports = Self => {
|
|||
Self.getLanded = async(ctx, shipped, addressFk, agencyModeFk, warehouseFk) => {
|
||||
const userId = ctx.req.accessToken.userId;
|
||||
const models = Self.app.models;
|
||||
const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss');
|
||||
const roles = await models.Account.getRoles(userId);
|
||||
const canSeeExpired = roles.filter(role =>
|
||||
role == 'productionBoss' || role == 'administrative'
|
||||
);
|
||||
let showExpired = false;
|
||||
if (isProductionBoss) showExpired = true;
|
||||
if (canSeeExpired.length) showExpired = true;
|
||||
|
||||
let stmts = [];
|
||||
stmts.push(new ParameterizedSQL(
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ module.exports = Self => {
|
|||
|
||||
await models.Ticket.rawSql('UPDATE ticket SET zoneFk = NULL WHERE zoneFk = ?', [id], options);
|
||||
|
||||
ticketList.forEach(ticket => {
|
||||
for (ticket of ticketList) {
|
||||
if (ticket.ticketState().alertLevel == 0) {
|
||||
promises.push(models.TicketTracking.create({
|
||||
ticketFk: ticket.id,
|
||||
|
|
@ -57,7 +57,7 @@ module.exports = Self => {
|
|||
workerFk: worker.id
|
||||
}, options));
|
||||
}
|
||||
});
|
||||
}
|
||||
await Promise.all(promises);
|
||||
await models.Zone.destroyById(id, options);
|
||||
await tx.commit();
|
||||
|
|
|
|||
|
|
@ -32,9 +32,12 @@ module.exports = Self => {
|
|||
&& where.agencyModeFk && where.warehouseFk;
|
||||
|
||||
if (filterByAvailability) {
|
||||
const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss');
|
||||
const roles = await models.Account.getRoles(userId);
|
||||
const canSeeExpired = roles.filter(role =>
|
||||
role == 'productionBoss' || role == 'administrative'
|
||||
);
|
||||
let showExpired = false;
|
||||
if (isProductionBoss) showExpired = true;
|
||||
if (canSeeExpired.length) showExpired = true;
|
||||
|
||||
stmt = new ParameterizedSQL(`CALL vn.zone_getLanded(?, ?, ?, ?, ?)`, [
|
||||
where.shipped,
|
||||
|
|
|
|||
|
|
@ -1,62 +1,81 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('zone deletezone()', () => {
|
||||
const userId = 9;
|
||||
const activeCtx = {
|
||||
accessToken: {userId: userId},
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
let zoneId = 9;
|
||||
let originalZoneTickets;
|
||||
let originalZone;
|
||||
let originalZoneWarehouses;
|
||||
let originalTickets;
|
||||
let ticketIDs;
|
||||
let originalZoneIncluded;
|
||||
let ticketsId;
|
||||
let originalTicketsState;
|
||||
let originalTicketStates;
|
||||
|
||||
beforeAll(async done => {
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
});
|
||||
try {
|
||||
originalZone = await app.models.Zone.findById(zoneId);
|
||||
originalZoneTickets = await app.models.Ticket.find({where: {zoneFk: zoneId}});
|
||||
originalZoneWarehouses = await app.models.ZoneWarehouse.findById(zoneId);
|
||||
originalTickets = await app.models.Ticket.find({
|
||||
where: {
|
||||
zoneFk: zoneId
|
||||
}
|
||||
});
|
||||
ticketIDs = originalTickets.map(ticket => ticket.id);
|
||||
originalZoneIncluded = await app.models.ZoneIncluded.find({where: {zoneFk: zoneId}});
|
||||
ticketsId = originalZoneTickets.map(originalZoneTickets => originalZoneTickets.id);
|
||||
originalTicketsState = await app.models.TicketState.find({where: {
|
||||
ticketFk: {inq: ticketsId},
|
||||
originalTicketStates = await app.models.TicketState.find({where: {
|
||||
ticketFk: {inq: ticketIDs},
|
||||
code: 'FIXING'}});
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
afterAll(async done => {
|
||||
try {
|
||||
await originalZone.save();
|
||||
await app.models.ZoneWarehouse.create(originalZoneWarehouses);
|
||||
|
||||
for (ticket of originalZoneTickets)
|
||||
for (ticket of originalTickets)
|
||||
await ticket.updateAttributes({zoneFk: zoneId});
|
||||
|
||||
for (zoneIncluded of originalZoneIncluded)
|
||||
await zoneIncluded.save();
|
||||
|
||||
const fixingStateId = 1;
|
||||
const ticketIds = originalZoneTickets.map(ticket => ticket.id);
|
||||
const trackings = await app.models.TicketTracking.find({where: {
|
||||
ticketFk: {inq: ticketIds},
|
||||
ticketFk: {inq: ticketIDs},
|
||||
stateFk: fixingStateId}});
|
||||
|
||||
for (let tracking of trackings)
|
||||
await app.models.TicketTracking.destroyById(tracking.id);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('should delete a zone and update their tickets', async() => {
|
||||
const ctx = {req: {accessToken: {userId: 9}}};
|
||||
await app.models.Zone.deleteZone(ctx, zoneId);
|
||||
|
||||
let updatedZone = await app.models.Zone.findById(zoneId);
|
||||
let zoneUpdatedTicket = await app.models.Ticket.findById(originalZoneTickets[0].id);
|
||||
let ticketsId = originalZoneTickets.map(originalZoneTickets => originalZoneTickets.id);
|
||||
const updatedZone = await app.models.Zone.findById(zoneId);
|
||||
const anUpdatedTicket = await app.models.Ticket.findById(ticketIDs[0]);
|
||||
|
||||
let updatedTicketState = await app.models.TicketState.find({where: {
|
||||
ticketFk: {inq: ticketsId},
|
||||
const updatedTicketStates = await app.models.TicketState.find({where: {
|
||||
ticketFk: {inq: ticketIDs},
|
||||
code: 'FIXING'}});
|
||||
|
||||
expect(updatedZone).toBeNull();
|
||||
expect(zoneUpdatedTicket.zoneFk).not.toBe(zoneId);
|
||||
expect(originalTicketsState.length).not.toBeGreaterThan(updatedTicketState.length);
|
||||
expect(anUpdatedTicket.zoneFk).toBeNull();
|
||||
expect(updatedTicketStates.length).toBeGreaterThan(originalTicketStates.length);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ const Component = require(`${appPath}/core/component`);
|
|||
const reportHeader = new Component('report-header');
|
||||
const reportFooter = new Component('report-footer');
|
||||
const md5 = require('md5');
|
||||
const fs = require('fs-extra');
|
||||
|
||||
module.exports = {
|
||||
name: 'delivery-note',
|
||||
|
|
@ -24,11 +25,14 @@ module.exports = {
|
|||
},
|
||||
computed: {
|
||||
dmsPath() {
|
||||
const pathHash = md5(this.signature.id.toString()).substring(0, 3);
|
||||
const hostPath = `file:///${config.storage.root}/${pathHash}`;
|
||||
if (!this.signature) return;
|
||||
|
||||
if (this.signature && this.signature.id)
|
||||
return `${hostPath}/${this.signature.id}.png`;
|
||||
const hash = md5(this.signature.id.toString()).substring(0, 3);
|
||||
const file = `${config.storage.root}/${hash}/${this.signature.id}.png`;
|
||||
const src = fs.readFileSync(file);
|
||||
const base64 = Buffer.from(src, 'utf8').toString('base64');
|
||||
|
||||
return `data:image/png;base64, ${base64}`;
|
||||
},
|
||||
serviceTotal() {
|
||||
let total = 0.00;
|
||||
|
|
|
|||
Loading…
Reference in New Issue