diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 4f9d2f1acd..0e4e1b33d9 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -770,25 +770,25 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) (05080000, 'Coral y materiales similares', 2, 2), (06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`) +INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`, `minPrice`, `stars`) VALUES - (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '1', 1, NULL, 0), - (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '2', 1, NULL, 0), - (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '3', 1, NULL, 0), - (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, '4', 2, NULL, 0), - (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '5', 2, NULL, 0), - (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '6', 2, NULL, 0), - (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '7', 2, NULL, 0), - (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '8', 1, NULL, 0), - (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '9', 1, NULL, 0), - (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '10', 1, NULL, 0), - (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, '11', 2, NULL, 0), - (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '12', 2, NULL, 0), - (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '13', 2, NULL, 0), - (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), - (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), - (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0), - (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, '', 2, NULL, 0); + (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '1', 1, NULL, 0, 1), + (2, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '2', 1, NULL, 0, 2), + (3, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '3', 1, NULL, 0, 5), + (4, 1, 60, 'YEL', 1, 1, 'Increases block', 1, 05080000, 1, 4751000000, 0, NULL, 0, '4', 2, NULL, 0, 3), + (5, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '5', 2, NULL, 0, 3), + (6, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '6', 2, NULL, 0, 4), + (7, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '7', 2, NULL, 0, 4), + (8, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '8', 1, NULL, 0, 5), + (9, 2, 70, 'BLU', 1, 2, NULL, 1, 06021010, 0, 2000000000, 0, NULL, 0, '9', 1, NULL, 0, 4), + (10, 1, 60, 'YEL', 1, 3, NULL, 1, 05080000, 0, 4751000000, 0, NULL, 0, '10', 1, NULL, 0, 4), + (11, 1, 60, 'YEL', 1, 1, NULL, 1, 05080000, 1, 4751000000, 0, NULL, 0, '11', 2, NULL, 0, 4), + (12, 3, 30, 'RED', 1, 2, NULL, 2, 06021010, 1, 4751000000, 0, NULL, 0, '12', 2, NULL, 0, 3), + (13, 5, 30, 'RED', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '13', 2, NULL, 0, 2), + (14, 5, 90, 'BLU', 1, 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0, 4), + (15, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0, 0), + (16, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, '', 2, NULL, 0, 0), + (71, 4, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, '', 2, NULL, 0, 0); INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`) VALUES diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js index 60a3fddb3f..af577d2f9f 100644 --- a/e2e/paths/10-travel/04_extra_community.spec.js +++ b/e2e/paths/10-travel/04_extra_community.spec.js @@ -20,6 +20,7 @@ describe('Travel extra community path', () => { await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); + await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500'); await page.waitForTimeout(1000); }); diff --git a/front/core/components/index.js b/front/core/components/index.js index ea568bf2be..3ccc64b899 100644 --- a/front/core/components/index.js +++ b/front/core/components/index.js @@ -51,3 +51,4 @@ import './treeview'; import './wday-picker'; import './datalist'; import './contextmenu'; +import './rating'; diff --git a/front/core/components/rating/index.html b/front/core/components/rating/index.html new file mode 100644 index 0000000000..f34c726224 --- /dev/null +++ b/front/core/components/rating/index.html @@ -0,0 +1,5 @@ +
+ + +
\ No newline at end of file diff --git a/front/core/components/rating/index.js b/front/core/components/rating/index.js new file mode 100644 index 0000000000..68892cf3d2 --- /dev/null +++ b/front/core/components/rating/index.js @@ -0,0 +1,39 @@ +import ngModule from '../../module'; +import FormInput from '../form-input'; +import './style.scss'; + +export default class Rating extends FormInput { + constructor($element, $scope) { + super($element, $scope); + + this.maxStars = 5; + this.stars = []; + } + + get field() { + return super.field; + } + + set field(value) { + super.field = value; + this.populateStars(); + } + + populateStars() { + for (let i = 0; i < this.maxStars; i++) { + const star = {isActive: false}; + if (i < this.field) + star.isActive = true; + + this.stars.push(star); + } + } +} + +ngModule.vnComponent('vnRating', { + template: require('./index.html'), + controller: Rating, + bindings: { + maxStars: ' { + let $element; + let $ctrl; + + beforeEach(ngModule('vnCore')); + + beforeEach(inject(($compile, $rootScope) => { + $element = $compile(``)($rootScope); + $ctrl = $element.controller('vnRating'); + })); + + afterEach(() => { + $element.remove(); + }); + + describe('field() setter', () => { + it(`should change field value and then call the populateStars() method`, () => { + jest.spyOn($ctrl, 'populateStars'); + + $ctrl.field = 5; + + expect($ctrl.populateStars).toHaveBeenCalledWith(); + expect($ctrl.stars.length).toEqual(5); + }); + }); + + describe('populateStars()', () => { + it(`should populate the stars array and mark four of them as active`, () => { + jest.spyOn($ctrl, 'populateStars'); + + $ctrl.field = 4; + + const activeStars = $ctrl.stars.filter(star => star.isActive); + + expect(activeStars.length).toEqual(4); + }); + }); +}); diff --git a/front/core/components/rating/style.scss b/front/core/components/rating/style.scss new file mode 100644 index 0000000000..b15a8a64cd --- /dev/null +++ b/front/core/components/rating/style.scss @@ -0,0 +1,11 @@ +@import "variables"; + +vn-rating { + vn-icon { + color: $color-primary-light + } + + vn-icon.active { + color: $color-primary + } +} diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss index c71112ffe1..8883c54802 100644 --- a/front/core/styles/variables.scss +++ b/front/core/styles/variables.scss @@ -61,6 +61,8 @@ $color-hover-cd: rgba(0, 0, 0, .1); $color-hover-dc: .7; $color-disabled: .6; +$color-primary-medium: lighten($color-primary, 20%); +$color-primary-light: lighten($color-primary, 35%); $color-font-link-medium: lighten($color-font-link, 20%); $color-font-link-light: lighten($color-font-link, 35%); $color-main-medium: lighten($color-main, 20%); diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index afef37aa49..f51137620d 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -11,8 +11,8 @@ vn-descriptor-content { & > img[ng-src] { min-height: 16em; display: block; - height: 100%; - width: 100%; + width: 256px; + height: 256px; } vn-float-button { diff --git a/front/salix/styles/order-product.scss b/front/salix/styles/order-product.scss index 11be8ebe01..0f5281490b 100644 --- a/front/salix/styles/order-product.scss +++ b/front/salix/styles/order-product.scss @@ -54,13 +54,15 @@ flex: 1; } & > .tags { - padding-bottom: 3px; height: 48px; & > vn-label-value { font-size: .75rem; } } + vn-rating vn-icon { + font-size: 1rem + } } .footer { font-size: .8rem; diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json index bc13d5dfde..564eab4843 100644 --- a/modules/item/front/routes.json +++ b/modules/item/front/routes.json @@ -9,7 +9,7 @@ {"state": "item.index", "icon": "icon-item"}, {"state": "item.request", "icon": "pan_tool"}, {"state": "item.waste", "icon": "icon-claims"}, - {"state": "item.fixedPrice", "icon": ""} + {"state": "item.fixedPrice", "icon": "contact_support"} ], "card": [ {"state": "item.card.basicData", "icon": "settings"}, diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js index 23414372fe..b2d49054d0 100644 --- a/modules/order/back/methods/order/catalogFilter.js +++ b/modules/order/back/methods/order/catalogFilter.js @@ -108,6 +108,7 @@ module.exports = Self => { i.value7, i.tag8, i.value8, + i.stars, tci.price, tci.available, w.lastName AS lastName, diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 9f5977cd52..ef6ea8a44b 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -155,7 +155,8 @@ module.exports = Self => { co.code companyCode, zed.zoneFk, zed.hourTheoretical, - zed.hourEffective + zed.hourEffective, + am.name AS agencyName FROM hedera.order o LEFT JOIN address a ON a.id = o.address_id LEFT JOIN agencyMode am ON am.id = o.agency_id diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index 25d84db759..39285a78d5 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -36,6 +36,9 @@ value="{{::item.value7}}"> + +
diff --git a/modules/order/front/catalog-view/index.js b/modules/order/front/catalog-view/index.js index 1e99ab82b3..6f2cead8f8 100644 --- a/modules/order/front/catalog-view/index.js +++ b/modules/order/front/catalog-view/index.js @@ -2,11 +2,9 @@ import ngModule from '../module'; import Component from 'core/lib/component'; import './style.scss'; -class Controller extends Component {} - ngModule.vnComponent('vnOrderCatalogView', { template: require('./index.html'), - controller: Controller, + controller: Component, bindings: { order: '<', model: '<' diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 7ad34a501a..230916ba3d 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -15,8 +15,8 @@ Confirmed Created Landed - T. Hour - Real hour + Hour + Agency Total @@ -52,8 +52,11 @@ {{::order.landed | date:'dd/MM/yyyy'}} - {{::order.hourTheoretical | date: 'HH:mm' | dashIfEmpty}} - {{::ticket.hourEffective | date: 'HH:mm' | dashIfEmpty}} + {{::(order.hourTheoretical + ? order.hourTheoretical + : order.hourEffective) | dashIfEmpty + }} + {{::order.agencyName}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}} + ng-model="$ctrl.shippedFrom"> + label="Landed from" + ng-model="$ctrl.landedFrom"> + + label="Shipped to" + ng-model="$ctrl.shippedTo"> + ng-model="$ctrl.landedTo"> diff --git a/modules/travel/front/extra-community-search-panel/index.js b/modules/travel/front/extra-community-search-panel/index.js index f2e4b66d9a..4e50ea787b 100644 --- a/modules/travel/front/extra-community-search-panel/index.js +++ b/modules/travel/front/extra-community-search-panel/index.js @@ -9,47 +9,47 @@ class Controller extends SearchPanel { } get shippedFrom() { - return this._shippedFrom; + return this.filter.shippedFrom; } set shippedFrom(value) { - this._shippedFrom = value; + this.filter.shippedFrom = value; - if (!this.filter.shippedTo) - this.filter.shippedTo = value; + if (!this.filter.landedFrom) + this.filter.landedFrom = value; } get shippedTo() { - return this._shippedTo; + return this.filter.shippedTo; } set shippedTo(value) { - this._shippedTo = value; - - if (!this.filter.shippedFrom) - this.filter.shippedFrom = value; - } - - get landedFrom() { - return this._landedFrom; - } - - set landedFrom(value) { - this._landedFrom = value; + this.filter.shippedTo = value; if (!this.filter.landedTo) this.filter.landedTo = value; } + get landedFrom() { + return this.filter.landedFrom; + } + + set landedFrom(value) { + this.filter.landedFrom = value; + + if (!this.filter.shippedFrom) + this.filter.shippedFrom = value; + } + get landedTo() { - return this._landedTo; + return this.filter.landedTo; } set landedTo(value) { - this._landedTo = value; + this.filter.landedTo = value; - if (!this.filter.landedFrom) - this.filter.landedFrom = value; + if (!this.filter.shippedTo) + this.filter.shippedTo = value; } }