diff --git a/front/salix/components/recover-password/index.html b/front/salix/components/recover-password/index.html
index b7587148b..5121f81bd 100644
--- a/front/salix/components/recover-password/index.html
+++ b/front/salix/components/recover-password/index.html
@@ -1,7 +1,7 @@
{
}, {
relation: 'address',
scope: {
- fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode'],
+ fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode', 'isEqualizated'],
include: {
relation: 'province',
scope: {
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 62e763c8f..bee01a875 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -41,6 +41,12 @@
"SaleComponent": {
"dataSource": "vn"
},
+ "SaleGroup": {
+ "dataSource": "vn"
+ },
+ "SaleGroupDetail": {
+ "dataSource": "vn"
+ },
"SaleTracking": {
"dataSource": "vn"
},
diff --git a/modules/ticket/back/models/sale.json b/modules/ticket/back/models/sale.json
index b30954ad1..669b05be6 100644
--- a/modules/ticket/back/models/sale.json
+++ b/modules/ticket/back/models/sale.json
@@ -75,6 +75,11 @@
"type": "hasOne",
"model": "ItemShelvingSale",
"foreignKey": "saleFk"
+ },
+ "saleGroupDetail": {
+ "type": "hasOne",
+ "model": "SaleGroupDetail",
+ "foreignKey": "saleFk"
}
}
}
diff --git a/modules/ticket/back/models/saleGroup.json b/modules/ticket/back/models/saleGroup.json
new file mode 100644
index 000000000..d5cf82cb5
--- /dev/null
+++ b/modules/ticket/back/models/saleGroup.json
@@ -0,0 +1,31 @@
+{
+ "name": "SaleGroup",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "saleGroup"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "parkingFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "saleGroupDetail": {
+ "type": "hasMany",
+ "model": "SaleGroupDetail",
+ "foreignKey": "saleGroupFk"
+ },
+ "parking": {
+ "type": "belongsTo",
+ "model": "Parking",
+ "foreignKey": "parkingFk"
+ }
+ }
+}
diff --git a/modules/ticket/back/models/saleGroupDetail.json b/modules/ticket/back/models/saleGroupDetail.json
new file mode 100644
index 000000000..2fbc71bbd
--- /dev/null
+++ b/modules/ticket/back/models/saleGroupDetail.json
@@ -0,0 +1,31 @@
+{
+ "name": "SaleGroupDetail",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "saleGroupDetail"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "saleFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "sale": {
+ "type": "belongsTo",
+ "model": "Sale",
+ "foreignKey": "saleFk"
+ },
+ "saleGroup": {
+ "type": "belongsTo",
+ "model": "SaleGroup",
+ "foreignKey": "saleGroupFk"
+ }
+ }
+}
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index c21eaa46a..8d3f414c2 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -17,6 +17,7 @@
Item
Description
Quantity
+
Parking
@@ -50,6 +51,7 @@
{{::sale.quantity}}
+
{{::sale.saleGroupDetail.saleGroup.parking.code | dashIfEmpty}}
Subtotal {{$ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
- VAT {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
+ VAT + RE
+ VAT
+ {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
+
Total {{$ctrl.summary.totalWithVat | currency: 'EUR':2}}