diff --git a/db/changes/234201/00-alterTableTicketRequest.sql b/db/changes/234201/00-alterTableTicketRequest.sql
new file mode 100644
index 0000000000..2a08137b98
--- /dev/null
+++ b/db/changes/234201/00-alterTableTicketRequest.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`ticketRequest` MODIFY COLUMN `itemFk` double DEFAULT NULL NOT NULL;
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index c505b3a097..571ad49af4 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -26,6 +26,7 @@
Ticket ID
Shipped
Description
+ Requester
Requested
Price
Atender
@@ -51,6 +52,13 @@
{{::request.description}}
+
+
+ {{::request.requesterName}}
+
+
{{::request.quantity}}
{{::request.price | currency: 'EUR':2}}
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index f27ea50184..47e5719889 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -99,6 +99,8 @@ module.exports = Self => {
switch (value) {
case 'pending':
return {'tr.isOk': null};
+ case 'accepted':
+ return {'tr.isOk': 1};
default:
return {'tr.isOk': value};
}
@@ -122,8 +124,7 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
const stmt = new ParameterizedSQL(
- `SELECT
- tr.id,
+ `SELECT tr.id,
tr.ticketFk,
tr.quantity,
tr.price,
@@ -133,18 +134,19 @@ module.exports = Self => {
tr.saleFk,
tr.requesterFk,
tr.isOk,
- s.quantity AS saleQuantity,
+ s.quantity saleQuantity,
s.itemFk,
- i.name AS itemDescription,
+ i.name itemDescription,
t.shipped,
- DATE(t.shipped) AS shippedDate,
+ DATE(t.shipped) shippedDate,
t.nickname,
t.warehouseFk,
t.clientFk,
- w.name AS warehouse,
- u.nickname AS salesPersonNickname,
- ua.name AS attenderName,
- c.salesPersonFk
+ w.name warehouse,
+ u.nickname salesPersonNickname,
+ ua.name attenderName,
+ c.salesPersonFk,
+ ua2.name requesterName
FROM ticketRequest tr
LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk
LEFT JOIN ticket t ON t.id = tr.ticketFk
@@ -155,9 +157,12 @@ module.exports = Self => {
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.id
LEFT JOIN worker wka ON wka.id = tr.attenderFk
- LEFT JOIN account.user ua ON ua.id = wka.id`);
+ LEFT JOIN account.user ua ON ua.id = wka.id
+ LEFT JOIN account.user ua2 ON ua2.id = tr.requesterFk`);
stmt.merge(conn.makeSuffix(filter));
+ console.log(stmt);
+
return conn.executeStmt(stmt, myOptions);
};
};