diff --git a/client/ticket/routes.json b/client/ticket/routes.json index c602f87689..49cb84b9c3 100644 --- a/client/ticket/routes.json +++ b/client/ticket/routes.json @@ -137,6 +137,18 @@ "description": "Sale", "icon": "icon-lines" } + }, + { + "url" : "/sale-checked", + "state": "ticket.card.saleChecked", + "component": "vn-ticket-sale-checked", + "params": { + "ticket": "$ctrl.ticket" + }, + "menu": { + "description": "Sale Checked", + "icon": "assignment" + } } ] } \ No newline at end of file diff --git a/client/ticket/src/locale/es.yml b/client/ticket/src/locale/es.yml index 5f40255880..a95164c74a 100644 --- a/client/ticket/src/locale/es.yml +++ b/client/ticket/src/locale/es.yml @@ -19,3 +19,11 @@ Sale: Lineas del pedido Some fields are invalid: Algunos campos no son válidos The observation type must be unique: El tipo de observación debe ser único Tickets: Tickets +Date : Fecha +Employee : Empleado +State: Estado +Tracking: Revisión +Created : Añadido +New : Nuevo +New state: Nuevo estado +Sale Checked: Control clientes diff --git a/client/ticket/src/sale-checked/sale-checked.html b/client/ticket/src/sale-checked/sale-checked.html new file mode 100644 index 0000000000..6785f33913 --- /dev/null +++ b/client/ticket/src/sale-checked/sale-checked.html @@ -0,0 +1,36 @@ + + + + + Sale checked + + + + + + + + + + + + + + + + + + +
Is checkedItemDescriptionQuantity
{{::sale.itemFk}} + + {{::sale.concept}} + + + {{::fetchedTag.tag.name}} {{::fetchedTag.value}} + + + + {{::sale.quantity}}
+
+
+
diff --git a/client/ticket/src/sale-checked/sale-checked.js b/client/ticket/src/sale-checked/sale-checked.js new file mode 100644 index 0000000000..ff5bf01a40 --- /dev/null +++ b/client/ticket/src/sale-checked/sale-checked.js @@ -0,0 +1,17 @@ +import ngModule from '../module'; +import FilterTicketList from '../filter-ticket-list'; + +class Controller extends FilterTicketList { + constructor($scope, $timeout, $state) { + super($scope, $timeout, $state); + + this.onOrder('quantity', 'ASC'); + } +} + +Controller.$inject = ['$scope', '$timeout', '$state']; + +ngModule.component('vnTicketSaleChecked', { + template: require('./sale-checked.html'), + controller: Controller +}); diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 132502666a..5a84ce4277 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -12,3 +12,4 @@ import './package/package'; import './sale/sale'; import './tracking/tracking'; import './fetched-tags/fetched-tags'; +import './sale-checked/sale-checked'; diff --git a/services/ticket/common/methods/sale/filter.js b/services/ticket/common/methods/sale/filter.js index b33d5f1b63..66d73b6b24 100644 --- a/services/ticket/common/methods/sale/filter.js +++ b/services/ticket/common/methods/sale/filter.js @@ -20,6 +20,12 @@ module.exports = Self => { } } } + }, + { + relation: "isChecked", + scope: { + fields: ["isChecked"] + } }] }; } diff --git a/services/ticket/common/models/sale.json b/services/ticket/common/models/sale.json index a7d75cf1ef..f1bf0eab8c 100644 --- a/services/ticket/common/models/sale.json +++ b/services/ticket/common/models/sale.json @@ -51,6 +51,11 @@ "model": "Ticket", "foreignKey": "ticketFk", "required": true + }, + "isChecked": { + "type": "hasOne", + "model": "SaleChecked", + "foreignKey": "saleFk" } } }