diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index 39285a78d..f247c9b6b 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -13,7 +13,8 @@ on-error-src/>
-

+

{{::item.name}}

@@ -65,3 +66,6 @@ vn-id="pricesPopover" order="$ctrl.order"> + + \ No newline at end of file diff --git a/modules/order/front/prices-popover/index.html b/modules/order/front/prices-popover/index.html index 61d8bb1a7..2551853e6 100644 --- a/modules/order/front/prices-popover/index.html +++ b/modules/order/front/prices-popover/index.html @@ -1,75 +1,52 @@ - - -
- - - - -
-
- - -
- - -
- - - - - - {{::price.warehouse}} - - - -
- {{::price.grouping}} - x {{::price.price | currency: 'EUR': 2}} -
-
- {{price.priceKg | currency: 'EUR'}}/Kg -
- - - - - - - - -
-
- Wrong quantity + + + + + + + {{::price.warehouse}} + + + +
+ {{::price.grouping}} + x {{::price.price | currency: 'EUR': 2}}
- - -
- - - +
+ {{::price.priceKg | currency: 'EUR'}}/Kg +
+ + + + + + + + + + + +
+ + +
+ diff --git a/modules/order/front/prices-popover/index.js b/modules/order/front/prices-popover/index.js index c9620136d..7e2fb1900 100644 --- a/modules/order/front/prices-popover/index.js +++ b/modules/order/front/prices-popover/index.js @@ -11,34 +11,18 @@ class Controller extends Popover { set prices(value) { this._prices = value; if (value && value[0].grouping) - this.calculateTotal(); + this.getTotalQuantity(); } get prices() { return this._prices; } - getTags() { - const filter = { - where: { - itemFk: this.id, - priority: {gte: 4} - }, - order: 'priority ASC', - include: {relation: 'tag'} - }; - this.$http.get(`ItemTags`, {filter}) - .then(res => { - this.tags = res.data; - this.$.$applyAsync(() => this.relocate()); - }); - } - show(parent, item) { this.item = JSON.parse(JSON.stringify(item)); this.id = item.id; this.prices = this.item.prices; - this.getTags(); + super.show(parent); } @@ -47,67 +31,74 @@ class Controller extends Popover { this.item = {}; this.tags = {}; this._prices = {}; - this.total = 0; + this.totalQuantity = 0; super.onClose(); } - calculateMax() { - this.max = this.item.available - this.total; - } - - calculateTotal() { - this.total = 0; - - this.prices.forEach(price => { + getTotalQuantity() { + let total = 0; + for (let price of this.prices) { if (!price.quantity) price.quantity = 0; - this.total += price.quantity; - }); - this.calculateMax(); + total += price.quantity; + } + + this.totalQuantity = total; + this.maxQuantity = this.item.available - total; } addQuantity(price) { - if (this.total + price.grouping <= this.max) + this.getTotalQuantity(); + const quantity = this.totalQuantity + price.grouping; + if (quantity <= this.maxQuantity) price.quantity += price.grouping; } - getFilledLines() { - const filledLines = []; - let match; - this.prices.forEach(price => { + getGroupings() { + const filledRows = []; + for (let price of this.prices) { if (price.quantity && price.quantity > 0) { - match = filledLines.find(element => { - return element.warehouseFk == price.warehouseFk; + const priceMatch = filledRows.find(row => { + return row.warehouseFk == price.warehouseFk; }); - if (!match) { - filledLines.push(Object.assign({}, price)); - return; - } - match.quantity += price.quantity; + if (!priceMatch) + filledRows.push(Object.assign({}, price)); + else priceMatch.quantity += price.quantity; } - }); - return filledLines; + } + + return filledRows; } submit() { - this.calculateTotal(); - const filledLines = this.getFilledLines(); + const filledRows = this.getGroupings(); - if (filledLines.length <= 0) { - this.vnApp.showError(this.$t('First you must add some quantity')); - return; + try { + const hasValidGropings = filledRows.some(row => + row.quantity % row.grouping == 0 + ); + + if (filledRows.length <= 0) + throw new Error('First you must add some quantity'); + + if (!hasValidGropings) + throw new Error(`The amounts doesn't match with the grouping`); + + const params = { + orderFk: this.order.id, + items: filledRows + }; + this.$http.post(`OrderRows/addToOrder`, params) + .then(() => { + this.vnApp.showSuccess(this.$t('Data saved!')); + this.hide(); + if (this.card) this.card.reload(); + }); + } catch (e) { + this.vnApp.showError(this.$t(e.message)); + return false; } - - const params = { - orderFk: this.order.id, - items: filledLines - }; - this.$http.post(`OrderRows/addToOrder`, params) - .then(() => { - this.vnApp.showSuccess(this.$t('Data saved!')); - this.hide(); - if (this.card) this.card.reload(); - }); + return true; } } diff --git a/modules/order/front/prices-popover/locale/es.yml b/modules/order/front/prices-popover/locale/es.yml index b1a26e0f3..27eac802d 100644 --- a/modules/order/front/prices-popover/locale/es.yml +++ b/modules/order/front/prices-popover/locale/es.yml @@ -1,4 +1,3 @@ -Last entries: Últimas entradas Qty.: Cant. -Wrong quantity: Cantidad errónea -First you must add some quantity: Primero debes agregar alguna cantidad \ No newline at end of file +First you must add some quantity: Primero debes agregar alguna cantidad +The amounts doesn't match with the grouping: Las cantidades no coinciden con el grouping \ No newline at end of file diff --git a/modules/order/front/prices-popover/style.scss b/modules/order/front/prices-popover/style.scss index dbca75586..0ab12ad02 100644 --- a/modules/order/front/prices-popover/style.scss +++ b/modules/order/front/prices-popover/style.scss @@ -1,25 +1,8 @@ @import "variables"; .vn-order-prices-popover .content { - max-width: 350px; - - .header > a:first-child { - visibility: hidden; - } - img[ng-src] { - height: 100%; - width: 100%; - } - vn-vertical.data { - padding-right: 16px; - border-right: 1px solid $color-main; - } .prices { vn-table { - .warehouse { - width: 48px; - max-width: 48px; - } .price-kg { color: $color-font-secondary; font-size: .75rem @@ -30,18 +13,6 @@ } .footer { text-align: center; - - .error { - display: none; - } - &.invalid { - .error { - display: block; - padding-top: 10px; - color: $color-alert; - text-align: center; - } - } } } } \ No newline at end of file diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html index 390d9daf7..4f65fe008 100644 --- a/modules/ticket/front/descriptor-menu/index.html +++ b/modules/ticket/front/descriptor-menu/index.html @@ -7,7 +7,6 @@