{{::$ctrl.label}}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/front/core/directives/index.js b/front/core/directives/index.js
index 4377afe8c..af05c9b38 100644
--- a/front/core/directives/index.js
+++ b/front/core/directives/index.js
@@ -11,7 +11,7 @@ import './visible-by';
import './bind';
import './repeat-last';
import './title';
-import './uvc';
+import './smart-table';
import './droppable';
import './http-click';
import './http-submit';
diff --git a/front/core/directives/uvc.html b/front/core/directives/smart-table.html
similarity index 77%
rename from front/core/directives/uvc.html
rename to front/core/directives/smart-table.html
index 9de13b675..6808b5618 100644
--- a/front/core/directives/uvc.html
+++ b/front/core/directives/smart-table.html
@@ -1,12 +1,13 @@
-
+ label="Salesperson">
+
+ {{$ctrl.claim.client.salesPersonUser.name}}
+
+ label="Attended by">
+
+ {{$ctrl.claim.worker.user.name}}
+
+ label="Ticket">
+
+ {{$ctrl.claim.ticketFk}}
+
+
+ class="vn-pt-sm"
+ icon="more_vert"
+ ng-click="$ctrl.showSmartTable($event)">
-
-
+
diff --git a/front/core/directives/uvc.js b/front/core/directives/smart-table.js
similarity index 70%
rename from front/core/directives/uvc.js
rename to front/core/directives/smart-table.js
index e464a93ab..08d1b6463 100644
--- a/front/core/directives/uvc.js
+++ b/front/core/directives/smart-table.js
@@ -1,23 +1,28 @@
import ngModule from '../module';
-import template from './uvc.html';
-import './uvc.scss';
+import template from './smart-table.html';
+import './smart-table.scss';
+/**
+ * Directive to hide/show selected columns of a table, don't use with rowspan.
+ * Property smart-table-ignore ignores one or more vn-th with prop field.
+ */
directive.$inject = ['$http', '$compile', 'vnApp', '$translate'];
export function directive($http, $compile, vnApp, $translate) {
function getHeaderList($element, $scope) {
- let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`);
- let headerList = Array.from(allHeaders);
+ let filtrableHeaders = $element[0].querySelectorAll('vn-th[field]:not([smart-table-ignore])');
+ let headerList = Array.from(filtrableHeaders);
let ids = [];
let titles = {};
headerList.forEach(header => {
- let id = header.getAttribute('th-id') || header.getAttribute('field');
+ let id = header.getAttribute('field');
ids.push(id);
titles[id] = header.innerText || id.charAt(0).toUpperCase() + id.slice(1);
});
$scope.fields = ids;
$scope.titles = titles;
+ $scope.allHeaders = Array.from($element[0].querySelectorAll('vn-th'));
return headerList;
}
@@ -38,34 +43,33 @@ export function directive($http, $compile, vnApp, $translate) {
Object.keys(userConfig.configuration).forEach(key => {
let index;
if (userConfig.configuration[key] === false) {
- index = headerList.findIndex(el => {
- return (el.getAttribute('th-id') == key || el.getAttribute('field') == key);
+ index = $scope.allHeaders.findIndex(el => {
+ return el.getAttribute('field') == key;
});
- let baseSelector = `vn-table[vn-uvc=${userConfig.tableCode}] > div`;
+ let baseSelector = `vn-table[vn-smart-table=${userConfig.tableCode}] > div`;
selectors.push(`${baseSelector} vn-thead > vn-tr > vn-th:nth-child(${index + 1})`);
selectors.push(`${baseSelector} vn-tbody > vn-tr > vn-td:nth-child(${index + 1})`);
selectors.push(`${baseSelector} vn-tbody > .vn-tr > vn-td:nth-child(${index + 1})`);
}
});
-
- if (document.querySelector('style[id="uvc"]')) {
- let child = document.querySelector('style[id="uvc"]');
+ if (document.querySelector('style[id="smart-table"]')) {
+ let child = document.querySelector('style[id="smart-table"]');
child.parentNode.removeChild(child);
}
if (selectors.length) {
let rule = selectors.join(', ') + '{display: none;}';
$scope.css = document.createElement('style');
- $scope.css.setAttribute('id', 'uvc');
+ $scope.css.setAttribute('id', 'smart-table');
document.head.appendChild($scope.css);
$scope.css.appendChild(document.createTextNode(rule));
}
$scope.$on('$destroy', () => {
- if ($scope.css && document.querySelector('style[id="uvc"]')) {
- let child = document.querySelector('style[id="uvc"]');
+ if ($scope.css && document.querySelector('style[id="smart-table"]')) {
+ let child = document.querySelector('style[id="smart-table"]');
child.parentNode.removeChild(child);
}
});
@@ -80,13 +84,13 @@ export function directive($http, $compile, vnApp, $translate) {
restrict: 'A',
link: async function($scope, $element, $attrs) {
let cTemplate = $compile(template)($scope)[0];
- $scope.$ctrl.showUvc = event => {
+ $scope.$ctrl.showSmartTable = event => {
event.preventDefault();
event.stopImmediatePropagation();
- $scope.uvc.show();
+ $scope.smartTable.show(event.target);
};
- let tableCode = $attrs.vnUvc.trim();
+ let tableCode = $attrs.vnSmartTable.trim();
let headerList = getHeaderList($element, $scope);
let defaultConfigView = {tableCode: tableCode, configuration: {}};
@@ -98,16 +102,16 @@ export function directive($http, $compile, vnApp, $translate) {
addHideClass($scope, headerList, config);
- let table = document.querySelector(`vn-table[vn-uvc=${tableCode}]`);
+ let table = document.querySelector(`vn-table[vn-smart-table=${tableCode}]`);
table.insertBefore(cTemplate, table.firstChild);
$scope.$ctrl.saveConfiguration = async tableConfiguration => {
let newConfig = await saveConfiguration(tableConfiguration);
vnApp.showSuccess($translate.instant('Data saved!'));
addHideClass($scope, headerList, newConfig.data);
- $scope.uvc.hide();
+ $scope.smartTable.hide();
};
}
};
}
-ngModule.directive('vnUvc', directive);
+ngModule.directive('vnSmartTable', directive);
diff --git a/front/core/directives/uvc.scss b/front/core/directives/smart-table.scss
similarity index 76%
rename from front/core/directives/uvc.scss
rename to front/core/directives/smart-table.scss
index 0cdf0ba1a..a156c060b 100644
--- a/front/core/directives/uvc.scss
+++ b/front/core/directives/smart-table.scss
@@ -1,4 +1,4 @@
-vn-table vn-dialog[vn-id="uvc"]{
+vn-table vn-popover[vn-id="smart-table"]{
& > div {
min-width: 288px;
align-items: center;
diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css
index 8805815e8..52a2308b4 100644
--- a/front/core/styles/icons/salixfont.css
+++ b/front/core/styles/icons/salixfont.css
@@ -22,7 +22,9 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
-
+.icon-latestBuys:before {
+ content: "\e95f";
+}
.icon-zone:before {
content: "\e95d";
}
diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg
index 9ca57000d..7e8695d63 100644
--- a/front/core/styles/icons/salixfont.svg
+++ b/front/core/styles/icons/salixfont.svg
@@ -102,6 +102,7 @@
@@ -24,6 +25,6 @@
@@ -79,3 +91,9 @@
question="Delete claim"
message="Are you sure you want to delete this claim?">
+
+
+
+
\ No newline at end of file
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index 42ae87971..d4f031eff 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -34,7 +34,7 @@
- {{::claim.nickName}}
+ {{::claim.userName}}
diff --git a/modules/client/back/methods/client/consumption.js b/modules/client/back/methods/client/consumption.js
index cb5b39c29..8430c4661 100644
--- a/modules/client/back/methods/client/consumption.js
+++ b/modules/client/back/methods/client/consumption.js
@@ -17,20 +17,20 @@ module.exports = Self => {
type: 'String',
description: `If it's and integer searchs by id, otherwise it searchs by name`
}, {
- arg: 'itemFk',
- type: 'Integer',
+ arg: 'itemId',
+ type: 'Number',
description: 'Item id'
}, {
- arg: 'categoryFk',
- type: 'Integer',
+ arg: 'categoryId',
+ type: 'Number',
description: 'Category id'
}, {
- arg: 'typeFk',
- type: 'Integer',
+ arg: 'typeId',
+ type: 'Number',
description: 'Item type id',
}, {
- arg: 'buyerFk',
- type: 'Integer',
+ arg: 'buyerId',
+ type: 'Number',
description: 'Buyer id'
}, {
arg: 'from',
@@ -75,6 +75,10 @@ module.exports = Self => {
return {'it.id': value};
case 'buyerId':
return {'it.workerFk': value};
+ case 'from':
+ return {'t.shipped': {gte: value}};
+ case 'to':
+ return {'t.shipped': {lte: value}};
}
});
filter = mergeFilters(filter, {where});
diff --git a/modules/client/back/methods/client/specs/consumption.spec.js b/modules/client/back/methods/client/specs/consumption.spec.js
index e7a42a8da..30a0572b3 100644
--- a/modules/client/back/methods/client/specs/consumption.spec.js
+++ b/modules/client/back/methods/client/specs/consumption.spec.js
@@ -37,4 +37,24 @@ describe('client consumption() filter', () => {
expect(secondRow.quantity).toEqual(15);
expect(thirdRow.quantity).toEqual(20);
});
+
+ it('should return a list of tickets from the item id 4', async() => {
+ const ctx = {req: {accessToken: {userId: 9}},
+ args: {
+ itemId: 4
+ }
+ };
+ const filter = {
+ where: {
+ clientFk: 101
+ },
+ order: 'itemTypeFk, itemName, itemSize'
+ };
+ const result = await app.models.Client.consumption(ctx, filter);
+
+ const expectedItemId = 4;
+ const firstRow = result[0];
+
+ expect(firstRow.itemFk).toEqual(expectedItemId);
+ });
});
diff --git a/modules/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index 155d95d9e..8a132665f 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -48,7 +48,7 @@ module.exports = Self => {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/client/back/methods/receipt/filter.js b/modules/client/back/methods/receipt/filter.js
index 532d72811..b32249d4b 100644
--- a/modules/client/back/methods/receipt/filter.js
+++ b/modules/client/back/methods/receipt/filter.js
@@ -42,11 +42,11 @@ module.exports = Self => {
r.workerFk,
c.code company,
r.created,
- r.invoiceFk ref,
+ r.invoiceFk description,
NULL debit,
r.amountPaid credit,
r.bankFk,
- u.nickname userNickname,
+ u.name userName,
r.clientFk,
FALSE hasPdf,
FALSE isInvoice
diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html
index bd5d10fd2..51b310128 100644
--- a/modules/client/front/address/index/index.html
+++ b/modules/client/front/address/index/index.html
@@ -46,7 +46,11 @@
style="overflow: hidden; min-width: 14em;">
{{::address.nickname}} - #{{::address.id}}
{{::address.street}}
- {{::address.city}}, {{::address.province.name}}
+
+ {{::address.postalCode}} -
+ {{::address.city}},
+ {{::address.province.name}}
+
{{::address.phone}},
{{::address.mobile}}
diff --git a/modules/client/front/address/index/index.js b/modules/client/front/address/index/index.js
index ea6a9f6b9..3a2b5dfa8 100644
--- a/modules/client/front/address/index/index.js
+++ b/modules/client/front/address/index/index.js
@@ -16,7 +16,8 @@ class Controller extends Section {
'provinceFk',
'phone',
'mobile',
- 'isEqualizated'
+ 'isEqualizated',
+ 'postalCode'
],
order: [
'isDefaultAddress DESC',
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index 506e86f4b..6cfdc0666 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -17,11 +17,17 @@
+ fields="['accountingTypeFk']"
+ include="{relation: 'accountingType'}"
+ order="id"
+ ng-model="$ctrl.receipt.bankFk"
+ search-function="{or: [{id: $search}, {bank: {like: '%'+ $search +'%'}}]}"
+ selection="$ctrl.bankSelection">
+ {{id}}: {{bank}}
+
+
+
+
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 880774f55..8b01cab4a 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -50,6 +50,19 @@ class Controller extends Dialog {
return this.receipt.description;
}
+ get bankSelection() {
+ return this._bankSelection;
+ }
+
+ set bankSelection(value) {
+ this._bankSelection = value;
+
+ if (value) {
+ const accountingType = value.accountingType;
+ this.receipt.description = accountingType && accountingType.receiptDescription;
+ }
+ }
+
getAmountPaid() {
const filter = {
where: {
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
new file mode 100644
index 000000000..11fdb1040
--- /dev/null
+++ b/modules/client/front/balance/create/index.spec.js
@@ -0,0 +1,76 @@
+import './index';
+
+describe('Client', () => {
+ describe('Component vnClientBalancCreate', () => {
+ let controller;
+ let $httpBackend;
+ let $httpParamSerializer;
+
+ beforeEach(ngModule('client'));
+
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+ $httpBackend = _$httpBackend_;
+ $httpParamSerializer = _$httpParamSerializer_;
+ let $scope = $rootScope.$new();
+ const $element = angular.element('
-
+
+
+
+
+
+
+
+
{{::balance.bankFk}}
{{::balance.debit | currency: 'EUR':2}}
{{::balance.credit | currency: 'EUR':2}}
diff --git a/modules/client/front/balance/index/index.js b/modules/client/front/balance/index/index.js
index 8f5261176..7e09e018c 100644
--- a/modules/client/front/balance/index/index.js
+++ b/modules/client/front/balance/index/index.js
@@ -39,6 +39,10 @@ class Controller extends Section {
this.getBalances();
}
+ get isAdministrative() {
+ return this.aclService.hasAny(['administrative']);
+ }
+
getData() {
return this.$.model.applyFilter(null, {
clientId: this.$params.id,
@@ -58,7 +62,7 @@ class Controller extends Section {
return balance.companyFk === selectedCompany;
});
- return currentBalance.amount;
+ return currentBalance && currentBalance.amount;
}
getBalances() {
@@ -79,6 +83,13 @@ class Controller extends Section {
this.$.invoiceOutDescriptor.show(event.target, balance.id);
}
+
+ changeDescription(balance) {
+ const params = {description: balance.description};
+ const endpoint = `Receipts/${balance.id}`;
+ this.$http.patch(endpoint, params)
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
+ }
}
Controller.$inject = ['$element', '$scope'];
diff --git a/modules/client/front/balance/index/index.spec.js b/modules/client/front/balance/index/index.spec.js
index 496407847..bdbea3846 100644
--- a/modules/client/front/balance/index/index.spec.js
+++ b/modules/client/front/balance/index/index.spec.js
@@ -3,10 +3,12 @@ import './index';
describe('Client', () => {
describe('Component vnClientBalanceIndex', () => {
let controller;
+ let $httpBackend;
beforeEach(ngModule('client'));
- beforeEach(inject(($componentController, $rootScope) => {
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
let $scope = $rootScope.$new();
const $element = angular.element('
{{::credit.created | date:'dd/MM/yyyy HH:mm'}}
- {{::credit.worker.user.nickname}}
+
+
+ {{::credit.worker.user.name}}
+
+
{{::credit.amount | currency:'EUR':2}}
@@ -39,3 +45,6 @@
vn-bind="+"
fixed-bottom-right>
+
+
\ No newline at end of file
diff --git a/modules/client/front/credit/index/index.js b/modules/client/front/credit/index/index.js
index 151aa35d6..28160dfeb 100644
--- a/modules/client/front/credit/index/index.js
+++ b/modules/client/front/credit/index/index.js
@@ -13,7 +13,7 @@ class Controller extends Section {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index aac5eb343..176f5cd93 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -35,8 +35,12 @@
info="Invoices minus payments plus orders not yet invoiced">
+ label="Sales person">
+
+ {{$ctrl.client.salesPerson.user.name}}
+
-
- {{'BILL' | translate: {ref: balance.ref} }}
-
-
- {{::balance.ref}}
-
-
-
+
+ {{'BILL' | translate: {ref: balance.description} }}
+
+
+ {{balance.description}}
+
+
+
@@ -89,4 +93,7 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/client/front/dms/index/index.html b/modules/client/front/dms/index/index.html
index 3402074cc..f38e91134 100644
--- a/modules/client/front/dms/index/index.html
+++ b/modules/client/front/dms/index/index.html
@@ -53,6 +53,12 @@
{{::document.dms.description}}
+
+
+
+
@@ -62,7 +68,7 @@
- {{::document.dms.worker.user.nickname | dashIfEmpty}}
+ {{::document.dms.worker.user.name | dashIfEmpty}}
{{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
diff --git a/modules/client/front/dms/index/index.js b/modules/client/front/dms/index/index.js
index c65de39e4..a18f195bb 100644
--- a/modules/client/front/dms/index/index.js
+++ b/modules/client/front/dms/index/index.js
@@ -32,7 +32,7 @@ class Controller extends Section {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
},
}
diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html
index bd7fc6e4a..7bb503fa2 100644
--- a/modules/client/front/sample/index/index.html
+++ b/modules/client/front/sample/index/index.html
@@ -32,7 +32,7 @@
- {{::sample.worker.user.nickname}}
+ {{::sample.worker.user.name}}
{{::sample.company.code}}
diff --git a/modules/client/front/sample/index/index.js b/modules/client/front/sample/index/index.js
index e93c2d2dc..132704de0 100644
--- a/modules/client/front/sample/index/index.js
+++ b/modules/client/front/sample/index/index.js
@@ -18,7 +18,7 @@ class Controller extends Section {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 9e53d4988..ce69bf158 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -21,8 +21,12 @@
-
+
+
+ {{$ctrl.summary.salesPerson.user.name}}
+
@@ -197,4 +201,7 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/entry/back/methods/entry/editLatestBuys.js b/modules/entry/back/methods/entry/editLatestBuys.js
new file mode 100644
index 000000000..bd5358e31
--- /dev/null
+++ b/modules/entry/back/methods/entry/editLatestBuys.js
@@ -0,0 +1,87 @@
+module.exports = Self => {
+ Self.remoteMethod('editLatestBuys', {
+ description: 'Updates a column for one or more buys',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'field',
+ type: 'String',
+ required: true,
+ description: `the column to edit`
+ },
+ {
+ arg: 'newValue',
+ type: 'Any',
+ required: true,
+ description: `The new value to save`
+ },
+ {
+ arg: 'lines',
+ type: ['Object'],
+ required: true,
+ description: `the buys which will be modified`
+ }],
+ returns: {
+ type: 'Object',
+ root: true
+ },
+ http: {
+ path: `/editLatestBuys`,
+ verb: 'POST'
+ }
+ });
+
+ Self.editLatestBuys = async(field, newValue, lines) => {
+ let modelName;
+ let identifier;
+
+ switch (field) {
+ case 'size':
+ case 'density':
+ case 'minPrice':
+ case 'description':
+ modelName = 'Item';
+ identifier = 'itemFk';
+ break;
+ case 'quantity':
+ case 'buyingValue':
+ case 'freightValue':
+ case 'packing':
+ case 'grouping':
+ case 'groupingMode':
+ case 'comissionValue':
+ case 'packageValue':
+ case 'price2':
+ case 'price3':
+ case 'weight':
+ modelName = 'Buy';
+ identifier = 'id';
+ }
+
+ const models = Self.app.models;
+ const model = models[modelName];
+
+ let tx = await model.beginTransaction({});
+
+ try {
+ let promises = [];
+ let options = {transaction: tx};
+
+ let targets = lines.map(line => {
+ return line[identifier];
+ });
+
+ let value = {};
+ value[field] = newValue;
+
+ // intentarlo con updateAll
+ for (let target of targets)
+ promises.push(model.upsertWithWhere({id: target}, value, options));
+
+ await Promise.all(promises);
+ await tx.commit();
+ } catch (error) {
+ await tx.rollback();
+ throw error;
+ }
+ };
+};
diff --git a/modules/entry/back/methods/entry/getBuys.js b/modules/entry/back/methods/entry/getBuys.js
new file mode 100644
index 000000000..1b05ec483
--- /dev/null
+++ b/modules/entry/back/methods/entry/getBuys.js
@@ -0,0 +1,74 @@
+module.exports = Self => {
+ Self.remoteMethod('getBuys', {
+ description: 'Returns buys for one entry',
+ accessType: 'READ',
+ accepts: {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The entry id',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: ['Object'],
+ root: true
+ },
+ http: {
+ path: `/:id/getBuys`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getBuys = async id => {
+ let filter = {
+ where: {entryFk: id},
+ fields: [
+ 'id',
+ 'itemFk',
+ 'stickers',
+ 'packing',
+ 'grouping',
+ 'quantity',
+ 'packageFk',
+ 'weight',
+ 'buyingValue',
+ 'price2',
+ 'price3'
+ ],
+ include: {
+ relation: 'item',
+ scope: {
+ fields: [
+ 'id',
+ 'typeFk',
+ 'name',
+ 'size',
+ 'minPrice',
+ 'tag5',
+ 'value5',
+ 'tag6',
+ 'value6',
+ 'tag7',
+ 'value7',
+ 'tag8',
+ 'value8',
+ 'tag9',
+ 'value9',
+ 'tag10',
+ 'value10',
+ 'groupingMode'
+ ],
+ include: {
+ relation: 'itemType',
+ scope: {
+ fields: ['code', 'description']
+ }
+ }
+ }
+ }
+ };
+
+ let buys = await Self.app.models.Buy.find(filter);
+ return buys;
+ };
+};
diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
new file mode 100644
index 000000000..3240652cd
--- /dev/null
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -0,0 +1,172 @@
+
+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('latestBuysFilter', {
+ description: 'Find all instances of the model matched by filter from the data source.',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'Object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+ },
+ {
+ arg: 'search',
+ type: 'String',
+ description: `If it's and integer searchs by id, otherwise it searchs by name`,
+ }, {
+ arg: 'id',
+ type: 'Integer',
+ description: 'Item id',
+ }, {
+ arg: 'tags',
+ type: ['Object'],
+ description: 'List of tags to filter with',
+ http: {source: 'query'}
+ }, {
+ arg: 'description',
+ type: 'String',
+ description: 'The item description',
+ }, {
+ arg: 'salesPersonFk',
+ type: 'Integer',
+ description: 'The buyer of the item',
+ }, {
+ arg: 'active',
+ type: 'Boolean',
+ description: 'Whether the the item is or not active',
+ }, {
+ arg: 'visible',
+ type: 'Boolean',
+ description: 'Whether the the item is or not visible',
+ }, {
+ arg: 'typeFk',
+ type: 'Integer',
+ description: 'Type id',
+ }, {
+ arg: 'categoryFk',
+ type: 'Integer',
+ description: 'Category id',
+ }
+ ],
+ returns: {
+ type: ['Object'],
+ root: true
+ },
+ http: {
+ path: `/latestBuysFilter`,
+ verb: 'GET'
+ }
+ });
+
+ Self.latestBuysFilter = async(ctx, filter) => {
+ let conn = Self.dataSource.connector;
+ let where = buildFilter(ctx.args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? {'i.id': value}
+ : {'i.name': {like: `%${value}%`}};
+ case 'id':
+ return {'i.id': value};
+ case 'description':
+ return {'i.description': {like: `%${value}%`}};
+ case 'categoryFk':
+ return {'ic.id': value};
+ case 'salesPersonFk':
+ return {'it.workerFk': value};
+ case 'typeFk':
+ return {'i.typeFk': value};
+ case 'active':
+ return {'i.isActive': value};
+ case 'visible':
+ if (value)
+ return {'v.visible': {gt: 0}};
+ else if (!value)
+ return {'v.visible': {lte: 0}};
+ }
+ });
+ filter = mergeFilters(ctx.args.filter, {where});
+
+ let stmts = [];
+ let stmt;
+
+ stmts.push('CALL cache.last_buy_refresh(FALSE)');
+ stmts.push('CALL cache.visible_refresh(@calc_id, FALSE, 1)');
+
+ stmt = new ParameterizedSQL(`
+ SELECT
+ i.image,
+ i.id AS itemFk,
+ i.size,
+ i.density,
+ i.typeFk,
+ i.family,
+ i.isActive,
+ i.minPrice,
+ i.description,
+ t.name AS type,
+ intr.description AS intrastat,
+ ori.code AS origin,
+ b.entryFk,
+ b.id,
+ b.quantity,
+ b.buyingValue,
+ b.freightValue,
+ b.isIgnored,
+ b.packing,
+ b.grouping,
+ b.groupingMode,
+ b.comissionValue,
+ b.packageValue,
+ b.price2,
+ b.price3,
+ b.ektFk,
+ b.weight,
+ b.packageFk
+ FROM cache.last_buy lb
+ LEFT JOIN cache.visible v ON v.item_id = lb.item_id
+ AND v.calc_id = @calc_id
+ JOIN item i ON i.id = lb.item_id
+ JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = it.warehouseFk
+ JOIN buy b ON b.id = lb.buy_id
+ LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN itemType t ON t.id = i.typeFk
+ LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
+ LEFT JOIN origin ori ON ori.id = i.originFk`
+ );
+
+ if (ctx.args.tags) {
+ let i = 1;
+ for (const tag of ctx.args.tags) {
+ const tAlias = `it${i++}`;
+
+ if (tag.tagFk) {
+ stmt.merge({
+ sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id
+ AND ${tAlias}.tagFk = ?
+ AND ${tAlias}.value LIKE ?`,
+ params: [tag.tagFk, `%${tag.value}%`],
+ });
+ } else {
+ stmt.merge({
+ sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id
+ AND ${tAlias}.value LIKE ?`,
+ params: [`%${tag.value}%`],
+ });
+ }
+ }
+ }
+
+ stmt.merge(conn.makeSuffix(filter));
+ let buysIndex = stmts.push(stmt) - 1;
+
+ let sql = ParameterizedSQL.join(stmts, ';');
+ let result = await conn.executeStmt(sql);
+ return buysIndex === 0 ? result : result[buysIndex];
+ };
+};
+
diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
new file mode 100644
index 000000000..5d1bd5a0d
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
@@ -0,0 +1,31 @@
+const app = require('vn-loopback/server/server');
+const model = app.models.Buy;
+
+describe('Buy editLatestsBuys()', () => {
+ it('should change the value of a given column for the selected buys', async() => {
+ let ctx = {
+ args: {
+ search: 'Ranged weapon longbow 2m'
+ }
+ };
+
+ let [original] = await model.latestBuysFilter(ctx);
+
+ const field = 'size';
+ let newValue = 99;
+ const lines = [{itemFk: original.itemFk, id: original.id}];
+
+ await model.editLatestBuys(field, newValue, lines);
+
+ let [result] = await model.latestBuysFilter(ctx);
+
+ expect(result.size).toEqual(99);
+
+ newValue = original.size;
+ await model.editLatestBuys(field, newValue, lines);
+
+ let [restoredFixture] = await model.latestBuysFilter(ctx);
+
+ expect(restoredFixture.size).toEqual(original.size);
+ });
+});
diff --git a/modules/entry/back/methods/entry/specs/getBuys.spec.js b/modules/entry/back/methods/entry/specs/getBuys.spec.js
new file mode 100644
index 000000000..b660ab2ad
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/getBuys.spec.js
@@ -0,0 +1,14 @@
+const app = require('vn-loopback/server/server');
+
+describe('entry getBuys()', () => {
+ const entryId = 4;
+ it('should get the buys and items of an entry', async() => {
+ const result = await app.models.Entry.getBuys(entryId);
+
+ const length = result.length;
+ const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
+
+ expect(result.length).toEqual(4);
+ expect(anyResult.item).toBeDefined();
+ });
+});
diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
new file mode 100644
index 000000000..ba18fcf57
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
@@ -0,0 +1,139 @@
+const app = require('vn-loopback/server/server');
+
+describe('Buy latests buys filter()', () => {
+ it('should return the entry matching "search"', async() => {
+ let ctx = {
+ args: {
+ search: 'Ranged weapon longbow 2m'
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+ let firstBuy = results[0];
+
+ expect(results.length).toEqual(1);
+ expect(firstBuy.size).toEqual(70);
+ });
+
+ it('should return the entry matching "id"', async() => {
+ let ctx = {
+ args: {
+ id: 1
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toEqual(1);
+ });
+
+ it('should return results matching "tags"', async() => {
+ let ctx = {
+ args: {
+ tags: [
+ {tagFk: 27, value: '2m'}
+ ]
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(2);
+ });
+
+ it('should return results matching "categoryFk"', async() => {
+ let ctx = {
+ args: {
+ categoryFk: 1
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(4);
+ });
+
+ it('should return results matching "typeFk"', async() => {
+ let ctx = {
+ args: {
+ typeFk: 2
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(4);
+ });
+
+ it('should return results matching "active"', async() => {
+ let ctx = {
+ args: {
+ active: true
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(6);
+ });
+
+ it('should return results matching "not active"', async() => {
+ let ctx = {
+ args: {
+ active: false
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(0);
+ });
+
+ it('should return results matching "visible"', async() => {
+ let ctx = {
+ args: {
+ visible: true
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(5);
+ });
+
+ it('should return results matching "not visible"', async() => {
+ let ctx = {
+ args: {
+ visible: false
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(0);
+ });
+
+ it('should return results matching "salesPersonFk"', async() => {
+ let ctx = {
+ args: {
+ salesPersonFk: 35
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(6);
+ });
+
+ it('should return results matching "description"', async() => {
+ let ctx = {
+ args: {
+ description: 'Increases block'
+ }
+ };
+
+ let results = await app.models.Buy.latestBuysFilter(ctx);
+
+ expect(results.length).toBe(1);
+ });
+});
diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json
index c8c8babad..0e37b947f 100644
--- a/modules/entry/back/model-config.json
+++ b/modules/entry/back/model-config.json
@@ -2,6 +2,9 @@
"Entry": {
"dataSource": "vn"
},
+ "Buy": {
+ "dataSource": "vn"
+ },
"EntryLog": {
"dataSource": "vn"
}
diff --git a/modules/entry/back/models/buy.js b/modules/entry/back/models/buy.js
new file mode 100644
index 000000000..e110164e8
--- /dev/null
+++ b/modules/entry/back/models/buy.js
@@ -0,0 +1,4 @@
+module.exports = Self => {
+ require('../methods/entry/editLatestBuys')(Self);
+ require('../methods/entry/latestBuysFilter')(Self);
+};
diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json
new file mode 100644
index 000000000..56f1eef4f
--- /dev/null
+++ b/modules/entry/back/models/buy.json
@@ -0,0 +1,73 @@
+{
+ "name": "Buy",
+ "base": "Loggable",
+ "log": {
+ "model": "EntryLog",
+ "relation": "entry"
+ },
+ "options": {
+ "mysql": {
+ "table": "buy"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "quantity": {
+ "type": "number"
+ },
+ "buyingValue": {
+ "type": "number"
+ },
+ "freightValue": {
+ "type": "number"
+ },
+ "packing": {
+ "type": "number"
+ },
+ "grouping": {
+ "type": "number"
+ },
+ "stickers": {
+ "type": "number"
+ },
+ "packageFk": {
+ "type": "number"
+ },
+ "groupingMode": {
+ "type": "number"
+ },
+ "comissionValue": {
+ "type": "number"
+ },
+ "packageValue": {
+ "type": "number"
+ },
+ "price2": {
+ "type": "number"
+ },
+ "price3": {
+ "type": "number"
+ },
+ "weight": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "entry": {
+ "type": "belongsTo",
+ "model": "Entry",
+ "foreignKey": "entryFk",
+ "required": true
+ },
+ "item": {
+ "type": "belongsTo",
+ "model": "Item",
+ "foreignKey": "itemFk",
+ "required": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index b1f71b4bd..94dbe787d 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -1,5 +1,5 @@
-
module.exports = Self => {
require('../methods/entry/filter')(Self);
require('../methods/entry/getEntry')(Self);
+ require('../methods/entry/getBuys')(Self);
};
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index d3f149680..a67641b0c 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -1,6 +1,6 @@
{
"name": "Entry",
- "base": "VnModel",
+ "base": "Loggable",
"log": {
"model":"EntryLog"
},
@@ -62,6 +62,18 @@
},
"loadPriority": {
"type": "number"
+ },
+ "supplierFk": {
+ "type": "number",
+ "required": true
+ },
+ "travelFk": {
+ "type": "number",
+ "required": true
+ },
+ "companyFk": {
+ "type": "number",
+ "required": true
}
},
"relations": {
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/entry/front/basic-data/index.js b/modules/entry/front/basic-data/index.js
new file mode 100644
index 000000000..141a365fa
--- /dev/null
+++ b/modules/entry/front/basic-data/index.js
@@ -0,0 +1,10 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnEntryBasicData', {
+ template: require('./index.html'),
+ controller: Section,
+ bindings: {
+ entry: '<'
+ }
+});
diff --git a/modules/entry/front/card/index.js b/modules/entry/front/card/index.js
index f9ab6187c..eafed171b 100644
--- a/modules/entry/front/card/index.js
+++ b/modules/entry/front/card/index.js
@@ -10,7 +10,8 @@ class Controller extends ModuleCard {
scope: {
fields: ['id', 'code']
}
- }, {
+ },
+ {
relation: 'travel',
scope: {
fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'],
@@ -35,12 +36,14 @@ class Controller extends ModuleCard {
}
]
}
- }, {
+ },
+ {
relation: 'supplier',
scope: {
fields: ['id', 'nickname']
}
- }, {
+ },
+ {
relation: 'currency'
}
]
diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html
new file mode 100644
index 000000000..7b5dfc928
--- /dev/null
+++ b/modules/entry/front/create/index.html
@@ -0,0 +1,61 @@
+
+
+
diff --git a/modules/entry/front/create/index.js b/modules/entry/front/create/index.js
new file mode 100644
index 000000000..5c61730f9
--- /dev/null
+++ b/modules/entry/front/create/index.js
@@ -0,0 +1,43 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+export default class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+
+ this.entry = {
+ companyFk: this.vnConfig.companyFk
+ };
+
+ if (this.$params && this.$params.supplierFk)
+ this.entry.supplierFk = parseInt(this.$params.supplierFk);
+ if (this.$params && this.$params.travelFk)
+ this.entry.travelFk = parseInt(this.$params.travelFk);
+ if (this.$params && this.$params.companyFk)
+ this.entry.companyFk = parseInt(this.$params.companyFk);
+ }
+
+ onSubmit() {
+ this.$.watcher.submit().then(
+ res => this.$state.go('entry.card.basicData', {id: res.data.id})
+ );
+ }
+
+ searchFunction($search) {
+ return {or: [
+ {'agencyModeName': {like: `%${$search}%`}},
+ {'warehouseInName': {like: `%${$search}%`}},
+ {'warehouseOutName': {like: `%${$search}%`}},
+ {'shipped': new Date($search)},
+ {'landed': new Date($search)}
+ ]};
+ }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnEntryCreate', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/entry/front/create/locale/es.yml b/modules/entry/front/create/locale/es.yml
new file mode 100644
index 000000000..aa269ed15
--- /dev/null
+++ b/modules/entry/front/create/locale/es.yml
@@ -0,0 +1,2 @@
+New entry: Nueva entrada
+Required fields (*): Campos requeridos (*)
\ No newline at end of file
diff --git a/modules/entry/front/create/style.scss b/modules/entry/front/create/style.scss
new file mode 100644
index 000000000..2dc52b1ff
--- /dev/null
+++ b/modules/entry/front/create/style.scss
@@ -0,0 +1,10 @@
+vn-entry-create {
+ vn-card {
+ position: relative
+ }
+ vn-icon[icon="info"] {
+ position: absolute;
+ top: 16px;
+ right: 16px
+ }
+}
\ No newline at end of file
diff --git a/modules/entry/front/descriptor-popover/index.html b/modules/entry/front/descriptor-popover/index.html
new file mode 100644
index 000000000..465a9bf51
--- /dev/null
+++ b/modules/entry/front/descriptor-popover/index.html
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/modules/entry/front/descriptor-popover/index.js b/modules/entry/front/descriptor-popover/index.js
new file mode 100644
index 000000000..d79aed03e
--- /dev/null
+++ b/modules/entry/front/descriptor-popover/index.js
@@ -0,0 +1,9 @@
+import ngModule from '../module';
+import DescriptorPopover from 'salix/components/descriptor-popover';
+
+class Controller extends DescriptorPopover {}
+
+ngModule.vnComponent('vnEntryDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/entry/front/descriptor/index.js b/modules/entry/front/descriptor/index.js
index dd417a842..fed3787d4 100644
--- a/modules/entry/front/descriptor/index.js
+++ b/modules/entry/front/descriptor/index.js
@@ -11,15 +11,23 @@ class Controller extends Descriptor {
}
get travelFilter() {
- return this.entry && JSON.stringify({
- agencyFk: this.entry.travel.agencyFk
- });
+ let travelFilter;
+ const entryTravel = this.entry && this.entry.travel;
+
+ if (entryTravel && entryTravel.agencyFk) {
+ travelFilter = this.entry && JSON.stringify({
+ agencyFk: entryTravel.agencyFk
+ });
+ }
+ return travelFilter;
}
get entryFilter() {
- if (!this.entry) return null;
+ let entryTravel = this.entry && this.entry.travel;
- const date = new Date(this.entry.travel.landed);
+ if (!entryTravel || !entryTravel.landed) return null;
+
+ const date = new Date(entryTravel.landed);
date.setHours(0, 0, 0, 0);
const from = new Date(date.getTime());
@@ -35,6 +43,48 @@ class Controller extends Descriptor {
});
}
+ loadData() {
+ const filter = {
+ include: [
+ {
+ relation: 'travel',
+ scope: {
+ fields: ['id', 'landed', 'agencyFk', 'warehouseOutFk'],
+ include: [
+ {
+ relation: 'agency',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'warehouseOut',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'warehouseIn',
+ scope: {
+ fields: ['name']
+ }
+ }
+ ]
+ }
+ },
+ {
+ relation: 'supplier',
+ scope: {
+ fields: ['id', 'nickname']
+ }
+ }
+ ]
+ };
+
+ return this.getData(`Entries/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
+ }
+
showEntryReport() {
this.vnReport.show('entry-order', {
entryId: this.entry.id
diff --git a/modules/entry/front/descriptor/index.spec.js b/modules/entry/front/descriptor/index.spec.js
index 513425c76..84defea3b 100644
--- a/modules/entry/front/descriptor/index.spec.js
+++ b/modules/entry/front/descriptor/index.spec.js
@@ -1,12 +1,14 @@
import './index.js';
describe('Entry Component vnEntryDescriptor', () => {
+ let $httpBackend;
let controller;
const entry = {id: 2};
beforeEach(ngModule('entry'));
- beforeEach(inject($componentController => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
controller = $componentController('vnEntryDescriptor', {$element: null}, {entry});
}));
@@ -24,4 +26,18 @@ describe('Entry Component vnEntryDescriptor', () => {
expect(controller.vnReport.show).toHaveBeenCalledWith('entry-order', params);
});
});
+
+ describe('loadData()', () => {
+ it('should perform ask for the entry', () => {
+ let query = `Entries/${entry.id}`;
+ jest.spyOn(controller, 'getData');
+
+ $httpBackend.expectGET(query).respond();
+ controller.loadData();
+ $httpBackend.flush();
+
+ expect(controller.getData).toHaveBeenCalledTimes(1);
+ expect(controller.getData).toHaveBeenCalledWith(query, jasmine.any(Object));
+ });
+ });
});
diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js
index f0c845b14..484d8f718 100644
--- a/modules/entry/front/index.js
+++ b/modules/entry/front/index.js
@@ -2,8 +2,12 @@ export * from './module';
import './main';
import './index/';
+import './create';
+import './latest-buys';
import './search-panel';
+import './latest-buys-search-panel';
import './descriptor';
+import './descriptor-popover';
import './card';
import './summary';
import './log';
diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html
index e3d174cbf..8a28888b0 100644
--- a/modules/entry/front/index/index.html
+++ b/modules/entry/front/index/index.html
@@ -69,4 +69,16 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Picture
+ Id
+ Packing
+ Grouping
+ Quantity
+ Description
+ Size
+ Type
+ Intrastat
+ Origin
+ Density
+ Active
+ Family
+ Entry
+ Buying value
+ Freight value
+ Commission value
+ Package value
+ Is ignored
+ Grouping price
+ Packing price
+ Min price
+ Ekt
+ Weight
+ PackageName
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{::buy.itemFk | zeroFill:6}}
+
+
+
+
+ {{::buy.packing | dashIfEmpty}}
+
+
+
+
+ {{::buy.grouping | dashIfEmpty}}
+
+
+ {{::buy.quantity}}
+
+ {{::buy.description | dashIfEmpty}}
+
+ {{::buy.size}}
+
+ {{::buy.type}}
+
+
+ {{::buy.intrastat}}
+
+ {{::buy.origin}}
+ {{::buy.density}}
+
+
+
+
+ {{::buy.family}}
+
+
+ {{::buy.entryFk}}
+
+
+ {{::buy.buyingValue | currency: 'EUR':2}}
+ {{::buy.freightValue | currency: 'EUR':2}}
+ {{::buy.comissionValue | currency: 'EUR':2}}
+ {{::buy.packageValue | currency: 'EUR':2}}
+ {{::buy.isIgnored}}
+ {{::buy.price2 | currency: 'EUR':2}}
+ {{::buy.price3 | currency: 'EUR':2}}
+ {{::buy.minPrice | currency: 'EUR':2}}
+ {{::buy.ektFk | dashIfEmpty}}
+ {{::buy.weight}}
+ {{::buy.packageFk}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js
new file mode 100644
index 000000000..8d2c5fe13
--- /dev/null
+++ b/modules/entry/front/latest-buys/index.js
@@ -0,0 +1,78 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ this.showFields = {
+ id: false,
+ actions: false
+ };
+ this.editedColumn;
+ }
+
+ get columns() {
+ if (this._columns) return this._columns;
+
+ this._columns = [
+ {field: 'quantity', displayName: this.$t('Quantity')},
+ {field: 'buyingValue', displayName: this.$t('Buying value')},
+ {field: 'freightValue', displayName: this.$t('Freight value')},
+ {field: 'packing', displayName: this.$t('Packing')},
+ {field: 'grouping', displayName: this.$t('Grouping')},
+ {field: 'comissionValue', displayName: this.$t('Commission value')},
+ {field: 'packageValue', displayName: this.$t('Package value')},
+ {field: 'price2', displayName: this.$t('Grouping price')},
+ {field: 'price3', displayName: this.$t('Packing price')},
+ {field: 'weight', displayName: this.$t('Weight')},
+ {field: 'description', displayName: this.$t('Description')},
+ {field: 'minPrice', displayName: this.$t('Min price')},
+ {field: 'size', displayName: this.$t('Size')},
+ {field: 'density', displayName: this.$t('Density')}
+ ];
+
+ return this._columns;
+ }
+
+ get checked() {
+ const buys = this.$.model.data || [];
+ const checkedBuys = [];
+ for (let buy of buys) {
+ if (buy.checked)
+ checkedBuys.push(buy);
+ }
+
+ return checkedBuys;
+ }
+
+ uncheck() {
+ const lines = this.checked;
+ for (let line of lines) {
+ if (line.checked)
+ line.checked = false;
+ }
+ }
+
+ get totalChecked() {
+ return this.checked.length;
+ }
+
+ onEditAccept() {
+ let data = {
+ field: this.editedColumn.field,
+ newValue: this.editedColumn.newValue,
+ lines: this.checked
+ };
+
+ return this.$http.post('Buys/editLatestBuys', data)
+ .then(() => {
+ this.uncheck();
+ this.$.model.refresh();
+ });
+ }
+}
+
+ngModule.component('vnEntryLatestBuys', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/entry/front/latest-buys/index.spec.js b/modules/entry/front/latest-buys/index.spec.js
new file mode 100644
index 000000000..658a2dc86
--- /dev/null
+++ b/modules/entry/front/latest-buys/index.spec.js
@@ -0,0 +1,82 @@
+import './index.js';
+
+describe('Entry', () => {
+ describe('Component vnEntryLatestBuys', () => {
+ let controller;
+ let $httpBackend;
+
+ beforeEach(ngModule('entry'));
+
+ beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
+ let $element = $compile(' {}},
+ edit: {hide: () => {}}
+ };
+ }));
+
+ describe('get columns', () => {
+ it(`should return a set of columns`, () => {
+ let result = controller.columns;
+
+ let length = result.length;
+ let anyColumn = Object.keys(result[Math.floor(Math.random() * Math.floor(length))]);
+
+ expect(anyColumn).toContain('field', 'displayName');
+ });
+ });
+
+ describe('get checked', () => {
+ it(`should return a set of checked lines`, () => {
+ controller.$.model.data = [
+ {checked: true, id: 1},
+ {checked: true, id: 2},
+ {checked: true, id: 3},
+ {checked: false, id: 4},
+ ];
+
+ let result = controller.checked;
+
+ expect(result.length).toEqual(3);
+ });
+ });
+
+ describe('uncheck()', () => {
+ it(`should clear the selection of lines on the controller`, () => {
+ controller.$.model.data = [
+ {checked: true, id: 1},
+ {checked: true, id: 2},
+ {checked: true, id: 3},
+ {checked: false, id: 4},
+ ];
+
+ let result = controller.checked;
+
+ expect(result.length).toEqual(3);
+
+ controller.uncheck();
+
+ result = controller.checked;
+
+ expect(result.length).toEqual(0);
+ });
+ });
+
+ describe('onEditAccept()', () => {
+ it(`should perform a query to update columns`, () => {
+ controller.editedColumn = {field: 'my field', newValue: 'the new value'};
+ let query = 'Buys/editLatestBuys';
+
+ $httpBackend.expectPOST(query).respond();
+ controller.onEditAccept();
+ $httpBackend.flush();
+
+ const result = controller.checked;
+
+ expect(result.length).toEqual(0);
+ });
+ });
+ });
+});
diff --git a/modules/entry/front/latest-buys/locale/en.yml b/modules/entry/front/latest-buys/locale/en.yml
new file mode 100644
index 000000000..48dda861b
--- /dev/null
+++ b/modules/entry/front/latest-buys/locale/en.yml
@@ -0,0 +1,2 @@
+Minimun amount: Minimun purchase quantity
+PackageName: Package
\ No newline at end of file
diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml
new file mode 100644
index 000000000..18bc1a689
--- /dev/null
+++ b/modules/entry/front/latest-buys/locale/es.yml
@@ -0,0 +1,14 @@
+Edit buy(s): Editar compra(s)
+Buying value: Precio
+Freight value: Porte
+Commission value: Comisión
+Package value: Embalaje
+Is ignored: Ignorado
+Grouping price: Precio grouping
+Packing price: Precio packing
+Min price: Precio min
+Ekt: Ekt
+Weight: Peso
+Minimun amount: Cantidad mínima de compra
+Field to edit: Campo a editar
+PackageName: Cubo
diff --git a/modules/entry/front/locale/es.yml b/modules/entry/front/locale/es.yml
index 0858bb7f9..b28cbe735 100644
--- a/modules/entry/front/locale/es.yml
+++ b/modules/entry/front/locale/es.yml
@@ -1,5 +1,6 @@
#Ordenar alfabeticamente
entry: entrada
+Latest buys: Últimas compras
# Sections
diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json
index 084ff7bb2..a430a95fa 100644
--- a/modules/entry/front/routes.json
+++ b/modules/entry/front/routes.json
@@ -2,13 +2,15 @@
"module": "entry",
"name": "Entries",
"icon": "icon-entry",
- "dependencies": ["travel"],
+ "dependencies": ["travel", "item"],
"validations": true,
"menus": {
"main": [
- {"state": "entry.index", "icon": "icon-entry"}
+ {"state": "entry.index", "icon": "icon-entry"},
+ {"state": "entry.latestBuys", "icon": "icon-latestBuys"}
],
"card": [
+ {"state": "entry.card.basicData", "icon": "settings"},
{"state": "entry.card.buy", "icon": "icon-lines"},
{"state": "entry.card.log", "icon": "history"}
]
@@ -24,7 +26,20 @@
"url": "/index?q",
"state": "entry.index",
"component": "vn-entry-index",
- "description": "Entries"
+ "description": "Entries",
+ "acl": ["buyer"]
+ }, {
+ "url": "/latest-buys?q",
+ "state": "entry.latestBuys",
+ "component": "vn-entry-latest-buys",
+ "description": "Latest buys",
+ "acl": ["buyer"]
+ }, {
+ "url": "/create?supplierFk&travelFk&companyFk",
+ "state": "entry.create",
+ "component": "vn-entry-create",
+ "description": "New entry",
+ "acl": ["buyer"]
}, {
"url": "/:id",
"state": "entry.card",
@@ -38,6 +53,14 @@
"params": {
"entry": "$ctrl.entry"
}
+ }, {
+ "url": "/basic-data",
+ "state": "entry.card.basicData",
+ "component": "vn-entry-basic-data",
+ "description": "Basic data",
+ "params": {
+ "entry": "$ctrl.entry"
+ }
}, {
"url" : "/log",
"state": "entry.card.log",
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index af9eae30c..9151558f2 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -19,8 +19,12 @@
-
+
+
+ {{$ctrl.entryData.travel.agency.name}}
+
@@ -65,4 +69,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/entry/front/summary/index.js b/modules/entry/front/summary/index.js
index f0b4c62b3..2a3dfe37b 100644
--- a/modules/entry/front/summary/index.js
+++ b/modules/entry/front/summary/index.js
@@ -10,15 +10,23 @@ class Controller extends Section {
set entry(value) {
this._entry = value;
- if (value && value.id)
+ if (value && value.id) {
this.getEntryData();
+ this.getBuys();
+ }
}
getEntryData() {
- return this.$http.get(`/api/Entries/${this.entry.id}/getEntry`).then(response => {
+ return this.$http.get(`Entries/${this.entry.id}/getEntry`).then(response => {
this.entryData = response.data;
});
}
+
+ getBuys() {
+ return this.$http.get(`Entries/${this.entry.id}/getBuys`).then(response => {
+ this.buys = response.data;
+ });
+ }
}
ngModule.vnComponent('vnEntrySummary', {
diff --git a/modules/entry/front/summary/index.spec.js b/modules/entry/front/summary/index.spec.js
index a2d25d0d6..396e92b01 100644
--- a/modules/entry/front/summary/index.spec.js
+++ b/modules/entry/front/summary/index.spec.js
@@ -38,7 +38,7 @@ describe('component vnEntrySummary', () => {
it('should perform a get and then store data on the controller', () => {
controller._entry = {id: 999};
- const query = `/api/Entries/${controller._entry.id}/getEntry`;
+ const query = `Entries/${controller._entry.id}/getEntry`;
$httpBackend.expectGET(query).respond('I am the entryData');
controller.getEntryData();
$httpBackend.flush();
@@ -46,4 +46,20 @@ describe('component vnEntrySummary', () => {
expect(controller.entryData).toEqual('I am the entryData');
});
});
+
+ describe('getBuys()', () => {
+ it('should perform a get asking for the buys of an entry', () => {
+ controller._entry = {id: 999};
+
+ const thatQuery = `Entries/${controller._entry.id}/getEntry`;
+ const query = `Entries/${controller._entry.id}/getBuys`;
+
+ $httpBackend.whenGET(thatQuery).respond('My Entries');
+ $httpBackend.expectGET(query).respond('Some buys');
+ controller.getBuys();
+ $httpBackend.flush();
+
+ expect(controller.buys).toEqual('Some buys');
+ });
+ });
});
diff --git a/modules/entry/front/summary/locale/es.yml b/modules/entry/front/summary/locale/es.yml
index 1673d6a17..6f442b2c8 100644
--- a/modules/entry/front/summary/locale/es.yml
+++ b/modules/entry/front/summary/locale/es.yml
@@ -1,3 +1,8 @@
Inventory: Inventario
Virtual: Redada
-Entry: Entrada
\ No newline at end of file
+Entry: Entrada
+Stickers: Etiquetas
+Item size: Tamaño
+Item type: Tipo
+Minimum price: Precio mínimo
+Buys: Compras
diff --git a/modules/entry/front/summary/style.scss b/modules/entry/front/summary/style.scss
index 1374d2ec7..27d361056 100644
--- a/modules/entry/front/summary/style.scss
+++ b/modules/entry/front/summary/style.scss
@@ -3,4 +3,18 @@
vn-entry-summary .summary {
max-width: $width-lg;
-}
\ No newline at end of file
+
+ .dark-row {
+ background-color: lighten($color-marginal, 10%);
+ }
+
+ tbody {
+ border: 2px solid $color-marginal;
+ }
+
+ tr {
+ margin-bottom: 10px;
+ }
+}
+
+$color-font-link-medium: lighten($color-font-link, 20%)
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 093d9edf7..fe22e4dd8 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -37,8 +37,12 @@
value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
+ label="Client">
+
+ {{$ctrl.invoiceOut.client.name}}
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js
index 372648dd6..d953d1938 100644
--- a/modules/item/back/methods/item-image-queue/downloadImages.js
+++ b/modules/item/back/methods/item-image-queue/downloadImages.js
@@ -20,37 +20,68 @@ module.exports = Self => {
const models = Self.app.models;
try {
- const imageQueue = await Self.find({limit: 25});
- const rootPath = models.Image.getPath();
- const tempPath = path.join(rootPath, 'temp');
+ const tempPath = path.join('/tmp/salix-image');
// Create temporary path
await fs.mkdir(tempPath, {recursive: true});
- for (let image of imageQueue) {
+ const timer = setInterval(async() => {
+ const image = await Self.findOne({
+ where: {error: null, url: {neq: null}}
+ });
+
+ // Exit loop
+ if (!image) return clearInterval(timer);
+
const fileName = `${image.itemFk}.png`;
const filePath = path.join(tempPath, fileName);
- const file = fs.createWriteStream(filePath);
- https.get(image.url, async response => {
- response.pipe(file);
+ const writeStream = fs.createWriteStream(filePath);
+ writeStream.on('open', () => {
+ https.get(image.url, async response => {
+ if (response.statusCode != 200) {
+ const error = new Error(`Could not download the image. Status code ${response.statusCode}`);
+
+ return await errorHandler(image.itemFk, error, filePath);
+ }
+
+ response.pipe(writeStream);
+ }).on('error', async error => {
+ await errorHandler(image.itemFk, error, filePath);
+ });
});
- file.on('finish', async function() {
- await models.Image.registerImage('catalog', fileName, filePath);
- await image.destroy();
+ writeStream.on('error', async error => {
+ await errorHandler(image.itemFk, error, filePath);
});
- file.on('error', err => {
- fs.unlink(filePath);
-
- throw err;
+ writeStream.on('finish', async function() {
+ try {
+ await models.Image.registerImage('catalog', fileName, filePath);
+ await image.destroy();
+ } catch (error) {
+ await errorHandler(image.itemFk, error, filePath);
+ }
});
+ }, 1000);
+ } catch (error) {
+ throw new Error('Try-catch error: ', error);
+ }
+
+ async function errorHandler(rowId, error, filePath) {
+ try {
+ const row = await Self.findById(rowId);
+
+ if (!row)
+ throw new Error(`Could not update due error ${error}`);
+
+ await row.updateAttribute('error', error);
+
+ if (filePath && fs.existsSync(filePath))
+ await fs.unlink(filePath);
+ } catch (err) {
+ throw new Error(`ErrorHandler error: ${err}`);
}
-
- return imageQueue;
- } catch (e) {
- throw e;
}
};
};
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index ad7edfa8c..1fefab77e 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -12,42 +12,38 @@ module.exports = Self => {
arg: 'filter',
type: 'Object',
description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
- http: {source: 'query'}
}, {
arg: 'tags',
type: ['Object'],
description: 'List of tags to filter with',
- http: {source: 'query'}
}, {
arg: 'search',
type: 'String',
description: `If it's and integer searchs by id, otherwise it searchs by name`,
- http: {source: 'query'}
}, {
arg: 'id',
type: 'Integer',
description: 'Item id',
- http: {source: 'query'}
}, {
arg: 'categoryFk',
type: 'Integer',
description: 'Category id',
- http: {source: 'query'}
}, {
arg: 'typeFk',
type: 'Integer',
description: 'Type id',
- http: {source: 'query'}
}, {
arg: 'isActive',
type: 'Boolean',
- description: 'Whether the the item is o not active',
- http: {source: 'query'}
+ description: 'Whether the the item is or not active',
}, {
arg: 'salesPersonFk',
type: 'Integer',
description: 'The buyer of the item',
- http: {source: 'query'}
+ }, {
+ arg: 'description',
+ type: 'String',
+ description: 'The item description',
}
],
returns: {
@@ -117,7 +113,7 @@ module.exports = Self => {
i.isActive,
t.name type,
t.workerFk buyerFk,
- u.nickname userNickname,
+ u.name userName,
intr.description AS intrastat,
i.stems,
ori.code AS origin,
diff --git a/modules/item/back/methods/item/getCard.js b/modules/item/back/methods/item/getCard.js
index 9780c5601..69b5c1116 100644
--- a/modules/item/back/methods/item/getCard.js
+++ b/modules/item/back/methods/item/getCard.js
@@ -37,7 +37,7 @@ module.exports = Self => {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/item/back/methods/item/getLastEntries.js b/modules/item/back/methods/item/getLastEntries.js
deleted file mode 100644
index a438afcb6..000000000
--- a/modules/item/back/methods/item/getLastEntries.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = Self => {
- Self.remoteMethod('getLastEntries', {
- description: 'Returns last entries',
- accessType: 'READ',
- accepts: [{
- arg: 'filter',
- type: 'object',
- required: true,
- description: 'itemFk, id'
- }],
- returns: {
- type: 'Array',
- root: true
- },
- http: {
- path: `/getLastEntries`,
- verb: 'GET'
- }
- });
-
- Self.getLastEntries = async filter => {
- let where = filter.where;
- let query = `CALL vn.itemLastEntries(?, ?)`;
- let [lastEntries] = await Self.rawSql(query, [where.itemFk, where.date]);
-
- return lastEntries;
- };
-};
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index fd52951d7..698984572 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -38,7 +38,7 @@ module.exports = Self => {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js
new file mode 100644
index 000000000..63e154b9e
--- /dev/null
+++ b/modules/item/back/methods/item/lastEntriesFilter.js
@@ -0,0 +1,62 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+ Self.remoteMethod('lastEntriesFilter', {
+ description: 'Returns last entries',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'filter',
+ type: 'object',
+ required: true,
+ description: 'itemFk, id'
+ }],
+ returns: {
+ type: 'Array',
+ root: true
+ },
+ http: {
+ path: `/lastEntriesFilter`,
+ verb: 'GET'
+ }
+ });
+
+ Self.lastEntriesFilter = async filter => {
+ const conn = Self.dataSource.connector;
+ const stmt = new ParameterizedSQL(
+ `SELECT
+ w.id AS warehouseFk,
+ w.name AS warehouse,
+ tr.landed,
+ b.id AS buyFk,
+ b.entryFk,
+ b.isIgnored,
+ b.price2,
+ b.price3,
+ b.stickers,
+ b.packing,
+ b.grouping,
+ b.groupingMode,
+ b.weight,
+ i.stems,
+ b.quantity,
+ b.buyingValue,
+ b.packageFk ,
+ s.id AS supplierFk,
+ s.name AS supplier
+ FROM itemType it
+ RIGHT JOIN (entry e
+ LEFT JOIN supplier s ON s.id = e.supplierFk
+ RIGHT JOIN buy b ON b.entryFk = e.id
+ LEFT JOIN item i ON i.id = b.itemFk
+ LEFT JOIN ink ON ink.id = i.inkFk
+ LEFT JOIN travel tr ON tr.id = e.travelFk
+ LEFT JOIN warehouse w ON w.id = tr.warehouseInFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ ) ON it.id = i.typeFk
+ LEFT JOIN edi.ekt ek ON b.ektFk = ek.id`);
+ stmt.merge(conn.makeSuffix(filter));
+
+ return conn.executeStmt(stmt);
+ };
+};
diff --git a/modules/item/back/methods/item/specs/getLastEntries.spec.js b/modules/item/back/methods/item/specs/getLastEntries.spec.js
deleted file mode 100644
index 5c996d8e3..000000000
--- a/modules/item/back/methods/item/specs/getLastEntries.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('item getLastEntries()', () => {
- it('should return one entry for a given item', async() => {
- let date = new Date();
- let filter = {where: {itemFk: 1, date: date}};
- let result = await app.models.Item.getLastEntries(filter);
-
- expect(result.length).toEqual(1);
- });
-
- it('should return five entries for a given item', async() => {
- let date = new Date();
-
- date.setMonth(date.getMonth() - 2, 1);
-
- let filter = {where: {itemFk: 1, date: date}};
- let result = await app.models.Item.getLastEntries(filter);
-
- expect(result.length).toEqual(5);
- });
-});
diff --git a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
new file mode 100644
index 000000000..f64bfed8a
--- /dev/null
+++ b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
@@ -0,0 +1,24 @@
+const app = require('vn-loopback/server/server');
+
+describe('item lastEntriesFilter()', () => {
+ const minDate = new Date(value);
+ minHour.setHours(0, 0, 0, 0);
+ const maxDate = new Date(value);
+ maxHour.setHours(23, 59, 59, 59);
+
+ it('should return one entry for a given item', async() => {
+ const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
+ const result = await app.models.Item.lastEntriesFilter(filter);
+
+ expect(result.length).toEqual(1);
+ });
+
+ it('should return five entries for a given item', async() => {
+ minDate.setMonth(minDate.getMonth() - 2, 1);
+
+ const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
+ const result = await app.models.Item.lastEntriesFilter(filter);
+
+ expect(result.length).toEqual(5);
+ });
+});
diff --git a/modules/item/back/models/item-image-queue.json b/modules/item/back/models/item-image-queue.json
index 61cb7b018..6e248ac96 100644
--- a/modules/item/back/models/item-image-queue.json
+++ b/modules/item/back/models/item-image-queue.json
@@ -16,6 +16,10 @@
"url": {
"type": "String",
"required": true
+ },
+ "error": {
+ "type": "String",
+ "required": true
}
},
"relations": {
diff --git a/modules/item/back/models/item.js b/modules/item/back/models/item.js
index d273404ea..9ddd056e6 100644
--- a/modules/item/back/models/item.js
+++ b/modules/item/back/models/item.js
@@ -5,7 +5,7 @@ module.exports = Self => {
require('../methods/item/clone')(Self);
require('../methods/item/updateTaxes')(Self);
require('../methods/item/getBalance')(Self);
- require('../methods/item/getLastEntries')(Self);
+ require('../methods/item/lastEntriesFilter')(Self);
require('../methods/item/getSummary')(Self);
require('../methods/item/getCard')(Self);
require('../methods/item/regularize')(Self);
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 5d2e47d2a..c5af8890b 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -122,6 +122,9 @@
"mysql": {
"columnName": "expenceFk"
}
+ },
+ "minPrice": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/supplier.json b/modules/item/back/models/supplier.json
index bc13e79b9..41fc9c45c 100644
--- a/modules/item/back/models/supplier.json
+++ b/modules/item/back/models/supplier.json
@@ -33,13 +33,13 @@
"retAccount": {
"type": "Number"
},
- "commision": {
+ "commission": {
"type": "Boolean"
},
"created": {
"type": "Date"
},
- "poscodeFk": {
+ "postcodeFk": {
"type": "Number"
},
"isActive": {
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 7b3504b3c..99146deb0 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -109,6 +109,14 @@
ng-model="$ctrl.item.density"
rule>
+
+
+ label="Buyer">
+
+ {{$ctrl.item.itemType.worker.user.name}}
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 0ee6a8815..01128ed74 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -8,24 +8,24 @@
+ vn-smart-table="itemIndex">
- Id
- Grouping
- Packing
- Description
- Stems
- Size
- Niche
- Type
- Category
- Intrastat
- Origin
- Buyer
- Density
- Active
+ Grouping
+ Packing
+ Description
+ Stems
+ Size
+ Niche
+ Type
+ Category
+ Intrastat
+ Origin
+ Buyer
+ Density
+ Active
@@ -70,11 +70,11 @@
{{::item.intrastat}}
{{::item.origin}}
-
+
- {{::item.userNickname}}
+ {{::item.userName}}
{{::item.density}}
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 6f2dba989..f306fb4f0 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -1,11 +1,15 @@
+ auto-load="true"
+ order="landed DESC, buyFk DESC"
+ limit="20">
-
+
@@ -20,8 +24,8 @@
Ig
- Warehouse
- Landed
+ Warehouse
+ Landed
Entry
P.P.U
P.P.P
@@ -29,11 +33,11 @@
Packing
Grouping
Stems
- Quantity
+ Quantity
Cost
Kg.
- Cube
- Provider
+ Cube
+ Provider
@@ -70,6 +74,30 @@
-
+
+
+ Filter by selection
+
+
+ Exclude selection
+
+
+ Remove filter
+
+
+ Remove all filters
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 3f9d7be36..11a2bf20e 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -6,17 +6,23 @@ class Controller extends Section {
constructor($element, $) {
super($element, $);
- let defaultDate = new Date();
- defaultDate.setDate(defaultDate.getDate() - 75);
- defaultDate.setHours(0, 0, 0, 0);
+ const from = new Date();
+ from.setDate(from.getDate() - 75);
+ from.setHours(0, 0, 0, 0);
+
+ const to = new Date();
+ to.setDate(to.getDate() + 10);
+ to.setHours(23, 59, 59, 59);
this.filter = {
where: {
itemFk: this.$params.id,
- date: defaultDate
+ shipped: {
+ between: [from, to]
+ }
}
};
- this._date = defaultDate;
+ this._date = from;
}
set date(value) {
@@ -31,6 +37,32 @@ class Controller extends Section {
get date() {
return this._date;
}
+
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'id':
+ case 'quantity':
+ case 'packageFk':
+ return {[`b.${param}`]: value};
+ case 'supplierFk':
+ return {[`s.id`]: value};
+ case 'warehouseFk':
+ return {'tr.warehouseInFk': value};
+ case 'landed':
+ return {'tr.landed': {
+ between: this.dateRange(value)}
+ };
+ }
+ }
+
+ dateRange(value) {
+ const minHour = new Date(value);
+ minHour.setHours(0, 0, 0, 0);
+ const maxHour = new Date(value);
+ maxHour.setHours(23, 59, 59, 59);
+
+ return [minHour, maxHour];
+ }
}
Controller.$inject = ['$element', '$scope'];
diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index 453f3105b..10d5f9762 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -56,12 +56,14 @@
label="For me"
ng-model="filter.mine">
-
-
+
+ {{name}}
+
Ticket ID
Shipped
- Description
+ Description
Requested
Price
- Atender
- Item
+ Atender
+ Item
Achieved
- Concept
+ Concept
State
+
@@ -83,7 +84,7 @@
{{request.itemDescription}}
- {{$ctrl.getState(request.isOk)}}
+ {{$ctrl.getState(request.isOk)}}
+
+
+ Filter by selection
+
+
+ Exclude selection
+
+
+ Remove filter
+
+
+ Remove all filters
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index 3801c926f..231d5eda7 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -17,18 +17,19 @@ export default class Controller extends Section {
this.filterParams = {
mine: true,
from: today,
- to: nextWeek
+ to: nextWeek,
+ state: 'pending'
};
}
}
getState(isOk) {
if (isOk === null)
- return 'Nueva';
+ return 'Pending';
else if (isOk)
- return 'Aceptada';
+ return 'Accepted';
else
- return 'Denegada';
+ return 'Denied';
}
confirmRequest(request) {
@@ -92,6 +93,31 @@ export default class Controller extends Section {
this.vnApp.showSuccess(this.$t('Data saved!'));
});
}
+
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'ticketFk':
+ case 'quantity':
+ case 'price':
+ case 'isOk':
+ return {[`tr.${param}`]: value};
+ case 'attenderName':
+ return {[`ua.name`]: value};
+ case 'shipped':
+ return {'t.shipped': {
+ between: this.dateRange(value)}
+ };
+ }
+ }
+
+ dateRange(value) {
+ const minHour = new Date(value);
+ minHour.setHours(0, 0, 0, 0);
+ const maxHour = new Date(value);
+ maxHour.setHours(23, 59, 59, 59);
+
+ return [minHour, maxHour];
+ }
}
ngModule.vnComponent('vnItemRequest', {
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index a33a21ec2..0fc061023 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -24,17 +24,17 @@ describe('Item', () => {
let isOk = null;
let result = controller.getState(isOk);
- expect(result).toEqual('Nueva');
+ expect(result).toEqual('Pending');
isOk = 1;
result = controller.getState(isOk);
- expect(result).toEqual('Aceptada');
+ expect(result).toEqual('Accepted');
isOk = 0;
result = controller.getState(isOk);
- expect(result).toEqual('Denegada');
+ expect(result).toEqual('Denied');
});
});
diff --git a/modules/item/front/request/locale/es.yml b/modules/item/front/request/locale/es.yml
index 33710a327..c61a00130 100644
--- a/modules/item/front/request/locale/es.yml
+++ b/modules/item/front/request/locale/es.yml
@@ -3,4 +3,7 @@ Specify the reasons to deny this request: Especifica las razones para descartar
Buy requests: Peticiones de compra
Search request by id or alias: Buscar peticiones por identificador o alias
Requested: Solicitado
-Achieved: Conseguido
\ No newline at end of file
+Achieved: Conseguido
+Pending: Pendiente
+Accepted: Aceptada
+Denied: Rechazada
\ No newline at end of file
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 938005828..bf9ab9445 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -36,8 +36,12 @@
-
+
+
+ {{$ctrl.summary.item.itemType.worker.user.name}}
+
@@ -105,4 +109,7 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js
index 114cd2786..41529428c 100644
--- a/modules/order/back/methods/order/catalogFilter.js
+++ b/modules/order/back/methods/order/catalogFilter.js
@@ -108,11 +108,12 @@ module.exports = Self => {
tci.available,
w.lastName AS lastName,
w.firstName,
- tci.priceKg
+ tci.priceKg,
+ ink.hex
FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk
- LEFT JOIN vn.ink ON ink.id = i.inkFk
+ JOIN vn.ink ON ink.id = i.inkFk
JOIN vn.worker w on w.id = it.workerFk`);
// Apply order by tag
diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index bfa64c4dd..66b4244d0 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -136,14 +136,10 @@ module.exports = Self => {
let stmts = [];
let stmt;
- stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
-
stmt = new ParameterizedSQL(
- `CREATE TEMPORARY TABLE tmp.filter
- (INDEX (id))
- ENGINE = MEMORY
- SELECT
+ `SELECT
o.id,
+ o.total,
o.date_send landed,
o.date_make created,
o.customer_id clientFk,
@@ -178,36 +174,13 @@ module.exports = Self => {
}
stmt.merge(conn.makeWhere(filter.where));
- stmt.merge({
- sql: `GROUP BY o.id`
- });
+ stmt.merge(`GROUP BY o.id`);
stmt.merge(conn.makePagination(filter));
stmts.push(stmt);
- stmts.push(`
- CREATE TEMPORARY TABLE tmp.order
- (INDEX (orderFk))
- ENGINE = MEMORY
- SELECT id AS orderFk
- FROM tmp.filter`);
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql);
- stmts.push('CALL hedera.order_getTotal()');
-
- stmt = new ParameterizedSQL(
- `SELECT f.*, ot.*
- FROM tmp.filter f
- LEFT JOIN tmp.orderTotal ot ON ot.orderFk = f.id`);
- const orderIndex = stmts.push(stmt) - 1;
-
- stmts.push(`
- DROP TEMPORARY TABLE
- tmp.order,
- tmp.orderTotal,
- tmp.filter`);
-
- let sql = ParameterizedSQL.join(stmts, ';');
- let result = await conn.executeStmt(sql);
-
- return result[orderIndex];
+ return result;
};
};
diff --git a/modules/order/back/models/order.json b/modules/order/back/models/order.json
index ab10ad194..38755c2a5 100644
--- a/modules/order/back/models/order.json
+++ b/modules/order/back/models/order.json
@@ -79,6 +79,9 @@
"mysql": {
"columnName": "confirm_date"
}
+ },
+ "total": {
+ "type": "Number"
}
},
"relations": {
diff --git a/modules/order/front/card/index.js b/modules/order/front/card/index.js
index d154b0b52..33012d0f6 100644
--- a/modules/order/front/card/index.js
+++ b/modules/order/front/card/index.js
@@ -37,7 +37,7 @@ class Controller extends ModuleCard {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html
index 459a61f59..2d7492d87 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -4,6 +4,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/entry/front/index/locale/es.yml b/modules/entry/front/index/locale/es.yml
index 8ef9b2c7a..2770ccfe9 100644
--- a/modules/entry/front/index/locale/es.yml
+++ b/modules/entry/front/index/locale/es.yml
@@ -12,4 +12,6 @@ Reference: Referencia
Created: Creado
Booked: Facturado
Is inventory: Inventario
-Notes: Notas
\ No newline at end of file
+Notes: Notas
+Status: Estado
+Selection: Selección
\ No newline at end of file
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
new file mode 100644
index 000000000..67fa7f0c2
--- /dev/null
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -0,0 +1,167 @@
+
+
+
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
new file mode 100644
index 000000000..adc95f43d
--- /dev/null
+++ b/modules/entry/front/latest-buys-search-panel/index.js
@@ -0,0 +1,79 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+class Controller extends SearchPanel {
+ constructor($element, $) {
+ super($element, $);
+ let model = 'Item';
+ let moreFields = ['description', 'name'];
+
+ let properties;
+ let validations = window.validations;
+
+ if (validations && validations[model])
+ properties = validations[model].properties;
+ else
+ properties = {};
+
+ this.moreFields = [];
+ for (let field of moreFields) {
+ let prop = properties[field];
+ this.moreFields.push({
+ name: field,
+ label: prop ? prop.description : field,
+ type: prop ? prop.type : null
+ });
+ }
+ }
+
+ get filter() {
+ let filter = this.$.filter;
+
+ for (let fieldFilter of this.fieldFilters)
+ filter[fieldFilter.name] = fieldFilter.value;
+
+ return filter;
+ }
+
+ set filter(value) {
+ if (!value)
+ value = {};
+ if (!value.tags)
+ value.tags = [{}];
+
+ this.fieldFilters = [];
+ for (let field of this.moreFields) {
+ if (value[field.name] != undefined) {
+ this.fieldFilters.push({
+ name: field.name,
+ value: value[field.name],
+ info: field
+ });
+ }
+ }
+
+ this.$.filter = value;
+ }
+
+ getSourceTable(selection) {
+ if (!selection || selection.isFree === true)
+ return null;
+
+ if (selection.sourceTable) {
+ return ''
+ + selection.sourceTable.charAt(0).toUpperCase()
+ + selection.sourceTable.substring(1) + 's';
+ } else if (selection.sourceTable == null)
+ return `ItemTags/filterItemTags/${selection.id}`;
+ }
+
+ removeField(index, field) {
+ this.fieldFilters.splice(index, 1);
+ this.$.filter[field] = undefined;
+ }
+}
+
+ngModule.component('vnLatestBuysSearchPanel', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js
new file mode 100644
index 000000000..6d403b9fb
--- /dev/null
+++ b/modules/entry/front/latest-buys-search-panel/index.spec.js
@@ -0,0 +1,45 @@
+import './index.js';
+
+describe('Entry', () => {
+ describe('Component vnLatestBuysSearchPanel', () => {
+ let $element;
+ let controller;
+
+ beforeEach(ngModule('entry'));
+
+ beforeEach(angular.mock.inject($componentController => {
+ $element = angular.element(`
+
+
+
+
+
+Buys
+| Quantity | +Stickers | +Package | +Weight | +Packing | +Grouping | +Buying value | +Import | +Grouping price | +Packing price | +
|---|---|---|---|---|---|---|---|---|---|
| {{::line.quantity}} | +{{::line.stickers | dashIfEmpty}} | +{{::line.packageFk | dashIfEmpty}} | +{{::line.weight}} | +
+ |
+
+ | {{::line.buyingValue | currency: 'EUR':2}} | +{{::line.quantity * line.buyingValue | currency: 'EUR':2}} | +{{::line.price2 | currency: 'EUR':2}} | +{{::line.price3 | currency: 'EUR':2}} | +
| + + {{::line.item.itemType.code}} + + | ++ + {{::line.item.id | zeroFill:6}} + + | ++ + {{::line.item.size}} + + | ++ + {{::line.item.minPrice | currency: 'EUR':2}} + + | +
+ |
+ |||||
+ ![]()
{
jest.spyOn(controller, 'buildTagsFilter');
jest.spyOn(controller, 'buildOrderFilter');
- const expectedResult = [{field: 'showOrder, price', name: 'Color and price'}];
+ const expectedResult = [{field: 'showOrder, price', name: 'Color and price', priority: 999}];
const items = [{id: 1, name: 'My Item', tags: [
{tagFk: 4, name: 'Length'},
{tagFk: 5, name: 'Color'}
diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html
index b16470bf2..e9f1684e5 100644
--- a/modules/order/front/descriptor/index.html
+++ b/modules/order/front/descriptor/index.html
@@ -15,8 +15,12 @@
value="{{$ctrl.$t($ctrl.order.isConfirmed ? 'Confirmed' : 'Not confirmed')}}">
+ label="Sales person">
+
+ {{$ctrl.order.client.salesPerson.user.name}}
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/order/front/locale/es.yml b/modules/order/front/locale/es.yml
index fbc384f21..c35898378 100644
--- a/modules/order/front/locale/es.yml
+++ b/modules/order/front/locale/es.yml
@@ -23,4 +23,5 @@ Created from: Creado desde
Search order by id: Buscar el pedido por identificador
order: pedido
Confirm lines: Confirmar las lineas
-Confirm: Confirmar
\ No newline at end of file
+Confirm: Confirmar
+Real hour: Hora real
\ No newline at end of file
diff --git a/modules/order/front/search-panel/locale/es.yml b/modules/order/front/search-panel/locale/es.yml
index 949f9b202..9546c7f74 100644
--- a/modules/order/front/search-panel/locale/es.yml
+++ b/modules/order/front/search-panel/locale/es.yml
@@ -7,4 +7,5 @@ Agency: Agencia
Application: Aplicación
SalesPerson: Comercial
Order confirmed: Pedido confirmado
-Show empty: Mostrar vacías
\ No newline at end of file
+Show empty: Mostrar vacías
+Search orders by id: Buscar pedido por id
\ No newline at end of file
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index eeeef1dac..c96f856f0 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -119,7 +119,7 @@ module.exports = Self => {
r.m3,
r.description,
am.name agencyName,
- u.nickname AS workerNickname,
+ u.name AS workerUserName,
v.numberPlate AS vehiclePlateNumber
FROM route r
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
@@ -128,7 +128,6 @@ module.exports = Self => {
LEFT JOIN account.user u ON u.id = w.userFk`
);
-
stmt.merge(conn.makeSuffix(filter));
let itemsIndex = stmts.push(stmt) - 1;
diff --git a/modules/route/back/methods/route/specs/summary.spec.js b/modules/route/back/methods/route/specs/summary.spec.js
index ba976ae94..a9516f7c5 100644
--- a/modules/route/back/methods/route/specs/summary.spec.js
+++ b/modules/route/back/methods/route/specs/summary.spec.js
@@ -25,7 +25,7 @@ describe('route summary()', () => {
const result = await app.models.Route.summary(1);
const worker = result.route.worker().user();
- expect(worker.nickname).toEqual('deliveryNick');
+ expect(worker.name).toEqual('delivery');
});
it(`should return a summary object containing data from the tickets`, async() => {
diff --git a/modules/route/back/methods/route/summary.js b/modules/route/back/methods/route/summary.js
index 0a8710e88..52927d974 100644
--- a/modules/route/back/methods/route/summary.js
+++ b/modules/route/back/methods/route/summary.js
@@ -38,7 +38,7 @@ module.exports = Self => {
{
relation: 'user',
scope: {
- fields: ['id', 'nickname']
+ fields: ['id', 'name']
}
}
]
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 16f6ad827..d095fed09 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -8,6 +8,11 @@
+
+
+
+
Id
Worker
Agency
@@ -22,12 +27,18 @@
+
+
+
+
{{::route.id | dashIfEmpty}}
- {{::route.workerNickname}}
+ {{::route.workerUserName}}
{{::route.agencyName | dashIfEmpty}}
@@ -55,9 +66,25 @@
-
-
-
+
+
+ {{$ctrl.summary.route.worker.user.name}}
+
@@ -71,7 +75,7 @@
- {{ticket.id | zeroFill:6}}
+ {{ticket.id}}
@@ -106,3 +110,6 @@
+
+
diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js
index 3ff2fcb59..79c7131ea 100644
--- a/modules/ticket/back/methods/expedition/filter.js
+++ b/modules/ticket/back/methods/expedition/filter.js
@@ -29,20 +29,24 @@ module.exports = Self => {
e.ticketFk,
e.isBox,
e.workerFk,
- i1.name namePackage,
+ i1.name packageItemName,
e.counter,
e.checked,
- i2.name nameBox,
+ i2.name freightItemName,
e.itemFk,
u.nickname userNickname,
e.created,
- e.externalId
+ e.externalId,
+ i3.name packagingName,
+ i3.id packagingItemFk,
+ e.packagingFk
FROM
vn.expedition e
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox
- LEFT JOIN vn.worker w ON w.id = e.workerFk
- LEFT JOIN account.user u ON u.id = w.userFk
+ LEFT JOIN vn.packaging p ON p.id = e.packagingFk
+ LEFT JOIN vn.item i3 ON i3.id = p.itemFk
+ LEFT JOIN account.user u ON u.id = e.workerFk
`);
stmt.merge(Self.buildSuffix(filter, 'e'));
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index ecd88caeb..4b7b088f4 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -44,8 +44,8 @@ module.exports = Self => {
type: 'Date',
description: `Date to`
}, {
- arg: 'isOk',
- type: 'Boolean',
+ arg: 'state',
+ type: 'String',
description: `Search request by request state`
}
],
@@ -77,8 +77,13 @@ module.exports = Self => {
return {'t.id': value};
case 'attenderFk':
return {'tr.attenderFk': value};
- case 'isOk':
- return {'tr.isOk': value};
+ case 'state':
+ switch (value) {
+ case 'pending':
+ return {'tr.isOk': null};
+ default:
+ return {'tr.isOk': value};
+ }
case 'clientFk':
return {'t.clientFk': value};
case 'from':
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 801563b93..878b4278e 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -2,6 +2,7 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('filter', {
@@ -233,7 +234,7 @@ module.exports = Self => {
});
}
- stmt.merge(conn.makeSuffix(filter));
+ stmt.merge(conn.makeWhere(filter.where));
stmts.push(stmt);
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketGetProblems');
@@ -241,9 +242,11 @@ module.exports = Self => {
CREATE TEMPORARY TABLE tmp.ticketGetProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT id ticketFk, clientFk, warehouseFk, shipped
- FROM tmp.filter
- WHERE alertLevel = 0 OR alertLevel IS NULL`);
+ SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
+ FROM tmp.filter f
+ LEFT JOIN alertLevel al ON al.alertLevel = f.alertLevel
+ WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
+ AND f.shipped >= CURDATE()`);
stmts.push('CALL ticketGetProblems()');
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticket');
@@ -262,6 +265,9 @@ module.exports = Self => {
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticketTotal tt ON tt.ticketFk = f.id`);
+ if (args.problems != undefined && (!args.from && !args.to))
+ throw new UserError('Choose a date range or days forward');
+
let condition;
let hasProblem;
let range;
@@ -293,6 +299,7 @@ module.exports = Self => {
stmt.merge(conn.makeWhere(problems));
stmt.merge(conn.makeOrderBy(filter.order));
+ stmt.merge(conn.makeLimit(filter));
let ticketsIndex = stmts.push(stmt);
stmts.push(
diff --git a/modules/ticket/back/methods/ticket/freightCost.js b/modules/ticket/back/methods/ticket/freightCost.js
new file mode 100644
index 000000000..008121f8f
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/freightCost.js
@@ -0,0 +1,26 @@
+module.exports = Self => {
+ Self.remoteMethod('freightCost', {
+ description: 'Returns the freight cost of a ticket',
+ accessType: 'READ',
+ accepts: {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'ticket id',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: 'Number',
+ root: true
+ },
+ http: {
+ path: `/:id/freightCost`,
+ verb: 'GET'
+ }
+ });
+
+ Self.freightCost = async ticketFk => {
+ const [freightCost] = await Self.rawSql(`SELECT vn.ticket_getFreightCost(?) total`, [ticketFk]);
+ return freightCost.total;
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/getComponentsSum.js b/modules/ticket/back/methods/ticket/getComponentsSum.js
new file mode 100644
index 000000000..c5333288e
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/getComponentsSum.js
@@ -0,0 +1,53 @@
+module.exports = Self => {
+ Self.remoteMethod('getComponentsSum', {
+ description: 'Returns a list of component and their sum from a ticket',
+ accessType: 'READ',
+ accepts: {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'ticket id',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: 'Number',
+ root: true
+ },
+ http: {
+ path: `/:id/getComponentsSum`,
+ verb: 'GET'
+ }
+ });
+ Self.getComponentsSum = async id => {
+ const models = Self.app.models;
+ let salesComponents = [];
+ let componentsSum = [];
+ let sales = await models.Sale.find({where: {ticketFk: id}});
+ let components = await models.Component.find();
+ if (sales.length > 0) {
+ for (let sale of sales) {
+ let myComponents = await models.SaleComponent.find({where: {saleFk: sale.id}});
+ salesComponents = salesComponents.concat(myComponents);
+ }
+
+ salesComponents.reduce((acumulator, currentValue) => {
+ if (!acumulator[currentValue.componentFk]) {
+ let defaultValue = 0;
+ let tarjetComponent = components.find(component => component.id === currentValue.componentFk);
+
+ acumulator[currentValue.componentFk] = {
+ componentFk: currentValue.componentFk,
+ value: defaultValue,
+ name: tarjetComponent.name
+ };
+ componentsSum.push(acumulator[currentValue.componentFk]);
+ }
+
+ acumulator[currentValue.componentFk].value += currentValue.value;
+
+ return acumulator;
+ });
+ }
+ return componentsSum;
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
index bd6fd327a..56375940d 100644
--- a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
@@ -17,7 +17,7 @@ describe('ticket deleteStowaway()', () => {
await app.models.Stowaway.rawSql(
`CALL ticketStateUpdate(?, ?)`, [shipId, 'OK']);
await app.models.Stowaway.rawSql(
- `CALL ticketStateUpdate(?, ?)`, [stowawayId, 'OK']);
+ `CALL ticketStateUpdate(?, ?)`, [stowawayId, 'FREE']);
});
it('should create an stowaway', async() => {
@@ -97,6 +97,6 @@ describe('ticket deleteStowaway()', () => {
}
});
- expect(shipState.name).toEqual('OK');
+ expect(shipState.name).toEqual('Libre');
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 4aa1b3a77..c03a41975 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -11,7 +11,16 @@ describe('ticket filter()', () => {
});
it('should return the tickets matching the problems on true', async() => {
- const ctx = {req: {accessToken: {userId: 9}}, args: {problems: true}};
+ const yesterday = new Date();
+ yesterday.setHours(0, 0, 0, 0);
+ const today = new Date();
+ today.setHours(23, 59, 59, 59);
+
+ const ctx = {req: {accessToken: {userId: 9}}, args: {
+ problems: true,
+ from: yesterday,
+ to: today
+ }};
const filter = {};
const result = await app.models.Ticket.filter(ctx, filter);
@@ -19,11 +28,21 @@ describe('ticket filter()', () => {
});
it('should return the tickets matching the problems on false', async() => {
- const ctx = {req: {accessToken: {userId: 9}}, args: {problems: false}};
+ const yesterday = new Date();
+ yesterday.setDate(yesterday.getDate() - 1);
+ yesterday.setHours(0, 0, 0, 0);
+ const today = new Date();
+ today.setHours(23, 59, 59, 59);
+
+ const ctx = {req: {accessToken: {userId: 9}}, args: {
+ problems: false,
+ from: yesterday,
+ to: today
+ }};
const filter = {};
const result = await app.models.Ticket.filter(ctx, filter);
- expect(result.length).toEqual(20);
+ expect(result.length).toEqual(10);
});
it('should return the tickets matching the problems on null', async() => {
@@ -52,10 +71,10 @@ describe('ticket filter()', () => {
const secondRow = result[1];
const thirdRow = result[2];
- expect(result.length).toEqual(3);
- expect(firstRow.state).toEqual('Arreglar');
- expect(secondRow.state).toEqual('Arreglar');
- expect(thirdRow.state).toEqual('Arreglar');
+ expect(result.length).toEqual(7);
+ expect(firstRow.state).toEqual('Libre');
+ expect(secondRow.state).toEqual('Libre');
+ expect(thirdRow.state).toEqual('Libre');
});
it('should return the tickets that are not pending', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/freightCost.spec.js b/modules/ticket/back/methods/ticket/specs/freightCost.spec.js
new file mode 100644
index 000000000..cb8f5a562
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/specs/freightCost.spec.js
@@ -0,0 +1,17 @@
+const app = require('vn-loopback/server/server');
+
+describe('ticket freightCost()', () => {
+ it('should return the freight cost of a given ticket', async() => {
+ let ticketId = 7;
+ let freightCost = await app.models.Ticket.freightCost(ticketId);
+
+ expect(freightCost).toBe(4);
+ });
+
+ it('should return null if the ticket does not exist', async() => {
+ let ticketId = 99;
+ let freightCost = await app.models.Ticket.freightCost(ticketId);
+
+ expect(freightCost).toBeNull();
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/getComponentsSum.spec.js b/modules/ticket/back/methods/ticket/specs/getComponentsSum.spec.js
new file mode 100644
index 000000000..4be8de3f0
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/specs/getComponentsSum.spec.js
@@ -0,0 +1,20 @@
+const app = require('vn-loopback/server/server');
+
+describe('ticket getComponentsSum()', () => {
+ it('should get the list of component for the ticket sales', async() => {
+ const ticketId = 7;
+ const components = await app.models.Ticket.getComponentsSum(ticketId);
+ const length = components.length;
+ const anyComponent = components[Math.floor(Math.random() * Math.floor(length))];
+
+ expect(components.length).toBeGreaterThan(0);
+ expect(anyComponent.componentFk).toBeDefined();
+ });
+
+ it('should return 0 if the given ticket does not have sales', async() => {
+ const ticketWithoutSales = 21;
+ const components = await app.models.Ticket.getComponentsSum(ticketWithoutSales);
+
+ expect(components.length).toEqual(0);
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js
index 79a7c24d9..434cf5624 100644
--- a/modules/ticket/back/methods/ticket/summary.js
+++ b/modules/ticket/back/methods/ticket/summary.js
@@ -63,7 +63,7 @@ module.exports = Self => {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/ticket/back/models/expedition.json b/modules/ticket/back/models/expedition.json
index 4a9682e03..c0b8d6508 100644
--- a/modules/ticket/back/models/expedition.json
+++ b/modules/ticket/back/models/expedition.json
@@ -24,12 +24,6 @@
},
"counter": {
"type": "Number"
- },
- "checked": {
- "type": "Number"
- },
- "externalId": {
- "type": "Number"
}
},
"relations": {
@@ -43,7 +37,7 @@
"model": "agency-mode",
"foreignKey": "agencyModeFk"
},
- "item": {
+ "packageItem": {
"type": "belongsTo",
"model": "Item",
"foreignKey": "itemFk"
@@ -58,10 +52,15 @@
"model": "TicketPackaging",
"foreignKey": "ticketFk"
},
- "box": {
+ "freightItem": {
"type": "belongsTo",
"model": "Item",
"foreignKey": "isBox"
+ },
+ "packaging": {
+ "type": "belongsTo",
+ "model": "Package",
+ "foreignKey": "packagingFk"
}
}
}
diff --git a/modules/ticket/back/models/ticket.js b/modules/ticket/back/models/ticket.js
index a2891430a..1150b7367 100644
--- a/modules/ticket/back/models/ticket.js
+++ b/modules/ticket/back/models/ticket.js
@@ -30,6 +30,8 @@ module.exports = Self => {
require('../methods/ticket/deleteStowaway')(Self);
require('../methods/ticket/sendSms')(Self);
require('../methods/ticket/isLocked')(Self);
+ require('../methods/ticket/freightCost')(Self);
+ require('../methods/ticket/getComponentsSum')(Self);
Self.observe('before save', async function(ctx) {
if (ctx.isNewInstance) return;
diff --git a/modules/ticket/front/basic-data/step-one/index.js b/modules/ticket/front/basic-data/step-one/index.js
index 68f5ac54d..45fd397dd 100644
--- a/modules/ticket/front/basic-data/step-one/index.js
+++ b/modules/ticket/front/basic-data/step-one/index.js
@@ -155,7 +155,7 @@ class Controller extends Component {
let query = `Clients/${value}`;
this.$http.get(query).then(res => {
if (res.data)
- this.ticket.addressFk = res.data.defaultAddressFk;
+ this.addressId = res.data.defaultAddressFk;
});
}
diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html
index 39e7753fc..fe0667c49 100644
--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@@ -3,27 +3,12 @@
data="ticketUpdateActions"
auto-load="true">
-
-
Item
- Description
+ Description
Quantity
Price (PPU)
New (PPU)
@@ -51,10 +36,31 @@
{{$ctrl.totalPrice | currency: 'EUR': 2}}
- {{$ctrl.totalNewPrice | currency: 'EUR': 2}}
- {{$ctrl.totalPriceDifference | currency: 'EUR': 2}}
+
+
+
+
diff --git a/modules/ticket/front/basic-data/step-two/index.js b/modules/ticket/front/basic-data/step-two/index.js
index ff09bf9ff..c578106ed 100644
--- a/modules/ticket/front/basic-data/step-two/index.js
+++ b/modules/ticket/front/basic-data/step-two/index.js
@@ -1,5 +1,6 @@
import ngModule from '../../module';
import Component from 'core/lib/component';
+import './style.scss';
class Controller extends Component {
$onInit() {
diff --git a/modules/ticket/front/basic-data/step-two/locale/es.yml b/modules/ticket/front/basic-data/step-two/locale/es.yml
index 49dd7fd80..a2a07991b 100644
--- a/modules/ticket/front/basic-data/step-two/locale/es.yml
+++ b/modules/ticket/front/basic-data/step-two/locale/es.yml
@@ -2,4 +2,7 @@ Price (PPU): Precio (Ud.)
New (PPU): Nuevo (Ud.)
Difference: Diferencia
Charge difference to: Cargar diferencia a
-The ticket has been unrouted: El ticket ha sido desenrutado
\ No newline at end of file
+The ticket has been unrouted: El ticket ha sido desenrutado
+Price: Precio
+New price: Nuevo precio
+Price difference: Diferencia de precio
\ No newline at end of file
diff --git a/modules/ticket/front/basic-data/step-two/style.scss b/modules/ticket/front/basic-data/step-two/style.scss
new file mode 100644
index 000000000..82672accb
--- /dev/null
+++ b/modules/ticket/front/basic-data/step-two/style.scss
@@ -0,0 +1,9 @@
+@import "variables";
+
+.align-left {
+ text-align: left
+}
+
+.align-center {
+ text-align: center
+}
\ No newline at end of file
diff --git a/modules/ticket/front/card/index.js b/modules/ticket/front/card/index.js
index 5b3c3c405..34ec2be98 100644
--- a/modules/ticket/front/card/index.js
+++ b/modules/ticket/front/card/index.js
@@ -44,7 +44,7 @@ class Controller extends ModuleCard {
include: {
relation: 'user',
scope: {
- fields: ['nickname']
+ fields: ['name']
}
}
}
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index 20ee592c1..fb8af3219 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -7,9 +7,6 @@
auto-load="true">
-
- Base to commission {{$ctrl.base() | currency: 'EUR':3}}
-
@@ -24,7 +21,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js
index 400684a0d..9afaa862c 100644
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@@ -2,12 +2,46 @@ import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller extends Section {
+ constructor($element, $, vnReport) {
+ super($element, $);
+ this.vnReport = vnReport;
+ }
+
preview(route) {
this.routeSelected = route;
this.$.summary.show();
}
+
+ get checked() {
+ const rows = this.$.model.data || [];
+ const checkedRows = [];
+ for (let row of rows) {
+ if (row.checked)
+ checkedRows.push(row);
+ }
+
+ return checkedRows;
+ }
+
+ get totalChecked() {
+ return this.checked.length;
+ }
+
+ showRouteReport() {
+ const routes = [];
+ for (let route of this.checked)
+ routes.push(route.id);
+ const routesId = routes.join(',');
+
+ this.vnReport.show('driver-route', {
+ authorization: this.vnToken.token,
+ routeId: routesId
+ });
+ }
}
+Controller.$inject = ['$element', '$scope', 'vnReport'];
+
ngModule.vnComponent('vnRouteIndex', {
template: require('./index.html'),
controller: Controller
diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js
new file mode 100644
index 000000000..e90fc7164
--- /dev/null
+++ b/modules/route/front/index/index.spec.js
@@ -0,0 +1,60 @@
+import './index.js';
+import crudModel from 'core/mocks/crud-model';
+
+describe('Component vnRouteIndex', () => {
+ let controller;
+
+ beforeEach(ngModule('route'));
+
+ beforeEach(inject($componentController => {
+ const $element = angular.element('- Charge difference to -
-
-
-
-
-
+
+
+
+
+ Price {{$ctrl.totalPrice | currency: 'EUR': 2}}
+ New price {{$ctrl.totalNewPrice | currency: 'EUR': 2}}
+ Difference {{$ctrl.totalPriceDifference | currency: 'EUR': 2}}
+
+ Total
+
+
+ Charge difference to
+
+
+
+
+ |
+
+
+ Total+
+
+ Components+
+
+
+
+Theorical cost+
+
|