+
diff --git a/front/core/components/input-file/style.scss b/front/core/components/input-file/style.scss
index 44d11f774..72470c4fe 100644
--- a/front/core/components/input-file/style.scss
+++ b/front/core/components/input-file/style.scss
@@ -4,4 +4,13 @@
.value {
cursor: pointer;
}
+ .control {
+ & > input[type=file] {
+ opacity: 0;
+ }
+ & > section {
+ position: absolute;
+ bottom: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index 89b5d7df6..10ec1f608 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -139,8 +139,12 @@ export default class Searchbar extends Component {
}
removeParam(index) {
+ const field = this.params[index].key;
+ this.filterSanitizer(field);
+
this.params.splice(index, 1);
- this.doSearch(this.fromBar(), 'bar');
+ this.toRemove = field;
+ this.doSearch(this.fromBar(), 'removeBar');
}
fromBar() {
@@ -163,7 +167,7 @@ export default class Searchbar extends Component {
let keys = Object.keys(filter);
keys.forEach(key => {
- if (key == 'search') return;
+ if (key == 'search' || key == 'tableQ' || key == 'tableOrder') return;
let value = filter[key];
let chip;
@@ -198,6 +202,7 @@ export default class Searchbar extends Component {
let promise = this.onSearch({$params: filter});
promise = promise || this.$q.resolve();
promise.then(data => this.onFilter(filter, source, data));
+ this.toBar(filter);
}
onFilter(filter, source, data) {
@@ -238,8 +243,11 @@ export default class Searchbar extends Component {
} else {
state = this.searchState;
- if (filter)
+ if (filter) {
+ if (this.tableQ)
+ filter.tableQ = this.tableQ;
params = {q: JSON.stringify(filter)};
+ }
if (this.$state.is(state))
opts = {location: 'replace'};
}
@@ -247,6 +255,12 @@ export default class Searchbar extends Component {
this.filter = filter;
+ if (source == 'removeBar') {
+ delete params[this.toRemove];
+ delete this.model.userParams[this.toRemove];
+ this.model.refresh();
+ }
+
if (!filter && this.model)
this.model.clear();
if (source != 'state')
@@ -269,9 +283,14 @@ export default class Searchbar extends Component {
this.model.clear();
return;
}
+ if (Object.keys(filter).length === 0) {
+ this.filterSanitizer('search');
+ if (this.model.userParams)
+ delete this.model.userParams['search'];
+ }
let where = null;
- let params = null;
+ let params = {};
if (this.exprBuilder) {
where = buildFilter(filter,
@@ -283,9 +302,89 @@ export default class Searchbar extends Component {
params = this.fetchParams({$params: params});
}
+ this.tableQ = null;
+
+ const hasParams = this.$params.q && Object.keys(JSON.parse(this.$params.q)).length;
+ if (hasParams) {
+ const stateFilter = JSON.parse(this.$params.q);
+ for (let param in stateFilter) {
+ if (param != 'tableQ' && param != 'orderQ')
+ this.filterSanitizer(param);
+ }
+
+ for (let param in this.suggestedFilter) {
+ this.filterSanitizer(param);
+ delete stateFilter[param];
+ }
+
+ this.tableQ = stateFilter.tableQ;
+ for (let param in stateFilter.tableQ)
+ params[param] = stateFilter.tableQ[param];
+
+ Object.assign(stateFilter, params);
+ return this.model.applyParams(params)
+ .then(() => this.model.data);
+ }
+
return this.model.applyFilter(where ? {where} : null, params)
.then(() => this.model.data);
}
+
+ filterSanitizer(field) {
+ if (!field) return;
+ const userFilter = this.model.userFilter;
+ const userParams = this.model.userParams;
+ const where = userFilter && userFilter.where;
+
+ if (this.model.userParams)
+ delete this.model.userParams[field];
+
+ if (this.exprBuilder) {
+ const param = this.exprBuilder({
+ param: field,
+ value: null
+ });
+ if (param) [field] = Object.keys(param);
+ }
+
+ if (!where) return;
+
+ const whereKeys = Object.keys(where);
+ for (let key of whereKeys) {
+ removeProp(where, field, key);
+
+ if (Object.keys(where).length == 0)
+ delete userFilter.where;
+ }
+
+ function removeProp(obj, targetProp, prop) {
+ if (prop == targetProp)
+ delete obj[prop];
+
+ if (prop === 'and' || prop === 'or' && obj[prop]) {
+ const arrayCopy = obj[prop].slice();
+ for (let param of arrayCopy) {
+ const [key] = Object.keys(param);
+ const index = obj[prop].findIndex(param => {
+ return Object.keys(param)[0] == key;
+ });
+ if (key == targetProp)
+ obj[prop].splice(index, 1);
+
+ if (param[key] instanceof Array)
+ removeProp(param, field, key);
+
+ if (Object.keys(param).length == 0)
+ obj[prop].splice(index, 1);
+ }
+
+ if (obj[prop].length == 0)
+ delete obj[prop];
+ }
+ }
+
+ return {userFilter, userParams};
+ }
}
ngModule.vnComponent('vnSearchbar', {
diff --git a/front/core/components/searchbar/searchbar.spec.js b/front/core/components/searchbar/searchbar.spec.js
index e4f58d294..ed8fd9d07 100644
--- a/front/core/components/searchbar/searchbar.spec.js
+++ b/front/core/components/searchbar/searchbar.spec.js
@@ -6,7 +6,7 @@ describe('Component vnSearchbar', () => {
let $state;
let $params;
let $scope;
- let filter = {id: 1, search: 'needle'};
+ const filter = {id: 1, search: 'needle'};
beforeEach(ngModule('vnCore', $stateProvider => {
$stateProvider
@@ -70,8 +70,8 @@ describe('Component vnSearchbar', () => {
describe('filter() setter', () => {
it(`should update the bar params and search`, () => {
- let withoutHours = new Date(2000, 1, 1);
- let withHours = new Date(withoutHours.getTime());
+ const withoutHours = new Date(2000, 1, 1);
+ const withHours = new Date(withoutHours.getTime());
withHours.setHours(12, 30, 15, 10);
controller.filter = {
@@ -83,8 +83,8 @@ describe('Component vnSearchbar', () => {
myObjectProp: {myProp: 1}
};
- let chips = {};
- for (let param of controller.params || [])
+ const chips = {};
+ for (const param of controller.params || [])
chips[param.key] = param.chip;
expect(controller.searchString).toBe('needle');
@@ -172,13 +172,22 @@ describe('Component vnSearchbar', () => {
describe('removeParam()', () => {
it(`should remove the parameter from the filter`, () => {
jest.spyOn(controller, 'doSearch');
+ controller.model = {
+ refresh: jest.fn(),
+ userParams: {
+ id: 1
+ }
+ };
+
+ controller.model.applyParams = jest.fn().mockReturnValue(Promise.resolve());
+ jest.spyOn(controller.model, 'applyParams');
controller.filter = filter;
controller.removeParam(0);
expect(controller.doSearch).toHaveBeenCalledWith({
search: 'needle'
- }, 'bar');
+ }, 'removeBar');
});
});
@@ -199,7 +208,7 @@ describe('Component vnSearchbar', () => {
it(`should go to the summary state when one result`, () => {
jest.spyOn($state, 'go');
- let data = [{id: 1}];
+ const data = [{id: 1}];
controller.baseState = 'foo';
controller.onFilter(filter, 'any', data);
@@ -214,7 +223,7 @@ describe('Component vnSearchbar', () => {
$scope.$apply();
jest.spyOn($state, 'go');
- let data = [{id: 1}];
+ const data = [{id: 1}];
controller.baseState = 'foo';
controller.onFilter(filter, 'any', data);
@@ -229,7 +238,7 @@ describe('Component vnSearchbar', () => {
$scope.$apply();
jest.spyOn($state, 'go');
- let data = [{id: 1}];
+ const data = [{id: 1}];
controller.baseState = 'foo';
controller.onFilter(filter, 'any', data);
@@ -247,7 +256,7 @@ describe('Component vnSearchbar', () => {
controller.onFilter(filter, 'any');
$scope.$apply();
- let queryParams = {q: JSON.stringify(filter)};
+ const queryParams = {q: JSON.stringify(filter)};
expect($state.go).toHaveBeenCalledWith('search.state', queryParams, undefined);
expect(controller.filter).toEqual(filter);
diff --git a/front/core/components/smart-table/index.html b/front/core/components/smart-table/index.html
index f26a6b4a2..752019313 100644
--- a/front/core/components/smart-table/index.html
+++ b/front/core/components/smart-table/index.html
@@ -103,3 +103,4 @@
+
diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js
index 9e6e7009c..8d2c3c153 100644
--- a/front/core/components/smart-table/index.js
+++ b/front/core/components/smart-table/index.js
@@ -15,9 +15,17 @@ export default class SmartTable extends Component {
this.$inputsScope;
this.columns = [];
this.autoSave = false;
+ this.autoState = true;
this.transclude();
}
+ $onChanges() {
+ if (this.model) {
+ this.defaultFilter();
+ this.defaultOrder();
+ }
+ }
+
$onDestroy() {
const styleElement = document.querySelector('style[id="smart-table"]');
if (this.$.css && styleElement)
@@ -47,10 +55,8 @@ export default class SmartTable extends Component {
set model(value) {
this._model = value;
- if (value) {
+ if (value)
this.$.model = value;
- this.defaultOrder();
- }
}
getDefaultViewConfig() {
@@ -160,8 +166,36 @@ export default class SmartTable extends Component {
}
}
+ defaultFilter() {
+ if (this.disabledTableFilter || !this.$params.q) return;
+
+ const stateFilter = JSON.parse(this.$params.q).tableQ;
+ if (!stateFilter || !this.exprBuilder) return;
+
+ const columns = this.columns.map(column => column.field);
+
+ this.displaySearch();
+ if (!this.$inputsScope.searchProps)
+ this.$inputsScope.searchProps = {};
+
+ for (let param in stateFilter) {
+ if (columns.includes(param)) {
+ const whereParams = {[param]: stateFilter[param]};
+ Object.assign(this.$inputsScope.searchProps, whereParams);
+ this.addFilter(param, stateFilter[param]);
+ }
+ }
+ }
+
defaultOrder() {
- const order = this.model.order;
+ if (this.disabledTableOrder) return;
+
+ let stateOrder;
+ if (this.$params.q)
+ stateOrder = JSON.parse(this.$params.q).tableOrder;
+
+ const order = stateOrder ? stateOrder : this.model.order;
+
if (!order) return;
const orderFields = order.split(', ');
@@ -195,6 +229,9 @@ export default class SmartTable extends Component {
this.setPriority(column.element, priority);
}
}
+
+ this.model.order = order;
+ this.refresh();
}
registerColumns() {
@@ -395,28 +432,54 @@ export default class SmartTable extends Component {
}
searchByColumn(field) {
- const searchCriteria = this.$inputsScope.searchProps[field];
- const emptySearch = searchCriteria === '' || searchCriteria == null;
-
const filters = this.filterSanitizer(field);
if (filters && filters.userFilter)
this.model.userFilter = filters.userFilter;
- if (!emptySearch)
- this.addFilter(field, this.$inputsScope.searchProps[field]);
- else this.model.refresh();
+ this.addFilter(field, this.$inputsScope.searchProps[field]);
+ }
+
+ searchPropsSanitizer() {
+ if (!this.$inputsScope || !this.$inputsScope.searchProps) return null;
+ let searchProps = this.$inputsScope.searchProps;
+ const searchPropsArray = Object.entries(searchProps);
+ searchProps = searchPropsArray.filter(
+ ([key, value]) => value && value != ''
+ );
+
+ return Object.fromEntries(searchProps);
}
addFilter(field, value) {
- let where = {[field]: value};
+ if (value == '') value = null;
- if (this.exprBuilder) {
- where = buildFilter(where, (param, value) =>
- this.exprBuilder({param, value})
- );
+ let stateFilter = {tableQ: {}};
+ if (this.$params.q) {
+ stateFilter = JSON.parse(this.$params.q);
+ if (!stateFilter.tableQ)
+ stateFilter.tableQ = {};
+ delete stateFilter.tableQ[field];
}
- this.model.addFilter({where});
+ const whereParams = {[field]: value};
+ if (value) {
+ let where = {[field]: value};
+ if (this.exprBuilder) {
+ where = buildFilter(whereParams, (param, value) =>
+ this.exprBuilder({param, value})
+ );
+ }
+ this.model.addFilter({where});
+ }
+
+ const searchProps = this.searchPropsSanitizer();
+
+ Object.assign(stateFilter.tableQ, searchProps);
+
+ const params = {q: JSON.stringify(stateFilter)};
+
+ this.$state.go(this.$state.current.name, params, {location: 'replace'});
+ this.refresh();
}
applySort() {
@@ -426,7 +489,18 @@ export default class SmartTable extends Component {
if (order)
this.model.order = order;
- this.model.refresh();
+ let stateFilter = {tableOrder: {}};
+ if (this.$params.q) {
+ stateFilter = JSON.parse(this.$params.q);
+ if (!stateFilter.tableOrder)
+ stateFilter.tableOrder = {};
+ }
+
+ stateFilter.tableOrder = order;
+
+ const params = {q: JSON.stringify(stateFilter)};
+ this.$state.go(this.$state.current.name, params, {location: 'replace'});
+ this.refresh();
}
filterSanitizer(field) {
@@ -535,6 +609,8 @@ ngModule.vnComponent('smartTable', {
autoSave: ' {
$httpBackend = _$httpBackend_;
$element = $compile(`
`)($rootScope);
controller = $element.controller('smartTable');
+ controller.model = {
+ refresh: jest.fn().mockReturnValue(new Promise(resolve => resolve())),
+ addFilter: jest.fn(),
+ userParams: {}
+ };
}));
afterEach(() => {
@@ -83,7 +88,7 @@ describe('Component smartTable', () => {
describe('defaultOrder', () => {
it('should insert a new object to the controller sortCriteria with a sortType value of "ASC"', () => {
const element = document.createElement('div');
- controller.model = {order: 'id'};
+ controller.model.order = 'id';
controller.columns = [
{field: 'id', element: element},
{field: 'test1', element: element},
@@ -101,7 +106,8 @@ describe('Component smartTable', () => {
it('should add new entries to the controller sortCriteria with a sortType values of "ASC" and "DESC"', () => {
const element = document.createElement('div');
- controller.model = {order: 'test1, id DESC'};
+ controller.model.order = 'test1, id DESC';
+
controller.columns = [
{field: 'id', element: element},
{field: 'test1', element: element},
@@ -125,8 +131,6 @@ describe('Component smartTable', () => {
describe('addFilter()', () => {
it('should call the model addFilter() with a basic where filter if exprBuilder() was not received', () => {
- controller.model = {addFilter: jest.fn()};
-
controller.addFilter('myField', 'myValue');
const expectedFilter = {
@@ -140,7 +144,6 @@ describe('Component smartTable', () => {
it('should call the model addFilter() with a built where filter resultant of exprBuilder()', () => {
controller.exprBuilder = jest.fn().mockReturnValue({builtField: 'builtValue'});
- controller.model = {addFilter: jest.fn()};
controller.addFilter('myField', 'myValue');
@@ -155,35 +158,48 @@ describe('Component smartTable', () => {
});
describe('applySort()', () => {
- it('should call the model refresh() without making changes on the model order', () => {
- controller.model = {refresh: jest.fn()};
+ it('should call the $state go and model refresh without making changes on the model order', () => {
+ controller.$state = {
+ go: jest.fn(),
+ current: {
+ name: 'section'
+ }
+ };
+ jest.spyOn(controller, 'refresh');
controller.applySort();
expect(controller.model.order).toBeUndefined();
- expect(controller.model.refresh).toHaveBeenCalled();
+ expect(controller.$state.go).toHaveBeenCalled();
+ expect(controller.refresh).toHaveBeenCalled();
});
- it('should call the model.refresh() after setting model order according to the controller sortCriteria', () => {
- controller.model = {refresh: jest.fn()};
+ it('should call the $state go and model refresh after setting model order according to the controller sortCriteria', () => {
const orderBy = {field: 'myField', sortType: 'ASC'};
+ controller.$state = {
+ go: jest.fn(),
+ current: {
+ name: 'section'
+ }
+ };
+ jest.spyOn(controller, 'refresh');
+
controller.sortCriteria = [orderBy];
controller.applySort();
expect(controller.model.order).toEqual(`${orderBy.field} ${orderBy.sortType}`);
- expect(controller.model.refresh).toHaveBeenCalled();
+ expect(controller.$state.go).toHaveBeenCalled();
+ expect(controller.refresh).toHaveBeenCalled();
});
});
describe('filterSanitizer()', () => {
it('should remove the where filter after leaving no fields in it', () => {
- controller.model = {
- userFilter: {
- where: {fieldToRemove: 'valueToRemove'}
- },
- userParams: {}
+ controller.model.userFilter = {
+ where: {fieldToRemove: 'valueToRemove'}
};
+ controller.model.userParams = {};
const result = controller.filterSanitizer('fieldToRemove');
@@ -193,23 +209,21 @@ describe('Component smartTable', () => {
});
it('should remove the where filter after leaving no fields and "empty ands/ors" in it', () => {
- controller.model = {
- userFilter: {
- where: {
- and: [
- {aFieldToRemove: 'aValueToRemove'},
- {aFieldToRemove: 'aValueToRemove'},
- {
- or: [
- {aFieldToRemove: 'aValueToRemove'},
- {aFieldToRemove: 'aValueToRemove'},
- ]
- }
- ]
- }
- },
- userParams: {}
- };
+ controller.model.userFilter = {
+ where: {
+ and: [
+ {aFieldToRemove: 'aValueToRemove'},
+ {aFieldToRemove: 'aValueToRemove'},
+ {
+ or: [
+ {aFieldToRemove: 'aValueToRemove'},
+ {aFieldToRemove: 'aValueToRemove'},
+ ]
+ }
+ ]
+ }
+ },
+ controller.model.userParams = {};
const result = controller.filterSanitizer('aFieldToRemove');
@@ -219,24 +233,22 @@ describe('Component smartTable', () => {
});
it('should not remove the where filter after leaving no empty "ands/ors" in it', () => {
- controller.model = {
- userFilter: {
- where: {
- and: [
- {aFieldToRemove: 'aValueToRemove'},
- {aFieldToRemove: 'aValueToRemove'},
- {
- or: [
- {aFieldToRemove: 'aValueToRemove'},
- {aFieldToRemove: 'aValueToRemove'},
- ]
- }
- ],
- or: [{dontKillMe: 'thanks'}]
- }
- },
- userParams: {}
+ controller.model.userFilter = {
+ where: {
+ and: [
+ {aFieldToRemove: 'aValueToRemove'},
+ {aFieldToRemove: 'aValueToRemove'},
+ {
+ or: [
+ {aFieldToRemove: 'aValueToRemove'},
+ {aFieldToRemove: 'aValueToRemove'},
+ ]
+ }
+ ],
+ or: [{dontKillMe: 'thanks'}]
+ }
};
+ controller.model.userParams = {};
const result = controller.filterSanitizer('aFieldToRemove');
@@ -249,7 +261,7 @@ describe('Component smartTable', () => {
describe('saveAll()', () => {
it('should throw an error if there are no changes to save in the model', () => {
jest.spyOn(controller.vnApp, 'showError');
- controller.model = {isChanged: false};
+ controller.model.isChanged = false;
controller.saveAll();
expect(controller.vnApp.showError).toHaveBeenCalledWith('No changes to save');
@@ -258,10 +270,8 @@ describe('Component smartTable', () => {
it('should call the showSuccess() if there are changes to save in the model', done => {
jest.spyOn(controller.vnApp, 'showSuccess');
- controller.model = {
- save: jest.fn().mockReturnValue(Promise.resolve()),
- isChanged: true
- };
+ controller.model.save = jest.fn().mockReturnValue(Promise.resolve());
+ controller.model.isChanged = true;
controller.saveAll().then(() => {
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
@@ -269,4 +279,43 @@ describe('Component smartTable', () => {
}).catch(done.fail);
});
});
+
+ describe('defaultFilter()', () => {
+ it('should call model refresh and model addFilter with filter', () => {
+ controller.exprBuilder = jest.fn().mockReturnValue({builtField: 'builtValue'});
+
+ controller.$params = {
+ q: '{"tableQ": {"fieldName":"value"}}'
+ };
+ controller.columns = [
+ {field: 'fieldName'}
+ ];
+ controller.$inputsScope = {
+ searchProps: {}
+ };
+ jest.spyOn(controller, 'refresh');
+
+ controller.defaultFilter();
+
+ expect(controller.model.addFilter).toHaveBeenCalled();
+ expect(controller.refresh).toHaveBeenCalled();
+ });
+ });
+
+ describe('searchPropsSanitizer()', () => {
+ it('should searchProps sanitize', () => {
+ controller.$inputsScope = {
+ searchProps: {
+ filterOne: '1',
+ filterTwo: ''
+ }
+ };
+ const searchPropsExpected = {
+ filterOne: '1'
+ };
+ const newSearchProps = controller.searchPropsSanitizer();
+
+ expect(newSearchProps).toEqual(searchPropsExpected);
+ });
+ });
});
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index e5dc82b16..d92c32b33 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -51,6 +51,7 @@ Entries: Entradas
Users: Usuarios
Suppliers: Proveedores
Monitors: Monitores
+Shelvings: Carros
# Common
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 1e151294f..f03441c0f 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -134,6 +134,7 @@
"Password does not meet requirements": "Password does not meet requirements",
"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
"Not enough privileges to edit a client": "Not enough privileges to edit a client",
+ "Claim pickup order sent": "Claim pickup order sent [({{claimId}})]({{{claimUrl}}}) to client *{{clientName}}*",
"You don't have grant privilege": "You don't have grant privilege",
"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user"
}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index a41315dd1..36595c51b 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -236,6 +236,9 @@
"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+ "This route does not exists": "Esta ruta no existe",
+ "Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
"You don't have grant privilege": "No tienes privilegios para dar privilegios",
- "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario"
+ "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+ "Empty data source": "Origen de datos vacio"
}
diff --git a/modules/account/back/models/ldap-config.js b/modules/account/back/models/ldap-config.js
index 819659066..a2a2684a9 100644
--- a/modules/account/back/models/ldap-config.js
+++ b/modules/account/back/models/ldap-config.js
@@ -5,6 +5,8 @@ const crypto = require('crypto');
const nthash = require('smbhash').nthash;
module.exports = Self => {
+ const shouldSync = process.env.NODE_ENV !== 'test';
+
Self.getSynchronizer = async function() {
return await Self.findOne({
fields: [
@@ -30,6 +32,7 @@ module.exports = Self => {
},
async syncUser(userName, info, password) {
+
let {
client,
accountConfig
@@ -130,13 +133,14 @@ module.exports = Self => {
}));
}
- if (changes.length)
+ if (shouldSync && changes.length)
await client.modify(dn, changes);
- } else
+ } else if (shouldSync)
await client.add(dn, newEntry);
} else {
try {
- await client.del(dn);
+ if (shouldSync)
+ await client.del(dn);
console.log(` -> User '${userName}' removed from LDAP`);
} catch (e) {
if (e.name !== 'NoSuchObjectError') throw e;
@@ -196,17 +200,19 @@ module.exports = Self => {
for (let group of groups) {
try {
let dn = `cn=${group},${groupDn}`;
- await client.modify(dn, new ldap.Change({
- operation,
- modification: {memberUid: userName}
- }));
+ if (shouldSync) {
+ await client.modify(dn, new ldap.Change({
+ operation,
+ modification: {memberUid: userName}
+ }));
+ }
} catch (err) {
if (err.name !== 'NoSuchObjectError')
throw err;
}
}
}
-
+
await applyOperations(deleteGroups, 'delete');
await applyOperations(addGroups, 'add');
},
@@ -266,8 +272,10 @@ module.exports = Self => {
filter: 'objectClass=posixGroup'
};
let reqs = [];
- await client.searchForeach(this.groupDn, opts,
- o => reqs.push(client.del(o.dn)));
+ await client.searchForeach(this.groupDn, opts, object => {
+ if (shouldSync)
+ reqs.push(client.del(object.dn));
+ });
await Promise.all(reqs);
// Recreate roles
@@ -291,7 +299,8 @@ module.exports = Self => {
}
let dn = `cn=${role.name},${this.groupDn}`;
- reqs.push(client.add(dn, newEntry));
+ if (shouldSync)
+ reqs.push(client.add(dn, newEntry));
}
await Promise.all(reqs);
}
diff --git a/modules/account/back/models/samba-config.js b/modules/account/back/models/samba-config.js
index 5fd62a68b..168b5ffb4 100644
--- a/modules/account/back/models/samba-config.js
+++ b/modules/account/back/models/samba-config.js
@@ -60,16 +60,19 @@ module.exports = Self => {
return `cn=Users,${dnBase}`;
},
- async syncUser(userName, info, password) {
+ async syncUser(userName, info, password) {
let {sshClient} = this;
-
+
let sambaUser = await this.adClient.searchOne(this.usersDn(), {
scope: 'sub',
attributes: ['userAccountControl'],
filter: `(&(objectClass=user)(sAMAccountName=${userName}))`
});
let isEnabled = sambaUser
- && !(sambaUser.userAccountControl & UserAccountControlFlags.ACCOUNTDISABLE);
+ && !(sambaUser.userAccountControl & UserAccountControlFlags.ACCOUNTDISABLE);
+
+ if (process.env.NODE_ENV === 'test')
+ return;
if (info.hasAccount) {
if (!sambaUser) {
diff --git a/modules/claim/back/methods/claim/claimPickupEmail.js b/modules/claim/back/methods/claim/claimPickupEmail.js
index 4d64cc66e..c688d6ded 100644
--- a/modules/claim/back/methods/claim/claimPickupEmail.js
+++ b/modules/claim/back/methods/claim/claimPickupEmail.js
@@ -9,7 +9,7 @@ module.exports = Self => {
arg: 'id',
type: 'number',
required: true,
- description: 'The client id',
+ description: 'The claim id',
http: {source: 'path'}
},
{
@@ -42,6 +42,11 @@ module.exports = Self => {
});
Self.claimPickupEmail = async ctx => {
+ const models = Self.app.models;
+ const userId = ctx.req.accessToken.userId;
+ const $t = ctx.req.__; // $translate
+ const origin = ctx.req.headers.origin;
+
const args = Object.assign({}, ctx.args);
const params = {
recipient: args.recipient,
@@ -52,6 +57,34 @@ module.exports = Self => {
for (const param in args)
params[param] = args[param];
+ const claim = await models.Claim.findById(args.id, {
+ fields: ['id', 'clientFk'],
+ include: {
+ relation: 'client',
+ scope: {
+ fields: ['name', 'salesPersonFk']
+ }
+ }
+ });
+
+ const message = $t('Claim pickup order sent', {
+ claimId: args.id,
+ clientName: claim.client().name,
+ claimUrl: `${origin}/#!/claim/${args.id}/summary`,
+ });
+
+ const salesPersonId = claim.client().salesPersonFk;
+ if (salesPersonId)
+ await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
+
+ await models.ClaimLog.create({
+ originFk: args.id,
+ userFk: userId,
+ action: 'insert',
+ description: 'Claim-pickup-order sent',
+ changedModel: 'Mail'
+ });
+
const email = new Email('claim-pickup-order', params);
return email.send();
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index 7a91e180a..16e134c60 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -19,7 +19,7 @@
readonly="true">
@@ -56,7 +56,7 @@
label="Pick up"
ng-model="$ctrl.claim.hasToPickUp"
vn-acl="claimManager"
- info="When checked will notify to the salesPerson">
+ title="{{'When checked will notify to the salesPerson' | translate}}">
diff --git a/modules/claim/front/basic-data/locale/es.yml b/modules/claim/front/basic-data/locale/es.yml
index c51afee3f..5250d266c 100644
--- a/modules/claim/front/basic-data/locale/es.yml
+++ b/modules/claim/front/basic-data/locale/es.yml
@@ -5,5 +5,5 @@ Responsability: Responsabilidad
Company: Empresa
Sales/Client: Comercial/Cliente
Pick up: Recoger
-When checked will notify a pickup to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
-Packages received: Bultos recibidos
\ No newline at end of file
+When checked will notify to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
+Packages received: Bultos recibidos
diff --git a/modules/claim/front/routes.json b/modules/claim/front/routes.json
index d02ea6f6c..a8b958c5f 100644
--- a/modules/claim/front/routes.json
+++ b/modules/claim/front/routes.json
@@ -73,7 +73,7 @@
{
"url": "/note",
"state": "claim.card.note",
- "component": "ui-view",
+ "component": "ui-view",
"abstract": true,
"acl": ["salesPerson"]
},
@@ -105,7 +105,7 @@
"acl": ["claimManager"]
},
{
- "url": "/action",
+ "url": "/action?q",
"state": "claim.card.action",
"component": "vn-claim-action",
"description": "Action",
@@ -131,4 +131,4 @@
"acl": ["claimManager"]
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 0c12aa2e6..6adbfd684 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -25,16 +25,23 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -42,16 +49,23 @@
label="Attended by"
value="{{$ctrl.summary.claim.worker.user.nickname}}">
-
+
+
+
-
Observations
@@ -70,13 +84,13 @@
-
Detail
@@ -98,7 +112,7 @@
-
{{::saleClaimed.sale.itemFk | zeroFill:6}}
@@ -111,7 +125,7 @@
{{::saleClaimed.sale.price | currency: 'EUR':2}}
{{::saleClaimed.sale.discount}} %
- {{saleClaimed.sale.quantity * saleClaimed.sale.price *
+ {{saleClaimed.sale.quantity * saleClaimed.sale.price *
((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
@@ -123,7 +137,7 @@
Photos
-
Development
@@ -165,8 +179,8 @@
{{::development.claimResult.description}}
{{::development.claimResponsible.description}}
-
{{::development.worker.user.nickname}}
@@ -179,21 +193,21 @@
Action
-
{{::action.sale.itemFk | zeroFill:6}}
-
{{::action.sale.ticket.id}}
@@ -258,9 +272,9 @@
vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk">
-
-
-
\ No newline at end of file
+
diff --git a/modules/client/back/methods/client/filter.js b/modules/client/back/methods/client/filter.js
new file mode 100644
index 000000000..3e1ea43bb
--- /dev/null
+++ b/modules/client/back/methods/client/filter.js
@@ -0,0 +1,147 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('filter', {
+ description: 'Find all clients matched by the filter',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'object',
+ },
+ {
+ arg: 'search',
+ type: 'string',
+ description: `If it's and integer searchs by id, otherwise it searchs by name`,
+ },
+ {
+ arg: 'name',
+ type: 'string',
+ description: 'The client name',
+ },
+ {
+ arg: 'salesPersonFk',
+ type: 'number',
+ },
+ {
+ arg: 'fi',
+ type: 'string',
+ description: 'The client fiscal id',
+ },
+ {
+ arg: 'socialName',
+ type: 'string',
+ },
+ {
+ arg: 'city',
+ type: 'string',
+ },
+ {
+ arg: 'postcode',
+ type: 'string',
+ },
+ {
+ arg: 'provinceFk',
+ type: 'number',
+ },
+ {
+ arg: 'email',
+ type: 'string',
+ },
+ {
+ arg: 'phone',
+ type: 'string',
+ },
+ {
+ arg: 'zoneFk',
+ type: 'number',
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/filter`,
+ verb: 'GET'
+ }
+ });
+
+ Self.filter = async(ctx, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const myOptions = {};
+ const postalCode = [];
+ const args = ctx.args;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (args.zoneFk) {
+ query = `CALL vn.zone_getPostalCode(?)`;
+ const [geos] = await Self.rawSql(query, [args.zoneFk]);
+ for (let geo of geos)
+ postalCode.push(geo.name);
+ }
+
+ const where = buildFilter(ctx.args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? {'c.id': {inq: value}}
+ : {'c.name': {like: `%${value}%`}};
+ case 'name':
+ case 'salesPersonFk':
+ case 'fi':
+ case 'socialName':
+ case 'city':
+ case 'postcode':
+ case 'provinceFk':
+ case 'email':
+ case 'phone':
+ param = `c.${param}`;
+ return {[param]: value};
+ case 'zoneFk':
+ param = 'a.postalCode';
+ return {[param]: {inq: postalCode}};
+ }
+ });
+
+ filter = mergeFilters(filter, {where});
+
+ const stmts = [];
+ const stmt = new ParameterizedSQL(
+ `SELECT
+ DISTINCT c.id,
+ c.name,
+ c.fi,
+ c.socialName,
+ c.phone,
+ c.city,
+ c.postcode,
+ c.email,
+ c.isActive,
+ c.isFreezed,
+ p.id AS provinceFk,
+ p.name AS province,
+ u.id AS salesPersonFk,
+ u.name AS salesPerson
+ FROM client c
+ LEFT JOIN account.user u ON u.id = c.salesPersonFk
+ LEFT JOIN province p ON p.id = c.provinceFk
+ JOIN vn.address a ON a.clientFk = c.id
+ `
+ );
+
+ stmt.merge(conn.makeWhere(filter.where));
+ stmt.merge(conn.makePagination(filter));
+
+ const clientsIndex = stmts.push(stmt) - 1;
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+
+ return clientsIndex === 0 ? result : result[clientsIndex];
+ };
+};
diff --git a/modules/client/back/methods/client/specs/filter.spec.js b/modules/client/back/methods/client/specs/filter.spec.js
new file mode 100644
index 000000000..679585050
--- /dev/null
+++ b/modules/client/back/methods/client/specs/filter.spec.js
@@ -0,0 +1,199 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('client filter()', () => {
+ it('should return the clients matching the filter with a limit of 20 rows', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {}};
+ const filter = {limit: '8'};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ expect(result.length).toEqual(8);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the client "Bruce Wayne" matching the search argument with his name', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {search: 'Bruce Wayne'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const firstResult = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstResult.name).toEqual('Bruce Wayne');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the client "Bruce Wayne" matching the search argument with his id', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {search: '1101'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const firstResult = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstResult.name).toEqual('Bruce Wayne');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the client "Bruce Wayne" matching the name argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {name: 'Bruce Wayne'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const firstResult = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstResult.name).toEqual('Bruce Wayne');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients matching the "salesPersonFk" argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+ const salesPersonId = 18;
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {salesPersonFk: salesPersonId}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const randomIndex = Math.floor(Math.random() * result.length);
+ const randomResultClient = result[randomIndex];
+
+ expect(result.length).toBeGreaterThanOrEqual(5);
+ expect(randomResultClient.salesPersonFk).toEqual(salesPersonId);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients matching the "fi" argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {fi: '251628698'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const firstClient = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstClient.name).toEqual('Max Eisenhardt');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients matching the "city" argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {city: 'Gotham'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const randomIndex = Math.floor(Math.random() * result.length);
+ const randomResultClient = result[randomIndex];
+
+ expect(result.length).toBeGreaterThanOrEqual(20);
+ expect(randomResultClient.city.toLowerCase()).toEqual('gotham');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients matching the "postcode" argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {postcode: '46460'}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ const randomIndex = Math.floor(Math.random() * result.length);
+ const randomResultClient = result[randomIndex];
+
+ expect(result.length).toBeGreaterThanOrEqual(20);
+ expect(randomResultClient.postcode).toEqual('46460');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients matching the "zoneFk" argument', async() => {
+ const tx = await models.Client.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ctx = {req: {accessToken: {userId: 1}}, args: {zoneFk: 9}};
+ const filter = {};
+ const result = await models.Client.filter(ctx, filter, options);
+
+ expect(result.length).toBe(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/client/back/methods/receipt/balanceCompensationEmail.js b/modules/client/back/methods/receipt/balanceCompensationEmail.js
new file mode 100644
index 000000000..e9ded147d
--- /dev/null
+++ b/modules/client/back/methods/receipt/balanceCompensationEmail.js
@@ -0,0 +1,40 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('balanceCompensationEmail', {
+ description: 'Sends the debit balances compensation email with an attached PDF',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'Number',
+ required: true,
+ description: 'The receipt id',
+ http: { source: 'path' }
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: '/:id/balance-compensation-email',
+ verb: 'POST'
+ }
+ });
+
+ Self.balanceCompensationEmail = async (ctx, id) => {
+
+ const models = Self.app.models;
+ const receipt = await models.Receipt.findById(id, {fields: ['clientFk']});
+ const client = await models.Client.findById(receipt.clientFk, {fields:['email']});
+
+ const email = new Email('balance-compensation', {
+ lang: ctx.req.getLocale(),
+ recipient: client.email+',administracion@verdnatura.es',
+ id
+ });
+
+ return email.send();
+ };
+};
diff --git a/modules/client/back/methods/receipt/balanceCompensationPdf.js b/modules/client/back/methods/receipt/balanceCompensationPdf.js
new file mode 100644
index 000000000..ff8713253
--- /dev/null
+++ b/modules/client/back/methods/receipt/balanceCompensationPdf.js
@@ -0,0 +1,50 @@
+const { Report } = require('vn-print');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('balanceCompensationPdf', {
+ description: 'Returns the the debit balances compensation pdf',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The receipt id',
+ http: { source: 'path' }
+ }
+ ],
+ returns: [
+ {
+ arg: 'body',
+ type: 'file',
+ root: true
+ }, {
+ arg: 'Content-Type',
+ type: 'String',
+ http: {target: 'header'}
+ }, {
+ arg: 'Content-Disposition',
+ type: 'String',
+ http: {target: 'header'}
+ }
+ ],
+ http: {
+ path: '/:id/balance-compensation-pdf',
+ verb: 'GET'
+ }
+ });
+
+ Self.balanceCompensationPdf = async(ctx, id) => {
+ const args = Object.assign({}, ctx.args);
+ const params = {lang: ctx.req.getLocale()};
+
+ delete args.ctx;
+ for (const param in args)
+ params[param] = args[param];
+
+ const report = new Report('balance-compensation', params);
+ const stream = await report.toPdfStream();
+
+ return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
+ };
+};
diff --git a/modules/client/back/model-config.json b/modules/client/back/model-config.json
index b2e600610..4ef34ca3a 100644
--- a/modules/client/back/model-config.json
+++ b/modules/client/back/model-config.json
@@ -8,6 +8,9 @@
"BankEntity": {
"dataSource": "vn"
},
+ "Business": {
+ "dataSource": "vn"
+ },
"BusinessType": {
"dataSource": "vn"
},
diff --git a/modules/client/back/models/business.json b/modules/client/back/models/business.json
new file mode 100644
index 000000000..7ad2d307f
--- /dev/null
+++ b/modules/client/back/models/business.json
@@ -0,0 +1,27 @@
+{
+ "name": "Business",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "business"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ }
+ },
+ "relations": {
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "workerFk"
+ },
+ "department": {
+ "type": "belongsTo",
+ "model": "Department",
+ "foreignKey": "departmentFk"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/client/back/models/client-methods.js b/modules/client/back/models/client-methods.js
index 04d10413a..5134e3942 100644
--- a/modules/client/back/models/client-methods.js
+++ b/modules/client/back/models/client-methods.js
@@ -47,4 +47,5 @@ module.exports = Self => {
require('../methods/client/incotermsAuthorizationHtml')(Self);
require('../methods/client/incotermsAuthorizationEmail')(Self);
require('../methods/client/consumptionSendQueued')(Self);
+ require('../methods/client/filter')(Self);
};
diff --git a/modules/client/back/models/receipt.js b/modules/client/back/models/receipt.js
index b79102e6b..3118cc239 100644
--- a/modules/client/back/models/receipt.js
+++ b/modules/client/back/models/receipt.js
@@ -2,6 +2,8 @@ const LoopBackContext = require('loopback-context');
module.exports = function(Self) {
require('../methods/receipt/filter')(Self);
+ require('../methods/receipt/balanceCompensationEmail')(Self);
+ require('../methods/receipt/balanceCompensationPdf')(Self);
require('../methods/receipt/receiptPdf')(Self);
Self.validateBinded('amountPaid', isNotZero, {
diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html
index 3c61d8543..1e0716112 100644
--- a/modules/client/front/balance/index/index.html
+++ b/modules/client/front/balance/index/index.html
@@ -121,9 +121,22 @@
-
-
-
+
+
+
+
+
+
+
+
+