diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index e6aca9665..71723e654 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -3,5 +3,6 @@ View consumer report: Ver informe de consumo
From date: Fecha desde
To date: Fecha hasta
Go to user: Ir al usuario
+Go to supplier: Ir al proveedor
Client invoices list: Listado de facturas del cliente
Pay method: Forma de pago
\ No newline at end of file
diff --git a/modules/client/front/extended-list/index.html b/modules/client/front/extended-list/index.html
new file mode 100644
index 000000000..b45a0bc5f
--- /dev/null
+++ b/modules/client/front/extended-list/index.html
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Identifier
+
+
+ Name
+
+
+ Social name
+
+
+ Tax number
+
+
+ Salesperson
+
+
+ Credit
+
+
+ Credit insurance
+
+
+ Phone
+
+
+ Mobile
+
+
+ Street
+
+
+ Country
+
+
+ Province
+
+
+ City
+
+
+ Postcode
+
+
+ Email
+
+
+ Created
+
+
+ Business type
+
+
+ Billing data
+
+
+ Sage tax type
+
+
+ Sage tr. type
+
+
+ Active
+
+
+ Vies
+
+
+ Verified data
+
+
+ Is equalizated
+
+
+ Freezed
+
+
+ Invoice
+
+
+ Invoice by address
+
+
+ Mailing
+
+
+ Received LCR
+
+
+ Received core VNL
+
+
+ Received B2B VNL
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{::client.id}}
+
+
+ {{::client.name}}
+ {{::client.socialName}}
+ {{::client.fi}}
+
+
+ {{::client.salesPerson | dashIfEmpty}}
+
+
+ {{::client.credit}}
+ {{::client.creditInsurance | dashIfEmpty}}
+ {{::client.phone | dashIfEmpty}}
+ {{::client.mobile | dashIfEmpty}}
+ {{::client.street | dashIfEmpty}}
+ {{::client.country | dashIfEmpty}}
+ {{::client.province | dashIfEmpty}}
+ {{::client.city | dashIfEmpty}}
+ {{::client.postcode | dashIfEmpty}}
+ {{::client.email | dashIfEmpty}}
+ {{::client.created | date:'dd/MM/yyyy'}}
+ {{::client.businessType | dashIfEmpty}}
+ {{::client.payMethod | dashIfEmpty}}
+ {{::client.sageTaxType | dashIfEmpty}}
+ {{::client.sageTransactionType | dashIfEmpty}}
+
+
+ {{ ::client.isActive ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.isVies ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.isTaxDataChecked ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.isEqualizated ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.isFreezed ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.hasToInvoice ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.hasToInvoiceByAddress ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.isToBeMailed ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.hasLcr ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.hasCoreVnl ? 'Yes' : 'No' | translate}}
+
+
+
+
+ {{ ::client.hasSepaVnl ? 'Yes' : 'No' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Filter by selection
+
+
+ Exclude selection
+
+
+ Remove filter
+
+
+ Remove all filters
+
+
+
\ No newline at end of file
diff --git a/modules/client/front/extended-list/index.js b/modules/client/front/extended-list/index.js
new file mode 100644
index 000000000..8eed48d01
--- /dev/null
+++ b/modules/client/front/extended-list/index.js
@@ -0,0 +1,184 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+
+ this.smartTableOptions = {
+ activeButtons: {
+ search: true,
+ shownColumns: true,
+ },
+ columns: [
+ {
+ field: 'socialName',
+ autocomplete: {
+ url: 'Clients',
+ showField: 'socialName',
+ valueField: 'socialName',
+ }
+ },
+ {
+ field: 'created',
+ datepicker: true
+ },
+ {
+ field: 'countryFk',
+ autocomplete: {
+ url: 'Countries',
+ showField: 'country',
+ }
+ },
+ {
+ field: 'provinceFk',
+ autocomplete: {
+ url: 'Provinces'
+ }
+ },
+ {
+ field: 'salesPersonFk',
+ autocomplete: {
+ url: 'Workers/activeWithInheritedRole',
+ where: `{role: 'salesPerson'}`,
+ searchFunction: '{firstName: $search}',
+ showField: 'nickname',
+ valueField: 'id',
+ }
+ },
+ {
+ field: 'businessTypeFk',
+ autocomplete: {
+ url: 'BusinessTypes',
+ valueField: 'code',
+ showField: 'description',
+ }
+ },
+ {
+ field: 'payMethodFk',
+ autocomplete: {
+ url: 'PayMethods',
+ }
+ },
+ {
+ field: 'sageTaxTypeFk',
+ autocomplete: {
+ url: 'SageTaxTypes',
+ showField: 'vat',
+ }
+ },
+ {
+ field: 'sageTransactionTypeFk',
+ autocomplete: {
+ url: 'SageTransactionTypes',
+ showField: 'transaction',
+ }
+ },
+ {
+ field: 'isActive',
+ checkbox: true
+ },
+ {
+ field: 'isVies',
+ checkbox: true
+ },
+ {
+ field: 'isTaxDataChecked',
+ checkbox: true
+ },
+ {
+ field: 'isEqualizated',
+ checkbox: true
+ },
+ {
+ field: 'isFreezed',
+ checkbox: true
+ },
+ {
+ field: 'hasToInvoice',
+ checkbox: true
+ },
+ {
+ field: 'hasToInvoiceByAddress',
+ checkbox: true
+ },
+ {
+ field: 'isToBeMailed',
+ checkbox: true
+ },
+ {
+ field: 'hasSepaVnl',
+ checkbox: true
+ },
+ {
+ field: 'hasLcr',
+ checkbox: true
+ },
+ {
+ field: 'hasCoreVnl',
+ checkbox: true
+ }
+ ]
+ };
+ }
+
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'created':
+ return {'c.created': {
+ between: this.dateRange(value)}
+ };
+ case 'id':
+ case 'name':
+ case 'socialName':
+ case 'fi':
+ case 'credit':
+ case 'creditInsurance':
+ case 'phone':
+ case 'mobile':
+ case 'street':
+ case 'city':
+ case 'postcode':
+ case 'email':
+ case 'isActive':
+ case 'isVies':
+ case 'isTaxDataChecked':
+ case 'isEqualizated':
+ case 'isFreezed':
+ case 'hasToInvoice':
+ case 'hasToInvoiceByAddress':
+ case 'isToBeMailed':
+ case 'hasSepaVnl':
+ case 'hasLcr':
+ case 'hasCoreVnl':
+ case 'countryFk':
+ case 'provinceFk':
+ case 'salesPersonFk':
+ case 'businessTypeFk':
+ case 'payMethodFk':
+ case 'sageTaxTypeFk':
+ case 'sageTransactionTypeFk':
+ return {[`c.${param}`]: 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];
+ }
+
+ preview(client) {
+ this.clientSelected = client;
+ this.$.preview.show();
+ }
+}
+
+ngModule.vnComponent('vnClientExtendedList', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/client/front/extended-list/locale/es.yml b/modules/client/front/extended-list/locale/es.yml
new file mode 100644
index 000000000..ea56f3af2
--- /dev/null
+++ b/modules/client/front/extended-list/locale/es.yml
@@ -0,0 +1,3 @@
+Mailing: Env. emails
+Sage tr. type: Tipo tr. sage
+Yes: Sí
\ No newline at end of file
diff --git a/modules/client/front/extended-list/style.scss b/modules/client/front/extended-list/style.scss
new file mode 100644
index 000000000..7625b5d16
--- /dev/null
+++ b/modules/client/front/extended-list/style.scss
@@ -0,0 +1,6 @@
+@import "variables";
+
+vn-chip.success,
+vn-chip.alert {
+ color: $color-font-bg
+}
\ No newline at end of file
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index f3fd42e76..1f3533327 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -33,7 +33,7 @@
label="Social name"
ng-model="$ctrl.client.socialName"
rule
- info="You can use letters and spaces"
+ info="Only letters, numbers and spaces can be used"
required="true">
{{clientId}} ya tiene este teléfono o email.
+ checked="$ctrl.checkAll"
+ check-field="checked"
+ check-dummy-enabled="true"
+ checked-dummy-count="$ctrl.checkedDummyCount">
Picture
@@ -126,7 +128,7 @@
}">
@@ -146,12 +148,12 @@
- {{::buy.packing | dashIfEmpty}}
+ {{::buy.packing | dashIfEmpty}}
- {{::buy.grouping | dashIfEmpty}}
+ {{::buy.grouping | dashIfEmpty}}
{{::buy.quantity}}
diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js
index 385e7e4b6..ec1109b81 100644
--- a/modules/entry/front/latest-buys/index.js
+++ b/modules/entry/front/latest-buys/index.js
@@ -6,7 +6,7 @@ export default class Controller extends Section {
constructor($element, $) {
super($element, $);
this.editedColumn;
- this.$checkAll = false;
+ this.checkAll = false;
this.smartTableOptions = {
activeButtons: {
@@ -91,7 +91,7 @@ export default class Controller extends Section {
const buys = this.$.model.data || [];
const checkedBuys = [];
for (let buy of buys) {
- if (buy.$checked)
+ if (buy.checked)
checkedBuys.push(buy);
}
@@ -142,6 +142,9 @@ export default class Controller extends Section {
}
get totalChecked() {
+ if (this.checkedDummyCount)
+ return this.checkedDummyCount;
+
return this.checked.length;
}
@@ -156,6 +159,23 @@ export default class Controller extends Section {
lines: rowsToEdit
};
+ if (this.checkedDummyCount && this.checkedDummyCount > 0) {
+ const params = {};
+ if (this.$.model.userParams) {
+ const userParams = this.$.model.userParams;
+ for (let param in userParams) {
+ let newParam = this.exprBuilder(param, userParams[param]);
+ if (!newParam)
+ newParam = {[param]: userParams[param]};
+ Object.assign(params, newParam);
+ }
+ }
+ if (this.$.model.userFilter)
+ Object.assign(params, this.$.model.userFilter.where);
+
+ data.filter = params;
+ }
+
return this.$http.post('Buys/editLatestBuys', data)
.then(() => {
this.uncheck();
diff --git a/modules/entry/front/latest-buys/index.spec.js b/modules/entry/front/latest-buys/index.spec.js
index e9392a797..76e122d80 100644
--- a/modules/entry/front/latest-buys/index.spec.js
+++ b/modules/entry/front/latest-buys/index.spec.js
@@ -31,10 +31,10 @@ describe('Entry', () => {
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},
+ {checked: true, id: 1},
+ {checked: true, id: 2},
+ {checked: true, id: 3},
+ {checked: false, id: 4},
];
let result = controller.checked;
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index f443a94fe..a95b2f18a 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -1,6 +1,6 @@
diff --git a/modules/entry/front/summary/index.js b/modules/entry/front/summary/index.js
index c949dba64..6e18bc959 100644
--- a/modules/entry/front/summary/index.js
+++ b/modules/entry/front/summary/index.js
@@ -4,6 +4,9 @@ import Summary from 'salix/components/summary';
class Controller extends Summary {
get entry() {
+ if (!this._entry)
+ return this.$params;
+
return this._entry;
}
diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
index 7e497d39a..f5eab9099 100644
--- a/modules/invoiceIn/back/methods/invoice-in/filter.js
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -144,6 +144,7 @@ module.exports = Self => {
ii.isBooked,
ii.supplierRef,
ii.docFk AS dmsFk,
+ dm.file,
ii.supplierFk,
ii.expenceFkDeductible deductibleExpenseFk,
s.name AS supplierName,
@@ -156,7 +157,8 @@ module.exports = Self => {
LEFT JOIN duaInvoiceIn dii ON dii.invoiceInFk = ii.id
LEFT JOIN dua d ON d.id = dii.duaFk
LEFT JOIN awb ON awb.id = d.awbFk
- LEFT JOIN company co ON co.id = ii.companyFk`
+ LEFT JOIN company co ON co.id = ii.companyFk
+ LEFT JOIN dms dm ON dm.id = ii.docFk`
);
const sqlWhere = conn.makeWhere(filter.where);
diff --git a/modules/invoiceIn/back/methods/invoice-in/getTotals.js b/modules/invoiceIn/back/methods/invoice-in/getTotals.js
index 918467010..f35c10617 100644
--- a/modules/invoiceIn/back/methods/invoice-in/getTotals.js
+++ b/modules/invoiceIn/back/methods/invoice-in/getTotals.js
@@ -30,7 +30,7 @@ module.exports = Self => {
SUM(iidd.amount) totalDueDay
FROM vn.invoiceIn ii
LEFT JOIN (SELECT SUM(iit.taxableBase) totalTaxableBase,
- SUM(iit.taxableBase * (1 + (ti.PorcentajeIva / 100))) totalVat
+ CAST(SUM(iit.taxableBase * (1 + (ti.PorcentajeIva / 100))) AS DECIMAL(10,2)) totalVat
FROM vn.invoiceInTax iit
LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
WHERE iit.invoiceInFk = ?) iit ON TRUE
diff --git a/modules/invoiceIn/front/create/index.html b/modules/invoiceIn/front/create/index.html
index 4ec724854..16ecf26cf 100644
--- a/modules/invoiceIn/front/create/index.html
+++ b/modules/invoiceIn/front/create/index.html
@@ -13,13 +13,14 @@
vn-id="supplier"
url="Suppliers"
label="Supplier"
- search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
+ search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}, {nif: {like: '%'+ $search +'%'}}]}"
+ fields="['nif']"
show-field="name"
value-field="id"
ng-model="$ctrl.invoiceIn.supplierFk"
order="id"
vn-focus>
- {{id}}: {{name}}
+ {{id}}: {{nif}}: {{name}}
-
-
{{id}}: {{bank}}
diff --git a/modules/invoiceIn/front/dueDay/index.js b/modules/invoiceIn/front/dueDay/index.js
index 22b697f7e..3cc1c81e8 100644
--- a/modules/invoiceIn/front/dueDay/index.js
+++ b/modules/invoiceIn/front/dueDay/index.js
@@ -17,6 +17,12 @@ class Controller extends Section {
this.card.reload();
});
}
+
+ bankSearchFunc($search) {
+ return /^\d+$/.test($search)
+ ? {id: $search}
+ : {bank: {like: '%' + $search + '%'}};
+ }
}
ngModule.vnComponent('vnInvoiceInDueDay', {
diff --git a/modules/invoiceIn/front/index/index.html b/modules/invoiceIn/front/index/index.html
index 62074be33..008d615b1 100644
--- a/modules/invoiceIn/front/index/index.html
+++ b/modules/invoiceIn/front/index/index.html
@@ -13,7 +13,7 @@
Supplier ref.
Serial number
Serial
- Account
+ File
Issued
Is booked
AWB
@@ -27,7 +27,7 @@
class="clickable vn-tr search-result"
ui-sref="invoiceIn.card.summary({id: {{::invoiceIn.id}}})">
{{::invoiceIn.id}}
-
+
@@ -36,8 +36,13 @@
{{::invoiceIn.supplierRef | dashIfEmpty}}
{{::invoiceIn.serialNumber}}
- {{::invoiceIn.serial}}
- {{::invoiceIn.account}}
+ {{::invoiceIn.serial}}
+
+
+ {{::invoiceIn.file}}
+
+
{{::invoiceIn.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
{{id}}: {{name}}
+
+
+
+
-
\ No newline at end of file
+
+
+
+
+
+
+ {{$ctrl.$t('New expense')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Save
+
+
\ No newline at end of file
diff --git a/modules/invoiceIn/front/tax/index.js b/modules/invoiceIn/front/tax/index.js
index 53cfc5598..d05a77f29 100644
--- a/modules/invoiceIn/front/tax/index.js
+++ b/modules/invoiceIn/front/tax/index.js
@@ -1,7 +1,12 @@
import ngModule from '../module';
import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
class Controller extends Section {
+ constructor($element, $, vnWeekDays) {
+ super($element, $);
+ this.expense = {};
+ }
taxRate(invoiceInTax, taxRateSelection) {
const taxTypeSage = taxRateSelection && taxRateSelection.rate;
const taxableBase = invoiceInTax && invoiceInTax.taxableBase;
@@ -26,6 +31,27 @@ class Controller extends Section {
this.card.reload();
});
}
+
+ onResponse() {
+ try {
+ if (!this.expense.code)
+ throw new Error(`The code can't be empty`);
+ if (!this.expense.description)
+ throw new UserError(`The description can't be empty`);
+
+ const data = [{
+ id: this.expense.code,
+ isWithheld: this.expense.isWithheld,
+ name: this.expense.description
+ }];
+
+ this.$http.post(`Expenses`, data) .then(() => {
+ this.vnApp.showSuccess(this.$t('Expense saved!'));
+ });
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ }
+ }
}
ngModule.vnComponent('vnInvoiceInTax', {
diff --git a/modules/invoiceIn/front/tax/index.spec.js b/modules/invoiceIn/front/tax/index.spec.js
index 20d5d40d8..c62ada9ca 100644
--- a/modules/invoiceIn/front/tax/index.spec.js
+++ b/modules/invoiceIn/front/tax/index.spec.js
@@ -1,16 +1,19 @@
import './index.js';
import watcher from 'core/mocks/watcher';
import crudModel from 'core/mocks/crud-model';
+const UserError = require('vn-loopback/util/user-error');
describe('InvoiceIn', () => {
describe('Component tax', () => {
let controller;
let $scope;
let vnApp;
+ let $httpBackend;
beforeEach(ngModule('invoiceIn'));
- beforeEach(inject(($componentController, $rootScope, _vnApp_) => {
+ beforeEach(inject(($componentController, $rootScope, _vnApp_, _$httpBackend_) => {
+ $httpBackend = _$httpBackend_;
vnApp = _vnApp_;
jest.spyOn(vnApp, 'showError');
$scope = $rootScope.$new();
@@ -19,6 +22,7 @@ describe('InvoiceIn', () => {
const $element = angular.element('
+ Refund
+
+
+
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index 7738845f9..b884e50cb 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -116,6 +116,35 @@ class Controller extends Section {
invoiceId: this.id
});
}
+
+ async refundInvoiceOut() {
+ let filter = {
+ where: {refFk: this.invoiceOut.ref}
+ };
+ const tickets = await this.$http.get('Tickets', {filter});
+ this.tickets = tickets.data;
+ this.ticketsIds = [];
+ for (let ticket of this.tickets)
+ this.ticketsIds.push(ticket.id);
+
+ filter = {
+ where: {ticketFk: {inq: this.ticketsIds}}
+ };
+ const sales = await this.$http.get('Sales', {filter});
+ this.sales = sales.data;
+
+ const ticketServices = await this.$http.get('TicketServices', {filter});
+ this.services = ticketServices.data;
+
+ const params = {
+ sales: this.sales,
+ services: this.services
+ };
+ const query = `Sales/refund`;
+ return this.$http.post(query, params).then(res => {
+ this.$state.go('ticket.card.sale', {id: res.data});
+ });
+ }
}
Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail'];
diff --git a/modules/invoiceOut/front/descriptor-menu/index.spec.js b/modules/invoiceOut/front/descriptor-menu/index.spec.js
index fced12e0d..c84c97a57 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.spec.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.spec.js
@@ -122,4 +122,34 @@ describe('vnInvoiceOutDescriptorMenu', () => {
expect(controller.vnApp.showMessage).toHaveBeenCalled();
});
});
+
+ // #4084 review with Juan
+ xdescribe('refundInvoiceOut()', () => {
+ it('should make a query and go to ticket.card.sale', () => {
+ controller.$state.go = jest.fn();
+
+ const invoiceOut = {
+ id: 1,
+ ref: 'T1111111'
+ };
+ controller.invoiceOut = invoiceOut;
+ const tickets = [{id: 1}];
+ const sales = [{id: 1}];
+ const services = [{id: 2}];
+
+ $httpBackend.expectGET(`Tickets`).respond(tickets);
+ $httpBackend.expectGET(`Sales`).respond(sales);
+ $httpBackend.expectGET(`TicketServices`).respond(services);
+
+ const expectedParams = {
+ sales: sales,
+ services: services
+ };
+ $httpBackend.expectPOST(`Sales/refund`, expectedParams).respond();
+ controller.refundInvoiceOut();
+ $httpBackend.flush();
+
+ expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: undefined});
+ });
+ });
});
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index a76f6aad3..8949f1f91 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -12,6 +12,8 @@ Are you sure you want to delete this invoice?: Estas seguro de eliminar esta fac
Are you sure you want to clone this invoice?: Estas seguro de clonar esta factura?
InvoiceOut booked: Factura asentada
Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
+Create a single ticket with all the content of the current invoice: Crear un ticket unico con todo el contenido de la factura actual
Regenerate PDF invoice: Regenerar PDF factura
The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
The email can't be empty: El correo no puede estar vacío
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.html b/modules/invoiceOut/front/index/global-invoicing/index.html
index 9fd412d0e..3d245b8d8 100644
--- a/modules/invoiceOut/front/index/global-invoicing/index.html
+++ b/modules/invoiceOut/front/index/global-invoicing/index.html
@@ -19,7 +19,7 @@
ng-if="$ctrl.isInvoicing">
Invoicing in progress...
+ Adding invoices to queue...
@@ -66,5 +66,5 @@
Make invoice
+ Invoice
\ No newline at end of file
diff --git a/modules/invoiceOut/front/index/global-invoicing/locale/es.yml b/modules/invoiceOut/front/index/global-invoicing/locale/es.yml
index 51e165e2a..1a6e15656 100644
--- a/modules/invoiceOut/front/index/global-invoicing/locale/es.yml
+++ b/modules/invoiceOut/front/index/global-invoicing/locale/es.yml
@@ -1,7 +1,7 @@
Create global invoice: Crear factura global
Some fields are required: Algunos campos son obligatorios
Max date: Fecha límite
-Invoicing in progress...: Facturación en progreso...
+Adding invoices to queue...: Añadiendo facturas a la cola...
Invoice date: Fecha de factura
From client: Desde el cliente
To client: Hasta el cliente
diff --git a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
index 6c692848b..25e661aee 100644
--- a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
+++ b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
@@ -1,12 +1,11 @@
-const models = require('vn-loopback/server/server').models;
-
+const {models} = 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 the given item', async() => {
+ const minDate = new Date();
+ minDate.setHours(0, 0, 0, 0);
+ const maxDate = new Date();
+ maxDate.setHours(23, 59, 59, 59);
- it('should return one entry for a given item', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
@@ -23,13 +22,18 @@ describe('item lastEntriesFilter()', () => {
}
});
- it('should return five entries for a given item', async() => {
+ it('should return five entries for the given item', async() => {
+ const minDate = new Date();
+ minDate.setHours(0, 0, 0, 0);
+ minDate.setMonth(minDate.getMonth() - 2, 1);
+
+ const maxDate = new Date();
+ maxDate.setHours(23, 59, 59, 59);
+
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
try {
- minDate.setMonth(minDate.getMonth() - 2, 1);
-
const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
const result = await models.Item.lastEntriesFilter(filter, options);
diff --git a/modules/item/back/models/expense.json b/modules/item/back/models/expense.json
index 65af02013..368876fbe 100644
--- a/modules/item/back/models/expense.json
+++ b/modules/item/back/models/expense.json
@@ -13,13 +13,10 @@
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
},
"isWithheld": {
"type": "number"
- },
- "taxTypeFk": {
- "type": "number"
}
},
"relations": {
@@ -28,13 +25,5 @@
"model": "TaxType",
"foreignKey": "taxTypeFk"
}
- },
- "acls": [
- {
- "accessType": "READ",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
- }
- ]
+ }
}
\ No newline at end of file
diff --git a/modules/item/back/models/genus.json b/modules/item/back/models/genus.json
index f18d8e4ae..007454130 100644
--- a/modules/item/back/models/genus.json
+++ b/modules/item/back/models/genus.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/item/back/models/ink.json b/modules/item/back/models/ink.json
index a3cd857bf..6a39daafe 100644
--- a/modules/item/back/models/ink.json
+++ b/modules/item/back/models/ink.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "String",
+ "type": "string",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
},
"showOrder": {
"type": "number"
diff --git a/modules/item/back/models/item-barcode.json b/modules/item/back/models/item-barcode.json
index b9de53dd1..e2ce347cb 100644
--- a/modules/item/back/models/item-barcode.json
+++ b/modules/item/back/models/item-barcode.json
@@ -13,12 +13,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"code": {
- "type": "String",
+ "type": "string",
"required": true
}
},
diff --git a/modules/item/back/models/item-botanical.json b/modules/item/back/models/item-botanical.json
index 6c465f0ee..8d8fd389f 100644
--- a/modules/item/back/models/item-botanical.json
+++ b/modules/item/back/models/item-botanical.json
@@ -12,7 +12,7 @@
},
"properties": {
"itemFk": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
}
diff --git a/modules/item/back/models/item-log.json b/modules/item/back/models/item-log.json
index c52931193..633a8f86b 100644
--- a/modules/item/back/models/item-log.json
+++ b/modules/item/back/models/item-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "Number"
+ "type": "number"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/item/back/models/item-placement.json b/modules/item/back/models/item-placement.json
index 7bbb2dc91..0c036ef14 100644
--- a/modules/item/back/models/item-placement.json
+++ b/modules/item/back/models/item-placement.json
@@ -8,17 +8,17 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true
},
"code": {
- "type": "String"
+ "type": "string"
},
"itemFk": {
- "type": "Number"
+ "type": "number"
},
"warehouseFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/item-shelving-sale.json b/modules/item/back/models/item-shelving-sale.json
index 04f505ddd..8b89a7597 100644
--- a/modules/item/back/models/item-shelving-sale.json
+++ b/modules/item/back/models/item-shelving-sale.json
@@ -8,15 +8,15 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"quantity": {
- "type": "Number"
+ "type": "number"
},
"created": {
- "type": "Date"
+ "type": "date"
}
},
"relations": {
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index f0391c565..951a4553a 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -8,27 +8,27 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"shelve": {
- "type": "String"
+ "type": "string"
},
"shelvingFk": {
- "type": "String"
+ "type": "string"
},
"itemFk": {
- "type": "Number"
+ "type": "number"
},
"deep": {
- "type": "Number"
+ "type": "number"
},
"quantity": {
- "type": "Number"
+ "type": "number"
},
"created": {
- "type": "Date"
+ "type": "date"
}
},
"relations": {
diff --git a/modules/item/back/models/item-tag.json b/modules/item/back/models/item-tag.json
index 6beeb29d3..5660b3628 100644
--- a/modules/item/back/models/item-tag.json
+++ b/modules/item/back/models/item-tag.json
@@ -13,23 +13,23 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"value": {
- "type": "String"
+ "type": "string"
},
"itemFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"tagFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"priority": {
- "type": "Number",
+ "type": "number",
"required": true
}
},
diff --git a/modules/item/back/models/item-tax-country.json b/modules/item/back/models/item-tax-country.json
index 24c621518..f10a9eb72 100644
--- a/modules/item/back/models/item-tax-country.json
+++ b/modules/item/back/models/item-tax-country.json
@@ -13,21 +13,21 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"effectived": {
- "type": "Boolean"
+ "type": "boolean"
},
"itemFk": {
- "type": "Number"
+ "type": "number"
},
"countryFk": {
- "type": "Number"
+ "type": "number"
},
"taxClassFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/item-type-tag.json b/modules/item/back/models/item-type-tag.json
index ca374e00e..8c4d50a07 100644
--- a/modules/item/back/models/item-type-tag.json
+++ b/modules/item/back/models/item-type-tag.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"priority": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/item-type.json b/modules/item/back/models/item-type.json
index cb9d5ace8..843d9877f 100644
--- a/modules/item/back/models/item-type.json
+++ b/modules/item/back/models/item-type.json
@@ -21,8 +21,11 @@
"life": {
"type": "number"
},
- "isPackaging": {
- "type": "boolean"
+ "promo": {
+ "type": "number"
+ },
+ "isUnconventionalSize": {
+ "type": "number"
}
},
"relations": {
@@ -40,6 +43,16 @@
"type": "belongsTo",
"model": "ItemCategory",
"foreignKey": "categoryFk"
+ },
+ "itemPackingType": {
+ "type": "belongsTo",
+ "model": "ItemPackingType",
+ "foreignKey": "itemPackingTypeFk"
+ },
+ "temperature": {
+ "type": "belongsTo",
+ "model": "Temperature",
+ "foreignKey": "temperatureFk"
}
},
"acls": [
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index efde2690f..01b6ba093 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -140,6 +140,9 @@
},
"isFloramondo": {
"type": "boolean"
+ },
+ "packingShelve": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/item/back/models/producer.json b/modules/item/back/models/producer.json
index 81a36f8d1..593a172b5 100644
--- a/modules/item/back/models/producer.json
+++ b/modules/item/back/models/producer.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/item/back/models/specie.json b/modules/item/back/models/specie.json
index c5a1f455e..f24474416 100644
--- a/modules/item/back/models/specie.json
+++ b/modules/item/back/models/specie.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/item/back/models/tag.json b/modules/item/back/models/tag.json
index 4cd1ad74e..6c5f5c0ba 100644
--- a/modules/item/back/models/tag.json
+++ b/modules/item/back/models/tag.json
@@ -8,25 +8,25 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String",
+ "type": "string",
"required": true
},
"isFree": {
- "type": "Boolean"
+ "type": "boolean"
},
"sourceTable": {
- "type": "String"
+ "type": "string"
},
"unit": {
- "type": "String"
+ "type": "string"
},
"isQuantitative": {
- "type": "Boolean",
+ "type": "boolean",
"mysql": {
"columnName": "isQuantitatif"
}
diff --git a/modules/item/front/index.js b/modules/item/front/index.js
index c328b1c8d..6a8d1b3b7 100644
--- a/modules/item/front/index.js
+++ b/modules/item/front/index.js
@@ -23,4 +23,4 @@ import './waste/index/';
import './waste/detail';
import './fixed-price';
import './fixed-price-search-panel';
-
+import './item-type';
diff --git a/modules/item/front/item-type/basic-data/index.html b/modules/item/front/item-type/basic-data/index.html
new file mode 100644
index 000000000..1417a05ab
--- /dev/null
+++ b/modules/item/front/item-type/basic-data/index.html
@@ -0,0 +1,62 @@
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/basic-data/index.js b/modules/item/front/item-type/basic-data/index.js
new file mode 100644
index 000000000..ec280fdf8
--- /dev/null
+++ b/modules/item/front/item-type/basic-data/index.js
@@ -0,0 +1,12 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {}
+
+ngModule.component('vnItemTypeBasicData', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ itemType: '<'
+ }
+});
diff --git a/modules/item/front/item-type/card/index.html b/modules/item/front/item-type/card/index.html
new file mode 100644
index 000000000..80af6088e
--- /dev/null
+++ b/modules/item/front/item-type/card/index.html
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/modules/item/front/item-type/create/index.js b/modules/item/front/item-type/create/index.js
new file mode 100644
index 000000000..ccf7744be
--- /dev/null
+++ b/modules/item/front/item-type/create/index.js
@@ -0,0 +1,15 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ onSubmit() {
+ return this.$.watcher.submit().then(res =>
+ this.$state.go('item.itemType.card.basicData', {id: res.data.id})
+ );
+ }
+}
+
+ngModule.component('vnItemTypeCreate', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/item/front/item-type/create/index.spec.js b/modules/item/front/item-type/create/index.spec.js
new file mode 100644
index 000000000..4b000df9a
--- /dev/null
+++ b/modules/item/front/item-type/create/index.spec.js
@@ -0,0 +1,34 @@
+import './index';
+
+describe('component vnItemTypeCreate', () => {
+ let $scope;
+ let $state;
+ let controller;
+
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject(($componentController, $rootScope, _$state_) => {
+ $scope = $rootScope.$new();
+ $state = _$state_;
+ $scope.watcher = {
+ submit: () => {
+ return {
+ then: callback => {
+ callback({data: {id: '1234'}});
+ }
+ };
+ }
+ };
+ const $element = angular.element('
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/descriptor/index.js b/modules/item/front/item-type/descriptor/index.js
new file mode 100644
index 000000000..9322c599a
--- /dev/null
+++ b/modules/item/front/item-type/descriptor/index.js
@@ -0,0 +1,20 @@
+import ngModule from '../../module';
+import Descriptor from 'salix/components/descriptor';
+
+class Controller extends Descriptor {
+ get itemType() {
+ return this.entity;
+ }
+
+ set itemType(value) {
+ this.entity = value;
+ }
+}
+
+ngModule.component('vnItemTypeDescriptor', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ itemType: '<'
+ }
+});
diff --git a/modules/item/front/item-type/index.js b/modules/item/front/item-type/index.js
new file mode 100644
index 000000000..5dcbe4097
--- /dev/null
+++ b/modules/item/front/item-type/index.js
@@ -0,0 +1,8 @@
+import './main';
+import './index/';
+import './summary';
+import './card';
+import './descriptor';
+import './create';
+import './basic-data';
+import './search-panel';
diff --git a/modules/item/front/item-type/index/index.html b/modules/item/front/item-type/index/index.html
new file mode 100644
index 000000000..50b9eb172
--- /dev/null
+++ b/modules/item/front/item-type/index/index.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/index/index.js b/modules/item/front/item-type/index/index.js
new file mode 100644
index 000000000..54ecba997
--- /dev/null
+++ b/modules/item/front/item-type/index/index.js
@@ -0,0 +1,14 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+ preview(itemType) {
+ this.selectedItemType = itemType;
+ this.$.summary.show();
+ }
+}
+
+ngModule.component('vnItemTypeIndex', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/modules/item/front/item-type/index/index.spec.js b/modules/item/front/item-type/index/index.spec.js
new file mode 100644
index 000000000..887c03f7f
--- /dev/null
+++ b/modules/item/front/item-type/index/index.spec.js
@@ -0,0 +1,34 @@
+import './index';
+
+describe('Item', () => {
+ describe('Component vnItemTypeIndex', () => {
+ let controller;
+ let $window;
+
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject(($componentController, _$window_) => {
+ $window = _$window_;
+ const $element = angular.element('
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/main/index.js b/modules/item/front/item-type/main/index.js
new file mode 100644
index 000000000..0dea00abb
--- /dev/null
+++ b/modules/item/front/item-type/main/index.js
@@ -0,0 +1,24 @@
+import ngModule from '../../module';
+import ModuleMain from 'salix/components/module-main';
+
+export default class ItemType extends ModuleMain {
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? {id: value}
+ : {or: [
+ {name: {like: `%${value}%`}},
+ {code: {like: `%${value}%`}}
+ ]};
+ case 'name':
+ case 'code':
+ return {[param]: {like: `%${value}%`}};
+ }
+ }
+}
+
+ngModule.vnComponent('vnItemType', {
+ controller: ItemType,
+ template: require('./index.html')
+});
diff --git a/modules/item/front/item-type/main/index.spec.js b/modules/item/front/item-type/main/index.spec.js
new file mode 100644
index 000000000..dcb14ec0e
--- /dev/null
+++ b/modules/item/front/item-type/main/index.spec.js
@@ -0,0 +1,31 @@
+import './index';
+
+describe('Item', () => {
+ describe('Component vnItemType', () => {
+ let controller;
+
+ beforeEach(ngModule('item'));
+
+ beforeEach(inject($componentController => {
+ const $element = angular.element('
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/search-panel/index.js b/modules/item/front/item-type/search-panel/index.js
new file mode 100644
index 000000000..17a439c39
--- /dev/null
+++ b/modules/item/front/item-type/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.component('vnItemTypeSearchPanel', {
+ template: require('./index.html'),
+ controller: SearchPanel
+});
diff --git a/modules/item/front/item-type/summary/index.html b/modules/item/front/item-type/summary/index.html
new file mode 100644
index 000000000..d003c8f38
--- /dev/null
+++ b/modules/item/front/item-type/summary/index.html
@@ -0,0 +1,50 @@
+
+
+ {{summary.id}} - {{summary.name}} - {{summary.worker.firstName}} {{summary.worker.lastName}}
+
+
+
+ Basic data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/item-type/summary/index.js b/modules/item/front/item-type/summary/index.js
new file mode 100644
index 000000000..7645de8b1
--- /dev/null
+++ b/modules/item/front/item-type/summary/index.js
@@ -0,0 +1,33 @@
+import ngModule from '../../module';
+import Component from 'core/lib/component';
+
+class Controller extends Component {
+ set itemType(value) {
+ this._itemType = value;
+ this.$.summary = null;
+ if (!value) return;
+
+ const filter = {
+ include: [
+ {relation: 'worker'},
+ {relation: 'category'},
+ {relation: 'itemPackingType'},
+ {relation: 'temperature'}
+ ]
+ };
+ this.$http.get(`ItemTypes/${value.id}`, {filter})
+ .then(res => this.$.summary = res.data);
+ }
+
+ get itemType() {
+ return this._itemType;
+ }
+}
+
+ngModule.component('vnItemTypeSummary', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ itemType: '<'
+ }
+});
diff --git a/modules/item/front/item-type/summary/locale/es.yml b/modules/item/front/item-type/summary/locale/es.yml
new file mode 100644
index 000000000..8f4cef70f
--- /dev/null
+++ b/modules/item/front/item-type/summary/locale/es.yml
@@ -0,0 +1,4 @@
+Life: Vida
+Promo: Promoción
+Item packing type: Tipo de embalaje
+Is unconventional size: Es de tamaño poco convencional
\ No newline at end of file
diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json
index 9e21e1697..5743d0ce7 100644
--- a/modules/item/front/routes.json
+++ b/modules/item/front/routes.json
@@ -9,7 +9,8 @@
{"state": "item.index", "icon": "icon-item"},
{"state": "item.request", "icon": "icon-buyrequest"},
{"state": "item.waste.index", "icon": "icon-claims"},
- {"state": "item.fixedPrice", "icon": "icon-fixedPrice"}
+ {"state": "item.fixedPrice", "icon": "icon-fixedPrice"},
+ {"state": "item.itemType", "icon": "contact_support"}
],
"card": [
{"state": "item.card.basicData", "icon": "settings"},
@@ -20,6 +21,9 @@
{"state": "item.card.diary", "icon": "icon-transaction"},
{"state": "item.card.last-entries", "icon": "icon-regentry"},
{"state": "item.card.log", "icon": "history"}
+ ],
+ "itemType": [
+ {"state": "item.itemType.card.basicData", "icon": "settings"}
]
},
"keybindings": [
@@ -169,6 +173,47 @@
"component": "vn-fixed-price",
"description": "Fixed prices",
"acl": ["buyer"]
+ },
+ {
+ "url" : "/item-type?q",
+ "state": "item.itemType",
+ "component": "vn-item-type",
+ "description": "Item Type",
+ "acl": ["buyer"]
+ },
+ {
+ "url": "/create",
+ "state": "item.itemType.create",
+ "component": "vn-item-type-create",
+ "description": "New itemType",
+ "acl": ["buyer"]
+ },
+ {
+ "url": "/:id",
+ "state": "item.itemType.card",
+ "component": "vn-item-type-card",
+ "abstract": true,
+ "description": "Detail"
+ },
+ {
+ "url": "/summary",
+ "state": "item.itemType.card.summary",
+ "component": "vn-item-type-summary",
+ "description": "Summary",
+ "params": {
+ "item-type": "$ctrl.itemType"
+ },
+ "acl": ["buyer"]
+ },
+ {
+ "url": "/basic-data",
+ "state": "item.itemType.card.basicData",
+ "component": "vn-item-type-basic-data",
+ "description": "Basic data",
+ "params": {
+ "item-type": "$ctrl.itemType"
+ },
+ "acl": ["buyer"]
}
]
}
\ No newline at end of file
diff --git a/modules/mdb/back/methods/mdbVersion/upload.js b/modules/mdb/back/methods/mdbVersion/upload.js
new file mode 100644
index 000000000..3d54c0250
--- /dev/null
+++ b/modules/mdb/back/methods/mdbVersion/upload.js
@@ -0,0 +1,121 @@
+const fs = require('fs-extra');
+const path = require('path');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('upload', {
+ description: 'Upload and attach a access file',
+ accepts: [
+ {
+ arg: 'appName',
+ type: 'string',
+ required: true,
+ description: 'The app name'
+ },
+ {
+ arg: 'newVersion',
+ type: 'number',
+ required: true,
+ description: `The new version number`
+ },
+ {
+ arg: 'branch',
+ type: 'string',
+ required: true,
+ description: `The branch name`
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/upload`,
+ verb: 'POST'
+ }
+ });
+
+ Self.upload = async(ctx, appName, newVersion, branch, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ const TempContainer = models.TempContainer;
+ const AccessContainer = models.AccessContainer;
+ const fileOptions = {};
+
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ let srcFile;
+ try {
+ const tempContainer = await TempContainer.container('access');
+ const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
+ const files = Object.values(uploaded.files).map(file => {
+ return file[0];
+ });
+ const uploadedFile = files[0];
+
+ const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
+ srcFile = path.join(file.client.root, file.container, file.name);
+
+ const accessContainer = await AccessContainer.container('.archive');
+ const destinationFile = path.join(
+ accessContainer.client.root, accessContainer.name, appName, `${newVersion}.7z`);
+
+ if (process.env.NODE_ENV == 'test')
+ await fs.unlink(srcFile);
+ else {
+ await fs.move(srcFile, destinationFile, {
+ overwrite: true
+ });
+ await fs.chmod(destinationFile, 0o644);
+
+ const existBranch = await models.MdbBranch.findOne({
+ where: {name: branch}
+ });
+
+ if (!existBranch)
+ throw new UserError('Not exist this branch');
+
+ const branchPath = path.join(accessContainer.client.root, 'branches', branch);
+ await fs.mkdir(branchPath, {recursive: true});
+
+ const destinationBranch = path.join(branchPath, `${appName}.7z`);
+ const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+ try {
+ await fs.unlink(destinationBranch);
+ } catch (e) {}
+ await fs.symlink(destinationFile, destinationBranch);
+
+ if (branch == 'master') {
+ try {
+ await fs.unlink(destinationRoot);
+ } catch (e) {}
+ await fs.symlink(destinationFile, destinationRoot);
+ }
+ }
+
+ await models.MdbVersion.upsert({
+ app: appName,
+ branchFk: branch,
+ version: newVersion
+ });
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+
+ if (fs.existsSync(srcFile))
+ await fs.unlink(srcFile);
+
+ throw e;
+ }
+ };
+};
diff --git a/modules/mdb/back/model-config.json b/modules/mdb/back/model-config.json
new file mode 100644
index 000000000..d5be8de87
--- /dev/null
+++ b/modules/mdb/back/model-config.json
@@ -0,0 +1,11 @@
+{
+ "MdbBranch": {
+ "dataSource": "vn"
+ },
+ "MdbVersion": {
+ "dataSource": "vn"
+ },
+ "AccessContainer": {
+ "dataSource": "accessStorage"
+ }
+}
diff --git a/modules/mdb/back/models/mdb-container.json b/modules/mdb/back/models/mdb-container.json
new file mode 100644
index 000000000..a927b30f1
--- /dev/null
+++ b/modules/mdb/back/models/mdb-container.json
@@ -0,0 +1,10 @@
+{
+ "name": "AccessContainer",
+ "base": "Container",
+ "acls": [{
+ "accessType": "*",
+ "principalType": "ROLE",
+ "principalId": "developer",
+ "permission": "ALLOW"
+ }]
+}
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbBranch.json b/modules/mdb/back/models/mdbBranch.json
new file mode 100644
index 000000000..486dfaf25
--- /dev/null
+++ b/modules/mdb/back/models/mdbBranch.json
@@ -0,0 +1,16 @@
+{
+ "name": "MdbBranch",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "mdbBranch"
+ }
+ },
+ "properties": {
+ "name": {
+ "id": true,
+ "type": "string",
+ "description": "Identifier"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbVersion.js b/modules/mdb/back/models/mdbVersion.js
new file mode 100644
index 000000000..b36ee2a60
--- /dev/null
+++ b/modules/mdb/back/models/mdbVersion.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+ require('../methods/mdbVersion/upload')(Self);
+};
diff --git a/modules/mdb/back/models/mdbVersion.json b/modules/mdb/back/models/mdbVersion.json
new file mode 100644
index 000000000..02635ff8a
--- /dev/null
+++ b/modules/mdb/back/models/mdbVersion.json
@@ -0,0 +1,26 @@
+{
+ "name": "MdbVersion",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "mdbVersion"
+ }
+ },
+ "properties": {
+ "app": {
+ "type": "string",
+ "description": "The app name",
+ "id": true
+ },
+ "version": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "branch": {
+ "type": "belongsTo",
+ "model": "MdbBranch",
+ "foreignKey": "branchFk"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/monitor/back/methods/sales-monitor/clientsFilter.js b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
index 44554c7e3..723d1e349 100644
--- a/modules/monitor/back/methods/sales-monitor/clientsFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
@@ -43,11 +43,9 @@ module.exports = Self => {
TIME(v.stamp) AS hour,
DATE(v.stamp) AS dated,
wtc.workerFk
- FROM hedera.userSession s
- JOIN hedera.visitUser v ON v.id = s.userVisitFk
+ FROM hedera.visitUser v
JOIN client c ON c.id = v.userFk
- LEFT JOIN account.user u ON c.salesPersonFk = u.id
- LEFT JOIN worker w ON c.salesPersonFk = w.id
+ JOIN account.user u ON c.salesPersonFk = u.id
LEFT JOIN sharingCart sc ON sc.workerFk = c.salesPersonFk
AND vn.VN_CURDATE() BETWEEN sc.started AND sc.ended
LEFT JOIN workerTeamCollegues wtc
@@ -58,7 +56,9 @@ module.exports = Self => {
const where = filter.where;
where['wtc.workerFk'] = userId;
- stmt.merge(conn.makeSuffix(filter));
+ stmt.merge(conn.makeWhere(filter.where));
+ stmt.merge(`GROUP BY clientFk, v.stamp`);
+ stmt.merge(conn.makePagination(filter));
return conn.executeStmt(stmt, myOptions);
};
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 07c0f540b..694b8fb94 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -304,7 +304,8 @@ module.exports = Self => {
{'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true},
{'tp.isTaxDataChecked': false},
- {'tp.isAvailable': false}
+ {'tp.itemShortage': {neq: null}},
+ {'tp.isTooLittle': true}
]};
} else if (hasProblems === false) {
whereProblems = {and: [
@@ -313,7 +314,8 @@ module.exports = Self => {
{'tp.hasTicketRequest': false},
{'tp.hasComponentLack': false},
{'tp.isTaxDataChecked': true},
- {'tp.isAvailable': true}
+ {'tp.itemShortage': null},
+ {'tp.isTooLittle': false}
]};
}
diff --git a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
index 3fcc6c91a..bcb37830c 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
@@ -6,12 +6,49 @@ describe('SalesMonitor clientsFilter()', () => {
try {
const options = {transaction: tx};
-
const ctx = {req: {accessToken: {userId: 18}}, args: {}};
- const filter = {order: 'dated DESC'};
+
+ const from = new Date();
+ const to = new Date();
+ from.setHours(0, 0, 0, 0);
+ to.setHours(23, 59, 59, 59);
+
+ const filter = {
+ where: {
+ 'v.stamp': {between: [from, to]}
+ }
+ };
const result = await models.SalesMonitor.clientsFilter(ctx, filter, options);
- expect(result.length).toEqual(9);
+ expect(result.length).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return the clients web activity filtered', async() => {
+ const tx = await models.SalesMonitor.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const ctx = {req: {accessToken: {userId: 18}}, args: {}};
+ const yesterday = new Date();
+ yesterday.setDate(yesterday.getDate() - 1);
+ const today = new Date();
+ yesterday.setHours(0, 0, 0, 0);
+ today.setHours(23, 59, 59, 59);
+
+ const filter = {
+ where: {
+ 'v.stamp': {between: [yesterday, today]}
+ }
+ };
+ const result = await models.SalesMonitor.clientsFilter(ctx, filter, options);
+
+ expect(result.length).toEqual(5);
await tx.rollback();
} catch (e) {
diff --git a/modules/monitor/front/index/clients/index.html b/modules/monitor/front/index/clients/index.html
index 35b52fa09..eafc2256e 100644
--- a/modules/monitor/front/index/clients/index.html
+++ b/modules/monitor/front/index/clients/index.html
@@ -88,8 +88,16 @@
-
+
+
+
+
+
Salesperson
-
+
Date
@@ -98,8 +98,8 @@
icon="icon-buyrequest">
@@ -153,8 +153,8 @@
-
- {{::ticket.shipped | date: 'dd/MM/yyyy'}}
+
+ {{::ticket.shippedDate | date: 'dd/MM/yyyy'}}
{{::ticket.zoneLanding | date: 'HH:mm'}}
diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js
index 58b56bbc5..91d9079d8 100644
--- a/modules/monitor/front/index/tickets/index.js
+++ b/modules/monitor/front/index/tickets/index.js
@@ -52,8 +52,8 @@ export default class Controller extends Section {
}
},
{
- field: 'shipped',
- searchable: false
+ field: 'shippedDate',
+ datepicker: true
},
{
field: 'theoreticalHour',
@@ -136,7 +136,7 @@ export default class Controller extends Section {
return {'z.hour': value};
case 'practicalHour':
return {'zed.etc': value};
- case 'shipped':
+ case 'shippedDate':
return {'t.shipped': {
between: this.dateRange(value)}
};
diff --git a/modules/order/back/models/order-row.json b/modules/order/back/models/order-row.json
index 44d5a103a..4b78bfdad 100644
--- a/modules/order/back/models/order-row.json
+++ b/modules/order/back/models/order-row.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"warehouseFk": {
- "type": "Number"
+ "type": "number"
},
"shipped": {
"type": "date",
@@ -22,22 +22,22 @@
}
},
"quantity": {
- "type": "Number",
+ "type": "number",
"mysql": {
"columnName": "amount"
}
},
"price": {
- "type": "Number"
+ "type": "number"
},
"rate": {
- "type": "Number"
+ "type": "number"
},
"created": {
"type": "date"
},
"saleFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/order/back/models/order-ticket.json b/modules/order/back/models/order-ticket.json
index 2875ebdfc..9fe144b47 100644
--- a/modules/order/back/models/order-ticket.json
+++ b/modules/order/back/models/order-ticket.json
@@ -9,11 +9,11 @@
"properties": {
"orderFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"ticketFk": {
"id": true,
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/order/back/models/order.json b/modules/order/back/models/order.json
index 38755c2a5..169c0c550 100644
--- a/modules/order/back/models/order.json
+++ b/modules/order/back/models/order.json
@@ -8,80 +8,80 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"landed": {
- "type": "Date",
+ "type": "date",
"required": true,
"mysql": {
"columnName": "date_send"
}
},
"clientFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "customer_id"
}
},
"addressFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "address_id"
}
},
"agencyModeFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "agency_id"
}
},
"companyFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "company_id"
}
},
"note": {
- "type": "String"
+ "type": "string"
},
"sourceApp": {
- "type": "String",
+ "type": "string",
"mysql": {
"columnName": "source_app"
}
},
"isConfirmed": {
- "type": "Number",
+ "type": "number",
"mysql": {
"columnName": "confirmed"
}
},
"created": {
- "type": "Date",
+ "type": "date",
"mysql": {
"columnName": "date_make"
}
},
"firstRowStamp": {
- "type": "Date",
+ "type": "date",
"mysql": {
"columnName": "first_row_stamp"
}
},
"confirmed": {
- "type": "Date",
+ "type": "date",
"mysql": {
"columnName": "confirm_date"
}
},
"total": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index a2a4a5226..c4bed7307 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -33,7 +33,7 @@
{{::order.name | dashIfEmpty}}
-
+
@@ -46,7 +46,7 @@
disabled="true">
- {{::order.created | date: 'dd/MM/yyyy HH:mm'}}
+ {{::order.created | date: 'dd/MM/yyyy HH:mm'}}
{{::order.landed | date:'dd/MM/yyyy'}}
diff --git a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
index 81686144d..ad4613caf 100644
--- a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
+++ b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
@@ -1,7 +1,6 @@
const models = require('vn-loopback/server/server').models;
-// Include after #3638 export database
-xdescribe('AgencyTerm createInvoiceIn()', () => {
+describe('AgencyTerm createInvoiceIn()', () => {
const rows = [
{
routeFk: 2,
@@ -17,6 +16,7 @@ xdescribe('AgencyTerm createInvoiceIn()', () => {
];
it('should make an invoiceIn', async() => {
+ pending('Include after #3638 export database');
const tx = await models.AgencyTerm.beginTransaction({});
const options = {transaction: tx};
@@ -32,8 +32,12 @@ xdescribe('AgencyTerm createInvoiceIn()', () => {
await models.AgencyTerm.createInvoiceIn(rows, dms, options);
const [newInvoiceIn] = await models.InvoiceIn.rawSql('SELECT MAX(id) id FROM invoiceIn', null, options);
- const [newInvoiceInDueDay] = await models.InvoiceInDueDay.rawSql('SELECT MAX(id) id FROM invoiceInDueDay', null, options);
- const [newInvoiceInTax] = await models.InvoiceInTax.rawSql('SELECT MAX(id) id FROM invoiceInTax', null, options);
+
+ const dueDayQuery = 'SELECT MAX(id) id FROM invoiceInDueDay';
+ const [newInvoiceInDueDay] = await models.InvoiceInDueDay.rawSql(dueDayQuery, null, options);
+
+ const taxQuery = 'SELECT MAX(id) id FROM invoiceInTax';
+ const [newInvoiceInTax] = await models.InvoiceInTax.rawSql(taxQuery, null, options);
expect(newInvoiceIn.id).toBeGreaterThan(oldInvoiceIn.id);
expect(newInvoiceInDueDay.id).toBeGreaterThan(oldInvoiceInDueDay.id);
diff --git a/modules/route/back/methods/route/getSuggestedTickets.js b/modules/route/back/methods/route/getSuggestedTickets.js
index f0333e66b..c1a9c7cae 100644
--- a/modules/route/back/methods/route/getSuggestedTickets.js
+++ b/modules/route/back/methods/route/getSuggestedTickets.js
@@ -59,6 +59,12 @@ module.exports = Self => {
fields: ['id', 'name']
}
},
+ {
+ relation: 'agencyMode',
+ scope: {
+ fields: ['id', 'name']
+ }
+ },
{
relation: 'address',
scope: {
diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js
index 892324acf..902647ba1 100644
--- a/modules/route/back/methods/route/specs/guessPriority.spec.js
+++ b/modules/route/back/methods/route/specs/guessPriority.spec.js
@@ -1,9 +1,21 @@
const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
describe('route guessPriority()', () => {
const targetRouteId = 7;
let routeTicketsToRestore;
+ const activeCtx = {
+ accessToken: {userId: 9},
+ __: () => {}
+ };
+
+ beforeAll(() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+ active: activeCtx
+ });
+ });
+
afterAll(async() => {
let restoreFixtures = [];
routeTicketsToRestore.forEach(ticket => {
@@ -12,12 +24,9 @@ describe('route guessPriority()', () => {
await Promise.all(restoreFixtures);
});
- it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => {
+ it('should call guessPriority() then check all tickets in that route have their priorities defined', async() => {
const ctx = {
- req: {
- accessToken: {userId: 9},
- __: () => {}
- },
+ req: activeCtx
};
routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}});
diff --git a/modules/route/back/models/deliveryPoint.json b/modules/route/back/models/deliveryPoint.json
index c6c0a2116..639f21e35 100644
--- a/modules/route/back/models/deliveryPoint.json
+++ b/modules/route/back/models/deliveryPoint.json
@@ -8,15 +8,15 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
},
"ubication": {
- "type": "String"
+ "type": "string"
}
}
}
diff --git a/modules/route/back/models/route-log.json b/modules/route/back/models/route-log.json
index abaeeb722..37f898267 100644
--- a/modules/route/back/models/route-log.json
+++ b/modules/route/back/models/route-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "Number"
+ "type": "number"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/route/back/models/route.json b/modules/route/back/models/route.json
index bdb641096..46fb6b76f 100644
--- a/modules/route/back/models/route.json
+++ b/modules/route/back/models/route.json
@@ -11,7 +11,7 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
@@ -22,10 +22,10 @@
"type": "date"
},
"kmStart": {
- "type": "Number"
+ "type": "number"
},
"kmEnd": {
- "type": "Number"
+ "type": "number"
},
"started": {
"type": "date"
@@ -40,13 +40,13 @@
}
},
"cost": {
- "type": "Number"
+ "type": "number"
},
"m3": {
- "type": "Number"
+ "type": "number"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/route/back/models/vehicle.json b/modules/route/back/models/vehicle.json
index 399480c98..a35926bef 100644
--- a/modules/route/back/models/vehicle.json
+++ b/modules/route/back/models/vehicle.json
@@ -8,27 +8,27 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"numberPlate": {
- "type": "String"
+ "type": "string"
},
"tradeMark": {
- "type": "String"
+ "type": "string"
},
"model": {
- "type": "String"
+ "type": "string"
},
"m3": {
- "type": "Number"
+ "type": "number"
},
"description": {
- "type": "String"
+ "type": "string"
},
"isActive": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/route/front/locale/en.yml b/modules/route/front/locale/en.yml
new file mode 100644
index 000000000..0e5302b14
--- /dev/null
+++ b/modules/route/front/locale/en.yml
@@ -0,0 +1 @@
+Unlink zone: Unlink zone {{zoneName}} from agency {{agencyName}}
\ No newline at end of file
diff --git a/modules/route/front/locale/es.yml b/modules/route/front/locale/es.yml
index 268bc4812..74ab2cd61 100644
--- a/modules/route/front/locale/es.yml
+++ b/modules/route/front/locale/es.yml
@@ -1,4 +1,5 @@
Routes: Rutas
Search routes by id: Buscar rutas por identificador
New route: Nueva ruta
-route: ruta
\ No newline at end of file
+route: ruta
+Unlink zone: Desvincular zona {{zoneName}} de agencia {{agencyName}}
\ No newline at end of file
diff --git a/modules/route/front/ticket-popup/index.html b/modules/route/front/ticket-popup/index.html
index 33684a433..99e3364b8 100644
--- a/modules/route/front/ticket-popup/index.html
+++ b/modules/route/front/ticket-popup/index.html
@@ -33,7 +33,7 @@
PC
Address
- Warehouse
+ Zone
@@ -62,7 +62,7 @@
@@ -76,4 +76,9 @@
question="{{$ctrl.confirmationMessage}}"
message="Unlink selected zone?">
+
+
+
+
+
diff --git a/modules/supplier/back/methods/supplier/getSummary.js b/modules/supplier/back/methods/supplier/getSummary.js
index 67f5267b6..bf3fa56f5 100644
--- a/modules/supplier/back/methods/supplier/getSummary.js
+++ b/modules/supplier/back/methods/supplier/getSummary.js
@@ -41,7 +41,9 @@ module.exports = Self => {
'sageTaxTypeFk',
'sageTransactionTypeFk',
'sageWithholdingFk',
- 'workerFk'
+ 'workerFk',
+ 'supplierActivityFk',
+ 'healthRegister'
],
include: [
{
@@ -98,14 +100,15 @@ module.exports = Self => {
}
}
},
+ {
+ relation: 'supplierActivity',
+ scope: {
+ fields: ['code', 'name']
+ }
+ }
]
};
- let supplier = await Self.app.models.Supplier.findOne(filter);
- const farmerCode = 2;
- if (supplier.sageWithholdingFk == farmerCode)
- supplier.isFarmer = true;
-
- return supplier;
+ return Self.app.models.Supplier.findOne(filter);
};
};
diff --git a/modules/supplier/back/methods/supplier/specs/getSummary.spec.js b/modules/supplier/back/methods/supplier/specs/getSummary.spec.js
index 21e56882f..30713f517 100644
--- a/modules/supplier/back/methods/supplier/specs/getSummary.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/getSummary.spec.js
@@ -25,12 +25,4 @@ describe('Supplier getSummary()', () => {
expect(payMethod.name).toEqual('PayMethod one');
});
-
- it(`should get if supplier is farmer by sageWithholdingFk`, async() => {
- const supplier = await app.models.Supplier.findById(2);
- const supplierSummary = await app.models.Supplier.getSummary(2);
-
- expect(supplier.isFarmer).toBeUndefined();
- expect(supplierSummary.isFarmer).toEqual(true);
- });
});
diff --git a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
index 0eec54926..a47e547d1 100644
--- a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
@@ -66,6 +66,8 @@ describe('Supplier updateFiscalData', () => {
city: 'VALENCIA',
provinceFk: 2,
countryFk: 1,
+ supplierActivityFk: 'animals',
+ healthRegister: '400664487H'
};
const result = await app.models.Supplier.updateFiscalData(ctx, supplierId);
@@ -80,6 +82,8 @@ describe('Supplier updateFiscalData', () => {
expect(result.city).toEqual('VALENCIA');
expect(result.provinceFk).toEqual(2);
expect(result.countryFk).toEqual(1);
+ expect(result.supplierActivityFk).toEqual('animals');
+ expect(result.healthRegister).toEqual('400664487H');
// Restores
ctx.args = defaultData;
diff --git a/modules/supplier/back/methods/supplier/updateFiscalData.js b/modules/supplier/back/methods/supplier/updateFiscalData.js
index daa602af0..4604b3f91 100644
--- a/modules/supplier/back/methods/supplier/updateFiscalData.js
+++ b/modules/supplier/back/methods/supplier/updateFiscalData.js
@@ -56,6 +56,14 @@ module.exports = Self => {
{
arg: 'countryFk',
type: 'any'
+ },
+ {
+ arg: 'supplierActivityFk',
+ type: 'string'
+ },
+ {
+ arg: 'healthRegister',
+ type: 'string'
}],
returns: {
arg: 'res',
diff --git a/modules/supplier/back/model-config.json b/modules/supplier/back/model-config.json
index 7c1bba1ec..dbc387ed2 100644
--- a/modules/supplier/back/model-config.json
+++ b/modules/supplier/back/model-config.json
@@ -11,6 +11,9 @@
"SupplierAccount": {
"dataSource": "vn"
},
+ "SupplierActivity": {
+ "dataSource": "vn"
+ },
"SupplierAgencyTerm": {
"dataSource": "vn"
},
diff --git a/modules/supplier/back/models/pay-dem.json b/modules/supplier/back/models/pay-dem.json
index f214f3e3a..1253c751c 100644
--- a/modules/supplier/back/models/pay-dem.json
+++ b/modules/supplier/back/models/pay-dem.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"payDem": {
- "type": "Number"
+ "type": "number"
}
}
}
diff --git a/modules/supplier/back/models/supplier-account.json b/modules/supplier/back/models/supplier-account.json
index 8e2838fe5..2ee83338b 100644
--- a/modules/supplier/back/models/supplier-account.json
+++ b/modules/supplier/back/models/supplier-account.json
@@ -12,15 +12,15 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"iban": {
- "type": "String"
+ "type": "string"
},
"beneficiary": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/supplier/back/models/supplier-activity.json b/modules/supplier/back/models/supplier-activity.json
new file mode 100644
index 000000000..7a0b9a537
--- /dev/null
+++ b/modules/supplier/back/models/supplier-activity.json
@@ -0,0 +1,18 @@
+{
+ "name": "SupplierActivity",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "supplierActivity"
+ }
+ },
+ "properties": {
+ "code": {
+ "type": "string",
+ "id": true
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/supplier/back/models/supplier-contact.json b/modules/supplier/back/models/supplier-contact.json
index 104a3a404..9e13c33a8 100644
--- a/modules/supplier/back/models/supplier-contact.json
+++ b/modules/supplier/back/models/supplier-contact.json
@@ -12,27 +12,27 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"supplierFk": {
- "type": "String"
+ "type": "string"
},
"phone": {
- "type": "String"
+ "type": "string"
},
"mobile": {
- "type": "String"
+ "type": "string"
},
"email": {
- "type": "String"
+ "type": "string"
},
"observation": {
- "type": "String"
+ "type": "string"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/supplier/back/models/supplier.json b/modules/supplier/back/models/supplier.json
index 8b4b8f26f..b27073ca5 100644
--- a/modules/supplier/back/models/supplier.json
+++ b/modules/supplier/back/models/supplier.json
@@ -101,6 +101,12 @@
},
"isPayMethodChecked": {
"type": "boolean"
+ },
+ "supplierActivityFk": {
+ "type": "string"
+ },
+ "healthRegister": {
+ "type": "string"
}
},
"relations": {
@@ -159,6 +165,11 @@
"type": "hasMany",
"model": "SupplierAddress",
"foreignKey": "supplierFk"
+ },
+ "supplierActivity": {
+ "type": "belongsTo",
+ "model": "SupplierActivity",
+ "foreignKey": "supplierActivityFk"
}
}
}
\ No newline at end of file
diff --git a/modules/supplier/front/agency-term/index/index.html b/modules/supplier/front/agency-term/index/index.html
index ac3b9b0d5..9d53226c5 100644
--- a/modules/supplier/front/agency-term/index/index.html
+++ b/modules/supplier/front/agency-term/index/index.html
@@ -78,7 +78,7 @@
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index fc44468f4..77a5cce4e 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -30,6 +30,11 @@
data="sageWithholdings"
order="withholding">
+
+
@@ -87,6 +92,22 @@
{{id}}: {{transaction}}
+
+
+
+
+
+
-
-
@@ -118,6 +113,13 @@
label="Sage withholding"
value="{{::$ctrl.summary.sageWithholding.withholding}}">
+
+
+
diff --git a/modules/supplier/front/summary/locale/es.yml b/modules/supplier/front/summary/locale/es.yml
index 512b75f9d..35291e579 100644
--- a/modules/supplier/front/summary/locale/es.yml
+++ b/modules/supplier/front/summary/locale/es.yml
@@ -7,4 +7,6 @@ Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage
Sage withholding: Retencion Sage
Go to the supplier: Ir al proveedor
-Responsible: Responsable
\ No newline at end of file
+Responsible: Responsable
+Supplier activity: Actividad proveedor
+Healt register: Pasaporte sanitario
\ No newline at end of file
diff --git a/modules/ticket/back/methods/expedition-state/filter.js b/modules/ticket/back/methods/expedition-state/filter.js
new file mode 100644
index 000000000..1483780f7
--- /dev/null
+++ b/modules/ticket/back/methods/expedition-state/filter.js
@@ -0,0 +1,41 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+ Self.remoteMethod('filter', {
+ description: 'Find all instances of the model matched by filter from the data source.',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+ http: {source: 'query'},
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true,
+ },
+ http: {
+ path: `/filter`,
+ verb: 'GET',
+ },
+ });
+
+ Self.filter = async(filter, options) => {
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const stmt = new ParameterizedSQL(
+ `SELECT es.created, u.name, u.id workerFk, est.description state
+ FROM vn.expeditionState es
+ JOIN vn.expeditionStateType est ON est.id = es.typeFk
+ JOIN account.user u ON u.id = es.userFk
+ `);
+ stmt.merge(Self.buildSuffix(filter, 'es'));
+
+ return Self.rawStmt(stmt, myOptions);
+ };
+};
diff --git a/modules/ticket/back/methods/expedition-state/specs/filter.spec.js b/modules/ticket/back/methods/expedition-state/specs/filter.spec.js
new file mode 100644
index 000000000..f144606eb
--- /dev/null
+++ b/modules/ticket/back/methods/expedition-state/specs/filter.spec.js
@@ -0,0 +1,21 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('expeditionState filter()', () => {
+ it('should return the expedition states matching the filter', async() => {
+ const tx = await models.ExpeditionState.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const filter = {where: {expeditionFk: 5}};
+ const response = await models.ExpeditionState.filter(filter, options);
+
+ expect(response.length).toEqual(2);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js
index 5eb7510b7..723d7c844 100644
--- a/modules/ticket/back/methods/expedition/filter.js
+++ b/modules/ticket/back/methods/expedition/filter.js
@@ -36,7 +36,6 @@ module.exports = Self => {
e.workerFk,
i1.name packageItemName,
e.counter,
- e.checked,
i2.name freightItemName,
e.itemFk,
u.name userName,
@@ -47,9 +46,10 @@ module.exports = Self => {
e.packagingFk,
es.workerFk expeditionScanWorkerFk,
su.name scannerUserName,
- es.scanned
- FROM
- vn.expedition e
+ es.scanned,
+ est.description state
+ FROM vn.expedition e
+ LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox
LEFT JOIN vn.packaging p ON p.id = e.packagingFk
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index 9c87f23d3..83a420a8e 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -2,19 +2,19 @@ const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('refund', {
- description: 'Create ticket with the selected lines changing the sign to the quantites',
+ description: 'Create ticket refund with lines and services changing the sign to the quantites',
accessType: 'WRITE',
accepts: [{
arg: 'sales',
description: 'The sales',
type: ['object'],
- required: true
+ required: false
},
{
- arg: 'ticketId',
- type: 'number',
- required: true,
- description: 'The ticket id'
+ arg: 'services',
+ type: ['object'],
+ required: false,
+ description: 'The services'
}],
returns: {
type: 'number',
@@ -26,7 +26,7 @@ module.exports = Self => {
}
});
- Self.refund = async(ctx, sales, ticketId, options) => {
+ Self.refund = async(ctx, sales, services, options) => {
const myOptions = {};
let tx;
@@ -39,7 +39,6 @@ module.exports = Self => {
}
try {
- const salesIds = [];
const userId = ctx.req.accessToken.userId;
const isClaimManager = await Self.app.models.Account.hasRole(userId, 'claimManager');
@@ -49,39 +48,47 @@ module.exports = Self => {
if (!hasValidRole)
throw new UserError(`You don't have privileges to create refund`);
- for (let sale of sales)
- salesIds.push(sale.id);
+ const salesIds = [];
+ if (sales) {
+ for (let sale of sales)
+ salesIds.push(sale.id);
+ } else
+ salesIds.push(null);
+
+ const servicesIds = [];
+ if (services) {
+ for (let service of services)
+ servicesIds.push(service.id);
+ } else
+ servicesIds.push(null);
const query = `
DROP TEMPORARY TABLE IF EXISTS tmp.sale;
DROP TEMPORARY TABLE IF EXISTS tmp.ticketService;
CREATE TEMPORARY TABLE tmp.sale
- SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
+ SELECT s.id, s.itemFk, s.quantity, s.concept, s.price, s.discount, s.ticketFk
FROM sale s
WHERE s.id IN (?);
- CREATE TEMPORARY TABLE tmp.ticketService(
- description VARCHAR(50),
- quantity DECIMAL (10,2),
- price DECIMAL (10,2),
- taxClassFk INT,
- ticketServiceTypeFk INT
- );
-
- CALL vn.ticket_doRefund(?, @newTicket);
+ CREATE TEMPORARY TABLE tmp.ticketService
+ SELECT ts.description, ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk, ts.ticketFk
+ FROM ticketService ts
+ WHERE ts.id IN (?);
+
+ CALL vn.ticket_doRefund(@newTicket);
DROP TEMPORARY TABLE tmp.sale;
DROP TEMPORARY TABLE tmp.ticketService;`;
- await Self.rawSql(query, [salesIds, ticketId], myOptions);
+ await Self.rawSql(query, [salesIds, servicesIds], myOptions);
const [newTicket] = await Self.rawSql('SELECT @newTicket id', null, myOptions);
- ticketId = newTicket.id;
+ const newTicketId = newTicket.id;
if (tx) await tx.commit();
- return ticketId;
+ return newTicketId;
} catch (e) {
if (tx) await tx.rollback();
throw e;
diff --git a/modules/ticket/back/methods/sale/refundAll.js b/modules/ticket/back/methods/sale/refundAll.js
deleted file mode 100644
index 6fcd27f0a..000000000
--- a/modules/ticket/back/methods/sale/refundAll.js
+++ /dev/null
@@ -1,78 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-
-module.exports = Self => {
- Self.remoteMethodCtx('refundAll', {
- description: 'Create ticket with all lines and services changing the sign to the quantites',
- accessType: 'WRITE',
- accepts: [{
- arg: 'ticketId',
- type: 'number',
- required: true,
- description: 'The ticket id'
- }],
- returns: {
- type: 'number',
- root: true
- },
- http: {
- path: `/refundAll`,
- verb: 'post'
- }
- });
-
- Self.refundAll = async(ctx, ticketId, options) => {
- const myOptions = {};
- let tx;
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- if (!myOptions.transaction) {
- tx = await Self.beginTransaction({});
- myOptions.transaction = tx;
- }
-
- try {
- const userId = ctx.req.accessToken.userId;
-
- const isClaimManager = await Self.app.models.Account.hasRole(userId, 'claimManager');
- const isSalesAssistant = await Self.app.models.Account.hasRole(userId, 'salesAssistant');
- const hasValidRole = isClaimManager || isSalesAssistant;
-
- if (!hasValidRole)
- throw new UserError(`You don't have privileges to create refund`);
-
- const query = `
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketService;
-
- CREATE TEMPORARY TABLE tmp.sale
- SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- WHERE t.id IN (?);
-
- CREATE TEMPORARY TABLE tmp.ticketService
- SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
- FROM ticketService ts
- WHERE ts.ticketFk IN (?);
-
- CALL vn.ticket_doRefund(?, @newTicket);
-
- DROP TEMPORARY TABLE tmp.sale;
- DROP TEMPORARY TABLE tmp.ticketService;`;
-
- await Self.rawSql(query, [ticketId, ticketId, ticketId], myOptions);
-
- const [newTicket] = await Self.rawSql('SELECT @newTicket id', null, myOptions);
- ticketId = newTicket.id;
-
- if (tx) await tx.commit();
-
- return ticketId;
- } catch (e) {
- if (tx) await tx.rollback();
- throw e;
- }
- };
-};
diff --git a/modules/ticket/back/methods/sale/specs/refund.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
index 40fd6c17e..5cb353055 100644
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -1,20 +1,20 @@
const models = require('vn-loopback/server/server').models;
describe('sale refund()', () => {
+ const sales = [
+ {id: 7, ticketFk: 11},
+ {id: 8, ticketFk: 11}
+ ];
+ const services = [{id: 1}];
+
it('should create ticket with the selected lines changing the sign to the quantites', async() => {
const tx = await models.Sale.beginTransaction({});
const ctx = {req: {accessToken: {userId: 9}}};
- const ticketId = 11;
- const sales = [
- {id: 7, ticketFk: 11},
- {id: 8, ticketFk: 11}
- ];
-
try {
const options = {transaction: tx};
- const response = await models.Sale.refund(ctx, sales, ticketId, options);
+ const response = await models.Sale.refund(ctx, sales, services, options);
const [newTicketId] = await models.Sale.rawSql('SELECT MAX(t.id) id FROM vn.ticket t;', null, options);
expect(response).toEqual(newTicketId.id);
@@ -30,17 +30,12 @@ describe('sale refund()', () => {
const tx = await models.Sale.beginTransaction({});
const ctx = {req: {accessToken: {userId: 1}}};
- const ticketId = 11;
- const sales = [
- {id: 7, ticketFk: 11}
- ];
-
let error;
try {
const options = {transaction: tx};
- await models.Sale.refund(ctx, sales, ticketId, options);
+ await models.Sale.refund(ctx, sales, services, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 331f2c486..b4ed91bce 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -324,7 +324,7 @@ module.exports = Self => {
case true:
condition = `or`;
hasProblem = true;
- range = 0;
+ range = {neq: null};
hasWhere = true;
break;
@@ -340,7 +340,7 @@ module.exports = Self => {
{'tp.isFreezed': hasProblem},
{'tp.risk': hasProblem},
{'tp.hasTicketRequest': hasProblem},
- {'tp.isAvailable': range}
+ {'tp.itemShortage': range}
]};
if (hasWhere)
diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js
index 6dfee5dfa..3e45b3fb5 100644
--- a/modules/ticket/back/methods/ticket/getSales.js
+++ b/modules/ticket/back/methods/ticket/getSales.js
@@ -94,7 +94,7 @@ module.exports = Self => {
sale.visible = itemStock.visible;
sale.claim = claimedSales.get(sale.id);
if (problems) {
- sale.isAvailable = problems.isAvailable;
+ sale.itemShortage = problems.itemShortage;
sale.hasTicketRequest = problems.hasTicketRequest;
sale.hasComponentLack = problems.hasComponentLack;
}
diff --git a/modules/ticket/back/methods/ticket/sendSms.js b/modules/ticket/back/methods/ticket/sendSms.js
index efe8ff206..a0adcae07 100644
--- a/modules/ticket/back/methods/ticket/sendSms.js
+++ b/modules/ticket/back/methods/ticket/sendSms.js
@@ -45,7 +45,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
try {
- const sms = await Self.app.models.Sms.send(ctx, id, destination, message);
+ const sms = await Self.app.models.Sms.send(ctx, destination, message);
const logRecord = {
originFk: id,
userFk: userId,
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index b251d5335..4b583fc87 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -39,7 +39,7 @@ describe('ticket filter()', () => {
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
- expect(result.length).toEqual(4);
+ expect(result.length).toEqual(6);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 04e1c140a..9b629e634 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -28,8 +28,9 @@ describe('ticket setDeleted()', () => {
expect(error.message).toEqual('You must delete the claim id %d first');
});
- // test excluded by task #3693
- xit('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => {
+
+ it('should delete ticket, remove stowaway and itemshelving then change stowaway state to "FIXING" ', async() => {
+ pending('test excluded by task #3693');
const tx = await models.Ticket.beginTransaction({});
try {
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 5d5f08694..41885ee33 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -14,6 +14,9 @@
"Expedition": {
"dataSource": "vn"
},
+ "ExpeditionState": {
+ "dataSource": "vn"
+ },
"Packaging": {
"dataSource": "vn"
},
diff --git a/modules/ticket/back/models/annual-average-invoiced.json b/modules/ticket/back/models/annual-average-invoiced.json
index d1f582011..02f097d41 100644
--- a/modules/ticket/back/models/annual-average-invoiced.json
+++ b/modules/ticket/back/models/annual-average-invoiced.json
@@ -8,7 +8,7 @@
},
"properties": {
"invoiced": {
- "type": "Number"
+ "type": "number"
},
"clientFk": {
"id": true
diff --git a/modules/ticket/back/models/component-type.json b/modules/ticket/back/models/component-type.json
index d72217a24..26daf5216 100644
--- a/modules/ticket/back/models/component-type.json
+++ b/modules/ticket/back/models/component-type.json
@@ -9,11 +9,11 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"type": {
- "type": "String"
+ "type": "string"
},
"isBase":{
"type":"Boolean"
diff --git a/modules/ticket/back/models/component.json b/modules/ticket/back/models/component.json
index 002b4804f..46ac492c5 100644
--- a/modules/ticket/back/models/component.json
+++ b/modules/ticket/back/models/component.json
@@ -9,26 +9,26 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"name": {
- "type": "String"
+ "type": "string"
},
"classRate": {
- "type": "Number"
+ "type": "number"
},
"tax": {
- "type": "Number"
+ "type": "number"
},
"isRenewable": {
- "type": "Number"
+ "type": "number"
},
"typeFk": {
- "type": "Number"
+ "type": "number"
},
"code": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/ticket/back/models/expedition-state.js b/modules/ticket/back/models/expedition-state.js
new file mode 100644
index 000000000..af76af718
--- /dev/null
+++ b/modules/ticket/back/models/expedition-state.js
@@ -0,0 +1,3 @@
+module.exports = function(Self) {
+ require('../methods/expedition-state/filter')(Self);
+};
diff --git a/modules/ticket/back/models/expedition-state.json b/modules/ticket/back/models/expedition-state.json
new file mode 100644
index 000000000..262eb2e38
--- /dev/null
+++ b/modules/ticket/back/models/expedition-state.json
@@ -0,0 +1,28 @@
+{
+ "name": "ExpeditionState",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "expeditionState"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "created": {
+ "type": "date"
+ },
+ "expeditionFk": {
+ "type": "number"
+ },
+ "typeFk": {
+ "type": "number"
+ },
+ "userFk": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/ticket/back/models/expedition.json b/modules/ticket/back/models/expedition.json
index c0b8d6508..fc94f185d 100644
--- a/modules/ticket/back/models/expedition.json
+++ b/modules/ticket/back/models/expedition.json
@@ -13,17 +13,17 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"isBox": {
- "type": "Number"
+ "type": "number"
},
"created": {
- "type": "Date"
+ "type": "date"
},
"counter": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/sale-checked.json b/modules/ticket/back/models/sale-checked.json
index 8ac52d598..96d790505 100644
--- a/modules/ticket/back/models/sale-checked.json
+++ b/modules/ticket/back/models/sale-checked.json
@@ -8,7 +8,7 @@
},
"properties": {
"isChecked": {
- "type": "Number"
+ "type": "number"
},
"saleFk": {
"id": true
diff --git a/modules/ticket/back/models/sale-component.json b/modules/ticket/back/models/sale-component.json
index 3b7991fbb..bf0f73e29 100644
--- a/modules/ticket/back/models/sale-component.json
+++ b/modules/ticket/back/models/sale-component.json
@@ -8,14 +8,14 @@
},
"properties": {
"value": {
- "type": "Number"
+ "type": "number"
},
"saleFk": {
- "type": "Number",
+ "type": "number",
"id": 2
},
"componentFk": {
- "type": "Number",
+ "type": "number",
"id": 1
}
},
diff --git a/modules/ticket/back/models/sale-tracking.json b/modules/ticket/back/models/sale-tracking.json
index 43b0df160..4a103ea15 100644
--- a/modules/ticket/back/models/sale-tracking.json
+++ b/modules/ticket/back/models/sale-tracking.json
@@ -9,23 +9,23 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"saleFk": {
- "type": "Number"
+ "type": "number"
},
"stateFk": {
- "type": "Number"
+ "type": "number"
},
"isChecked": {
"type": "boolean"
},
"created": {
- "type": "Date"
+ "type": "date"
},
"originalQuantity": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index 2652aded2..2a4457263 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -7,7 +7,6 @@ module.exports = Self => {
require('../methods/sale/updateConcept')(Self);
require('../methods/sale/recalculatePrice')(Self);
require('../methods/sale/refund')(Self);
- require('../methods/sale/refundAll')(Self);
require('../methods/sale/canEdit')(Self);
Self.validatesPresenceOf('concept', {
diff --git a/modules/ticket/back/models/sale.json b/modules/ticket/back/models/sale.json
index 767a3e59e..e18f0291f 100644
--- a/modules/ticket/back/models/sale.json
+++ b/modules/ticket/back/models/sale.json
@@ -14,30 +14,33 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"concept": {
- "type": "String",
+ "type": "string",
"required": true
},
"quantity": {
- "type": "Number"
+ "type": "number"
},
"price": {
- "type": "Number"
+ "type": "number"
},
"discount": {
- "type": "Number"
+ "type": "number"
},
"reserved": {
"type": "boolean"
},
"isPicked": {
- "type": "Number"
+ "type": "number"
},
"created": {
"type": "date"
+ },
+ "originalQuantity":{
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/stowaway.json b/modules/ticket/back/models/stowaway.json
index 5a925cd20..ef3aeb40d 100644
--- a/modules/ticket/back/models/stowaway.json
+++ b/modules/ticket/back/models/stowaway.json
@@ -9,15 +9,15 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"shipFk": {
- "type": "Number",
+ "type": "number",
"required": false
},
"created":{
- "type": "Date",
+ "type": "date",
"required": false
}
},
diff --git a/modules/ticket/back/models/ticket-config.json b/modules/ticket/back/models/ticket-config.json
index ff6818bb5..a1c96e7f6 100644
--- a/modules/ticket/back/models/ticket-config.json
+++ b/modules/ticket/back/models/ticket-config.json
@@ -9,11 +9,11 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"scopeDays": {
- "type": "Number"
+ "type": "number"
}
}
}
diff --git a/modules/ticket/back/models/ticket-last-state.json b/modules/ticket/back/models/ticket-last-state.json
index 6c8bc66d5..e871a8ee6 100644
--- a/modules/ticket/back/models/ticket-last-state.json
+++ b/modules/ticket/back/models/ticket-last-state.json
@@ -12,10 +12,10 @@
},
"ticketFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"ticketTrackingFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-log.json b/modules/ticket/back/models/ticket-log.json
index 950742e98..169bdeaa0 100644
--- a/modules/ticket/back/models/ticket-log.json
+++ b/modules/ticket/back/models/ticket-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "Number"
+ "type": "number"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-observation.json b/modules/ticket/back/models/ticket-observation.json
index ba4f85ce8..9035e4440 100644
--- a/modules/ticket/back/models/ticket-observation.json
+++ b/modules/ticket/back/models/ticket-observation.json
@@ -13,11 +13,11 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"description": {
- "type": "String",
+ "type": "string",
"required": true
}
},
diff --git a/modules/ticket/back/models/ticket-packaging.json b/modules/ticket/back/models/ticket-packaging.json
index feea541fa..533f4064c 100644
--- a/modules/ticket/back/models/ticket-packaging.json
+++ b/modules/ticket/back/models/ticket-packaging.json
@@ -13,17 +13,17 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"quantity": {
- "type": "Number"
+ "type": "number"
},
"created": {
- "type": "Date"
+ "type": "date"
},
"pvp": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-request.json b/modules/ticket/back/models/ticket-request.json
index f216cd531..01601c7f6 100644
--- a/modules/ticket/back/models/ticket-request.json
+++ b/modules/ticket/back/models/ticket-request.json
@@ -12,29 +12,29 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"description": {
- "type": "String",
+ "type": "string",
"required": true
},
"created": {
- "type": "Date"
+ "type": "date"
},
"quantity": {
- "type": "Number",
+ "type": "number",
"required": true
},
"price": {
- "type": "Number"
+ "type": "number"
},
"isOk": {
- "type": "Boolean"
+ "type": "boolean"
},
"response": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-service-type.json b/modules/ticket/back/models/ticket-service-type.json
index 623d0f398..ec2c9232a 100644
--- a/modules/ticket/back/models/ticket-service-type.json
+++ b/modules/ticket/back/models/ticket-service-type.json
@@ -7,16 +7,16 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"name": {
- "type": "String",
+ "type": "string",
"required": true
},
"expenseFk": {
- "type": "Number",
+ "type": "number",
"mysql": {
"columnName": "expenceFk"
}
diff --git a/modules/ticket/back/models/ticket-service.json b/modules/ticket/back/models/ticket-service.json
index 8b0c490a8..347b6b976 100644
--- a/modules/ticket/back/models/ticket-service.json
+++ b/modules/ticket/back/models/ticket-service.json
@@ -13,32 +13,32 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"ticketFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"description": {
- "type": "String",
+ "type": "string",
"required": true
},
"quantity": {
- "type": "Number",
+ "type": "number",
"required": true
},
"price": {
- "type": "Number",
+ "type": "number",
"required": true
},
"taxClassFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"ticketServiceTypeFk": {
- "type": "Number",
+ "type": "number",
"required": true
}
},
diff --git a/modules/ticket/back/models/ticket-tracking.json b/modules/ticket/back/models/ticket-tracking.json
index c2c365013..e80e2f8f4 100644
--- a/modules/ticket/back/models/ticket-tracking.json
+++ b/modules/ticket/back/models/ticket-tracking.json
@@ -14,20 +14,20 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"created": {
- "type": "Date"
+ "type": "date"
},
"ticketFk": {
- "type": "Number"
+ "type": "number"
},
"stateFk": {
- "type": "Number"
+ "type": "number"
},
"workerFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-update-action.json b/modules/ticket/back/models/ticket-update-action.json
index 3072c2172..e69f7e1ab 100644
--- a/modules/ticket/back/models/ticket-update-action.json
+++ b/modules/ticket/back/models/ticket-update-action.json
@@ -9,15 +9,15 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"description": "Identifier"
},
"description": {
- "type": "String",
+ "type": "string",
"required": true
},
"code": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/ticket/back/models/ticket-weekly.json b/modules/ticket/back/models/ticket-weekly.json
index 6d432831f..d81baf4ad 100644
--- a/modules/ticket/back/models/ticket-weekly.json
+++ b/modules/ticket/back/models/ticket-weekly.json
@@ -14,10 +14,10 @@
"properties": {
"ticketFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"weekDay": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html
index c99575d42..1dcfd669f 100644
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@@ -302,7 +302,7 @@
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 1c80a6f9d..c6388654e 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -273,9 +273,21 @@ class Controller extends Section {
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
- refundAll() {
- const params = {ticketId: this.id};
- const query = `Sales/refundAll`;
+ async refund() {
+ const filter = {
+ where: {ticketFk: this.id}
+ };
+ const sales = await this.$http.get('Sales', {filter});
+ this.sales = sales.data;
+
+ const ticketServices = await this.$http.get('TicketServices', {filter});
+ this.services = ticketServices.data;
+
+ const params = {
+ sales: this.sales,
+ services: this.services
+ };
+ const query = `Sales/refund`;
return this.$http.post(query, params).then(res => {
this.$state.go('ticket.card.sale', {id: res.data});
});
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 75f3522ae..af377d8ea 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -262,16 +262,27 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
});
});
- describe('refundAll()', () => {
+ // #4084 review with Juan
+ xdescribe('refund()', () => {
it('should make a query and go to ticket.card.sale', () => {
- jest.spyOn(controller.$state, 'go').mockReturnValue();
- const expectedParams = {ticketId: ticket.id};
+ controller.$state.go = jest.fn();
- $httpBackend.expect('POST', `Sales/refundAll`, expectedParams).respond({ticketId: 16});
- controller.refundAll();
+ controller._id = ticket.id;
+ const sales = [{id: 1}];
+ const services = [{id: 2}];
+
+ $httpBackend.expectGET(`Sales`).respond(sales);
+ $httpBackend.expectGET(`TicketServices`).respond(services);
+
+ const expectedParams = {
+ sales: sales,
+ services: services
+ };
+ $httpBackend.expectPOST(`Sales/refund`, expectedParams).respond();
+ controller.refund();
$httpBackend.flush();
- expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: {ticketId: ticket.id}});
+ expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: undefined});
});
});
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index bdbb2c3e8..a41d368f6 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -19,10 +19,9 @@
Package type
Counter
externalId
- Packager
Created
- Palletizer
- Scanned
+ State
+
@@ -33,7 +32,7 @@
vn-tooltip="Delete expedition">
- {{expedition.id | zeroFill:6}}
+ {{expedition.id | zeroFill:6}}
{{::expedition.freightItemName}}
{{::expedition.counter}}
{{::expedition.externalId}}
-
-
- {{::expedition.userName | dashIfEmpty}}
-
-
{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}
+ {{::expedition.state}}
-
- {{::expedition.scannerUserName | dashIfEmpty}}
-
+
+
- {{::expedition.scanned | date:'dd/MM/yyyy HH:mm'}}
@@ -77,4 +71,44 @@
on-accept="$ctrl.onDialogAccept($data)"
question="Delete expedition"
message="Are you sure you want to delete this expedition?">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+ State
+ Worker
+ Created
+
+
+
+
+ {{::expeditionState.state}}
+
+
+ {{::expeditionState.name || 'System' | translate}}
+
+
+ {{::expeditionState.created | date:'dd/MM/yyyy HH:mm'}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 0c395e6ce..120d89bb2 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -6,6 +6,11 @@ class Controller extends Section {
return this.$http.delete(`Expeditions/${id}`)
.then(() => this.$.model.refresh());
}
+
+ showLog(expedition) {
+ this.expedition = expedition;
+ this.$.statusLog.show();
+ }
}
ngModule.vnComponent('vnTicketExpedition', {
diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index 425539aef..586ef2109 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -5,10 +5,12 @@ describe('Ticket', () => {
let controller;
let $scope;
let $httpBackend;
+ let $window;
beforeEach(ngModule('ticket'));
- beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
+ beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$window_) => {
+ $window = _$window_;
$httpBackend = _$httpBackend_;
$scope = $rootScope.$new();
$scope.model = {
@@ -30,5 +32,23 @@ describe('Ticket', () => {
expect($scope.model.refresh).toHaveBeenCalledWith();
});
});
+
+ describe('showLog()', () => {
+ it('should show the popover status log', () => {
+ controller.$.statusLog = {show: () => {}};
+ jest.spyOn(controller.$.statusLog, 'show');
+
+ const expedition = {id: 1};
+
+ const event = new MouseEvent('click', {
+ view: $window,
+ bubbles: true,
+ cancelable: true
+ });
+ controller.showLog(event, expedition);
+
+ expect(controller.$.statusLog.show).toHaveBeenCalledWith();
+ });
+ });
});
});
diff --git a/modules/ticket/front/expedition/locale/es.yml b/modules/ticket/front/expedition/locale/es.yml
new file mode 100644
index 000000000..d23cf25af
--- /dev/null
+++ b/modules/ticket/front/expedition/locale/es.yml
@@ -0,0 +1 @@
+Status log: Hitorial de estados
\ No newline at end of file
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 36af86001..1e18ce284 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -52,8 +52,8 @@
icon="icon-buyrequest">
diff --git a/modules/ticket/front/index/locale/es.yml b/modules/ticket/front/index/locale/es.yml
index eac0084f6..74b17b0f3 100644
--- a/modules/ticket/front/index/locale/es.yml
+++ b/modules/ticket/front/index/locale/es.yml
@@ -1,6 +1,7 @@
Weekly tickets: Tickets programados
Go to lines: Ir a lineas
Not available: No disponible
+Not visible: No visible
Payment on account...: Pago a cuenta...
Set as delivered and open delivery note(s): Marcar como servido/s y abrir albarán/es
Closure: Cierre
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 836fadb9b..f4e5840f3 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -95,8 +95,8 @@
translate-attr="{title: 'Reserved'}">
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index bb8a81bc4..987333e28 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -483,7 +483,7 @@ class Controller extends Section {
const sales = this.selectedValidSales();
if (!sales) return;
- const params = {sales: sales, ticketId: this.ticket.id};
+ const params = {sales: sales};
const query = `Sales/refund`;
this.resetChanges();
this.$http.post(query, params).then(res => {
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index 13fd84b00..bb5505ce6 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -42,7 +42,7 @@
diff --git a/modules/ticket/front/volume/index.js b/modules/ticket/front/volume/index.js
index 81491bca0..a3d531898 100644
--- a/modules/ticket/front/volume/index.js
+++ b/modules/ticket/front/volume/index.js
@@ -20,7 +20,7 @@ class Controller extends Section {
set sales(value) {
this._sales = value;
- if (value) this.applyVolumes();
+ if (value && value.length) this.applyVolumes();
}
applyVolumes() {
diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index b4bfecbfb..aa92fa308 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -1,7 +1,6 @@
const app = require('vn-loopback/server/server');
-// #2687 - Cannot make a data rollback because of the triggers
-xdescribe('Travel cloneWithEntries()', () => {
+describe('Travel cloneWithEntries()', () => {
const models = app.models;
const travelId = 5;
const currentUserId = 1102;
@@ -9,44 +8,45 @@ xdescribe('Travel cloneWithEntries()', () => {
let travelBefore;
let newTravelId;
- afterAll(async() => {
- try {
- const entries = await models.Entry.find({
- where: {
- travelFk: newTravelId
- }
- });
- const entriesId = entries.map(entry => entry.id);
+ // afterAll(async() => {
+ // try {
+ // const entries = await models.Entry.find({
+ // where: {
+ // travelFk: newTravelId
+ // }
+ // });
+ // const entriesId = entries.map(entry => entry.id);
- // Destroy all entries buys
- await models.Buy.destroyAll({
- where: {
- entryFk: {inq: entriesId}
- }
- });
+ // // Destroy all entries buys
+ // await models.Buy.destroyAll({
+ // where: {
+ // entryFk: {inq: entriesId}
+ // }
+ // });
- // Destroy travel entries
- await models.Entry.destroyAll({
- where: {
- travelFk: newTravelId
- }
- });
+ // // Destroy travel entries
+ // await models.Entry.destroyAll({
+ // where: {
+ // travelFk: newTravelId
+ // }
+ // });
- // Destroy new travel
- await models.Travel.destroyById(newTravelId);
+ // // Destroy new travel
+ // await models.Travel.destroyById(newTravelId);
- // Restore original travel shipped & landed
- const travel = await models.Travel.findById(travelId);
- await travel.updateAttributes({
- shipped: travelBefore.shipped,
- landed: travelBefore.landed
- });
- } catch (error) {
- console.error(error);
- }
- });
+ // // Restore original travel shipped & landed
+ // const travel = await models.Travel.findById(travelId);
+ // await travel.updateAttributes({
+ // shipped: travelBefore.shipped,
+ // landed: travelBefore.landed
+ // });
+ // } catch (error) {
+ // console.error(error);
+ // }
+ // });
it(`should clone the travel and the containing entries`, async() => {
+ pending('#2687 - Cannot make a data rollback because of the triggers');
const warehouseThree = 3;
const agencyModeOne = 1;
const yesterday = new Date();
diff --git a/modules/travel/back/models/thermograph.json b/modules/travel/back/models/thermograph.json
index 2519fffc4..bd9ad3119 100644
--- a/modules/travel/back/models/thermograph.json
+++ b/modules/travel/back/models/thermograph.json
@@ -8,13 +8,13 @@
},
"properties": {
"id": {
- "type": "String",
+ "type": "string",
"id": true,
"description": "Identifier",
"required": true
},
"model": {
- "type": "String",
+ "type": "string",
"required": true
}
}
diff --git a/modules/travel/back/models/travel-log.json b/modules/travel/back/models/travel-log.json
index d53be88f1..d07f83e50 100644
--- a/modules/travel/back/models/travel-log.json
+++ b/modules/travel/back/models/travel-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "String"
+ "type": "string"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json
index cd2f1d653..95330e263 100644
--- a/modules/travel/back/models/travel.json
+++ b/modules/travel/back/models/travel.json
@@ -12,7 +12,7 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
@@ -23,28 +23,28 @@
"type": "date"
},
"isDelivered": {
- "type": "Boolean"
+ "type": "boolean"
},
"isReceived": {
- "type": "Boolean"
+ "type": "boolean"
},
"ref": {
- "type": "String"
+ "type": "string"
},
"totalEntries": {
- "type": "Number"
+ "type": "number"
},
"m3": {
- "type": "Number"
+ "type": "number"
},
"kg": {
- "type": "Number"
+ "type": "number"
},
"cargoSupplierFk": {
- "type": "Number"
+ "type": "number"
},
"agencyModeFk": {
- "type": "Number",
+ "type": "number",
"mysql": {
"columnName": "agencyFk"
}
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index 81c5d1192..153c28b60 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -135,7 +135,8 @@ module.exports = Self => {
function formatDate(date) {
let day = date.getDate();
if (day < 10) day = `0${day}`;
- let month = date.getMonth();
+
+ let month = date.getMonth() + 1;
if (month < 10) month = `0${month}`;
let year = date.getFullYear();
diff --git a/modules/worker/back/methods/worker/deleteAbsence.js b/modules/worker/back/methods/worker/deleteAbsence.js
index 72e9243d9..45dc04b2d 100644
--- a/modules/worker/back/methods/worker/deleteAbsence.js
+++ b/modules/worker/back/methods/worker/deleteAbsence.js
@@ -87,7 +87,7 @@ module.exports = Self => {
function formatDate(date) {
let day = date.getDate();
if (day < 10) day = `0${day}`;
- let month = date.getMonth();
+ let month = date.getMonth() + 1;
if (month < 10) month = `0${month}`;
let year = date.getFullYear();
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index c155e331d..c6b984bd2 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -20,6 +20,9 @@
"EducationLevel": {
"dataSource": "vn"
},
+ "Sector": {
+ "dataSource": "vn"
+ },
"WorkCenter": {
"dataSource": "vn"
},
diff --git a/modules/worker/back/models/absence-type.json b/modules/worker/back/models/absence-type.json
index f4e9aed18..7fc62f780 100644
--- a/modules/worker/back/models/absence-type.json
+++ b/modules/worker/back/models/absence-type.json
@@ -9,19 +9,19 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"name": {
- "type": "String"
+ "type": "string"
},
"rgb": {
- "type": "String"
+ "type": "string"
},
"code": {
- "type": "String"
+ "type": "string"
},
"holidayEntitlementRate": {
- "type": "Number"
+ "type": "number"
}
},
"acls": [
diff --git a/modules/worker/back/models/calendar-holiday.json b/modules/worker/back/models/calendar-holiday.json
index 544452553..f7777c2b7 100644
--- a/modules/worker/back/models/calendar-holiday.json
+++ b/modules/worker/back/models/calendar-holiday.json
@@ -9,14 +9,14 @@
"properties": {
"calendarHolidaysNameFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"calendarHolidaysTypeFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"dated": {
- "type": "Date"
+ "type": "date"
}
},
"relations": {
diff --git a/modules/worker/back/models/calendar-holidays-name.json b/modules/worker/back/models/calendar-holidays-name.json
index d04ef9c74..d2798f106 100644
--- a/modules/worker/back/models/calendar-holidays-name.json
+++ b/modules/worker/back/models/calendar-holidays-name.json
@@ -9,10 +9,10 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/worker/back/models/calendar-holidays-type.json b/modules/worker/back/models/calendar-holidays-type.json
index 178331b87..cf738d353 100644
--- a/modules/worker/back/models/calendar-holidays-type.json
+++ b/modules/worker/back/models/calendar-holidays-type.json
@@ -9,13 +9,13 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"name": {
- "type": "String"
+ "type": "string"
},
"hexColour": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/worker/back/models/calendar.json b/modules/worker/back/models/calendar.json
index 1da7179c4..40d29c519 100644
--- a/modules/worker/back/models/calendar.json
+++ b/modules/worker/back/models/calendar.json
@@ -13,13 +13,13 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"businessFk": {
- "type": "Number"
+ "type": "number"
},
"dated": {
- "type": "Date"
+ "type": "date"
}
},
"relations": {
diff --git a/modules/worker/back/models/device.json b/modules/worker/back/models/device.json
index 5367faedf..566f7da7d 100644
--- a/modules/worker/back/models/device.json
+++ b/modules/worker/back/models/device.json
@@ -9,13 +9,13 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"sn": {
- "type": "String"
+ "type": "string"
},
"model": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/worker/back/models/sector.json b/modules/worker/back/models/sector.json
new file mode 100644
index 000000000..8bd5e773f
--- /dev/null
+++ b/modules/worker/back/models/sector.json
@@ -0,0 +1,20 @@
+{
+ "name": "Sector",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "sector"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string",
+ "required": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/worker/back/models/work-center-holiday.json b/modules/worker/back/models/work-center-holiday.json
index eddfd7af1..e5f201d9d 100644
--- a/modules/worker/back/models/work-center-holiday.json
+++ b/modules/worker/back/models/work-center-holiday.json
@@ -9,13 +9,13 @@
"properties": {
"workCenterFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"days": {
- "type": "Number"
+ "type": "number"
},
"year": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/worker/back/models/work-center.json b/modules/worker/back/models/work-center.json
index a0e651bba..2d7bab24e 100644
--- a/modules/worker/back/models/work-center.json
+++ b/modules/worker/back/models/work-center.json
@@ -9,10 +9,10 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"name": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-department.json b/modules/worker/back/models/worker-department.json
index 0eeca50e7..b169cbf5e 100644
--- a/modules/worker/back/models/worker-department.json
+++ b/modules/worker/back/models/worker-department.json
@@ -9,10 +9,10 @@
"properties": {
"workerFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"departmentFk": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-dms.json b/modules/worker/back/models/worker-dms.json
index 80634cfcc..575cfbc24 100644
--- a/modules/worker/back/models/worker-dms.json
+++ b/modules/worker/back/models/worker-dms.json
@@ -13,25 +13,25 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true
},
"dmsFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "document"
}
},
"workerFk": {
- "type": "Number",
+ "type": "number",
"required": true,
"mysql": {
"columnName": "worker"
}
},
"isReadableByWorker": {
- "type": "Boolean"
+ "type": "boolean"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-log.json b/modules/worker/back/models/worker-log.json
index f100f3486..d2fa0487d 100644
--- a/modules/worker/back/models/worker-log.json
+++ b/modules/worker/back/models/worker-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "String"
+ "type": "string"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-mana.json b/modules/worker/back/models/worker-mana.json
index b98b2a325..0e50b8f63 100644
--- a/modules/worker/back/models/worker-mana.json
+++ b/modules/worker/back/models/worker-mana.json
@@ -8,11 +8,11 @@
},
"properties": {
"amount": {
- "type": "Number"
+ "type": "number"
},
"workerFk": {
"id": true,
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-media.json b/modules/worker/back/models/worker-media.json
index 805ff383b..8a28fb422 100644
--- a/modules/worker/back/models/worker-media.json
+++ b/modules/worker/back/models/worker-media.json
@@ -9,10 +9,10 @@
"properties": {
"workerFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"mediaValue": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-team-collegues.json b/modules/worker/back/models/worker-team-collegues.json
index 2e4a0a4f8..18b7d90bd 100644
--- a/modules/worker/back/models/worker-team-collegues.json
+++ b/modules/worker/back/models/worker-team-collegues.json
@@ -9,11 +9,11 @@
"properties": {
"workerFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"collegueFk": {
"id": true,
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-team.json b/modules/worker/back/models/worker-team.json
index 4cd4b1244..0b490ba6e 100644
--- a/modules/worker/back/models/worker-team.json
+++ b/modules/worker/back/models/worker-team.json
@@ -8,12 +8,12 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
"team": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/worker/back/models/worker-time-control-mail.json b/modules/worker/back/models/worker-time-control-mail.json
index 7f8522757..daf3d5155 100644
--- a/modules/worker/back/models/worker-time-control-mail.json
+++ b/modules/worker/back/models/worker-time-control-mail.json
@@ -9,26 +9,26 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"required": true
},
"workerFk": {
- "type": "Number"
+ "type": "number"
},
"year": {
- "type": "Number"
+ "type": "number"
},
"week": {
- "type": "Number"
+ "type": "number"
},
"state": {
- "type": "String"
+ "type": "string"
},
"updated": {
- "type": "Date"
+ "type": "date"
},
"emailResponse": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/worker/back/models/worker-time-control-params.json b/modules/worker/back/models/worker-time-control-params.json
index cc904cf40..14cabbfb0 100644
--- a/modules/worker/back/models/worker-time-control-params.json
+++ b/modules/worker/back/models/worker-time-control-params.json
@@ -9,19 +9,19 @@
},
"properties": {
"mailHost": {
- "type": "String"
+ "type": "string"
},
"mailUser": {
- "type": "String"
+ "type": "string"
},
"mailPass": {
- "type": "String"
+ "type": "string"
},
"mailSuccessFolder": {
- "type": "String"
+ "type": "string"
},
"mailErrorFolder": {
- "type": "String"
+ "type": "string"
}
},
"acls": [
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index c8054caff..f7a344358 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -46,6 +46,9 @@
},
"SSN": {
"type" : "string"
+ },
+ "labelerFk": {
+ "type" : "number"
}
},
"relations": {
@@ -78,6 +81,11 @@
"type": "hasMany",
"model": "WorkerTeamCollegues",
"foreignKey": "workerFk"
+ },
+ "sector": {
+ "type": "belongsTo",
+ "model": "Sector",
+ "foreignKey": "sectorFk"
}
}
}
\ No newline at end of file
diff --git a/modules/zone/back/models/agency-mode.json b/modules/zone/back/models/agency-mode.json
index ded58e819..027cec190 100644
--- a/modules/zone/back/models/agency-mode.json
+++ b/modules/zone/back/models/agency-mode.json
@@ -9,7 +9,7 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
@@ -24,10 +24,10 @@
"type": "number"
},
"m3": {
- "type": "Number"
+ "type": "number"
},
"inflation": {
- "type": "Number"
+ "type": "number"
},
"reportMail": {
"type": "string"
@@ -36,7 +36,7 @@
"type": "boolean"
},
"code": {
- "type": "String",
+ "type": "string",
"required": false
}
},
diff --git a/modules/zone/back/models/delivery-method.json b/modules/zone/back/models/delivery-method.json
index 8106c1d4f..31454f2f8 100644
--- a/modules/zone/back/models/delivery-method.json
+++ b/modules/zone/back/models/delivery-method.json
@@ -9,7 +9,7 @@
},
"properties": {
"id": {
- "type": "Number",
+ "type": "number",
"id": true,
"description": "Identifier"
},
diff --git a/modules/zone/back/models/zone-closure.json b/modules/zone/back/models/zone-closure.json
index 895374838..0483a0c83 100644
--- a/modules/zone/back/models/zone-closure.json
+++ b/modules/zone/back/models/zone-closure.json
@@ -9,10 +9,10 @@
"properties": {
"zoneFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"dated": {
- "type": "Date",
+ "type": "date",
"required": true
},
"hour": {
diff --git a/modules/zone/back/models/zone-estimated-delivery.json b/modules/zone/back/models/zone-estimated-delivery.json
index d65cee3b5..399de8f58 100644
--- a/modules/zone/back/models/zone-estimated-delivery.json
+++ b/modules/zone/back/models/zone-estimated-delivery.json
@@ -9,28 +9,28 @@
"properties": {
"zoneFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"hourTheoretical": {
"type": "date"
},
"totalVolume": {
- "type": "Number"
+ "type": "number"
},
"remainingVolume": {
- "type": "Number"
+ "type": "number"
},
"speed": {
- "type": "Number"
+ "type": "number"
},
"hourEffective": {
- "type": "Date"
+ "type": "date"
},
"minutesLess": {
- "type": "Date"
+ "type": "date"
},
"etc": {
- "type": "Date"
+ "type": "date"
}
},
diff --git a/modules/zone/back/models/zone-event.json b/modules/zone/back/models/zone-event.json
index 54c9c4a7d..7cf4b8301 100644
--- a/modules/zone/back/models/zone-event.json
+++ b/modules/zone/back/models/zone-event.json
@@ -13,41 +13,41 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"zoneFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"type": {
- "type": "String"
+ "type": "string"
},
"dated": {
- "type": "Date"
+ "type": "date"
},
"started": {
- "type": "Date"
+ "type": "date"
},
"ended": {
- "type": "Date"
+ "type": "date"
},
"weekDays": {
- "type": "String"
+ "type": "string"
},
"hour": {
- "type": "Date"
+ "type": "date"
},
"travelingDays": {
- "type": "Number"
+ "type": "number"
},
"price": {
- "type": "Number"
+ "type": "number"
},
"bonus": {
- "type": "Number"
+ "type": "number"
},
"m3Max": {
- "type": "Number"
+ "type": "number"
}
},
"relations": {
diff --git a/modules/zone/back/models/zone-exclusion.json b/modules/zone/back/models/zone-exclusion.json
index f1c80debd..415bce40c 100644
--- a/modules/zone/back/models/zone-exclusion.json
+++ b/modules/zone/back/models/zone-exclusion.json
@@ -9,10 +9,10 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"dated": {
- "type": "Date",
+ "type": "date",
"required": true
}
},
diff --git a/modules/zone/back/models/zone-geo.json b/modules/zone/back/models/zone-geo.json
index 0a001235f..e9d9aa3eb 100644
--- a/modules/zone/back/models/zone-geo.json
+++ b/modules/zone/back/models/zone-geo.json
@@ -9,22 +9,22 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"name": {
- "type": "String"
+ "type": "string"
},
"lft": {
- "type": "Number"
+ "type": "number"
},
"rgt": {
- "type": "Number"
+ "type": "number"
},
"depth": {
- "type": "Number"
+ "type": "number"
},
"sons": {
- "type": "Number"
+ "type": "number"
}
}
}
\ No newline at end of file
diff --git a/modules/zone/back/models/zone-included.json b/modules/zone/back/models/zone-included.json
index e462b7a65..595f47a78 100644
--- a/modules/zone/back/models/zone-included.json
+++ b/modules/zone/back/models/zone-included.json
@@ -14,10 +14,10 @@
"properties": {
"zoneFk": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"isIncluded": {
- "type": "Boolean"
+ "type": "boolean"
}
},
"relations": {
diff --git a/modules/zone/back/models/zone-log.json b/modules/zone/back/models/zone-log.json
index ddca9261b..c2c66c155 100644
--- a/modules/zone/back/models/zone-log.json
+++ b/modules/zone/back/models/zone-log.json
@@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
- "type": "Number",
+ "type": "number",
"forceId": false
},
"originFk": {
- "type": "Number",
+ "type": "number",
"required": true
},
"userFk": {
- "type": "Number"
+ "type": "number"
},
"action": {
- "type": "String",
+ "type": "string",
"required": true
},
"changedModel": {
- "type": "String"
+ "type": "string"
},
"oldInstance": {
- "type": "Object"
+ "type": "object"
},
"newInstance": {
- "type": "Object"
+ "type": "object"
},
"creationDate": {
- "type": "Date"
+ "type": "date"
},
"changedModelId": {
- "type": "String"
+ "type": "string"
},
"changedModelValue": {
- "type": "String"
+ "type": "string"
},
"description": {
- "type": "String"
+ "type": "string"
}
},
"relations": {
diff --git a/modules/zone/back/models/zone-warehouse.json b/modules/zone/back/models/zone-warehouse.json
index 0f0e43f4a..003e4e3c2 100644
--- a/modules/zone/back/models/zone-warehouse.json
+++ b/modules/zone/back/models/zone-warehouse.json
@@ -13,10 +13,10 @@
"properties": {
"id": {
"id": true,
- "type": "Number"
+ "type": "number"
},
"warehouseFk": {
- "type": "Number",
+ "type": "number",
"required": true
}
},
diff --git a/modules/zone/front/basic-data/index.html b/modules/zone/front/basic-data/index.html
index eb701a803..1836216a2 100644
--- a/modules/zone/front/basic-data/index.html
+++ b/modules/zone/front/basic-data/index.html
@@ -67,7 +67,6 @@
diff --git a/modules/zone/front/delivery-days/index.js b/modules/zone/front/delivery-days/index.js
index e4d5e72e9..71e8c8ab7 100644
--- a/modules/zone/front/delivery-days/index.js
+++ b/modules/zone/front/delivery-days/index.js
@@ -73,15 +73,14 @@ class Controller extends Section {
for (let event of $events)
zoneIds.push(event.zoneFk);
- this.$.zoneEvents.show($event.target);
-
const params = {
zoneIds: zoneIds,
date: day
};
this.$http.post(`Zones/getZoneClosing`, params)
- .then(res => this.zoneClosing = res.data);
+ .then(res => this.zoneClosing = res.data)
+ .then(() => this.$.zoneEvents.show($event.target));
}
preview(zone) {
diff --git a/package.json b/package.json
index 35c27fc0c..52741641a 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,6 @@
"gulp-env": "^0.4.0",
"gulp-file": "^0.4.0",
"gulp-install": "^1.1.0",
- "gulp-jasmine": "^4.0.0",
"gulp-merge-json": "^1.3.1",
"gulp-nodemon": "^2.5.0",
"gulp-print": "^2.0.1",
@@ -78,7 +77,7 @@
"html-loader-jest": "^0.2.1",
"html-webpack-plugin": "^4.0.0-beta.11",
"identity-obj-proxy": "^3.0.0",
- "jasmine": "^3.10.0",
+ "jasmine": "^4.1.0",
"jasmine-reporters": "^2.4.0",
"jasmine-spec-reporter": "^7.0.0",
"jest": "^26.0.1",
@@ -88,7 +87,7 @@
"minimist": "^1.2.5",
"mysql2": "^1.7.0",
"node-sass": "^4.14.1",
- "nodemon": "^1.19.4",
+ "nodemon": "^2.0.16",
"plugin-error": "^1.0.1",
"raw-loader": "^1.0.0",
"regenerator-runtime": "^0.13.7",
@@ -102,7 +101,10 @@
},
"scripts": {
"dbtest": "nodemon -q db/tests.js -w db/tests",
- "test": "jest --watch",
+ "test:back": "nodemon -q back/tests.js --config back/nodemonConfig.json",
+ "test:back:ci": "node back/tests.js ci",
+ "test:e2e": "node e2e/helpers/tests.js",
+ "test:front": "jest --watch",
"back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
"lint": "eslint ./ --cache --ignore-pattern .gitignore",
"docker": "docker build --progress=plain -t salix-db ./db"
diff --git a/print/methods/routes.js b/print/methods/routes.js
index ea40e0743..28671b3da 100644
--- a/print/methods/routes.js
+++ b/print/methods/routes.js
@@ -16,7 +16,7 @@ module.exports = [
cb: require('./closure')
},
{
- url: '/api/notify',
- cb: require('./notify')
+ url: '/api/schedule',
+ cb: require('./schedule')
}
];
diff --git a/print/methods/notify/consumption.js b/print/methods/schedule/consumption.js
similarity index 100%
rename from print/methods/notify/consumption.js
rename to print/methods/schedule/consumption.js
diff --git a/print/methods/notify/index.js b/print/methods/schedule/index.js
similarity index 76%
rename from print/methods/notify/index.js
rename to print/methods/schedule/index.js
index df4705d1e..05d54b2ed 100644
--- a/print/methods/notify/index.js
+++ b/print/methods/schedule/index.js
@@ -2,5 +2,6 @@ const express = require('express');
const router = new express.Router();
router.post('/consumption', require('./consumption'));
+router.post('/invoice', require('./invoice'));
module.exports = router;
diff --git a/print/methods/schedule/invoice.js b/print/methods/schedule/invoice.js
new file mode 100644
index 000000000..c76ca85b5
--- /dev/null
+++ b/print/methods/schedule/invoice.js
@@ -0,0 +1,114 @@
+const db = require('vn-print/core/database');
+const Email = require('vn-print/core/email');
+const Report = require('vn-print/core/report');
+const storage = require('vn-print/core/storage');
+
+module.exports = async function(request, response, next) {
+ try {
+ response.status(200).json({
+ message: 'Success'
+ });
+
+ const invoices = await db.rawSql(`
+ SELECT
+ io.id,
+ io.clientFk,
+ io.issued,
+ io.ref,
+ c.email recipient,
+ c.salesPersonFk,
+ c.isToBeMailed,
+ c.hasToInvoice,
+ co.hasDailyInvoice,
+ eu.email salesPersonEmail
+ FROM invoiceOut_queue ioq
+ JOIN invoiceOut io ON io.id = ioq.invoiceFk
+ JOIN client c ON c.id = io.clientFk
+ JOIN province p ON p.id = c.provinceFk
+ JOIN country co ON co.id = p.countryFk
+ LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+ WHERE status = ''`);
+
+ let connection;
+ let invoiceId;
+ for (const invoiceOut of invoices) {
+ try {
+ invoiceId = invoiceOut.id;
+ connection = await db.getConnection();
+ connection.query('START TRANSACTION');
+
+ const args = Object.assign({
+ invoiceId: invoiceOut.id,
+ recipientId: invoiceOut.clientFk,
+ recipient: invoiceOut.recipient,
+ replyTo: invoiceOut.salesPersonEmail
+ }, response.locals);
+
+ const invoiceReport = new Report('invoice', args);
+ const stream = await invoiceReport.toPdfStream();
+
+ const issued = invoiceOut.issued;
+ const year = issued.getFullYear().toString();
+ const month = (issued.getMonth() + 1).toString();
+ const day = issued.getDate().toString();
+
+ const fileName = `${year}${invoiceOut.ref}.pdf`;
+
+ // Store invoice
+ storage.write(stream, {
+ type: 'invoice',
+ path: `${year}/${month}/${day}`,
+ fileName: fileName
+ });
+
+ connection.query('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id]);
+
+ const isToBeMailed = invoiceOut.recipient && invoiceOut.salesPersonFk && invoiceOut.isToBeMailed;
+
+ if (isToBeMailed) {
+ const mailOptions = {
+ overrideAttachments: true,
+ attachments: []
+ };
+
+ const invoiceAttachment = {
+ filename: fileName,
+ content: stream
+ };
+
+ if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
+ const exportation = new Report('exportation', args);
+ const stream = await exportation.toPdfStream();
+ const fileName = `CITES-${invoiceOut.ref}.pdf`;
+
+ mailOptions.attachments.push({
+ filename: fileName,
+ content: stream
+ });
+ }
+
+ mailOptions.attachments.push(invoiceAttachment);
+
+ const email = new Email('invoice', args);
+ await email.send(mailOptions);
+ }
+ // Update queue status
+ sql = `UPDATE invoiceOut_queue
+ SET status = "printed",
+ printed = NOW()
+ WHERE invoiceFk = ?`;
+ connection.query(sql, [invoiceOut.id]);
+ connection.query('COMMIT');
+ } catch (error) {
+ connection.query('ROLLBACK');
+ connection.release();
+ sql = `UPDATE invoiceOut_queue
+ SET status = ?
+ WHERE invoiceFk = ?`;
+ await db.rawSql(sql, [error.message, invoiceId]);
+ }
+ }
+ } catch (error) {
+ next(error);
+ }
+};
diff --git a/print/templates/email/osticket-report/osticket-report.html b/print/templates/email/osticket-report/osticket-report.html
index 76973c8e1..a9cf9a24a 100644
--- a/print/templates/email/osticket-report/osticket-report.html
+++ b/print/templates/email/osticket-report/osticket-report.html
@@ -35,8 +35,8 @@