Merge branch 'dev' into 7677_vnLocation_perf

back/models/buyer.json

@@ -15,6 +15,9 @@
 		"nickname": {
 			"type": "string",
 			"required": true
+		},
+		"display": {
+			"type": "boolean"
 		}
 	},
 	"acls": [

db/dump/fixtures.before.sql

@@ -179,12 +179,12 @@ INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `i
         (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
 
 INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
-    VALUES
+    VALUES (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
-        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
         (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 13,  1, 1, 0),
         (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
         (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
         (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
+        (6,  'Warehouse six',   'VNH',    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
         (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);
 
@@ -1495,16 +1495,16 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
 INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`)
-    VALUES
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1),
-        (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000,  'first travel',     1, 1, 1),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2),
-        (2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150,    2000,  'second travel',    2, 2, 2),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3),
-        (3, util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00,  'third travel',     1, 1, 3),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4),
-        (4, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,   'fourth travel',    0, 2, 4),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5),
-        (5, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,   'fifth travel',     1, 1, 5),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6),
-        (6, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,   'sixth travel',     1, 2, 6),
+        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7),
-        (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,   'seventh travel',   2, 1, 7),
+        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10),
-        (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2, 10),
+        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10),
-        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL + 5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 5 DAY), 5, 1, 1, 50.00,  500,   'nineth travel',     1, 2, 10);
+        (11, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
     VALUES
@@ -1517,7 +1517,8 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
         (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
         (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  ''),
         (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  ''),
-        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  '');
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, 1,  ''),
+        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 1, 1, '');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@@ -1540,7 +1541,7 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
+INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
     VALUES
         (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
         (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
@@ -1556,7 +1557,8 @@ INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagi
         (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
         (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
         (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
+        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000');
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -3933,43 +3935,37 @@ INSERT INTO vn.medicalReview
 (id, workerFk, centerFk, `date`, `time`, isFit, amount, invoice, remark)
 VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);
 
-INSERT INTO vn.payrollComponent
+INSERT INTO vn.stockBought (workerFk, bought, reserve, dated) 
-(id, name, isSalaryAgreed, isVariable, isException)
+    VALUES(35, 1.00, 1.00, '2001-01-01');
-	VALUES
+
-		(1, 'Salario1', 1, 0, 0),
+INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)
+	VALUES (1,0.6,6);
+
+INSERT INTO vn.payrollComponent (id, name, isSalaryAgreed, isVariable, isException)
+	VALUES (1, 'Salario1', 1, 0, 0),
 		(2, 'Salario2', 1, 1, 0),
 		(3, 'Salario3', 1, 0, 1);
 
-
+INSERT INTO vn.workerIncome (debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
-INSERT INTO vn.workerIncome
+	VALUES (1000.00, 900.00, 2, '2000-01-01', 1106, NULL),
-(debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
-	VALUES
-		(1000.00, 900.00, 2, '2000-01-01', 1106, NULL),
 		(1001.00, 800.00, 2, '2000-01-01', 1106, NULL);
 
+INSERT INTO dipole.printer (id, description) VALUES(1, '');
 
-INSERT INTO dipole.printer (id, description)
+INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode, truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
-VALUES(1, '');
+    VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);
 
-INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode,
+INSERT INTO vn.accountDetail (id, value, accountDetailTypeFk, supplierAccountFk)
-truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
+    VALUES (21, 'ES12345B12345678', 3, 241),
-VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);
+        (35, 'ES12346B12345679', 3, 241);
 
-INSERT INTO vn.accountDetail
+INSERT INTO vn.accountDetailType (id, description, code)
-(id, value, accountDetailTypeFk, supplierAccountFk)
+    VALUES (1, 'IBAN', 'iban'),
-VALUES
+        (2, 'SWIFT', 'swift'),
-	(21, 'ES12345B12345678', 3, 241),
+        (3, 'Referencia Remesas', 'remRef'),
-	(35, 'ES12346B12345679', 3, 241);
+        (4, 'Referencia Transferencias', 'trnRef'),
-
+        (5, 'Referencia Nominas', 'payRef'),
-INSERT INTO vn.accountDetailType
+        (6, 'ABA', 'aba');
-(id, description, code)
-VALUES
-		(1, 'IBAN', 'iban'),
-		(2, 'SWIFT', 'swift'),
-		(3, 'Referencia Remesas', 'remRef'),
-		(4, 'Referencia Transferencias', 'trnRef'),
-		(5, 'Referencia Nominas', 'payRef'),
-		(6, 'ABA', 'aba');
 
 INSERT IGNORE INTO ormConfig 
     SET id =1,

db/routines/vn/procedures/stockBought_calculate.sql

@@ -0,0 +1,52 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`stockBought_calculate`()
+BEGIN
+/**
+ * Inserts the purchase volume per buyer
+ * into stockBought according to the current date.
+ */
+	DECLARE vDated DATE;
+	SET vDated = util.VN_CURDATE();
+
+	CREATE OR REPLACE TEMPORARY TABLE tStockBought
+		SELECT workerFk, reserve 
+			FROM stockBought 
+			WHERE dated = vDated
+				AND reserve;
+
+	DELETE FROM stockBought WHERE dated = vDated;
+
+	INSERT INTO stockBought (workerFk, bought, dated)
+		SELECT it.workerFk,
+				ROUND(SUM(
+					(ac.conversionCoefficient * 
+						(b.quantity / b.packing) * 
+						buy_getVolume(b.id)
+					) / (vc.trolleyM3 * 1000000)
+				), 1),
+				vDated
+			FROM entry e
+				JOIN travel t ON t.id = e.travelFk 
+				JOIN warehouse w ON w.id = t.warehouseInFk
+				JOIN buy b ON b.entryFk = e.id
+				JOIN item i ON i.id = b.itemFk 
+				JOIN itemType it ON it.id = i.typeFk
+				JOIN auctionConfig ac
+				JOIN volumeConfig vc
+			WHERE t.shipped = vDated
+				AND t.warehouseInFk = ac.warehouseFk
+			GROUP BY it.workerFk;
+
+	UPDATE stockBought s
+			JOIN tStockBought ts ON ts.workerFk = s.workerFk
+				SET s.reserve = ts.reserve
+		WHERE s.dated = vDated;
+
+	INSERT INTO stockBought (workerFk, reserve, dated)
+		SELECT ts.workerFk, ts.reserve, vDated
+			FROM tStockBought ts
+			WHERE ts.workerFk NOT IN (SELECT workerFk FROM stockBought WHERE dated = vDated);
+
+	DROP TEMPORARY TABLE tStockBought;
+END$$
+DELIMITER ;

db/routines/vn/views/buyer.sql

@@ -2,10 +2,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`buyer`
 AS SELECT DISTINCT `u`.`id` AS `userFk`,
-	`u`.`nickname` AS `nickname`
+	`u`.`nickname` AS `nickname`,
+	`ic`.`display` AS `display`
 FROM (
 		`account`.`user` `u`
 		JOIN `vn`.`itemType` `it` ON(`it`.`workerFk` = `u`.`id`)
+		JOIN `vn`.`itemCategory` `ic` ON(`ic`.`id` = `it`.`categoryFk`)
 	)
 WHERE `u`.`active` <> 0
 ORDER BY `u`.`nickname`

db/versions/11115-turquoiseRose/00-firstScript.sql

@@ -0,0 +1,30 @@
+-- Place your SQL code here
+-- vn.stockBought definition
+
+CREATE TABLE IF NOT EXISTS vn.stockBought (
+	id INT UNSIGNED auto_increment NOT NULL,
+	workerFk int(10) unsigned NOT NULL,
+	bought decimal(10,2) NOT NULL COMMENT 'purchase volume in m3 for the day',
+	reserve decimal(10,2) NULL COMMENT 'reserved volume in m3 for the day',
+	dated DATE NOT NULL DEFAULT current_timestamp(),
+	CONSTRAINT stockBought_pk PRIMARY KEY (id),
+	CONSTRAINT stockBought_unique UNIQUE KEY (workerFk,dated),
+	CONSTRAINT stockBought_worker_FK FOREIGN KEY (workerFk) REFERENCES vn.worker(id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+
+INSERT IGNORE vn.stockBought (workerFk, bought, reserve, dated)
+    SELECT userFk, SUM(buyed), SUM(IFNULL(reserved,0)), dated
+        FROM vn.stockBuyed
+        WHERE userFk IS NOT NULL
+            AND buyed IS NOT NULL
+        GROUP BY userFk, dated;
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('StockBought','*','READ','ALLOW','ROLE','buyer'),
+		('StockBought','*','WRITE','ALLOW','ROLE','buyer'),
+		('Buyer','*','READ','ALLOW','ROLE','buyer');
+

loopback/locale/en.json

@@ -235,9 +235,10 @@
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
-	"This postcode already exists": "This postcode already exists",
 	"Original invoice not found": "Original invoice not found",
 	"There is already a tray with the same height": "There is already a tray with the same height",
 	"The height must be greater than 50cm": "The height must be greater than 50cm",
-	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm"
+	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
-}
+	"This postcode already exists": "This postcode already exists",
+	"This buyer has already made a reservation for this date": "This buyer has already made a reservation for this date"
+}

loopback/locale/es.json

@@ -366,16 +366,17 @@
 	"The invoices have been created but the PDFs could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
 	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
 	"Payment method is required": "El método de pago es obligatorio",
-	"Cannot send mail": "Não é possível enviar o email",
+	"Cannot send mail": "No se ha podido enviar el correo",
 	"CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
 	"The sale not exists in the item shelving": "La venta no existe en la estantería del artículo",
-	"The entry not have stickers": "La entrada no tiene etiquetas",
-	"Too many records": "Demasiados registros",
 	"Original invoice not found": "Factura original no encontrada",
 	"The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
 	"Weight already set": "El peso ya está establecido",
 	"This ticket is not allocated to your department": "Este ticket no está asignado a tu departamento",
 	"There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
 	"The height must be greater than 50cm": "La altura debe ser superior a 50cm",
-	"The maximum height of the wagon is 200cm": "La altura máxima es 200cm"
+	"The maximum height of the wagon is 200cm": "La altura máxima es 200cm",
+	"The entry does not have stickers": "La entrada no tiene etiquetas",
+	"Too many records": "Demasiados registros",
+	"This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha"
 }

modules/account/back/models/mail-alias-account.js

@@ -1,5 +1,6 @@
 
 const ForbiddenError = require('vn-loopback/util/forbiddenError');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.rewriteDbError(function(err) {

modules/entry/back/methods/entry/print.js

@@ -52,7 +52,7 @@ module.exports = Self => {
             await merger.add(new Uint8Array(pdfBuffer[0]));
         }
 
-        if (!merger._doc) throw new UserError('The entry not have stickers');
+        if (!merger._doc) throw new UserError('The entry does not have stickers');
 
         await Self.rawSql(`
             UPDATE buy

modules/entry/back/methods/entry/specs/filter.spec.js

@@ -39,7 +39,7 @@ describe('Entry filter()', () => {
 
             const result = await models.Entry.filter(ctx, options);
 
-            expect(result.length).toEqual(11);
+            expect(result.length).toEqual(12);
 
             await tx.rollback();
         } catch (e) {
@@ -131,7 +131,7 @@ describe('Entry filter()', () => {
 
             const result = await models.Entry.filter(ctx, options);
 
-            expect(result.length).toEqual(10);
+            expect(result.length).toEqual(11);
 
             await tx.rollback();
         } catch (e) {

modules/entry/back/methods/stock-bought/getStockBought.js

@@ -0,0 +1,60 @@
+module.exports = Self => {
+    Self.remoteMethod('getStockBought', {
+        description: 'Returns the stock bought for a given date',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'workerFk',
+            type: 'number',
+            description: 'The id for a buyer',
+        },
+        {
+            arg: 'dated',
+            type: 'date',
+            description: 'The date to filter',
+        }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getStockBought`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getStockBought = async(workerFk, dated = Date.vnNew()) => {
+        const models = Self.app.models;
+        const today = Date.vnNew();
+        dated.setHours(0, 0, 0, 0);
+        today.setHours(0, 0, 0, 0);
+
+        if (dated.getTime() === today.getTime())
+            await models.StockBought.rawSql(`CALL vn.stockBought_calculate()`);
+
+        const filter = {
+            where: {
+                dated: dated
+            },
+            include: [
+                {
+                    relation: 'worker',
+                    scope: {
+                        include: [
+                            {
+                                relation: 'user',
+                                scope: {
+                                    fields: ['id', 'name']
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        };
+
+        if (workerFk) filter.where.workerFk = workerFk;
+
+        return models.StockBought.find(filter);
+    };
+};

modules/entry/back/methods/stock-bought/getStockBoughtDetail.js

@@ -0,0 +1,58 @@
+module.exports = Self => {
+    Self.remoteMethod('getStockBoughtDetail', {
+        description: 'Returns the detail of stock bought for a given date and a worker',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'workerFk',
+            type: 'number',
+            description: 'The worker to filter',
+            required: true,
+        }, {
+            arg: 'dated',
+            type: 'string',
+            description: 'The date to filter',
+        }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getStockBoughtDetail`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getStockBoughtDetail = async(workerFk, dated) => {
+        if (!dated) {
+            dated = Date.vnNew();
+            dated.setHours(0, 0, 0, 0);
+        }
+        return Self.rawSql(
+            `SELECT e.id entryFk,
+                    i.id itemFk,
+                    i.longName itemName,
+                    b.quantity,
+                    ROUND((ac.conversionCoefficient * 
+                            (b.quantity / b.packing) * 
+                            buy_getVolume(b.id)
+                        ) / (vc.trolleyM3 * 1000000), 
+                        2
+                    ) volume,
+                    b.packagingFk,
+                    b.packing
+                FROM entry e
+                    JOIN travel t ON t.id = e.travelFk 
+                    JOIN buy b ON b.entryFk = e.id
+                    JOIN item i ON i.id = b.itemFk 
+                    JOIN itemType it ON it.id = i.typeFk
+                    JOIN worker w ON w.id = it.workerFk 
+                    JOIN auctionConfig ac
+                    JOIN volumeConfig vc
+                WHERE t.warehouseInFk = ac.warehouseFk
+                    AND it.workerFk = ?
+                    AND t.shipped = util.VN_CURDATE()`,
+            [workerFk]
+        );
+    };
+};

modules/entry/back/model-config.json

@@ -25,5 +25,8 @@
     },
     "EntryType": {
         "dataSource": "vn"
+    },
+    "StockBought": {
+        "dataSource": "vn"
     }
 }

modules/entry/back/models/stock-bought.js

@@ -0,0 +1,10 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    require('../methods/stock-bought/getStockBought')(Self);
+    require('../methods/stock-bought/getStockBoughtDetail')(Self);
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This buyer has already made a reservation for this date`);
+        return err;
+    });
+};

modules/entry/back/models/stock-bought.json

@@ -0,0 +1,34 @@
+{
+    "name": "StockBought",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "stockBought"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "workerFk": {
+            "type": "number"
+        },
+        "bought": {
+            "type": "number"
+        },
+        "reserve": {
+            "type": "number"
+        },
+        "dated": {
+            "type": "date"
+        }
+    },
+    "relations": {
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "workerFk"
+        }
+    }
+}