diff --git a/README.md b/README.md
index 32377c115c..1e3ad5e9e7 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Required applications.
* Node.js = 14.x LTS
* Docker
* Git
-* Docker
You will need to install globally the following items.
```
diff --git a/back/methods/dms/updateFile.js b/back/methods/dms/updateFile.js
index 314761932b..161f4728c9 100644
--- a/back/methods/dms/updateFile.js
+++ b/back/methods/dms/updateFile.js
@@ -89,6 +89,7 @@ module.exports = Self => {
await uploadNewFile(ctx, dms, myOptions);
if (tx) await tx.commit();
+
return dms;
} catch (e) {
if (tx) await tx.rollback();
diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js
index d6540cbc55..6bda1e6db2 100644
--- a/back/methods/dms/uploadFile.js
+++ b/back/methods/dms/uploadFile.js
@@ -96,6 +96,7 @@ module.exports = Self => {
}
if (tx) await tx.commit();
+
return addedDms;
} catch (e) {
if (tx) await tx.rollback();
diff --git a/back/models/image.js b/back/models/image.js
index a35018814d..d736e924f8 100644
--- a/back/models/image.js
+++ b/back/models/image.js
@@ -151,6 +151,7 @@ module.exports = Self => {
await fs.unlink(srcFilePath);
await tx.commit();
+
return newImage;
} catch (e) {
await tx.rollback();
diff --git a/db/changes/10370-pickles/00-ticket_getProblems.sql b/db/changes/10370-pickles/00-ticket_getProblems.sql
new file mode 100644
index 0000000000..2ee057cd2d
--- /dev/null
+++ b/db/changes/10370-pickles/00-ticket_getProblems.sql
@@ -0,0 +1,48 @@
+drop procedure `vn`.`ticket_getProblems`;
+
+DELIMITER $$
+$$
+create
+ definer = root@`%` procedure `vn`.`ticket_getProblems`(IN vIsTodayRelative tinyint(1))
+BEGIN
+/**
+ * Calcula los problemas para un conjunto de tickets.
+ * Agrupados por ticket
+ *
+ * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
+ * @return tmp.ticket_problems
+ */
+ CALL sale_getProblems(vIsTodayRelative);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticket_problems;
+ CREATE TEMPORARY TABLE tmp.ticket_problems
+ (PRIMARY KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT
+ ticketFk,
+ MAX(p.isFreezed) AS isFreezed,
+ MAX(p.risk) AS risk,
+ MAX(p.hasHighRisk) AS hasHighRisk,
+ MAX(p.hasTicketRequest) AS hasTicketRequest,
+ MIN(p.isAvailable) AS isAvailable,
+ MAX(p.itemShortage) AS itemShortage,
+ MIN(p.isTaxDataChecked) AS isTaxDataChecked,
+ MAX(p.hasComponentLack) AS hasComponentLack,
+ 0 AS totalProblems
+ FROM tmp.sale_problems p
+ GROUP BY ticketFk;
+
+ UPDATE tmp.ticket_problems tp
+ SET tp.totalProblems = (
+ (tp.isFreezed) +
+ IF(tp.risk, TRUE, FALSE) +
+ (tp.hasTicketRequest) +
+ (tp.isAvailable = 0) +
+ (tp.isTaxDataChecked = 0) +
+ (tp.hasComponentLack)
+ );
+
+ DROP TEMPORARY TABLE
+ tmp.sale_problems;
+END;;$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10370-pickles/delete.keep b/db/changes/10370-pickles/delete.keep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 71f8344767..133801f38b 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -108,7 +108,7 @@ let actions = {
},
getState: async function() {
- return await this.evaluate(() => {
+ return this.evaluate(() => {
let $state = angular.element(document.body).injector().get('$state');
return $state.current.name;
});
@@ -194,7 +194,7 @@ let actions = {
},
getProperty: async function(selector, property) {
- return await this.evaluate((selector, property) => {
+ return this.evaluate((selector, property) => {
return document.querySelector(selector)[property].replace(/\s+/g, ' ').trim();
}, selector, property);
},
@@ -202,7 +202,7 @@ let actions = {
getClassName: async function(selector) {
const element = await this.$(selector);
const handle = await element.getProperty('className');
- return await handle.jsonValue();
+ return handle.jsonValue();
},
waitPropertyLength: async function(selector, property, minLength) {
@@ -210,7 +210,7 @@ let actions = {
const element = document.querySelector(selector);
return element && element[property] != null && element[property] !== '' && element[property].length >= minLength;
}, {}, selector, property, minLength);
- return await this.getProperty(selector, property);
+ return this.getProperty(selector, property);
},
expectPropertyValue: async function(selector, property, value) {
@@ -219,7 +219,7 @@ let actions = {
builtSelector = await this.selectorFormater(selector);
try {
- return await this.waitForFunction((selector, property, value) => {
+ return this.waitForFunction((selector, property, value) => {
const element = document.querySelector(selector);
return element[property] == value;
}, {}, builtSelector, property, value);
@@ -239,7 +239,7 @@ let actions = {
return element && element[property] != null && element[property] !== '';
}, {}, builtSelector, property);
- return await this.getProperty(builtSelector, property);
+ return this.getProperty(builtSelector, property);
} catch (error) {
throw new Error(`couldn't get property: ${property} of ${builtSelector}, ${error}`);
}
@@ -261,7 +261,7 @@ let actions = {
await this.waitForSelector(selector);
await this.waitForFunction(checkVisibility, {}, selector);
- return await this.click(selector);
+ return this.click(selector);
},
writeOnEditableTD: async function(selector, text) {
@@ -274,7 +274,7 @@ let actions = {
focusElement: async function(selector) {
await this.waitForSelector(selector);
- return await this.evaluate(selector => {
+ return this.evaluate(selector => {
let element = document.querySelector(selector);
element.focus();
}, selector);
@@ -282,19 +282,19 @@ let actions = {
isVisible: async function(selector) {
await this.waitForSelector(selector);
- return await this.evaluate(checkVisibility, selector);
+ return this.evaluate(checkVisibility, selector);
},
waitImgLoad: async function(selector) {
await this.waitForSelector(selector);
- return await this.waitForFunction(selector => {
+ return this.waitForFunction(selector => {
const imageReady = document.querySelector(selector).complete;
return imageReady;
}, {}, selector);
},
countElement: async function(selector) {
- return await this.evaluate(selector => {
+ return this.evaluate(selector => {
return document.querySelectorAll(selector).length;
}, selector);
},
@@ -312,7 +312,7 @@ let actions = {
waitForClassNotPresent: async function(selector, className) {
await this.waitForSelector(selector);
- return await this.waitForFunction((selector, className) => {
+ return this.waitForFunction((selector, className) => {
if (!document.querySelector(selector).classList.contains(className))
return true;
}, {}, selector, className);
@@ -320,7 +320,7 @@ let actions = {
waitForClassPresent: async function(selector, className) {
await this.waitForSelector(selector);
- return await this.waitForFunction((elementSelector, targetClass) => {
+ return this.waitForFunction((elementSelector, targetClass) => {
if (document.querySelector(elementSelector).classList.contains(targetClass))
return true;
}, {}, selector, className);
@@ -387,13 +387,13 @@ let actions = {
const innerText = document.querySelector(selector).innerText;
return innerText != null && innerText != '';
}, {}, selector);
- return await this.evaluate(selector => {
+ return this.evaluate(selector => {
return document.querySelector(selector).innerText;
}, selector);
},
waitForEmptyInnerText: async function(selector) {
- return await this.waitFunction(selector => {
+ return this.waitFunction(selector => {
return document.querySelector(selector).innerText == '';
}, selector);
},
@@ -521,7 +521,7 @@ let actions = {
checkboxState: async function(selector) {
await this.waitForSelector(selector);
- return await this.evaluate(selector => {
+ return this.evaluate(selector => {
let checkbox = document.querySelector(selector);
switch (checkbox.$ctrl.field) {
case null:
@@ -536,14 +536,14 @@ let actions = {
isDisabled: async function(selector) {
await this.waitForSelector(selector);
- return await this.evaluate(selector => {
+ return this.evaluate(selector => {
let element = document.querySelector(selector);
return element.$ctrl.disabled;
}, selector);
},
waitForStylePresent: async function(selector, property, value) {
- return await this.waitForFunction((selector, property, value) => {
+ return this.waitForFunction((selector, property, value) => {
const element = document.querySelector(selector);
return element.style[property] == value;
}, {}, selector, property, value);
@@ -631,7 +631,7 @@ export function extendPage(page) {
for (let name in actions) {
page[name] = async(...args) => {
try {
- return await actions[name].apply(page, args);
+ return actions[name].apply(page, args);
} catch (err) {
let stringArgs = args
.map(i => typeof i == 'function' ? 'Function' : i)
diff --git a/e2e/helpers/puppeteer.js b/e2e/helpers/puppeteer.js
index 02ef82b1b7..97ec492609 100644
--- a/e2e/helpers/puppeteer.js
+++ b/e2e/helpers/puppeteer.js
@@ -5,11 +5,16 @@ import {url as defaultURL} from './config';
export async function getBrowser() {
const args = [
- `--no-sandbox`,
- `--window-size=${ 1920 },${ 1080 }`
+ '--no-sandbox',
+ `--window-size=${ 1920 },${ 1080 }`,
+ '--single-process',
+ '--no-zygote'
+ // '--disable-dev-shm-usage'
+ // '--full-memory-crash-report',
+ // '--unlimited-storage'
];
- let env = process.env;
+ const env = process.env;
if (env.E2E_DEBUG) {
args.push('--auto-open-devtools-for-tabs');
@@ -22,6 +27,9 @@ export async function getBrowser() {
defaultViewport: null,
headless: headless,
slowMo: 0, // slow down by ms
+ // ignoreDefaultArgs: ['--disable-extensions'],
+ // executablePath: '/usr/bin/google-chrome-stable',
+ // executablePath: '/usr/bin/firefox-developer-edition',
});
let page = (await browser.pages())[0];
@@ -38,7 +46,7 @@ export async function getBrowser() {
});
});
page = extendPage(page);
- page.setDefaultTimeout(4000);
+ page.setDefaultTimeout(5000);
await page.goto(defaultURL, {waitUntil: 'load'});
return {page, close: browser.close.bind(browser)};
}
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index f63d67f8ba..52c89743d5 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -544,7 +544,7 @@ export default {
},
ticketSales: {
setOk: 'vn-ticket-sale vn-tool-bar > vn-button[label="Ok"] > button',
- saleLine: 'vn-table div > vn-tbody > vn-tr',
+ saleLine: 'vn-table div > vn-tbody > vn-tr vn-check',
saleDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
saleDescriptorPopoverSummaryButton: '.vn-popover.shown vn-item-descriptor a[ui-sref="item.card.summary({id: $ctrl.descriptor.id})"]',
newItemButton: 'vn-ticket-sale vn-card vn-icon-button[icon="add_circle"]',
diff --git a/e2e/paths/04-item/08_regularize.spec.js b/e2e/paths/04-item/08_regularize.spec.js
index 97c45643f1..d7bab3b7bb 100644
--- a/e2e/paths/04-item/08_regularize.spec.js
+++ b/e2e/paths/04-item/08_regularize.spec.js
@@ -107,6 +107,7 @@ describe('Item regularize path', () => {
});
it('should regularize the item once more', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.itemDescriptor.moreMenu);
await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
index 6c82e31a70..0ce803bea5 100644
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@@ -196,6 +196,7 @@ describe('Ticket Edit sale path', () => {
});
it('should select the third sale and create a claim of it', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
await page.waitToClick(selectors.ticketSales.moreMenu);
await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
@@ -340,9 +341,10 @@ describe('Ticket Edit sale path', () => {
});
it('should confirm the new ticket received the line', async() => {
+ const expectedLines = 1;
const result = await page.countElement(selectors.ticketSales.saleLine);
- expect(result).toEqual(1);
+ expect(result).toEqual(expectedLines);
});
it('should check the first sale reserved icon isnt visible', async() => {
@@ -353,6 +355,7 @@ describe('Ticket Edit sale path', () => {
it('should mark the first sale as reserved', async() => {
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketSales.moreMenu);
await page.waitToClick(selectors.ticketSales.moreMenuReserve);
await page.closePopup();
@@ -363,6 +366,7 @@ describe('Ticket Edit sale path', () => {
});
it('should unmark the first sale as reserved', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketSales.moreMenu);
await page.waitToClick(selectors.ticketSales.moreMenuUnmarkReseved);
await page.waitForClassPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index 2392de28ff..be5b1e153a 100644
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@@ -28,6 +28,7 @@ describe('Ticket descriptor path', () => {
});
it('should add the ticket to thursday turn using the descriptor more menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
@@ -63,6 +64,7 @@ describe('Ticket descriptor path', () => {
});
it('should add the ticket to saturday turn using the descriptor more menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js
index 08534f8e45..dcca61eab5 100644
--- a/e2e/paths/05-ticket/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@@ -22,6 +22,7 @@ describe('Ticket descriptor path', () => {
});
it(`should update the shipped hour using the descriptor menu`, async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour);
await page.pickTime(selectors.ticketDescriptor.changeShippedHour, '08:15');
@@ -65,6 +66,7 @@ describe('Ticket descriptor path', () => {
describe('Restore ticket', () => {
it('should restore the ticket using the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuRestoreTicket);
await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
@@ -82,6 +84,7 @@ describe('Ticket descriptor path', () => {
});
it('should open the add stowaway dialog', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitForFunction(() => {
let element = document.querySelector('vn-ticket-descriptor-menu');
return element.$ctrl.canShowStowaway === true;
@@ -114,6 +117,7 @@ describe('Ticket descriptor path', () => {
});
it('should delete the stowaway', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteStowawayButton);
@@ -145,6 +149,7 @@ describe('Ticket descriptor path', () => {
});
it('should invoice the ticket using the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuMakeInvoice);
@@ -176,6 +181,7 @@ describe('Ticket descriptor path', () => {
describe('SMS', () => {
it('should send the payment SMS using the descriptor menu', async() => {
+ await page.waitForTimeout(2000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuPaymentSMS);
@@ -188,6 +194,7 @@ describe('Ticket descriptor path', () => {
});
it('should send the import SMS using the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitForContentLoaded();
await page.waitToClick(selectors.ticketDescriptor.moreMenuSendImportSms);
diff --git a/e2e/paths/05-ticket/14_create_ticket.spec.js b/e2e/paths/05-ticket/14_create_ticket.spec.js
index bfaa087752..1c0e10e6d9 100644
--- a/e2e/paths/05-ticket/14_create_ticket.spec.js
+++ b/e2e/paths/05-ticket/14_create_ticket.spec.js
@@ -62,6 +62,7 @@ describe('Ticket create path', () => {
});
it('should make the previously created ticket the stowaway of the current ticket', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuAddStowaway);
await page.waitToClick(selectors.ticketDescriptor.addStowawayDialogFirstTicket);
@@ -71,6 +72,7 @@ describe('Ticket create path', () => {
});
it('should delete the current ticket', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
diff --git a/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
index a68ce894ef..a27050daa7 100644
--- a/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
+++ b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
@@ -17,6 +17,7 @@ describe('Ticket create from client path', () => {
});
it('should click the create simple ticket on the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.clientDescriptor.moreMenu);
await page.waitToClick(selectors.clientDescriptor.simpleTicketButton);
await page.waitForState('ticket.create');
diff --git a/e2e/paths/09-invoice-in/02_descriptor.spec.js b/e2e/paths/09-invoice-in/02_descriptor.spec.js
index 02bbce7ac1..28b8e7ae3e 100644
--- a/e2e/paths/09-invoice-in/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-in/02_descriptor.spec.js
@@ -18,6 +18,7 @@ describe('InvoiceIn descriptor path', () => {
});
it('should clone the invoiceIn using the descriptor more menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.invoiceInDescriptor.moreMenu);
await page.waitToClick(selectors.invoiceInDescriptor.moreMenuCloneInvoiceIn);
await page.waitToClick(selectors.invoiceInDescriptor.acceptButton);
@@ -31,6 +32,7 @@ describe('InvoiceIn descriptor path', () => {
});
it('should delete the cloned invoiceIn using the descriptor more menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.invoiceInDescriptor.moreMenu);
await page.waitToClick(selectors.invoiceInDescriptor.moreMenuDeleteInvoiceIn);
await page.waitToClick(selectors.invoiceInDescriptor.acceptButton);
diff --git a/e2e/paths/09-invoice-out/02_descriptor.spec.js b/e2e/paths/09-invoice-out/02_descriptor.spec.js
index 8d403e0839..222237b4f2 100644
--- a/e2e/paths/09-invoice-out/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out/02_descriptor.spec.js
@@ -38,6 +38,7 @@ describe('InvoiceOut descriptor path', () => {
});
it('should delete the invoiceOut using the descriptor more menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.invoiceOutDescriptor.moreMenu);
await page.waitToClick(selectors.invoiceOutDescriptor.moreMenuDeleteInvoiceOut);
await page.waitToClick(selectors.invoiceOutDescriptor.acceptDeleteButton);
diff --git a/e2e/paths/09-invoice-out/03_manualInvoice.spec.js b/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
index 396f84bfb5..d32ab3f3cf 100644
--- a/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
+++ b/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
@@ -16,6 +16,7 @@ describe('InvoiceOut manual invoice path', () => {
});
it('should open the manual invoice form', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
@@ -44,6 +45,7 @@ describe('InvoiceOut manual invoice path', () => {
});
it('should now open the manual invoice form', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js
index 619228f354..d61818866b 100644
--- a/e2e/paths/10-travel/03_descriptor.spec.js
+++ b/e2e/paths/10-travel/03_descriptor.spec.js
@@ -34,6 +34,7 @@ describe('Travel descriptor path', () => {
});
it('should be redirected to the create entry view', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.travelDescriptor.dotMenu);
await page.waitToClick(selectors.travelDescriptor.dotMenuAddEntry);
await page.waitForState('entry.create');
@@ -89,6 +90,7 @@ describe('Travel descriptor path', () => {
});
it('should be redirected to the create travel when using the clone option of the dot menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.travelDescriptor.dotMenu);
await page.waitToClick(selectors.travelDescriptor.dotMenuClone);
await page.respondToDialog('accept');
@@ -114,6 +116,7 @@ describe('Travel descriptor path', () => {
});
it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.travelDescriptor.dotMenu);
await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
await page.waitToClick(selectors.travelDescriptor.acceptClonation);
diff --git a/e2e/paths/11-zone/02_descriptor.spec.js b/e2e/paths/11-zone/02_descriptor.spec.js
index 1de84d601a..d88829907d 100644
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ b/e2e/paths/11-zone/02_descriptor.spec.js
@@ -17,6 +17,7 @@ describe('Zone descriptor path', () => {
});
it('should eliminate the zone using the descriptor option', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.zoneDescriptor.menu);
await page.waitToClick(selectors.zoneDescriptor.deleteZone);
await page.respondToDialog('accept');
diff --git a/e2e/paths/14-account/01_create_and_basic_data.spec.js b/e2e/paths/14-account/01_create_and_basic_data.spec.js
index 5a07119e79..204da363c3 100644
--- a/e2e/paths/14-account/01_create_and_basic_data.spec.js
+++ b/e2e/paths/14-account/01_create_and_basic_data.spec.js
@@ -91,6 +91,7 @@ describe('Account create and basic data path', () => {
});
it('should activate the account using the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.accountDescriptor.menuButton);
await page.waitToClick(selectors.accountDescriptor.activateAccount);
await page.waitToClick(selectors.accountDescriptor.acceptButton);
@@ -138,6 +139,7 @@ describe('Account create and basic data path', () => {
describe('Set password', () => {
it('should set the password using the descriptor menu', async() => {
+ await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
await page.waitToClick(selectors.accountDescriptor.menuButton);
await page.waitToClick(selectors.accountDescriptor.setPassword);
await page.write(selectors.accountDescriptor.newPassword, 'quantum.crypt0graphy');
diff --git a/front/core/components/menu/menu.js b/front/core/components/menu/menu.js
index d0c6490040..e0d968e2f8 100755
--- a/front/core/components/menu/menu.js
+++ b/front/core/components/menu/menu.js
@@ -3,8 +3,8 @@ import Popover from '../popover';
import './style.scss';
export default class Menu extends Popover {
- show(parent) {
- super.show(parent);
+ show(parent, direction) {
+ super.show(parent, direction);
this.windowEl.addEventListener('click', () => this.hide());
}
}
diff --git a/front/core/components/menu/style.scss b/front/core/components/menu/style.scss
index 92f4372432..6125c0e5bc 100644
--- a/front/core/components/menu/style.scss
+++ b/front/core/components/menu/style.scss
@@ -1,7 +1,18 @@
@import "./effects";
+@import "variables";
.vn-menu {
vn-item, .vn-item {
@extend %clickable;
}
+
+ vn-item.dropdown:after,
+ .vn-item.dropdown:after {
+ font-family: 'Material Icons';
+ content: 'keyboard_arrow_right';
+ position: absolute;
+ color: $color-spacer;
+ font-size: 1.5em;
+ right: 0
+ }
}
diff --git a/front/core/components/pagination/pagination.html b/front/core/components/pagination/pagination.html
index 6809018dde..72d7c31ff7 100644
--- a/front/core/components/pagination/pagination.html
+++ b/front/core/components/pagination/pagination.html
@@ -1,9 +1,10 @@
-
-
+
-
+
+
+
diff --git a/front/core/components/pagination/style.scss b/front/core/components/pagination/style.scss
index 413a6fb5f4..02dcb43e40 100644
--- a/front/core/components/pagination/style.scss
+++ b/front/core/components/pagination/style.scss
@@ -1,7 +1,13 @@
+@import "variables";
vn-pagination {
display: block;
text-align: center;
+ color: $color-primary;
+
+ vn-button, vn-icon {
+ display: block
+ }
& > div > vn-icon-button {
font-size: 2rem;
diff --git a/front/core/components/popover/index.js b/front/core/components/popover/index.js
index d78179ab9b..446c0697b9 100644
--- a/front/core/components/popover/index.js
+++ b/front/core/components/popover/index.js
@@ -23,12 +23,15 @@ export default class Popover extends Popup {
* it is shown in a visible relative position to it.
*
* @param {HTMLElement|Event} parent Overrides the parent property
+ * @param {String} direction - Direction [left]
*/
- show(parent) {
+ show(parent, direction) {
if (parent instanceof Event)
parent = event.target;
if (parent) this.parent = parent;
+ if (direction) this.direction = direction;
+
super.show();
this.content = this.popup.querySelector('.content');
this.$timeout(() => this.relocate(), 10);
@@ -89,21 +92,40 @@ export default class Popover extends Popup {
let width = clamp(popoverRect.width, parentRect.width, maxWith);
let height = popoverRect.height;
- let left = parentRect.left + parentRect.width / 2 - width / 2;
- left = clamp(left, margin, maxRight - width);
+ let left;
+ if (this.direction == 'left') {
+ left = parentRect.left + parentRect.width;
+ left = clamp(left, margin, maxRight - width);
+ } else {
+ left = parentRect.left + parentRect.width / 2 - width / 2;
+ left = clamp(left, margin, maxRight - width);
+ }
- let top = parentRect.top + parentRect.height + arrowOffset;
+ let top;
+ if (this.direction == 'left')
+ top = parentRect.top;
+ else
+ top = parentRect.top + parentRect.height + arrowOffset;
let showTop = top + height > maxBottom;
if (showTop) top = parentRect.top - height - arrowOffset;
top = Math.max(top, margin);
- if (showTop)
+ if (this.direction == 'left')
+ arrowStyle.left = `0`;
+ else if (showTop)
arrowStyle.bottom = `0`;
else
arrowStyle.top = `0`;
- let arrowLeft = (parentRect.left - left) + parentRect.width / 2;
- arrowLeft = clamp(arrowLeft, arrowHeight, width - arrowHeight);
+ let arrowLeft;
+ if (this.direction == 'left') {
+ arrowLeft = 0;
+ let arrowTop = arrowOffset;
+ arrowStyle.top = `${arrowTop}px`;
+ } else {
+ arrowLeft = (parentRect.left - left) + parentRect.width / 2;
+ arrowLeft = clamp(arrowLeft, arrowHeight, width - arrowHeight);
+ }
arrowStyle.left = `${arrowLeft}px`;
style.top = `${top}px`;
diff --git a/front/core/services/email.js b/front/core/services/email.js
index 4385eed5f3..633b13a263 100644
--- a/front/core/services/email.js
+++ b/front/core/services/email.js
@@ -18,6 +18,18 @@ class Email {
return this.$http.get(`email/${template}`, {params})
.then(() => this.vnApp.showMessage(this.$t('Notification sent!')));
}
+
+ /**
+ * Sends an email displaying a notification when it's sent.
+ *
+ * @param {String} template The email report name
+ * @param {Object} params The email parameters
+ * @return {Promise} Promise resolved when it's sent
+ */
+ sendCsv(template, params) {
+ return this.$http.get(`csv/${template}/send`, {params})
+ .then(() => this.vnApp.showMessage(this.$t('Notification sent!')));
+ }
}
Email.$inject = ['$http', '$translate', 'vnApp'];
diff --git a/front/core/services/report.js b/front/core/services/report.js
index 32ccb52a37..c58a0ee0e2 100644
--- a/front/core/services/report.js
+++ b/front/core/services/report.js
@@ -20,6 +20,21 @@ class Report {
const serializedParams = this.$httpParamSerializer(params);
window.open(`api/report/${report}?${serializedParams}`);
}
+
+ /**
+ * Shows a report in another window, automatically adds the authorization
+ * token to params.
+ *
+ * @param {String} report The report name
+ * @param {Object} params The report parameters
+ */
+ showCsv(report, params) {
+ params = Object.assign({
+ authorization: this.vnToken.token
+ }, params);
+ const serializedParams = this.$httpParamSerializer(params);
+ window.open(`api/csv/${report}/download?${serializedParams}`);
+ }
}
Report.$inject = ['$httpParamSerializer', 'vnToken'];
diff --git a/gulpfile.js b/gulpfile.js
index 73b325449a..59c79c154e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -94,8 +94,11 @@ async function launchBackTest(done) {
await new Promise((resolve, reject) => {
const jasmine = require('gulp-jasmine');
- let options = {
+ const options = {
+ verbose: false,
+ includeStackTrace: false,
errorOnFail: false,
+ timeout: 5000,
config: {}
};
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index bc97eae195..8890e911f5 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -116,5 +116,6 @@
"This client is not invoiceable": "This client is not invoiceable",
"INACTIVE_PROVIDER": "Inactive provider",
"reference duplicated": "reference duplicated",
- "The PDF document does not exists": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option"
+ "The PDF document does not exists": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
+ "This item is not available": "This item is not available"
}
\ No newline at end of file
diff --git a/modules/client/back/methods/client/specs/canBeInvoiced.spec.js b/modules/client/back/methods/client/specs/canBeInvoiced.spec.js
index 7b0640d2a5..2f11d80139 100644
--- a/modules/client/back/methods/client/specs/canBeInvoiced.spec.js
+++ b/modules/client/back/methods/client/specs/canBeInvoiced.spec.js
@@ -8,12 +8,10 @@ describe('client canBeInvoiced()', () => {
accessToken: {userId: userId}
};
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should return falsy for a client without the data checked', async() => {
diff --git a/modules/client/back/models/specs/address.spec.js b/modules/client/back/models/specs/address.spec.js
index 3271c7d8f0..cae18258f4 100644
--- a/modules/client/back/models/specs/address.spec.js
+++ b/modules/client/back/models/specs/address.spec.js
@@ -4,13 +4,11 @@ describe('loopback model address', () => {
let createdAddressId;
const clientId = 1101;
- afterAll(async done => {
+ afterAll(async() => {
let client = await app.models.Client.findById(clientId);
await app.models.Address.destroyById(createdAddressId);
await client.updateAttribute('isEqualizated', false);
-
- done();
});
describe('observe()', () => {
diff --git a/modules/entry/back/methods/entry/deleteBuys.js b/modules/entry/back/methods/entry/deleteBuys.js
index 951abfd4cb..ce5ff6a7d9 100644
--- a/modules/entry/back/methods/entry/deleteBuys.js
+++ b/modules/entry/back/methods/entry/deleteBuys.js
@@ -41,6 +41,7 @@ module.exports = Self => {
const deleted = await Promise.all(promises);
if (tx) await tx.commit();
+
return deleted;
} catch (e) {
if (tx) await tx.rollback();
diff --git a/modules/entry/back/methods/entry/importBuys.js b/modules/entry/back/methods/entry/importBuys.js
index 3ed8ac1c7d..f3bf37dde5 100644
--- a/modules/entry/back/methods/entry/importBuys.js
+++ b/modules/entry/back/methods/entry/importBuys.js
@@ -97,6 +97,7 @@ module.exports = Self => {
const sql = ParameterizedSQL.join(stmts, ';');
await conn.executeStmt(sql, myOptions);
+
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
diff --git a/modules/entry/back/methods/entry/specs/importBuys.spec.js b/modules/entry/back/methods/entry/specs/importBuys.spec.js
index 942ce0a0b4..467c21e90d 100644
--- a/modules/entry/back/methods/entry/specs/importBuys.spec.js
+++ b/modules/entry/back/methods/entry/specs/importBuys.spec.js
@@ -10,12 +10,10 @@ describe('entry import()', () => {
accessToken: {userId: buyerId},
};
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should import the buy rows', async() => {
diff --git a/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
index d286993ad6..e62272c15d 100644
--- a/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
+++ b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
@@ -3,12 +3,10 @@ const LoopBackContext = require('loopback-context');
describe('entry importBuysPreview()', () => {
const entryId = 1;
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should return the buys with the calculated packageFk', async() => {
diff --git a/modules/entry/front/buy/import/style.scss b/modules/entry/front/buy/import/style.scss
index 8426d41699..9b2fb76886 100644
--- a/modules/entry/front/buy/import/style.scss
+++ b/modules/entry/front/buy/import/style.scss
@@ -1,9 +1,3 @@
-vn-entry-buy-import {
- .vn-table > tbody td:nth-child(1) {
- width: 250px
- }
-}
-
.itemFilter {
vn-table.scrollable {
height: 500px
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 4d9a4ffd88..e96e994470 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -2,18 +2,49 @@
module="invoiceOut"
description="$ctrl.invoiceOut.ref">
-
- Show invoice PDF
-
-
+
+
+ Show as PDF
+
+
+ Show as CSV
+
+
+
+
+
- Send invoice PDF
+ Send invoice...
+
+
+
+
+ Send PDF
+
+
+ Send CSV
+
+
+
-
-
+
+
Are you sure you want to send it?
+ ng-model="sendPdfConfirmation.data.email">
+
+
+
+
+
+
+
+
+
+
+
+ Are you sure you want to send it?
+
diff --git a/modules/invoiceOut/front/descriptor/index.js b/modules/invoiceOut/front/descriptor/index.js
index 0600ffa5b9..129fe16d1a 100644
--- a/modules/invoiceOut/front/descriptor/index.js
+++ b/modules/invoiceOut/front/descriptor/index.js
@@ -14,29 +14,6 @@ class Controller extends Descriptor {
return this.aclService.hasAny(['invoicing']);
}
- deleteInvoiceOut() {
- return this.$http.post(`InvoiceOuts/${this.id}/delete`)
- .then(() => this.$state.go('invoiceOut.index'))
- .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut deleted')));
- }
-
- bookInvoiceOut() {
- return this.$http.post(`InvoiceOuts/${this.invoiceOut.ref}/book`)
- .then(() => this.$state.reload())
- .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut booked')));
- }
-
- createInvoicePdf() {
- const invoiceId = this.invoiceOut.id;
- return this.$http.post(`InvoiceOuts/${invoiceId}/createPdf`)
- .then(() => this.reload())
- .then(() => {
- const snackbarMessage = this.$t(
- `The invoice PDF document has been regenerated`);
- this.vnApp.showSuccess(snackbarMessage);
- });
- }
-
get filter() {
if (this.invoiceOut)
return JSON.stringify({refFk: this.invoiceOut.ref});
@@ -55,7 +32,7 @@ class Controller extends Descriptor {
}, {
relation: 'client',
scope: {
- fields: ['id', 'name']
+ fields: ['id', 'name', 'email']
}
}
]
@@ -76,13 +53,51 @@ class Controller extends Descriptor {
// Prevents error when not defined
}
- sendInvoice($data) {
+ deleteInvoiceOut() {
+ return this.$http.post(`InvoiceOuts/${this.id}/delete`)
+ .then(() => this.$state.go('invoiceOut.index'))
+ .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut deleted')));
+ }
+
+ bookInvoiceOut() {
+ return this.$http.post(`InvoiceOuts/${this.invoiceOut.ref}/book`)
+ .then(() => this.$state.reload())
+ .then(() => this.vnApp.showSuccess(this.$t('InvoiceOut booked')));
+ }
+
+ createPdfInvoice() {
+ const invoiceId = this.invoiceOut.id;
+ return this.$http.post(`InvoiceOuts/${invoiceId}/createPdf`)
+ .then(() => this.reload())
+ .then(() => {
+ const snackbarMessage = this.$t(
+ `The invoice PDF document has been regenerated`);
+ this.vnApp.showSuccess(snackbarMessage);
+ });
+ }
+
+ showCsvInvoice() {
+ this.vnReport.showCsv('invoice', {
+ recipientId: this.invoiceOut.client.id,
+ invoiceId: this.id,
+ });
+ }
+
+ sendPdfInvoice($data) {
return this.vnEmail.send('invoice', {
recipientId: this.invoiceOut.client.id,
recipient: $data.email,
invoiceId: this.id
});
}
+
+ sendCsvInvoice($data) {
+ return this.vnEmail.sendCsv('invoice', {
+ recipientId: this.invoiceOut.client.id,
+ recipient: $data.email,
+ invoiceId: this.id
+ });
+ }
}
ngModule.vnComponent('vnInvoiceOutDescriptor', {
diff --git a/modules/invoiceOut/front/descriptor/index.spec.js b/modules/invoiceOut/front/descriptor/index.spec.js
index 0a5494b9ab..12430d44db 100644
--- a/modules/invoiceOut/front/descriptor/index.spec.js
+++ b/modules/invoiceOut/front/descriptor/index.spec.js
@@ -3,30 +3,20 @@ import './index';
describe('vnInvoiceOutDescriptor', () => {
let controller;
let $httpBackend;
- const invoiceOut = {id: 1};
+ let $httpParamSerializer;
+ const invoiceOut = {
+ id: 1,
+ client: {id: 1101}
+ };
beforeEach(ngModule('invoiceOut'));
- beforeEach(inject(($componentController, _$httpBackend_) => {
+ beforeEach(inject(($componentController, _$httpParamSerializer_, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
+ $httpParamSerializer = _$httpParamSerializer_;
controller = $componentController('vnInvoiceOutDescriptor', {$element: null});
}));
- describe('createInvoicePdf()', () => {
- it('should make a query and show a success snackbar', () => {
- jest.spyOn(controller.vnApp, 'showSuccess');
-
- controller.invoiceOut = invoiceOut;
-
- $httpBackend.whenGET(`InvoiceOuts/${invoiceOut.id}`).respond();
- $httpBackend.expectPOST(`InvoiceOuts/${invoiceOut.id}/createPdf`).respond();
- controller.createInvoicePdf();
- $httpBackend.flush();
-
- expect(controller.vnApp.showSuccess).toHaveBeenCalled();
- });
- });
-
describe('loadData()', () => {
it(`should perform a get query to store the invoice in data into the controller`, () => {
const id = 1;
@@ -39,4 +29,81 @@ describe('vnInvoiceOutDescriptor', () => {
expect(controller.invoiceOut).toEqual(response);
});
});
+
+ describe('createPdfInvoice()', () => {
+ it('should make a query to the createPdf() endpoint and show a success snackbar', () => {
+ jest.spyOn(controller.vnApp, 'showSuccess');
+
+ controller.invoiceOut = invoiceOut;
+
+ $httpBackend.whenGET(`InvoiceOuts/${invoiceOut.id}`).respond();
+ $httpBackend.expectPOST(`InvoiceOuts/${invoiceOut.id}/createPdf`).respond();
+ controller.createPdfInvoice();
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+ });
+ });
+
+ describe('showCsvInvoice()', () => {
+ it('should make a query to the csv invoice download endpoint and show a message snackbar', () => {
+ jest.spyOn(window, 'open').mockReturnThis();
+
+ controller.invoiceOut = invoiceOut;
+
+ const expectedParams = {
+ invoiceId: invoiceOut.id,
+ recipientId: invoiceOut.client.id
+ };
+ const serializedParams = $httpParamSerializer(expectedParams);
+ const expectedPath = `api/csv/invoice/download?${serializedParams}`;
+ controller.showCsvInvoice();
+
+ expect(window.open).toHaveBeenCalledWith(expectedPath);
+ });
+ });
+
+ describe('sendPdfInvoice()', () => {
+ it('should make a query to the email invoice endpoint and show a message snackbar', () => {
+ jest.spyOn(controller.vnApp, 'showMessage');
+
+ controller.invoiceOut = invoiceOut;
+
+ const $data = {email: 'brucebanner@gothamcity.com'};
+ const expectedParams = {
+ invoiceId: invoiceOut.id,
+ recipient: $data.email,
+ recipientId: invoiceOut.client.id
+ };
+ const serializedParams = $httpParamSerializer(expectedParams);
+
+ $httpBackend.expectGET(`email/invoice?${serializedParams}`).respond();
+ controller.sendPdfInvoice($data);
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showMessage).toHaveBeenCalled();
+ });
+ });
+
+ describe('sendCsvInvoice()', () => {
+ it('should make a query to the csv invoice send endpoint and show a message snackbar', () => {
+ jest.spyOn(controller.vnApp, 'showMessage');
+
+ controller.invoiceOut = invoiceOut;
+
+ const $data = {email: 'brucebanner@gothamcity.com'};
+ const expectedParams = {
+ invoiceId: invoiceOut.id,
+ recipient: $data.email,
+ recipientId: invoiceOut.client.id
+ };
+ const serializedParams = $httpParamSerializer(expectedParams);
+
+ $httpBackend.expectGET(`csv/invoice/send?${serializedParams}`).respond();
+ controller.sendCsvInvoice($data);
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showMessage).toHaveBeenCalled();
+ });
+ });
});
diff --git a/modules/invoiceOut/front/descriptor/locale/es.yml b/modules/invoiceOut/front/descriptor/locale/es.yml
index 3430fe4e70..2f377ebdf8 100644
--- a/modules/invoiceOut/front/descriptor/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor/locale/es.yml
@@ -2,8 +2,10 @@ Volume exceded: Volumen excedido
Volume: Volumen
Client card: Ficha del cliente
Invoice ticket list: Listado de tickets de la factura
-Show invoice PDF: Ver factura en PDF
-Send invoice PDF: Enviar factura en PDF
+Show invoice...: Ver factura...
+Send invoice...: Enviar factura...
+Send PDF invoice: Enviar factura en PDF
+Send CSV invoice: Enviar factura en CSV
Delete Invoice: Eliminar factura
Clone Invoice: Clonar factura
InvoiceOut deleted: Factura eliminada
diff --git a/modules/item/back/methods/item/updateTaxes.js b/modules/item/back/methods/item/updateTaxes.js
index 70a82757a4..262f4dcb1f 100644
--- a/modules/item/back/methods/item/updateTaxes.js
+++ b/modules/item/back/methods/item/updateTaxes.js
@@ -40,7 +40,7 @@ module.exports = Self => {
if (!tax.taxClassFk)
throw new UserError('Tax class cannot be blank');
- promises.push(Self.app.models.ItemTaxCountry.update(
+ promises.push(Self.app.models.ItemTaxCountry.updateAll(
{id: tax.id},
{taxClassFk: tax.taxClassFk}
), myOptions);
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 1b56d87f78..5627975d8c 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -129,54 +129,20 @@ module.exports = Self => {
const where = buildFilter(ctx.args, (param, value) => {
switch (param) {
- case 'search':
- return /^\d+$/.test(value)
- ? {'t.id': {inq: value}}
- : {'t.nickname': {like: `%${value}%`}};
case 'from':
return {'t.shipped': {gte: value}};
case 'to':
return {'t.shipped': {lte: value}};
- case 'nickname':
- return {'t.nickname': {like: `%${value}%`}};
- case 'refFk':
- return {'t.refFk': value};
case 'salesPersonFk':
return {'c.salesPersonFk': value};
- case 'provinceFk':
- return {'a.provinceFk': value};
- case 'stateFk':
- return {'ts.stateFk': value};
case 'mine':
case 'myTeam':
if (value)
return {'c.salesPersonFk': {inq: teamMembersId}};
else
return {'c.salesPersonFk': {nin: teamMembersId}};
-
- case 'alertLevel':
- return {'ts.alertLevel': value};
- case 'pending':
- if (value) {
- return {and: [
- {'st.alertLevel': 0},
- {'st.code': {nin: [
- 'OK',
- 'BOARDING',
- 'PRINTED',
- 'PRINTED_AUTO',
- 'PICKER_DESIGNED'
- ]}}
- ]};
- } else {
- return {and: [
- {'st.alertLevel': {gt: 0}}
- ]};
- }
case 'id':
case 'clientFk':
- case 'agencyModeFk':
- case 'warehouseFk':
param = `t.${param}`;
return {[param]: value};
}
@@ -196,7 +162,6 @@ module.exports = Self => {
t.id,
t.shipped,
CAST(DATE(t.shipped) AS CHAR) AS shippedDate,
- HOUR(t.shipped) AS shippedHour,
t.nickname,
t.refFk,
t.routeFk,
@@ -217,12 +182,12 @@ module.exports = Self => {
ts.code AS alertLevelCode,
u.name AS userName,
c.salesPersonFk,
+ c.credit,
z.hour AS zoneLanding,
- HOUR(z.hour) AS zoneHour,
- MINUTE(z.hour) AS zoneMinute,
z.name AS zoneName,
z.id AS zoneFk,
- CAST(z.hour AS CHAR) AS hour,
+ TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour,
+ TIME_FORMAT(z.hour, '%H:%i') AS theoreticalhour,
TIME_FORMAT(zed.etc, '%H:%i') AS practicalHour
FROM ticket t
LEFT JOIN invoiceOut io ON t.refFk = io.ref
@@ -248,6 +213,47 @@ module.exports = Self => {
stmt.merge(conn.makeWhere(filter.where));
stmts.push(stmt);
+ // Get client debt balance
+ stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt');
+ stmts.push(`
+ CREATE TEMPORARY TABLE tmp.clientGetDebt
+ (INDEX (clientFk))
+ ENGINE = MEMORY
+ SELECT DISTINCT clientFk FROM tmp.filter`);
+
+ stmt = new ParameterizedSQL('CALL clientGetDebt(?)', [args.to]);
+ stmts.push(stmt);
+ stmts.push('DROP TEMPORARY TABLE tmp.clientGetDebt');
+
+ stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.tickets');
+ stmt = new ParameterizedSQL(`
+ CREATE TEMPORARY TABLE tmp.tickets
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT f.*, r.risk AS debt
+ FROM tmp.filter f
+ LEFT JOIN tmp.risk r ON f.clientFk = r.clientFk`);
+ stmts.push(stmt);
+
+ // Sum risk to future
+ stmts.push(`SET @client:= 0`);
+ stmts.push('SET @risk := 0');
+ stmts.push(`
+ UPDATE tmp.tickets
+ SET debt = IF(@client <> @client:= clientFk,
+ -totalWithVat + @risk:= - debt + totalWithVat,
+ -totalWithVat + @risk:= @risk + totalWithVat
+ )
+ ORDER BY clientFk, shipped DESC
+ `);
+
+ // Remove positive risks
+ stmts.push(`
+ UPDATE tmp.tickets t
+ SET debt = 0
+ WHERE t.debt + t.credit >= 0
+ `);
+
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems');
stmts.push(`
CREATE TEMPORARY TABLE tmp.sale_getProblems
@@ -260,27 +266,39 @@ module.exports = Self => {
AND f.shipped >= CURDATE()`);
stmts.push('CALL ticket_getProblems(FALSE)');
+ stmts.push(`
+ INSERT INTO tmp.ticket_problems (ticketFk, risk, totalProblems)
+ SELECT t.id, t.debt + t.credit AS risk, 1
+ FROM tmp.tickets t
+ WHERE (t.debt + t.credit) < 0
+ ON DUPLICATE KEY UPDATE
+ risk = t.debt + t.credit, totalProblems = totalProblems + 1
+ `);
+
stmt = new ParameterizedSQL(`
- SELECT f.*, tp.*
- FROM tmp.filter f
- LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = f.id`);
+ SELECT t.*, tp.*,
+ ((tp.risk) + cc.riskTolerance < 0) AS hasHighRisk
+ FROM tmp.tickets t
+ LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = t.id
+ JOIN clientConfig cc`);
const hasProblems = args.problems;
if (hasProblems != undefined && (!args.from && !args.to))
throw new UserError('Choose a date range or days forward');
- let problemsFilter;
+ let finalFilter = {};
+ let whereProblems;
if (hasProblems === true) {
- problemsFilter = {or: [
+ whereProblems = {or: [
{'tp.isFreezed': true},
- {'tp.risk': {gt: 0}},
+ {'tp.risk': {lt: 0}},
{'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true},
{'tp.isTaxDataChecked': false},
{'tp.isAvailable': false}
]};
} else if (hasProblems === false) {
- problemsFilter = {and: [
+ whereProblems = {and: [
{'tp.isFreezed': false},
{'tp.risk': 0},
{'tp.hasTicketRequest': false},
@@ -290,8 +308,53 @@ module.exports = Self => {
]};
}
- if (problemsFilter)
- stmt.merge(conn.makeWhere(problemsFilter));
+ if (whereProblems) finalFilter.where = whereProblems;
+
+ const myWhere = buildFilter(ctx.args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? {'t.id': {inq: value}}
+ : {'t.nickname': {like: `%${value}%`}};
+
+ case 'nickname':
+ return {'t.nickname': {like: `%${value}%`}};
+ case 'refFk':
+ return {'t.refFk': value};
+
+ case 'provinceFk':
+ return {'t.provinceFk': value};
+ case 'stateFk':
+ return {'t.stateFk': value};
+ case 'alertLevel':
+ return {'t.alertLevel': value};
+ case 'pending':
+ if (value) {
+ return {and: [
+ {'t.alertLevel': 0},
+ {'t.alertLevelCode': {nin: [
+ 'OK',
+ 'BOARDING',
+ 'PRINTED',
+ 'PRINTED_AUTO',
+ 'PICKER_DESIGNED'
+ ]}}
+ ]};
+ } else {
+ return {and: [
+ {'t.alertLevel': {gt: 0}}
+ ]};
+ }
+ case 'agencyModeFk':
+ case 'warehouseFk':
+ param = `t.${param}`;
+ return {[param]: value};
+ }
+ });
+
+ finalFilter = mergeFilters(finalFilter, {where: myWhere});
+ if (finalFilter.where)
+ stmt.merge(conn.makeWhere(finalFilter.where));
stmt.merge(conn.makeOrderBy(filter.order));
stmt.merge(conn.makeLimit(filter));
@@ -300,7 +363,9 @@ module.exports = Self => {
stmts.push(
`DROP TEMPORARY TABLE
tmp.filter,
- tmp.ticket_problems`);
+ tmp.ticket_problems,
+ tmp.sale_getProblems,
+ tmp.risk`);
let sql = ParameterizedSQL.join(stmts, ';');
let result = await conn.executeStmt(sql);
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index 53cd9941ef..28e2b5571a 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -1,15 +1,15 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('SalesMonitor salesFilter()', () => {
- it('should return the tickets matching the filter', async() => {
+ it('should now return the tickets matching the filter', async() => {
const ctx = {req: {accessToken: {userId: 9}}, args: {}};
const filter = {order: 'id DESC'};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
expect(result.length).toEqual(24);
});
- it('should return the tickets matching the problems on true', async() => {
+ it('should now return the tickets matching the problems on true', async() => {
const yesterday = new Date();
yesterday.setHours(0, 0, 0, 0);
const today = new Date();
@@ -21,12 +21,12 @@ describe('SalesMonitor salesFilter()', () => {
to: today
}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
- expect(result.length).toEqual(9);
+ expect(result.length).toEqual(13);
});
- it('should return the tickets matching the problems on false', async() => {
+ it('should now return the tickets matching the problems on false', async() => {
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
yesterday.setHours(0, 0, 0, 0);
@@ -39,33 +39,33 @@ describe('SalesMonitor salesFilter()', () => {
to: today
}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
expect(result.length).toEqual(0);
});
- it('should return the tickets matching the problems on null', async() => {
+ it('should now return the tickets matching the problems on null', async() => {
const ctx = {req: {accessToken: {userId: 9}}, args: {problems: null}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
expect(result.length).toEqual(24);
});
- it('should return the tickets matching the orderId 11', async() => {
+ it('should now return the tickets matching the orderId 11', async() => {
const ctx = {req: {accessToken: {userId: 9}}, args: {orderFk: 11}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
const firstRow = result[0];
expect(result.length).toEqual(1);
expect(firstRow.id).toEqual(11);
});
- it('should return the tickets with grouped state "Pending" and not "Ok" nor "BOARDING"', async() => {
+ it('should now return the tickets with grouped state "Pending" and not "Ok" nor "BOARDING"', async() => {
const ctx = {req: {accessToken: {userId: 9}}, args: {pending: true}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
const length = result.length;
const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
@@ -74,10 +74,10 @@ describe('SalesMonitor salesFilter()', () => {
expect(anyResult.state).toMatch(/(Libre|Arreglar)/);
});
- it('should return the tickets that are not pending', async() => {
+ it('should now return the tickets that are not pending', async() => {
const ctx = {req: {accessToken: {userId: 9}}, args: {pending: false}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
const firstRow = result[0];
const secondRow = result[1];
const thirdRow = result[2];
@@ -88,18 +88,18 @@ describe('SalesMonitor salesFilter()', () => {
expect(thirdRow.state).toEqual('Entregado');
});
- it('should return the tickets from the worker team', async() => {
+ it('should now return the tickets from the worker team', async() => {
const ctx = {req: {accessToken: {userId: 18}}, args: {myTeam: true}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
expect(result.length).toEqual(20);
});
- it('should return the tickets that are not from the worker team', async() => {
+ it('should now return the tickets that are not from the worker team', async() => {
const ctx = {req: {accessToken: {userId: 18}}, args: {myTeam: false}};
const filter = {};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
expect(result.length).toEqual(4);
});
@@ -113,7 +113,7 @@ describe('SalesMonitor salesFilter()', () => {
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
const filter = {order: 'totalProblems DESC'};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
const firstTicket = result.shift();
const secondTicket = result.shift();
@@ -131,7 +131,7 @@ describe('SalesMonitor salesFilter()', () => {
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
const filter = {order: 'totalProblems ASC'};
- const result = await app.models.SalesMonitor.salesFilter(ctx, filter);
+ const result = await models.SalesMonitor.salesFilter(ctx, filter);
const firstTicket = result.shift();
const secondTicket = result.shift();
diff --git a/modules/monitor/front/index/search-panel/index.html b/modules/monitor/front/index/search-panel/index.html
index dc24c778bf..5458202d22 100644
--- a/modules/monitor/front/index/search-panel/index.html
+++ b/modules/monitor/front/index/search-panel/index.html
@@ -70,7 +70,7 @@
diff --git a/modules/monitor/front/index/search-panel/index.js b/modules/monitor/front/index/search-panel/index.js
index 057d555e46..ef6625e8a5 100644
--- a/modules/monitor/front/index/search-panel/index.js
+++ b/modules/monitor/front/index/search-panel/index.js
@@ -14,7 +14,7 @@ class Controller extends SearchPanel {
this.$http.get('AlertLevels').then(res => {
for (let state of res.data) {
groupedStates.push({
- alertLevel: state.alertLevel,
+ id: state.id,
code: state.code,
name: this.$t(state.code)
});
diff --git a/modules/monitor/front/index/search-panel/index.spec.js b/modules/monitor/front/index/search-panel/index.spec.js
index 0d19fd35fe..f862e8d775 100644
--- a/modules/monitor/front/index/search-panel/index.spec.js
+++ b/modules/monitor/front/index/search-panel/index.spec.js
@@ -18,7 +18,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
jest.spyOn(controller, '$t').mockReturnValue('miCodigo');
const data = [
{
- alertLevel: 9999,
+ id: 9999,
code: 'myCode'
}
];
@@ -27,7 +27,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
$httpBackend.flush();
expect(controller.groupedStates).toEqual([{
- alertLevel: 9999,
+ id: 9999,
code: 'myCode',
name: 'miCodigo'
}]);
diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html
index 82adf27656..4a166d51a9 100644
--- a/modules/monitor/front/index/tickets/index.html
+++ b/modules/monitor/front/index/tickets/index.html
@@ -1,9 +1,8 @@
-
+ order="shippedDate DESC, preparationHour ASC, zoneLanding ASC, id">
Client
Salesperson
Date
- Prep.
- Theoretical
+ Prep.
+ Theoretical
Practical
Province
State
@@ -51,7 +50,7 @@
-
+
this.$.model.applyFilter(null, this.filterParams));
+ }
+ }
+
+ fetchParams($params = {}) {
+ const excludedParams = [
+ 'search',
+ 'clientFk',
+ 'orderFk',
+ 'refFk',
+ 'scopeDays'
+ ];
+
+ const hasExcludedParams = excludedParams.some(param => {
+ return $params && $params[param];
+ });
+ const hasParams = Object.entries($params).length;
+ if (!hasParams || !hasExcludedParams)
$params.scopeDays = 1;
if (typeof $params.scopeDays === 'number') {
@@ -68,8 +85,10 @@ export default class Controller extends Section {
return {'c.salesPersonFk': value};
case 'provinceFk':
return {'a.provinceFk': value};
- case 'hour':
+ case 'theoreticalHour':
return {'z.hour': value};
+ case 'practicalHour':
+ return {'zed.etc': value};
case 'shipped':
return {'t.shipped': {
between: this.dateRange(value)}
diff --git a/modules/order/back/methods/order-row/specs/addToOrder.spec.js b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
index 3b832dee28..6e937176db 100644
--- a/modules/order/back/methods/order-row/specs/addToOrder.spec.js
+++ b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
@@ -3,10 +3,8 @@ const app = require('vn-loopback/server/server');
describe('order addToOrder()', () => {
const orderId = 8;
let rowToDelete;
- afterAll(async done => {
+ afterAll(async() => {
await app.models.OrderRow.removes({rows: [rowToDelete], actualOrderId: orderId});
-
- done();
});
it('should add a row to a given order', async() => {
diff --git a/modules/order/back/methods/order-row/specs/removes.spec.js b/modules/order/back/methods/order-row/specs/removes.spec.js
index 1c68c6052a..510676aa0a 100644
--- a/modules/order/back/methods/order-row/specs/removes.spec.js
+++ b/modules/order/back/methods/order-row/specs/removes.spec.js
@@ -4,12 +4,10 @@ describe('order removes()', () => {
let row;
let newRow;
- beforeAll(async done => {
+ beforeAll(async() => {
row = await app.models.OrderRow.findOne({where: {id: 12}});
row.id = null;
newRow = await app.models.OrderRow.create(row);
-
- done();
});
it('should throw an error if rows property is empty', async() => {
diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index ef6ea8a44b..bd987dd5b0 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -119,7 +119,7 @@ module.exports = Self => {
case 'sourceApp':
return {'o.source_app': value};
case 'ticketFk':
- return {'ort.ticketFk': value};
+ return {'ot.ticketFk': value};
case 'isConfirmed':
return {'o.confirmed': value ? 1 : 0};
case 'myTeam':
@@ -137,7 +137,10 @@ module.exports = Self => {
let stmt;
stmt = new ParameterizedSQL(
- `SELECT
+ `CREATE TEMPORARY TABLE tmp.filter
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT
o.id,
o.total,
o.date_send landed,
@@ -168,20 +171,20 @@ module.exports = Self => {
LEFT JOIN ticket t ON t.id = ot.ticketFk
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
- if (args && args.ticketFk) {
- stmt.merge({
- sql: `LEFT JOIN orderTicket ort ON ort.orderFk = o.id`
- });
- }
-
stmt.merge(conn.makeWhere(filter.where));
- stmt.merge(`GROUP BY o.id`);
stmt.merge(conn.makePagination(filter));
stmts.push(stmt);
+ stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
+ stmt.merge(`GROUP BY id`);
+ stmt.merge(conn.makeOrderBy(filter.order));
+ const ordersIndex = stmts.push(stmt) - 1;
+
+ stmts.push(`DROP TEMPORARY TABLE tmp.filter`);
+
const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql);
- return result;
+ return result[ordersIndex];
};
};
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index 84e33b7790..8caed24522 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -4,10 +4,8 @@ let UserError = require('vn-loopback/util/user-error');
describe('order new()', () => {
let orderId;
- afterAll(async done => {
+ afterAll(async() => {
await app.models.Order.destroyById(orderId);
-
- done();
});
it('should throw an error if the client isnt active', async() => {
diff --git a/modules/order/back/methods/order/specs/updateBasicData.spec.js b/modules/order/back/methods/order/specs/updateBasicData.spec.js
index 5e83d69a01..adf009bc15 100644
--- a/modules/order/back/methods/order/specs/updateBasicData.spec.js
+++ b/modules/order/back/methods/order/specs/updateBasicData.spec.js
@@ -2,12 +2,10 @@ const app = require('vn-loopback/server/server');
describe('Order updateBasicData', () => {
const orderId = 21;
- afterAll(async done => {
+ afterAll(async() => {
let validparams = {note: null};
await app.models.Order.updateBasicData(orderId, validparams);
-
- done();
});
it('should return an error if the order is confirmed', async() => {
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 288e81226e..a2a4a52261 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -17,7 +17,7 @@
Landed
Hour
Agency
- Total
+ Total
diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js
index 4e70d727e0..892324acfb 100644
--- a/modules/route/back/methods/route/specs/guessPriority.spec.js
+++ b/modules/route/back/methods/route/specs/guessPriority.spec.js
@@ -4,14 +4,12 @@ describe('route guessPriority()', () => {
const targetRouteId = 7;
let routeTicketsToRestore;
- afterAll(async done => {
+ afterAll(async() => {
let restoreFixtures = [];
routeTicketsToRestore.forEach(ticket => {
restoreFixtures.push(ticket.updateAttribute('priority', null));
});
await Promise.all(restoreFixtures);
-
- done();
});
it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => {
diff --git a/modules/route/back/methods/route/specs/insertTicket.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js
index 9e78064968..7c60e755f7 100644
--- a/modules/route/back/methods/route/specs/insertTicket.spec.js
+++ b/modules/route/back/methods/route/specs/insertTicket.spec.js
@@ -8,12 +8,10 @@ describe('route insertTicket()', () => {
accessToken: {userId: deliveryId},
};
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should add the ticket to a route', async() => {
diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js
index f7dd151390..c3c99e6765 100644
--- a/modules/supplier/back/models/specs/supplier.spec.js
+++ b/modules/supplier/back/models/specs/supplier.spec.js
@@ -4,18 +4,14 @@ describe('loopback model Supplier', () => {
let supplierOne;
let supplierTwo;
- beforeAll(async done => {
+ beforeAll(async() => {
supplierOne = await app.models.Supplier.findById(1);
supplierTwo = await app.models.Supplier.findById(442);
-
- done();
});
- afterAll(async done => {
+ afterAll(async() => {
await supplierOne.updateAttribute('payMethodFk', supplierOne.payMethodFk);
await supplierTwo.updateAttribute('payMethodFk', supplierTwo.payMethodFk);
-
- done();
});
describe('payMethodFk', () => {
diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js
index 817630eec9..5eb7510b73 100644
--- a/modules/ticket/back/methods/expedition/filter.js
+++ b/modules/ticket/back/methods/expedition/filter.js
@@ -7,13 +7,13 @@ module.exports = Self => {
accepts: [
{
arg: 'filter',
- type: 'Object',
+ type: 'object',
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
http: {source: 'query'},
},
],
returns: {
- type: ['Object'],
+ type: ['object'],
root: true,
},
http: {
@@ -22,7 +22,12 @@ module.exports = Self => {
},
});
- Self.filter = async filter => {
+ Self.filter = async(filter, options) => {
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
const stmt = new ParameterizedSQL(
`SELECT
e.id,
@@ -55,6 +60,6 @@ module.exports = Self => {
`);
stmt.merge(Self.buildSuffix(filter, 'e'));
- return await Self.rawStmt(stmt);
+ return Self.rawStmt(stmt, myOptions);
};
};
diff --git a/modules/ticket/back/methods/expedition/specs/filter.spec.js b/modules/ticket/back/methods/expedition/specs/filter.spec.js
new file mode 100644
index 0000000000..85e98da4a2
--- /dev/null
+++ b/modules/ticket/back/methods/expedition/specs/filter.spec.js
@@ -0,0 +1,21 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('expedition filter()', () => {
+ it('should return the expeditions matching the filter', async() => {
+ const tx = await models.Expedition.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const filter = {where: {packagingFk: 1}};
+ const response = await models.Expedition.filter(filter, options);
+
+ expect(response.length).toEqual(10);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/packaging/listPackaging.js b/modules/ticket/back/methods/packaging/listPackaging.js
index 174630f29d..c26bdbda66 100644
--- a/modules/ticket/back/methods/packaging/listPackaging.js
+++ b/modules/ticket/back/methods/packaging/listPackaging.js
@@ -7,13 +7,13 @@ module.exports = Self => {
accessType: 'READ',
accepts: [{
arg: 'filter',
- type: 'Object',
+ type: 'object',
required: false,
description: 'Filter defining where and paginated data',
http: {source: 'query'}
}],
returns: {
- type: ['Object'],
+ type: ['object'],
root: true
},
http: {
@@ -22,9 +22,14 @@ module.exports = Self => {
}
});
- Self.listPackaging = async filter => {
- let conn = Self.dataSource.connector;
- let stmt = new ParameterizedSQL(
+ Self.listPackaging = async(filter, options) => {
+ const conn = Self.dataSource.connector;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const stmt = new ParameterizedSQL(
`SELECT name, itemFk, packagingFk
FROM (SELECT i.name, i.id itemFk, p.id packagingFk
FROM item i
@@ -33,6 +38,7 @@ module.exports = Self => {
);
stmt.merge(conn.makeSuffix(filter));
- return conn.executeStmt(stmt);
+
+ return conn.executeStmt(stmt, myOptions);
};
};
diff --git a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
index 9633093f1a..3d07b90f96 100644
--- a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
+++ b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
@@ -1,12 +1,22 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket listPackaging()', () => {
it('should return the packaging', async() => {
- let filter = {where: {packagingFk: 1}};
- let response = await app.models.Packaging.listPackaging(filter);
+ const tx = await models.Packaging.beginTransaction({});
- expect(response[0].name).toBeDefined();
- expect(response[0].name).toEqual('Container ammo box 1m');
+ try {
+ const options = {transaction: tx};
+
+ const filter = {where: {packagingFk: 1}};
+ const response = await models.Packaging.listPackaging(filter, options);
+
+ expect(response[0].name).toEqual('Container ammo box 1m');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
index 0bcb94c036..c0d63ef626 100644
--- a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
+++ b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
@@ -7,11 +7,11 @@ module.exports = Self => {
accessType: 'READ',
accepts: [{
arg: 'filter',
- type: 'Object',
+ type: 'object',
description: 'Filter defining where and paginated data'
}],
returns: {
- type: ['Object'],
+ type: ['object'],
root: true
},
http: {
@@ -20,8 +20,13 @@ module.exports = Self => {
}
});
- Self.listSaleTracking = async filter => {
- let stmt = new ParameterizedSQL(`
+ Self.listSaleTracking = async(filter, options) => {
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const stmt = new ParameterizedSQL(`
SELECT
st.id,
s.ticketFk,
@@ -41,9 +46,9 @@ module.exports = Self => {
stmt.merge(Self.makeSuffix(filter));
- let trackings = await Self.rawStmt(stmt);
+ const trackings = await Self.rawStmt(stmt, myOptions);
- let salesFilter = {
+ const salesFilter = {
include: [
{
relation: 'item'
@@ -52,14 +57,14 @@ module.exports = Self => {
where: {ticketFk: filter.where.ticketFk}
};
- let sales = await Self.app.models.Sale.find(salesFilter);
+ const sales = await Self.app.models.Sale.find(salesFilter, myOptions);
- trackings.forEach(tracking => {
- sales.forEach(sale => {
+ for (const tracking of trackings) {
+ for (const sale of sales) {
if (tracking.itemFk == sale.itemFk)
tracking.item = sale.item();
- });
- });
+ }
+ }
return trackings;
};
diff --git a/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js b/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
index 7b19f45bb6..d51c56874e 100644
--- a/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
+++ b/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
@@ -1,17 +1,39 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket listSaleTracking()', () => {
it('should call the listSaleTracking method and return the response', async() => {
- let filter = {where: {ticketFk: 1}};
- let result = await app.models.SaleTracking.listSaleTracking(filter);
+ const tx = await models.SaleTracking.beginTransaction({});
- expect(result.length).toEqual(4);
+ try {
+ const options = {transaction: tx};
+
+ const filter = {where: {ticketFk: 1}};
+ const result = await models.SaleTracking.listSaleTracking(filter, options);
+
+ expect(result.length).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it(`should call the listSaleTracking method and return zero if doesn't have lines`, async() => {
- let filter = {where: {ticketFk: 2}};
- let result = await app.models.SaleTracking.listSaleTracking(filter);
+ const tx = await models.SaleTracking.beginTransaction({});
- expect(result.length).toEqual(0);
+ try {
+ const options = {transaction: tx};
+
+ const filter = {where: {ticketFk: 2}};
+ const result = await models.SaleTracking.listSaleTracking(filter, options);
+
+ expect(result.length).toEqual(0);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/deleteSales.js b/modules/ticket/back/methods/sale/deleteSales.js
index a604da8582..c1359569d7 100644
--- a/modules/ticket/back/methods/sale/deleteSales.js
+++ b/modules/ticket/back/methods/sale/deleteSales.js
@@ -26,54 +26,73 @@ module.exports = Self => {
}
});
- Self.deleteSales = async(ctx, sales, ticketId) => {
+ Self.deleteSales = async(ctx, sales, ticketId, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- const canEditSales = await models.Sale.canEdit(ctx, sales);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- const ticket = await models.Ticket.findById(ticketId, {
- include: {
- relation: 'client',
- scope: {
- include: {
- relation: 'salesPersonUser',
- scope: {
- fields: ['id', 'name']
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const canEditSales = await models.Sale.canEdit(ctx, sales, myOptions);
+
+ const ticket = await models.Ticket.findById(ticketId, {
+ include: {
+ relation: 'client',
+ scope: {
+ include: {
+ relation: 'salesPersonUser',
+ scope: {
+ fields: ['id', 'name']
+ }
}
}
}
+ }, myOptions);
+
+ const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
+ if (!isTicketEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
+
+ if (!canEditSales)
+ throw new UserError(`Sale(s) blocked, please contact production`);
+
+ const promises = [];
+ let deletions = '';
+ for (let sale of sales) {
+ const deletedSale = models.Sale.destroyById(sale.id, myOptions);
+ deletions += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity})`;
+
+ promises.push(deletedSale);
}
- });
- const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId);
- if (!isTicketEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ const salesPerson = ticket.client().salesPersonUser();
+ if (salesPerson) {
+ const origin = ctx.req.headers.origin;
- if (!canEditSales)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ const message = $t('Deleted sales from ticket', {
+ ticketId: ticketId,
+ ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
+ deletions: deletions
+ });
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
+ }
- const promises = [];
- let deletions = '';
- for (let sale of sales) {
- const deletedSale = models.Sale.destroyById(sale.id);
- deletions += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity})`;
+ const deletedSales = await Promise.all(promises);
- promises.push(deletedSale);
+ if (tx) await tx.commit();
+
+ return deletedSales;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
-
- const salesPerson = ticket.client().salesPersonUser();
- if (salesPerson) {
- const origin = ctx.req.headers.origin;
-
- const message = $t('Deleted sales from ticket', {
- ticketId: ticketId,
- ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
- deletions: deletions
- });
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
- }
-
- return Promise.all(promises);
};
};
diff --git a/modules/ticket/back/methods/sale/getClaimableFromTicket.js b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
index adfb917103..4e0549a4d3 100644
--- a/modules/ticket/back/methods/sale/getClaimableFromTicket.js
+++ b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
@@ -18,26 +18,32 @@ module.exports = Self => {
}
});
- Self.getClaimableFromTicket = async ticketFk => {
- let query = `SELECT
- s.id AS saleFk,
- t.id AS ticketFk,
- t.landed,
- s.concept,
- s.itemFk,
- s.quantity,
- s.price,
- s.discount,
- t.nickname
- FROM vn.ticket t
- INNER JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
+ Self.getClaimableFromTicket = async(ticketFk, options) => {
+ const myOptions = {};
- WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, CURDATE())
- AND t.id = ? AND cb.id IS NULL
- ORDER BY t.landed DESC, t.id DESC`;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- let claimableSales = await Self.rawSql(query, [ticketFk]);
+ const query = `
+ SELECT
+ s.id AS saleFk,
+ t.id AS ticketFk,
+ t.landed,
+ s.concept,
+ s.itemFk,
+ s.quantity,
+ s.price,
+ s.discount,
+ t.nickname
+ FROM vn.ticket t
+ INNER JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
+
+ WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, CURDATE())
+ AND t.id = ? AND cb.id IS NULL
+ ORDER BY t.landed DESC, t.id DESC`;
+
+ const claimableSales = await Self.rawSql(query, [ticketFk], myOptions);
return claimableSales;
};
diff --git a/modules/ticket/back/methods/sale/recalculatePrice.js b/modules/ticket/back/methods/sale/recalculatePrice.js
index 9e902d393e..3ffc23c3b8 100644
--- a/modules/ticket/back/methods/sale/recalculatePrice.js
+++ b/modules/ticket/back/methods/sale/recalculatePrice.js
@@ -20,20 +20,39 @@ module.exports = Self => {
}
});
- Self.recalculatePrice = async(ctx, id) => {
+ Self.recalculatePrice = async(ctx, id, options) => {
const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- const sale = await Self.findById(id);
- const isEditable = await models.Ticket.isEditable(ctx, sale.ticketFk);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
- const canEditSale = await models.Sale.canEdit(ctx, [id]);
+ try {
+ const sale = await Self.findById(id, null, myOptions);
+ const isEditable = await models.Ticket.isEditable(ctx, sale.ticketFk, myOptions);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ if (!isEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
- return Self.rawSql('CALL vn.sale_calculateComponent(?, null)', [id]);
+ const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
+
+ if (!canEditSale)
+ throw new UserError(`Sale(s) blocked, please contact production`);
+
+ const recalculation = await Self.rawSql('CALL vn.sale_calculateComponent(?, null)', [id], myOptions);
+
+ if (tx) await tx.commit();
+
+ return recalculation;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/sale/reserve.js b/modules/ticket/back/methods/sale/reserve.js
index 639827fa7d..b368f6fc3d 100644
--- a/modules/ticket/back/methods/sale/reserve.js
+++ b/modules/ticket/back/methods/sale/reserve.js
@@ -34,63 +34,80 @@ module.exports = Self => {
}
});
- Self.reserve = async(ctx, ticketId, sales, reserved) => {
+ Self.reserve = async(ctx, ticketId, sales, reserved, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId);
- if (!isTicketEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- const canEditSale = await models.Sale.canEdit(ctx, sales);
-
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
-
- let changesMade = '';
- const promises = [];
-
- for (let sale of sales) {
- if (sale.reserved != reserved) {
- const oldState = sale.reserved ? 'reserved' : 'regular';
- const newState = reserved ? 'reserved' : 'regular';
-
- const reservedSale = models.Sale.update({id: sale.id}, {reserved: reserved});
-
- promises.push(reservedSale);
-
- changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity}) ${$t('State')}: ${$t(oldState)} âž” *${$t(newState)}*`;
- }
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
}
- const result = await Promise.all(promises);
+ try {
+ const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
+ if (!isTicketEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
- const ticket = await models.Ticket.findById(ticketId, {
- include: {
- relation: 'client',
- scope: {
- include: {
- relation: 'salesPersonUser',
- scope: {
- fields: ['id', 'name']
+ const canEditSale = await models.Sale.canEdit(ctx, sales, myOptions);
+
+ if (!canEditSale)
+ throw new UserError(`Sale(s) blocked, please contact production`);
+
+ let changesMade = '';
+ const promises = [];
+
+ for (let sale of sales) {
+ if (sale.reserved != reserved) {
+ const oldState = sale.reserved ? 'reserved' : 'regular';
+ const newState = reserved ? 'reserved' : 'regular';
+
+ const reservedSale = models.Sale.updateAll({id: sale.id}, {reserved: reserved}, myOptions);
+
+ promises.push(reservedSale);
+
+ changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity}) ${$t('State')}: ${$t(oldState)} âž” *${$t(newState)}*`;
+ }
+ }
+
+ const result = await Promise.all(promises);
+
+ const ticket = await models.Ticket.findById(ticketId, {
+ include: {
+ relation: 'client',
+ scope: {
+ include: {
+ relation: 'salesPersonUser',
+ scope: {
+ fields: ['id', 'name']
+ }
}
}
}
+ }, myOptions);
+
+ const salesPerson = ticket.client().salesPersonUser();
+ if (salesPerson) {
+ const origin = ctx.req.headers.origin;
+
+ const message = $t('Changed sale reserved state', {
+ ticketId: ticketId,
+ ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
+ changes: changesMade
+ });
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
- });
- const salesPerson = ticket.client().salesPersonUser();
- if (salesPerson) {
- const origin = ctx.req.headers.origin;
+ if (tx) await tx.commit();
- const message = $t('Changed sale reserved state', {
- ticketId: ticketId,
- ticketUrl: `${origin}/#!/ticket/${ticketId}/sale`,
- changes: changesMade
- });
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+ return result;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
-
- return result;
};
};
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index fb1e1ab877..4f6747257e 100644
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@@ -1,36 +1,69 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale canEdit()', () => {
it('should return true if the role is production regardless of the saleTrackings', async() => {
- const productionUserID = 49;
- let ctx = {req: {accessToken: {userId: productionUserID}}};
+ const tx = await models.Sale.beginTransaction({});
- const sales = [{id: 3}];
+ try {
+ const options = {transaction: tx};
- const result = await app.models.Sale.canEdit(ctx, sales);
+ const productionUserID = 49;
+ const ctx = {req: {accessToken: {userId: productionUserID}}};
- expect(result).toEqual(true);
+ const sales = [{id: 3}];
+
+ const result = await models.Sale.canEdit(ctx, sales, options);
+
+ expect(result).toEqual(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return true if the role is not production and none of the sales has saleTracking', async() => {
- const salesPersonUserID = 18;
- let ctx = {req: {accessToken: {userId: salesPersonUserID}}};
+ const tx = await models.Sale.beginTransaction({});
- const sales = [{id: 10}];
+ try {
+ const options = {transaction: tx};
- const result = await app.models.Sale.canEdit(ctx, sales);
+ const salesPersonUserID = 18;
+ const ctx = {req: {accessToken: {userId: salesPersonUserID}}};
- expect(result).toEqual(true);
+ const sales = [{id: 10}];
+
+ const result = await models.Sale.canEdit(ctx, sales, options);
+
+ expect(result).toEqual(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return false if any of the sales has a saleTracking record', async() => {
- const salesPersonUserID = 18;
- let ctx = {req: {accessToken: {userId: salesPersonUserID}}};
+ const tx = await models.Sale.beginTransaction({});
- const sales = [{id: 3}];
+ try {
+ const options = {transaction: tx};
- const result = await app.models.Sale.canEdit(ctx, sales);
+ const salesPersonUserID = 18;
+ const ctx = {req: {accessToken: {userId: salesPersonUserID}}};
- expect(result).toEqual(false);
+ const sales = [{id: 3}];
+
+ const result = await models.Sale.canEdit(ctx, sales, options);
+
+ expect(result).toEqual(false);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/deleteSales.spec.js b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
index aabc383754..82cf916b32 100644
--- a/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
+++ b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
@@ -1,38 +1,29 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale deleteSales()', () => {
- let sale;
- 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);
- } catch (error) {
- console.error(error);
- }
-
- done();
- });
-
it('should throw an error if the ticket of the given sales is not editable', async() => {
- let ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
+ const tx = await models.Sale.beginTransaction({});
let error;
-
- const sales = [{id: 1, instance: 0}, {id: 2, instance: 1}];
- const ticketId = 2;
-
try {
- await app.models.Sale.deleteSales(ctx, sales, ticketId);
+ const options = {transaction: tx};
+
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+
+ const sales = [{id: 1, instance: 0}, {id: 2, instance: 1}];
+ const ticketId = 2;
+
+ await models.Sale.deleteSales(ctx, sales, ticketId, options);
+
+ await tx.rollback();
} catch (e) {
+ await tx.rollback();
error = e;
}
@@ -40,19 +31,33 @@ describe('sale deleteSales()', () => {
});
it('should delete the sale', async() => {
- let ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
+ const tx = await models.Sale.beginTransaction({});
- const sales = [{id: newSale.id, instance: 0}];
- const ticketId = 16;
+ try {
+ const options = {transaction: tx};
- let res = await app.models.Sale.deleteSales(ctx, sales, ticketId);
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const sale = await models.Sale.findOne({where: {id: 9}}, options);
+ sale.id = null;
+ const newSale = await models.Sale.create(sale, options);
- expect(res).toEqual([{count: 1}]);
+ const sales = [{id: newSale.id, instance: 0}];
+ const ticketId = 16;
+
+ const deletions = await models.Sale.deleteSales(ctx, sales, ticketId, options);
+
+ expect(deletions).toEqual([{count: 1}]);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js b/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
index b12c220849..d7eda99655 100644
--- a/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
+++ b/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
@@ -1,10 +1,21 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale getClaimableFromTicket()', () => {
it('should return the claimable sales of a given ticket', async() => {
- let claimableFromTicket = await app.models.Sale.getClaimableFromTicket(16);
+ const tx = await models.Sale.beginTransaction({});
- expect(claimableFromTicket[0].concept).toBe('Ranged weapon longbow 2m');
- expect(claimableFromTicket.length).toBe(3);
+ try {
+ const options = {transaction: tx};
+
+ const claimableFromTicket = await models.Sale.getClaimableFromTicket(16, options);
+
+ expect(claimableFromTicket[0].concept).toBe('Ranged weapon longbow 2m');
+ expect(claimableFromTicket.length).toBe(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js b/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
index 23d7d721b4..4f6579d322 100644
--- a/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
@@ -1,24 +1,43 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale recalculatePrice()', () => {
const saleId = 7;
it('should update the sale price', async() => {
- const ctx = {req: {accessToken: {userId: 9}}};
- const response = await app.models.Sale.recalculatePrice(ctx, saleId);
+ const tx = await models.Sale.beginTransaction({});
- expect(response.affectedRows).toBeDefined();
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 9}}};
+ const response = await models.Sale.recalculatePrice(ctx, saleId, options);
+
+ expect(response.affectedRows).toBeDefined();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should throw an error if the ticket is not editable', async() => {
- const ctx = {req: {accessToken: {userId: 9}}};
- const immutableSaleId = 1;
- await app.models.Sale.recalculatePrice(ctx, immutableSaleId)
- .catch(response => {
- expect(response).toEqual(new Error(`The sales of this ticket can't be modified`));
- error = response;
- });
+ const tx = await models.Sale.beginTransaction({});
- expect(error).toBeDefined();
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 9}}};
+ const immutableSaleId = 1;
+ await models.Sale.recalculatePrice(ctx, immutableSaleId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error(`The sales of this ticket can't be modified`));
});
});
diff --git a/modules/ticket/back/methods/sale/specs/reserve.spec.js b/modules/ticket/back/methods/sale/specs/reserve.spec.js
index 3752a2b6b9..c4b3b4e5db 100644
--- a/modules/ticket/back/methods/sale/specs/reserve.spec.js
+++ b/modules/ticket/back/methods/sale/specs/reserve.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale reserve()', () => {
const ctx = {
@@ -9,51 +9,54 @@ describe('sale reserve()', () => {
}
};
- afterAll(async done => {
- let ctx = {req: {accessToken: {userId: 9}}};
- let params = {
- sales: [
- {id: 7},
- {id: 8}],
- ticketFk: 11,
- reserved: false
- };
-
- await app.models.Sale.reserve(ctx, params);
-
- done();
- });
-
it('should throw an error if the ticket can not be modified', async() => {
+ const tx = await models.Sale.beginTransaction({});
+
let error;
- const ticketId = 2;
- const sales = [{id: 5}];
- const reserved = false;
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.reserve(ctx, ticketId, sales, reserved)
- .catch(response => {
- expect(response).toEqual(new Error(`The sales of this ticket can't be modified`));
- error = response;
- });
+ const ticketId = 2;
+ const sales = [{id: 5}];
+ const reserved = false;
- expect(error).toBeDefined();
+ await models.Sale.reserve(ctx, ticketId, sales, reserved, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error(`The sales of this ticket can't be modified`));
});
it('should update the given sales of a ticket to reserved', async() => {
- originalTicketSales = await app.models.Ticket.getSales(11);
+ const tx = await models.Sale.beginTransaction({});
- expect(originalTicketSales[0].reserved).toEqual(false);
- expect(originalTicketSales[1].reserved).toEqual(false);
+ try {
+ const options = {transaction: tx};
- const ticketId = 11;
- const sales = [{id: 7}, {id: 8}];
- const reserved = true;
+ originalTicketSales = await models.Ticket.getSales(11, options);
- await app.models.Sale.reserve(ctx, ticketId, sales, reserved);
+ expect(originalTicketSales[0].reserved).toEqual(false);
+ expect(originalTicketSales[1].reserved).toEqual(false);
- const reservedTicketSales = await app.models.Ticket.getSales(ticketId);
+ const ticketId = 11;
+ const sales = [{id: 7}, {id: 8}];
+ const reserved = true;
- expect(reservedTicketSales[0].reserved).toEqual(true);
- expect(reservedTicketSales[1].reserved).toEqual(true);
+ await models.Sale.reserve(ctx, ticketId, sales, reserved, options);
+
+ const reservedTicketSales = await models.Ticket.getSales(ticketId, options);
+
+ expect(reservedTicketSales[0].reserved).toEqual(true);
+ expect(reservedTicketSales[1].reserved).toEqual(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
index 428bac390f..01f610d36d 100644
--- a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
@@ -1,40 +1,45 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale updateConcept()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
const saleId = 1;
- let originalSale;
-
- beforeAll(async done => {
- originalSale = await app.models.Sale.findById(saleId);
-
- done();
- });
-
- afterAll(async done => {
- await originalSale.save();
-
- done();
- });
it('should throw if ID was undefined', async() => {
- let err;
- const newConcept = 'I am he new concept';
+ const tx = await models.Sale.beginTransaction({});
+ let error;
try {
- await app.models.Sale.updateConcept(ctx, undefined, newConcept);
+ const options = {transaction: tx};
+
+ const newConcept = 'not going to heppen';
+
+ await models.Sale.updateConcept(ctx, undefined, newConcept, options);
+
+ await tx.rollback();
} catch (e) {
- err = e;
+ await tx.rollback();
+ error = e;
}
- expect(err).toBeDefined();
+ expect(error).toBeDefined();
});
it('should update the sale concept', async() => {
- const newConcept = 'I am the new concept';
+ const tx = await models.Sale.beginTransaction({});
- let response = await app.models.Sale.updateConcept(ctx, saleId, newConcept);
+ try {
+ const options = {transaction: tx};
- expect(response.concept).toEqual(newConcept);
+ const newConcept = 'I am the new concept';
+
+ let response = await models.Sale.updateConcept(ctx, saleId, newConcept, options);
+
+ expect(response.concept).toEqual(newConcept);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index ea8a65c27b..e76511421e 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -1,104 +1,100 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale updatePrice()', () => {
- let originalSale;
- let originalSalesPersonMana;
- let createdSaleComponent;
- let saleId = 7;
- let manaComponentId;
-
- beforeAll(async done => {
- let component = await app.models.Component.findOne({where: {code: 'mana'}});
- manaComponentId = component.id;
- originalSale = await app.models.Sale.findById(saleId);
- originalSalesPersonMana = await app.models.WorkerMana.findById(18);
-
- done();
- });
+ const ctx = {
+ req: {
+ accessToken: {userId: 18},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const saleId = 7;
it('should throw an error if the ticket is not editable', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- let immutableSaleId = 1;
- let price = 5;
+ const tx = await models.Sale.beginTransaction({});
- await app.models.Sale.updatePrice(ctx, immutableSaleId, price)
- .catch(response => {
- expect(response).toEqual(new Error(`The sales of this ticket can't be modified`));
- error = response;
- });
+ try {
+ const options = {transaction: tx};
- expect(error).toBeDefined();
+ const immutableSaleId = 1;
+ const price = 5;
+
+ await models.Sale.updatePrice(ctx, immutableSaleId, price, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error(`The sales of this ticket can't be modified`));
});
it('should return 0 if the price is an empty string', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
+ const tx = await models.Sale.beginTransaction({});
- let price = '';
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.updatePrice(ctx, saleId, price);
- let updatedSale = await app.models.Sale.findById(saleId);
+ const price = '';
- expect(updatedSale.price).toEqual(0);
+ await models.Sale.updatePrice(ctx, saleId, price, options);
+ const updatedSale = await models.Sale.findById(saleId, null, options);
- // restores
- await originalSale.updateAttributes(originalSale);
- await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
- await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
+ expect(updatedSale.price).toEqual(0);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should now set price as a number in a string', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
+ const tx = await models.Sale.beginTransaction({});
- let price = '8';
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.updatePrice(ctx, saleId, price);
- let updatedSale = await app.models.Sale.findById(saleId);
+ const price = '8';
- expect(updatedSale.price).toEqual(8);
+ await models.Sale.updatePrice(ctx, saleId, price, options);
+ const updatedSale = await models.Sale.findById(saleId, null, options);
- // restores
- await originalSale.updateAttributes(originalSale);
- await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
- await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
+ expect(updatedSale.price).toEqual(8);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
- // #2736 sale updatePrice() returns inconsistent values
- xit('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;
+ it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
+ const tx = await models.Sale.beginTransaction({});
- await app.models.Sale.updatePrice(ctx, saleId, price);
- let updatedSale = await app.models.Sale.findById(saleId);
- createdSaleComponent = await app.models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponentId}});
+ try {
+ const options = {transaction: tx};
- expect(updatedSale.price).toBe(price);
- expect(createdSaleComponent.value).toEqual(-2.04);
+ const price = 5.4;
+ const originalSalesPersonMana = await models.WorkerMana.findById(18, null, options);
+ const manaComponent = await models.Component.findOne({where: {code: 'mana'}}, options);
- let updatedSalesPersonMana = await app.models.WorkerMana.findById(18);
+ await models.Sale.updatePrice(ctx, saleId, price, options);
+ const updatedSale = await models.Sale.findById(saleId, null, options);
+ createdSaleComponent = await models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponent.id}}, options);
- expect(updatedSalesPersonMana.amount).not.toEqual(originalSalesPersonMana.amount);
+ expect(updatedSale.price).toBe(price);
+ expect(createdSaleComponent.value).toEqual(-2.04);
- // restores
- await originalSale.updateAttributes(originalSale);
- await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0});
- await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
+ const updatedSalesPersonMana = await models.WorkerMana.findById(18, null, options);
+
+ expect(updatedSalesPersonMana.amount).not.toEqual(originalSalesPersonMana.amount);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js b/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
index dabdac3840..4c961faab5 100644
--- a/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale updateQuantity()', () => {
const ctx = {
@@ -10,44 +10,61 @@ describe('sale updateQuantity()', () => {
};
it('should throw an error if the quantity is not a number', async() => {
+ const tx = await models.Sale.beginTransaction({});
+
let error;
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.updateQuantity(ctx, 1, 'wrong quantity!')
- .catch(response => {
- expect(response).toEqual(new Error('The value should be a number'));
- error = response;
- });
+ await models.Sale.updateQuantity(ctx, 1, 'wrong quantity!', options);
- expect(error).toBeDefined();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error('The value should be a number'));
});
it('should throw an error if the quantity is greater than it should be', async() => {
+ const tx = await models.Sale.beginTransaction({});
+
let error;
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.updateQuantity(ctx, 1, 99)
- .catch(response => {
- expect(response).toEqual(new Error('The new quantity should be smaller than the old one'));
- error = response;
- });
+ await models.Sale.updateQuantity(ctx, 1, 99, options);
- expect(error).toBeDefined();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error('The new quantity should be smaller than the old one'));
});
it('should update the quantity of a given sale current line', async() => {
- let originalLineData = await app.models.Sale.findOne({where: {id: 1}, fields: ['quantity']});
+ const tx = await models.Sale.beginTransaction({});
- expect(originalLineData.quantity).toEqual(5);
+ try {
+ const options = {transaction: tx};
- await app.models.Sale.updateQuantity(ctx, 1, 4);
+ const originalLine = await models.Sale.findOne({where: {id: 1}, fields: ['quantity']}, options);
- let modifiedLineData = await app.models.Sale.findOne({where: {id: 1}, fields: ['quantity']});
+ expect(originalLine.quantity).toEqual(5);
- expect(modifiedLineData.quantity).toEqual(4);
+ await models.Sale.updateQuantity(ctx, 1, 4, options);
- await app.models.Sale.update({id: 1}, {quantity: 5});
+ const modifiedLine = await models.Sale.findOne({where: {id: 1}, fields: ['quantity']}, options);
- let resetLineDataValues = await app.models.Sale.findOne({where: {id: 1}, fields: ['quantity']});
+ expect(modifiedLine.quantity).toEqual(4);
- expect(resetLineDataValues.quantity).toEqual(5);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/sale/updateConcept.js b/modules/ticket/back/methods/sale/updateConcept.js
index 6a5f3375fa..0730f85e28 100644
--- a/modules/ticket/back/methods/sale/updateConcept.js
+++ b/modules/ticket/back/methods/sale/updateConcept.js
@@ -24,15 +24,35 @@ module.exports = Self => {
}
});
- Self.updateConcept = async(ctx, id, newConcept) => {
+ Self.updateConcept = async(ctx, id, newConcept, options) => {
const models = Self.app.models;
- const currentLine = await models.Sale.findById(id);
+ const myOptions = {};
+ let tx;
- const canEditSale = await models.Sale.canEdit(ctx, [id]);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
- return await currentLine.updateAttributes({concept: newConcept});
+ try {
+ const currentLine = await models.Sale.findById(id, null, myOptions);
+
+ const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
+
+ if (!canEditSale)
+ throw new UserError(`Sale(s) blocked, please contact production`);
+
+ const line = await currentLine.updateAttributes({concept: newConcept}, myOptions);
+
+ if (tx) await tx.commit();
+
+ return line;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index cb86296c93..fa1705e55c 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -28,14 +28,21 @@ module.exports = Self => {
}
});
- Self.updatePrice = async(ctx, id, newPrice) => {
+ Self.updatePrice = async(ctx, id, newPrice, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
- const tx = await Self.beginTransaction({});
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
try {
- const options = {transaction: tx};
-
const filter = {
include: {
relation: 'ticket',
@@ -57,22 +64,22 @@ module.exports = Self => {
}
};
- const sale = await models.Sale.findById(id, filter, options);
+ const sale = await models.Sale.findById(id, filter, myOptions);
- const isEditable = await models.Ticket.isEditable(ctx, sale.ticketFk);
+ const isEditable = await models.Ticket.isEditable(ctx, sale.ticketFk, myOptions);
if (!isEditable)
throw new UserError(`The sales of this ticket can't be modified`);
- const canEditSale = await models.Sale.canEdit(ctx, [id]);
+ const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
if (!canEditSale)
throw new UserError(`Sale(s) blocked, please contact production`);
const oldPrice = sale.price;
const userId = ctx.req.accessToken.userId;
- const usesMana = await models.WorkerMana.findOne({where: {workerFk: userId}, fields: 'amount'}, options);
+ const usesMana = await models.WorkerMana.findOne({where: {workerFk: userId}, fields: 'amount'}, myOptions);
const componentCode = usesMana ? 'mana' : 'buyerDiscount';
- const discount = await models.Component.findOne({where: {code: componentCode}}, options);
+ const discount = await models.Component.findOne({where: {code: componentCode}}, myOptions);
const componentId = discount.id;
const componentValue = newPrice - sale.price;
@@ -80,23 +87,23 @@ module.exports = Self => {
componentFk: componentId,
saleFk: id
};
- const saleComponent = await models.SaleComponent.findOne({where}, options);
+ const saleComponent = await models.SaleComponent.findOne({where}, myOptions);
if (saleComponent) {
await models.SaleComponent.updateAll(where, {
value: saleComponent.value + componentValue
- }, options);
+ }, myOptions);
} else {
await models.SaleComponent.create({
saleFk: id,
componentFk: componentId,
value: componentValue
- }, options);
+ }, myOptions);
}
- await sale.updateAttributes({price: newPrice}, options);
+ await sale.updateAttributes({price: newPrice}, myOptions);
query = `CALL vn.manaSpellersRequery(?)`;
- await Self.rawSql(query, [userId], options);
+ await Self.rawSql(query, [userId], myOptions);
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
@@ -111,14 +118,14 @@ module.exports = Self => {
ticketUrl: `${origin}/#!/ticket/${sale.ticket().id}/sale`,
itemUrl: `${origin}/#!/item/${sale.itemFk}/summary`
});
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
- await tx.commit();
+ if (tx) await tx.commit();
return sale;
} catch (error) {
- await tx.rollback();
+ if (tx) await tx.rollback();
throw error;
}
};
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 62e09f1f58..24e3736f37 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -26,60 +26,77 @@ module.exports = Self => {
}
});
- Self.updateQuantity = async(ctx, id, newQuantity) => {
- const $t = ctx.req.__; // $translate
+ Self.updateQuantity = async(ctx, id, newQuantity, options) => {
const models = Self.app.models;
+ const $t = ctx.req.__; // $translate
+ const myOptions = {};
+ let tx;
- const canEditSale = await models.Sale.canEdit(ctx, [id]);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- if (!canEditSale)
- throw new UserError(`Sale(s) blocked, please contact production`);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
- if (isNaN(newQuantity))
- throw new UserError(`The value should be a number`);
+ try {
+ const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
- const filter = {
- include: {
- relation: 'ticket',
- scope: {
- include: {
- relation: 'client',
- scope: {
- include: {
- relation: 'salesPersonUser',
- scope: {
- fields: ['id', 'name']
+ if (!canEditSale)
+ throw new UserError(`Sale(s) blocked, please contact production`);
+
+ if (isNaN(newQuantity))
+ throw new UserError(`The value should be a number`);
+
+ const filter = {
+ include: {
+ relation: 'ticket',
+ scope: {
+ include: {
+ relation: 'client',
+ scope: {
+ include: {
+ relation: 'salesPersonUser',
+ scope: {
+ fields: ['id', 'name']
+ }
}
}
}
}
}
+ };
+
+ const sale = await models.Sale.findById(id, filter, myOptions);
+
+ if (newQuantity > sale.quantity)
+ throw new UserError('The new quantity should be smaller than the old one');
+
+ const oldQuantity = sale.quantity;
+ const result = await sale.updateAttributes({quantity: newQuantity}, myOptions);
+
+ const salesPerson = sale.ticket().client().salesPersonUser();
+ if (salesPerson) {
+ const origin = ctx.req.headers.origin;
+ const message = $t('Changed sale quantity', {
+ ticketId: sale.ticket().id,
+ itemId: sale.itemFk,
+ concept: sale.concept,
+ oldQuantity: oldQuantity,
+ newQuantity: newQuantity,
+ ticketUrl: `${origin}/#!/ticket/${sale.ticket().id}/sale`,
+ itemUrl: `${origin}/#!/item/${sale.itemFk}/summary`
+ });
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
- };
- const sale = await models.Sale.findById(id, filter);
+ if (tx) await tx.commit();
- if (newQuantity > sale.quantity)
- throw new UserError('The new quantity should be smaller than the old one');
-
- const oldQuantity = sale.quantity;
- const result = await sale.updateAttributes({quantity: newQuantity});
-
- const salesPerson = sale.ticket().client().salesPersonUser();
- if (salesPerson) {
- const origin = ctx.req.headers.origin;
- const message = $t('Changed sale quantity', {
- ticketId: sale.ticket().id,
- itemId: sale.itemFk,
- concept: sale.concept,
- oldQuantity: oldQuantity,
- newQuantity: newQuantity,
- ticketUrl: `${origin}/#!/ticket/${sale.ticket().id}/sale`,
- itemUrl: `${origin}/#!/item/${sale.itemFk}/summary`
- });
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+ return result;
+ } catch (error) {
+ if (tx) await tx.rollback();
+ throw error;
}
-
- return result;
};
};
diff --git a/modules/ticket/back/methods/state/editableStates.js b/modules/ticket/back/methods/state/editableStates.js
index c1cbda7994..2c90ac43b1 100644
--- a/modules/ticket/back/methods/state/editableStates.js
+++ b/modules/ticket/back/methods/state/editableStates.js
@@ -1,4 +1,3 @@
-
module.exports = Self => {
Self.remoteMethodCtx('editableStates', {
description: 'Gets the editable states according the user role ',
@@ -8,7 +7,7 @@ module.exports = Self => {
type: 'object'
},
returns: {
- type: ['Object'],
+ type: ['object'],
root: true
},
http: {
@@ -17,14 +16,18 @@ module.exports = Self => {
}
});
- Self.editableStates = async(ctx, filter) => {
- let userId = ctx.req.accessToken.userId;
- let models = Self.app.models;
- let statesList = await models.State.find({where: filter.where});
+ Self.editableStates = async(ctx, filter, options) => {
+ const models = Self.app.models;
+ const userId = ctx.req.accessToken.userId;
+ const myOptions = {};
- let isProduction = await models.Account.hasRole(userId, 'production');
- let isSalesPerson = await models.Account.hasRole(userId, 'salesPerson');
- let isAdministrative = await models.Account.hasRole(userId, 'administrative');
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ let statesList = await models.State.find({where: filter.where}, myOptions);
+ const isProduction = await models.Account.hasRole(userId, 'production', myOptions);
+ const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson', myOptions);
+ const isAdministrative = await models.Account.hasRole(userId, 'administrative', myOptions);
if (isProduction || isAdministrative)
return statesList;
diff --git a/modules/ticket/back/methods/state/isEditable.js b/modules/ticket/back/methods/state/isEditable.js
index 34d86aad11..a0d11c2b76 100644
--- a/modules/ticket/back/methods/state/isEditable.js
+++ b/modules/ticket/back/methods/state/isEditable.js
@@ -18,19 +18,23 @@ module.exports = Self => {
}
});
- Self.isEditable = async(ctx, stateId) => {
+ Self.isEditable = async(ctx, stateId, options) => {
const accessToken = ctx.req.accessToken;
const models = Self.app.models;
const userId = accessToken.userId;
+ const myOptions = {};
- let isProduction = await models.Account.hasRole(userId, 'production');
- let isSalesPerson = await models.Account.hasRole(userId, 'salesPerson');
- let isAdministrative = await models.Account.hasRole(userId, 'administrative');
- let state = await models.State.findById(stateId);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- let salesPersonAllowed = (isSalesPerson && (state.code == 'PICKER_DESIGNED' || state.code == 'PRINTED'));
+ const isProduction = await models.Account.hasRole(userId, 'production', myOptions);
+ const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson', myOptions);
+ const isAdministrative = await models.Account.hasRole(userId, 'administrative', myOptions);
+ const state = await models.State.findById(stateId, null, myOptions);
- let isAllowed = isProduction || isAdministrative || salesPersonAllowed || state.alertLevel == 0;
+ const salesPersonAllowed = (isSalesPerson && (state.code == 'PICKER_DESIGNED' || state.code == 'PRINTED'));
+
+ const isAllowed = isProduction || isAdministrative || salesPersonAllowed || state.alertLevel == 0;
return isAllowed;
};
};
diff --git a/modules/ticket/back/methods/state/specs/editableState.spec.js b/modules/ticket/back/methods/state/specs/editableState.spec.js
index fc0b804943..c75242be0a 100644
--- a/modules/ticket/back/methods/state/specs/editableState.spec.js
+++ b/modules/ticket/back/methods/state/specs/editableState.spec.js
@@ -1,34 +1,73 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket editableStates()', () => {
const filter = {where: {name: {like: '%%'}}};
it('should return the expected state for the given role', async() => {
- const productionRole = 49;
- const ctx = {req: {accessToken: {userId: productionRole}}};
+ const tx = await models.State.beginTransaction({});
- let result = await app.models.State.editableStates(ctx, filter);
- let deliveredState = result.some(state => state.code == 'DELIVERED');
+ try {
+ const options = {transaction: tx};
- expect(deliveredState).toBeTruthy();
+ const productionRole = 49;
+ const ctx = {req: {accessToken: {userId: productionRole}}};
+
+ const editableStates = await models.State.editableStates(ctx, filter, options);
+
+ const deliveredState = editableStates.some(state => state.code == 'DELIVERED');
+
+ expect(deliveredState).toBeTruthy();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
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);
- let deliveredState = result.some(state => state.code == 'DELIVERED');
- let pickerDesignedState = result.some(state => state.code == 'PICKER_DESIGNED');
+ const tx = await models.State.beginTransaction({});
- expect(deliveredState).toBeFalsy();
- expect(pickerDesignedState).toBeTruthy();
+ try {
+ const options = {transaction: tx};
+
+ const productionRole = 18;
+ const ctx = {req: {accessToken: {userId: productionRole}}};
+
+ const editableStates = await models.State.editableStates(ctx, filter, options);
+
+ const deliveredState = editableStates.some(state => state.code == 'DELIVERED');
+
+ const pickerDesignedState = editableStates.some(state => state.code == 'PICKER_DESIGNED');
+
+ expect(deliveredState).toBeFalsy();
+ expect(pickerDesignedState).toBeTruthy();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it(`should return again the expected state by a specific role`, async() => {
- const employeeRole = 1;
- const ctx = {req: {accessToken: {userId: employeeRole}}};
- let result = await app.models.State.editableStates(ctx, filter);
- let pickerDesignedState = result.some(state => state.code == 'PICKER_DESIGNED');
+ const tx = await models.State.beginTransaction({});
- expect(pickerDesignedState).toBeTruthy();
+ try {
+ const options = {transaction: tx};
+
+ const employeeRole = 1;
+ const ctx = {req: {accessToken: {userId: employeeRole}}};
+
+ const editableStates = await models.State.editableStates(ctx, filter, options);
+
+ const pickerDesignedState = editableStates.some(state => state.code == 'PICKER_DESIGNED');
+
+ expect(pickerDesignedState).toBeTruthy();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/state/specs/isEditable.spec.js b/modules/ticket/back/methods/state/specs/isEditable.spec.js
index 518a543bfb..20641cfa3a 100644
--- a/modules/ticket/back/methods/state/specs/isEditable.spec.js
+++ b/modules/ticket/back/methods/state/specs/isEditable.spec.js
@@ -1,61 +1,127 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('state isEditable()', () => {
it('should return false if the state is not editable by a specific role', async() => {
- const salesPersonRole = 18;
- const onDeliveryState = 13;
- let ctx = {req: {accessToken: {userId: salesPersonRole}}};
- let result = await app.models.State.isEditable(ctx, onDeliveryState);
+ const tx = await models.State.beginTransaction({});
- expect(result).toBe(false);
+ try {
+ const options = {transaction: tx};
+
+ const salesPersonRole = 18;
+ const onDeliveryState = 13;
+ const ctx = {req: {accessToken: {userId: salesPersonRole}}};
+ const result = await models.State.isEditable(ctx, onDeliveryState, options);
+
+ expect(result).toBe(false);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return true if the state is editable by a specific role', async() => {
- const salesPersonRole = 18;
- const asignedState = 20;
- let ctx = {req: {accessToken: {userId: salesPersonRole}}};
- let result = await app.models.State.isEditable(ctx, asignedState);
+ const tx = await models.State.beginTransaction({});
- expect(result).toBe(true);
+ try {
+ const options = {transaction: tx};
+
+ const salesPersonRole = 18;
+ const asignedState = 20;
+ const ctx = {req: {accessToken: {userId: salesPersonRole}}};
+ const result = await models.State.isEditable(ctx, asignedState, options);
+
+ expect(result).toBe(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return true again if the state is editable by a specific role', async() => {
- const employeeRole = 1;
- const fixingState = 1;
- let ctx = {req: {accessToken: {userId: employeeRole}}};
- let result = await app.models.State.isEditable(ctx, fixingState);
+ const tx = await models.State.beginTransaction({});
- expect(result).toBe(true);
+ try {
+ const options = {transaction: tx};
+
+ const employeeRole = 1;
+ const fixingState = 1;
+ const ctx = {req: {accessToken: {userId: employeeRole}}};
+ const result = await models.State.isEditable(ctx, fixingState, options);
+
+ expect(result).toBe(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return false if the state is not editable for the given role', async() => {
- const employeeRole = 1;
- const asignedState = 13;
- let ctx = {req: {accessToken: {userId: employeeRole}}};
- let result = await app.models.State.isEditable(ctx, asignedState);
+ const tx = await models.State.beginTransaction({});
- expect(result).toBe(false);
+ try {
+ const options = {transaction: tx};
+
+ const employeeRole = 1;
+ const asignedState = 13;
+ const ctx = {req: {accessToken: {userId: employeeRole}}};
+ const result = await models.State.isEditable(ctx, asignedState, options);
+
+ expect(result).toBe(false);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return true if the state is editable for the given role', async() => {
- const productionRole = 49;
- const onDeliveryState = 13;
- let ctx = {req: {accessToken: {userId: productionRole}}};
- let result = await app.models.State.isEditable(ctx, onDeliveryState);
+ const tx = await models.State.beginTransaction({});
- expect(result).toBe(true);
+ try {
+ const options = {transaction: tx};
+
+ const productionRole = 49;
+ const onDeliveryState = 13;
+ const ctx = {req: {accessToken: {userId: productionRole}}};
+ const result = await models.State.isEditable(ctx, onDeliveryState, options);
+
+ expect(result).toBe(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return true if the ticket is editable, the role is salesPerson and the ticket state is printed', async() => {
- const salesPersonRole = 18;
- const printedState = 4;
- const okState = 3;
- const ctx = {req: {accessToken: {userId: salesPersonRole}}};
+ const tx = await models.State.beginTransaction({});
- let canEditCurrent = await app.models.State.isEditable(ctx, printedState);
- let canAsignNew = await app.models.State.isEditable(ctx, okState);
- let result = canEditCurrent && canAsignNew;
+ try {
+ const options = {transaction: tx};
- expect(result).toBe(true);
+ const salesPersonRole = 18;
+ const printedState = 4;
+ const okState = 3;
+ const ctx = {req: {accessToken: {userId: salesPersonRole}}};
+
+ const canEditCurrent = await models.State.isEditable(ctx, printedState, options);
+ const canAsignNew = await models.State.isEditable(ctx, okState, options);
+ const result = canEditCurrent && canAsignNew;
+
+ expect(result).toBe(true);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket-dms/removeFile.js b/modules/ticket/back/methods/ticket-dms/removeFile.js
index 52a0c524f2..f48dc7fef1 100644
--- a/modules/ticket/back/methods/ticket-dms/removeFile.js
+++ b/modules/ticket/back/methods/ticket-dms/removeFile.js
@@ -4,12 +4,12 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: {
arg: 'id',
- type: 'Number',
+ type: 'number',
description: 'The document id',
http: {source: 'path'}
},
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -18,16 +18,36 @@ module.exports = Self => {
}
});
- Self.removeFile = async(ctx, id) => {
+ Self.removeFile = async(ctx, id, options) => {
const models = Self.app.models;
- const targetTicketDms = await models.TicketDms.findById(id);
- const targetDms = await models.Dms.findById(targetTicketDms.dmsFk);
- const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}});
+ const myOptions = {};
+ let tx;
- await models.Dms.removeFile(ctx, targetTicketDms.dmsFk);
- await targetTicketDms.destroy();
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- return targetDms.updateAttribute('dmsTypeFk', trashDmsType.id);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const targetTicketDms = await models.TicketDms.findById(id, null, myOptions);
+ const targetDms = await models.Dms.findById(targetTicketDms.dmsFk, null, myOptions);
+ const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}}, myOptions);
+
+ await models.Dms.removeFile(ctx, targetTicketDms.dmsFk, myOptions);
+ await targetTicketDms.destroy(myOptions);
+
+ await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+
+ if (tx) await tx.commit();
+
+ return targetDms;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket-dms/specs/removeFile.spec.js b/modules/ticket/back/methods/ticket-dms/specs/removeFile.spec.js
index 1cd3b16cb6..9296984c39 100644
--- a/modules/ticket/back/methods/ticket-dms/specs/removeFile.spec.js
+++ b/modules/ticket/back/methods/ticket-dms/specs/removeFile.spec.js
@@ -1,18 +1,25 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('TicketDms removeFile()', () => {
const ticketDmsId = 1;
it(`should return an error for a user without enough privileges`, async() => {
- let clientId = 1101;
- let ctx = {req: {accessToken: {userId: clientId}}};
+ const tx = await models.TicketDms.beginTransaction({});
let error;
- await app.models.TicketDms.removeFile(ctx, ticketDmsId).catch(e => {
- error = e;
- }).finally(() => {
- expect(error.message).toEqual(`You don't have enough privileges`);
- });
+ try {
+ const options = {transaction: tx};
- expect(error).toBeDefined();
+ const clientId = 1101;
+ const ctx = {req: {accessToken: {userId: clientId}}};
+
+ await models.TicketDms.removeFile(ctx, ticketDmsId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`You don't have enough privileges`);
});
});
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index ce4bfdccbe..f7f7fbc2a8 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -6,22 +6,22 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Integer',
+ type: 'number',
required: true,
description: 'The request ID',
}, {
arg: 'itemFk',
- type: 'Integer',
+ type: 'number',
required: true,
description: 'The requested item ID',
}, {
arg: 'quantity',
- type: 'Integer',
+ type: 'number',
required: true,
description: 'The requested item quantity',
}],
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -30,25 +30,37 @@ module.exports = Self => {
}
});
- Self.confirm = async ctx => {
+ Self.confirm = async(ctx, options) => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
- const tx = await Self.beginTransaction({});
const $t = ctx.req.__; // $translate
- let sale;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
try {
- let options = {transaction: tx};
-
- let item = await models.Item.findById(ctx.args.itemFk, null, options);
+ const item = await models.Item.findById(ctx.args.itemFk, null, myOptions);
if (!item)
throw new UserError(`That item doesn't exists`);
- let request = await models.TicketRequest.findById(ctx.args.id, {
+ const request = await models.TicketRequest.findById(ctx.args.id, {
include: {relation: 'ticket'}
- }, options);
+ }, myOptions);
+
+ const itemStock = await models.Item.getVisibleAvailable(
+ ctx.args.itemFk,
+ request.ticket().warehouseFk,
+ request.ticket().shipped,
+ myOptions
+ );
- const itemStock = await models.Item.getVisibleAvailable(ctx.args.itemFk, request.ticket().warehouseFk, request.ticket().shipped);
const isAvailable = itemStock.available > 0;
if (!isAvailable)
@@ -57,23 +69,24 @@ module.exports = Self => {
if (request.saleFk)
throw new UserError(`This request already contains a sale`);
- sale = await models.Sale.create({
+ const sale = await models.Sale.create({
ticketFk: request.ticketFk,
itemFk: ctx.args.itemFk,
quantity: ctx.args.quantity,
concept: item.name
- }, options);
+ }, myOptions);
await request.updateAttributes({
saleFk: sale.id,
itemFk: sale.itemFk,
isOk: true
- }, options);
+ }, myOptions);
- query = `CALL vn.sale_calculateComponent(?, NULL)`;
- await Self.rawSql(query, [sale.id], options);
+ const query = `CALL vn.sale_calculateComponent(?, NULL)`;
+ await Self.rawSql(query, [sale.id], myOptions);
const origin = ctx.req.headers.origin;
const requesterId = request.requesterFk;
+
const message = $t('Bought units from buy request', {
quantity: sale.quantity,
concept: sale.concept,
@@ -82,10 +95,9 @@ module.exports = Self => {
url: `${origin}/#!/ticket/${sale.ticketFk}/summary`,
urlItem: `${origin}/#!/item/${sale.itemFk}/summary`
});
- await models.Chat.sendCheckingPresence(ctx, requesterId, message);
+ await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
- // log
- let logRecord = {
+ const logRecord = {
originFk: sale.ticketFk,
userFk: userId,
action: 'update',
@@ -99,14 +111,14 @@ module.exports = Self => {
}
};
- await Self.app.models.TicketLog.create(logRecord);
+ await Self.app.models.TicketLog.create(logRecord, myOptions);
- await tx.commit();
+ if (tx) await tx.commit();
return sale;
- } catch (error) {
- await tx.rollback();
- throw error;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
};
};
diff --git a/modules/ticket/back/methods/ticket-request/deny.js b/modules/ticket/back/methods/ticket-request/deny.js
index e663ef1bc4..5b79a57cb2 100644
--- a/modules/ticket/back/methods/ticket-request/deny.js
+++ b/modules/ticket/back/methods/ticket-request/deny.js
@@ -4,7 +4,7 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Integer',
+ type: 'number',
required: true,
description: 'The request ID',
}, {
@@ -23,17 +23,37 @@ module.exports = Self => {
}
});
- Self.deny = async ctx => {
- let userId = ctx.req.accessToken.userId;
- let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
+ Self.deny = async(ctx, options) => {
+ const myOptions = {};
+ let tx;
- let params = {
- isOk: false,
- attenderFk: worker.id,
- response: ctx.args.observation,
- };
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- let request = await Self.app.models.TicketRequest.findById(ctx.args.id);
- return request.updateAttributes(params);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const userId = ctx.req.accessToken.userId;
+ const worker = await Self.app.models.Worker.findOne({where: {userFk: userId}}, myOptions);
+
+ const params = {
+ isOk: false,
+ attenderFk: worker.id,
+ response: ctx.args.observation,
+ };
+
+ const request = await Self.app.models.TicketRequest.findById(ctx.args.id, null, myOptions);
+ await request.updateAttributes(params, myOptions);
+
+ if (tx) await tx.commit();
+
+ return request;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 9b864f6322..62c58ea951 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -68,9 +68,13 @@ module.exports = Self => {
}
});
- Self.filter = async(ctx, filter) => {
- let conn = Self.dataSource.connector;
- let userId = ctx.req.accessToken.userId;
+ Self.filter = async(ctx, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const userId = ctx.req.accessToken.userId;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
if (ctx.args.mine)
ctx.args.attenderFk = userId;
@@ -111,9 +115,7 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
- let stmt;
-
- stmt = new ParameterizedSQL(
+ const stmt = new ParameterizedSQL(
`SELECT
tr.id,
tr.ticketFk,
@@ -149,8 +151,6 @@ module.exports = Self => {
LEFT JOIN account.user ua ON ua.id = wka.userFk`);
stmt.merge(conn.makeSuffix(filter));
- let result = await conn.executeStmt(stmt);
-
- return result;
+ return conn.executeStmt(stmt, myOptions);
};
};
diff --git a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
index 2068fdfddd..49413cf44e 100644
--- a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket-request confirm()', () => {
let ctx = {
@@ -12,74 +12,89 @@ describe('ticket-request confirm()', () => {
};
it(`should throw an error if the item doesn't exist`, async() => {
- ctx.args = {itemFk: 999};
+ const tx = await models.TicketRequest.beginTransaction({});
let error;
try {
- await app.models.TicketRequest.confirm(ctx);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ ctx.args = {itemFk: 999};
+ await models.TicketRequest.confirm(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual(`That item doesn't exists`);
});
it('should throw an error if the item is not available', async() => {
- const requestId = 5;
- const itemId = 4;
- const quantity = 99999;
-
- ctx.args = {
- itemFk: itemId,
- id: requestId,
- quantity: quantity
- };
+ const tx = await models.TicketRequest.beginTransaction({});
let error;
-
try {
- await app.models.TicketRequest.confirm(ctx);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ const requestId = 5;
+ const itemId = 4;
+ const quantity = 99999;
+
+ ctx.args = {
+ itemFk: itemId,
+ id: requestId,
+ quantity: quantity
+ };
+
+ await models.TicketRequest.confirm(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual(`This item is not available`);
});
it(`should throw if there's a sale id`, async() => {
- const requestId = 4;
- const itemId = 1;
- const quantity = 10;
-
- ctx.args = {
- itemFk: itemId,
- id: requestId,
- quantity: quantity
- };
-
- const request = await app.models.TicketRequest.findById(requestId);
-
- expect(request.saleFk).toBeNull();
-
- await request.updateAttributes({saleFk: 2});
-
- ctx.args = {
- itemFk: itemId,
- id: requestId,
- quantity: quantity
- };
+ const tx = await models.TicketRequest.beginTransaction({});
let error;
-
try {
- await app.models.TicketRequest.confirm(ctx);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ const requestId = 4;
+ const itemId = 1;
+ const quantity = 10;
+
+ ctx.args = {
+ itemFk: itemId,
+ id: requestId,
+ quantity: quantity
+ };
+
+ const request = await models.TicketRequest.findById(requestId, null, options);
+
+ expect(request.saleFk).toBeNull();
+
+ await request.updateAttributes({saleFk: 2}, options);
+
+ ctx.args = {
+ itemFk: itemId,
+ id: requestId,
+ quantity: quantity
+ };
+
+ await models.TicketRequest.confirm(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual(`This request already contains a sale`);
-
- // restores
- await request.updateAttributes({saleFk: null});
});
});
diff --git a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
index 04152fa215..523c5f0650 100644
--- a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
@@ -1,25 +1,22 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket-request deny()', () => {
- let request;
- afterAll(async done => {
- let params = {
- isOk: null,
- attenderFk: request.attenderFk,
- response: null,
- };
+ it('should return the dinied ticket request', async() => {
+ const tx = await models.TicketRequest.beginTransaction({});
- await request.updateAttributes(params);
- done();
- });
+ try {
+ const options = {transaction: tx};
- it('should return all ticket requests', async() => {
- let ctx = {req: {accessToken: {userId: 9}}, args: {id: 4, observation: 'my observation'}};
+ const ctx = {req: {accessToken: {userId: 9}}, args: {id: 4, observation: 'my observation'}};
- request = await app.models.TicketRequest.findById(ctx.args.id);
+ const result = await models.TicketRequest.deny(ctx, options);
- let result = await app.models.TicketRequest.deny(ctx);
+ expect(result.id).toEqual(4);
- expect(result.id).toEqual(4);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
index 82bdfbd38f..ae004a024a 100644
--- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
@@ -1,85 +1,184 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket-request filter()', () => {
const userId = 9;
let ctx = {req: {accessToken: {userId: userId}}};
it('should now return all ticket requests', async() => {
- ctx.args = {};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
+ try {
+ const options = {transaction: tx};
- expect(result.length).toEqual(3);
+ ctx.args = {};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+
+ expect(result.length).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching a generic search value which is the ticket ID', async() => {
- ctx.args = {search: 11};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(4);
+ ctx.args = {search: 11};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching a generic search value which is the client address alias', async() => {
- ctx.args = {search: 'NY roofs'};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(4);
+ ctx.args = {search: 'NY roofs'};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the ticket ID', async() => {
- ctx.args = {ticketFk: 11};
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ const tx = await models.TicketRequest.beginTransaction({});
- expect(requestId).toEqual(4);
+ try {
+ const options = {transaction: tx};
+
+ ctx.args = {ticketFk: 11};
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the atender ID', async() => {
- ctx.args = {attenderFk: 35};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(3);
+ ctx.args = {attenderFk: 35};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the isOk triple-state', async() => {
- ctx.args = {isOk: null};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(3);
+ ctx.args = {isOk: null};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the client ID', async() => {
- ctx.args = {clientFk: 1102};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(4);
+ ctx.args = {clientFk: 1102};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the warehouse ID', async() => {
- ctx.args = {warehouse: 1};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx, {order: 'id'});
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(3);
+ ctx.args = {warehouse: 1};
+
+ const result = await models.TicketRequest.filter(ctx, {order: 'id'}, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket request matching the salesPerson ID', async() => {
- ctx.args = {salesPersonFk: 18};
+ const tx = await models.TicketRequest.beginTransaction({});
- const result = await app.models.TicketRequest.filter(ctx);
- const requestId = result[0].id;
+ try {
+ const options = {transaction: tx};
- expect(requestId).toEqual(3);
+ ctx.args = {salesPersonFk: 18};
+
+ const result = await models.TicketRequest.filter(ctx, options);
+ const requestId = result[0].id;
+
+ expect(requestId).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket-tracking/changeState.js b/modules/ticket/back/methods/ticket-tracking/changeState.js
index f7baeecfdf..4ae9ab40c5 100644
--- a/modules/ticket/back/methods/ticket-tracking/changeState.js
+++ b/modules/ticket/back/methods/ticket-tracking/changeState.js
@@ -23,38 +23,64 @@ module.exports = Self => {
}
});
- Self.changeState = async(ctx, params) => {
- let userId = ctx.req.accessToken.userId;
- let models = Self.app.models;
+ Self.changeState = async(ctx, params, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- if (!params.stateFk && !params.code)
- throw new UserError('State cannot be blank');
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- if (params.code) {
- let state = await models.State.findOne({where: {code: params.code}, fields: ['id']});
- params.stateFk = state.id;
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
}
- if (!params.workerFk) {
- let worker = await models.Worker.findOne({where: {userFk: userId}});
- params.workerFk = worker.id;
+ try {
+ const userId = ctx.req.accessToken.userId;
+
+ if (!params.stateFk && !params.code)
+ throw new UserError('State cannot be blank');
+
+ if (params.code) {
+ const state = await models.State.findOne({
+ where: {code: params.code},
+ fields: ['id']
+ }, myOptions);
+
+ params.stateFk = state.id;
+ }
+
+ if (!params.workerFk) {
+ const worker = await models.Worker.findOne({
+ where: {userFk: userId}
+ }, myOptions);
+
+ params.workerFk = worker.id;
+ }
+
+ const ticketState = await models.TicketState.findById(params.ticketFk, {
+ fields: ['stateFk']
+ }, myOptions);
+
+ let oldStateAllowed;
+ if (ticketState)
+ oldStateAllowed = await models.State.isEditable(ctx, ticketState.stateFk, myOptions);
+ const newStateAllowed = await models.State.isEditable(ctx, params.stateFk, myOptions);
+
+ const isAllowed = (!ticketState || oldStateAllowed == true) && newStateAllowed == true;
+
+ if (!isAllowed)
+ throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
+
+ const ticketTracking = await models.TicketTracking.create(params, myOptions);
+
+ if (tx) await tx.commit();
+
+ return ticketTracking;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
-
- let ticketState = await models.TicketState.findById(
- params.ticketFk,
- {fields: ['stateFk']}
- );
-
- let oldStateAllowed;
- if (ticketState)
- oldStateAllowed = await models.State.isEditable(ctx, ticketState.stateFk);
- let newStateAllowed = await models.State.isEditable(ctx, params.stateFk);
-
- let isAllowed = (!ticketState || oldStateAllowed == true) && newStateAllowed == true;
-
- if (!isAllowed)
- throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
-
- return models.TicketTracking.create(params);
};
};
diff --git a/modules/ticket/back/methods/ticket-tracking/setDelivered.js b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
index 509f5b4460..bd6e32dcff 100644
--- a/modules/ticket/back/methods/ticket-tracking/setDelivered.js
+++ b/modules/ticket/back/methods/ticket-tracking/setDelivered.js
@@ -6,13 +6,13 @@ module.exports = Self => {
{
arg: 'ticketIds',
description: 'the array of ticket ids to set as delivered',
- type: ['Number'],
+ type: ['number'],
required: true,
http: {source: 'body'}
}
],
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -21,30 +21,47 @@ module.exports = Self => {
}
});
- Self.setDelivered = async(ctx, ticketIds) => {
- let userId = ctx.req.accessToken.userId;
- let models = Self.app.models;
+ Self.setDelivered = async(ctx, ticketIds, options) => {
+ const userId = ctx.req.accessToken.userId;
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- let state = await models.State.findOne({
- where: {
- code: 'delivered'
- },
- fields: ['id', 'name', 'alertLevel', 'code']
- });
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- let worker = await models.Worker.findOne({where: {userFk: userId}});
-
- let promises = [];
- for (let id of ticketIds) {
- let promise = models.TicketTracking.changeState(ctx, {
- stateFk: state.id,
- workerFk: worker.id,
- ticketFk: id
- });
- promises.push(promise);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
}
- await Promise.all(promises);
- return state;
+ try {
+ const state = await models.State.findOne({
+ where: {
+ code: 'delivered'
+ },
+ fields: ['id', 'name', 'alertLevel', 'code']
+ }, myOptions);
+
+ const worker = await models.Worker.findOne({where: {userFk: userId}}, myOptions);
+
+ const promises = [];
+ for (const id of ticketIds) {
+ const promise = models.TicketTracking.changeState(ctx, {
+ stateFk: state.id,
+ workerFk: worker.id,
+ ticketFk: id
+ }, myOptions);
+ promises.push(promise);
+ }
+ await Promise.all(promises);
+
+ if (tx) await tx.commit();
+
+ return state;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
index 9b10f18f0a..746e1b7fce 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
@@ -1,110 +1,133 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('ticket changeState()', () => {
const salesPersonId = 18;
const employeeId = 1;
const productionId = 49;
- let activeCtx = {
+ const activeCtx = {
accessToken: {userId: 9},
};
- let ctx = {req: activeCtx};
- let ticket;
+ const ctx = {req: activeCtx};
+ const now = new Date();
+ const sampleTicket = {
+ shipped: now,
+ landed: now,
+ nickname: 'Many Places',
+ packages: 0,
+ updated: now,
+ priority: 1,
+ zoneFk: 3,
+ zonePrice: 5,
+ zoneBonus: 1,
+ totalWithVat: 120,
+ totalWithoutVat: 100,
+ clientFk: 1106,
+ warehouseFk: 1,
+ addressFk: 126,
+ routeFk: 6,
+ companyFk: 442,
+ agencyModeFk: 7
+ };
- beforeAll(async done => {
+ beforeAll(async() => {
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() => {
- activeCtx.accessToken.userId = salesPersonId;
- let params = {ticketFk: 2, stateFk: 3};
+ const tx = await models.TicketTracking.beginTransaction({});
+
+ let error;
- let errCode;
try {
- await app.models.TicketTracking.changeState(ctx, params);
+ const options = {transaction: tx};
+
+ activeCtx.accessToken.userId = salesPersonId;
+ const params = {ticketFk: 2, stateFk: 3};
+
+ await models.TicketTracking.changeState(ctx, params, options);
+
+ await tx.rollback();
} catch (e) {
- errCode = e.code;
+ await tx.rollback();
+ error = e;
}
- expect(errCode).toBe('ACCESS_DENIED');
+ expect(error.code).toBe('ACCESS_DENIED');
});
it('should throw an error if a worker with employee role attemps to a forbidden state', async() => {
- activeCtx.accessToken.userId = employeeId;
- let params = {ticketFk: 11, stateFk: 13};
+ const tx = await models.TicketTracking.beginTransaction({});
+
+ let error;
- let errCode;
try {
- await app.models.TicketTracking.changeState(ctx, params);
+ const options = {transaction: tx};
+
+ activeCtx.accessToken.userId = employeeId;
+ const params = {ticketFk: 11, stateFk: 13};
+
+ await models.TicketTracking.changeState(ctx, params, options);
+
+ await tx.rollback();
} catch (e) {
- errCode = e.code;
+ await tx.rollback();
+ error = e;
}
- expect(errCode).toBe('ACCESS_DENIED');
+ expect(error.code).toBe('ACCESS_DENIED');
});
it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => {
- activeCtx.accessToken.userId = productionId;
- let params = {ticketFk: ticket.id, stateFk: 3};
+ const tx = await models.TicketTracking.beginTransaction({});
- let ticketTracking = await app.models.TicketTracking.changeState(ctx, params);
+ try {
+ const options = {transaction: tx};
- 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();
+ const ticket = await models.Ticket.create(sampleTicket, options);
- // restores
- await app.models.TicketTracking.destroyById(ticketTracking.__data.id);
+ activeCtx.accessToken.userId = productionId;
+ const params = {ticketFk: ticket.id, stateFk: 3};
+
+ const ticketTracking = await models.TicketTracking.changeState(ctx, params, options);
+
+ 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();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
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};
- let res = await app.models.TicketTracking.changeState(ctx, params);
+ const tx = await models.TicketTracking.beginTransaction({});
- expect(res.__data.ticketFk).toBe(params.ticketFk);
- expect(res.__data.stateFk).toBe(params.stateFk);
- expect(res.__data.workerFk).toBe(params.workerFk);
- expect(res.__data.workerFk).toBe(1);
- expect(res.__data.id).toBeDefined();
+ try {
+ const options = {transaction: tx};
+
+ const ticket = await models.Ticket.create(sampleTicket, options);
+ const ctx = {req: {accessToken: {userId: 18}}};
+ const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
+ const params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
+ const res = await models.TicketTracking.changeState(ctx, params, options);
+
+ expect(res.__data.ticketFk).toBe(params.ticketFk);
+ expect(res.__data.stateFk).toBe(params.stateFk);
+ expect(res.__data.workerFk).toBe(params.workerFk);
+ expect(res.__data.workerFk).toBe(1);
+ expect(res.__data.id).toBeDefined();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
index 042ae0a1fa..3d37221c4e 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('ticket setDelivered()', () => {
@@ -7,50 +7,40 @@ describe('ticket setDelivered()', () => {
accessToken: {userId: userId},
};
- let ticketOne;
- let ticketTwo;
-
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
+ });
+
+ it('should return the state which has been applied to the given tickets', async() => {
+ const tx = await models.TicketTracking.beginTransaction({});
+
try {
- let originalTicketOne = await app.models.Ticket.findById(8);
- let originalTicketTwo = await app.models.Ticket.findById(10);
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 49}}};
+
+ const originalTicketOne = await models.Ticket.findById(8, null, options);
+ const originalTicketTwo = await models.Ticket.findById(10, null, options);
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);
+ const ticketOne = await models.Ticket.create(originalTicketOne, options);
+ const ticketTwo = await models.Ticket.create(originalTicketTwo, options);
+
+ const delivered = await models.State.findOne({where: {code: 'delivered'}, fields: ['id']}, options);
+
+ const params = [ticketOne.id, ticketTwo.id];
+ const state = await models.TicketTracking.setDelivered(ctx, params, options);
+
+ expect(state.id).toEqual(delivered.id);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
}
-
- 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();
- });
-
- it('should return the state which has been applied to the given tickets', async() => {
- let ctx = {req: {accessToken: {userId: 49}}};
- let delivered = await app.models.State.findOne({where: {code: 'delivered'}, fields: ['id']});
-
- let params = [ticketOne.id, ticketTwo.id];
- let state = await app.models.TicketTracking.setDelivered(ctx, params);
-
- expect(state.id).toEqual(delivered.id);
-
- // restores
- await app.models.TicketTracking.destroyById(state.id);
});
});
diff --git a/modules/ticket/back/methods/ticket-weekly/filter.js b/modules/ticket/back/methods/ticket-weekly/filter.js
index ef00aff9ba..0bf92d5429 100644
--- a/modules/ticket/back/methods/ticket-weekly/filter.js
+++ b/modules/ticket/back/methods/ticket-weekly/filter.js
@@ -10,18 +10,18 @@ module.exports = Self => {
accepts: [
{
arg: 'filter',
- type: 'Object',
+ type: 'object',
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
http: {source: 'query'}
}, {
arg: 'search',
- type: 'String',
+ type: 'string',
description: `If it's and integer searchs by id, otherwise it searchs by client id`,
http: {source: 'query'}
}
],
returns: {
- type: ['Object'],
+ type: ['object'],
root: true
},
http: {
@@ -30,10 +30,14 @@ module.exports = Self => {
}
});
- Self.filter = async(ctx, filter) => {
- let conn = Self.dataSource.connector;
+ Self.filter = async(ctx, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const myOptions = {};
- let where = buildFilter(ctx.args, (param, value) => {
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':
return {or: [
@@ -46,10 +50,9 @@ module.exports = Self => {
filter = mergeFilters(ctx.args.filter, {where});
- let stmts = [];
- let stmt;
+ const stmts = [];
- stmt = new ParameterizedSQL(
+ const stmt = new ParameterizedSQL(
`SELECT t.id AS ticketFk, c.id AS clientFk, c.name AS clientName, tw.weekDay,
wh.name AS warehouseName, u.id AS workerFk, u.name AS userName, u.nickName, tw.agencyModeFk
FROM ticketWeekly tw
@@ -60,10 +63,10 @@ module.exports = Self => {
);
stmt.merge(conn.makeSuffix(filter));
- let itemsIndex = stmts.push(stmt) - 1;
+ const itemsIndex = stmts.push(stmt) - 1;
- let sql = ParameterizedSQL.join(stmts, ';');
- let result = await conn.executeStmt(sql);
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
return itemsIndex === 0 ? result : result[itemsIndex];
};
};
diff --git a/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js b/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
index 690fa669b9..411bbe014d 100644
--- a/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
@@ -1,43 +1,89 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket-weekly filter()', () => {
const authUserId = 9;
it('should all return the tickets matching the filter', async() => {
- const filter = {order: 't.id ASC'};
- const ctx = {req: {accessToken: {userId: authUserId}}, args: {filter: filter}};
- const result = await app.models.TicketWeekly.filter(ctx);
+ const tx = await models.TicketWeekly.beginTransaction({});
- const firstRow = result[0];
+ try {
+ const options = {transaction: tx};
- expect(firstRow.ticketFk).toEqual(1);
- expect(result.length).toEqual(5);
+ const filter = {order: 't.id ASC'};
+
+ const ctx = {req: {accessToken: {userId: authUserId}}, args: {filter: filter}};
+
+ const result = await models.TicketWeekly.filter(ctx, null, options);
+
+ const firstRow = result[0];
+
+ expect(firstRow.ticketFk).toEqual(1);
+ expect(result.length).toEqual(5);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket with id one', async() => {
- const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 2}};
- const filter = {};
- const result = await app.models.TicketWeekly.filter(ctx, filter);
- const firstRow = result[0];
+ const tx = await models.TicketWeekly.beginTransaction({});
- expect(firstRow.ticketFk).toEqual(2);
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 2}};
+
+ const result = await models.TicketWeekly.filter(ctx, null, options);
+ const firstRow = result[0];
+
+ expect(firstRow.ticketFk).toEqual(2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket matching the client name', async() => {
- const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'bruce'}};
- const filter = {};
- const result = await app.models.TicketWeekly.filter(ctx, filter);
- const firstRow = result[0];
+ const tx = await models.TicketWeekly.beginTransaction({});
- expect(firstRow.clientName).toEqual('Bruce Wayne');
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'bruce'}};
+
+ const result = await models.TicketWeekly.filter(ctx, null, options);
+ const firstRow = result[0];
+
+ expect(firstRow.clientName).toEqual('Bruce Wayne');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return the ticket matching the client id', async() => {
- const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
- const filter = {};
- const result = await app.models.TicketWeekly.filter(ctx, filter);
- const firstRow = result[0];
+ const tx = await models.TicketWeekly.beginTransaction({});
- expect(firstRow.clientFk).toEqual(1101);
- expect(firstRow.clientName).toEqual('Bruce Wayne');
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
+
+ const result = await models.TicketWeekly.filter(ctx, null, options);
+ const firstRow = result[0];
+
+ expect(firstRow.clientFk).toEqual(1101);
+ expect(firstRow.clientName).toEqual('Bruce Wayne');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index 133cdeb032..5156896496 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -117,9 +117,6 @@ module.exports = Self => {
if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk)
throw new UserError(`You don't have privileges to change the zone`);
}
- const observationTypeDelivery = await models.ObservationType.findOne({
- where: {code: 'delivery'}
- }, myOptions);
const originalTicket = await models.Ticket.findOne({
where: {id: args.id},
diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js
index a72ea6c45e..e6048421e3 100644
--- a/modules/ticket/back/methods/ticket/new.js
+++ b/modules/ticket/back/methods/ticket/new.js
@@ -12,12 +12,12 @@ module.exports = Self => {
},
{
arg: 'shipped',
- type: 'Date',
+ type: 'date',
description: `The shipment date filter`
},
{
arg: 'landed',
- type: 'Date',
+ type: 'date',
description: `The landing date filter`
},
{
@@ -142,7 +142,7 @@ module.exports = Self => {
if (tx) await tx.commit();
- return await ticket;
+ return ticket;
} catch (e) {
if (tx) await tx.rollback();
throw e;
diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js
index 202a619a50..2456d3de05 100644
--- a/modules/ticket/back/methods/ticket/priceDifference.js
+++ b/modules/ticket/back/methods/ticket/priceDifference.js
@@ -66,70 +66,77 @@ module.exports = Self => {
myOptions.transaction = tx;
}
- const isEditable = await Self.isEditable(ctx, args.id, myOptions);
+ try {
+ const isEditable = await Self.isEditable(ctx, args.id, myOptions);
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ if (!isEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
- const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss', myOptions);
- if (!isProductionBoss) {
- const zoneShipped = await models.Agency.getShipped(
- args.landed,
- args.addressId,
- args.agencyModeId,
- args.warehouseId,
- myOptions);
+ const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss', myOptions);
+ if (!isProductionBoss) {
+ const zoneShipped = await models.Agency.getShipped(
+ args.landed,
+ args.addressId,
+ args.agencyModeId,
+ args.warehouseId,
+ myOptions);
- if (!zoneShipped || zoneShipped.zoneFk != args.zoneId)
- throw new UserError(`You don't have privileges to change the zone`);
- }
-
- const items = await models.Sale.find({
- where: {
- ticketFk: args.id
- },
- order: 'concept ASC',
- include: 'item'
- }, myOptions);
-
- const salesObj = {
- items: items,
- totalUnitPrice: 0.00,
- totalNewPrice: 0.00,
- totalDifference: 0.00,
- };
-
- const query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`;
- const params = [args.id, args.landed, args.addressId, args.zoneId, args.warehouseId];
- const [difComponents] = await Self.rawSql(query, params, myOptions);
-
- const map = new Map();
-
- // Sale price component, one per sale
- for (difComponent of difComponents)
- map.set(difComponent.saleFk, difComponent);
-
- function round(value) {
- return Math.round(value * 100) / 100;
- }
-
- for (sale of salesObj.items) {
- const difComponent = map.get(sale.id);
-
- if (difComponent) {
- sale.component = difComponent;
-
- salesObj.totalDifference += difComponent.difference;
- salesObj.totalDifference = round(salesObj.totalDifference);
-
- salesObj.totalNewPrice += difComponent.newPrice;
- salesObj.totalNewPrice = round(salesObj.totalNewPrice);
+ if (!zoneShipped || zoneShipped.zoneFk != args.zoneId)
+ throw new UserError(`You don't have privileges to change the zone`);
}
- salesObj.totalUnitPrice += sale.price;
- salesObj.totalUnitPrice = round(salesObj.totalUnitPrice);
- }
+ const items = await models.Sale.find({
+ where: {
+ ticketFk: args.id
+ },
+ order: 'concept ASC',
+ include: 'item'
+ }, myOptions);
- return salesObj;
+ const salesObj = {
+ items: items,
+ totalUnitPrice: 0.00,
+ totalNewPrice: 0.00,
+ totalDifference: 0.00,
+ };
+
+ const query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`;
+ const params = [args.id, args.landed, args.addressId, args.zoneId, args.warehouseId];
+ const [difComponents] = await Self.rawSql(query, params, myOptions);
+
+ const map = new Map();
+
+ // Sale price component, one per sale
+ for (difComponent of difComponents)
+ map.set(difComponent.saleFk, difComponent);
+
+ for (sale of salesObj.items) {
+ const difComponent = map.get(sale.id);
+
+ if (difComponent) {
+ sale.component = difComponent;
+
+ salesObj.totalDifference += difComponent.difference;
+ salesObj.totalDifference = round(salesObj.totalDifference);
+
+ salesObj.totalNewPrice += difComponent.newPrice;
+ salesObj.totalNewPrice = round(salesObj.totalNewPrice);
+ }
+
+ salesObj.totalUnitPrice += sale.price;
+ salesObj.totalUnitPrice = round(salesObj.totalUnitPrice);
+ }
+
+ if (tx) await tx.commit();
+
+ return salesObj;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
+
+ function round(value) {
+ return Math.round(value * 100) / 100;
+ }
};
diff --git a/modules/ticket/back/methods/ticket/recalculateComponents.js b/modules/ticket/back/methods/ticket/recalculateComponents.js
index 0648983c51..5b9e8e5dc0 100644
--- a/modules/ticket/back/methods/ticket/recalculateComponents.js
+++ b/modules/ticket/back/methods/ticket/recalculateComponents.js
@@ -11,7 +11,7 @@ module.exports = Self => {
http: {source: 'path'}
}],
returns: {
- type: 'Number',
+ type: 'number',
root: true
},
http: {
@@ -20,12 +20,32 @@ module.exports = Self => {
}
});
- Self.recalculateComponents = async(ctx, id) => {
- const isEditable = await Self.isEditable(ctx, id);
+ Self.recalculateComponents = async(ctx, id, options) => {
+ const myOptions = {};
+ let tx;
- if (!isEditable)
- throw new UserError(`The current ticket can't be modified`);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- return Self.rawSql('CALL vn.ticket_recalcComponents(?, NULL)', [id]);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const isEditable = await Self.isEditable(ctx, id, myOptions);
+
+ if (!isEditable)
+ throw new UserError(`The current ticket can't be modified`);
+
+ const recalculation = await Self.rawSql('CALL vn.ticket_recalcComponents(?, NULL)', [id], myOptions);
+
+ if (tx) await tx.commit();
+
+ return recalculation;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket/restore.js b/modules/ticket/back/methods/ticket/restore.js
index a3a79dc7cf..c9bb126fdc 100644
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@@ -6,7 +6,7 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Number',
+ type: 'number',
required: true,
description: 'The ticket id',
http: {source: 'path'}
diff --git a/modules/ticket/back/methods/ticket/sendSms.js b/modules/ticket/back/methods/ticket/sendSms.js
index efcaf4eda4..efe8ff206b 100644
--- a/modules/ticket/back/methods/ticket/sendSms.js
+++ b/modules/ticket/back/methods/ticket/sendSms.js
@@ -5,23 +5,23 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Number',
+ type: 'number',
required: true,
description: 'The ticket id',
http: {source: 'path'}
},
{
arg: 'destination',
- type: 'String',
+ type: 'string',
required: true,
},
{
arg: 'message',
- type: 'String',
+ type: 'string',
required: true,
}],
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -30,28 +30,46 @@ module.exports = Self => {
}
});
- Self.sendSms = async(ctx, id, destination, message) => {
+ Self.sendSms = async(ctx, id, destination, message, options) => {
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
const userId = ctx.req.accessToken.userId;
- let sms = await Self.app.models.Sms.send(ctx, id, destination, message);
- let logRecord = {
- originFk: id,
- userFk: userId,
- action: 'insert',
- changedModel: 'sms',
- newInstance: {
- destinationFk: id,
- destination: destination,
- message: message,
- statusCode: sms.statusCode,
- status: sms.status
- }
- };
+ try {
+ const sms = await Self.app.models.Sms.send(ctx, id, destination, message);
+ const logRecord = {
+ originFk: id,
+ userFk: userId,
+ action: 'insert',
+ changedModel: 'sms',
+ newInstance: {
+ destinationFk: id,
+ destination: destination,
+ message: message,
+ statusCode: sms.statusCode,
+ status: sms.status
+ }
+ };
- const ticketLog = await Self.app.models.TicketLog.create(logRecord);
+ const ticketLog = await Self.app.models.TicketLog.create(logRecord, myOptions);
- sms.logId = ticketLog.id;
+ sms.logId = ticketLog.id;
- return sms;
+ if (tx) await tx.commit();
+
+ return sms;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 9e8d202fac..38bd6e7b53 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -6,7 +6,7 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Number',
+ type: 'number',
required: true,
description: 'The ticket id',
http: {source: 'path'}
@@ -21,113 +21,133 @@ module.exports = Self => {
}
});
- Self.setDeleted = async(ctx, id) => {
+ Self.setDeleted = async(ctx, id, options) => {
const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
- const isEditable = await Self.isEditable(ctx, id);
const $t = ctx.req.__; // $translate
+ const myOptions = {};
+ let tx;
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- // Check if has sales with shelving
- const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant');
- const sales = await models.Sale.find({
- include: {relation: 'itemShelvingSale'},
- where: {ticketFk: id}
- });
- const hasItemShelvingSales = sales.some(sale => {
- return sale.itemShelvingSale();
- });
-
- if (hasItemShelvingSales && !isSalesAssistant)
- throw new UserError(`You cannot delete a ticket that part of it is being prepared`);
-
- // Check for existing claim
- const claimOfATicket = await models.Claim.findOne({where: {ticketFk: id}});
- if (claimOfATicket)
- throw new UserError('You must delete the claim id %d first', 'DELETE_CLAIM_FIRST', claimOfATicket.id);
-
- // Check for existing purchase requests
- const hasPurchaseRequests = await models.TicketRequest.count({
- ticketFk: id,
- isOk: true
- });
-
- if (hasPurchaseRequests)
- throw new UserError('You must delete all the buy requests first');
-
- // removes item shelvings
- if (hasItemShelvingSales && isSalesAssistant) {
- const promises = [];
- for (let sale of sales) {
- if (sale.itemShelvingSale()) {
- const itemShelvingSale = sale.itemShelvingSale();
- const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id);
- promises.push(destroyedShelving);
- }
- }
- await Promise.all(promises);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
}
- // Remove ticket greuges
- const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}});
- const ownGreuges = ticketGreuges.every(greuge => {
- return greuge.ticketFk == id;
- });
- if (ownGreuges) {
- for (const greuge of ticketGreuges) {
- const instance = await models.Greuge.findById(greuge.id);
+ try {
+ const userId = ctx.req.accessToken.userId;
+ const isEditable = await Self.isEditable(ctx, id, myOptions);
- await instance.destroy();
- }
- }
+ if (!isEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
- const ticket = await models.Ticket.findById(id, {
- include: [{
- relation: 'client',
- scope: {
- fields: ['id', 'salesPersonFk'],
- include: {
- relation: 'salesPersonUser',
- scope: {
- fields: ['id', 'name']
- }
+ // Check if has sales with shelving
+ const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
+ const sales = await models.Sale.find({
+ include: {relation: 'itemShelvingSale'},
+ where: {ticketFk: id}
+ }, myOptions);
+ const hasItemShelvingSales = sales.some(sale => {
+ return sale.itemShelvingSale();
+ });
+
+ if (hasItemShelvingSales && !isSalesAssistant)
+ throw new UserError(`You cannot delete a ticket that part of it is being prepared`);
+
+ // Check for existing claim
+ const claimOfATicket = await models.Claim.findOne({where: {ticketFk: id}}, myOptions);
+ if (claimOfATicket)
+ throw new UserError('You must delete the claim id %d first', 'DELETE_CLAIM_FIRST', claimOfATicket.id);
+
+ // Check for existing purchase requests
+ const hasPurchaseRequests = await models.TicketRequest.count({
+ ticketFk: id,
+ isOk: true
+ }, myOptions);
+
+ if (hasPurchaseRequests)
+ throw new UserError('You must delete all the buy requests first');
+
+ // removes item shelvings
+ if (hasItemShelvingSales && isSalesAssistant) {
+ const promises = [];
+ for (let sale of sales) {
+ if (sale.itemShelvingSale()) {
+ const itemShelvingSale = sale.itemShelvingSale();
+ const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions);
+ promises.push(destroyedShelving);
}
}
- }, {
- relation: 'ship'
- }, {
- relation: 'stowaway'
- }]
- });
+ await Promise.all(promises);
+ }
- // Change state to "fixing" if contains an stowaway and remove the link between them
- let otherTicketId;
- if (ticket.stowaway())
- otherTicketId = ticket.stowaway().shipFk;
- else if (ticket.ship())
- otherTicketId = ticket.ship().id;
-
- if (otherTicketId) {
- await models.Ticket.deleteStowaway(ctx, otherTicketId);
- await models.TicketTracking.changeState(ctx, {
- ticketFk: otherTicketId,
- code: 'FIXING'
+ // Remove ticket greuges
+ const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions);
+ const ownGreuges = ticketGreuges.every(greuge => {
+ return greuge.ticketFk == id;
});
- }
+ if (ownGreuges) {
+ for (const greuge of ticketGreuges) {
+ const instance = await models.Greuge.findById(greuge.id, null, myOptions);
- // Send notification to salesPerson
- const salesPersonUser = ticket.client().salesPersonUser();
- if (salesPersonUser) {
- const origin = ctx.req.headers.origin;
- const message = $t(`I have deleted the ticket id`, {
- id: id,
- url: `${origin}/#!/ticket/${id}/summary`
- });
- await models.Chat.send(ctx, `@${salesPersonUser.name}`, message);
- }
+ await instance.destroy(myOptions);
+ }
+ }
- return ticket.updateAttribute('isDeleted', true);
+ const ticket = await models.Ticket.findById(id, {
+ include: [{
+ relation: 'client',
+ scope: {
+ fields: ['id', 'salesPersonFk'],
+ include: {
+ relation: 'salesPersonUser',
+ scope: {
+ fields: ['id', 'name']
+ }
+ }
+ }
+ }, {
+ relation: 'ship'
+ }, {
+ relation: 'stowaway'
+ }]
+ }, myOptions);
+
+ // Change state to "fixing" if contains an stowaway and remove the link between them
+ let otherTicketId;
+ if (ticket.stowaway())
+ otherTicketId = ticket.stowaway().shipFk;
+ else if (ticket.ship())
+ otherTicketId = ticket.ship().id;
+
+ if (otherTicketId) {
+ await models.Ticket.deleteStowaway(ctx, otherTicketId, myOptions);
+ await models.TicketTracking.changeState(ctx, {
+ ticketFk: otherTicketId,
+ code: 'FIXING'
+ }, myOptions);
+ }
+
+ // Send notification to salesPerson
+ const salesPersonUser = ticket.client().salesPersonUser();
+ if (salesPersonUser) {
+ const origin = ctx.req.headers.origin;
+ const message = $t(`I have deleted the ticket id`, {
+ id: id,
+ url: `${origin}/#!/ticket/${id}/summary`
+ });
+ await models.Chat.send(ctx, `@${salesPersonUser.name}`, message);
+ }
+
+ const updatedTicket = await ticket.updateAttribute('isDeleted', true, myOptions);
+
+ if (tx) await tx.commit();
+
+ return updatedTicket;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 05853acba2..43f5b93dfa 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -8,12 +8,10 @@ describe('ticket canBeInvoiced()', () => {
accessToken: {userId: userId}
};
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should return falsy for an already invoiced ticket', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
index 36fc6732b3..24d4a48bad 100644
--- a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
@@ -11,12 +11,10 @@ describe('ticket makeInvoice()', () => {
};
const ctx = {req: activeCtx};
- beforeAll(async done => {
+ beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
-
- done();
});
it('should throw an error when invoicing tickets from multiple clients', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
index 72be4c3b44..ed10d114f4 100644
--- a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
@@ -1,24 +1,43 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket recalculateComponents()', () => {
const ticketId = 11;
it('should update the ticket components', async() => {
- const ctx = {req: {accessToken: {userId: 9}}};
- const response = await app.models.Ticket.recalculateComponents(ctx, ticketId);
+ const tx = await models.Ticket.beginTransaction({});
- expect(response.affectedRows).toBeDefined();
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 9}}};
+ const response = await models.Ticket.recalculateComponents(ctx, ticketId, options);
+
+ expect(response.affectedRows).toBeDefined();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should throw an error if the ticket is not editable', async() => {
- const ctx = {req: {accessToken: {userId: 9}}};
- const immutableTicketId = 1;
- await app.models.Ticket.recalculateComponents(ctx, immutableTicketId)
- .catch(response => {
- expect(response).toEqual(new Error(`The current ticket can't be modified`));
- error = response;
- });
+ const tx = await models.Ticket.beginTransaction({});
- expect(error).toBeDefined();
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 9}}};
+ const immutableTicketId = 1;
+ await models.Ticket.recalculateComponents(ctx, immutableTicketId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error).toEqual(new Error(`The current ticket can't be modified`));
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
index 61dc60abc4..8ec4ca487a 100644
--- a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
@@ -1,29 +1,30 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const soap = require('soap');
describe('ticket sendSms()', () => {
- let logId;
-
- afterAll(async done => {
- await app.models.TicketLog.destroyById(logId);
-
- done();
- });
-
it('should send a message and log it', async() => {
- spyOn(soap, 'createClientAsync').and.returnValue('a so fake client');
- let ctx = {req: {accessToken: {userId: 9}}};
- let id = 11;
- let destination = 222222222;
- let message = 'this is the message created in a test';
+ const tx = await models.Ticket.beginTransaction({});
- let sms = await app.models.Ticket.sendSms(ctx, id, destination, message);
+ try {
+ const options = {transaction: tx};
- logId = sms.logId;
+ spyOn(soap, 'createClientAsync').and.returnValue('a so fake client');
+ const ctx = {req: {accessToken: {userId: 9}}};
+ const id = 11;
+ const destination = 222222222;
+ const message = 'this is the message created in a test';
- let createdLog = await app.models.TicketLog.findById(logId);
- let json = JSON.parse(JSON.stringify(createdLog.newInstance));
+ const sms = await models.Ticket.sendSms(ctx, id, destination, message, options);
- expect(json.message).toEqual(message);
+ const createdLog = await models.TicketLog.findById(sms.logId, null, options);
+ const json = JSON.parse(JSON.stringify(createdLog.newInstance));
+
+ expect(json.message).toEqual(message);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 7d200a72df..73ccc116d3 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -1,6 +1,5 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
-const models = app.models;
describe('ticket setDeleted()', () => {
const userId = 1106;
@@ -10,95 +9,110 @@ describe('ticket setDeleted()', () => {
};
it('should throw an error if the given ticket has a claim', async() => {
- const ctx = {req: activeCtx};
- const ticketId = 16;
- let error;
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
try {
- await app.models.Ticket.setDeleted(ctx, ticketId);
+ const options = {transaction: tx};
+
+ const ctx = {req: activeCtx};
+ const ticketId = 16;
+
+ await models.Ticket.setDeleted(ctx, ticketId, options);
+
+ await tx.rollback();
} catch (e) {
+ await tx.rollback();
error = e;
}
- expect(error.translateArgs[0]).toEqual(2);
expect(error.message).toEqual('You must delete the claim id %d first');
});
it('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- const ctx = {
- req: {
- accessToken: {userId: employeeUser},
- headers: {
- origin: 'http://localhost:5000'
- },
- __: () => {}
- }
- };
+ const tx = await models.Ticket.beginTransaction({});
- let sampleTicket = await models.Ticket.findById(12);
- let sampleStowaway = await models.Ticket.findById(13);
+ try {
+ const options = {transaction: tx};
- sampleTicket.id = undefined;
- let shipTicket = await models.Ticket.create(sampleTicket);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ const ctx = {
+ req: {
+ accessToken: {userId: employeeUser},
+ headers: {
+ origin: 'http://localhost:5000'
+ },
+ __: () => {}
+ }
+ };
- sampleStowaway.id = undefined;
- let stowawayTicket = await models.Ticket.create(sampleStowaway);
+ const sampleTicket = await models.Ticket.findById(12);
+ const sampleStowaway = await models.Ticket.findById(13);
- await models.Stowaway.rawSql(`
- INSERT INTO vn.stowaway(id, shipFk)
- VALUES (?, ?)`, [stowawayTicket.id, shipTicket.id]);
+ sampleTicket.id = undefined;
+ const shipTicket = await models.Ticket.create(sampleTicket, options);
- const boardingState = await models.State.findOne({
- where: {
- code: 'BOARDING'
- }
- });
- await models.TicketTracking.create({
- ticketFk: stowawayTicket.id,
- stateFk: boardingState.id,
- workerFk: ctx.req.accessToken.userId
- });
+ sampleStowaway.id = undefined;
+ const stowawayTicket = await models.Ticket.create(sampleStowaway, options);
- const okState = await models.State.findOne({
- where: {
- code: 'OK'
- }
- });
- await models.TicketTracking.create({
- ticketFk: shipTicket.id,
- stateFk: okState.id,
- workerFk: ctx.req.accessToken.userId
- });
+ await models.Stowaway.rawSql(`
+ INSERT INTO vn.stowaway(id, shipFk)
+ VALUES (?, ?)`, [stowawayTicket.id, shipTicket.id], options);
- let stowawayTicketState = await models.TicketState.findOne({
- where: {
- ticketFk: stowawayTicket.id
- }
- });
+ const boardingState = await models.State.findOne({
+ where: {
+ code: 'BOARDING'
+ }
+ }, options);
- let stowaway = await models.Stowaway.findById(shipTicket.id);
+ await models.TicketTracking.create({
+ ticketFk: stowawayTicket.id,
+ stateFk: boardingState.id,
+ workerFk: ctx.req.accessToken.userId
+ }, options);
- expect(stowaway).toBeDefined();
- expect(stowawayTicketState.code).toEqual('BOARDING');
+ const okState = await models.State.findOne({
+ where: {
+ code: 'OK'
+ }
+ }, options);
- await models.Ticket.setDeleted(ctx, shipTicket.id);
+ await models.TicketTracking.create({
+ ticketFk: shipTicket.id,
+ stateFk: okState.id,
+ workerFk: ctx.req.accessToken.userId
+ }, options);
- stowawayTicketState = await models.TicketState.findOne({
- where: {
- ticketFk: stowawayTicket.id
- }
- });
+ let stowawayTicketState = await models.TicketState.findOne({
+ where: {
+ ticketFk: stowawayTicket.id
+ }
+ }, options);
- stowaway = await models.Stowaway.findById(shipTicket.id);
+ let stowaway = await models.Stowaway.findById(shipTicket.id, null, options);
- expect(stowaway).toBeNull();
- expect(stowawayTicketState.code).toEqual('FIXING');
+ expect(stowaway).toBeDefined();
+ expect(stowawayTicketState.code).toEqual('BOARDING');
- // restores
- await models.Ticket.destroyById(shipTicket.id);
- await models.Ticket.destroyById(stowawayTicket.id);
+ await models.Ticket.setDeleted(ctx, shipTicket.id, options);
+
+ stowawayTicketState = await models.TicketState.findOne({
+ where: {
+ ticketFk: stowawayTicket.id
+ }
+ }, options);
+
+ stowaway = await models.Stowaway.findById(shipTicket.id, null, options);
+
+ expect(stowaway).toBeNull();
+ expect(stowawayTicketState.code).toEqual('FIXING');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/summary.spec.js b/modules/ticket/back/methods/ticket/specs/summary.spec.js
index 7d29e8258f..5d2991b0ac 100644
--- a/modules/ticket/back/methods/ticket/specs/summary.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/summary.spec.js
@@ -1,28 +1,72 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('ticket summary()', () => {
it('should return a summary object containing data from 1 ticket', async() => {
- let result = await app.models.Ticket.summary(1);
+ const tx = await models.Ticket.beginTransaction({});
- expect(result.id).toEqual(1);
- expect(result.nickname).toEqual('Bat cave');
+ try {
+ const options = {transaction: tx};
+
+ const result = await models.Ticket.summary(1, options);
+
+ expect(result.id).toEqual(1);
+ expect(result.nickname).toEqual('Bat cave');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return a summary object containing sales from 1 ticket', async() => {
- let result = await app.models.Ticket.summary(1);
+ const tx = await models.Ticket.beginTransaction({});
- expect(result.sales.length).toEqual(4);
+ try {
+ const options = {transaction: tx};
+
+ const result = await models.Ticket.summary(1, options);
+
+ expect(result.sales.length).toEqual(4);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return a summary object containing totalWithoutVat for 1 ticket', async() => {
- let result = await app.models.Ticket.summary(1);
+ const tx = await models.Ticket.beginTransaction({});
- expect(result.totalWithoutVat).toEqual(jasmine.any(Number));
+ try {
+ const options = {transaction: tx};
+
+ const result = await models.Ticket.summary(1, options);
+
+ expect(result.totalWithoutVat).toEqual(jasmine.any(Number));
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should return a summary object containing total for 1 ticket', async() => {
- let result = await app.models.Ticket.summary(1);
+ const tx = await models.Ticket.beginTransaction({});
- expect(result.totalWithVat).toEqual(jasmine.any(Number));
+ try {
+ const options = {transaction: tx};
+
+ const result = await models.Ticket.summary(1, options);
+
+ expect(result.totalWithVat).toEqual(jasmine.any(Number));
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
index 5a37abef4e..58e598ea99 100644
--- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('sale transferSales()', () => {
@@ -8,160 +8,167 @@ describe('sale transferSales()', () => {
};
const ctx = {req: activeCtx};
- let createdTicketsIds = [];
-
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);
- }
+ it('should throw an error as the ticket is not editable', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ const currentTicketId = 1;
+ const receiverTicketId = undefined;
+ const sales = [];
+
+ await models.Ticket.transferSales(ctx, currentTicketId, receiverTicketId, sales, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
- done();
- });
-
- it('should throw an error as the ticket is not editable', async() => {
- let error;
-
- const currentTicketId = 1;
- const receiverTicketId = undefined;
- const sales = [];
-
- await app.models.Ticket.transferSales(ctx, currentTicketId, receiverTicketId, sales)
- .catch(response => {
- expect(response.message).toEqual(`The sales of this ticket can't be modified`);
- error = response;
- });
-
- expect(error).toBeDefined();
+ expect(error.message).toEqual(`The sales of this ticket can't be modified`);
});
it('should throw an error if the receiving ticket is not editable', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
let error;
+ try {
+ const options = {transaction: tx};
- const currentTicketId = 16;
- const receiverTicketId = 1;
- const sales = [];
+ const currentTicketId = 16;
+ const receiverTicketId = 1;
+ const sales = [];
- await app.models.Ticket.transferSales(ctx, currentTicketId, receiverTicketId, sales)
- .catch(response => {
- expect(response.message).toEqual(`The sales of the receiver ticket can't be modified`);
- error = response;
- });
+ await models.Ticket.transferSales(ctx, currentTicketId, receiverTicketId, sales, options);
- expect(error).toBeDefined();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`The sales of the receiver ticket can't be modified`);
});
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;
+ const tx = await models.Ticket.beginTransaction({});
- let formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
+ try {
+ const options = {transaction: tx};
- expect(formerTicketSales.length).toEqual(2);
+ const formerTicketId = 11;
+ let createdTicketId = undefined;
- let createdTicket = await app.models.Ticket.transferSales(
- ctx, formerTicketId, createdTicketId, formerTicketSales);
+ let formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
- createdTicketId = createdTicket.id;
- createdTicketsIds.push(createdTicketId);
+ expect(formerTicketSales.length).toEqual(2);
- formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
- createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
+ let createdTicket = await models.Ticket.transferSales(
+ ctx, formerTicketId, createdTicketId, formerTicketSales, options);
- expect(formerTicketSales.length).toEqual(0);
- expect(createdTicketSales.length).toEqual(2);
+ createdTicketId = createdTicket.id;
- await app.models.Ticket.transferSales(
- ctx, createdTicketId, formerTicketId, createdTicketSales);
+ formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
+ createdTicketSales = await models.Ticket.getSales(createdTicketId, options);
- formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
- createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
+ expect(formerTicketSales.length).toEqual(0);
+ expect(createdTicketSales.length).toEqual(2);
- createdTicket = await app.models.Ticket.findById(createdTicketId);
+ await models.Ticket.transferSales(
+ ctx, createdTicketId, formerTicketId, createdTicketSales, options);
- expect(createdTicket.isDeleted).toBeTruthy();
- expect(formerTicketSales.length).toEqual(2);
- expect(createdTicketSales.length).toEqual(0);
+ formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
+ createdTicketSales = await models.Ticket.getSales(createdTicketId, options);
+
+ createdTicket = await models.Ticket.findById(createdTicketId, null, options);
+
+ expect(createdTicket.isDeleted).toBeTruthy();
+ expect(formerTicketSales.length).toEqual(2);
+ expect(createdTicketSales.length).toEqual(0);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
describe('sale transferPartialSales()', () => {
it('should throw an error in the quantity to transfer exceeds the amount from the original sale', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
let error;
- let currentTicket = await app.models.Ticket.findById(11);
- let currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
+ try {
+ const options = {transaction: tx};
- const currentTicketId = currentTicket.id;
- const receiverTicketId = undefined;
+ const currentTicket = await models.Ticket.findById(11, null, options);
+ const currentTicketSales = await models.Ticket.getSales(currentTicket.id, options);
- currentTicketSales[0].quantity = 99;
+ const currentTicketId = currentTicket.id;
+ const receiverTicketId = undefined;
- await app.models.Ticket.transferSales(
- ctx, currentTicketId, receiverTicketId, currentTicketSales)
- .catch(response => {
- expect(response.message).toEqual(`Invalid quantity`);
- error = response;
- });
+ currentTicketSales[0].quantity = 99;
- expect(error).toBeDefined();
+ await models.Ticket.transferSales(
+ ctx, currentTicketId, receiverTicketId, currentTicketSales, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`Invalid quantity`);
});
it('should transfer two sales to a new ticket but one shall be partial', async() => {
- const formerTicketId = 11;
- let createdTicketId = undefined;
+ const tx = await models.Ticket.beginTransaction({});
- let formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
+ try {
+ const options = {transaction: tx};
- const partialSaleId = formerTicketSales[0].id;
- const completeSaleId = formerTicketSales[1].id;
- let partialSaleTotalQuantity = formerTicketSales[0].quantity;
+ const formerTicketId = 11;
+ let createdTicketId = undefined;
- expect(partialSaleTotalQuantity).toEqual(15);
+ let formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
- formerTicketSales[0].quantity = 1;
+ const completeSaleId = formerTicketSales[1].id;
+ let partialSaleTotalQuantity = formerTicketSales[0].quantity;
- let createdTicket = await app.models.Ticket.transferSales(
- ctx, formerTicketId, createdTicketId, formerTicketSales);
+ expect(partialSaleTotalQuantity).toEqual(15);
- createdTicketId = createdTicket.id;
- createdTicketsIds.push(createdTicket.id);
+ formerTicketSales[0].quantity = 1;
- formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
- createdTicketSales = await app.models.Ticket.getSales(createdTicketId);
+ let createdTicket = await models.Ticket.transferSales(
+ ctx, formerTicketId, createdTicketId, formerTicketSales, options);
- const [createdPartialSale] = createdTicketSales.filter(sale => {
- return sale.id != completeSaleId;
- });
+ createdTicketId = createdTicket.id;
- expect(formerTicketSales.length).toEqual(1);
- expect(formerTicketSales[0].quantity).toEqual(partialSaleTotalQuantity - 1);
- expect(createdTicketSales.length).toEqual(2);
- expect(createdPartialSale.quantity).toEqual(1);
+ formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
+ createdTicketSales = await models.Ticket.getSales(createdTicketId, options);
- let saleToRestore = await app.models.Sale.findById(partialSaleId);
- await saleToRestore.updateAttribute('quantity', partialSaleTotalQuantity);
+ const [createdPartialSale] = createdTicketSales.filter(sale => {
+ return sale.id != completeSaleId;
+ });
- let saleToReturnToTicket = await app.models.Sale.findById(completeSaleId);
- await saleToReturnToTicket.updateAttribute('ticketFk', formerTicketId);
+ expect(formerTicketSales.length).toEqual(1);
+ expect(formerTicketSales[0].quantity).toEqual(partialSaleTotalQuantity - 1);
+ expect(createdTicketSales.length).toEqual(2);
+ expect(createdPartialSale.quantity).toEqual(1);
- formerTicketSales = await app.models.Ticket.getSales(formerTicketId);
-
- const [returningPartialSale] = formerTicketSales.filter(sale => {
- return sale.id == partialSaleId;
- });
-
- expect(returningPartialSale.quantity).toEqual(partialSaleTotalQuantity);
- expect(formerTicketSales.length).toEqual(2);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
index 406a3f3ee2..ae79185e41 100644
--- a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
@@ -1,156 +1,171 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('sale updateDiscount()', () => {
const originalSaleId = 8;
- let componentId;
- let originalSale;
- 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;
-
- 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();
- });
it('should throw an error if no sales were selected', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- let error;
- const ticketId = 11;
- const sales = [];
- const newDiscount = 10;
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
try {
- await app.models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const ticketId = 11;
+ const sales = [];
+ const newDiscount = 10;
+
+ await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual('Please select at least one sale');
});
it('should throw an error if no sales belong to different tickets', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- let error;
- const ticketId = 11;
- const sales = [1, 14];
- const newDiscount = 10;
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
try {
- await app.models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const ticketId = 11;
+ const sales = [1, 14];
+ const newDiscount = 10;
+
+ await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual('All sales must belong to the same ticket');
});
it('should throw an error if the ticket is invoiced already', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- let error;
- const ticketId = 1;
- const sales = [1];
- const newDiscount = 100;
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
try {
- await app.models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount);
- } catch (err) {
- error = err;
+ const options = {transaction: tx};
+
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const ticketId = 1;
+ const sales = [1];
+ const newDiscount = 100;
+
+ await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
}
expect(error.message).toEqual(`The sales of this ticket can't be modified`);
});
it('should update the discount if the salesPerson has mana', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- const ticketId = 11;
- const sales = [originalSaleId];
- const newDiscount = 100;
- let manaDiscount = await app.models.Component.findOne({where: {code: 'mana'}});
- componentId = manaDiscount.id;
+ const tx = await models.Ticket.beginTransaction({});
- await app.models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount);
+ try {
+ const options = {transaction: tx};
- let updatedSale = await app.models.Sale.findById(originalSaleId);
- let createdSaleComponent = await app.models.SaleComponent.findOne({
- where: {
- componentFk: componentId,
- saleFk: originalSaleId
- }
- });
+ const ctx = {
+ req: {
+ accessToken: {userId: 18},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const ticketId = 11;
+ const sales = [originalSaleId];
+ const newDiscount = 100;
+ const manaDiscount = await models.Component.findOne({where: {code: 'mana'}}, options);
+ const componentId = manaDiscount.id;
- expect(createdSaleComponent.componentFk).toEqual(componentId);
- expect(updatedSale.discount).toEqual(100);
+ await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, options);
+
+ const updatedSale = await models.Sale.findById(originalSaleId, null, options);
+ const createdSaleComponent = await models.SaleComponent.findOne({
+ where: {
+ componentFk: componentId,
+ saleFk: originalSaleId
+ }
+ }, options);
+
+ expect(createdSaleComponent.componentFk).toEqual(componentId);
+ expect(updatedSale.discount).toEqual(100);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
it('should update the discount and add company discount component if the worker does not have mana', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- const ticketId = 11;
- const sales = [originalSaleId];
- const newDiscount = 100;
+ const tx = await models.Ticket.beginTransaction({});
- await app.models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount);
+ try {
+ const options = {transaction: tx};
- let updatedSale = await app.models.Sale.findById(originalSaleId);
- let createdSaleComponent = await app.models.SaleComponent.findOne({
- where: {
- componentFk: componentId,
- saleFk: originalSaleId
- }
- });
+ const ctx = {
+ req: {
+ accessToken: {userId: 9},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ }
+ };
+ const ticketId = 11;
+ const sales = [originalSaleId];
+ const newDiscount = 100;
- expect(createdSaleComponent.componentFk).toEqual(componentId);
- expect(updatedSale.discount).toEqual(100);
+ await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, options);
+
+ const updatedSale = await models.Sale.findById(originalSaleId, null, options);
+ const manaDiscount = await models.Component.findOne({where: {code: 'buyerDiscount'}}, options);
+ const componentId = manaDiscount.id;
+
+ const createdSaleComponent = await models.SaleComponent.findOne({
+ where: {
+ componentFk: componentId,
+ saleFk: originalSaleId
+ }
+ }, options);
+
+ expect(createdSaleComponent.componentFk).toEqual(componentId);
+ expect(updatedSale.discount).toEqual(100);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js b/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js
index ffe61e35d8..8f36e21cd5 100644
--- a/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js
@@ -1,4 +1,4 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
const userId = 9;
@@ -11,34 +11,44 @@ describe('ticket updateEditableTicket()', () => {
const validTicketId = 12;
const invalidTicketId = 1;
const data = {addressFk: 1};
- const originalData = {addressFk: 123};
-
- afterAll(async done => {
- await app.models.Ticket.updateEditableTicket(ctx, validTicketId, originalData);
-
- done();
- });
it('should now throw an error if the ticket is not editable', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
let error;
+ try {
+ const options = {transaction: tx};
- await app.models.Ticket.updateEditableTicket(ctx, invalidTicketId, data).catch(e => {
+ await models.Ticket.updateEditableTicket(ctx, invalidTicketId, data, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
error = e;
- }).finally(() => {
- expect(error.message).toEqual('This ticket can not be modified');
- });
+ }
- expect(error).toBeDefined();
+ expect(error.message).toEqual('This ticket can not be modified');
});
it('should edit the ticket address', async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- await app.models.Ticket.updateEditableTicket(ctx, validTicketId, data);
+ const tx = await models.Ticket.beginTransaction({});
- let updatedTicket = await app.models.Ticket.findById(validTicketId);
+ try {
+ const options = {transaction: tx};
- expect(updatedTicket.addressFk).toEqual(1);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ await models.Ticket.updateEditableTicket(ctx, validTicketId, data, options);
+
+ const updatedTicket = await models.Ticket.findById(validTicketId, null, options);
+
+ expect(updatedTicket.addressFk).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/uploadFile.spec.js b/modules/ticket/back/methods/ticket/specs/uploadFile.spec.js
index 4ad6894112..133c13265b 100644
--- a/modules/ticket/back/methods/ticket/specs/uploadFile.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/uploadFile.spec.js
@@ -1,19 +1,26 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
describe('Ticket uploadFile()', () => {
it(`should return an error for a user without enough privileges`, async() => {
- let ticketId = 15;
- let currentUserId = 1101;
- let ticketTypeId = 14;
- let ctx = {req: {accessToken: {userId: currentUserId}}, args: {dmsTypeId: ticketTypeId}};
+ const tx = await models.Ticket.beginTransaction({});
let error;
- await app.models.Ticket.uploadFile(ctx, ticketId).catch(e => {
- error = e;
- }).finally(() => {
- expect(error.message).toEqual(`You don't have enough privileges`);
- });
+ try {
+ const options = {transaction: tx};
- expect(error).toBeDefined();
+ const ticketId = 15;
+ const currentUserId = 1101;
+ const ticketTypeId = 14;
+ const ctx = {req: {accessToken: {userId: currentUserId}}, args: {dmsTypeId: ticketTypeId}};
+
+ await models.Ticket.uploadFile(ctx, ticketId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`You don't have enough privileges`);
});
});
diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js
index 037aee8b1e..848913fe17 100644
--- a/modules/ticket/back/methods/ticket/summary.js
+++ b/modules/ticket/back/methods/ticket/summary.js
@@ -19,10 +19,17 @@ module.exports = Self => {
}
});
- Self.summary = async ticketFk => {
- let models = Self.app.models;
- let summaryObj = await getTicketData(Self, ticketFk);
- summaryObj.sales = await models.Ticket.getSales(ticketFk);
+ Self.summary = async(ticketFk, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const summaryObj = await getTicketData(Self, ticketFk, myOptions);
+
+ summaryObj.sales = await models.Ticket.getSales(ticketFk, myOptions);
+
summaryObj.packagings = await models.TicketPackaging.find({
where: {ticketFk: ticketFk},
include: [{relation: 'packaging',
@@ -33,24 +40,25 @@ module.exports = Self => {
}
}
}]
- });
- summaryObj.requests = await getRequests(Self, ticketFk);
+ }, myOptions);
+
+ summaryObj.requests = await getRequests(Self, ticketFk, myOptions);
+
summaryObj.services = await models.TicketService.find({
where: {ticketFk: ticketFk},
include: [{relation: 'taxClass'}]
- });
+ }, myOptions);
return summaryObj;
};
- async function getTicketData(Self, ticketFk) {
- let filter = {
+ async function getTicketData(Self, ticketFk, options) {
+ const filter = {
include: [
{relation: 'warehouse', scope: {fields: ['name']}},
{relation: 'agencyMode', scope: {fields: ['name']}},
{relation: 'zone', scope: {fields: ['name']}},
- {
- relation: 'client',
+ {relation: 'client',
scope: {
fields: ['salesPersonFk', 'name', 'phone', 'mobile'],
include: {
@@ -99,11 +107,11 @@ module.exports = Self => {
where: {id: ticketFk}
};
- return await Self.findOne(filter);
+ return Self.findOne(filter, options);
}
- async function getRequests(Self, ticketFk) {
- let filter = {
+ async function getRequests(Self, ticketFk, options) {
+ const filter = {
where: {
ticketFk: ticketFk
},
@@ -127,6 +135,6 @@ module.exports = Self => {
}
]
};
- return await Self.app.models.TicketRequest.find(filter);
+ return Self.app.models.TicketRequest.find(filter, options);
}
};
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 541f19615f..49529135c3 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -5,25 +5,25 @@ module.exports = Self => {
description: 'Transfer sales to a new or a given ticket',
accepts: [{
arg: 'id',
- type: 'Number',
+ type: 'number',
required: true,
description: 'Origin ticket id',
http: {source: 'path'}
},
{
arg: 'ticketId',
- type: 'Number',
+ type: 'number',
description: 'Destination ticket id',
required: false
},
{
arg: 'sales',
- type: ['Object'],
+ type: ['object'],
description: 'The sales to transfer',
required: true
}],
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -32,28 +32,35 @@ module.exports = Self => {
}
});
- Self.transferSales = async(ctx, id, ticketId, sales) => {
- let userId = ctx.req.accessToken.userId;
+ Self.transferSales = async(ctx, id, ticketId, sales, options) => {
+ const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
+ const myOptions = {};
+ let tx;
- const isEditable = await models.Ticket.isEditable(ctx, id);
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- if (ticketId) {
- const isReceiverEditable = await models.Ticket.isEditable(ctx, ticketId);
- if (!isReceiverEditable)
- throw new UserError(`The sales of the receiver ticket can't be modified`);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
}
- let tx = await Self.beginTransaction({});
-
try {
- const options = {transaction: tx};
- const originalTicket = await models.Ticket.findById(id, null, options);
+ const isEditable = await models.Ticket.isEditable(ctx, id, myOptions);
+ if (!isEditable)
+ throw new UserError(`The sales of this ticket can't be modified`);
+
+ if (ticketId) {
+ const isReceiverEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
+ if (!isReceiverEditable)
+ throw new UserError(`The sales of the receiver ticket can't be modified`);
+ }
+
+ const originalTicket = await models.Ticket.findById(id, null, myOptions);
const originalSales = await models.Sale.find({
where: {ticketFk: id}
- }, options);
+ }, myOptions);
if (!ticketId) {
const ticket = await models.Ticket.findById(id);
@@ -61,7 +68,7 @@ module.exports = Self => {
if (!canCreateTicket)
throw new UserError(`You can't create a ticket for a inactive client`);
- ticketId = await cloneTicket(originalTicket, options);
+ ticketId = await cloneTicket(originalTicket, myOptions);
}
const map = new Map();
@@ -80,10 +87,10 @@ module.exports = Self => {
if (sale.quantity == originalSale.quantity) {
await models.Sale.updateAll({
id: sale.id
- }, {ticketFk: ticketId}, options);
+ }, {ticketFk: ticketId}, myOptions);
} else if (sale.quantity != originalSale.quantity) {
await transferPartialSale(
- ticketId, originalSale, sale, options);
+ ticketId, originalSale, sale, myOptions);
}
// Log to original ticket
@@ -105,7 +112,7 @@ module.exports = Self => {
concept: sale.concept,
ticket: ticketId
}
- }, options);
+ }, myOptions);
// Log to destination ticket
await models.TicketLog.create({
@@ -126,22 +133,22 @@ module.exports = Self => {
concept: sale.concept,
ticket: ticketId
}
- }, options);
+ }, myOptions);
}
- const isTicketEmpty = await models.Ticket.isEmpty(id, options);
+ const isTicketEmpty = await models.Ticket.isEmpty(id, myOptions);
if (isTicketEmpty) {
await originalTicket.updateAttributes({
isDeleted: true
- }, options);
+ }, myOptions);
}
- await tx.commit();
+ if (tx) await tx.commit();
return {id: ticketId};
- } catch (error) {
- await tx.rollback();
- throw error;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
};
@@ -163,7 +170,7 @@ module.exports = Self => {
// Update original sale
const rest = originalSale.quantity - sale.quantity;
- const originalInstance = await models.Sale.findById(sale.id, options);
+ const originalInstance = await models.Sale.findById(sale.id, null, options);
await originalInstance.updateAttribute('quantity', rest, options);
// Clone sale with new quantity
diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index c9424395d3..cd6a5fabcc 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -35,14 +35,21 @@ module.exports = Self => {
}
});
- Self.updateDiscount = async(ctx, id, salesIds, newDiscount) => {
+ Self.updateDiscount = async(ctx, id, salesIds, newDiscount, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
- const tx = await Self.beginTransaction({});
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
try {
- const options = {transaction: tx};
-
const filter = {
where: {
id: {inq: salesIds}
@@ -61,7 +68,7 @@ module.exports = Self => {
}
};
- const sales = await models.Sale.find(filter, options);
+ const sales = await models.Sale.find(filter, myOptions);
if (sales.length === 0)
throw new UserError('Please select at least one sale');
@@ -71,15 +78,15 @@ module.exports = Self => {
throw new UserError('All sales must belong to the same ticket');
const userId = ctx.req.accessToken.userId;
- const isLocked = await models.Ticket.isLocked(id);
- const roles = await models.Account.getRoles(userId);
+ const isLocked = await models.Ticket.isLocked(id, myOptions);
+ const roles = await models.Account.getRoles(userId, myOptions);
const hasAllowedRoles = roles.filter(role =>
role == 'salesPerson' || role == 'claimManager'
);
const state = await Self.app.models.TicketState.findOne({
where: {ticketFk: id}
- });
+ }, myOptions);
const alertLevel = state ? state.alertLevel : null;
if (isLocked || (!hasAllowedRoles && alertLevel > 0))
@@ -89,11 +96,11 @@ module.exports = Self => {
where: {
workerFk: userId
},
- fields: 'amount'}, options);
+ fields: 'amount'}, myOptions);
const componentCode = usesMana ? 'mana' : 'buyerDiscount';
const discountComponent = await models.Component.findOne({
- where: {code: componentCode}}, options);
+ where: {code: componentCode}}, myOptions);
const componentId = discountComponent.id;
const promises = [];
@@ -105,9 +112,9 @@ module.exports = Self => {
const newComponent = models.SaleComponent.upsert({
saleFk: sale.id,
value: value,
- componentFk: componentId}, options);
+ componentFk: componentId}, myOptions);
- const updatedSale = sale.updateAttribute('discount', newDiscount, options);
+ const updatedSale = sale.updateAttribute('discount', newDiscount, myOptions);
promises.push(newComponent, updatedSale);
changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity}) ${oldDiscount}% âž” *${newDiscount}%*`;
@@ -116,7 +123,7 @@ module.exports = Self => {
await Promise.all(promises);
const query = `call vn.manaSpellersRequery(?)`;
- await Self.rawSql(query, [userId], options);
+ await Self.rawSql(query, [userId], myOptions);
const ticket = await models.Ticket.findById(id, {
include: {
@@ -130,7 +137,7 @@ module.exports = Self => {
}
}
}
- }, options);
+ }, myOptions);
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
@@ -141,13 +148,13 @@ module.exports = Self => {
ticketUrl: `${origin}/#!/ticket/${id}/sale`,
changes: changesMade
});
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
- await tx.commit();
- } catch (error) {
- await tx.rollback();
- throw error;
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
};
};
diff --git a/modules/ticket/back/methods/ticket/updateEditableTicket.js b/modules/ticket/back/methods/ticket/updateEditableTicket.js
index 39143f8a22..15b6f7cb6f 100644
--- a/modules/ticket/back/methods/ticket/updateEditableTicket.js
+++ b/modules/ticket/back/methods/ticket/updateEditableTicket.js
@@ -15,7 +15,7 @@ module.exports = Self => {
{
arg: 'data',
description: 'Model instance data',
- type: 'Object',
+ type: 'object',
required: true,
http: {source: 'body'}
}
@@ -30,12 +30,30 @@ module.exports = Self => {
}
});
- Self.updateEditableTicket = async(ctx, id, data) => {
- let ticketIsEditable = await Self.app.models.Ticket.isEditable(ctx, id);
- if (!ticketIsEditable)
- throw new UserError('This ticket can not be modified');
+ Self.updateEditableTicket = async(ctx, id, data, options) => {
+ const myOptions = {};
+ let tx;
- let ticket = await Self.app.models.Ticket.findById(id);
- await ticket.updateAttributes(data);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const ticketIsEditable = await Self.app.models.Ticket.isEditable(ctx, id, myOptions);
+ if (!ticketIsEditable)
+ throw new UserError('This ticket can not be modified');
+
+ const ticket = await Self.app.models.Ticket.findById(id, null, myOptions);
+ await ticket.updateAttributes(data, myOptions);
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
};
};
diff --git a/modules/ticket/back/methods/ticket/uploadFile.js b/modules/ticket/back/methods/ticket/uploadFile.js
index e5ea465cb7..4de9904e14 100644
--- a/modules/ticket/back/methods/ticket/uploadFile.js
+++ b/modules/ticket/back/methods/ticket/uploadFile.js
@@ -4,40 +4,40 @@ module.exports = Self => {
accessType: 'WRITE',
accepts: [{
arg: 'id',
- type: 'Number',
+ type: 'number',
description: 'The ticket id',
http: {source: 'path'}
}, {
arg: 'warehouseId',
- type: 'Number',
+ type: 'number',
description: 'The warehouse id',
required: true
}, {
arg: 'companyId',
- type: 'Number',
+ type: 'number',
description: 'The company id',
required: true
}, {
arg: 'dmsTypeId',
- type: 'Number',
+ type: 'number',
description: 'The dms type id',
required: true
}, {
arg: 'reference',
- type: 'String',
+ type: 'string',
required: true
}, {
arg: 'description',
- type: 'String',
+ type: 'string',
required: true
}, {
arg: 'hasFile',
- type: 'Boolean',
+ type: 'boolean',
description: 'True if has an attached file',
required: true
}],
returns: {
- type: 'Object',
+ type: 'object',
root: true
},
http: {
@@ -46,31 +46,38 @@ module.exports = Self => {
}
});
- Self.uploadFile = async(ctx, id) => {
+ Self.uploadFile = async(ctx, id, options) => {
const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
const promises = [];
- const tx = await Self.beginTransaction({});
-
try {
- const options = {transaction: tx};
-
- const uploadedFiles = await models.Dms.uploadFile(ctx, options);
+ const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
uploadedFiles.forEach(dms => {
const newTicketDms = models.TicketDms.create({
ticketFk: id,
dmsFk: dms.id
- }, options);
+ }, myOptions);
promises.push(newTicketDms);
});
const resolvedPromises = await Promise.all(promises);
- await tx.commit();
+ if (tx) await tx.commit();
return resolvedPromises;
- } catch (err) {
- await tx.rollback();
- throw err;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
}
};
};
diff --git a/modules/ticket/back/models/specs/ticket-packaging.spec.js b/modules/ticket/back/models/specs/ticket-packaging.spec.js
index 893e0fb96a..f2834643dd 100644
--- a/modules/ticket/back/models/specs/ticket-packaging.spec.js
+++ b/modules/ticket/back/models/specs/ticket-packaging.spec.js
@@ -3,10 +3,8 @@ const app = require('vn-loopback/server/server');
describe('ticket model TicketTracking', () => {
let ticketTrackingId;
- afterAll(async done => {
+ afterAll(async() => {
await app.models.TicketPackaging.destroyById(ticketTrackingId);
-
- done();
});
it('should save a ticketTraing as the quantity is greater than 0', async() => {
diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html
index 555246f9f2..ae5642cf32 100644
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@@ -2,6 +2,7 @@
icon="more_vert"
vn-popover="menu">
+
Add turn
-
- Show Delivery Note
+ Show Delivery Note...
+
+
+
+ Show as PDF
+
+
+ Show as CSV
+
+
+
-
- Send Delivery Note
+ Send Delivery Note...
+
+
+
+
+ Send PDF
+
+
+ Send CSV
+
+
+
@@ -133,13 +163,39 @@