verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1972-buyer_week_waste

This commit is contained in:
Joan Sanchez 2020-01-09 07:52:35 +01:00
parent 6c9def9c6c a979a17482
commit a702d14fa9
28 changed files with 283 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -34,5 +34,5 @@ COPY \
CMD ["pm2-runtime", "./back/process.yml"] CMD ["pm2-runtime", "./back/process.yml"]
HEALTHCHECK --interval=1m --timeout=10s \ HEALTHCHECK --interval=15s --timeout=10s \
CMD curl -f http://localhost:3000/api/Applications/status || exit 1 CMD curl -f http://localhost:3000/api/Applications/status || exit 1

31
Jenkinsfile vendored
View File

@ -7,19 +7,12 @@ pipeline {
} }
environment { environment {
PROJECT_NAME = 'salix' PROJECT_NAME = 'salix'
REGISTRY = 'registry.verdnatura.es' STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
PORT_MASTER_FRONT = '5002'
PORT_MASTER_BACK = '3001'
PORT_TEST_FRONT = '5001'
PORT_TEST_BACK = '4001'
TAG = "${env.BRANCH_NAME}"
} }
stages { stages {
stage('Checkout') { stage('Checkout') {
steps { steps {
script { script {
env.STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
if (!env.GIT_COMMITTER_EMAIL) { if (!env.GIT_COMMITTER_EMAIL) {
env.COMMITTER_EMAIL = sh( env.COMMITTER_EMAIL = sh(
script: 'git --no-pager show -s --format="%ae"', script: 'git --no-pager show -s --format="%ae"',
@ -29,16 +22,6 @@ pipeline {
env.COMMITTER_EMAIL = env.GIT_COMMITTER_EMAIL; env.COMMITTER_EMAIL = env.GIT_COMMITTER_EMAIL;
} }
switch (env.BRANCH_NAME) {
case 'master':
env.PORT_FRONT = PORT_MASTER_FRONT
env.PORT_BACK = PORT_MASTER_BACK
break
case 'test':
env.PORT_FRONT = PORT_TEST_FRONT
env.PORT_BACK = PORT_TEST_BACK
break
}
switch (env.BRANCH_NAME) { switch (env.BRANCH_NAME) {
case 'master': case 'master':
env.NODE_ENV = 'production' env.NODE_ENV = 'production'
@ -48,6 +31,14 @@ pipeline {
break break
} }
} }
configFileProvider([
configFile(fileId: "salix.groovy",
variable: 'GROOVY_FILE')
]) {
load env.GROOVY_FILE
}
sh 'printenv' sh 'printenv'
} }
} }
@ -57,8 +48,8 @@ pipeline {
} }
steps { steps {
nodejs('node-lts') { nodejs('node-lts') {
sh 'npm install --no-audit' sh 'npm install --no-audit --prefer-offline'
sh 'gulp install' sh 'gulp install --ci'
} }
} }
} }

3
back/process.yml
View File

@ -2,4 +2,5 @@ apps:
- script: ./loopback/server/server.js - script: ./loopback/server/server.js
name: salix-back name: salix-back
instances: 1 instances: 1
max_restarts: 5 max_restarts: 3
restart_delay: 15000

54
db/dump/fixtures.sql
View File

@ -53,20 +53,20 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
VALUES VALUES
(1, 978, 1, 0, 2000, 9, 0); (1, 978, 1, 0, 2000, 9, 0);
INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`,`lang`) INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`)
VALUES VALUES
(101, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com', 'es'), (101, 'BruceWayne', 'Bruce Wayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com', 'es'),
(102, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com', 'en'), (102, 'PetterParker', 'Petter Parker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com', 'en'),
(103, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com', 'fr'), (103, 'ClarkKent', 'Clark Kent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com', 'fr'),
(104, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@mydomain.com', 'es'), (104, 'TonyStark', 'Tony Stark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@mydomain.com', 'es'),
(105, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt'), (105, 'MaxEisenhardt', 'Max Eisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt'),
(106, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@mydomain.com', 'es'), (106, 'DavidCharlesHaller', 'David Charles Haller', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@mydomain.com', 'es'),
(107, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@mydomain.com', 'es'), (107, 'HankPym', 'Hank Pym', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@mydomain.com', 'es'),
(108, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'CharlesXavier@mydomain.com', 'es'), (108, 'CharlesXavier', 'Charles Xavier', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'CharlesXavier@mydomain.com', 'es'),
(109, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@mydomain.com', 'es'), (109, 'BruceBanner', 'Bruce Banner', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@mydomain.com', 'es'),
(110, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'JessicaJones@mydomain.com', 'es'), (110, 'JessicaJones', 'Jessica Jones', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'JessicaJones@mydomain.com', 'es'),
(111, 'Missing', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'), (111, 'Missing', 'Missing', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'),
(112, 'Trash', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'); (112, 'Trash', 'Trash', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es');
INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`) INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`)
VALUES VALUES
@ -1586,20 +1586,20 @@ INSERT INTO `postgresql`.`calendar_state` (`calendar_state_id`, `type`, `rgb`, `
INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`) INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`)
VALUES VALUES
(106, 1, DATE_ADD(CURDATE(), INTERVAL 10 DAY)), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL 10 DAY))),
(106, 1, DATE_ADD(CURDATE(), INTERVAL 11 DAY)), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -11 DAY), DATE_ADD(CURDATE(), INTERVAL 11 DAY))),
(106, 1, DATE_ADD(CURDATE(), INTERVAL 12 DAY)), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -12 DAY), DATE_ADD(CURDATE(), INTERVAL 12 DAY))),
(106, 1, DATE_ADD(CURDATE(), INTERVAL 20 DAY)), (106, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -20 DAY), DATE_ADD(CURDATE(), INTERVAL 20 DAY))),
(106, 2, DATE_ADD(CURDATE(), INTERVAL -10 DAY)), (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 13 DAY))),
(106, 1, DATE_ADD(CURDATE(), INTERVAL -12 DAY)), (106, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 14 DAY))),
(106, 2, DATE_ADD(CURDATE(), INTERVAL -20 DAY)), (106, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 15 DAY))),
(107, 1, DATE_ADD(CURDATE(), INTERVAL 15 DAY)), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL 10 DAY))),
(107, 1, DATE_ADD(CURDATE(), INTERVAL 16 DAY)), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -11 DAY), DATE_ADD(CURDATE(), INTERVAL 11 DAY))),
(107, 1, DATE_ADD(CURDATE(), INTERVAL 20 DAY)), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -12 DAY), DATE_ADD(CURDATE(), INTERVAL 12 DAY))),
(107, 1, DATE_ADD(CURDATE(), INTERVAL 30 DAY)), (107, 1, IF(MONTH(CURDATE()) = 12 AND DAY(CURDATE()) > 10, DATE_ADD(CURDATE(), INTERVAL -20 DAY), DATE_ADD(CURDATE(), INTERVAL 20 DAY))),
(107, 2, DATE_ADD(CURDATE(), INTERVAL -10 DAY)), (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -13 DAY), DATE_ADD(CURDATE(), INTERVAL 13 DAY))),
(107, 1, DATE_ADD(CURDATE(), INTERVAL -12 DAY)), (107, 1, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -14 DAY), DATE_ADD(CURDATE(), INTERVAL 14 DAY))),
(107, 2, DATE_ADD(CURDATE(), INTERVAL -20 DAY)); (107, 2, IF(MONTH(CURDATE()) >= 1 AND DAY(CURDATE()) > 20, DATE_ADD(CURDATE(), INTERVAL -15 DAY), DATE_ADD(CURDATE(), INTERVAL 15 DAY)));
INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`) INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`)
VALUES VALUES

37
docker-compose.yml
View File

@ -1,28 +1,45 @@
version: '3.5' version: '3.7'
services: services:
front: front:
image: registry.verdnatura.es/salix-front:${TAG} image: registry.verdnatura.es/salix-front:${BRANCH_NAME:?}
restart: unless-stopped
build: build:
context: . context: .
dockerfile: front/Dockerfile dockerfile: front/Dockerfile
ports: ports:
- ${PORT_FRONT}:80 - ${FRONT_PORT:?}:80
links:
- back
deploy: deploy:
replicas: 3 replicas: 3
back: back:
image: registry.verdnatura.es/salix-back:${TAG} image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
restart: unless-stopped
build: . build: .
ports: ports:
- ${PORT_BACK}:3000 - ${BACK_PORT:?}:3000
environment: environment:
- NODE_ENV - NODE_ENV
configs:
- source: datasources
target: /etc/salix/datasources.json
- source: datasources_local
target: /etc/salix/datasources.local.json
- source: print
target: /etc/salix/print.json
- source: print_local
target: /etc/salix/print.local.json
volumes: volumes:
- /mnt/storage/containers/salix:/etc/salix
- /mnt/storage/pdfs:/var/lib/salix/pdfs - /mnt/storage/pdfs:/var/lib/salix/pdfs
- /mnt/storage/dms:/var/lib/salix/dms - /mnt/storage/dms:/var/lib/salix/dms
deploy: deploy:
replicas: 6 replicas: 6
configs:
datasources:
external: true
name: salix_datasources
datasources_local:
external: true
name: salix-${BRANCH_NAME:?}_datasources
print:
external: true
name: salix_print
print_local:
external: true
name: salix-${BRANCH_NAME:?}_print

2
e2e/helpers/selectors.js
View File

@ -162,7 +162,7 @@ export default {
}, },
clientBalance: { clientBalance: {
balanceButton: 'vn-left-menu a[ui-sref="client.card.balance.index"]', balanceButton: 'vn-left-menu a[ui-sref="client.card.balance.index"]',
companyAutocomplete: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyFk"]', companyAutocomplete: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
newPaymentButton: `vn-float-button`, newPaymentButton: `vn-float-button`,
newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]', newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
newPaymentAmountInput: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"] input', newPaymentAmountInput: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"] input',

2
e2e/paths/08-route-module/02_basic_data.spec.js
View File

@ -34,7 +34,7 @@ describe('Route basic Data path', () => {
.waitToGetProperty(`${selectors.routeBasicData.workerAutoComplete} input`, 'value'); .waitToGetProperty(`${selectors.routeBasicData.workerAutoComplete} input`, 'value');
expect(worker).toEqual('adminBossNick'); expect(worker).toEqual('adminBoss - adminBossNick');
}); });
it('should confirm the vehicle was edited', async() => { it('should confirm the vehicle was edited', async() => {

1
front/core/components/data-viewer/locale/es.yml Normal file
View File

@ -0,0 +1 @@
No service for the specified zone: No hay servicio para la zona especificada

33
gulpfile.js
View File

@ -101,6 +101,7 @@ async function backTestOnce() {
gulp.src(backSpecFiles) gulp.src(backSpecFiles)
.pipe(jasmine(options)) .pipe(jasmine(options))
.on('end', resolve) .on('end', resolve)
.on('error', reject)
.resume(); .resume();
}); });
@ -110,27 +111,33 @@ backTestOnce.description = `Runs the backend tests once, can receive --junit arg
async function backTestDockerOnce() { async function backTestDockerOnce() {
let containerId = await docker(); let containerId = await docker();
let err;
try { try {
await backTestOnce(); await backTestOnce();
} catch (e) { } catch (e) {
throw e; err = e;
} finally { }
if (argv['random']) if (argv['random'])
await execP(`docker rm -fv ${containerId}`); await execP(`docker rm -fv ${containerId}`);
} if (err) throw err;
} }
backTestDockerOnce.description = `Runs backend tests using in site container once`; backTestDockerOnce.description = `Runs backend tests using in site container once`;
async function backTestDocker() { async function backTestDocker() {
let containerId = await docker(); let containerId = await docker();
let err;
try { try {
await backTest(); await backTest();
} catch (e) { } catch (e) {
throw e; err = e;
} finally { }
if (argv['random']) if (argv['random'])
await execP(`docker rm -fv ${containerId}`); await execP(`docker rm -fv ${containerId}`);
} if (err) throw err;
} }
backTestDocker.description = `Runs backend tests restoring fixtures first`; backTestDocker.description = `Runs backend tests restoring fixtures first`;
@ -240,14 +247,15 @@ function install() {
const install = require('gulp-install'); const install = require('gulp-install');
const print = require('gulp-print'); const print = require('gulp-print');
let npmArgs = [];
if (argv.ci) npmArgs = ['--no-audit', '--prefer-offline'];
let packageFiles = ['front/package.json', 'print/package.json']; let packageFiles = ['front/package.json', 'print/package.json'];
return gulp.src(packageFiles) return gulp.src(packageFiles)
.pipe(print(filepath => { .pipe(print(filepath => {
return `Installing packages in ${filepath}`; return `Installing packages in ${filepath}`;
})) }))
.pipe(install({ .pipe(install({npm: npmArgs}));
npm: ['--no-package-lock']
}));
} }
install.description = `Installs node dependencies in all directories`; install.description = `Installs node dependencies in all directories`;
@ -429,6 +437,7 @@ async function docker() {
let result = await execP(`docker run --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`); let result = await execP(`docker run --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
containerId = result.stdout; containerId = result.stdout;
try {
if (argv['random']) { if (argv['random']) {
let inspect = await execP(`docker inspect -f "{{json .NetworkSettings}}" ${containerId}`); let inspect = await execP(`docker inspect -f "{{json .NetworkSettings}}" ${containerId}`);
let netSettings = JSON.parse(inspect.stdout); let netSettings = JSON.parse(inspect.stdout);
@ -438,6 +447,12 @@ async function docker() {
} }
if (runChown) await dockerWait(); if (runChown) await dockerWait();
} catch (err) {
if (argv['random'])
await execP(`docker rm -fv ${containerId}`);
throw err;
}
return containerId; return containerId;
} }
docker.description = `Builds the database image and runs a container`; docker.description = `Builds the database image and runs a container`;

2
loopback/server/datasources.json
View File

@ -14,7 +14,7 @@
"multipleStatements": true, "multipleStatements": true,
"legacyUtcDateProcessing": false, "legacyUtcDateProcessing": false,
"timezone": "local", "timezone": "local",
"connectTimeout": 20000, "connectTimeout": 40000,
"acquireTimeout": 20000 "acquireTimeout": 20000
}, },
"storage": { "storage": {

2
modules/agency/back/methods/zone/getEvents.js
View File

@ -9,7 +9,7 @@ module.exports = Self => {
description: 'The province id', description: 'The province id',
required: true required: true
}, { }, {
arg: 'search', arg: 'postCode',
type: 'String', type: 'String',
description: 'The postcode' description: 'The postcode'
}, { }, {

8
modules/agency/front/delivery-days/index.js
View File

@ -8,8 +8,14 @@ class Controller extends Section {
} }
onSubmit() { onSubmit() {
this.$.data = null;
this.$http.get(`Zones/getEvents`, {params: this.$.params}) this.$http.get(`Zones/getEvents`, {params: this.$.params})
.then(res => this.$.data = res.data); .then(res => {
let data = res.data;
this.$.data = data;
if (!data.events.length)
this.vnApp.showMessage(this.$t('No service for the specified zone'));
});
} }
} }

8
modules/agency/front/events/index.html
View File

@ -160,12 +160,12 @@
response="cancel" response="cancel"
translate-attr="{value: 'Cancel'}"> translate-attr="{value: 'Cancel'}">
</input> </input>
<button <input
type="button"
ng-if="!$ctrl.isNew" ng-if="!$ctrl.isNew"
response="delete" response="delete"
translate> translate-attr="{value: 'Delete'}">
Delete </input>
</button>
<button response="accept"> <button response="accept">
<span ng-if="$ctrl.isNew" translate>Add</span> <span ng-if="$ctrl.isNew" translate>Add</span>
<span ng-if="!$ctrl.isNew" translate>Save</span> <span ng-if="!$ctrl.isNew" translate>Save</span>

4
modules/claim/front/detail/index.html
View File

@ -54,8 +54,8 @@
</vn-td> </vn-td>
<vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td> <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
<vn-td number> <vn-td number>
<span class="link" <span ng-class="{'link': $ctrl.isEditable}"
vn-tooltip="Edit discount" title="{{$ctrl.isEditable ? 'Edit discount' : ''}}"
ng-click="$ctrl.showEditPopover($event, saleClaimed)"> ng-click="$ctrl.showEditPopover($event, saleClaimed)">
{{saleClaimed.sale.discount}} % {{saleClaimed.sale.discount}} %
</span> </span>

15
modules/claim/front/detail/index.js
View File

@ -29,8 +29,10 @@ class Controller {
set salesClaimed(value) { set salesClaimed(value) {
this._salesClaimed = value; this._salesClaimed = value;
if (value) if (value) {
this.calculateTotals(); this.calculateTotals();
this.isClaimEditable();
}
} }
get salesClaimed() { get salesClaimed() {
@ -119,14 +121,15 @@ class Controller {
} }
showEditPopover(event, saleClaimed) { showEditPopover(event, saleClaimed) {
this.saleClaimed = saleClaimed; if (this.isEditable) {
if (!this.aclService.hasAny(['salesAssistant'])) if (!this.aclService.hasAny(['salesAssistant']))
return this.vnApp.showError(this.$translate.instant('Insuficient permisos')); return this.vnApp.showError(this.$translate.instant('Insuficient permisos'));
this.saleClaimed = saleClaimed;
this.$.editPopover.parent = event.target; this.$.editPopover.parent = event.target;
this.$.editPopover.show(); this.$.editPopover.show();
} }
}
getSalespersonMana() { getSalespersonMana() {
this.$http.get(`Tickets/${this.claim.ticketFk}/getSalesPersonMana`).then(res => { this.$http.get(`Tickets/${this.claim.ticketFk}/getSalesPersonMana`).then(res => {
@ -134,6 +137,12 @@ class Controller {
}); });
} }
isClaimEditable() {
this.$http.get(`Tickets/${this.claim.ticketFk}/isEditable`).then(res => {
this.isEditable = res.data;
});
}
updateDiscount() { updateDiscount() {
const claimedSale = this.saleClaimed.sale; const claimedSale = this.saleClaimed.sale;
if (this.newDiscount != claimedSale.discount) { if (this.newDiscount != claimedSale.discount) {

15
modules/claim/front/detail/index.spec.js
View File

@ -17,13 +17,14 @@ describe('claim', () => {
show: () => {} show: () => {}
}; };
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpBackend.when('GET', 'Claims/ClaimBeginnings').respond({}); $httpBackend.whenGET('Claims/ClaimBeginnings').respond({});
$httpBackend.whenGET(`Tickets/1/isEditable`).respond(true);
$state = _$state_; $state = _$state_;
aclService = {hasAny: () => true}; aclService = {hasAny: () => true};
controller = $componentController('vnClaimDetail', {$state, aclService, $scope}); controller = $componentController('vnClaimDetail', {$state, aclService, $scope});
controller.claim = {ticketFk: 1};
controller.salesToClaim = [{saleFk: 1}, {saleFk: 2}]; controller.salesToClaim = [{saleFk: 1}, {saleFk: 2}];
controller.salesClaimed = [{id: 1, sale: {}}]; controller.salesClaimed = [{id: 1, sale: {}}];
controller.claim = {ticketFk: 1};
controller.$.model = crudModel; controller.$.model = crudModel;
controller.$.addSales = { controller.$.addSales = {
hide: () => {}, hide: () => {},
@ -36,7 +37,6 @@ describe('claim', () => {
describe('openAddSalesDialog()', () => { describe('openAddSalesDialog()', () => {
it('should call getClaimableFromTicket and $.addSales.show', () => { it('should call getClaimableFromTicket and $.addSales.show', () => {
controller.$ = {addSales: {show: () => {}}};
spyOn(controller, 'getClaimableFromTicket'); spyOn(controller, 'getClaimableFromTicket');
spyOn(controller.$.addSales, 'show'); spyOn(controller.$.addSales, 'show');
controller.openAddSalesDialog(); controller.openAddSalesDialog();
@ -146,5 +146,14 @@ describe('claim', () => {
expect(controller.$.descriptor.show).toHaveBeenCalledWith(); expect(controller.$.descriptor.show).toHaveBeenCalledWith();
}); });
}); });
describe('isClaimEditable()', () => {
it('should check if the claim is editable', () => {
controller.isClaimEditable();
$httpBackend.flush();
expect(controller.isEditable).toBeTruthy();
});
});
}); });
}); });

4
modules/client/back/methods/receipt/filter.js
View File

@ -11,12 +11,12 @@ module.exports = Self => {
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
http: {source: 'query'} http: {source: 'query'}
}, { }, {
arg: 'clientFk', arg: 'clientId',
type: 'Number', type: 'Number',
description: 'The client id', description: 'The client id',
required: true, required: true,
}, { }, {
arg: 'companyFk', arg: 'companyId',
type: 'Number', type: 'Number',
description: 'The company id', description: 'The company id',
required: true, required: true,

2
modules/client/front/balance/index/index.html
View File

@ -19,7 +19,7 @@
<vn-autocomplete <vn-autocomplete
vn-id="company" vn-id="company"
class="dense" class="dense"
ng-model="$ctrl.companyFk" ng-model="$ctrl.companyId"
url="Companies" url="Companies"
show-field="code" show-field="code"
value-field="id" value-field="id"

25
modules/client/front/balance/index/index.js
View File

@ -20,27 +20,27 @@ class Controller {
}; };
} }
get companyFk() { get companyId() {
if (!this._companyFk) if (!this._companyId)
this.companyFk = this.vnConfig.companyFk; this.companyId = this.vnConfig.companyFk;
return this._companyFk; return this._companyId;
} }
set companyFk(id) { set companyId(value) {
this._companyFk = id; this._companyId = value;
if (id) this.getData(); if (value) this.getData();
} }
getData() { getData() {
return this.$.model.applyFilter(null, { return this.$.model.applyFilter(null, {
clientFk: this.$stateParams.id, clientId: this.$stateParams.id,
companyFk: this.companyFk companyId: this.companyId
}).then(() => this.$.riskModel.applyFilter({ }).then(() => this.$.riskModel.applyFilter({
where: { where: {
clientFk: this.$stateParams.id, clientFk: this.$stateParams.id,
companyFk: this.companyFk companyFk: this.companyId
} }
})).then(() => this.getBalances()); })).then(() => this.getBalances());
} }
@ -48,7 +48,7 @@ class Controller {
getCurrentBalance() { getCurrentBalance() {
const clientRisks = this.$.riskModel.data; const clientRisks = this.$.riskModel.data;
const selectedCompany = this.companyFk; const selectedCompany = this.companyId;
const currentBalance = clientRisks.find(balance => { const currentBalance = clientRisks.find(balance => {
return balance.companyFk === selectedCompany; return balance.companyFk === selectedCompany;
}); });
@ -63,7 +63,6 @@ class Controller {
balance.balance = this.getCurrentBalance(); balance.balance = this.getCurrentBalance();
if (index > 0) { if (index > 0) {
let previousBalance = balances[index - 1]; let previousBalance = balances[index - 1];
balance.balance = previousBalance.balance - (previousBalance.debit - previousBalance.credit); balance.balance = previousBalance.balance - (previousBalance.debit - previousBalance.credit);
} }
}); });
@ -71,7 +70,7 @@ class Controller {
openCreateDialog() { openCreateDialog() {
this.$.balanceCreateDialog.companyFk = this.companyFk; this.$.balanceCreateDialog.companyFk = this.companyId;
this.$.balanceCreateDialog.onResponse = () => this.getData(); this.$.balanceCreateDialog.onResponse = () => this.getData();
this.$.balanceCreateDialog.show(); this.$.balanceCreateDialog.show();
} }

77
modules/client/front/balance/index/index.spec.js
View File

@ -11,24 +11,91 @@ describe('Client', () => {
$componentController = _$componentController_; $componentController = _$componentController_;
let $scope = $rootScope.$new(); let $scope = $rootScope.$new();
controller = $componentController('vnClientBalanceIndex', {$scope}); controller = $componentController('vnClientBalanceIndex', {$scope});
controller._companyFk = 442;
controller.$stateParams.id = 101;
controller.$.model = {applyFilter: () => {}}; controller.$.model = {applyFilter: () => {}};
controller.$.riskModel = {applyFilter: () => {}}; controller.$.riskModel = {
applyFilter: () => {},
data:
[{
clientFk: 101,
companyFk: 442,
amount: 713.24,
company: {
id: 442,
code: 'VNL'
}
}]
};
})); }));
describe('getData()', () => { describe('getData()', () => {
it('should apply the filters on he models and get the client balance', () => { it('should apply the filters on he models and get the client balance', () => {
controller._companyId = 442;
controller.$stateParams.id = 101;
spyOn(controller, 'getBalances'); spyOn(controller, 'getBalances');
spyOn(controller.$.model, 'applyFilter').and.returnValue(Promise.resolve()); spyOn(controller.$.model, 'applyFilter').and.returnValue(Promise.resolve());
spyOn(controller.$.riskModel, 'applyFilter').and.returnValue(Promise.resolve()); spyOn(controller.$.riskModel, 'applyFilter').and.returnValue(Promise.resolve());
controller.getData().then(() => { controller.getData().then(() => {
expect(controller.$.model.applyFilter).toHaveBeenCalledWith(null, {'clientFk': 101, 'companyFk': 442}); expect(controller.$.model.applyFilter).toHaveBeenCalledWith(null, {'clientId': 101, 'companyId': 442});
expect(controller.$.riskModel.applyFilter).toHaveBeenCalledWith({'where': {'clientFk': 101, 'companyFk': 442}}); expect(controller.$.riskModel.applyFilter).toHaveBeenCalledWith({'where': {'clientFk': 101, 'companyFk': 442}});
expect(controller.getBalances).toHaveBeenCalledWith(); expect(controller.getBalances).toHaveBeenCalledWith();
}); });
}); });
}); });
describe('company setter/getter', () => {
it('should return the company', () => {
controller.companyId = null;
expect(controller._companyId).toEqual(jasmine.any(Object));
});
it('should return the company and then call getData()', () => {
spyOn(controller, 'getData');
controller.companyId = 442;
expect(controller._companyId).toEqual(442);
expect(controller.getData).toHaveBeenCalledWith();
});
});
describe('getCurrentBalance()', () => {
it('should return the client balance amount', () => {
controller._companyId = 442;
let result = controller.getCurrentBalance();
expect(result).toEqual(713.24);
});
});
describe('getBalances()', () => {
it('should return the total client balance amount', () => {
spyOn(controller, 'getCurrentBalance').and.callThrough();
controller._companyId = 442;
controller.$.model = {data:
[{
id: 1,
debit: 1000,
credit: null
},
{
id: 2,
debit: null,
credit: 500
},
{
id: 3,
debit: null,
credit: 300
}
]};
controller.getBalances();
const expectedBalances = controller.$.model.data;
expect(expectedBalances[0].balance).toEqual(713.24);
expect(expectedBalances[1].balance).toEqual(-286.76);
expect(expectedBalances[2].balance).toEqual(213.24);
});
});
}); });
}); });

19
modules/client/front/web-access/index.spec.js
View File

@ -29,13 +29,24 @@ describe('Component VnClientWebAccess', () => {
}); });
describe('isCustomer()', () => { describe('isCustomer()', () => {
it(`should perform a query if client is defined with an ID`, () => { it('should return a true if the password can be modified', () => {
controller.client = {id: '1234'}; controller.client = {id: '1234'};
controller.isCustomer();
$httpBackend.when('GET', `Clients/${controller.client.id}/hasCustomerRole`).respond('ok'); $httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`).respond({isCustomer: true});
$httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`); controller.isCustomer();
$httpBackend.flush(); $httpBackend.flush();
expect(controller.canChangePassword).toBeTruthy();
});
it(`should return a false if the password can't be modified`, () => {
controller.client = {id: '1234'};
$httpBackend.expectGET(`Clients/${controller.client.id}/hasCustomerRole`).respond({isCustomer: false});
controller.isCustomer();
$httpBackend.flush();
expect(controller.canChangePassword).toBeFalsy();
}); });
}); });

