back/methods/vn-user/renew-token.js

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

modules/item/back/methods/fixed-price/filter.js

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