verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
Conversation 0 Commits 233 Files Changed 166 +221 -220
5 changed files with 221 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b0c4f7fd3c - Show all commits

1
back/models/collection.js
View File

@ -5,5 +5,4 @@ module.exports = Self => {
require('../methods/collection/getTickets')(Self); require('../methods/collection/getTickets')(Self);
require('../methods/collection/assign')(Self); require('../methods/collection/assign')(Self);
require('../methods/collection/getSales')(Self); require('../methods/collection/getSales')(Self);
require('../methods/collection/exchangeRateUpdate')(Self);
}; };

3
loopback/locale/en.json
View File

@ -224,5 +224,6 @@
"There are not picking tickets": "There are not picking tickets", "There are not picking tickets": "There are not picking tickets",
"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)", "ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
"This password can only be changed by the user themselves": "This password can only be changed by the user themselves", "This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
"They're not your subordinate": "They're not your subordinate" "They're not your subordinate": "They're not your subordinate",
"InvoiceIn is already booked": "InvoiceIn is already booked"
} }

0
back/methods/collection/exchangeRateUpdate.js → modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
View File

6
back/methods/collection/spec/exchangeRateUpdate.spec.js → modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
View File

@ -17,7 +17,7 @@ describe('exchangeRateUpdate functionality', function() {
spyOn(models.ReferenceRate, 'findOne').and.returnValue(Promise.resolve(null)); spyOn(models.ReferenceRate, 'findOne').and.returnValue(Promise.resolve(null));
spyOn(models.ReferenceRate, 'create').and.returnValue(Promise.resolve()); spyOn(models.ReferenceRate, 'create').and.returnValue(Promise.resolve());
await models.Collection.exchangeRateUpdate(); await models.InvoiceIn.exchangeRateUpdate();
expect(models.ReferenceRate.create).toHaveBeenCalledTimes(2); expect(models.ReferenceRate.create).toHaveBeenCalledTimes(2);
}); });
@ -28,7 +28,7 @@ describe('exchangeRateUpdate functionality', function() {
let thrownError = null; let thrownError = null;
try { try {
await models.Collection.exchangeRateUpdate(); await models.InvoiceIn.exchangeRateUpdate();
} catch (error) { } catch (error) {
thrownError = error; thrownError = error;
} }
@ -41,7 +41,7 @@ describe('exchangeRateUpdate functionality', function() {
let error; let error;
try { try {
await models.Collection.exchangeRateUpdate(); await models.InvoiceIn.exchangeRateUpdate();
} catch (e) { } catch (e) {
error = e; error = e;
} }

1
modules/invoiceIn/back/models/invoice-in.js
View File

@ -10,6 +10,7 @@ module.exports = Self => {
require('../methods/invoice-in/invoiceInEmail')(Self); require('../methods/invoice-in/invoiceInEmail')(Self);
require('../methods/invoice-in/getSerial')(Self); require('../methods/invoice-in/getSerial')(Self);
require('../methods/invoice-in/corrective')(Self); require('../methods/invoice-in/corrective')(Self);
require('../methods/invoice-in/exchangeRateUpdate')(Self);
Self.rewriteDbError(function(err) { Self.rewriteDbError(function(err) {
if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn')) if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn'))