diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index eb28c4a01..4b726a833 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2834,24 +2834,24 @@ UPDATE `account`.`user`
INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
VALUES
- (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
- (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
- (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
+ (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 22, NULL),
+ (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 22, NULL),
+ (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 22, NULL),
(7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
- (16, 9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
+ (16, 9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 12, 'Shield');
INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
VALUES
(1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
(1, 18, 'select', '2001-06-09 11:00:03', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
- (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale', 69854, 'Armor' , '{"isPicked": false}','{"isPicked": true}', NULL),
- (1, 18, 'update', '2001-01-01 10:05:01', 'Sale', 69854, 'Armor' , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
- (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale', 5689, 'Shield' , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
- (1, 18, 'insert', '2000-12-31 15:00:05', 'Sale', 69854, 'Armor' , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
+ (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale', 5, 'Armor' , '{"isPicked": false}','{"isPicked": true}', NULL),
+ (1, 18, 'update', '2001-01-01 10:05:01', 'Sale', 5, 'Armor' , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
+ (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale', 4, 'Shield' , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
+ (1, 18, 'insert', '2000-12-31 15:00:05', 'Sale', 1, 'Armor' , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
(1, 18, 'update', '2000-12-28 08:40:45', 'Ticket', 45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
(1, 18, 'select', '2000-12-27 03:40:30', 'Ticket', 45, NULL , NULL, NULL, NULL),
- (1, 18, 'insert', '2000-04-10 09:40:15', 'Sale', 5689, 'Shield' , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
+ (1, 18, 'insert', '2000-04-10 09:40:15', 'Sale', 4, 'Shield' , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
(1, 18, 'insert', '1999-05-09 10:00:00', 'Ticket', 45, 'Super Man' , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
VALUES
diff --git a/front/salix/components/index.js b/front/salix/components/index.js
index 555a18450..9addc23c8 100644
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@@ -21,5 +21,4 @@ import './user-popover';
import './upload-photo';
import './bank-entity';
import './log';
-import './instance-log';
import './sendSms';
diff --git a/front/salix/components/instance-log/index.html b/front/salix/components/instance-log/index.html
deleted file mode 100644
index 9794f75c2..000000000
--- a/front/salix/components/instance-log/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/front/salix/components/instance-log/index.js b/front/salix/components/instance-log/index.js
deleted file mode 100644
index 6d8497c2d..000000000
--- a/front/salix/components/instance-log/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import ngModule from '../../module';
-import Section from '../section';
-import './style.scss';
-
-export default class Controller extends Section {
- open() {
- this.$.instanceLog.show();
- }
-}
-
-ngModule.vnComponent('vnInstanceLog', {
- controller: Controller,
- template: require('./index.html'),
- bindings: {
- model: '<',
- originId: '<',
- changedModelId: '<',
- changedModel: '@',
- url: '@'
- }
-});
diff --git a/front/salix/components/instance-log/style.scss b/front/salix/components/instance-log/style.scss
deleted file mode 100644
index f355e0ac8..000000000
--- a/front/salix/components/instance-log/style.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-vn-log.vn-instance-log {
- vn-card {
- width: 900px;
- visibility: hidden;
- & > * {
- visibility: visible;
- }
- }
-}
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 176815eef..790b7fbb8 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -72,6 +72,7 @@ export default class Controller extends Section {
$postLink() {
this.resetFilter();
+ this.defaultFilter();
this.$.$watch(
() => this.$.filter,
() => this.applyFilter(),
@@ -79,6 +80,14 @@ export default class Controller extends Section {
);
}
+ defaultFilter() {
+ const defaultFilters = ['changedModel', 'changedModelId'];
+ for (const defaultFilter of defaultFilters) {
+ if (this[defaultFilter])
+ this.$.filter[defaultFilter] = this[defaultFilter];
+ }
+ }
+
get logs() {
return this._logs;
}
diff --git a/modules/ticket/front/log/index.html b/modules/ticket/front/log/index.html
index 91109d3eb..c36b0aa52 100644
--- a/modules/ticket/front/log/index.html
+++ b/modules/ticket/front/log/index.html
@@ -1 +1,6 @@
-
\ No newline at end of file
+
+
diff --git a/modules/ticket/front/routes.json b/modules/ticket/front/routes.json
index e403ab02d..da39fbbf7 100644
--- a/modules/ticket/front/routes.json
+++ b/modules/ticket/front/routes.json
@@ -187,7 +187,7 @@
}
},
{
- "url" : "/log",
+ "url" : "/log?changedModel&changedModelId",
"state": "ticket.card.log",
"component": "vn-ticket-log",
"description": "Log"
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index be9e81964..b10df317b 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -212,16 +212,9 @@
vn-none
vn-tooltip="History"
icon="history"
- ng-click="log.open()"
+ ng-click="$ctrl.goToLog(sale.id)"
ng-show="sale.$hasLogs">
-
-
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index b68db6dc0..f946d0a25 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -558,6 +558,14 @@ class Controller extends Section {
cancel() {
this.$.editDiscount.hide();
}
+
+ goToLog(saleId) {
+ this.$state.go('ticket.card.log', {
+ originId: this.$params.id,
+ changedModel: 'Sale',
+ changedModelId: saleId
+ });
+ }
}
ngModule.vnComponent('vnTicketSale', {