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

Merge branch 'master' into test
gitea/salix/test This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-06-13 11:48:01 +02:00
parent a030e68262 91174d1c8e
commit dbeef407a3
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/client/back/methods/client/confirmTransaction.js
View File

@ -27,7 +27,7 @@ module.exports = Self => {
let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options); let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);
let confirm = await Self.rawSql('CALL hedera.tpvTransactionConfirmById(?)', [id], options); let confirm = await Self.rawSql('CALL hedera.tpvTransaction_confirmById(?)', [id], options);
let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options); let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);

2
modules/client/back/methods/client/specs/confirmTransaction.spec.js
View File

@ -5,7 +5,7 @@ describe('Client confirmTransaction', () => {
afterAll(async done => { afterAll(async done => {
await app.models.Client.rawSql(` await app.models.Client.rawSql(`
CALL hedera.tpvTransactionUndo(?)`, [transactionId]); CALL hedera.tpvTransaction_undo(?)`, [transactionId]);
done(); done();
}); });

2
modules/item/back/methods/item/specs/clone.spec.js
View File

@ -1,6 +1,6 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
fdescribe('item clone()', () => { describe('item clone()', () => {
let nextItemId; let nextItemId;
beforeEach(async() => { beforeEach(async() => {

2
modules/order/back/methods/order/filter.js
View File

@ -140,7 +140,7 @@ module.exports = Self => {
SELECT id AS orderFk SELECT id AS orderFk
FROM tmp.filter`); FROM tmp.filter`);
stmts.push('CALL hedera.orderGetTotal()'); stmts.push('CALL hedera.order_getTotal()');
let orderIndex = stmts.push(` let orderIndex = stmts.push(`
SELECT f.*, ot.* SELECT f.*, ot.*

2
modules/order/back/methods/order/getTaxes.js
View File

@ -36,7 +36,7 @@ module.exports = Self => {
SELECT ? AS orderFk`, [orderFk]); SELECT ? AS orderFk`, [orderFk]);
stmts.push(stmt); stmts.push(stmt);
stmts.push('CALL hedera.orderGetTax()'); stmts.push('CALL hedera.order_getTax()');
let orderTaxIndex = stmts.push('SELECT * FROM tmp.orderAmount') - 1; let orderTaxIndex = stmts.push('SELECT * FROM tmp.orderAmount') - 1;

2
modules/order/back/methods/order/getTotal.js
View File

@ -20,7 +20,7 @@ module.exports = Self => {
}); });
Self.getTotal = async orderFk => { Self.getTotal = async orderFk => {
let query = `SELECT hedera.orderGetTotal(?) total;`; let query = `SELECT hedera.order_getTotal(?) total;`;
let [total] = await Self.rawSql(query, [orderFk]); let [total] = await Self.rawSql(query, [orderFk]);
return total.total; return total.total;