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

Merge branch 'dev' into 6760-transferClient
gitea/salix/pipeline/pr-dev Build queued... Details

This commit is contained in:
Javier Segarra 2024-08-27 06:19:44 +00:00
parent 5f06ae5cf4 5f949e1344
commit b00070fd1a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/methods/vn-user/renew-token.js
View File

@ -29,8 +29,9 @@ module.exports = Self => {
return token; return token;
// Schedule to remove current token // Schedule to remove current token
setTimeout(() => { setTimeout(async() => {
Self.logout(token.id); if (await models.AccessToken.findById(token.id))
await Self.logout(token.id);
}, courtesyTime * 1000); }, courtesyTime * 1000);
// Get scopes // Get scopes

3
modules/item/back/methods/fixed-price/filter.js
View File

@ -1,4 +1,3 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const buildFilter = require('vn-loopback/util/filter').buildFilter; const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters; const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@ -134,7 +133,7 @@ module.exports = Self => {
const stmts = []; const stmts = [];
const stmt = new ParameterizedSQL(` const stmt = new ParameterizedSQL(`
SELECT fp.id, SELECT DISTINCT fp.id,
fp.itemFk, fp.itemFk,
fp.warehouseFk, fp.warehouseFk,
fp.rate2, fp.rate2,