Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
This commit is contained in:
commit
17b7ffeec3
|
|
@ -25,9 +25,11 @@ pipeline {
|
|||
switch (env.BRANCH_NAME) {
|
||||
case 'master':
|
||||
env.NODE_ENV = 'production'
|
||||
env.BACK_REPLICAS = 4
|
||||
break
|
||||
case 'test':
|
||||
env.NODE_ENV = 'test'
|
||||
env.BACK_REPLICAS = 2
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ module.exports = Self => {
|
|||
throw new UserError(`You don't have enough privileges`);
|
||||
|
||||
if (process.env.NODE_ENV == 'test')
|
||||
throw new UserError(`You can't upload images on the test instance`);
|
||||
throw new UserError(`You can't upload images on the test environment`);
|
||||
|
||||
// Upload file to temporary path
|
||||
const tempContainer = await TempContainer.container(args.collection);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
DROP TRIGGER IF EXISTS `vn`.`itemTag_afterUpdate`;
|
||||
|
||||
DELIMITER $$
|
||||
USE `vn`$$
|
||||
CREATE DEFINER=`root`@`%` TRIGGER `vn`.`itemTag_afterUpdate`
|
||||
AFTER UPDATE ON `itemTag` FOR EACH ROW
|
||||
trig: BEGIN
|
||||
IF @isTriggerDisabled THEN
|
||||
LEAVE trig;
|
||||
END IF;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.item;
|
||||
CREATE TEMPORARY TABLE tmp.item
|
||||
SELECT NEW.itemFk id;
|
||||
|
||||
CALL item_refreshTags();
|
||||
DROP TEMPORARY TABLE tmp.item;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1 @@
|
|||
12271-wisemen
|
||||
|
|
@ -0,0 +1 @@
|
|||
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('FixedPrice', '*', '*', 'ALLOW', 'ROLE', 'buyer');
|
||||
|
|
@ -8,7 +8,7 @@ services:
|
|||
ports:
|
||||
- 80
|
||||
deploy:
|
||||
replicas: 3
|
||||
replicas: 2
|
||||
back:
|
||||
image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
|
||||
build: .
|
||||
|
|
@ -30,7 +30,7 @@ services:
|
|||
- /mnt/storage/dms:/var/lib/salix/dms
|
||||
- /mnt/storage/image:/var/lib/salix/image
|
||||
deploy:
|
||||
replicas: 6
|
||||
replicas: ${BACK_REPLICAS:?}
|
||||
configs:
|
||||
datasources:
|
||||
external: true
|
||||
|
|
|
|||
|
|
@ -250,6 +250,18 @@ export default {
|
|||
taxClassCheckbox: '.vn-popover.shown vn-horizontal:nth-child(11) > vn-check',
|
||||
saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button'
|
||||
},
|
||||
itemFixedPrice: {
|
||||
add: 'vn-fixed-price vn-icon[icon="add_circle"]',
|
||||
fourthFixedPrice: 'vn-fixed-price vn-tr:nth-child(4)',
|
||||
fourthItemID: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.itemFk"]',
|
||||
fourthWarehouse: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.warehouseFk"]',
|
||||
fourthPPU: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(4)',
|
||||
fourthPPP: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(5)',
|
||||
fourthMinPrice: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(6)',
|
||||
fourthStarted: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.started"]',
|
||||
fourthEnded: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.ended"]',
|
||||
fourthDeleteIcon: 'vn-fixed-price vn-tr:nth-child(4) > vn-td:nth-child(9) > vn-icon-button[icon="delete"]'
|
||||
},
|
||||
itemCreateView: {
|
||||
temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]',
|
||||
type: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
|
||||
|
|
@ -721,9 +733,9 @@ export default {
|
|||
},
|
||||
workerSummary: {
|
||||
header: 'vn-worker-summary h5',
|
||||
id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) > section > span',
|
||||
email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
|
||||
department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
|
||||
id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
|
||||
email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
|
||||
department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(5) > section > span',
|
||||
userId: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(2) > section > span',
|
||||
userName: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) > section > span',
|
||||
role: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) > section > span',
|
||||
|
|
@ -793,13 +805,13 @@ export default {
|
|||
workerCalendar: {
|
||||
year: 'vn-worker-calendar vn-autocomplete[ng-model="$ctrl.year"]',
|
||||
totalHolidaysUsed: 'vn-worker-calendar div.totalBox > div',
|
||||
januaryThirtyFirst: 'vn-worker-calendar vn-calendar:nth-child(2) section:nth-child(33) > div',
|
||||
marchTwentyThird: 'vn-worker-calendar vn-calendar:nth-child(4) section:nth-child(29) > div',
|
||||
mayFourth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(8) > div',
|
||||
mayEighth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(12) > div',
|
||||
mayTwelfth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(16) > div',
|
||||
mayThirteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(17) > div',
|
||||
mayFourteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(18) > div',
|
||||
penultimateMondayOfJanuary: 'vn-worker-calendar vn-calendar:nth-child(2) section:nth-child(22) > div',
|
||||
lastMondayOfMarch: 'vn-worker-calendar vn-calendar:nth-child(4) section:nth-child(29) > div',
|
||||
fistMondayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(8) > div',
|
||||
secondFridayOfJun: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(12) > div',
|
||||
secondTuesdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(16) > div',
|
||||
secondWednesdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(17) > div',
|
||||
secondThursdayOfMay: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(18) > div',
|
||||
holidays: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(1)',
|
||||
absence: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(2)',
|
||||
halfHoliday: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(3)',
|
||||
|
|
@ -832,7 +844,8 @@ export default {
|
|||
},
|
||||
travelExtraCommunity: {
|
||||
anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr',
|
||||
firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable',
|
||||
firstTravelReference: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="reference"]',
|
||||
firstTravelLockedKg: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="lockedKg"]',
|
||||
removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i'
|
||||
},
|
||||
travelBasicData: {
|
||||
|
|
|
|||
|
|
@ -27,31 +27,31 @@ describe('Worker calendar path', () => {
|
|||
it('should set two days as holidays on the calendar and check the total holidays increased by 1.5', async() => {
|
||||
await page.waitToClick(selectors.workerCalendar.holidays);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
|
||||
await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.absence);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.marchTwentyThird);
|
||||
await page.waitToClick(selectors.workerCalendar.lastMondayOfMarch);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.halfHoliday);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayFourth);
|
||||
await page.waitToClick(selectors.workerCalendar.fistMondayOfMay);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.furlough);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayTwelfth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondTuesdayOfMay);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayThirteenth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondWednesdayOfMay);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayFourteenth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondThursdayOfMay);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.halfFurlough);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayEighth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondFridayOfJun);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
|
||||
const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
|
||||
|
|
@ -71,31 +71,31 @@ describe('Worker calendar path', () => {
|
|||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.holidays);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
|
||||
await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.absence);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.marchTwentyThird);
|
||||
await page.waitToClick(selectors.workerCalendar.lastMondayOfMarch);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.halfHoliday);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayFourth);
|
||||
await page.waitToClick(selectors.workerCalendar.fistMondayOfMay);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.furlough);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayTwelfth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondTuesdayOfMay);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayThirteenth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondWednesdayOfMay);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayFourteenth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondThursdayOfMay);
|
||||
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.halfFurlough);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.mayEighth);
|
||||
await page.waitToClick(selectors.workerCalendar.secondFridayOfJun);
|
||||
});
|
||||
|
||||
it('should check the total holidays used are back to what it was', async() => {
|
||||
|
|
@ -116,7 +116,7 @@ describe('Worker calendar path', () => {
|
|||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.holidays);
|
||||
await page.waitForTimeout(reasonableTimeBetweenClicks);
|
||||
await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
|
||||
await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
|
||||
});
|
||||
|
||||
it('should check the total holidays used are now the initial ones', async() => {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
import selectors from '../../helpers/selectors.js';
|
||||
import getBrowser from '../../helpers/puppeteer';
|
||||
|
||||
describe('Item fixed prices path', () => {
|
||||
let browser;
|
||||
let page;
|
||||
beforeAll(async() => {
|
||||
browser = await getBrowser();
|
||||
page = browser.page;
|
||||
await page.loginAndModule('buyer', 'item');
|
||||
await page.accessToSection('item.fixedPrice');
|
||||
});
|
||||
|
||||
afterAll(async() => {
|
||||
await browser.close();
|
||||
});
|
||||
|
||||
it('should click on the add new foxed price button', async() => {
|
||||
await page.waitToClick(selectors.itemFixedPrice.add);
|
||||
await page.waitForSelector(selectors.itemFixedPrice.fourthFixedPrice);
|
||||
});
|
||||
|
||||
it('should fill the fixed price data', async() => {
|
||||
const now = new Date();
|
||||
const searchValue = 'Chest ammo box';
|
||||
await page.waitToClick(selectors.itemFixedPrice.fourthItemID);
|
||||
await page.write('body > div > div > div.content > div.filter.ng-scope > vn-textfield', searchValue);
|
||||
try {
|
||||
await page.waitForFunction(searchValue => {
|
||||
const element = document.querySelector('li.active');
|
||||
if (element)
|
||||
return element.innerText.toLowerCase().includes(searchValue.toLowerCase());
|
||||
}, {}, searchValue);
|
||||
} catch (error) {
|
||||
const builtSelector = await page.selectorFormater(selectors.ticketSales.moreMenuState);
|
||||
const inputValue = await page.evaluate(() => {
|
||||
return document.querySelector('.vn-drop-down.shown vn-textfield input').value;
|
||||
});
|
||||
throw new Error(`${builtSelector} value is ${inputValue}! ${error}`);
|
||||
}
|
||||
await page.keyboard.press('Enter');
|
||||
await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
|
||||
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPU, '20');
|
||||
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPP, '10');
|
||||
await page.writeOnEditableTD(selectors.itemFixedPrice.fourthMinPrice, '5');
|
||||
await page.pickDate(selectors.itemFixedPrice.fourthStarted, now);
|
||||
await page.pickDate(selectors.itemFixedPrice.fourthEnded, now);
|
||||
await page.waitForTimeout(1000);
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
expect(message.text).toContain('Data saved!');
|
||||
});
|
||||
|
||||
it('should reload the section and check the created price has the expected ID', async() => {
|
||||
await page.accessToSection('item.index');
|
||||
await page.accessToSection('item.fixedPrice');
|
||||
const result = await page.getProperty('vn-fixed-price > div > vn-card > vn-table > div > vn-tbody > vn-tr:nth-child(4) > vn-td:nth-child(1) > span', 'innerText');
|
||||
|
||||
expect(result).toContain('13');
|
||||
});
|
||||
});
|
||||
|
|
@ -16,19 +16,23 @@ describe('Travel extra community path', () => {
|
|||
await browser.close();
|
||||
});
|
||||
|
||||
it('should edit the travel reference', async() => {
|
||||
it('should edit the travel reference and the locked kilograms', async() => {
|
||||
await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter);
|
||||
await page.waitForSpinnerLoad();
|
||||
await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
|
||||
await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500');
|
||||
await page.waitForTimeout(1000);
|
||||
});
|
||||
|
||||
it('should reload the index and confirm the reference was edited', async() => {
|
||||
it('should reload the index and confirm the reference and locked kg were edited', async() => {
|
||||
await page.accessToSection('travel.index');
|
||||
await page.accessToSection('travel.extraCommunity');
|
||||
await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter);
|
||||
await page.waitForTextInElement(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
|
||||
const reference = await page.getProperty(selectors.travelExtraCommunity.firstTravelReference, 'innerText');
|
||||
const lockedKg = await page.getProperty(selectors.travelExtraCommunity.firstTravelLockedKg, 'innerText');
|
||||
|
||||
expect(reference).toContain('edited reference');
|
||||
expect(lockedKg).toContain(1500);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -187,7 +187,10 @@ export default class Field extends FormInput {
|
|||
}
|
||||
|
||||
onChange() {
|
||||
this.emit('change', {value: this.field});
|
||||
// Changes doesn't reflect until appling async
|
||||
this.$.$applyAsync(() => {
|
||||
this.emit('change', {value: this.field});
|
||||
});
|
||||
}
|
||||
}
|
||||
Field.$inject = ['$element', '$scope'];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import Component from '../../lib/component';
|
||||
import './style.scss';
|
||||
|
||||
export default class SearchPanel extends Component {
|
||||
set filter(value) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@import "variables";
|
||||
@import "./variables";
|
||||
|
||||
vn-searchbar {
|
||||
display: block;
|
||||
|
|
@ -44,4 +44,27 @@ vn-searchbar {
|
|||
& > form {
|
||||
padding: $spacing-lg;
|
||||
}
|
||||
|
||||
& > form#manifold-form {
|
||||
padding: 0;
|
||||
|
||||
.manifold-panel {
|
||||
border: $border-thin-light;
|
||||
border-radius: 5px;
|
||||
position: relative;
|
||||
text-align: right;
|
||||
|
||||
.or {
|
||||
font-weight: bold;
|
||||
font-size: 26px;
|
||||
color: $color-font-secondary
|
||||
}
|
||||
|
||||
vn-icon[icon="info"] {
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
right: 2px
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import ngModule from '../../module';
|
||||
import './style.scss';
|
||||
|
||||
export default class Th {
|
||||
constructor($element) {
|
||||
|
|
|
|||
|
|
@ -73,6 +73,21 @@ ui-view > .vn-summary {
|
|||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
position: relative;
|
||||
span {
|
||||
display: block;
|
||||
}
|
||||
a {
|
||||
color: $color-font;
|
||||
}
|
||||
}
|
||||
h4 span:after {
|
||||
font-family: 'Material Icons';
|
||||
content: 'open_in_new';
|
||||
position: absolute;
|
||||
right: 5px;
|
||||
text-transform: none;
|
||||
color: $color-spacer
|
||||
}
|
||||
& > * {
|
||||
margin: $spacing-sm;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ Suppliers: Proveedores
|
|||
Summary: Vista previa
|
||||
Basic data: Datos básicos
|
||||
List: Listado
|
||||
Go to: Ir a
|
||||
|
||||
# Misc
|
||||
|
||||
|
|
|
|||
|
|
@ -166,5 +166,6 @@
|
|||
"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
|
||||
"Sorts whole route": "Reordena ruta entera",
|
||||
"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong> y un precio de <strong>{{price}} €</strong>",
|
||||
"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong>"
|
||||
"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong>",
|
||||
"That item doesn't exists": "Ese artículo no existe"
|
||||
}
|
||||
|
|
@ -35,14 +35,13 @@ module.exports = Self => {
|
|||
accountConfig
|
||||
} = this;
|
||||
|
||||
let newEntry;
|
||||
let dn = `uid=${userName},${this.userDn}`;
|
||||
|
||||
if (info.hasAccount) {
|
||||
let {user} = info;
|
||||
|
||||
let oldUser = await client.searchOne(this.userDn, {
|
||||
scope: 'sub',
|
||||
attributes: ['userPassword', 'sambaNTPassword'],
|
||||
filter: `&(uid=${userName})`
|
||||
});
|
||||
|
||||
|
|
@ -52,7 +51,7 @@ module.exports = Self => {
|
|||
? nameArgs.splice(1).join(' ')
|
||||
: '-';
|
||||
|
||||
newEntry = {
|
||||
let newEntry = {
|
||||
uid: userName,
|
||||
objectClass: [
|
||||
'inetOrgPerson',
|
||||
|
|
@ -101,62 +100,115 @@ module.exports = Self => {
|
|||
if (newEntry[prop] == null)
|
||||
delete newEntry[prop];
|
||||
}
|
||||
|
||||
if (oldUser) {
|
||||
let changes = [];
|
||||
let skipProps = new Set([
|
||||
'dn',
|
||||
'controls'
|
||||
]);
|
||||
|
||||
for (let prop in oldUser) {
|
||||
let deleteProp = !skipProps.has(prop)
|
||||
&& !newEntry.hasOwnProperty(prop);
|
||||
if (!deleteProp) continue;
|
||||
changes.push(new ldap.Change({
|
||||
operation: 'delete',
|
||||
modification: {
|
||||
[prop]: oldUser[prop]
|
||||
}
|
||||
}));
|
||||
}
|
||||
for (let prop in newEntry) {
|
||||
if (this.isEqual(oldUser[prop], newEntry[prop]))
|
||||
continue;
|
||||
changes.push(new ldap.Change({
|
||||
operation: 'replace',
|
||||
modification: {
|
||||
[prop]: newEntry[prop]
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
if (changes.length)
|
||||
await client.modify(dn, changes);
|
||||
} else
|
||||
await client.add(dn, newEntry);
|
||||
} else {
|
||||
try {
|
||||
await client.del(dn);
|
||||
console.log(` -> User '${userName}' removed from LDAP`);
|
||||
} catch (e) {
|
||||
if (e.name !== 'NoSuchObjectError') throw e;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// Remove and recreate (if applicable) user
|
||||
|
||||
let dn = `uid=${userName},${this.userDn}`;
|
||||
let operation;
|
||||
|
||||
try {
|
||||
await client.del(dn);
|
||||
operation = 'delete';
|
||||
} catch (e) {
|
||||
if (e.name !== 'NoSuchObjectError') throw e;
|
||||
}
|
||||
|
||||
if (info.hasAccount) {
|
||||
await client.add(dn, newEntry);
|
||||
operation = 'add';
|
||||
}
|
||||
|
||||
if (operation === 'delete')
|
||||
console.log(` -> User '${userName}' removed from LDAP`);
|
||||
isEqual(a, b) {
|
||||
if (Array.isArray(a) && Array.isArray(b)) {
|
||||
if (a.length !== b.length)
|
||||
return false;
|
||||
for (let element of a) {
|
||||
if (b.indexOf(element) === -1)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
} else
|
||||
return a == b;
|
||||
},
|
||||
|
||||
async syncUserGroups(userName, info) {
|
||||
let {client} = this;
|
||||
let {user} = info;
|
||||
let groupDn = this.groupDn;
|
||||
|
||||
let opts = {
|
||||
scope: 'sub',
|
||||
attributes: ['dn'],
|
||||
attributes: ['dn', 'cn'],
|
||||
filter: `&(memberUid=${userName})(objectClass=posixGroup)`
|
||||
};
|
||||
let oldGroups = await client.searchAll(this.groupDn, opts);
|
||||
let oldGroups = await client.searchAll(groupDn, opts);
|
||||
|
||||
let reqs = [];
|
||||
for (let oldGroup of oldGroups) {
|
||||
let change = new ldap.Change({
|
||||
operation: 'delete',
|
||||
modification: {memberUid: userName}
|
||||
});
|
||||
reqs.push(client.modify(oldGroup.dn, change));
|
||||
let deleteGroups = [];
|
||||
let addGroups = [];
|
||||
|
||||
if (info.hasAccount) {
|
||||
let oldSet = new Set();
|
||||
oldGroups.forEach(e => oldSet.add(e.cn));
|
||||
|
||||
let newSet = new Set();
|
||||
user.roles().forEach(e => newSet.add(e.inherits().name));
|
||||
|
||||
for (let group of oldGroups) {
|
||||
if (!newSet.has(group.cn))
|
||||
deleteGroups.push(group.cn);
|
||||
}
|
||||
for (let role of user.roles()) {
|
||||
if (!oldSet.has(role.inherits().name))
|
||||
addGroups.push(role.inherits().name);
|
||||
}
|
||||
} else {
|
||||
for (let group of oldGroups)
|
||||
deleteGroups.push(group.cn);
|
||||
}
|
||||
await Promise.all(reqs);
|
||||
|
||||
if (!info.hasAccount) return;
|
||||
|
||||
reqs = [];
|
||||
for (let role of info.user.roles()) {
|
||||
let change = new ldap.Change({
|
||||
operation: 'add',
|
||||
modification: {memberUid: userName}
|
||||
});
|
||||
let roleName = role.inherits().name;
|
||||
let dn = `cn=${roleName},${this.groupDn}`;
|
||||
reqs.push(client.modify(dn, change));
|
||||
async function applyOperations(groups, operation) {
|
||||
for (let group of groups) {
|
||||
try {
|
||||
let dn = `cn=${group},${groupDn}`;
|
||||
await client.modify(dn, new ldap.Change({
|
||||
operation,
|
||||
modification: {memberUid: userName}
|
||||
}));
|
||||
} catch (err) {
|
||||
if (err.name !== 'NoSuchObjectError')
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
await Promise.all(reqs);
|
||||
|
||||
await applyOperations(deleteGroups, 'delete');
|
||||
await applyOperations(addGroups, 'add');
|
||||
},
|
||||
|
||||
async getUsers(usersToSync) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<vn-card class="summary">
|
||||
<h5>
|
||||
<a ng-if="::summary.id"
|
||||
<a
|
||||
ng-if="::summary.id"
|
||||
vn-tooltip="Go to the user"
|
||||
ui-sref="account.card.summary({id: {{::summary.id}}})"
|
||||
name="goToSummary">
|
||||
|
|
@ -10,7 +11,18 @@
|
|||
</h5>
|
||||
<vn-horizontal class="vn-pa-md">
|
||||
<vn-one>
|
||||
<h4 translate>Basic data</h4>
|
||||
<h4 ng-show="$ctrl.isHr">
|
||||
<a
|
||||
ui-sref="account.card.basicData({id:summary.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Basic Data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isHr">
|
||||
Basic Data
|
||||
</h4>
|
||||
<vn-label-value
|
||||
label="Id"
|
||||
value="{{summary.id}}">
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ class Controller extends Summary {
|
|||
this.$http.get(`Accounts/${value.id}`, {filter})
|
||||
.then(res => this.$.summary = res.data);
|
||||
}
|
||||
get isHr() {
|
||||
return this.aclService.hasAny(['hr']);
|
||||
}
|
||||
|
||||
get user() {
|
||||
return this._user;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
</vn-crud-model>
|
||||
<vn-card class="summary">
|
||||
<h5>
|
||||
<a ng-if="::$ctrl.summary.claim.id"
|
||||
<a
|
||||
ng-if="::$ctrl.summary.claim.id"
|
||||
vn-tooltip="Go to the claim"
|
||||
ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})"
|
||||
name="goToSummary">
|
||||
|
|
@ -54,7 +55,18 @@
|
|||
</vn-range>
|
||||
</vn-one>
|
||||
<vn-auto>
|
||||
<h4 translate>Detail</h4>
|
||||
<h4 ng-show="$ctrl.isSalesPerson">
|
||||
<a
|
||||
ui-sref="claim.card.detail({id:$ctrl.claim.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Detail</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
ng-show="!$ctrl.isSalesPerson"
|
||||
translate>
|
||||
Detail
|
||||
</h4>
|
||||
<vn-data-viewer data="::$ctrl.summary.salesClaimed">
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
|
|
@ -105,7 +117,18 @@
|
|||
</vn-horizontal>
|
||||
</vn-auto>
|
||||
<vn-auto>
|
||||
<h4 translate>Development</h4>
|
||||
<h4 ng-show="$ctrl.isClaimManager">
|
||||
<a
|
||||
ui-sref="claim.card.development({id:$ctrl.claim.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Development</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isClaimManager">
|
||||
Development
|
||||
</h4>
|
||||
<vn-data-viewer data="::$ctrl.summary.developments">
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
|
|
@ -136,7 +159,18 @@
|
|||
</vn-data-viewer>
|
||||
</vn-auto>
|
||||
<vn-auto>
|
||||
<h4 translate>Action</h4>
|
||||
<h4 ng-show="$ctrl.isClaimManager">
|
||||
<a
|
||||
ui-sref="claim.card.action({id:$ctrl.claim.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Action</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isClaimManager">
|
||||
Action
|
||||
</h4>
|
||||
<vn-data-viewer data="::$ctrl.summary.actions">
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@ class Controller extends Summary {
|
|||
this.getSummary();
|
||||
}
|
||||
|
||||
get isSalesPerson() {
|
||||
return this.aclService.hasAny(['salesPerson']);
|
||||
}
|
||||
|
||||
get isClaimManager() {
|
||||
return this.aclService.hasAny(['claimManager']);
|
||||
}
|
||||
|
||||
get claim() {
|
||||
return this._claim;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ module.exports = function(Self) {
|
|||
description: 'Updates a client address updating default address',
|
||||
accepts: [{
|
||||
arg: 'ctx',
|
||||
type: 'Object',
|
||||
type: 'object',
|
||||
http: {source: 'context'}
|
||||
},
|
||||
{
|
||||
|
|
@ -70,7 +70,7 @@ module.exports = function(Self) {
|
|||
}],
|
||||
returns: {
|
||||
root: true,
|
||||
type: 'Object'
|
||||
type: 'object'
|
||||
},
|
||||
http: {
|
||||
verb: 'patch',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class Controller extends Section {
|
|||
get reportParams() {
|
||||
const userParams = this.$.model.userParams;
|
||||
return Object.assign({
|
||||
authorization: this.vnToken.token,
|
||||
recipient: this.client.email,
|
||||
recipientId: this.client.id
|
||||
}, userParams);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,18 @@
|
|||
</h5>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<h4 translate>Basic data</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.basicData({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Basic data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">
|
||||
Basic data
|
||||
</h4>
|
||||
<vn-label-value label="Id"
|
||||
value="{{$ctrl.summary.id}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -43,7 +54,18 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Fiscal address</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Fiscal address</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">
|
||||
Fiscal address
|
||||
</h4>
|
||||
<vn-label-value label="Social name"
|
||||
value="{{$ctrl.summary.socialName}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -67,7 +89,18 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Fiscal data</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Fiscal data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">
|
||||
Fiscal data
|
||||
</h4>
|
||||
<vn-vertical>
|
||||
<vn-check
|
||||
label="Is equalizated"
|
||||
|
|
@ -107,7 +140,18 @@
|
|||
</vn-vertical>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Billing data</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.billingData({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Billing data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">
|
||||
Billing data
|
||||
</h4>
|
||||
<vn-label-value label="Pay method"
|
||||
value="{{$ctrl.summary.payMethod.name}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -136,7 +180,18 @@
|
|||
</vn-vertical>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Default address</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.address.index({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Address</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">
|
||||
Address
|
||||
</h4>
|
||||
<vn-label-value label="Name"
|
||||
value="{{$ctrl.summary.defaultAddress.nickname}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -148,7 +203,17 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Web access</h4>
|
||||
<h4 ng-show="$ctrl.isEmployee">
|
||||
<a
|
||||
ui-sref="client.card.webAccess({id:$ctrl.client.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Web access</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isEmployee">Web access
|
||||
</h4>
|
||||
<vn-label-value label="User"
|
||||
value="{{$ctrl.summary.account.name}}">
|
||||
</vn-label-value>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ class Controller extends Summary {
|
|||
}
|
||||
});
|
||||
}
|
||||
get isEmployee() {
|
||||
return this.aclService.hasAny(['employee']);
|
||||
}
|
||||
|
||||
sumRisk() {
|
||||
let total = 0;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ Secured credit: Crédito asegurado
|
|||
Average invoiced: Consumo medio
|
||||
Sales person: Comercial
|
||||
Recovery: Recobro
|
||||
Basic data: Datos básicos
|
||||
Balance due: Saldo vencido
|
||||
Rate: Tarifa
|
||||
Business data: Datos comerciales
|
||||
|
|
|
|||
|
|
@ -93,7 +93,12 @@ module.exports = Self => {
|
|||
let where = buildFilter(ctx.args, (param, value) => {
|
||||
switch (param) {
|
||||
case 'search':
|
||||
return {'e.id': value};
|
||||
return /^\d+$/.test(value)
|
||||
? {'e.id': value}
|
||||
: {or: [
|
||||
{'s.name': {like: `%${value}%`}},
|
||||
{'s.nickname': {like: `%${value}%`}}
|
||||
]};
|
||||
case 'ref':
|
||||
param = `e.${param}`;
|
||||
return {[param]: {like: `%${value}%`}};
|
||||
|
|
@ -141,6 +146,7 @@ module.exports = Self => {
|
|||
e.invoiceInFk,
|
||||
t.landed,
|
||||
s.name AS supplierName,
|
||||
s.nickname AS supplierAlias,
|
||||
co.code AS companyCode,
|
||||
cu.code AS currencyCode
|
||||
FROM vn.entry e
|
||||
|
|
|
|||
|
|
@ -8,11 +8,14 @@
|
|||
<vn-searchbar
|
||||
vn-focus
|
||||
panel="vn-entry-search-panel"
|
||||
info="Search entrys by id"
|
||||
info="Search entry by id or a suppliers by name or alias"
|
||||
model="model">
|
||||
</vn-searchbar>
|
||||
</vn-portal>
|
||||
<vn-portal slot="menu">
|
||||
<vn-left-menu></vn-left-menu>
|
||||
</vn-portal>
|
||||
<ui-view></ui-view>
|
||||
<ui-view></ui-view>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
vn-one
|
||||
label="General search"
|
||||
ng-model="filter.search"
|
||||
info="Search entries by id"
|
||||
info="Search entry by id or a suppliers by name or alias"
|
||||
vn-focus>
|
||||
</vn-textfield>
|
||||
</vn-horizontal>
|
||||
|
|
@ -45,8 +45,11 @@
|
|||
label="Supplier"
|
||||
ng-model="filter.supplierFk"
|
||||
url="Suppliers"
|
||||
fields="['name','nickname']"
|
||||
search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
|
||||
show-field="name"
|
||||
value-field="id">
|
||||
<tpl-item>{{name}}: {{nickname}}</tpl-item>
|
||||
</vn-autocomplete>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
|
|
|
|||
|
|
@ -4,4 +4,5 @@ Nickname: Alias
|
|||
From: Desde
|
||||
To: Hasta
|
||||
Agency: Agencia
|
||||
Warehouse: Almacén
|
||||
Warehouse: Almacén
|
||||
Search entry by id or a suppliers by name or alias: Buscar entrada por id o proveedores por nombre y alias
|
||||
|
|
@ -0,0 +1,192 @@
|
|||
|
||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
||||
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
||||
|
||||
module.exports = Self => {
|
||||
Self.remoteMethodCtx('filter', {
|
||||
description: 'Find all instances of the model matched by filter from the data source.',
|
||||
accessType: 'READ',
|
||||
accepts: [
|
||||
{
|
||||
arg: 'filter',
|
||||
type: 'object',
|
||||
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
||||
},
|
||||
{
|
||||
arg: 'search',
|
||||
type: 'string',
|
||||
description: `If it's and integer searchs by itemFk, otherwise it searchs by the itemType code`,
|
||||
},
|
||||
{
|
||||
arg: 'itemFk',
|
||||
type: 'integer',
|
||||
description: 'The item id',
|
||||
},
|
||||
{
|
||||
arg: 'typeFk',
|
||||
type: 'integer',
|
||||
description: 'The item type id',
|
||||
},
|
||||
{
|
||||
arg: 'categoryFk',
|
||||
type: 'integer',
|
||||
description: 'The item category id',
|
||||
},
|
||||
{
|
||||
arg: 'warehouseFk',
|
||||
type: 'integer',
|
||||
description: 'The warehouse id',
|
||||
},
|
||||
{
|
||||
arg: 'buyerFk',
|
||||
type: 'integer',
|
||||
description: 'The buyer id',
|
||||
},
|
||||
{
|
||||
arg: 'rate2',
|
||||
type: 'integer',
|
||||
description: 'The price per unit',
|
||||
},
|
||||
{
|
||||
arg: 'rate3',
|
||||
type: 'integer',
|
||||
description: 'The price per package',
|
||||
},
|
||||
{
|
||||
arg: 'minPrice',
|
||||
type: 'integer',
|
||||
description: 'The minimum price of the item',
|
||||
},
|
||||
{
|
||||
arg: 'hasMinPrice',
|
||||
type: 'boolean',
|
||||
description: 'whether a minimum price has been defined for the item',
|
||||
},
|
||||
{
|
||||
arg: 'started',
|
||||
type: 'date',
|
||||
description: 'Price validity start date',
|
||||
},
|
||||
{
|
||||
arg: 'ended',
|
||||
type: 'date',
|
||||
description: 'Price validity end date',
|
||||
},
|
||||
{
|
||||
arg: 'tags',
|
||||
type: ['object'],
|
||||
description: 'List of tags to filter with',
|
||||
},
|
||||
{
|
||||
arg: 'mine',
|
||||
type: 'Boolean',
|
||||
description: `Search requests attended by the current user`
|
||||
}
|
||||
],
|
||||
returns: {
|
||||
type: ['Object'],
|
||||
root: true
|
||||
},
|
||||
http: {
|
||||
path: `/filter`,
|
||||
verb: 'GET'
|
||||
}
|
||||
});
|
||||
|
||||
Self.filter = async(ctx, filter) => {
|
||||
const conn = Self.dataSource.connector;
|
||||
let userId = ctx.req.accessToken.userId;
|
||||
|
||||
if (ctx.args.mine)
|
||||
ctx.args.buyerFk = userId;
|
||||
|
||||
const where = buildFilter(ctx.args, (param, value) => {
|
||||
switch (param) {
|
||||
case 'search':
|
||||
return /^\d+$/.test(value)
|
||||
? {'fp.itemFk': {inq: value}}
|
||||
: {'it.code': {like: `%${value}%`}};
|
||||
case 'categoryFk':
|
||||
return {'it.categoryFk': value};
|
||||
case 'buyerFk':
|
||||
return {'it.workerFk': value};
|
||||
case 'warehouseFk':
|
||||
case 'rate2':
|
||||
case 'rate3':
|
||||
case 'started':
|
||||
case 'ended':
|
||||
param = `fp.${param}`;
|
||||
return {[param]: value};
|
||||
case 'minPrice':
|
||||
case 'hasMinPrice':
|
||||
case 'typeFk':
|
||||
param = `i.${param}`;
|
||||
return {[param]: value};
|
||||
}
|
||||
});
|
||||
filter = mergeFilters(filter, {where});
|
||||
|
||||
const stmts = [];
|
||||
let stmt;
|
||||
|
||||
stmt = new ParameterizedSQL(
|
||||
`SELECT fp.id,
|
||||
fp.itemFk,
|
||||
fp.warehouseFk,
|
||||
fp.rate2,
|
||||
fp.rate3,
|
||||
fp.started,
|
||||
fp.ended,
|
||||
i.minPrice,
|
||||
i.hasMinPrice,
|
||||
i.name,
|
||||
i.subName,
|
||||
i.tag5,
|
||||
i.value5,
|
||||
i.tag6,
|
||||
i.value6,
|
||||
i.tag7,
|
||||
i.value7,
|
||||
i.tag8,
|
||||
i.value8,
|
||||
i.tag9,
|
||||
i.value9,
|
||||
i.tag10,
|
||||
i.value10
|
||||
FROM priceFixed fp
|
||||
JOIN item i ON i.id = fp.itemFk
|
||||
JOIN itemType it ON it.id = i.typeFk`
|
||||
);
|
||||
|
||||
if (ctx.args.tags) {
|
||||
let i = 1;
|
||||
for (const tag of ctx.args.tags) {
|
||||
const tAlias = `it${i++}`;
|
||||
|
||||
if (tag.tagFk) {
|
||||
stmt.merge({
|
||||
sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id
|
||||
AND ${tAlias}.tagFk = ?
|
||||
AND ${tAlias}.value LIKE ?`,
|
||||
params: [tag.tagFk, `%${tag.value}%`],
|
||||
});
|
||||
} else {
|
||||
stmt.merge({
|
||||
sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id
|
||||
AND ${tAlias}.value LIKE ?`,
|
||||
params: [`%${tag.value}%`],
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stmt.merge(conn.makeWhere(filter.where));
|
||||
stmt.merge(conn.makePagination(filter));
|
||||
|
||||
const fixedPriceIndex = stmts.push(stmt) - 1;
|
||||
const sql = ParameterizedSQL.join(stmts, ';');
|
||||
const result = await conn.executeStmt(sql);
|
||||
return fixedPriceIndex === 0 ? result : result[fixedPriceIndex];
|
||||
};
|
||||
};
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('fixed price filter()', () => {
|
||||
it('should return 1 result filtering by item ID', async() => {
|
||||
const itemID = 3;
|
||||
const ctx = {
|
||||
req: {accessToken: {userId: 1}},
|
||||
args: {
|
||||
search: itemID
|
||||
}
|
||||
};
|
||||
const result = await app.models.FixedPrice.filter(ctx);
|
||||
|
||||
expect(result.length).toEqual(1);
|
||||
expect(result[0].id).toEqual(2);
|
||||
expect(result[0].itemFk).toEqual(itemID);
|
||||
});
|
||||
|
||||
it('should return 1 result filtering by item type code', async() => {
|
||||
const itemCode = 'CRI';
|
||||
const ctx = {
|
||||
req: {accessToken: {userId: 1}},
|
||||
args: {
|
||||
search: itemCode
|
||||
}
|
||||
};
|
||||
const itemType = await app.models.ItemType.findOne({
|
||||
where: {code: itemCode},
|
||||
fields: ['id']
|
||||
});
|
||||
const items = await app.models.Item.find({
|
||||
where: {typeFk: itemType.id},
|
||||
fields: ['id']
|
||||
});
|
||||
const IDs = items.map(item => {
|
||||
return item.id;
|
||||
});
|
||||
|
||||
const result = await app.models.FixedPrice.filter(ctx);
|
||||
const firstResult = result[0];
|
||||
|
||||
expect(result.length).toEqual(1);
|
||||
expect(firstResult.id).toEqual(2);
|
||||
expect(IDs).toContain(firstResult.itemFk);
|
||||
});
|
||||
|
||||
it('should return 2 results filtering by warehouse', async() => {
|
||||
const warehouseID = 1;
|
||||
const ctx = {
|
||||
req: {accessToken: {userId: 1}},
|
||||
args: {
|
||||
warehouseFk: warehouseID
|
||||
}
|
||||
};
|
||||
const result = await app.models.FixedPrice.filter(ctx);
|
||||
const length = result.length;
|
||||
const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
|
||||
|
||||
expect(result.length).toEqual(2);
|
||||
expect(anyResult.warehouseFk).toEqual(warehouseID);
|
||||
});
|
||||
|
||||
it('should return no results filtering by hasMinPrice', async() => {
|
||||
const ctx = {
|
||||
req: {accessToken: {userId: 1}},
|
||||
args: {
|
||||
hasMinPrice: true
|
||||
}
|
||||
};
|
||||
const result = await app.models.FixedPrice.filter(ctx);
|
||||
|
||||
expect(result.length).toEqual(0);
|
||||
});
|
||||
|
||||
it('should return no results filtering by typeFk', async() => {
|
||||
const ctx = {
|
||||
req: {accessToken: {userId: 1}},
|
||||
args: {
|
||||
typeFk: 1
|
||||
}
|
||||
};
|
||||
const result = await app.models.FixedPrice.filter(ctx);
|
||||
|
||||
expect(result.length).toEqual(1);
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
|
||||
describe('upsertFixedPrice()', () => {
|
||||
const now = new Date();
|
||||
const fixedPriceId = 1;
|
||||
let originalFixedPrice;
|
||||
let originalItem;
|
||||
|
||||
beforeAll(async() => {
|
||||
originalFixedPrice = await app.models.FixedPrice.findById(fixedPriceId);
|
||||
originalItem = await app.models.Item.findById(originalFixedPrice.itemFk);
|
||||
});
|
||||
|
||||
afterAll(async() => {
|
||||
await originalFixedPrice.save();
|
||||
await originalItem.save();
|
||||
});
|
||||
|
||||
it(`should toggle the hasMinPrice boolean if there's a minPrice and update the rest of the data`, async() => {
|
||||
const ctx = {args: {
|
||||
id: fixedPriceId,
|
||||
itemFk: originalFixedPrice.itemFk,
|
||||
warehouseFk: 1,
|
||||
rate2: 100,
|
||||
rate3: 300,
|
||||
started: now,
|
||||
ended: now,
|
||||
minPrice: 100,
|
||||
hasMinPrice: false
|
||||
}};
|
||||
|
||||
const result = await app.models.FixedPrice.upsertFixedPrice(ctx, ctx.args.id);
|
||||
|
||||
delete ctx.args.started;
|
||||
delete ctx.args.ended;
|
||||
ctx.args.hasMinPrice = true;
|
||||
|
||||
expect(result).toEqual(jasmine.objectContaining(ctx.args));
|
||||
});
|
||||
|
||||
it(`should toggle the hasMinPrice boolean if there's no minPrice and update the rest of the data`, async() => {
|
||||
const ctx = {args: {
|
||||
id: fixedPriceId,
|
||||
itemFk: originalFixedPrice.itemFk,
|
||||
warehouseFk: 1,
|
||||
rate2: 2.5,
|
||||
rate3: 2,
|
||||
started: now,
|
||||
ended: now,
|
||||
minPrice: 0,
|
||||
hasMinPrice: true
|
||||
}};
|
||||
|
||||
const result = await app.models.FixedPrice.upsertFixedPrice(ctx, ctx.args.id);
|
||||
|
||||
delete ctx.args.started;
|
||||
delete ctx.args.ended;
|
||||
ctx.args.hasMinPrice = false;
|
||||
|
||||
expect(result).toEqual(jasmine.objectContaining(ctx.args));
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
module.exports = Self => {
|
||||
Self.remoteMethod('upsertFixedPrice', {
|
||||
description: 'Inserts or updates a fixed price for an item',
|
||||
accessType: 'WRITE',
|
||||
accepts: [{
|
||||
arg: 'ctx',
|
||||
type: 'object',
|
||||
http: {source: 'context'}
|
||||
},
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'number',
|
||||
description: 'The fixed price id'
|
||||
},
|
||||
{
|
||||
arg: 'itemFk',
|
||||
type: 'number'
|
||||
},
|
||||
{
|
||||
arg: 'warehouseFk',
|
||||
type: 'number'
|
||||
},
|
||||
{
|
||||
arg: 'started',
|
||||
type: 'date'
|
||||
},
|
||||
{
|
||||
arg: 'ended',
|
||||
type: 'date'
|
||||
},
|
||||
{
|
||||
arg: 'rate2',
|
||||
type: 'number'
|
||||
},
|
||||
{
|
||||
arg: 'rate3',
|
||||
type: 'number'
|
||||
},
|
||||
{
|
||||
arg: 'minPrice',
|
||||
type: 'number'
|
||||
},
|
||||
{
|
||||
arg: 'hasMinPrice',
|
||||
type: 'any'
|
||||
}],
|
||||
returns: {
|
||||
type: 'object',
|
||||
root: true
|
||||
},
|
||||
http: {
|
||||
path: `/upsertFixedPrice`,
|
||||
verb: 'PATCH'
|
||||
}
|
||||
});
|
||||
|
||||
Self.upsertFixedPrice = async ctx => {
|
||||
const models = Self.app.models;
|
||||
|
||||
const args = ctx.args;
|
||||
const tx = await models.Address.beginTransaction({});
|
||||
try {
|
||||
const options = {transaction: tx};
|
||||
delete args.ctx; // removed unwanted data
|
||||
|
||||
const fixedPrice = await models.FixedPrice.upsert(args, options);
|
||||
const targetItem = await models.Item.findById(args.itemFk, null, options);
|
||||
await targetItem.updateAttributes({
|
||||
minPrice: args.minPrice,
|
||||
hasMinPrice: args.minPrice ? true : false
|
||||
}, options);
|
||||
|
||||
const itemFields = [
|
||||
'minPrice',
|
||||
'hasMinPrice',
|
||||
'name',
|
||||
'subName',
|
||||
'tag5',
|
||||
'value5',
|
||||
'tag6',
|
||||
'value6',
|
||||
'tag7',
|
||||
'value7',
|
||||
'tag8',
|
||||
'value8',
|
||||
'tag9',
|
||||
'value9',
|
||||
'tag10',
|
||||
'value10'
|
||||
];
|
||||
|
||||
const fieldsCopy = [].concat(itemFields);
|
||||
const filter = {
|
||||
include: {
|
||||
relation: 'item',
|
||||
scope: {
|
||||
fields: fieldsCopy
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const result = await models.FixedPrice.findById(fixedPrice.id, filter, options);
|
||||
const item = result.item();
|
||||
|
||||
for (let key of itemFields)
|
||||
result[key] = item[key];
|
||||
|
||||
await tx.commit();
|
||||
return result;
|
||||
} catch (e) {
|
||||
await tx.rollback();
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -119,6 +119,7 @@ module.exports = Self => {
|
|||
ori.code AS origin,
|
||||
ic.name AS category,
|
||||
i.density,
|
||||
i.stemMultiplier,
|
||||
b.grouping,
|
||||
b.packing,
|
||||
itn.code AS niche, @visibleCalc
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ module.exports = Self => {
|
|||
query = `SET @isTriggerDisabled = FALSE`;
|
||||
await Self.rawSql(query, null, options);
|
||||
|
||||
|
||||
query = `CALL vn.itemRefreshTags(?)`;
|
||||
await Self.rawSql(query, [item.id], options);
|
||||
await tx.commit();
|
||||
|
|
|
|||
|
|
@ -76,5 +76,8 @@
|
|||
},
|
||||
"TaxType": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"FixedPrice": {
|
||||
"dataSource": "vn"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
module.exports = Self => {
|
||||
require('../methods/fixed-price/filter')(Self);
|
||||
require('../methods/fixed-price/upsertFixedPrice')(Self);
|
||||
};
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
"name": "FixedPrice",
|
||||
"base": "VnModel",
|
||||
"options": {
|
||||
"mysql": {
|
||||
"table": "priceFixed"
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"id": {
|
||||
"type": "number",
|
||||
"id": true,
|
||||
"description": "Identifier"
|
||||
},
|
||||
"itemFk": {
|
||||
"type": "number",
|
||||
"required": true
|
||||
},
|
||||
"warehouseFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"rate2": {
|
||||
"type": "number",
|
||||
"required": true
|
||||
},
|
||||
"rate3": {
|
||||
"type": "number",
|
||||
"required": true
|
||||
},
|
||||
"started": {
|
||||
"type": "date",
|
||||
"required": true
|
||||
},
|
||||
"ended": {
|
||||
"type": "date",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
"item": {
|
||||
"type": "belongsTo",
|
||||
"model": "Item",
|
||||
"foreignKey": "itemFk"
|
||||
},
|
||||
"warehouse": {
|
||||
"type": "belongsTo",
|
||||
"model": "Warehouse",
|
||||
"foreignKey": "warehouseFk"
|
||||
}
|
||||
},
|
||||
"acls": [
|
||||
{
|
||||
"accessType": "READ",
|
||||
"principalType": "ROLE",
|
||||
"principalId": "buyer",
|
||||
"permission": "ALLOW"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -12,116 +12,119 @@
|
|||
},
|
||||
"properties": {
|
||||
"id": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"id": true,
|
||||
"description": "Id"
|
||||
},
|
||||
"name": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Name"
|
||||
},
|
||||
"size": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"description": "Size"
|
||||
},
|
||||
"category": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Category"
|
||||
},
|
||||
"typeFk": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"description": "Type",
|
||||
"required": true
|
||||
},
|
||||
"stems": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"description": "Stems"
|
||||
},
|
||||
"description": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Description"
|
||||
},
|
||||
"isOnOffer": {
|
||||
"type": "Boolean",
|
||||
"type": "boolean",
|
||||
"description": "Offer"
|
||||
},
|
||||
"isBargain": {
|
||||
"type": "Boolean",
|
||||
"type": "boolean",
|
||||
"description": "Bargain"
|
||||
},
|
||||
"isActive": {
|
||||
"type": "Boolean",
|
||||
"type": "boolean",
|
||||
"description": "Active"
|
||||
},
|
||||
"comment": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Comment"
|
||||
},
|
||||
"relevancy": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"description": "Relevancy"
|
||||
},
|
||||
"density": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"description": "Density"
|
||||
},
|
||||
"image": {
|
||||
"type": "String",
|
||||
"stemMultiplier": {
|
||||
"type": "number",
|
||||
"description": "Multiplier"
|
||||
},"image": {
|
||||
"type": "string",
|
||||
"description": "Image"
|
||||
},
|
||||
"longName": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Long name"
|
||||
},
|
||||
"subName": {
|
||||
"type": "String",
|
||||
"type": "string",
|
||||
"description": "Subname"
|
||||
},
|
||||
"tag5": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value5": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"tag6": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value6": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"tag7": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value7": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"tag8": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value8": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"tag9": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value9": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"tag10": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"value10": {
|
||||
"type": "String"
|
||||
"type": "string"
|
||||
},
|
||||
"compression": {
|
||||
"type": "Number"
|
||||
"type": "number"
|
||||
},
|
||||
"hasKgPrice": {
|
||||
"type": "Boolean",
|
||||
"type": "boolean",
|
||||
"description": "Price per Kg"
|
||||
},
|
||||
"expenseFk": {
|
||||
"type": "Number",
|
||||
"type": "number",
|
||||
"mysql": {
|
||||
"columnName": "expenceFk"
|
||||
}
|
||||
|
|
@ -129,8 +132,11 @@
|
|||
"minPrice": {
|
||||
"type": "number"
|
||||
},
|
||||
"hasMinPrice": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"isFragile": {
|
||||
"type": "Boolean"
|
||||
"type": "boolean"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,136 @@
|
|||
<vn-crud-model
|
||||
url="Tags"
|
||||
fields="['id','name','isFree', 'sourceTable']"
|
||||
data="tags"
|
||||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<div class="search-panel">
|
||||
<form class="vn-pa-lg" ng-submit="$ctrl.onSearch()">
|
||||
<vn-horizontal>
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="General search"
|
||||
ng-model="filter.search"
|
||||
vn-focus>
|
||||
</vn-textfield>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
url="ItemCategories"
|
||||
label="Category"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
ng-model="filter.categoryFk">
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete vn-one
|
||||
url="ItemTypes"
|
||||
label="Type"
|
||||
where="{categoryFk: filter.categoryFk}"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
ng-model="filter.typeFk"
|
||||
fields="['categoryFk']"
|
||||
include="'category'">
|
||||
<tpl-item>
|
||||
<div>{{name}}</div>
|
||||
<div class="text-caption text-secondary">
|
||||
{{category.name}}
|
||||
</div>
|
||||
</tpl-item>
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
ng-model="filter.buyerFk"
|
||||
url="Clients/activeWorkersWithRole"
|
||||
show-field="nickname"
|
||||
search-function="{firstName: $search}"
|
||||
value-field="id"
|
||||
where="{role: 'buyer'}"
|
||||
label="Buyer">
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
label="Warehouse"
|
||||
ng-model="filter.warehouseFk"
|
||||
url="Warehouses">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Started"
|
||||
ng-model="filter.started">
|
||||
</vn-date-picker>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Ended"
|
||||
ng-model="filter.ended">
|
||||
</vn-date-picker>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-check vn-one
|
||||
triple-state="true"
|
||||
label="For me"
|
||||
ng-model="filter.mine">
|
||||
</vn-check>
|
||||
<vn-check vn-one
|
||||
triple-state="true"
|
||||
label="Minimum price"
|
||||
ng-model="filter.hasMinPrice">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal class="vn-pt-sm">
|
||||
<vn-one class="text-subtitle1" translate>
|
||||
Tags
|
||||
</vn-one>
|
||||
<vn-icon-button
|
||||
vn-none
|
||||
vn-bind="+"
|
||||
vn-tooltip="Add tag"
|
||||
icon="add_circle"
|
||||
ng-click="filter.tags.push({})">
|
||||
</vn-icon-button>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal ng-repeat="itemTag in filter.tags">
|
||||
<vn-autocomplete vn-two vn-id="tag"
|
||||
label="Tag"
|
||||
initial-data="itemTag.tag"
|
||||
ng-model="itemTag.tagFk"
|
||||
data="tags"
|
||||
show-field="name"
|
||||
on-change="itemTag.value = null"
|
||||
rule>
|
||||
</vn-autocomplete>
|
||||
<vn-textfield vn-three
|
||||
ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
|
||||
vn-id="text"
|
||||
label="Value"
|
||||
ng-model="itemTag.value"
|
||||
rule>
|
||||
</vn-textfield>
|
||||
<vn-autocomplete vn-three
|
||||
ng-show="tag.selection.isFree === false"
|
||||
url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
|
||||
search-function="{value: $search}"
|
||||
label="Value"
|
||||
ng-model="itemTag.value"
|
||||
show-field="value"
|
||||
value-field="value"
|
||||
rule>
|
||||
</vn-autocomplete>
|
||||
<vn-icon-button
|
||||
vn-none
|
||||
vn-tooltip="Remove tag"
|
||||
icon="delete"
|
||||
ng-click="filter.tags.splice($index, 1)"
|
||||
tabindex="-1">
|
||||
</vn-icon-button>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal class="vn-mt-lg">
|
||||
<vn-submit label="Search"></vn-submit>
|
||||
</vn-horizontal>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
import ngModule from '../module';
|
||||
import SearchPanel from 'core/components/searchbar/search-panel';
|
||||
|
||||
class Controller extends SearchPanel {
|
||||
get filter() {
|
||||
return this.$.filter;
|
||||
}
|
||||
|
||||
set filter(value = {}) {
|
||||
if (!value.tags) value.tags = [{}];
|
||||
|
||||
this.$.filter = value;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnFixedPriceSearchPanel', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller
|
||||
});
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Started: Inicio
|
||||
Ended: Fin
|
||||
Minimum price: Precio mínimo
|
||||
Item ID: ID Artículo
|
||||
|
|
@ -0,0 +1,159 @@
|
|||
<vn-crud-model
|
||||
vn-id="model"
|
||||
url="FixedPrices/filter"
|
||||
limit="20"
|
||||
data="prices"
|
||||
auto-load="true"
|
||||
order="itemFk">
|
||||
</vn-crud-model>
|
||||
<vn-crud-model
|
||||
auto-load="true"
|
||||
url="Warehouses"
|
||||
data="warehouses"
|
||||
order="name">
|
||||
</vn-crud-model>
|
||||
<vn-portal slot="topbar">
|
||||
<vn-searchbar
|
||||
auto-state="false"
|
||||
panel="vn-fixed-price-search-panel"
|
||||
info="Search prices by item ID or code"
|
||||
placeholder="Search fixed prices"
|
||||
filter="{}"
|
||||
model="model">
|
||||
</vn-searchbar>
|
||||
</vn-portal>
|
||||
<div class="vn-w-xl">
|
||||
<vn-card>
|
||||
<vn-table model="model">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
<vn-th field="itemFk">Item ID</vn-th>
|
||||
<vn-th field="itemFk">Item</vn-th>
|
||||
<vn-th field="warehouseFk">Warehouse</vn-th>
|
||||
<vn-th field="rate2">P.P.U.</vn-th>
|
||||
<vn-th field="rate3">P.P.P.</vn-th>
|
||||
<vn-th field="minPrice">Min price</vn-th>
|
||||
<vn-th field="started" style="width: 90px">Started</vn-th>
|
||||
<vn-th field="ended" style="width: 90px">Ended</vn-th>
|
||||
<vn-th shrink></vn-th>
|
||||
</vn-tr>
|
||||
</vn-thead>
|
||||
<vn-tbody>
|
||||
<vn-tr ng-repeat="price in prices">
|
||||
<vn-td>
|
||||
<span
|
||||
ng-if="price.itemFk"
|
||||
ng-click="itemDescriptor.show($event, price.itemFk)"
|
||||
class="link">
|
||||
{{price.itemFk}}
|
||||
</span>
|
||||
<vn-autocomplete
|
||||
class="dense"
|
||||
ng-if="!price.itemFk"
|
||||
vn-focus
|
||||
url="Items"
|
||||
ng-model="price.itemFk"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
search-function="$ctrl.itemSearchFunc($search)"
|
||||
on-change="$ctrl.upsertPrice(price)"
|
||||
order="id DESC"
|
||||
tabindex="1">
|
||||
<tpl-item>
|
||||
{{::id}} - {{::name}}
|
||||
</tpl-item>
|
||||
</vn-autocomplete>
|
||||
</vn-td>
|
||||
<vn-td expand>
|
||||
<text>
|
||||
<vn-fetched-tags
|
||||
max-length="6"
|
||||
item="price"
|
||||
name="price.name"
|
||||
sub-name="price.subName"
|
||||
tabindex="-1">
|
||||
</vn-fetched-tags>
|
||||
</text>
|
||||
</vn-td>
|
||||
<vn-td>
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
label="Warehouse"
|
||||
ng-model="price.warehouseFk"
|
||||
url="Warehouses"
|
||||
on-change="$ctrl.upsertPrice(price)"
|
||||
tabindex="2">
|
||||
</vn-autocomplete>
|
||||
</vn-td>
|
||||
<vn-td-editable number>
|
||||
<text>{{price.rate2 | currency: 'EUR':2}}</text>
|
||||
<field>
|
||||
<vn-input-number
|
||||
class="dense"
|
||||
vn-focus
|
||||
ng-model="price.rate2"
|
||||
on-change="$ctrl.upsertPrice(price)">
|
||||
</vn-input-number>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td-editable number>
|
||||
<text>{{price.rate3 | currency: 'EUR':2}}</text>
|
||||
<field>
|
||||
<vn-input-number
|
||||
class="dense"
|
||||
vn-focus
|
||||
ng-model="price.rate3"
|
||||
on-change="$ctrl.upsertPrice(price)">
|
||||
</vn-input-number>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td-editable number>
|
||||
<text>{{(price.hasMinPrice ? (price.minPrice | currency: 'EUR':2) : "-")}}</text>
|
||||
<field>
|
||||
<vn-input-number
|
||||
class="dense"
|
||||
vn-focus
|
||||
ng-model="price.minPrice"
|
||||
on-change="$ctrl.upsertPrice(price)">
|
||||
</vn-input-number>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Started"
|
||||
ng-model="price.started"
|
||||
on-change="$ctrl.upsertPrice(price)">
|
||||
</vn-date-picker>
|
||||
</vn-td>
|
||||
<vn-td>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Ended"
|
||||
ng-model="price.ended"
|
||||
on-change="$ctrl.upsertPrice(price)">
|
||||
</vn-date-picker>
|
||||
</vn-td>
|
||||
<vn-td shrink>
|
||||
<vn-icon-button
|
||||
icon="delete"
|
||||
vn-tooltip="Delete"
|
||||
ng-click="$ctrl.removePrice($index)">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
</vn-tr>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
<div class="vn-pa-md">
|
||||
<vn-icon-button
|
||||
vn-tooltip="Add fixed price"
|
||||
icon="add_circle"
|
||||
vn-bind="+"
|
||||
ng-click="model.insert()">
|
||||
</vn-icon-button>
|
||||
</div>
|
||||
</vn-card>
|
||||
</div>
|
||||
<vn-item-descriptor-popover
|
||||
vn-id="itemDescriptor">
|
||||
</vn-item-descriptor-popover>
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
import ngModule from '../module';
|
||||
import Section from 'salix/components/section';
|
||||
import './style.scss';
|
||||
|
||||
export default class Controller extends Section {
|
||||
constructor($element, $) {
|
||||
super($element, $);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inserts a new instance
|
||||
*/
|
||||
add() {
|
||||
this.$.model.insert({});
|
||||
}
|
||||
|
||||
upsertPrice(price) {
|
||||
price.hasMinPrice = price.minPrice ? true : false;
|
||||
|
||||
let requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
|
||||
for (let field of requiredFields)
|
||||
if (price[field] == undefined) return;
|
||||
|
||||
const query = 'FixedPrices/upsertFixedPrice';
|
||||
this.$http.patch(query, price)
|
||||
.then(res => {
|
||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||
Object.assign(price, res.data);
|
||||
});
|
||||
}
|
||||
|
||||
removePrice($index) {
|
||||
const price = this.$.model.data[$index];
|
||||
if (price.id) {
|
||||
this.$http.delete(`FixedPrices/${price.id}`)
|
||||
.then(() => {
|
||||
this.$.model.remove($index);
|
||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||
});
|
||||
} else
|
||||
this.$.model.remove($index);
|
||||
}
|
||||
|
||||
itemSearchFunc($search) {
|
||||
return /^\d+$/.test($search)
|
||||
? {id: $search}
|
||||
: {name: {like: '%' + $search + '%'}};
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnFixedPrice', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller
|
||||
});
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
import './index';
|
||||
|
||||
describe('fixed price', () => {
|
||||
describe('Component vnFixedPrice', () => {
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
|
||||
beforeEach(ngModule('item'));
|
||||
|
||||
beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => {
|
||||
$httpBackend = _$httpBackend_;
|
||||
const $scope = $rootScope.$new();
|
||||
const $element = angular.element('<vn-fixed-price></vn-fixed-price>');
|
||||
controller = $componentController('vnFixedPrice', {$element, $scope});
|
||||
}));
|
||||
|
||||
describe('upsertPrice()', () => {
|
||||
it('should do nothing if one or more required arguments are missing', () => {
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
|
||||
controller.upsertPrice({});
|
||||
|
||||
expect(controller.vnApp.showSuccess).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should perform an http request to update the price', () => {
|
||||
const now = new Date();
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
|
||||
$httpBackend.expectPATCH('FixedPrices/upsertFixedPrice').respond();
|
||||
controller.upsertPrice({
|
||||
itemFk: 1,
|
||||
started: now,
|
||||
ended: now,
|
||||
rate2: 1,
|
||||
rate3: 2
|
||||
});
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('removePrice()', () => {
|
||||
it(`should only remove the created instance by the model as it doesn't have an ID yet`, () => {
|
||||
const $index = 0;
|
||||
controller.$ = {
|
||||
model: {
|
||||
remove: () => {},
|
||||
data: [{
|
||||
foo: 'bar'
|
||||
}]
|
||||
}
|
||||
};
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
jest.spyOn(controller.$.model, 'remove');
|
||||
|
||||
controller.removePrice($index);
|
||||
|
||||
expect(controller.vnApp.showSuccess).not.toHaveBeenCalled();
|
||||
expect(controller.$.model.remove).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should remove the instance performing an delete http request', () => {
|
||||
const $index = 0;
|
||||
controller.$ = {
|
||||
model: {
|
||||
remove: () => {},
|
||||
data: [{
|
||||
id: '1'
|
||||
}]
|
||||
}
|
||||
};
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
jest.spyOn(controller.$.model, 'remove');
|
||||
|
||||
const query = `FixedPrices/${controller.$.model.data[0].id}`;
|
||||
$httpBackend.expectDELETE(query).respond();
|
||||
controller.removePrice($index);
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
|
||||
expect(controller.$.model.remove).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Fixed prices: Precios fijados
|
||||
Search prices by item ID or code: Buscar por ID de artículo o código
|
||||
Search fixed prices: Buscar precios fijados
|
||||
Add fixed price: Añadir precio fijado
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
@import "variables";
|
||||
|
||||
vn-table vn-date-picker {
|
||||
max-width: 90px;
|
||||
}
|
||||
|
|
@ -21,4 +21,6 @@ import './botanical';
|
|||
import './barcode';
|
||||
import './summary';
|
||||
import './waste';
|
||||
import './fixed-price';
|
||||
import './fixed-price-search-panel';
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
<vn-th field="origin" shrink>Origin</vn-th>
|
||||
<vn-th field="salesperson" shrink>Buyer</vn-th>
|
||||
<vn-th field="density" shrink>Density</vn-th>
|
||||
<vn-th field="stemMultiplier" shrink>Multiplier</vn-th>
|
||||
<vn-th field="active" shrink>Active</vn-th>
|
||||
<vn-th></vn-th>
|
||||
</vn-tr>
|
||||
|
|
@ -78,6 +79,7 @@
|
|||
</span>
|
||||
</vn-td>
|
||||
<vn-td shrink>{{::item.density}}</vn-td>
|
||||
<vn-td shrink >{{::item.stemMultiplier}}</vn-td>
|
||||
<vn-td shrink>
|
||||
<vn-check
|
||||
disabled="true"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@
|
|||
"main": [
|
||||
{"state": "item.index", "icon": "icon-item"},
|
||||
{"state": "item.request", "icon": "pan_tool"},
|
||||
{"state": "item.waste", "icon": "icon-claims"}
|
||||
{"state": "item.waste", "icon": "icon-claims"},
|
||||
{"state": "item.fixedPrice", "icon": ""}
|
||||
],
|
||||
"card": [
|
||||
{"state": "item.card.basicData", "icon": "settings"},
|
||||
|
|
@ -32,22 +33,26 @@
|
|||
"abstract": true,
|
||||
"description": "Items",
|
||||
"component": "vn-items"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url": "/index?q",
|
||||
"state": "item.index",
|
||||
"component": "vn-item-index",
|
||||
"description": "Items"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url": "/create",
|
||||
"state": "item.create",
|
||||
"component": "vn-item-create",
|
||||
"description": "New item"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url": "/:id",
|
||||
"state": "item.card",
|
||||
"abstract": true,
|
||||
"component": "vn-item-card"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/basic-data",
|
||||
"state": "item.card.basicData",
|
||||
"component": "vn-item-basic-data",
|
||||
|
|
@ -56,7 +61,8 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["buyer"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/tags",
|
||||
"state": "item.card.tags",
|
||||
"component": "vn-item-tags",
|
||||
|
|
@ -65,13 +71,15 @@
|
|||
"item-tags": "$ctrl.itemTags"
|
||||
},
|
||||
"acl": ["buyer", "replenisher"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/tax",
|
||||
"state": "item.card.tax",
|
||||
"component": "vn-item-tax",
|
||||
"description": "Tax",
|
||||
"acl": ["administrative","buyer"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/niche",
|
||||
"state": "item.card.niche",
|
||||
"component": "vn-item-niche",
|
||||
|
|
@ -80,7 +88,8 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["buyer","replenisher"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/botanical",
|
||||
"state": "item.card.botanical",
|
||||
"component": "vn-item-botanical",
|
||||
|
|
@ -89,7 +98,8 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["buyer"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/barcode",
|
||||
"state": "item.card.itemBarcode",
|
||||
"component": "vn-item-barcode",
|
||||
|
|
@ -98,7 +108,8 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["buyer","replenisher"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/summary",
|
||||
"state": "item.card.summary",
|
||||
"component": "vn-item-summary",
|
||||
|
|
@ -106,7 +117,8 @@
|
|||
"params": {
|
||||
"item": "$ctrl.item"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/diary?warehouseFk&lineFk",
|
||||
"state": "item.card.diary",
|
||||
"component": "vn-item-diary",
|
||||
|
|
@ -115,7 +127,8 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["employee"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/last-entries",
|
||||
"state": "item.card.last-entries",
|
||||
"component": "vn-item-last-entries",
|
||||
|
|
@ -124,12 +137,14 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["employee"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/log",
|
||||
"state": "item.card.log",
|
||||
"component": "vn-item-log",
|
||||
"description": "Log"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/request?q",
|
||||
"state": "item.request",
|
||||
"component": "vn-item-request",
|
||||
|
|
@ -138,12 +153,20 @@
|
|||
"item": "$ctrl.item"
|
||||
},
|
||||
"acl": ["employee"]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"url" : "/waste",
|
||||
"state": "item.waste",
|
||||
"component": "vn-item-waste",
|
||||
"description": "Waste breakdown",
|
||||
"acl": ["buyer"]
|
||||
},
|
||||
{
|
||||
"url" : "/fixed-price",
|
||||
"state": "item.fixedPrice",
|
||||
"component": "vn-fixed-price",
|
||||
"description": "Fixed prices",
|
||||
"acl": ["buyer"]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -25,7 +25,18 @@
|
|||
</vn-horizontal>
|
||||
</vn-one>
|
||||
<vn-one name="basicData">
|
||||
<h4 translate>Basic data</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer">
|
||||
<a
|
||||
ui-sref="item.card.basicData({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Basic data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer">
|
||||
Basic data
|
||||
</h4>
|
||||
<vn-label-value label="Name"
|
||||
value="{{$ctrl.summary.item.name}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -53,7 +64,18 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="otherData">
|
||||
<h4 translate>Other data</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer">
|
||||
<a
|
||||
ui-sref="item.card.basicData({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Other data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer">
|
||||
Other data
|
||||
</h4>
|
||||
<vn-label-value label="Intrastat code"
|
||||
value="{{$ctrl.summary.item.intrastat.id}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -77,7 +99,18 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="tags">
|
||||
<h4 translate>Tags</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
|
||||
<a
|
||||
ui-sref="item.card.tags({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Tags</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
|
||||
Tags
|
||||
</h4>
|
||||
<vn-label-value
|
||||
label="{{tag.priority}} {{tag.tag.name}}"
|
||||
ng-repeat="tag in $ctrl.summary.tags track by tag.id"
|
||||
|
|
@ -85,21 +118,54 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="tax">
|
||||
<h4 translate>Tax</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer || $ctrl.isAdministrative">
|
||||
<a
|
||||
ui-sref="item.card.tax({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Tax</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer || !$ctrl.isAdministrative">
|
||||
Tax
|
||||
</h4>
|
||||
<vn-label-value label="{{tax.country.country}}"
|
||||
ng-repeat="tax in $ctrl.summary.item.taxes"
|
||||
value="{{tax.taxClass.description}}">
|
||||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="niche">
|
||||
<h4 translate>Niche</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
|
||||
<a
|
||||
ui-sref="item.card.niche({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Niche</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
|
||||
Niche
|
||||
</h4>
|
||||
<vn-label-value label="{{niche.warehouse.name}}"
|
||||
ng-repeat="niche in $ctrl.summary.niches"
|
||||
value="{{niche.code}}">
|
||||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="botanical">
|
||||
<h4 translate>Botanical</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer">
|
||||
<a
|
||||
ui-sref="item.card.botanical({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Botanical</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer">
|
||||
Botanical
|
||||
</h4>
|
||||
<vn-label-value label="Botanical"
|
||||
value="{{$ctrl.summary.botanical.botanical}}">
|
||||
</vn-label-value>
|
||||
|
|
@ -111,7 +177,18 @@
|
|||
</vn-label-value>
|
||||
</vn-one>
|
||||
<vn-one name="barcode">
|
||||
<h4 translate>Barcode</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
|
||||
<a
|
||||
ui-sref="item.card.itemBarcode({id:$ctrl.item.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Barcode</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
|
||||
Barcode
|
||||
</h4>
|
||||
<p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index">
|
||||
<b>{{barcode.code}}</b>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,22 @@ class Controller extends Summary {
|
|||
if (this.item && this.item.id)
|
||||
this.getSummary();
|
||||
}
|
||||
|
||||
get isBuyer() {
|
||||
return this.aclService.hasAny(['buyer']);
|
||||
}
|
||||
|
||||
get isReplenisher() {
|
||||
return this.aclService.hasAny(['replenisher']);
|
||||
}
|
||||
|
||||
get isAdministrative() {
|
||||
return this.aclService.hasAny(['administrative']);
|
||||
}
|
||||
|
||||
get isEmployee() {
|
||||
return this.aclService.hasAny(['employee']);
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnItemSummary', {
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
initial-data="itemTag.tag"
|
||||
ng-model="itemTag.tagFk"
|
||||
data="tags"
|
||||
on-change="$ctrl.getSourceTable(tag)"
|
||||
show-field="name"
|
||||
on-change="itemTag.value = null"
|
||||
rule>
|
||||
</vn-autocomplete>
|
||||
<vn-textfield vn-three
|
||||
|
|
|
|||
|
|
@ -25,8 +25,15 @@ class Controller extends Section {
|
|||
}
|
||||
|
||||
$onChanges() {
|
||||
if (this.order && this.order.isConfirmed)
|
||||
this.$state.go('order.card.line');
|
||||
this.getData().then(() => {
|
||||
if (this.order && this.order.isConfirmed)
|
||||
this.$state.go('order.card.line');
|
||||
});
|
||||
}
|
||||
|
||||
getData() {
|
||||
return this.$http.get(`Orders/${this.$params.id}`)
|
||||
.then(res => this.order = res.data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -366,8 +373,5 @@ class Controller extends Section {
|
|||
|
||||
ngModule.vnComponent('vnOrderCatalog', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
order: '<'
|
||||
}
|
||||
controller: Controller
|
||||
});
|
||||
|
|
|
|||
|
|
@ -28,6 +28,22 @@ describe('Order', () => {
|
|||
};
|
||||
}));
|
||||
|
||||
describe('getData()', () => {
|
||||
it(`should make a query an fetch the order data`, () => {
|
||||
controller._order = null;
|
||||
|
||||
$httpBackend.expect('GET', `Orders/4`).respond(200, {id: 4, isConfirmed: true});
|
||||
$httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond();
|
||||
controller.getData();
|
||||
$httpBackend.flush();
|
||||
|
||||
const order = controller.order;
|
||||
|
||||
expect(order.id).toEqual(4);
|
||||
expect(order.isConfirmed).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
describe('order() setter', () => {
|
||||
it(`should call scope $applyAsync() method and apply filters from state params`, () => {
|
||||
$httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond();
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('route updateVolume()', () => {
|
||||
// #2735 route updateVolume() returns inconsistent values
|
||||
xdescribe('route updateVolume()', () => {
|
||||
const routeId = 1;
|
||||
const userId = 50;
|
||||
const activeCtx = {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,18 @@
|
|||
</vn-textarea>
|
||||
</vn-one>
|
||||
<vn-auto>
|
||||
<h4 translate>Ticket</h4>
|
||||
<h4 ng-show="$ctrl.isDelivery">
|
||||
<a
|
||||
ui-sref="route.card.tickets({id:$ctrl.route.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Ticket</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isDelivery">
|
||||
Ticket
|
||||
</h4>
|
||||
<vn-table model="model">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@ class Controller extends Summary {
|
|||
});
|
||||
}
|
||||
|
||||
get isDelivery() {
|
||||
return this.aclService.hasAny(['delivery']);
|
||||
}
|
||||
|
||||
get route() {
|
||||
return this._route;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,18 @@
|
|||
</h5>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<h4 translate>Basic data</h4>
|
||||
<h4 ng-show="$ctrl.isAdministrative">
|
||||
<a
|
||||
ui-sref="supplier.card.basicData({id:$ctrl.supplier.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Basic data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isAdministrative">
|
||||
Basic data
|
||||
</h4>
|
||||
<vn-vertical>
|
||||
<vn-label-value
|
||||
label="Id"
|
||||
|
|
@ -37,7 +48,18 @@
|
|||
</vn-vertical>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<h4 translate>Billing data</h4>
|
||||
<h4 ng-show="$ctrl.isAdministrative">
|
||||
<a
|
||||
ui-sref="supplier.card.billingData({id:$ctrl.supplier.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Billing data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isAdministrative">
|
||||
Billing data
|
||||
</h4>
|
||||
<vn-label-value
|
||||
label="Pay method"
|
||||
value="{{::$ctrl.summary.payMethod.name}}">
|
||||
|
|
@ -63,7 +85,18 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<h4 translate>Fiscal data</h4>
|
||||
<h4 ng-show="$ctrl.isAdministrative">
|
||||
<a
|
||||
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Fiscal data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isAdministrative">
|
||||
Fiscal data
|
||||
</h4>
|
||||
<vn-label-value
|
||||
label="Sage tax type"
|
||||
value="{{::$ctrl.summary.sageTaxType.vat}}">
|
||||
|
|
@ -82,7 +115,18 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<h4 translate>Fiscal address</h4>
|
||||
<h4 ng-show="$ctrl.isAdministrative">
|
||||
<a
|
||||
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Fiscal address</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isAdministrative">
|
||||
Fiscal address
|
||||
</h4>
|
||||
<vn-label-value
|
||||
label="Social name"
|
||||
value="{{::$ctrl.summary.name}}">
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ class Controller extends Summary {
|
|||
this.getSummary();
|
||||
}
|
||||
|
||||
get isAdministrative() {
|
||||
return this.aclService.hasAny(['administrative']);
|
||||
}
|
||||
|
||||
getSummary() {
|
||||
return this.$http.get(`Suppliers/${this.supplier.id}/getSummary`).then(response => {
|
||||
this.summary = response.data;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ describe('sale updatePrice()', () => {
|
|||
await originalSalesPersonMana.updateAttributes(originalSalesPersonMana);
|
||||
});
|
||||
|
||||
it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
|
||||
// #2736 sale updatePrice() returns inconsistent values
|
||||
xit('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
|
||||
let ctx = {req: {accessToken: {userId: 18}}};
|
||||
let price = 5.4;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ module.exports = Self => {
|
|||
}, {
|
||||
arg: 'attenderFk',
|
||||
type: 'Number',
|
||||
description: `Search requests atended by the given worker`
|
||||
description: `Search requests attended by a given worker id`
|
||||
}, {
|
||||
arg: 'mine',
|
||||
type: 'Boolean',
|
||||
description: `Search requests attended by the connected worker`
|
||||
description: `Search requests attended by the current user`
|
||||
}, {
|
||||
arg: 'from',
|
||||
type: 'Date',
|
||||
|
|
@ -62,10 +62,9 @@ module.exports = Self => {
|
|||
Self.filter = async(ctx, filter) => {
|
||||
let conn = Self.dataSource.connector;
|
||||
let userId = ctx.req.accessToken.userId;
|
||||
let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
|
||||
|
||||
if (ctx.args.mine)
|
||||
ctx.args.attenderFk = worker.id;
|
||||
ctx.args.attenderFk = userId;
|
||||
|
||||
let where = buildFilter(ctx.args, (param, value) => {
|
||||
switch (param) {
|
||||
|
|
|
|||
|
|
@ -10,75 +10,75 @@ module.exports = Self => {
|
|||
accepts: [
|
||||
{
|
||||
arg: 'ctx',
|
||||
type: 'Object',
|
||||
type: 'object',
|
||||
http: {source: 'context'}
|
||||
}, {
|
||||
arg: 'filter',
|
||||
type: 'Object',
|
||||
type: 'object',
|
||||
description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string`
|
||||
}, {
|
||||
arg: 'search',
|
||||
type: 'String',
|
||||
description: `If it's and integer searchs by id, otherwise it searchs by nickname`
|
||||
type: 'string',
|
||||
description: `If it's and number searchs by id, otherwise it searchs by nickname`
|
||||
}, {
|
||||
arg: 'from',
|
||||
type: 'Date',
|
||||
type: 'date',
|
||||
description: `The from date filter`
|
||||
}, {
|
||||
arg: 'to',
|
||||
type: 'Date',
|
||||
type: 'date',
|
||||
description: `The to date filter`
|
||||
}, {
|
||||
arg: 'nickname',
|
||||
type: 'String',
|
||||
type: 'string',
|
||||
description: `The nickname filter`
|
||||
}, {
|
||||
arg: 'id',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The ticket id filter`
|
||||
}, {
|
||||
arg: 'clientFk',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The client id filter`
|
||||
}, {
|
||||
arg: 'agencyModeFk',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The agency mode id filter`
|
||||
}, {
|
||||
arg: 'warehouseFk',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The warehouse id filter`
|
||||
}, {
|
||||
arg: 'salesPersonFk',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The salesperson id filter`
|
||||
}, {
|
||||
arg: 'provinceFk',
|
||||
type: 'Integer',
|
||||
type: 'number',
|
||||
description: `The province id filter`
|
||||
}, {
|
||||
arg: 'stateFk',
|
||||
type: 'Number',
|
||||
type: 'number',
|
||||
description: `The state id filter`
|
||||
}, {
|
||||
arg: 'myTeam',
|
||||
type: 'Boolean',
|
||||
type: 'boolean',
|
||||
description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)`
|
||||
}, {
|
||||
arg: 'problems',
|
||||
type: 'Boolean',
|
||||
type: 'boolean',
|
||||
description: `Whether to show only tickets with problems`
|
||||
}, {
|
||||
arg: 'pending',
|
||||
type: 'Boolean',
|
||||
type: 'boolean',
|
||||
description: `Whether to show only tickets with state 'Pending'`
|
||||
}, {
|
||||
arg: 'mine',
|
||||
type: 'Boolean',
|
||||
type: 'boolean',
|
||||
description: `Whether to show only tickets for the current logged user`
|
||||
}, {
|
||||
arg: 'orderFk',
|
||||
type: 'Number',
|
||||
type: 'number',
|
||||
description: `The order id filter`
|
||||
}, {
|
||||
arg: 'refFk',
|
||||
|
|
@ -86,12 +86,12 @@ module.exports = Self => {
|
|||
description: `The invoice reference filter`
|
||||
}, {
|
||||
arg: 'alertLevel',
|
||||
type: 'Number',
|
||||
type: 'number',
|
||||
description: `The alert level of the tickets`
|
||||
}
|
||||
],
|
||||
returns: {
|
||||
type: ['Object'],
|
||||
type: ['object'],
|
||||
root: true
|
||||
},
|
||||
http: {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ Discount: Descuento
|
|||
Employee : Empleado
|
||||
Import: Importe
|
||||
Is checked: Comprobado
|
||||
Item: Articulo
|
||||
Item: Artículo
|
||||
Landing: Llegada
|
||||
Landed: F. entrega
|
||||
More: Más
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="search-panel">
|
||||
<form ng-submit="$ctrl.onSearch()">
|
||||
<vn-horizontal>
|
||||
<form id="manifold-form" ng-submit="$ctrl.onSearch()">
|
||||
<vn-horizontal class="vn-px-lg vn-pt-lg">
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="General search"
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
vn-focus>
|
||||
</vn-textfield>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-horizontal class="vn-px-lg">
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="Client id"
|
||||
|
|
@ -21,27 +21,37 @@
|
|||
ng-model="filter.orderFk">
|
||||
</vn-textfield>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="From"
|
||||
ng-model="filter.from">
|
||||
</vn-date-picker>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="To"
|
||||
ng-model="filter.to">
|
||||
</vn-date-picker>
|
||||
<vn-input-number
|
||||
vn-one
|
||||
min="0"
|
||||
step="1"
|
||||
label="Days onward"
|
||||
ng-model="filter.scopeDays"
|
||||
display-controls="true">
|
||||
</vn-input-number>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<section class="vn-px-md">
|
||||
<vn-horizontal class="manifold-panel vn-pa-md">
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="From"
|
||||
ng-model="filter.from"
|
||||
on-change="$ctrl.from = value">
|
||||
</vn-date-picker>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="To"
|
||||
ng-model="filter.to"
|
||||
on-change="$ctrl.to = value">
|
||||
</vn-date-picker>
|
||||
<vn-none class="or vn-px-md">O</vn-none>
|
||||
<vn-input-number
|
||||
vn-one
|
||||
min="0"
|
||||
step="1"
|
||||
label="Days onward"
|
||||
ng-model="filter.scopeDays"
|
||||
on-change="$ctrl.scopeDays = value"
|
||||
display-controls="true">
|
||||
</vn-input-number>
|
||||
<vn-icon color-marginal
|
||||
icon="info"
|
||||
vn-tooltip="Cannot choose a range of dates and days onward at the same time">
|
||||
</vn-icon>
|
||||
</vn-horizontal>
|
||||
</section>
|
||||
<vn-horizontal class="vn-px-lg">
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="Nickname"
|
||||
|
|
@ -63,7 +73,7 @@
|
|||
ng-model="filter.refFk">
|
||||
</vn-textfield>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-horizontal class="vn-px-lg">
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
label="Agency"
|
||||
|
|
@ -87,7 +97,7 @@
|
|||
</tpl-item>
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-horizontal class="vn-px-lg">
|
||||
<vn-autocomplete
|
||||
vn-one
|
||||
label="Warehouse"
|
||||
|
|
@ -101,7 +111,7 @@
|
|||
url="Provinces">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-horizontal class="vn-px-lg">
|
||||
<vn-check
|
||||
vn-one
|
||||
label="My team"
|
||||
|
|
@ -121,7 +131,7 @@
|
|||
triple-state="true">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal class="vn-mt-lg">
|
||||
<vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
|
||||
<vn-submit label="Search"></vn-submit>
|
||||
</vn-horizontal>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
import ngModule from '../module';
|
||||
import SearchPanel from 'core/components/searchbar/search-panel';
|
||||
|
||||
class Controller extends SearchPanel {
|
||||
constructor($, $element) {
|
||||
super($, $element);
|
||||
this.filter = this.$.filter;
|
||||
|
||||
this.getGroupedStates();
|
||||
}
|
||||
|
||||
|
|
@ -19,6 +22,35 @@ class Controller extends SearchPanel {
|
|||
this.groupedStates = groupedStates;
|
||||
});
|
||||
}
|
||||
|
||||
get from() {
|
||||
return this._from;
|
||||
}
|
||||
|
||||
set from(value) {
|
||||
this._from = value;
|
||||
this.filter.scopeDays = null;
|
||||
}
|
||||
|
||||
get to() {
|
||||
return this._to;
|
||||
}
|
||||
|
||||
set to(value) {
|
||||
this._to = value;
|
||||
this.filter.scopeDays = null;
|
||||
}
|
||||
|
||||
get scopeDays() {
|
||||
return this._scopeDays;
|
||||
}
|
||||
|
||||
set scopeDays(value) {
|
||||
this._scopeDays = value;
|
||||
|
||||
this.filter.from = null;
|
||||
this.filter.to = null;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnTicketSearchPanel', {
|
||||
|
|
|
|||
|
|
@ -10,10 +10,11 @@ describe('Ticket Component vnTicketSearchPanel', () => {
|
|||
$httpBackend = _$httpBackend_;
|
||||
controller = $componentController('vnTicketSearchPanel', {$element: null});
|
||||
controller.$t = () => {};
|
||||
controller.filter = {};
|
||||
}));
|
||||
|
||||
describe('getGroupedStates()', () => {
|
||||
it('should set an array of groupedStates with the aditionof a name translation', () => {
|
||||
it('should set an array of groupedStates with the adition of a name translation', () => {
|
||||
jest.spyOn(controller, '$t').mockReturnValue('miCodigo');
|
||||
const data = [
|
||||
{
|
||||
|
|
@ -32,4 +33,39 @@ describe('Ticket Component vnTicketSearchPanel', () => {
|
|||
}]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('from() setter', () => {
|
||||
it('should clear the scope days when setting the from property', () => {
|
||||
controller.filter.scopeDays = 1;
|
||||
|
||||
controller.from = new Date();
|
||||
|
||||
expect(controller.filter.scopeDays).toBeNull();
|
||||
expect(controller.from).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('to() setter', () => {
|
||||
it('should clear the scope days when setting the to property', () => {
|
||||
controller.filter.scopeDays = 1;
|
||||
|
||||
controller.to = new Date();
|
||||
|
||||
expect(controller.filter.scopeDays).toBeNull();
|
||||
expect(controller.to).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('scopeDays() setter', () => {
|
||||
it('should clear the date range when setting the scopeDays property', () => {
|
||||
controller.filter.from = new Date();
|
||||
controller.filter.to = new Date();
|
||||
|
||||
controller.scopeDays = 1;
|
||||
|
||||
expect(controller.filter.from).toBeNull();
|
||||
expect(controller.filter.to).toBeNull();
|
||||
expect(controller.scopeDays).toBeDefined();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,4 +16,5 @@ Pending: Pendiente
|
|||
FREE: Libre
|
||||
DELIVERED: Servido
|
||||
ON_PREPARATION: En preparacion
|
||||
PACKED: Encajado
|
||||
PACKED: Encajado
|
||||
Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<vn-crud-model
|
||||
vn-id="typesModel"
|
||||
auto-load="true"
|
||||
url="TicketServiceTypes"
|
||||
data="ticketServiceTypes"
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ class Controller extends Section {
|
|||
throw new UserError(`Name can't be empty`);
|
||||
|
||||
return this.$http.post(`TicketServiceTypes`, this.$.newServiceType)
|
||||
.then(res => {
|
||||
this.$.typesModel.refresh();
|
||||
return res;
|
||||
})
|
||||
.then(res => service.ticketServiceTypeFk = res.data.id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import './index.js';
|
||||
import crudModel from 'core/mocks/crud-model';
|
||||
|
||||
describe('Ticket component vnTicketService', () => {
|
||||
let controller;
|
||||
|
|
@ -11,7 +12,7 @@ describe('Ticket component vnTicketService', () => {
|
|||
beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => {
|
||||
$httpBackend = _$httpBackend_;
|
||||
$scope = $rootScope.$new();
|
||||
|
||||
$scope.typesModel = crudModel;
|
||||
$element = angular.element(`<div></div>`);
|
||||
controller = $componentController('vnTicketService', {$scope, $element});
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<vn-card class="summary">
|
||||
<h5>
|
||||
<a ng-if="::$ctrl.summary.id"
|
||||
<a
|
||||
ng-if="::$ctrl.summary.id"
|
||||
vn-tooltip="Go to the ticket"
|
||||
ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
|
||||
name="goToSummary">
|
||||
|
|
@ -103,7 +104,13 @@
|
|||
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency: 'EUR':2}}</strong></p>
|
||||
</vn-one>
|
||||
<vn-auto name="sales">
|
||||
<h4 translate>Sale</h4>
|
||||
<h4>
|
||||
<a
|
||||
ui-sref="ticket.card.sale({id:$ctrl.ticket.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Sale</span>
|
||||
</a>
|
||||
</h4>
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
@ -158,7 +165,13 @@
|
|||
</vn-table>
|
||||
</vn-auto>
|
||||
<vn-one ng-if="$ctrl.summary.packagings.length != 0">
|
||||
<h4 translate>Packages</h4>
|
||||
<h4>
|
||||
<a
|
||||
ui-sref="ticket.card.package({id:$ctrl.ticket.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Packages</span>
|
||||
</a>
|
||||
</h4>
|
||||
<vn-table model="model">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
@ -177,7 +190,13 @@
|
|||
</vn-table>
|
||||
</vn-one>
|
||||
<vn-one class="services" ng-if="$ctrl.summary.services.length != 0">
|
||||
<h4 translate>Service</h4>
|
||||
<h4>
|
||||
<a
|
||||
ui-sref="ticket.card.service({id:$ctrl.ticket.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Service</span>
|
||||
</a>
|
||||
</h4>
|
||||
<vn-table model="model">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
@ -202,7 +221,13 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-auto ng-if="$ctrl.summary.requests.length != 0">
|
||||
<h4 translate>Purchase request</h4>
|
||||
<h4>
|
||||
<a
|
||||
ui-sref="ticket.card.request.index({id:$ctrl.ticket.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Purchase request</span>
|
||||
</a>
|
||||
</h4>
|
||||
<vn-table model="model">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<vn-tr>
|
||||
<vn-th field="ticketFk" number>Ticket ID</vn-th>
|
||||
<vn-th field="clientName">Client</vn-th>
|
||||
<vn-th>Weekday</vn-th>
|
||||
<vn-th>Shipment</vn-th>
|
||||
<vn-th>Agency</vn-th>
|
||||
<vn-th>Warehouse</vn-th>
|
||||
<vn-th>Salesperson</vn-th>
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad
|
|||
This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
|
||||
Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente
|
||||
Search by weekly ticket: Buscar por tickets programados
|
||||
weekDay: Dia
|
||||
Shipment: Salida
|
||||
|
|
@ -10,68 +10,74 @@ module.exports = Self => {
|
|||
accepts: [
|
||||
{
|
||||
arg: 'filter',
|
||||
type: 'Object',
|
||||
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'object',
|
||||
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
|
||||
},
|
||||
{
|
||||
arg: 'search',
|
||||
type: 'String',
|
||||
description: 'Searchs the travel by id',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'string',
|
||||
description: 'Searchs the travel by id'
|
||||
},
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'Integer',
|
||||
description: 'The travel id',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'number',
|
||||
description: 'The travel id'
|
||||
},
|
||||
{
|
||||
arg: 'shippedFrom',
|
||||
type: 'Date',
|
||||
description: 'The shipped from date filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'date',
|
||||
description: 'The shipped from date filter'
|
||||
},
|
||||
{
|
||||
arg: 'shippedTo',
|
||||
type: 'Date',
|
||||
description: 'The shipped to date filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'date',
|
||||
description: 'The shipped to date filter'
|
||||
},
|
||||
{
|
||||
arg: 'landedFrom',
|
||||
type: 'Date',
|
||||
description: 'The landed from date filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'date',
|
||||
description: 'The landed from date filter'
|
||||
},
|
||||
{
|
||||
arg: 'landedTo',
|
||||
type: 'Date',
|
||||
description: 'The landed to date filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'date',
|
||||
description: 'The landed to date filter'
|
||||
},
|
||||
{
|
||||
arg: 'agencyFk',
|
||||
type: 'Number',
|
||||
description: 'The agencyModeFk id',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'number',
|
||||
description: 'The agencyModeFk id'
|
||||
},
|
||||
{
|
||||
arg: 'warehouseOutFk',
|
||||
type: 'Number',
|
||||
description: 'The warehouseOutFk filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'number',
|
||||
description: 'The warehouseOutFk filter'
|
||||
},
|
||||
{
|
||||
arg: 'warehouseInFk',
|
||||
type: 'Number',
|
||||
description: 'The warehouseInFk filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'number',
|
||||
description: 'The warehouseInFk filter'
|
||||
},
|
||||
{
|
||||
arg: 'totalEntries',
|
||||
type: 'Number',
|
||||
description: 'The totalEntries filter',
|
||||
http: {source: 'query'}
|
||||
}, {
|
||||
type: 'number',
|
||||
description: 'The totalEntries filter'
|
||||
},
|
||||
{
|
||||
arg: 'ref',
|
||||
type: 'string',
|
||||
description: 'The reference'
|
||||
}, {
|
||||
},
|
||||
{
|
||||
arg: 'continent',
|
||||
type: 'string',
|
||||
description: 'The continent code'
|
||||
}
|
||||
},
|
||||
{
|
||||
arg: 'cargoSupplierFk',
|
||||
type: 'number',
|
||||
description: 'The freighter supplier id'
|
||||
},
|
||||
],
|
||||
returns: {
|
||||
type: ['Object'],
|
||||
|
|
@ -108,6 +114,7 @@ module.exports = Self => {
|
|||
case 'warehouseOutFk':
|
||||
case 'warehouseInFk':
|
||||
case 'totalEntries':
|
||||
case 'cargoSupplierFk':
|
||||
param = `t.${param}`;
|
||||
return {[param]: value};
|
||||
}
|
||||
|
|
@ -172,8 +179,8 @@ module.exports = Self => {
|
|||
e.notes,
|
||||
CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedkg,
|
||||
CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg
|
||||
FROM entry e
|
||||
JOIN tmp.travel tr ON tr.id = e.travelFk
|
||||
FROM tmp.travel tr
|
||||
JOIN entry e ON e.travelFk = tr.id
|
||||
JOIN buy b ON b.entryFk = e.id
|
||||
JOIN packaging pkg ON pkg.id = b.packageFk
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
"m3": {
|
||||
"type": "Number"
|
||||
},
|
||||
"kg": {
|
||||
"type": "Number"
|
||||
},
|
||||
"cargoSupplierFk": {
|
||||
"type": "Number"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -39,24 +39,28 @@
|
|||
<vn-date-picker
|
||||
vn-one
|
||||
label="Shipped from"
|
||||
ng-model="filter.shippedFrom">
|
||||
ng-model="filter.shippedFrom"
|
||||
on-change="$ctrl.shippedFrom = value">
|
||||
</vn-date-picker>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Shipped to"
|
||||
ng-model="filter.shippedTo">
|
||||
ng-model="filter.shippedTo"
|
||||
on-change="$ctrl.shippedTo = value">
|
||||
</vn-date-picker>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Landed from"
|
||||
ng-model="filter.landedFrom">
|
||||
ng-model="filter.landedFrom"
|
||||
on-change="$ctrl.landedFrom = value">
|
||||
</vn-date-picker>
|
||||
<vn-date-picker
|
||||
vn-one
|
||||
label="Landed to"
|
||||
ng-model="filter.landedTo">
|
||||
ng-model="filter.landedTo"
|
||||
on-change="$ctrl.landedTo = value">
|
||||
</vn-date-picker>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
|
|
@ -76,6 +80,13 @@
|
|||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-autocomplete vn-one
|
||||
label="Freighter"
|
||||
ng-model="filter.cargoSupplierFk"
|
||||
url="Suppliers"
|
||||
show-field="name"
|
||||
value-field="id">
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete vn-one
|
||||
label="Continent Out"
|
||||
ng-model="filter.continent"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,59 @@
|
|||
import ngModule from '../module';
|
||||
import SearchPanel from 'core/components/searchbar/search-panel';
|
||||
|
||||
class Controller extends SearchPanel {
|
||||
constructor($, $element) {
|
||||
super($, $element);
|
||||
|
||||
this.filter = this.$.filter;
|
||||
}
|
||||
|
||||
get shippedFrom() {
|
||||
return this._shippedFrom;
|
||||
}
|
||||
|
||||
set shippedFrom(value) {
|
||||
this._shippedFrom = value;
|
||||
|
||||
if (!this.filter.shippedTo)
|
||||
this.filter.shippedTo = value;
|
||||
}
|
||||
|
||||
get shippedTo() {
|
||||
return this._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;
|
||||
|
||||
if (!this.filter.landedTo)
|
||||
this.filter.landedTo = value;
|
||||
}
|
||||
|
||||
get landedTo() {
|
||||
return this._landedTo;
|
||||
}
|
||||
|
||||
set landedTo(value) {
|
||||
this._landedTo = value;
|
||||
|
||||
if (!this.filter.landedFrom)
|
||||
this.filter.landedFrom = value;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnExtraCommunitySearchPanel', {
|
||||
template: require('./index.html'),
|
||||
controller: SearchPanel
|
||||
controller: Controller
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,19 +9,27 @@
|
|||
<vn-searchbar
|
||||
vn-focus
|
||||
panel="vn-extra-community-search-panel"
|
||||
info="Search by travel id or reference"
|
||||
placeholder="Search by extra community travel"
|
||||
suggested-filter="$ctrl.defaultFilter"
|
||||
filter="$ctrl.defaultFilter"
|
||||
info="Search by travel id or reference"
|
||||
auto-state="false"
|
||||
model="model">
|
||||
</vn-searchbar>
|
||||
</vn-portal>
|
||||
<vn-data-viewer model="model" class="travel-list">
|
||||
<vn-card ng-repeat="travel in travels" class="vn-mb-md">
|
||||
<vn-card>
|
||||
<section class="vn-pa-md">
|
||||
<vn-table vn-droppable="$ctrl.onDrop($event)" ng-attr-id="{{::travel.id}}">
|
||||
<vn-tool-bar class="vn-mb-md">
|
||||
<vn-button disabled="!model.userParams.landedFrom || !model.userParams.landedTo"
|
||||
icon="picture_as_pdf"
|
||||
ng-click="$ctrl.showReport()"
|
||||
vn-tooltip="Open as PDF">
|
||||
</vn-button>
|
||||
</vn-tool-bar>
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
<vn-tr ng-if="$index == 0">
|
||||
<vn-tr>
|
||||
<vn-th shrink>Id</vn-th>
|
||||
<vn-th expand>Supplier</vn-th>
|
||||
<vn-th expand>Freighter</vn-th>
|
||||
|
|
@ -33,14 +41,14 @@
|
|||
<vn-th expand translate-attr="{title: 'Warehouse Out'}">
|
||||
Wh. Out
|
||||
</vn-th>
|
||||
<vn-th expand>Shipped</vn-th>
|
||||
<vn-th expand>W. Shipped</vn-th>
|
||||
<vn-th expand translate-attr="{title: 'Warehouse In'}">
|
||||
Wh. In
|
||||
</vn-th>
|
||||
<vn-th expand>Landed</vn-th>
|
||||
<vn-th expand>W. Landed</vn-th>
|
||||
</vn-tr>
|
||||
</vn-thead>
|
||||
<vn-tbody>
|
||||
<vn-tbody ng-repeat="travel in travels" class="vn-mb-md" vn-droppable="$ctrl.onDrop($event)" ng-attr-id="{{::travel.id}}">
|
||||
<vn-tr class="header">
|
||||
<vn-td>
|
||||
<span class="link"
|
||||
|
|
@ -50,17 +58,26 @@
|
|||
</vn-td>
|
||||
<vn-td expand>{{::travel.agencyModeName}}</vn-td>
|
||||
<vn-td expand>{{::travel.cargoSupplierNickname}}</vn-td>
|
||||
<vn-td-editable expand>
|
||||
<vn-td-editable name="reference" expand>
|
||||
<text>{{travel.ref}}</text>
|
||||
<field>
|
||||
<vn-textfield class="dense" vn-focus
|
||||
ng-model="travel.ref"
|
||||
on-change="$ctrl.changeReference(travel)">
|
||||
on-change="$ctrl.save(travel.id, {ref: value})">
|
||||
</vn-textfield>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td number>{{::travel.stickers}}</vn-td>
|
||||
<vn-td number>{{::travel.kg}}</vn-td>
|
||||
<vn-td-editable name="lockedKg" expand style="text-align: right">
|
||||
<text number>{{travel.kg}}</text>
|
||||
<field>
|
||||
<vn-input-number class="dense" vn-focus
|
||||
ng-model="travel.kg"
|
||||
on-change="$ctrl.save(travel.id, {kg: value})"
|
||||
min="0">
|
||||
</vn-input-number>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td number>{{::travel.loadedKg}}</vn-td>
|
||||
<vn-td number>{{::travel.volumeKg}}</vn-td>
|
||||
<vn-td expand>{{::travel.warehouseOutName}}</vn-td>
|
||||
|
|
@ -80,17 +97,17 @@
|
|||
<vn-td>{{::entry.supplierName}}</vn-td>
|
||||
<vn-td></vn-td>
|
||||
<vn-td expand>{{::entry.ref}}</vn-td>
|
||||
<vn-th number>{{::entry.stickers}}</vn-th>
|
||||
<vn-td number>{{::entry.stickers}}</vn-td>
|
||||
<vn-td number></vn-td>
|
||||
<vn-td number>{{::entry.loadedkg}}</vn-td>
|
||||
<vn-td number>{{::entry.volumeKg}}</vn-td>
|
||||
<vn-td>
|
||||
<span nf-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
|
||||
<span ng-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
|
||||
{{::entry.notes}}
|
||||
</span>
|
||||
</vn-td>
|
||||
<vn-td>
|
||||
<span nf-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
|
||||
<span ng-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
|
||||
{{::entry.evaNotes}}
|
||||
</span>
|
||||
</vn-td>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@ import Section from 'salix/components/section';
|
|||
import './style.scss';
|
||||
|
||||
class Controller extends Section {
|
||||
constructor($element, $) {
|
||||
constructor($element, $, vnReport) {
|
||||
super($element, $);
|
||||
|
||||
this.vnReport = vnReport;
|
||||
|
||||
const draggable = this.element.querySelector('.travel-list');
|
||||
draggable.addEventListener('dragstart',
|
||||
event => this.dragStart(event));
|
||||
|
|
@ -13,7 +15,7 @@ class Controller extends Section {
|
|||
event => this.dragEnd(event));
|
||||
|
||||
this.draggableElement = 'a[draggable]';
|
||||
this.droppableElement = 'vn-table[vn-droppable]';
|
||||
this.droppableElement = 'vn-tbody[vn-droppable]';
|
||||
|
||||
const scopeDays = 14;
|
||||
const landedFrom = new Date();
|
||||
|
|
@ -77,14 +79,26 @@ class Controller extends Section {
|
|||
}
|
||||
}
|
||||
|
||||
changeReference(travel) {
|
||||
const params = {ref: travel.ref};
|
||||
const endpoint = `Travels/${travel.id}`;
|
||||
this.$http.patch(endpoint, params)
|
||||
save(id, data) {
|
||||
const endpoint = `Travels/${id}`;
|
||||
this.$http.patch(endpoint, data)
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
|
||||
}
|
||||
|
||||
get reportParams() {
|
||||
const userParams = this.$.model.userParams;
|
||||
return Object.assign({
|
||||
authorization: this.vnToken.token
|
||||
}, userParams);
|
||||
}
|
||||
|
||||
showReport() {
|
||||
this.vnReport.show('extra-community', this.reportParams);
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$element', '$scope', 'vnReport'];
|
||||
|
||||
ngModule.vnComponent('vnTravelExtraCommunity', {
|
||||
template: require('./index.html'),
|
||||
controller: Controller
|
||||
|
|
|
|||
|
|
@ -14,20 +14,6 @@ describe('Travel Component vnTravelExtraCommunity', () => {
|
|||
controller.$.model.refresh = jest.fn();
|
||||
}));
|
||||
|
||||
describe('changeReference()', () => {
|
||||
it('should make an HTTP query', () => {
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
|
||||
const travel = {id: 1, ref: 'New reference'};
|
||||
const expectedData = {ref: 'New reference'};
|
||||
$httpBackend.expect('PATCH', `Travels/${travel.id}`, expectedData).respond(200);
|
||||
controller.changeReference(travel);
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
|
||||
});
|
||||
});
|
||||
|
||||
describe('findDraggable()', () => {
|
||||
it('should find the draggable element', () => {
|
||||
const draggable = document.createElement('a');
|
||||
|
|
@ -46,7 +32,7 @@ describe('Travel Component vnTravelExtraCommunity', () => {
|
|||
|
||||
describe('findDroppable()', () => {
|
||||
it('should find the droppable element', () => {
|
||||
const droppable = document.createElement('vn-table');
|
||||
const droppable = document.createElement('vn-tbody');
|
||||
droppable.setAttribute('vn-droppable', true);
|
||||
|
||||
const $event = new Event('drop');
|
||||
|
|
@ -103,13 +89,13 @@ describe('Travel Component vnTravelExtraCommunity', () => {
|
|||
|
||||
describe('onDrop()', () => {
|
||||
it('should make an HTTP patch query', () => {
|
||||
const droppable = document.createElement('vn-table');
|
||||
const droppable = document.createElement('vn-tbody');
|
||||
droppable.setAttribute('vn-droppable', true);
|
||||
droppable.setAttribute('id', 1);
|
||||
|
||||
jest.spyOn(controller, 'findDroppable').mockReturnValue(droppable);
|
||||
|
||||
const oldDroppable = document.createElement('vn-table');
|
||||
const oldDroppable = document.createElement('vn-tbody');
|
||||
oldDroppable.setAttribute('vn-droppable', true);
|
||||
const entry = document.createElement('div');
|
||||
oldDroppable.appendChild(entry);
|
||||
|
|
@ -124,4 +110,19 @@ describe('Travel Component vnTravelExtraCommunity', () => {
|
|||
$httpBackend.flush();
|
||||
});
|
||||
});
|
||||
|
||||
describe('save()', () => {
|
||||
it('should make an HTTP query', () => {
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
|
||||
const travelId = 1;
|
||||
const data = {ref: 'New reference'};
|
||||
const expectedData = {ref: 'New reference'};
|
||||
$httpBackend.expect('PATCH', `Travels/${travelId}`, expectedData).respond(200);
|
||||
controller.save(travelId, data);
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,5 +4,8 @@ Freighter: Transitario
|
|||
Bl. KG: KG Bloq.
|
||||
Phy. KG: KG físico
|
||||
Vol. KG: KG Vol.
|
||||
Search by travel id or reference: Buscar por id travel o referencia
|
||||
Continent Out: Continente salida
|
||||
Search by travel id or reference: Buscar por id de travel o referencia
|
||||
Search by extra community travel: Buscar por envío extra comunitario
|
||||
Continent Out: Continente salida
|
||||
W. Shipped: F. envío
|
||||
W. Landed: F. llegada
|
||||
|
|
@ -26,11 +26,11 @@ vn-travel-extra-community {
|
|||
color: $color-active
|
||||
}
|
||||
|
||||
vn-td-editable text:after {
|
||||
vn-td-editable:hover text:after {
|
||||
font-family: 'Material Icons';
|
||||
content: 'edit';
|
||||
position: absolute;
|
||||
margin-left: 5px;
|
||||
right: -15px;
|
||||
color: $color-spacer
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<vn-card class="summary">
|
||||
<h5>
|
||||
<a ng-if="::$ctrl.travelData.id"
|
||||
<a
|
||||
ng-if="::$ctrl.travelData.id"
|
||||
vn-tooltip="Go to the travel"
|
||||
ui-sref="travel.card.summary({id: {{::$ctrl.travelData.id}}})"
|
||||
name="goToSummary">
|
||||
|
|
@ -132,7 +133,18 @@
|
|||
</vn-table>
|
||||
</vn-auto>
|
||||
<vn-auto ng-if="$ctrl.travelThermographs.length != 0">
|
||||
<h4 translate>Thermographs</h4>
|
||||
<h4 ng-show="$ctrl.isBuyer">
|
||||
<a
|
||||
ui-sref="travel.card.thermograph.index({id:$ctrl.travelData.id})"
|
||||
target="_self">
|
||||
<span translate vn-tooltip="Go to">Thermograph</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translate
|
||||
ng-show="!$ctrl.isBuyer">
|
||||
Thermograph
|
||||
</h4>
|
||||
<vn-table>
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ class Controller extends Summary {
|
|||
|
||||
return total;
|
||||
}
|
||||
|
||||
get isBuyer() {
|
||||
return this.aclService.hasAny(['buyer']);
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnTravelSummary', {
|
||||
|
|
|
|||
|
|
@ -84,13 +84,6 @@
|
|||
value-field="id">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-textarea vn-one vn-focus
|
||||
label="Description"
|
||||
ng-model="$ctrl.dms.description"
|
||||
rule>
|
||||
</vn-textarea>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-input-file
|
||||
vn-one
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Calendar",
|
||||
"base": "Loggable",
|
||||
"base": "VnModel",
|
||||
"log": {
|
||||
"model": "WorkerLog",
|
||||
"relation": "labour"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,17 @@
|
|||
</h5>
|
||||
<vn-horizontal class="vn-pa-md">
|
||||
<vn-one>
|
||||
<h4 translate>Basic data</h4>
|
||||
<h4 ng-show="$ctrl.isHr">
|
||||
<a
|
||||
ui-sref="worker.card.basicData({id:$ctrl.worker.id})">
|
||||
<span translate vn-tooltip="Go to">Basic data</span>
|
||||
</a>
|
||||
</h4>
|
||||
<h4
|
||||
translates
|
||||
ng-show="!$ctrl.isHr">
|
||||
Basic data
|
||||
</h4>
|
||||
<vn-label-value label="Id"
|
||||
value="{{worker.id}}">
|
||||
</vn-label-value>
|
||||
|
|
|
|||
|
|
@ -52,6 +52,10 @@ class Controller extends Summary {
|
|||
this.$.worker = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
get isHr() {
|
||||
return this.aclService.hasAny(['hr']);
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnWorkerSummary', {
|
||||
|
|
|
|||
|
|
@ -4,12 +4,10 @@ import crudModel from 'core/mocks/crud-model';
|
|||
describe('component vnZoneCalendar', () => {
|
||||
let $scope;
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
|
||||
beforeEach(ngModule('zone'));
|
||||
|
||||
beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
|
||||
$httpBackend = _$httpBackend_;
|
||||
beforeEach(inject(($componentController, $rootScope) => {
|
||||
$scope = $rootScope.$new();
|
||||
const $element = angular.element(`<vn-zone-calendar></vn-zone-calendar>`);
|
||||
controller = $componentController('vnZoneCalendar', {$element, $scope});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<vn-card class="summary">
|
||||
<h5>
|
||||
<a ng-if="::$ctrl.summary.id"
|
||||
<a
|
||||
ng-if="::$ctrl.summary.id"
|
||||
vn-tooltip="Go to the zone"
|
||||
ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})"
|
||||
name="goToSummary">
|
||||
|
|
@ -36,7 +37,11 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal class="vn-pa-md">
|
||||
<vn-auto>
|
||||
<h4 translate>Warehouses</h4>
|
||||
<h4>
|
||||
<a ui-sref="zone.card.warehouses({id:$ctrl.zone.id})">
|
||||
<span translate vn-tooltip="Go to">Warehouse</span>
|
||||
</a>
|
||||
</h4>
|
||||
<vn-table model="model" auto-load="false">
|
||||
<vn-thead>
|
||||
<vn-tr>
|
||||
|
|
|
|||
|
|
@ -125,30 +125,56 @@
|
|||
padding-right: 16px;
|
||||
}
|
||||
|
||||
/* Medium-Large */
|
||||
|
||||
.vn-pa-ml {
|
||||
padding: 32px;
|
||||
}
|
||||
.vn-pl-ml {
|
||||
padding-left: 32px;
|
||||
}
|
||||
.vn-pr-ml {
|
||||
padding-right: 32px;
|
||||
}
|
||||
.vn-pt-ml {
|
||||
padding-top: 32px;
|
||||
}
|
||||
.vn-pb-ml {
|
||||
padding-bottom: 32px;
|
||||
}
|
||||
.vn-py-ml {
|
||||
padding-top: 32px;
|
||||
padding-bottom: 32px;
|
||||
}
|
||||
.vn-px-ml {
|
||||
padding-left: 32px;
|
||||
padding-right: 32px;
|
||||
}
|
||||
|
||||
/* Large */
|
||||
|
||||
.vn-pa-lg {
|
||||
padding: 32px;
|
||||
padding: 64px;
|
||||
}
|
||||
.vn-pl-lg {
|
||||
padding-left: 32px;
|
||||
padding-left: 64px;
|
||||
}
|
||||
.vn-pr-lg {
|
||||
padding-right: 32px;
|
||||
padding-right: 64px;
|
||||
}
|
||||
.vn-pt-lg {
|
||||
padding-top: 32px;
|
||||
padding-top: 64px;
|
||||
}
|
||||
.vn-pb-lg {
|
||||
padding-bottom: 32px;
|
||||
padding-bottom: 64px;
|
||||
}
|
||||
.vn-py-lg {
|
||||
padding-top: 32px;
|
||||
padding-bottom: 32px;
|
||||
padding-top: 64px;
|
||||
padding-bottom: 64px;
|
||||
}
|
||||
.vn-px-lg {
|
||||
padding-left: 32px;
|
||||
padding-right: 32px;
|
||||
padding-left: 64px;
|
||||
padding-right: 64px;
|
||||
}
|
||||
|
||||
/* Extra large */
|
||||
|
|
@ -296,30 +322,56 @@
|
|||
margin-right: 16px;
|
||||
}
|
||||
|
||||
/* Medium-Large */
|
||||
|
||||
.vn-ma-ml {
|
||||
margin: 32px;
|
||||
}
|
||||
.vn-mt-ml {
|
||||
margin-top: 32px;
|
||||
}
|
||||
.vn-ml-ml {
|
||||
margin-left: 32px;
|
||||
}
|
||||
.vn-mr-ml {
|
||||
margin-right: 32px;
|
||||
}
|
||||
.vn-mb-ml {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
.vn-my-ml {
|
||||
margin-top: 32px;
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
.vn-mx-ml {
|
||||
margin-left: 32px;
|
||||
margin-right: 32px;
|
||||
}
|
||||
|
||||
/* Large */
|
||||
|
||||
.vn-ma-lg {
|
||||
margin: 32px;
|
||||
margin: 64px;
|
||||
}
|
||||
.vn-mt-lg {
|
||||
margin-top: 32px;
|
||||
margin-top: 64px;
|
||||
}
|
||||
.vn-ml-lg {
|
||||
margin-left: 32px;
|
||||
margin-left: 64px;
|
||||
}
|
||||
.vn-mr-lg {
|
||||
margin-right: 32px;
|
||||
margin-right: 64px;
|
||||
}
|
||||
.vn-mb-lg {
|
||||
margin-bottom: 32px;
|
||||
margin-bottom: 64px;
|
||||
}
|
||||
.vn-my-lg {
|
||||
margin-top: 32px;
|
||||
margin-bottom: 32px;
|
||||
margin-top: 64px;
|
||||
margin-bottom: 64px;
|
||||
}
|
||||
.vn-mx-lg {
|
||||
margin-left: 32px;
|
||||
margin-right: 32px;
|
||||
margin-left: 64px;
|
||||
margin-right: 64px;
|
||||
}
|
||||
|
||||
/* Extra large */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
const mysql = require('mysql2/promise');
|
||||
const config = require('./config.js');
|
||||
const fs = require('fs-extra');
|
||||
const PromisePoolConnection = mysql.PromisePoolConnection;
|
||||
|
||||
module.exports = {
|
||||
init() {
|
||||
|
|
@ -16,11 +17,17 @@ module.exports = {
|
|||
* Makes a query from a raw sql
|
||||
* @param {String} query - The raw SQL query
|
||||
* @param {Object} params - Parameterized values
|
||||
* @param {Object} connection - Optional pool connection
|
||||
*
|
||||
* @return {Object} - Result promise
|
||||
*/
|
||||
rawSql(query, params) {
|
||||
return this.pool.query(query, params).then(([rows]) => {
|
||||
rawSql(query, params, connection) {
|
||||
let pool = this.pool;
|
||||
if (params instanceof PromisePoolConnection)
|
||||
connection = params;
|
||||
if (connection) pool = connection;
|
||||
|
||||
return pool.query(query, params).then(([rows]) => {
|
||||
return rows;
|
||||
});
|
||||
},
|
||||
|
|
@ -85,5 +92,57 @@ module.exports = {
|
|||
return this.findOneFromDef(queryName, params).then(row => {
|
||||
return Object.values(row)[0];
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Returns the content of a SQL file
|
||||
* @param {String} queryName - The SQL file name
|
||||
*
|
||||
* @return {Object} - SQL
|
||||
*/
|
||||
getSqlFromDef(queryName) {
|
||||
return fs.readFileSync(`${queryName}.sql`, 'utf8');
|
||||
},
|
||||
|
||||
/**
|
||||
* Merges two SQL strings
|
||||
*
|
||||
* @param {String} query - Input SQL
|
||||
* @param {String} sql - String to merge
|
||||
*
|
||||
* @return {String} - Merged SQL string
|
||||
*/
|
||||
merge(query, sql) {
|
||||
return query += `\r\n ${sql}`;
|
||||
},
|
||||
|
||||
/**
|
||||
* Builds where string
|
||||
*
|
||||
* @param {Object} args - Query params
|
||||
* @param {Function} callback - Callback
|
||||
*
|
||||
* @return {String} - Where Sql string
|
||||
*/
|
||||
buildWhere(args, callback) {
|
||||
let sql = '';
|
||||
|
||||
for (let prop in args) {
|
||||
const value = args[prop];
|
||||
if (!value) continue;
|
||||
|
||||
const sanitizedValue = mysql.escape(value);
|
||||
const conditional = callback(prop, sanitizedValue);
|
||||
|
||||
if (!conditional) continue;
|
||||
|
||||
if (sql) sql += ' AND ';
|
||||
sql += conditional;
|
||||
}
|
||||
let where = '';
|
||||
if (sql)
|
||||
where = `WHERE ${sql}`;
|
||||
|
||||
return where;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ const defaultLocale = config.i18n.locale;
|
|||
|
||||
const number = function(value, locale = defaultLocale) {
|
||||
if (!locale) locale = defaultLocale;
|
||||
if (value === null || value == '') return;
|
||||
return new Intl.NumberFormat(locale, {
|
||||
style: 'decimal'
|
||||
}).format(parseFloat(value));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
const {KeyValueModel} = require('loopback');
|
||||
const Vue = require('vue');
|
||||
|
||||
const zerofill = function(value, pad) {
|
||||
|
|
|
|||
|
|
@ -8,10 +8,12 @@ const dbHelper = {
|
|||
* Makes a query from a raw sql
|
||||
* @param {String} query - The raw SQL query
|
||||
* @param {Object} params - Parameterized values
|
||||
* @param {Object} connection - Optional pool connection
|
||||
*
|
||||
* @return {Object} - Result promise
|
||||
*/
|
||||
rawSql: db.rawSql,
|
||||
rawSql: (query, params, connection) =>
|
||||
db.rawSql(query, params, connection),
|
||||
|
||||
/**
|
||||
* Makes a query from a SQL file
|
||||
|
|
@ -32,7 +34,7 @@ const dbHelper = {
|
|||
*
|
||||
* @return {Object} - Result promise
|
||||
*/
|
||||
findOne: db.findOne,
|
||||
findOne: (query, params) => db.findOne(query, params),
|
||||
|
||||
/**
|
||||
* Returns the first row from a given SQL file
|
||||
|
|
@ -53,7 +55,7 @@ const dbHelper = {
|
|||
*
|
||||
* @return {Object} - Result promise
|
||||
*/
|
||||
findValue: db.findValue,
|
||||
findValue: (query, params) => db.findValue(query, params),
|
||||
|
||||
/**
|
||||
* Returns the first property from a given SQL file
|
||||
|
|
@ -66,7 +68,18 @@ const dbHelper = {
|
|||
return this.findOneFromDef(queryName, params).then(row => {
|
||||
return Object.values(row)[0];
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Returns the content of an SQL file
|
||||
* @param {String} queryName - The SQL file name
|
||||
*
|
||||
* @return {Object} - SQL
|
||||
*/
|
||||
getSqlFromDef(queryName) {
|
||||
const absolutePath = path.join(__dirname, '../', this.tplPath, 'sql', queryName);
|
||||
return db.getSqlFromDef(absolutePath);
|
||||
},
|
||||
},
|
||||
props: ['tplPath']
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</div>
|
||||
<!-- Block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block vn-pa-lg">
|
||||
<div class="grid-block vn-pa-ml">
|
||||
<h1>{{ $t('title') }}</h1>
|
||||
<p>{{$t('dear')}},</p>
|
||||
<p v-html="$t('description', [dated])"></p>
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
</div>
|
||||
<!-- Block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block vn-pa-lg">
|
||||
<div class="grid-block vn-pa-ml">
|
||||
<table class="column-oriented">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</div>
|
||||
<!-- Block -->
|
||||
<div class="grid-row">
|
||||
<div class="grid-block vn-pa-lg">
|
||||
<div class="grid-block vn-pa-ml">
|
||||
<h1>{{ $t('title') }}</h1>
|
||||
<p>{{$t('dear')}},</p>
|
||||
<p v-html="$t('description', [minDate, maxDate])"></p>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue