diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 2d3353f15..61d548edf 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -666,9 +666,9 @@ INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `create INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`) VALUES - (1, 0.00, 10, 10, 0, 0, CURDATE(), 6, 1.50), - (2, 100.00, 20, 20, 0, 0, CURDATE(), 7, 1.00), - (3, 14000.00, 0, 0, 0, 0, CURDATE(), NULL, 0), + (1, 0.00, 10, 10, 0, 1, CURDATE(), 6, 1.50), + (2, 100.00, 20, 20, 0, 1, CURDATE(), 7, 1.00), + (3, 14000.00, 0, 0, 0, 1, CURDATE(), NULL, 0), (4, 218000.00, 0, 0, 0, 0, CURDATE(), NULL, 0), (5, 292000.00, 0, 0, 0, 0, CURDATE(), NULL, 0), (94, 140875.00, 49.00, 115.00, 25.00, 0, CURDATE(), 71, 0.00); diff --git a/modules/ticket/back/methods/packaging/listPackaging.js b/modules/ticket/back/methods/packaging/listPackaging.js index 033201818..174630f29 100644 --- a/modules/ticket/back/methods/packaging/listPackaging.js +++ b/modules/ticket/back/methods/packaging/listPackaging.js @@ -29,7 +29,7 @@ module.exports = Self => { FROM (SELECT i.name, i.id itemFk, p.id packagingFk FROM item i JOIN packaging p ON i.id = p.itemFk - WHERE i.name <> '') p` + WHERE i.name <> '' AND p.isPackageReturnable) p` ); stmt.merge(conn.makeSuffix(filter));