|
-
-
diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html
index a96da252b2..538789027a 100644
--- a/modules/order/front/descriptor/index.html
+++ b/modules/order/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.order.client.name"
+ summary="$ctrl.$.summary">
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html
index bda46952ae..fc1d3419c5 100644
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.route.name"
+ summary="$ctrl.$.summary">
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/modules/route/front/routes.json b/modules/route/front/routes.json
index 0d66a56979..f5e7d9ae85 100644
--- a/modules/route/front/routes.json
+++ b/modules/route/front/routes.json
@@ -7,7 +7,7 @@
"menus": {
"main": [
{"state": "route.index", "icon": "icon-delivery"},
- {"state": "route.agencyTerm.index", "icon": "contact_support"}
+ {"state": "route.agencyTerm.index", "icon": "icon-agency-term"}
],
"card": [
{"state": "route.card.basicData", "icon": "settings"},
diff --git a/modules/supplier/front/descriptor/index.html b/modules/supplier/front/descriptor/index.html
index dcc065eff8..4691bfe9bb 100644
--- a/modules/supplier/front/descriptor/index.html
+++ b/modules/supplier/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.supplier.name"
+ summary="$ctrl.$.summary">
+
+
+
\ No newline at end of file
diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json
index 35519b89a4..86bfba40cf 100644
--- a/modules/supplier/front/routes.json
+++ b/modules/supplier/front/routes.json
@@ -15,7 +15,7 @@
{"state": "supplier.card.address.index", "icon": "icon-delivery"},
{"state": "supplier.card.account", "icon": "icon-account"},
{"state": "supplier.card.contact", "icon": "contact_phone"},
- {"state": "supplier.card.agencyTerm.index", "icon": "contact_support"},
+ {"state": "supplier.card.agencyTerm.index", "icon": "icon-agency-term"},
{"state": "supplier.card.log", "icon": "history"},
{"state": "supplier.card.consumption", "icon": "show_chart"}
]
diff --git a/modules/ticket/back/methods/sale/payBack.js b/modules/ticket/back/methods/sale/refund.js
similarity index 77%
rename from modules/ticket/back/methods/sale/payBack.js
rename to modules/ticket/back/methods/sale/refund.js
index 098da4d5a8..9c87f23d38 100644
--- a/modules/ticket/back/methods/sale/payBack.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -1,7 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethodCtx('payBack', {
+ Self.remoteMethodCtx('refund', {
description: 'Create ticket with the selected lines changing the sign to the quantites',
accessType: 'WRITE',
accepts: [{
@@ -21,12 +21,12 @@ module.exports = Self => {
root: true
},
http: {
- path: `/payBack`,
+ path: `/refund`,
verb: 'post'
}
});
- Self.payBack = async(ctx, sales, ticketId, options) => {
+ Self.refund = async(ctx, sales, ticketId, options) => {
const myOptions = {};
let tx;
@@ -47,21 +47,35 @@ module.exports = Self => {
const hasValidRole = isClaimManager || isSalesAssistant;
if (!hasValidRole)
- throw new UserError(`You don't have privileges to create pay back`);
+ throw new UserError(`You don't have privileges to create refund`);
for (let sale of sales)
salesIds.push(sale.id);
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
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);
- DROP TEMPORARY TABLE tmp.sale;`;
+
+ DROP TEMPORARY TABLE tmp.sale;
+ DROP TEMPORARY TABLE tmp.ticketService;`;
await Self.rawSql(query, [salesIds, ticketId], myOptions);
+
const [newTicket] = await Self.rawSql('SELECT @newTicket id', null, myOptions);
ticketId = newTicket.id;
diff --git a/modules/ticket/back/methods/sale/refundAll.js b/modules/ticket/back/methods/sale/refundAll.js
new file mode 100644
index 0000000000..6fcd27f0a6
--- /dev/null
+++ b/modules/ticket/back/methods/sale/refundAll.js
@@ -0,0 +1,78 @@
+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/payBack.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
similarity index 84%
rename from modules/ticket/back/methods/sale/specs/payBack.spec.js
rename to modules/ticket/back/methods/sale/specs/refund.spec.js
index ffcf964563..40fd6c17ea 100644
--- a/modules/ticket/back/methods/sale/specs/payBack.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -1,6 +1,6 @@
const models = require('vn-loopback/server/server').models;
-describe('sale payBack()', () => {
+describe('sale refund()', () => {
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}}};
@@ -14,7 +14,7 @@ describe('sale payBack()', () => {
try {
const options = {transaction: tx};
- const response = await models.Sale.payBack(ctx, sales, ticketId, options);
+ const response = await models.Sale.refund(ctx, sales, ticketId, options);
const [newTicketId] = await models.Sale.rawSql('SELECT MAX(t.id) id FROM vn.ticket t;', null, options);
expect(response).toEqual(newTicketId.id);
@@ -26,7 +26,7 @@ describe('sale payBack()', () => {
}
});
- it(`should throw an error if the user doesn't have privileges to create a pay back`, async() => {
+ it(`should throw an error if the user doesn't have privileges to create a refund`, async() => {
const tx = await models.Sale.beginTransaction({});
const ctx = {req: {accessToken: {userId: 1}}};
@@ -40,7 +40,7 @@ describe('sale payBack()', () => {
try {
const options = {transaction: tx};
- await models.Sale.payBack(ctx, sales, ticketId, options);
+ await models.Sale.refund(ctx, sales, ticketId, options);
await tx.rollback();
} catch (e) {
@@ -49,6 +49,6 @@ describe('sale payBack()', () => {
}
expect(error).toBeDefined();
- expect(error.message).toEqual(`You don't have privileges to create pay back`);
+ expect(error.message).toEqual(`You don't have privileges to create refund`);
});
});
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index 9efd660570..2652aded2a 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -6,7 +6,8 @@ module.exports = Self => {
require('../methods/sale/updateQuantity')(Self);
require('../methods/sale/updateConcept')(Self);
require('../methods/sale/recalculatePrice')(Self);
- require('../methods/sale/payBack')(Self);
+ require('../methods/sale/refund')(Self);
+ require('../methods/sale/refundAll')(Self);
require('../methods/sale/canEdit')(Self);
Self.validatesPresenceOf('concept', {
diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html
index 88ed4b46b2..c99575d423 100644
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@@ -139,6 +139,11 @@
translate>
Recalculate components
+
+ Refund all
+
@@ -292,4 +297,12 @@
on-accept="$ctrl.recalculateComponents()"
question="Are you sure you want to recalculate the components?"
message="Recalculate components">
+
+
+
+
\ 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 6465c43ace..1c80a6f9db 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -272,6 +272,14 @@ class Controller extends Section {
.then(() => this.reload())
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
+
+ refundAll() {
+ const params = {ticketId: this.id};
+ const query = `Sales/refundAll`;
+ 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/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index faf45504e0..75f3522aed 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -262,6 +262,19 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
});
});
+ describe('refundAll()', () => {
+ it('should make a query and go to ticket.card.sale', () => {
+ jest.spyOn(controller.$state, 'go').mockReturnValue();
+ const expectedParams = {ticketId: ticket.id};
+
+ $httpBackend.expect('POST', `Sales/refundAll`, expectedParams).respond({ticketId: 16});
+ controller.refundAll();
+ $httpBackend.flush();
+
+ expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: {ticketId: ticket.id}});
+ });
+ });
+
describe('showSMSDialog()', () => {
it('should set the destionationFk and destination properties and then call the sms open() method', () => {
controller.$.sms = {open: () => {}};
diff --git a/modules/ticket/front/descriptor-menu/locale/es.yml b/modules/ticket/front/descriptor-menu/locale/es.yml
index 761687e749..060d03154f 100644
--- a/modules/ticket/front/descriptor-menu/locale/es.yml
+++ b/modules/ticket/front/descriptor-menu/locale/es.yml
@@ -7,4 +7,5 @@ Send PDF: Enviar PDF
Send CSV: Enviar CSV
Send CSV Delivery Note: Enviar albarán en CSV
Send PDF Delivery Note: Enviar albarán en PDF
-Show Proforma: Ver proforma
\ No newline at end of file
+Show Proforma: Ver proforma
+Refund all: Abonar todo
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index 8d76888264..2c27b19cda 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.ticket.client.name"
+ summary="$ctrl.$.summary">
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml
index f56f29f92a..2a7bf360ff 100644
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@@ -29,4 +29,5 @@ SMS Minimum import: 'SMS Importe minimo'
SMS Pending payment: 'SMS Pago pendiente'
Restore ticket: Restaurar ticket
You are going to restore this ticket: Vas a restaurar este ticket
-Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
\ No newline at end of file
+Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
+Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 18905f8590..836fadb9b9 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -512,10 +512,10 @@
Unmark as reserved
- Pay Back
+ Refund
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index a60c9cb965..bb8a81bc4c 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -479,12 +479,12 @@ class Controller extends Section {
});
}
- createPayBack() {
+ createRefund() {
const sales = this.selectedValidSales();
if (!sales) return;
const params = {sales: sales, ticketId: this.ticket.id};
- const query = `Sales/payBack`;
+ const query = `Sales/refund`;
this.resetChanges();
this.$http.post(query, params).then(res => {
this.$state.go('ticket.card.sale', {id: res.data});
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index fc4d1b4f36..a8ac2f3de3 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -703,15 +703,15 @@ describe('Ticket', () => {
});
});
- describe('createPayBack()', () => {
+ describe('createRefund()', () => {
it('should make an HTTP POST query and then call to the $state go() method', () => {
jest.spyOn(controller, 'selectedValidSales').mockReturnValue(controller.sales);
jest.spyOn(controller, 'resetChanges');
jest.spyOn(controller.$state, 'go');
const expectedId = 9999;
- $httpBackend.expect('POST', `Sales/payBack`).respond(200, expectedId);
- controller.createPayBack();
+ $httpBackend.expect('POST', `Sales/refund`).respond(200, expectedId);
+ controller.createRefund();
$httpBackend.flush();
expect(controller.resetChanges).toHaveBeenCalledWith();
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 7edb0a626d..aab8ff493d 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -36,6 +36,6 @@ Warehouse: Almacen
Agency: Agencia
Shipped: F. envio
Packaging: Encajado
-Pay Back: Abono
+Refund: Abono
Promotion mana: Maná promoción
-Claim mana: Maná reclamación
\ No newline at end of file
+Claim mana: Maná reclamación
diff --git a/modules/travel/front/descriptor/index.html b/modules/travel/front/descriptor/index.html
index 28e908d18f..bbf5721fd9 100644
--- a/modules/travel/front/descriptor/index.html
+++ b/modules/travel/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.travel.ref"
+ summary="$ctrl.$.summary">
@@ -42,3 +43,6 @@
+
+
+
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 036b70eab2..01681ebb80 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -1,6 +1,7 @@
+ description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName"
+ summary="$ctrl.$.summary">
![]()
+
+
+
+ description="$ctrl.zone.name"
+ summary="$ctrl.$.summary">
+
+
+
+
|