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
commit dbeef407a3
6 changed files with 6 additions and 6 deletions

View File

@ -27,7 +27,7 @@ module.exports = Self => {
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);

View File

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

View File

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

View File

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

View File

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

View File

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