diff --git a/db/changes/10400-christmas/00-ACL.sql b/db/changes/10400-christmas/00-ACL.sql new file mode 100644 index 000000000..4f87cb708 --- /dev/null +++ b/db/changes/10400-christmas/00-ACL.sql @@ -0,0 +1,2 @@ +INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId) + VALUES ('Sale','payBack','WRITE','ALLOW','ROLE','employee'); diff --git a/db/changes/10400-christmas/00-ticket_doRefund.sql b/db/changes/10400-christmas/00-ticket_doRefund.sql new file mode 100644 index 000000000..1c1faf315 --- /dev/null +++ b/db/changes/10400-christmas/00-ticket_doRefund.sql @@ -0,0 +1,90 @@ +DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT) +BEGIN + + DECLARE vDone BIT DEFAULT 0; + DECLARE vCustomer MEDIUMINT; + DECLARE vWarehouse TINYINT; + DECLARE vCompany MEDIUMINT; + DECLARE vAddress MEDIUMINT; + DECLARE vRefundAgencyMode INT; + DECLARE vItemFk INT; + DECLARE vQuantity DECIMAL (10,2); + DECLARE vConcept VARCHAR(50); + DECLARE vPrice DECIMAL (10,2); + DECLARE vDiscount TINYINT; + DECLARE vSaleNew INT; + DECLARE vSaleMain INT; + DECLARE vZoneFk INT; + + DECLARE vRsMainTicket CURSOR FOR + SELECT * + FROM tmp.sale; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1; + + SELECT id INTO vRefundAgencyMode + FROM agencyMode WHERE `name` = 'ABONO'; + + SELECT clientFk, warehouseFk, companyFk, addressFk + INTO vCustomer, vWarehouse, vCompany, vAddress + FROM ticket + WHERE id = vOriginTicket; + + SELECT id INTO vZoneFk + FROM zone WHERE agencyModeFk = vRefundAgencyMode + LIMIT 1; + + INSERT INTO vn.ticket ( + clientFk, + shipped, + addressFk, + agencyModeFk, + nickname, + warehouseFk, + companyFk, + landed, + zoneFk + ) + SELECT + vCustomer, + CURDATE(), + vAddress, + vRefundAgencyMode, + a.nickname, + vWarehouse, + vCompany, + CURDATE(), + vZoneFk + FROM address a + WHERE a.id = vAddress; + + SET vNewTicket = LAST_INSERT_ID(); + + SET vDone := 0; + OPEN vRsMainTicket ; + FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount; + + WHILE NOT vDone DO + + INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount) + VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount ); + + SET vSaleNew = LAST_INSERT_ID(); + + INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) + SELECT vSaleNew,componentFk,`value` + FROM vn.saleComponent + WHERE saleFk = vSaleMain; + + FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount; + + END WHILE; + CLOSE vRsMainTicket; + +END; +$$ +DELIMITER ; \ No newline at end of file diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 8675797e7..155ffdd22 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -558,6 +558,7 @@ export default { moreMenuUnmarkReseved: 'vn-item[name="unreserve"]', moreMenuUpdateDiscount: 'vn-item[name="discount"]', moreMenuRecalculatePrice: 'vn-item[name="calculatePrice"]', + moreMenuPayBack: 'vn-item[name="payBack"]', moreMenuUpdateDiscountInput: 'vn-input-number[ng-model="$ctrl.edit.discount"] input', transferQuantityInput: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable > span > text', transferQuantityCell: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable', diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index dfda4dcfb..1f3aedadf 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -206,7 +206,16 @@ describe('Ticket Edit sale path', () => { expect(message.text).toContain('Data saved!'); }); + it('should select the third sale and create a pay back', async() => { + await page.waitToClick(selectors.ticketSales.firstSaleCheckbox); + await page.waitToClick(selectors.ticketSales.moreMenu); + await page.waitToClick(selectors.ticketSales.moreMenuPayBack); + await page.waitForState('ticket.card.sale'); + }); + it('should select the third sale and create a claim of it', async() => { + await page.accessToSearchResult('16'); + await page.accessToSection('ticket.card.sale'); await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox); await page.waitToClick(selectors.ticketSales.moreMenu); await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim); diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js index d306c6f84..591af2839 100644 --- a/modules/client/front/balance/create/index.js +++ b/modules/client/front/balance/create/index.js @@ -82,7 +82,7 @@ class Controller extends Dialog { } set amountToReturn(value) { - if (!value) return; + if (isNaN(value)) return; value = value.toFixed(2); diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index a7ca38173..98e78c7aa 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -112,7 +112,10 @@ module.exports = Self => { case 'search': return /^\d+$/.test(value) ? {or: [{'i.id': value}, codeWhere]} - : {or: [{'i.name': {like: `%${value}%`}}, codeWhere]}; + : {or: [ + {'i.name': {like: `%${value}%`}}, + {'i.longName': {like: `%${value}%`}}, + codeWhere]}; case 'id': case 'isActive': case 'typeFk': diff --git a/modules/ticket/back/methods/sale/payBack.js b/modules/ticket/back/methods/sale/payBack.js new file mode 100644 index 000000000..41150a1e0 --- /dev/null +++ b/modules/ticket/back/methods/sale/payBack.js @@ -0,0 +1,70 @@ +module.exports = Self => { + Self.remoteMethodCtx('payBack', { + description: 'Create ticket with the selected lines changing the sign to the quantites', + accessType: 'WRITE', + accepts: [{ + arg: 'sales', + description: 'The sales', + type: ['object'], + required: true + }, + { + arg: 'ticketId', + type: 'number', + required: true, + description: 'The ticket id' + }], + returns: { + type: 'number', + root: true + }, + http: { + path: `/payBack`, + verb: 'post' + } + }); + + Self.payBack = async(ctx, sales, 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 salesIds = []; + const params = []; + sales.forEach(sale => { + salesIds.push(sale.id); + params.push('?'); + }); + + const paramsString = params.join(); + + const query = ` + DROP TEMPORARY TABLE IF EXISTS tmp.sale; + 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 (${paramsString}); + CALL vn.ticket_doRefund(${ticketId}, @newTicket); + DROP TEMPORARY TABLE tmp.sale;`; + + await Self.rawSql(query, salesIds, 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/payment.spec.js b/modules/ticket/back/methods/sale/specs/payment.spec.js new file mode 100644 index 000000000..9f0bcc98a --- /dev/null +++ b/modules/ticket/back/methods/sale/specs/payment.spec.js @@ -0,0 +1,26 @@ +const models = require('vn-loopback/server/server').models; + +describe('sale payBack()', () => { + it('should create ticket with the selected lines changing the sign to the quantites', async() => { + const tx = await models.Sale.beginTransaction({}); + const ticketId = 11; + const sales = [ + {id: 7, ticketFk: 11}, + {id: 8, ticketFk: 11} + ]; + try { + const options = {transaction: tx}; + + const ctx = {req: {accessToken: {userId: 9}}}; + const response = await models.Sale.payBack(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); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js index 545e054dc..9efd66057 100644 --- a/modules/ticket/back/models/sale.js +++ b/modules/ticket/back/models/sale.js @@ -6,6 +6,7 @@ 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/canEdit')(Self); Self.validatesPresenceOf('concept', { diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index f7a279d9a..fe1f5684d 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -490,4 +490,9 @@ ng-if="$ctrl.isEditable && $ctrl.hasReserves()"> Unmark as reserved + + Pay Back + \ No newline at end of file diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js index 752ed23ba..9d0f71eb8 100644 --- a/modules/ticket/front/sale/index.js +++ b/modules/ticket/front/sale/index.js @@ -460,6 +460,18 @@ class Controller extends Section { }); } + createPayBack() { + const sales = this.selectedValidSales(); + if (!sales) return; + + const params = {sales: sales, ticketId: this.ticket.id}; + const query = `Sales/payBack`; + this.resetChanges(); + this.$http.post(query, params).then(res => { + this.$state.go('ticket.card.sale', {id: res.data}); + }); + } + itemSearchFunc($search) { return /^\d+$/.test($search) ? {id: $search} diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js index 673e9a3f9..15ce1798b 100644 --- a/modules/ticket/front/sale/index.spec.js +++ b/modules/ticket/front/sale/index.spec.js @@ -701,6 +701,22 @@ describe('Ticket', () => { }); }); + describe('createPayBack()', () => { + 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.flush(); + + expect(controller.resetChanges).toHaveBeenCalledWith(); + expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: expectedId}); + }); + }); + describe('itemSearchFunc()', () => { it('should return the filter by id property for an input of a number', () => { const itemId = 1; diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml index 92d8dfe28..e4152600f 100644 --- a/modules/ticket/front/sale/locale/es.yml +++ b/modules/ticket/front/sale/locale/es.yml @@ -35,4 +35,5 @@ Address: Dirección Warehouse: Almacen Agency: Agencia Shipped: F. envio -Packaging: Encajado \ No newline at end of file +Packaging: Encajado +Pay Back: Abono \ No newline at end of file diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html index 20c29f0ee..7a843c830 100644 --- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html @@ -23,6 +23,10 @@ {{$t('clientId')}} {{client.id}} + + {{$t('phone')}} + {{client.phone}} + {{$t('date')}} {{dated}} diff --git a/print/templates/reports/claim-pickup-order/locale/es.yml b/print/templates/reports/claim-pickup-order/locale/es.yml index 385a54917..9faf9ac06 100644 --- a/print/templates/reports/claim-pickup-order/locale/es.yml +++ b/print/templates/reports/claim-pickup-order/locale/es.yml @@ -9,6 +9,7 @@ reference: Referencia concept: Concepto clientSignature: Firma del cliente claim: Reclamación {0} +phone: Teléfono sections: agency: description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina diff --git a/print/templates/reports/claim-pickup-order/sql/client.sql b/print/templates/reports/claim-pickup-order/sql/client.sql index 30a42d5c8..640b0c8a7 100644 --- a/print/templates/reports/claim-pickup-order/sql/client.sql +++ b/print/templates/reports/claim-pickup-order/sql/client.sql @@ -8,7 +8,8 @@ SELECT a.street, a.nickname, p.name AS province, - ct.country + ct.country, + IFNULL(c.phone, cc.phone) AS phone FROM claim cl JOIN client c ON c.id = cl.clientFk JOIN account.user u ON u.id = c.id @@ -17,4 +18,6 @@ FROM claim cl LEFT JOIN province p ON p.id = a.provinceFk LEFT JOIN autonomy amy ON amy.id = p.autonomyFk LEFT JOIN country ct ON ct.id = amy.countryFk -WHERE cl.id = ? \ No newline at end of file + LEFT JOIN clientContact cc ON cc.clientFk = c.id +WHERE cl.id = ? +LIMIT 1; \ No newline at end of file