From d0ae97e41ba512327da28cf42323c817848b1833 Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 28 Dec 2022 12:16:23 +0100 Subject: [PATCH] refactor: move changes from ticket.sale-checked to ticket.sale-tracking --- modules/ticket/front/sale-tracking/index.html | 153 ++++++++++++++---- modules/ticket/front/sale-tracking/index.js | 82 +++++++++- .../ticket/front/sale-tracking/locale/es.yml | 1 + modules/ticket/front/sale-tracking/style.scss | 7 + 4 files changed, 210 insertions(+), 33 deletions(-) create mode 100644 modules/ticket/front/sale-tracking/locale/es.yml create mode 100644 modules/ticket/front/sale-tracking/style.scss diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html index fc585650a3..2a7b53a8f2 100644 --- a/modules/ticket/front/sale-tracking/index.html +++ b/modules/ticket/front/sale-tracking/index.html @@ -1,10 +1,11 @@ @@ -12,31 +13,28 @@ - + Is checked Item - Description + Description Quantity - Original - Worker - State - Created + + - - - + + + + + + - {{sale.itemFk | zeroFill:6}} + {{::sale.itemFk | zeroFill:6}} @@ -53,16 +51,20 @@ {{::sale.quantity}} - {{::sale.originalQuantity}} - - - {{::sale.userNickname | dashIfEmpty}} - + + + + + + + - {{::sale.state}} - {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} @@ -70,8 +72,99 @@ + warehouse-fk="$ctrl.ticket.warehouseFk" + ticket-fk="$ctrl.ticket.id"> - - \ No newline at end of file + + + + + + + + + + Quantity + Original + Worker + State + Created + + + + + {{::sale.quantity}} + {{::sale.originalQuantity}} + + + {{::sale.userNickname | dashIfEmpty}} + + + {{::sale.state}} + {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} + + + + + + + + + + + + + + + + + + + + Quantity + Worker + Shelving + Parking + Created + + + + + {{::itemShelvingSale.quantity}} + + + {{::itemShelvingSale.name | dashIfEmpty}} + + + {{::itemShelvingSale.shelvingFk}} + {{::itemShelvingSale.code}} + {{::itemShelvingSale.created | date: 'dd/MM/yyyy HH:mm'}} + + + + + + + + diff --git a/modules/ticket/front/sale-tracking/index.js b/modules/ticket/front/sale-tracking/index.js index 394ef4f1ee..25a4632caf 100644 --- a/modules/ticket/front/sale-tracking/index.js +++ b/modules/ticket/front/sale-tracking/index.js @@ -1,12 +1,88 @@ import ngModule from '../module'; import Section from 'salix/components/section'; +import './style.scss'; -class Controller extends Section {} +class Controller extends Section { + constructor($element, $) { + super($element, $); + this.filter = { + include: [ + { + relation: 'item' + }, { + relation: 'isChecked', + scope: { + fields: ['isChecked'] + } + } + ] + }; + } + + $onInit() { + const query = `Sales/${this.$params.id}/salePreparingList`; + this.$http.get(query) + .then(res => { + this.salePreparingList = res.data; + }); + } + + showItemDescriptor(event, sale) { + this.quicklinks = { + btnThree: { + icon: 'icon-transaction', + state: `item.card.diary({ + id: ${sale.itemFk}, + warehouseFk: ${this.ticket.warehouseFk}, + lineFk: ${sale.id} + })`, + tooltip: 'Item diary' + } + }; + this.$.itemDescriptor.show(event.target, sale.itemFk); + } + + chipHasSaleGroupDetail(saleId) { + this.salePreparing = this.salePreparingList.find(element => element.saleFk == saleId); + if (this.salePreparing.hasSaleGroupDetail) return 'pink'; + else return 'message'; + } + + chipIsPreviousSelected() { + if (this.salePreparing.isPreviousSelected) return 'notice'; + else return 'message'; + } + + chipIsPrevious() { + if (this.salePreparing.isPrevious) return 'dark-notice'; + else return 'message'; + } + + chipIsPrepared() { + if (this.salePreparing.isPrepared) return 'warning'; + else return 'message'; + } + + chipIsControled() { + if (this.salePreparing.isControled) return 'yellow'; + else return 'message'; + } + + showSaleTracking(sale) { + this.saleId = sale.id; + this.$.saleTracking.show(); + } + + showItemShelvingSale(sale) { + this.saleId = sale.id; + this.$.itemShelvingSale.show(); + } +} ngModule.vnComponent('vnTicketSaleTracking', { template: require('./index.html'), controller: Controller, bindings: { - ticket: '<', - }, + ticket: '<' + } }); diff --git a/modules/ticket/front/sale-tracking/locale/es.yml b/modules/ticket/front/sale-tracking/locale/es.yml new file mode 100644 index 0000000000..3a7964bb2d --- /dev/null +++ b/modules/ticket/front/sale-tracking/locale/es.yml @@ -0,0 +1 @@ +ItemShelvings sale: Carros línea diff --git a/modules/ticket/front/sale-tracking/style.scss b/modules/ticket/front/sale-tracking/style.scss new file mode 100644 index 0000000000..8f02410c2e --- /dev/null +++ b/modules/ticket/front/sale-tracking/style.scss @@ -0,0 +1,7 @@ +@import "variables"; + +.chip { + display: inline-block; + min-width: 10px; + min-height: 20px; +}