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

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

This commit is contained in:
Carlos Jimenez Ruiz 2019-06-14 12:27:54 +02:00
parent b8a4861f01 5203c33483
commit fcc0ad6098
72 changed files with 2012 additions and 1571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
back/methods/dms/uploadFile.js
View File

@ -5,40 +5,36 @@ module.exports = Self => {
Self.remoteMethodCtx('uploadFile', {
description: 'Uploads a file and inserts into dms model',
accessType: 'WRITE',
accepts: [{
accepts: [
{
arg: 'options',
type: 'object'
},
{
}, {
arg: 'warehouseId',
type: 'Number',
description: ''
},
{
}, {
arg: 'companyId',
type: 'Number',
description: ''
},
{
}, {
arg: 'dmsTypeId',
type: 'Number',
description: ''
},
{
}, {
arg: 'reference',
type: 'String',
description: ''
},
{
}, {
arg: 'description',
type: 'String',
description: ''
},
{
}, {
arg: 'hasFile',
type: 'Boolean',
description: ''
}],
}
],
returns: {
type: 'Object',
root: true
@ -49,17 +45,24 @@ module.exports = Self => {
}
});
Self.uploadFile = async(ctx, options = {}) => {
Self.uploadFile = async(ctx, options) => {
const models = Self.app.models;
const storageConnector = Self.app.dataSources.storage.connector;
const myUserId = ctx.req.accessToken.userId;
const myWorker = await models.Worker.findOne({where: {userFk: myUserId}});
const args = ctx.args;
const fileOptions = {};
const hasParentTransaction = options && options.transaction;
if (!options.transaction)
options.transaction = await Self.beginTransaction({});
let tx;
let myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
const hasWriteRole = await models.DmsType.hasWriteRole(ctx, args.dmsTypeId);
@ -83,11 +86,11 @@ module.exports = Self => {
reference: args.reference,
description: args.description,
hasFile: args.hasFile
}, options).then(newDms => {
}, myOptions).then(newDms => {
const extension = storageConnector.getFileExtension(file.name);
const fileName = `${newDms.id}.${extension}`;
return newDms.updateAttribute('file', fileName, options);
return newDms.updateAttribute('file', fileName, myOptions);
}).then(dms => {
return models.Container.getContainer('temp').then(container => {
const originPath = `${container.client.root}/${container.name}/${file.name}`;
@ -104,14 +107,10 @@ module.exports = Self => {
const resolvedPromise = await Promise.all(promises);
if (!hasParentTransaction)
await options.transaction.commit();
if (tx) await tx.commit();
return resolvedPromise;
} catch (e) {
if (!hasParentTransaction)
await options.transaction.rollback();
if (tx) await tx.rollback();
throw e;
}
};

10
back/model-config.json
View File

@ -11,6 +11,9 @@
"Company": {
"dataSource": "vn"
},
"Container": {
"dataSource": "storage"
},
"Delivery": {
"dataSource": "vn"
},
@ -44,8 +47,11 @@
"DmsType": {
"dataSource": "vn"
},
"Container": {
"dataSource": "storage"
"Town": {
"dataSource": "vn"
},
"Postcode": {
"dataSource": "vn"
}
}

50
back/models/postcode.json Normal file
View File

@ -0,0 +1,50 @@
{
"name": "Postcode",
"base": "VnModel",
"options": {
"mysql": {
"table": "postCode"
}
},
"properties": {
"code": {
"id": true,
"type": "String"
}
},
"relations": {
"town": {
"type": "belongsTo",
"model": "Town",
"foreignKey": "townFk"
},
"geo": {
"type": "belongsTo",
"model": "ZoneGeo",
"foreignKey": "geoFk"
}
},
"acls": [{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}],
"scopes": {
"location": {
"include": {
"relation": "town",
"scope": {
"include": {
"relation": "province",
"scope": {
"include": {
"relation": "country"
}
}
}
}
}
}
}
}

56
back/models/town.json Normal file
View File

@ -0,0 +1,56 @@
{
"name": "Town",
"base": "VnModel",
"options": {
"mysql": {
"table": "town"
}
},
"properties": {
"id": {
"id": true,
"type": "Number"
},
"name": {
"type": "String"
}
},
"relations": {
"province": {
"type": "belongsTo",
"model": "Province",
"foreignKey": "provinceFk"
},
"postcodes": {
"type": "hasMany",
"model": "Postcode",
"foreignKey": "townFk"
},
"geo": {
"type": "belongsTo",
"model": "ZoneGeo",
"foreignKey": "geoFk"
}
},
"acls": [{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}],
"scopes": {
"location": {
"include": [{
"relation": "province",
"scope": {
"include": {
"relation": "country"
}
}
},
{
"relation": "postcodes"
}]
}
}
}

2
db/docker-boot.sh
View File

@ -5,7 +5,7 @@ export MYSQL_PWD=root
mysql_import() {
FILE=$1
echo "[INFO] -> Imported $FILE"
mysql -u root --comments -f < "$FILE"
mysql -u root --default-character-set=utf8 --comments -f < "$FILE"
}
mysql_import dump/structure.sql

14
db/dump/fixtures.sql
View File

@ -147,6 +147,20 @@ INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `warehouseFk`, `zoneFk`)
(4, 'Province four', 1, NULL, 2),
(5, 'Province five', 1, NULL, 1);
INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
VALUES
(1, 'Valencia', 1),
(2, 'Silla', 1),
(3, 'Algemesi', 1),
(4, 'Alzira', 1);
INSERT INTO `vn`.`postCode`(`code`, `townFk`)
VALUES
('46000', 1),
('46460', 2),
('46680', 3),
('46600', 4);
INSERT INTO `vn`.`clientType`(`id`, `code`, `type`)
VALUES
(1, 'normal', 'Normal'),

13
e2e/helpers/selectors.js
View File

@ -33,7 +33,10 @@ export default {
taxNumber: `${components.vnTextfield}[name="fi"]`,
socialName: `${components.vnTextfield}[name="socialName"]`,
street: `${components.vnTextfield}[name="street"]`,
city: `${components.vnTextfield}[name="city"]`,
postcode: `vn-autocomplete[field="$ctrl.client.postcode"]`,
city: `vn-autocomplete[field="$ctrl.client.city"]`,
province: `vn-autocomplete[field="$ctrl.client.provinceFk"]`,
country: `vn-autocomplete[field="$ctrl.client.countryFk"]`,
userName: `${components.vnTextfield}[name="userName"]`,
email: `${components.vnTextfield}[name="email"]`,
salesPersonAutocomplete: `vn-autocomplete[field="$ctrl.client.salesPersonFk"]`,
@ -62,8 +65,8 @@ export default {
equalizationTaxCheckbox: 'vn-check[label="Is equalizated"] md-checkbox',
acceptPropagationButton: 'vn-client-fiscal-data > vn-confirm button[response=ACCEPT]',
addressInput: `${components.vnTextfield}[name="street"]`,
cityInput: `${components.vnTextfield}[name="city"]`,
postcodeInput: `${components.vnTextfield}[name="postcode"]`,
postcodeAutocomplete: `vn-autocomplete[field="$ctrl.client.postcode"]`,
cityAutocomplete: `vn-autocomplete[field="$ctrl.client.city"]`,
provinceAutocomplete: 'vn-autocomplete[field="$ctrl.client.provinceFk"]',
countryAutocomplete: 'vn-autocomplete[field="$ctrl.client.countryFk"]',
activeCheckbox: 'vn-check[label="Active"] md-checkbox',
@ -97,8 +100,8 @@ export default {
defaultCheckboxInput: 'vn-check[label="Default"] md-checkbox',
consigneeInput: `${components.vnTextfield}[name="nickname"]`,
streetAddressInput: `${components.vnTextfield}[name="street"]`,
postcodeInput: `${components.vnTextfield}[name="postalCode"]`,
cityInput: `${components.vnTextfield}[name="city"]`,
postcodeAutocomplete: `vn-autocomplete[field="$ctrl.address.postalCode"]`,
cityAutocomplete: `vn-autocomplete[field="$ctrl.address.city"]`,
provinceAutocomplete: 'vn-autocomplete[field="$ctrl.address.provinceFk"]',
agencyAutocomplete: 'vn-autocomplete[field="$ctrl.address.agencyModeFk"]',
phoneInput: `${components.vnTextfield}[name="phone"]`,

17
e2e/paths/02-client-module/01_create_client.spec.js
View File

@ -53,7 +53,7 @@ describe('Client create path', () => {
.write(selectors.createClientView.name, 'Carol Danvers')
.write(selectors.createClientView.socialName, 'AVG tax')
.write(selectors.createClientView.street, 'Many places')
.write(selectors.createClientView.city, 'Silla')
.autocompleteSearch(selectors.createClientView.postcode, '46000')
.clearInput(selectors.createClientView.email)
.write(selectors.createClientView.email, 'incorrect email format')
.waitToClick(selectors.createClientView.createButton)
@ -62,6 +62,21 @@ describe('Client create path', () => {
expect(result).toEqual('Some fields are invalid');
});
it(`should check for autocompleted city, province and country`, async() => {
const clientCity = await nightmare
.waitToGetProperty(`${selectors.createClientView.city} input`, 'value');
const clientProvince = await nightmare
.waitToGetProperty(`${selectors.createClientView.province} input`, 'value');
const clientCountry = await nightmare
.waitToGetProperty(`${selectors.createClientView.country} input`, 'value');
expect(clientCity).toEqual('Valencia');
expect(clientProvince).toEqual('Province one');
expect(clientCountry).toEqual('España');
});
it(`should create a new user with all correct data`, async() => {
const result = await nightmare
.clearInput(selectors.createClientView.email)

28
e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
View File

@ -67,11 +67,7 @@ describe('Client Edit fiscalData path', () => {
.write(selectors.clientFiscalData.fiscalIdInput, 'INVALID!')
.clearInput(selectors.clientFiscalData.addressInput)
.write(selectors.clientFiscalData.addressInput, 'Somewhere edited')
.clearInput(selectors.clientFiscalData.postcodeInput)
.write(selectors.clientFiscalData.postcodeInput, '12345')
.clearInput(selectors.clientFiscalData.cityInput)
.write(selectors.clientFiscalData.cityInput, 'N/A')
.autocompleteSearch(selectors.clientFiscalData.provinceAutocomplete, 'Province two')
.autocompleteSearch(selectors.clientFiscalData.postcodeAutocomplete, '46000')
.waitToClick(selectors.clientFiscalData.activeCheckbox)
.waitToClick(selectors.clientFiscalData.frozenCheckbox)
.waitToClick(selectors.clientFiscalData.hasToInvoiceCheckbox)
@ -197,23 +193,31 @@ describe('Client Edit fiscalData path', () => {
it('should confirm the postcode have been edited', async() => {
const result = await nightmare
.waitToGetProperty(selectors.clientFiscalData.postcodeInput, 'value');
.waitToGetProperty(`${selectors.clientFiscalData.postcodeAutocomplete} input`, 'value');
expect(result).toEqual('12345');
expect(result).toContain('46000');
});
it('should confirm the city have been edited', async() => {
it('should confirm the city have been autocompleted', async() => {
const result = await nightmare
.waitToGetProperty(selectors.clientFiscalData.cityInput, 'value');
.waitToGetProperty(`${selectors.clientFiscalData.cityAutocomplete} input`, 'value');
expect(result).toEqual('N/A');
expect(result).toEqual('Valencia');
});
it(`should confirm the province have been selected`, async() => {
it(`should confirm the province have been autocompleted`, async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.clientFiscalData.provinceAutocomplete} input`, 'value');
expect(result).toEqual('Province two');
expect(result).toEqual('Province one');
});
it('should confirm the country have been autocompleted', async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.clientFiscalData.countryAutocomplete} input`, 'value');
expect(result).toEqual('España');
});
it('should confirm active checkbox is unchecked', async() => {

26
e2e/paths/02-client-module/05_add_address.spec.js
View File

@ -24,8 +24,7 @@ describe('Client Add address path', () => {
const result = await nightmare
.waitToClick(selectors.clientAddresses.defaultCheckboxInput)
.clearInput(selectors.clientAddresses.streetAddressInput)
.write(selectors.clientAddresses.postcodeInput, '10022')
.autocompleteSearch(selectors.clientAddresses.provinceAutocomplete, 'Province four')
.autocompleteSearch(selectors.clientAddresses.postcodeAutocomplete, '46000')
.autocompleteSearch(selectors.clientAddresses.agencyAutocomplete, 'Entanglement')
.write(selectors.clientAddresses.phoneInput, '999887744')
.write(selectors.clientAddresses.mobileInput, '999887744')
@ -35,11 +34,32 @@ describe('Client Add address path', () => {
expect(result).toEqual('Some fields are invalid');
});
it('should confirm the postcode have been edited', async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.clientAddresses.postcodeAutocomplete} input`, 'value');
expect(result).toContain('46000');
});
it('should confirm the city have been autocompleted', async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.clientAddresses.cityAutocomplete} input`, 'value');
expect(result).toEqual('Valencia');
});
it(`should confirm the province have been autocompleted`, async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.clientAddresses.provinceAutocomplete} input`, 'value');
expect(result).toEqual('Province one');
});
it(`should create a new address with all it's data`, async() => {
const result = await nightmare
.write(selectors.clientAddresses.consigneeInput, 'Bruce Bunner')
.write(selectors.clientAddresses.streetAddressInput, '320 Park Avenue New York')
.write(selectors.clientAddresses.cityInput, 'New York')
.waitToClick(selectors.clientAddresses.saveButton)
.waitForLastSnackbar();

2
front/core/components/autocomplete/autocomplete.html
View File

@ -19,6 +19,6 @@
</div>
<vn-drop-down
vn-id="drop-down"
on-select="$ctrl.onDropDownSelect(value)"
on-select="$ctrl.onDropDownSelect(item)"
on-data-ready="$ctrl.onDataReady()">
</vn-drop-down>

14
front/core/components/autocomplete/autocomplete.js
View File

@ -79,10 +79,10 @@ export default class Autocomplete extends Input {
}
set field(value) {
if (angular.equals(value, this._field))
return;
this._field = value;
if (!value) return;
this.refreshSelection();
this.emit('change', {value});
}
@ -125,7 +125,9 @@ export default class Autocomplete extends Input {
|| this.selectionIsValid(this._selection))
return;
this.selection = this.fetchSelection();
const selection = this.fetchSelection();
if (!this.selection)
this.selection = selection;
}
fetchSelection() {
@ -217,7 +219,9 @@ export default class Autocomplete extends Input {
if (this.form) this.form.$setDirty();
}
onDropDownSelect(value) {
onDropDownSelect(item) {
const value = item[this.valueField];
this.selection = item;
this.setValue(value);
this.field = value;
}

2
front/core/components/button-menu/button-menu.html
View File

@ -7,7 +7,7 @@
</button>
<vn-drop-down
vn-id="drop-down"
on-select="$ctrl.onDropDownSelect(value)"
on-select="$ctrl.onDropDownSelect(item)"
ng-click="$ctrl.onDropDownClick($event)">
</vn-drop-down>
</div>

3
front/core/components/button-menu/button-menu.js
View File

@ -53,7 +53,8 @@ export default class ButtonMenu extends Input {
event.preventDefault();
}
onDropDownSelect(value) {
onDropDownSelect(item) {
const value = item[this.valueField];
this.field = value;
this.emit('change', {value});
}

7
front/core/components/button-menu/button-menu.spec.js
View File

@ -7,6 +7,7 @@ describe('Component vnButtonMenu', () => {
beforeEach(inject(($compile, $rootScope) => {
$element = $compile(`<vn-icon-menu></vn-icon-menu>`)($rootScope);
controller = $element.controller('vnIconMenu');
controller.valueField = 'name';
}));
afterEach(() => {
@ -31,10 +32,10 @@ describe('Component vnButtonMenu', () => {
describe('onDropDownSelect(value)', () => {
it(`should set field to the given value and emit the change event`, () => {
spyOn(controller, 'emit');
controller.onDropDownSelect('mariano');
controller.onDropDownSelect({name: 'Item name'});
expect(controller.field).toBe('mariano');
expect(controller.emit).toHaveBeenCalledWith('change', {value: 'mariano'});
expect(controller.field).toBe('Item name');
expect(controller.emit).toHaveBeenCalledWith('change', {value: 'Item name'});
});
});
});

2
front/core/components/drop-down/drop-down.js
View File

@ -186,7 +186,7 @@ export default class DropDown extends Component {
this.field = value;
}
this.emit('select', {value: value});
this.emit('select', {item});
}
if (!this.multiple)

2
front/core/components/icon-menu/icon-menu.html
View File

@ -5,7 +5,7 @@
</vn-icon>
<vn-drop-down
vn-id="drop-down"
on-select="$ctrl.onDropDownSelect(value)"
on-select="$ctrl.onDropDownSelect(item)"
ng-click="$ctrl.onDropDownClick($event)">
</vn-drop-down>
</div>

5
front/core/components/table/index.html
View File

@ -2,7 +2,10 @@
<vn-empty-rows ng-if="$ctrl.isRefreshing">
<vn-spinner enable="$ctrl.isRefreshing"></vn-spinner>
</vn-empty-rows>
<vn-empty-rows ng-if="!$ctrl.isRefreshing && !$ctrl.model.data">
<vn-empty-rows ng-if="$ctrl.model && !$ctrl.isRefreshing && !$ctrl.model.data">
<span translate>Enter a new search</span>
</vn-empty-rows>
<vn-empty-rows ng-if="$ctrl.model && !$ctrl.isRefreshing && $ctrl.model.data.length == 0">
<span translate>No results</span>
</vn-empty-rows>
</div>

852
front/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
front/package.json
View File

@ -20,11 +20,11 @@
"angular-translate-loader-partial": "^2.18.1",
"flatpickr": "^4.5.2",
"fs-extra": "^5.0.0",
"js-yaml": "^3.12.1",
"js-yaml": "^3.13.1",
"material-design-lite": "^1.3.0",
"mg-crud": "^1.1.2",
"moment-timezone": "^0.5.25",
"npm": "^6.5.0",
"npm": "^6.9.0",
"oclazyload": "^0.6.3",
"require-yaml": "0.0.1",
"validator": "^6.3.0"

2
loopback/common/models/loggable.js
View File

@ -112,7 +112,7 @@ module.exports = function(Self) {
for (let key1 in ctx.Model.relations) {
let val1 = ctx.Model.relations[key1];
if (val1.keyFrom == key && key != 'id') {
let recordSet = await ctx.Model.app.models[val1.modelTo.modelName].findById(val, options);
let recordSet = await ctx.Model.app.models[val1.modelTo.modelName].findById(val, null, options);
let showField = val1.modelTo && val1.modelTo.definition.settings.log && val1.modelTo.definition.settings.log.showField && recordSet && recordSet[val1.modelTo.definition.settings.log.showField];
if (!showField) {

23
loopback/common/models/vn-model.js
View File

@ -11,6 +11,20 @@ module.exports = function(Self) {
setup() {
Self.super_.setup.call(this);
/**
* Setting a global transaction timeout to find out if the service
* is blocked because the connection pool is empty.
*/
this.once('dataSourceAttached', () => {
let orgBeginTransaction = this.beginTransaction;
this.beginTransaction = function(options, cb) {
options = options || {};
if (!options.timeout)
options.timeout = 30000;
return orgBeginTransaction.call(this, options, cb);
};
});
// Register field ACL validation
/* this.beforeRemote('prototype.patchAttributes', ctx => this.checkUpdateAcls(ctx));
this.beforeRemote('updateAll', ctx => this.checkUpdateAcls(ctx));
@ -41,10 +55,11 @@ module.exports = function(Self) {
},
async crud(deletes, updates, creates) {
let transaction = await this.beginTransaction({});
let options = {transaction};
let tx = await this.beginTransaction({});
try {
let options = {transaction: tx};
if (deletes) {
let promises = [];
for (let id of deletes)
@ -65,9 +80,9 @@ module.exports = function(Self) {
}
}
await transaction.commit();
await tx.commit();
} catch (error) {
await transaction.rollback();
await tx.rollback();
throw error;
}
},

2
loopback/server/middleware.development.json
View File

@ -3,7 +3,7 @@
"strong-error-handler": {
"params": {
"debug": true,
"log": true
"log": false
}
}
}

6
loopback/server/middleware.json
View File

@ -49,6 +49,10 @@
},
"final:after": {
"./middleware/error-handler": {},
"strong-error-handler": {}
"strong-error-handler": {
"params": {
"log": false
}
}
}
}

4
loopback/server/middleware/error-handler.js
View File

@ -1,4 +1,5 @@
const UserError = require('../../util/user-error');
const logToConsole = require('strong-error-handler/lib/logger');
module.exports = function() {
return function(err, req, res, next) {
@ -23,6 +24,9 @@ module.exports = function() {
if (err.sqlState == '45000')
return next(new UserError(req.__(err.sqlMessage)));
if (!err.statusCode || err.statusCode >= 500)
logToConsole(req, err);
next(err);
};
};

11
modules/agency/back/methods/zone/clone.js
View File

@ -21,8 +21,10 @@ module.exports = Self => {
Self.clone = async id => {
const models = Self.app.models;
const transaction = await Self.beginTransaction({});
const options = {transaction};
const tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
// Find original zone
const zone = await models.Zone.findOne({
@ -53,7 +55,6 @@ module.exports = Self => {
where: {zoneFk: id}
}, options);
try {
const newZone = await Self.create(zone, options);
const newIncludedGeo = includedGeo.map(included => {
included.zoneFk = newZone.id;
@ -66,11 +67,11 @@ module.exports = Self => {
await models.ZoneIncluded.create(newIncludedGeo, options);
await models.ZoneCalendar.create(newCalendayDays, options);
await transaction.commit();
await tx.commit();
return newZone;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

2
modules/agency/front/create/locale/es.yml
View File

@ -1,3 +1,3 @@
Traveling days: Días de viaje
Estimated hour (ETD): Hora estimada (ETD)
Closure hour (ETD): Hora de cierre (ETD)
Bonus: Bonificación

2
modules/agency/front/descriptor/index.html
View File

@ -30,7 +30,7 @@
<vn-label-value label="Agency"
value="{{$ctrl.zone.agencyMode.name}}">
</vn-label-value>
<vn-label-value label="Estimated hour (ETD)"
<vn-label-value label="Closure hour (ETD)"
value="{{$ctrl.zone.hour | dateTime: 'HH:mm'}}">
</vn-label-value>
<vn-label-value label="Traveling days"

2
modules/agency/front/index/index.html
View File

@ -26,7 +26,7 @@
<vn-th field="name" expand>Name</vn-th>
<vn-th field="agencyModeFk">Agency</vn-th>
<vn-th field="warehouseFK">Warehouse</vn-th>
<vn-th field="hour" shrink vn-tooltip="ETD">Hour</vn-th>
<vn-th field="hour" vn-tooltip="ETD" default-order="DESC" shrink>Hour</vn-th>
<vn-th field="price" number shrink>Price</vn-th>
<vn-th shrink></vn-th>
</vn-tr>

32
modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
View File

@ -19,7 +19,7 @@ module.exports = Self => {
}
});
async function addSalesToTicket(salesToRefund, ticketFk, transaction) {
async function addSalesToTicket(salesToRefund, ticketFk, options) {
let formatedSales = [];
salesToRefund.forEach(sale => {
let formatedSale = {
@ -35,10 +35,10 @@ module.exports = Self => {
};
formatedSales.push(formatedSale);
});
return await Self.app.models.Sale.create(formatedSales, transaction);
return await Self.app.models.Sale.create(formatedSales, options);
}
async function insertIntoClaimEnd(createdSales, claimId, workerId, transaction) {
async function insertIntoClaimEnd(createdSales, claimId, workerId, options) {
let formatedSales = [];
createdSales.forEach(sale => {
let formatedSale = {
@ -48,17 +48,17 @@ module.exports = Self => {
};
formatedSales.push(formatedSale);
});
return await Self.app.models.ClaimEnd.create(formatedSales, transaction);
return await Self.app.models.ClaimEnd.create(formatedSales, options);
}
async function saveObservation(observation, transaction) {
async function saveObservation(observation, options) {
let query = `INSERT INTO vn.ticketObservation(ticketFk, observationTypeFk, description) VALUES(?, ?, ?)
ON DUPLICATE KEY UPDATE description = CONCAT(vn.ticketObservation.description, VALUES(description),' ')`;
await Self.rawSql(query, [
observation.ticketFk,
observation.observationTypeFk,
observation.description
], transaction);
], options);
}
Self.importToNewRefundTicket = async(ctx, id) => {
@ -109,37 +109,39 @@ module.exports = Self => {
]
};
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let newRefundTicket = await models.Ticket.new(ctx, params, {transaction: transaction});
let options = {transaction: tx};
let newRefundTicket = await models.Ticket.new(ctx, params, options);
let observation = {
description: `Reclama ticket: ${claim.ticketFk}`,
ticketFk: newRefundTicket.id,
observationTypeFk: obsevationType.id
};
await saveObservation(observation, {transaction: transaction});
await saveObservation(observation, options);
await models.TicketTracking.create({
ticketFk: newRefundTicket.id,
stateFk: state.id,
workerFk: worker.id
}, {transaction: transaction});
}, options);
let salesToRefund = await models.ClaimBeginning.find(salesFilter);
let createdSales = await addSalesToTicket(salesToRefund, newRefundTicket.id, {transaction: transaction});
insertIntoClaimEnd(createdSales, id, worker.id, {transaction: transaction});
let createdSales = await addSalesToTicket(salesToRefund, newRefundTicket.id, options);
insertIntoClaimEnd(createdSales, id, worker.id, options);
await Self.rawSql('CALL vn.ticketCalculateClon(?, ?)', [
newRefundTicket.id, claim.ticketFk
], {transaction: transaction});
], options);
await transaction.commit();
await tx.commit();
return newRefundTicket;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

18
modules/claim/back/methods/claim/createFromSales.js
View File

@ -26,27 +26,29 @@ module.exports = Self => {
Self.createFromSales = async(ctx, params) => {
let model = Self.app.models;
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let userId = ctx.req.accessToken.userId;
let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
params.claim.workerFk = worker.id;
let newClaim = await Self.create(params.claim, {transaction});
let newClaim = await Self.create(params.claim, options);
let promises = [];
for (let i = 0; i < params.sales.length; i++) {
promises.push(model.ClaimBeginning.create(
{saleFk: params.sales[i].id,
promises.push(model.ClaimBeginning.create({
saleFk: params.sales[i].id,
claimFk: newClaim.id,
quantity: params.sales[i].quantity},
{transaction}));
quantity: params.sales[i].quantity
}, options));
}
await Promise.all(promises);
await transaction.commit();
await tx.commit();
return newClaim;
} catch (e) {
transaction.rollback();
await tx.rollback();
throw e;
}
};

30
modules/claim/back/methods/claim/regularizeClaim.js
View File

@ -30,8 +30,10 @@ module.exports = Self => {
where: {claimFk: params.claimFk}
});
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
for (let i = 0; i < claimEnds.length; i++) {
const claimEnd = claimEnds[i];
const destination = claimEnd.claimDestination();
@ -45,7 +47,7 @@ module.exports = Self => {
addressFk: addressFk,
companyFk: sale.ticket().companyFk,
warehouseFk: sale.ticket().warehouseFk
}, transaction);
}, options);
let address = await models.Address.findOne({
where: {id: addressFk}
@ -58,7 +60,7 @@ module.exports = Self => {
warehouseFk: sale.ticket().warehouseFk,
companyFk: sale.ticket().companyFk,
userId: userId
}, transaction);
}, options);
}
await models.Sale.create({
@ -68,7 +70,7 @@ module.exports = Self => {
quantity: -sale.quantity,
price: sale.price,
discount: 100
}, {transaction: transaction});
}, options);
if (sale.ticket().client().salesPerson()) {
await sendMessage(ctx, {
@ -78,20 +80,20 @@ module.exports = Self => {
quantity: sale.quantity,
concept: sale.concept,
nickname: address.nickname
}, transaction);
}, options);
}
}
let claim = await Self.findById(params.claimFk);
claim = await claim.updateAttributes({
claimStateFk: resolvedState
}, {transaction: transaction});
}, options);
await transaction.commit();
await tx.commit();
return claim;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};
@ -117,7 +119,7 @@ module.exports = Self => {
});
}
async function getTicketId(params, transaction) {
async function getTicketId(params, options) {
const currentDate = new Date();
currentDate.setHours(null, null, null);
@ -129,12 +131,12 @@ module.exports = Self => {
shipped: currentDate,
landed: currentDate
}
}, {transaction: transaction});
}, options);
return ticket && ticket.id;
}
async function createTicket(ctx, params, transaction) {
async function createTicket(ctx, params, options) {
let ticket = await Self.app.models.Ticket.new(ctx,
{
shipped: new Date(),
@ -144,18 +146,18 @@ module.exports = Self => {
companyFk: params.companyFk,
addressFk: params.addressFk,
userId: params.userId
}, {transaction: transaction});
}, options);
return ticket.id;
}
async function sendMessage(ctx, params, transaction) {
async function sendMessage(ctx, params, options) {
const message = `Envio ${params.quantity} unidades de "${params.concept}" (#${params.itemFk}) a `
+ `"${params.nickname}" provenientes del ticket #${params.ticketFk}`;
await Self.app.models.Message.send(ctx, {
recipientFk: params.recipientFk,
message: message
}, {transaction: transaction});
}, options);
}
};

6
modules/claim/front/descriptor/index.html
View File

@ -75,3 +75,9 @@
question="Send Pickup order"
message="Are you sure you want to send it?">
</vn-confirm>
<vn-confirm
vn-id="confirm-delete-claim"
on-response="$ctrl.deleteClaim(response)"
question="Delete claim"
message="Are you sure you want to delete it?">
</vn-confirm>

19
modules/claim/front/descriptor/index.js
View File

@ -1,15 +1,17 @@
import ngModule from '../module';
class Controller {
constructor($scope, $state, $http, $translate, vnApp) {
constructor($scope, $state, $http, $translate, vnApp, aclService) {
this.$scope = $scope;
this.$state = $state;
this.$http = $http;
this.$translate = $translate;
this.vnApp = vnApp;
this.aclService = aclService;
this.moreOptions = [
{callback: this.showPickupOrder, name: 'Show Pickup order'},
{callback: this.confirmPickupOrder, name: 'Send Pickup order'}
{callback: this.confirmPickupOrder, name: 'Send Pickup order'},
{callback: this.confirmDeleteClaim, name: 'Delete claim', acl: 'salesAssistant'}
];
}
@ -57,6 +59,9 @@ class Controller {
this.$scope.confirmPickupOrder.show();
}
confirmDeleteClaim() {
this.$scope.confirmDeleteClaim.show();
}
sendPickupOrder(response) {
if (response === 'ACCEPT') {
this.$http.post(`/api/email/claim-pickup-order`, {claimFk: this.claim.id}).then(
@ -64,9 +69,17 @@ class Controller {
);
}
}
deleteClaim(response) {
if (response === 'ACCEPT') {
this.$http.delete(`/claim/api/Claims/${this.claim.id}`).then(() => {
this.vnApp.showSuccess(this.$translate.instant('Claim deleted!'));
this.$state.go('claim.index');
});
}
}
}
Controller.$inject = ['$scope', '$state', '$http', '$translate', 'vnApp'];
Controller.$inject = ['$scope', '$state', '$http', '$translate', 'vnApp', 'aclService'];
ngModule.component('vnClaimDescriptor', {
template: require('./index.html'),

29
modules/claim/front/descriptor/index.spec.js
View File

@ -48,5 +48,34 @@ describe('Item Component vnClaimDescriptor', () => {
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('Notification sent!');
});
});
describe('confirmDeleteClaim()', () => {
it('should call confirmDeleteClaim.show()', () => {
controller.$scope.confirmDeleteClaim = {
show: jasmine.createSpy('show')
};
controller.claim = {id: 2};
controller.confirmDeleteClaim();
expect(controller.$scope.confirmDeleteClaim.show).toHaveBeenCalledWith();
});
});
describe('deleteClaime(response)', () => {
it('should perform a query and call showSuccess if the response is ACCEPT', () => {
let response = 'ACCEPT';
controller.claim = {id: 2};
spyOn(controller.vnApp, 'showSuccess');
spyOn(controller.$state, 'go');
$httpBackend.when('DELETE', `/claim/api/Claims/2`).respond(200);
$httpBackend.expect('DELETE', `/claim/api/Claims/2`);
controller.deleteClaim(response);
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Claim deleted!');
expect(controller.$state.go).toHaveBeenCalledWith('claim.index');
});
});
});

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

@ -154,4 +154,3 @@
</div>
</div>
</vn-popover>
<p>

2
modules/claim/front/locale/es.yml
View File

@ -3,6 +3,7 @@ Add sale: Añadir linea
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Client Id: Id cliente
Claimed ticket: Ticket reclamado
Delete claim: Eliminar reclamación
Observation: Observación
Responsible: Responsable
Remove sale: Borrar linea
@ -11,4 +12,5 @@ Created: Creado
Send Pickup order: Enviar orden de recogida
Show Pickup order: Ver orden de recogida
Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
Claim deleted!: Reclamación eliminada!

14
modules/client/back/methods/address/createDefaultAddress.js
View File

@ -19,23 +19,25 @@ module.exports = function(Self) {
Self.createDefaultAddress = async data => {
const Address = Self.app.models.Address;
const Client = Self.app.models.Client;
const transaction = await Address.beginTransaction({});
const tx = await Address.beginTransaction({});
try {
let options = {transaction: tx};
let address = data.address;
let newAddress = await Address.create(address, {transaction});
let client = await Client.findById(address.clientFk, {transaction});
let newAddress = await Address.create(address, options);
let client = await Client.findById(address.clientFk, options);
if (data.isDefaultAddress) {
await client.updateAttributes({
defaultAddressFk: newAddress.id
}, {transaction});
}, options);
}
await transaction.commit();
await tx.commit();
return newAddress;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

16
modules/client/back/methods/client/confirmTransaction.js
View File

@ -19,15 +19,17 @@ module.exports = Self => {
});
Self.confirmTransaction = async(ctx, id) => {
let transaction = await Self.beginTransaction({});
let userId = ctx.req.accessToken.userId;
let tx = await Self.beginTransaction({});
try {
let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, {options: transaction});
let options = {transaction: tx};
let confirm = await Self.rawSql('CALL hedera.tpvTransactionConfirmById(?)', [id], {options: transaction});
let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);
let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, {options: transaction});
let confirm = await Self.rawSql('CALL hedera.tpvTransaction_confirmById(?)', [id], options);
let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);
let oldInstance = {status: oldTpvTransaction.status};
let newInstance = {status: tpvTransaction.status};
@ -42,12 +44,12 @@ module.exports = Self => {
newInstance: newInstance
};
await Self.app.models.ClientLog.create(logRecord, {options: transaction});
await Self.app.models.ClientLog.create(logRecord, options);
await transaction.commit();
await tx.commit();
return confirm;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

16
modules/client/back/methods/client/createWithUser.js
View File

@ -25,10 +25,12 @@ module.exports = function(Self) {
};
const Account = Self.app.models.Account;
const Address = Self.app.models.Address;
const transaction = await Account.beginTransaction({});
const tx = await Account.beginTransaction({});
try {
let account = await Account.create(user, {transaction});
let options = {transaction: tx};
let account = await Account.create(user, options);
let client = await Self.create({
id: account.id,
name: data.name,
@ -42,7 +44,7 @@ module.exports = function(Self) {
provinceFk: data.provinceFk,
countryFk: data.countryFk,
isEqualizated: data.isEqualizated
}, {transaction});
}, options);
let address = await Address.create({
@ -54,16 +56,16 @@ module.exports = function(Self) {
provinceFk: client.provinceFk,
isEqualizated: client.isEqualizated,
isActive: true
}, {transaction});
}, options);
await client.updateAttributes({
defaultAddressFk: address.id
}, {transaction});
}, options);
await transaction.commit();
await tx.commit();
return client;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

2
modules/client/back/methods/client/specs/confirmTransaction.spec.js
View File

@ -5,7 +5,7 @@ describe('Client confirmTransaction', () => {
afterAll(async done => {
await app.models.Client.rawSql(`
CALL hedera.tpvTransactionUndo(?)`, [transactionId]);
CALL hedera.tpvTransaction_undo(?)`, [transactionId]);
done();
});

9
modules/client/back/methods/client/uploadFile.js
View File

@ -50,11 +50,12 @@ module.exports = Self => {
Self.uploadFile = async(ctx, id) => {
const models = Self.app.models;
const transaction = await Self.beginTransaction({});
const options = {transaction};
const promises = [];
const tx = await Self.beginTransaction({});
try {
const options = {transaction: tx};
const uploadedFiles = await models.Dms.uploadFile(ctx, options);
uploadedFiles.forEach(dms => {
const newClientDms = models.ClientDms.create({
@ -66,11 +67,11 @@ module.exports = Self => {
});
const resolvedPromises = await Promise.all(promises);
await transaction.commit();
await tx.commit();
return resolvedPromises;
} catch (err) {
await transaction.rollback();
await tx.rollback();
throw err;
}
};

12
modules/client/back/methods/credit-classification/createWithInsurance.js
View File

@ -23,11 +23,13 @@ module.exports = Self => {
});
Self.createWithInsurance = async(data, ctx) => {
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let classificationSchema = {client: data.clientFk, started: data.started};
let newClassification = await Self.create(classificationSchema, {transaction});
let newClassification = await Self.create(classificationSchema, options);
let CreditInsurance = Self.app.models.CreditInsurance;
let insuranceSchema = {
creditClassification: newClassification.id,
@ -35,13 +37,13 @@ module.exports = Self => {
grade: data.grade
};
let newCreditInsurance = await CreditInsurance.create(insuranceSchema, {transaction});
await transaction.commit();
let newCreditInsurance = await CreditInsurance.create(insuranceSchema, options);
await tx.commit();
await CreditInsurance.messageSend(newCreditInsurance, ctx.req.accessToken);
return newClassification;
} catch (e) {
transaction.rollback();
await tx.rollback();
throw e;
}
};

40
modules/client/front/address/create/index.html
View File

@ -6,6 +6,14 @@
save="post"
form="form">
</vn-watcher>
<vn-crud-model
vn-id="model"
url="/client/api/AddressObservations"
fields="['id', 'addressFk', 'observationTypeFk', 'description']"
link="{addressFk: $ctrl.$stateParams.addressId}"
data="observations"
auto-load="true">
</vn-crud-model>
<form name="form" ng-submit="$ctrl.onSubmit()" compact>
<vn-card pad-large>
<vn-horizontal pad-small-v>
@ -16,22 +24,40 @@
<vn-textfield vn-one label="Street address" field="$ctrl.address.street"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Postcode" field="$ctrl.address.postalCode"></vn-textfield>
<vn-textfield vn-one label="Town/City" field="$ctrl.address.city"></vn-textfield>
<vn-autocomplete
vn-one
<vn-autocomplete vn-id="postcode" vn-one
field="$ctrl.address.postalCode"
on-change="$ctrl.setLocation()"
search-function="{code: $search}"
url="/api/Postcodes/location"
fields="['code', 'townFk']"
show-field="code"
value-field="code"
label="Postcode">
<tpl-item>
{{code}}, {{town.name}} - {{town.province.name}}
({{town.province.country.country}})
</tpl-item>
</vn-autocomplete>
<vn-autocomplete vn-one
label="City"
url="/api/Towns"
show-field="name"
value-field="name"
field="$ctrl.address.city">
</vn-autocomplete>
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.address.provinceFk"
url="/client/api/Provinces"
url="/api/Provinces"
show-field="name"
value-field="id"
label="Province">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete
vn-one
field="$ctrl.address.agencyModeFk"
url="/client/api/AgencyModes/isActive"
url="/api/AgencyModes/isActive"
show-field="name"
value-field="id"
label="Agency">

18
modules/client/front/address/create/index.js
View File

@ -1,8 +1,8 @@
import ngModule from '../../module';
export default class Controller {
constructor($scope, $state) {
this.$scope = $scope;
constructor($, $state) {
this.$ = $;
this.$state = $state;
this.data = {
address: {
@ -14,8 +14,20 @@ export default class Controller {
this.address = this.data.address;
}
setLocation() {
const location = this.$.postcode.selection;
if (!location || !location.town) return;
const town = location.town;
const province = town.province;
const country = province.country;
this.address.city = location.town.name;
this.address.provinceFk = province.id;
this.address.countryFk = country.id;
}
onSubmit() {
this.$scope.watcher.submit().then(res => {
this.$.watcher.submit().then(res => {
if (res.data && this.data.isDefaultAddress)
this.client.defaultAddressFk = res.data.id;

4
modules/client/front/address/create/index.spec.js
View File

@ -14,8 +14,8 @@ describe('Client', () => {
$state = _$state_;
$state.params.id = '1234';
controller = $componentController('vnClientAddressCreate', {$state});
controller.$scope.watcher = watcher;
controller.$scope.watcher.submit = () => {
controller.$.watcher = watcher;
controller.$.watcher.submit = () => {
return {
then: callback => {
callback({data: {id: 124}});

29
modules/client/front/address/edit/index.html
View File

@ -25,7 +25,7 @@
data="types"
auto-load="true">
</vn-crud-model>
<form name="form" ng-submit="$ctrl.submit()" compact>
<form name="form" ng-submit="$ctrl.onSubmit()" compact>
<vn-card pad-large>
<vn-horizontal pad-small-v>
<vn-check vn-one label="Enabled" field="$ctrl.address.isActive"></vn-check>
@ -40,12 +40,31 @@
<vn-textfield vn-one label="Street" field="$ctrl.address.street"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Postcode" field="$ctrl.address.postalCode"></vn-textfield>
<vn-textfield vn-one label="City" field="$ctrl.address.city"></vn-textfield>
<vn-autocomplete vn-id="postcode" vn-one
field="$ctrl.address.postalCode"
on-change="$ctrl.setLocation()"
search-function="{code: $search}"
url="/api/Postcodes/location"
fields="['code', 'townFk']"
show-field="code"
value-field="code"
label="Postcode">
<tpl-item>
{{code}}, {{town.name}} - {{town.province.name}}
({{town.province.country.country}})
</tpl-item>
</vn-autocomplete>
<vn-autocomplete vn-one
initial-data="$ctrl.address.province"
label="City"
url="/api/Towns"
show-field="name"
value-field="name"
field="$ctrl.address.city">
</vn-autocomplete>
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.address.provinceFk"
url="/client/api/Provinces"
url="/api/Provinces"
show-field="name"
value-field="id"
label="Province">

14
modules/client/front/address/edit/index.js
View File

@ -20,7 +20,19 @@ export default class Controller {
this.$state.go('client.card.address.index');
}
submit() {
setLocation() {
const location = this.$.postcode.selection;
if (!location || !location.town) return;
const town = location.town;
const province = town.province;
const country = province.country;
this.address.city = location.town.name;
this.address.provinceFk = province.id;
this.address.countryFk = country.id;
}
onSubmit() {
this.$.watcher.check();
this.$.watcher.realSubmit()
.then(() => this.$.model.save(true))

49
modules/client/front/create/index.html
View File

@ -33,34 +33,45 @@
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Postcode"
field="$ctrl.client.postcode">
</vn-textfield>
<vn-textfield
vn-one
<vn-autocomplete vn-id="postcode" vn-one
field="$ctrl.client.postcode"
on-change="$ctrl.setLocation()"
search-function="{code: $search}"
url="/api/Postcodes/location"
fields="['code', 'townFk']"
show-field="code"
value-field="code"
label="Postcode">
<tpl-item>
{{code}}, {{town.name}} - {{town.province.name}}
({{town.province.country.country}})
</tpl-item>
</vn-autocomplete>
<vn-autocomplete vn-one
label="City"
url="/api/Towns"
show-field="name"
value-field="name"
field="$ctrl.client.city">
</vn-textfield>
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete
vn-one
field="$ctrl.client.countryFk"
url="/client/api/Countries"
show-field="country"
value-field="id"
label="Country">
</vn-autocomplete>
<vn-autocomplete
vn-one
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.client.provinceFk"
url="/client/api/Provinces"
url="/api/Provinces"
show-field="name"
value-field="id"
label="Province">
</vn-autocomplete>
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.client.countryFk"
url="/api/Countries"
show-field="country"
value-field="id"
label="Country">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-textfield

18
modules/client/front/create/index.js
View File

@ -1,20 +1,34 @@
import ngModule from '../module';
export default class Controller {
constructor($scope, $state) {
constructor($scope, $state, $http) {
this.$ = $scope;
this.$state = $state;
this.$http = $http;
this.client = {
active: true
};
}
setLocation() {
const location = this.$.postcode.selection;
if (!location || !location.town) return;
const town = location.town;
const province = town.province;
const country = province.country;
this.client.city = location.town.name;
this.client.provinceFk = province.id;
this.client.countryFk = country.id;
}
onSubmit() {
this.$.watcher.submit().then(
json => this.$state.go('client.card.basicData', {id: json.data.id})
);
}
}
Controller.$inject = ['$scope', '$state'];
Controller.$inject = ['$scope', '$state', '$http'];
ngModule.component('vnClientCreate', {
template: require('./index.html'),

53
modules/client/front/fiscal-data/index.html
View File

@ -5,7 +5,7 @@
form="form"
save="patch">
</vn-watcher>
<form name="form" ng-submit="$ctrl.submit()" compact>
<form name="form" ng-submit="$ctrl.onSubmit()" compact>
<vn-card pad-large>
<vn-horizontal>
<vn-textfield
@ -28,36 +28,45 @@
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Postcode"
field="$ctrl.client.postcode">
</vn-textfield>
<vn-textfield
vn-one
<vn-autocomplete vn-id="postcode" vn-one
field="$ctrl.client.postcode"
on-change="$ctrl.setLocation()"
search-function="{code: $search}"
url="/api/Postcodes/location"
fields="['code', 'townFk']"
show-field="code"
value-field="code"
label="Postcode">
<tpl-item>
{{code}}, {{town.name}} - {{town.province.name}}
({{town.province.country.country}})
</tpl-item>
</vn-autocomplete>
<vn-autocomplete vn-one
label="City"
url="/api/Towns"
show-field="name"
value-field="name"
field="$ctrl.client.city">
</vn-textfield>
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete
vn-one
initial-data="$ctrl.client.country"
field="$ctrl.client.countryFk"
url="/client/api/Countries"
show-field="country"
value-field="id"
label="Country">
</vn-autocomplete>
<vn-autocomplete
vn-one
initial-data="$ctrl.client.province"
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.client.provinceFk"
url="/client/api/Provinces"
url="/api/Provinces"
show-field="name"
value-field="id"
label="Province">
</vn-autocomplete>
<vn-autocomplete vn-one
disabled="true"
field="$ctrl.client.countryFk"
url="/api/Countries"
show-field="country"
value-field="id"
label="Country">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal pad-small-v>
<vn-check

14
modules/client/front/fiscal-data/index.js
View File

@ -24,7 +24,7 @@ export default class Controller {
return !this.client.isTaxDataChecked;
}
submit() {
onSubmit() {
if (this.isEqualizated != this.client.isEqualizated) {
this.oldHasToInvoiceByAddress = this.client.hasToInvoiceByAddress;
this.client.hasToInvoiceByAddress = false;
@ -56,6 +56,18 @@ export default class Controller {
);
}
}
setLocation() {
const location = this.$.postcode.selection;
if (!location || !location.town) return;
const town = location.town;
const province = town.province;
const country = province.country;
this.client.city = location.town.name;
this.client.provinceFk = province.id;
this.client.countryFk = country.id;
}
}
Controller.$inject = ['$scope', '$http', 'vnApp', '$translate'];

16
modules/invoiceOut/back/methods/invoiceOut/delete.js
View File

@ -21,24 +21,24 @@ module.exports = Self => {
});
Self.delete = async id => {
const transaction = await Self.beginTransaction({});
const tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let invoiceOut = await Self.findById(id);
let tickets = await Self.app.models.Ticket.find({where: {refFk: invoiceOut.ref}});
const promises = [];
tickets.forEach(ticket => {
promises.push(ticket.updateAttribute('refFk', null, {transaction}));
promises.push(ticket.updateAttribute('refFk', null, options));
});
return Promise.all(promises).then(async() => {
await invoiceOut.destroy({transaction});
await transaction.commit();
await Promise.all(promises);
await invoiceOut.destroy(options);
await tx.commit();
return tickets;
});
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

12
modules/invoiceOut/back/methods/invoiceOut/regenerate.js
View File

@ -24,11 +24,13 @@ module.exports = Self => {
const models = Self.app.models;
const invoiceReportFk = 30; // FIXME - Should be deprecated
const worker = await models.Worker.findOne({where: {userFk: userId}});
const transaction = await Self.beginTransaction({});
const tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
// Remove all invoice references from tickets
const invoiceOut = await models.InvoiceOut.findById(id, {transaction});
const invoiceOut = await models.InvoiceOut.findById(id, null, options);
await invoiceOut.updateAttributes({
hasPdf: false
});
@ -36,13 +38,13 @@ module.exports = Self => {
// Send to print queue
await Self.rawSql(`
INSERT INTO vn.printServerQueue (reportFk, param1, workerFk)
VALUES (?, ?, ?)`, [invoiceReportFk, id, worker.id], {transaction});
VALUES (?, ?, ?)`, [invoiceReportFk, id, worker.id], options);
await transaction.commit();
await tx.commit();
return invoiceOut;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

12
modules/item/back/methods/item/clone.js
View File

@ -23,11 +23,12 @@ module.exports = Self => {
});
Self.clone = async itemId => {
let transaction = await Self.beginTransaction({});
let options = {transaction};
let tx = await Self.beginTransaction({});
try {
const origin = await Self.findById(itemId, options);
let options = {transaction: tx};
const origin = await Self.findById(itemId, null, options);
if (!origin)
throw new UserError(`That item doesn't exists`);
@ -46,11 +47,10 @@ module.exports = Self => {
await cloneTags(origin.id, newItem.id, promises, options);
await Promise.all(promises);
await transaction.commit();
await tx.commit();
return newItem;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

18
modules/item/back/methods/item/new.js
View File

@ -33,16 +33,18 @@ module.exports = Self => {
throw new UserError(`You don't have enough privileges to do that`);
}
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let provisionalName = params.provisionalName;
delete params.provisionalName;
let item = await Self.app.models.Item.create(params, {transaction: transaction});
let item = await Self.app.models.Item.create(params, options);
let typeTags = await Self.app.models.ItemTypeTag.find({where: {itemTypeFk: item.typeFk}});
let query = `SET @isTriggerDisabled = TRUE`;
await Self.rawSql(query, null, {transaction: transaction});
await Self.rawSql(query, null, options);
let nameTag = await Self.app.models.Tag.findOne({where: {name: 'Nombre temporal'}});
@ -53,18 +55,18 @@ module.exports = Self => {
newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
});
await Self.app.models.ItemTag.create(newTags, {transaction: transaction});
await Self.app.models.ItemTag.create(newTags, options);
query = `SET @isTriggerDisabled = FALSE`;
await Self.rawSql(query, null, {transaction: transaction});
await Self.rawSql(query, null, options);
query = `CALL vn.itemRefreshTags(?)`;
await Self.rawSql(query, [item.id], {transaction: transaction});
await transaction.commit();
await Self.rawSql(query, [item.id], options);
await tx.commit();
return item;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
};

26
modules/item/back/methods/item/regularize.js
View File

@ -42,15 +42,17 @@ module.exports = Self => {
where: {description: 'Corregido'}
});
let transaction = await Self.beginTransaction({});
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let item = await models.Item.findById(itemFk);
let ticketFk = await getTicketId({
clientFk: itemDestination.address.clientFk,
addressFk: itemDestination.addressFk,
warehouseFk: warehouseFk
}, transaction);
}, options);
if (!ticketFk) {
ticketFk = await createTicket(ctx, {
@ -58,15 +60,15 @@ module.exports = Self => {
addressFk: itemDestination.addressFk,
warehouseFk: warehouseFk,
userId: userId
}, transaction);
}, options);
}
let query = `
CALL vn.getItemVisibleAvailable(?,curdate(),?,?)`;
let options = [itemFk, warehouseFk, true];
let [res] = await Self.rawSql(query, options, {transaction: transaction});
let params = [itemFk, warehouseFk, true];
let [res] = await Self.rawSql(query, params, options);
let newQuantity = res[0].visible - quantity;
@ -76,16 +78,16 @@ module.exports = Self => {
concept: item.name,
quantity: newQuantity,
discount: 100
}, {transaction: transaction});
}, options);
await transaction.commit();
await tx.commit();
return ticketFk;
} catch (e) {
await transaction.rollback();
await tx.rollback();
throw e;
}
async function createTicket(ctx, params, transaction) {
async function createTicket(ctx, params, options) {
let ticket = await Self.app.models.Ticket.new(
ctx,
{
@ -96,13 +98,13 @@ module.exports = Self => {
companyFk: params.companyFk,
addressFk: params.addressFk,
userId: params.userId
}, {transaction: transaction});
}, options);
return ticket.id;
}
async function getTicketId(params, transaction) {
async function getTicketId(params, options) {
const currentDate = new Date();
currentDate.setHours(null, null, null);
@ -113,7 +115,7 @@ module.exports = Self => {
shipped: currentDate,
landed: currentDate
}
}, {transaction: transaction});
}, options);
return ticket && ticket.id;
}

2
modules/order/back/methods/order/filter.js
View File

@ -140,7 +140,7 @@ module.exports = Self => {
SELECT id AS orderFk
FROM tmp.filter`);
stmts.push('CALL hedera.orderGetTotal()');
stmts.push('CALL hedera.order_getTotal()');
let orderIndex = stmts.push(`
SELECT f.*, ot.*

2
modules/order/back/methods/order/getTaxes.js
View File

@ -36,7 +36,7 @@ module.exports = Self => {
SELECT ? AS orderFk`, [orderFk]);
stmts.push(stmt);
stmts.push('CALL hedera.orderGetTax()');
stmts.push('CALL hedera.order_getTax()');
let orderTaxIndex = stmts.push('SELECT * FROM tmp.orderAmount') - 1;

2
modules/order/back/methods/order/getTotal.js
View File

@ -20,7 +20,7 @@ module.exports = Self => {
});
Self.getTotal = async orderFk => {
let query = `SELECT hedera.orderGetTotal(?) total;`;
let query = `SELECT hedera.order_getTotal(?) total;`;
let [total] = await Self.rawSql(query, [orderFk]);
return total.total;

10
modules/ticket/back/methods/sale/moveToTicket.js
View File

@ -26,8 +26,6 @@ module.exports = Self => {
let currentTicket = await models.Ticket.findById(params.currentTicket.currentTicketId);
let newTicketData = {};
let receiverTicket = params.receiverTicket;
let transaction = await Self.beginTransaction({});
let options = {transaction};
let isCurrentTicketEditable = await models.Ticket.isEditable(params.currentTicket.currentTicketId);
if (!isCurrentTicketEditable)
@ -55,7 +53,11 @@ module.exports = Self => {
};
}
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
if (!params.receiverTicket.id)
receiverTicket = await models.Ticket.new(ctx, newTicketData, options);
@ -74,11 +76,11 @@ module.exports = Self => {
promises.push(currentTicket.updateAttributes({isDeleted: true}, options));
await Promise.all(promises);
await transaction.commit();
await tx.commit();
return receiverTicket;
} catch (error) {
await transaction.rollback();
await tx.rollback();
throw error;
}
};

9
modules/ticket/back/methods/sale/updatePrice.js
View File

@ -30,10 +30,11 @@ module.exports = Self => {
Self.updatePrice = async(id, newPrice) => {
let models = Self.app.models;
let transaction = await Self.beginTransaction({});
let options = {transaction};
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let filter = {
fields: ['id', 'ticketFk', 'price'],
include: {
@ -86,9 +87,9 @@ module.exports = Self => {
query = `call vn.manaSpellersRequery(?)`;
await Self.rawSql(query, [salesPerson], options);
await transaction.commit();
await tx.commit();
} catch (error) {
await transaction.rollback();
await tx.rollback();
throw error;
}
};

9
modules/ticket/back/methods/ticket-request/confirm.js
View File

@ -32,10 +32,11 @@ module.exports = Self => {
Self.confirm = async ctx => {
const models = Self.app.models;
let transaction = await Self.beginTransaction({});
let options = {transaction: transaction};
let tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let item = await models.Item.findById(ctx.args.itemFk);
if (!item)
throw new UserError(`That item doesn't exists`);
@ -88,9 +89,9 @@ module.exports = Self => {
message: message
}, options);
await transaction.commit();
await tx.commit();
} catch (error) {
await transaction.rollback();
await tx.rollback();
throw error;
}
};

30
modules/ticket/back/methods/ticket/makeInvoice.js
View File

@ -26,19 +26,20 @@ module.exports = function(Self) {
Self.makeInvoice = async(ctx, id) => {
let userId = ctx.req.accessToken.userId;
let models = Self.app.models;
let options = {};
options.transaction = await Self.beginTransaction({});
let $ = Self.app.models;
let tx = await Self.beginTransaction({});
try {
let ticket = await models.Ticket.findById(id, {fields: ['id', 'clientFk', 'companyFk']});
let options = {transaction: tx};
let clientCanBeInvoiced = await models.Client.canBeInvoiced(ticket.clientFk);
let filter = {fields: ['id', 'clientFk', 'companyFk']};
let ticket = await $.Ticket.findById(id, filter, options);
let clientCanBeInvoiced = await $.Client.canBeInvoiced(ticket.clientFk);
if (!clientCanBeInvoiced)
throw new UserError(`This client can't be invoiced`);
let ticketCanBeInvoiced = await models.Ticket.canBeInvoiced(ticket.id);
let ticketCanBeInvoiced = await $.Ticket.canBeInvoiced(ticket.id);
if (!ticketCanBeInvoiced)
throw new UserError(`This ticket can't be invoiced`);
@ -50,9 +51,12 @@ module.exports = function(Self) {
query = `CALL vn.invoiceFromTicket(?)`;
await Self.rawSql(query, [ticket.id], options);
query = `CALL vn.invoiceOutMake(?, ?, @invoiceId);
SELECT @invoiceId AS invoiceId;`;
result = await Self.rawSql(query, [serial, null], options);
result = await Self.rawSql(
`CALL vn.invoiceOutMake(?, ?, @invoiceId);
SELECT @invoiceId AS invoiceId;`,
[serial, null],
options
);
let invoice = result[1][0].invoiceId;
if (serial != 'R' && invoice) {
@ -60,15 +64,15 @@ module.exports = function(Self) {
await Self.rawSql(query, [invoice], options);
}
let user = await Self.app.models.Worker.findOne({where: {userFk: userId}});
let user = await $.Worker.findOne({where: {userFk: userId}}, options);
query = `INSERT INTO printServerQueue(reportFk, param1, workerFk) VALUES (?, ?, ?)`;
await Self.rawSql(query, [3, invoice, user.id], options);
await options.transaction.commit();
await tx.commit();
return {invoiceFk: invoice, serial};
} catch (e) {
options.transaction.rollback();
await tx.rollback();
throw e;
}
};

32
modules/ticket/back/methods/ticket/new.js
View File

@ -21,8 +21,9 @@ module.exports = Self => {
}
});
Self.new = async(ctx, params, transaction) => {
let address = await Self.app.models.Address.findOne({
Self.new = async(ctx, params, options) => {
let $ = Self.app.models;
let address = await $.Address.findOne({
where: {id: params.addressFk},
fields: ['id', 'clientFk'],
include: [
@ -41,7 +42,7 @@ module.exports = Self => {
let agencyMode;
if (params && params.agencyModeFk)
agencyMode = await Self.app.models.AgencyMode.findById(params.agencyModeFk);
agencyMode = await $.AgencyMode.findById(params.agencyModeFk);
if (address.client().type().code === 'normal' && (!agencyMode || agencyMode.code != 'refund')) {
if (address.client().isFreezed)
@ -51,12 +52,19 @@ module.exports = Self => {
throw new UserError(`You can't create a ticket for a inactive client`);
}
if (!transaction || !transaction.commit)
transaction = await Self.beginTransaction({});
let tx;
if ((typeof options) != 'object')
options = {};
if (!options.transaction) {
tx = await Self.beginTransaction({});
options.transaction = tx;
}
try {
if (!params.shipped && params.landed) {
params.shipped = await Self.app.models.Agency.getShipped(ctx, {
params.shipped = await $.Agency.getShipped(ctx, {
landed: params.landed,
addressFk: address.id,
agencyModeFk: params.agencyModeFk,
@ -65,7 +73,7 @@ module.exports = Self => {
}
if (params.shipped && !params.landed) {
const landedResult = await Self.app.models.Agency.getLanded(ctx, {
const landedResult = await $.Agency.getLanded(ctx, {
shipped: params.shipped,
addressFk: address.id,
agencyModeFk: params.agencyModeFk,
@ -89,9 +97,9 @@ module.exports = Self => {
params.routeFk || null,
params.landed,
params.userId
], {options: transaction});
], options);
let ticket = await Self.app.models.Ticket.findById(result[1][0].newTicketId, {options: transaction});
let ticket = await $.Ticket.findById(result[1][0].newTicketId, null, options);
let cleanInstance = JSON.parse(JSON.stringify(ticket));
let logRecord = {
@ -104,12 +112,12 @@ module.exports = Self => {
newInstance: cleanInstance
};
await Self.app.models.TicketLog.create(logRecord, {options: transaction});
await $.TicketLog.create(logRecord, options);
await transaction.commit();
if (tx) await tx.commit();
return await ticket;
} catch (e) {
await transaction.rollback();
if (tx) await tx.rollback();
throw e;
}
};

9
modules/ticket/back/methods/ticket/updateDiscount.js
View File

@ -36,10 +36,11 @@ module.exports = Self => {
Self.updateDiscount = async(id, salesIds, newDiscount) => {
const models = Self.app.models;
const transaction = await Self.beginTransaction({});
const options = {transaction};
const tx = await Self.beginTransaction({});
try {
const options = {transaction: tx};
const filter = {
fields: ['id', 'ticketFk', 'price'],
where: {
@ -112,9 +113,9 @@ module.exports = Self => {
query = `call vn.manaSpellersRequery(?)`;
await Self.rawSql(query, [salesPersonId], options);
await transaction.commit();
await tx.commit();
} catch (error) {
await transaction.rollback();
await tx.rollback();
throw error;
}
};

9
modules/ticket/back/methods/ticket/uploadFile.js
View File

@ -50,11 +50,12 @@ module.exports = Self => {
Self.uploadFile = async(ctx, id) => {
const models = Self.app.models;
const transaction = await Self.beginTransaction({});
const options = {transaction};
const promises = [];
const tx = await Self.beginTransaction({});
try {
const options = {transaction: tx};
const uploadedFiles = await models.Dms.uploadFile(ctx, options);
uploadedFiles.forEach(dms => {
const newTicketDms = models.TicketDms.create({
@ -66,11 +67,11 @@ module.exports = Self => {
});
const resolvedPromises = await Promise.all(promises);
await transaction.commit();
await tx.commit();
return resolvedPromises;
} catch (err) {
await transaction.rollback();
await tx.rollback();
throw err;
}
};

1
modules/worker/back/methods/worker-calendar/absences.js
View File

@ -1,4 +1,5 @@
const UserError = require('vn-loopback/util/user-error');
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
module.exports = Self => {
Self.remoteMethodCtx('absences', {

1573
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -16,7 +16,7 @@
"loopback": "^3.25.0",
"loopback-boot": "^2.27.1",
"loopback-component-explorer": "^6.3.1",
"loopback-component-storage": "^3.6.0",
"loopback-component-storage": "^3.6.1",
"loopback-connector-mysql": "^5.3.1",
"loopback-connector-remote": "^3.4.1",
"loopback-context": "^3.4.0",
@ -47,7 +47,7 @@
"eslint-plugin-jasmine": "^2.10.1",
"fancy-log": "^1.3.2",
"file-loader": "^1.1.11",
"gulp": "^4.0.0",
"gulp": "^4.0.2",
"gulp-concat": "^2.6.1",
"gulp-env": "^0.4.0",
"gulp-file": "^0.4.0",

2
print/report/rpt-claim-pickup-order/locale.js
View File

@ -15,7 +15,7 @@ module.exports = {
sections: {
agency: {
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 <em>(agomezf@integra2.es)</em>`
Tlf: 96 166 77 88 - Ana Gómez (Ext. 113) <em>(agomezf@integra2.es)</em> `
}
}
},