2
modules/invoiceOut/front/descriptor/index.js
View File

@ -53,7 +53,7 @@ class Controller {
} }
showInvoiceOutPdf() { showInvoiceOutPdf() {
let url = `InvoiceOuts/${this.invoiceOut.id}/download?access_token=${this.accessToken}`; let url = `api/InvoiceOuts/${this.invoiceOut.id}/download?access_token=${this.accessToken}`;
window.open(url, '_blank'); window.open(url, '_blank');
} }

2
modules/invoiceOut/front/index/index.js
View File

@ -27,7 +27,7 @@ export default class Controller {
} }
openPdf(id, event) { openPdf(id, event) {
let url = `InvoiceOuts/${id}/download?access_token=${this.accessToken}`; let url = `api/InvoiceOuts/${id}/download?access_token=${this.accessToken}`;
window.open(url, '_blank'); window.open(url, '_blank');
event.preventDefault(); event.preventDefault();
event.stopImmediatePropagation(); event.stopImmediatePropagation();

3
modules/route/front/basic-data/index.html
View File

@ -17,6 +17,9 @@
value-field="id" value-field="id"
where="{role: 'employee'}" where="{role: 'employee'}"
label="Worker"> label="Worker">
<tpl-item>
<div>{{name}} - {{nickname}}</div>
</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
vn-one vn-one

15
modules/worker/back/methods/worker-calendar/specs/absences.spec.js
View File

@ -1,7 +1,6 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
// #1924 - Fix hours describe('Worker absences()', () => {
xdescribe('Worker absences()', () => {
it('should get the absence calendar for a full year contract', async() => { it('should get the absence calendar for a full year contract', async() => {
let ctx = {req: {accessToken: {userId: 106}}}; let ctx = {req: {accessToken: {userId: 106}}};
let workerFk = 106; let workerFk = 106;
@ -27,8 +26,8 @@ xdescribe('Worker absences()', () => {
let firstType = absences[0].absenceType().name; let firstType = absences[0].absenceType().name;
let sixthType = absences[5].absenceType().name; let sixthType = absences[5].absenceType().name;
expect(firstType).toEqual('Leave of absence'); expect(firstType).toMatch(/(Holidays|Leave of absence)/);
expect(sixthType).toEqual('Holidays'); expect(sixthType).toMatch(/(Holidays|Leave of absence)/);
}); });
it('should get the absence calendar for a permanent contract', async() => { it('should get the absence calendar for a permanent contract', async() => {
@ -64,8 +63,8 @@ xdescribe('Worker absences()', () => {
let firstType = absences[0].absenceType().name; let firstType = absences[0].absenceType().name;
let sixthType = absences[5].absenceType().name; let sixthType = absences[5].absenceType().name;
expect(firstType).toEqual('Leave of absence'); expect(firstType).toMatch(/(Holidays|Leave of absence)/);
expect(sixthType).toEqual('Holidays'); expect(sixthType).toMatch(/(Holidays|Leave of absence)/);
// restores the contract end date // restores the contract end date
await app.models.WorkerLabour.rawSql( await app.models.WorkerLabour.rawSql(
@ -146,8 +145,8 @@ xdescribe('Worker absences()', () => {
let firstType = absences[0].absenceType().name; let firstType = absences[0].absenceType().name;
let sixthType = absences[5].absenceType().name; let sixthType = absences[5].absenceType().name;
expect(firstType).toEqual('Leave of absence'); expect(firstType).toMatch(/(Holidays|Leave of absence)/);
expect(sixthType).toEqual('Holidays'); expect(sixthType).toMatch(/(Holidays|Leave of absence)/);
// resets the holidays per year with originalHolidaysValue and the contract starting date // resets the holidays per year with originalHolidaysValue and the contract starting date
await app.models.WorkCenterHoliday.updateAll( await app.models.WorkCenterHoliday.updateAll(

2
modules/worker/front/log/style.scss
View File

@ -19,7 +19,7 @@ vn-log {
} }
@media screen and (max-width: 1570px) { @media screen and (max-width: 1570px) {
.expendable { vn-table .expendable {
display: none; display: none;
} }
.changes { .changes {

2
print/core/config.js
View File

@ -4,8 +4,10 @@ let env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
let configPath = `/etc/salix`; let configPath = `/etc/salix`;
let config = require('../config/print.json'); let config = require('../config/print.json');
let configFiles = [ let configFiles = [
`${appPath}/config/print.local.json`,
`${appPath}/config/print.${env}.json`, `${appPath}/config/print.${env}.json`,
`${configPath}/print.json`, `${configPath}/print.json`,
`${configPath}/print.local.json`,
`${configPath}/print.${env}.json` `${configPath}/print.${env}.json`
]; ];

2
print/templates/reports/claim-pickup-order/locale/es.yml
View File

@ -12,4 +12,4 @@ claim: Reclamación {0}
sections: sections:
agency: agency:
description: 'Para agilizar tu recogida, por favor, pónte en contacto con la oficina description: 'Para agilizar tu recogida, por favor, pónte en contacto con la oficina
de integrados. <br/> Tlf: 96 166 77 88 - Ana Gómez (Ext. 2133) <em>(agomezf@integra2.es)</em>' de integrados. <br/> Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) <em>(agomezf@integra2.es)</em>'