diff --git a/db/changes/230201/00-ACL_ItemShelvingSale.sql b/db/changes/230201/00-ACL_ItemShelvingSale.sql
new file mode 100644
index 000000000..38b65f89a
--- /dev/null
+++ b/db/changes/230201/00-ACL_ItemShelvingSale.sql
@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+ VALUES ('ItemShelvingSale','*','*','ALLOW','employee');
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 762e5411a..4bbce0442 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1143,10 +1143,10 @@ INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`,
INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
VALUES
- ('1', '1', '1', '', '1106'),
- ('2', '2', '5', '', '1106'),
- ('1', '7', '1', '', '1106'),
- ('2', '8', '5', '', '1106');
+ ('1', '1', '1', util.VN_CURDATE(), '1106'),
+ ('2', '2', '5', util.VN_CURDATE(), '1106'),
+ ('1', '7', '1', util.VN_CURDATE(), '1106'),
+ ('2', '8', '5', util.VN_CURDATE(), '1106');
INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
VALUES
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 951a4553a..51659e716 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -41,6 +41,11 @@
"type": "belongsTo",
"model": "Account",
"foreignKey": "userFk"
- }
+ },
+ "shelving": {
+ "type": "belongsTo",
+ "model": "Shelving",
+ "foreignKey": "shelvingFk"
+ }
}
}
diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html
index a8b0b6230..3da4471c6 100644
--- a/modules/ticket/front/sale-checked/index.html
+++ b/modules/ticket/front/sale-checked/index.html
@@ -54,14 +54,14 @@
@@ -124,3 +124,46 @@
vn-id="worker-descriptor">
+
+
+
+
+
+
+
+
+
+ Quantity
+ Worker
+ Shelving
+ Parking
+ Created
+
+
+
+
+ {{::itemShelvingSale.quantity}}
+ {{::itemShelvingSale.userFk}}
+ {{::itemShelvingSale.itemShelving.shelvingFk}}
+ {{::itemShelvingSale.state}}
+ {{::itemShelvingSale.created | date: 'dd/MM/yyyy HH:mm'}}
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/ticket/front/sale-checked/index.js b/modules/ticket/front/sale-checked/index.js
index baa4c9af0..04196c313 100644
--- a/modules/ticket/front/sale-checked/index.js
+++ b/modules/ticket/front/sale-checked/index.js
@@ -17,6 +17,27 @@ class Controller extends Section {
}
]
};
+
+ this.filterItemShelvingSale = {
+ include: {
+ relation: 'itemShelving',
+ scope: {
+ fields: ['shelvingFk'],
+ include: {
+ relation: 'shelving',
+ scope: {
+ fields: ['parkingFk'],
+ include: {
+ relation: 'parking',
+ scope: {
+ fields: ['id', 'code']
+ }
+ }
+ }
+ }
+ }
+ }
+ };
}
$onInit() {
@@ -72,6 +93,13 @@ class Controller extends Section {
this.saleId = sale.id;
this.$.saleTracking.show();
}
+
+ showItemShelvingSale(sale) {
+ this.saleId = sale.id;
+ this.$.itemShelvingSale.show();
+
+ console.log(this.itemShelvingSales);
+ }
}
ngModule.vnComponent('vnTicketSaleChecked', {
diff --git a/modules/ticket/front/sale-checked/locale/es.yml b/modules/ticket/front/sale-checked/locale/es.yml
new file mode 100644
index 000000000..3a7964bb2
--- /dev/null
+++ b/modules/ticket/front/sale-checked/locale/es.yml
@@ -0,0 +1 @@
+ItemShelvings sale: Carros línea