verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity

2534 - Fill sage data before enable taxDataChecked #432

Merged
carlosjr merged 3 commits from 2534-sage_taxDataChecked into dev 2020-11-04 12:54:15 +00:00
Conversation 0 Commits 3 Files Changed 8 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0570d83a6d - Show all commits

2
loopback/locale/es.json
View File

@ -157,5 +157,5 @@
"landed": "F. entrega", "landed": "F. entrega",
"addressFk": "Consignatario", "addressFk": "Consignatario",
"companyFk": "Empresa", "companyFk": "Empresa",
"You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data" "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados"
} }

9
modules/client/back/methods/client/specs/updateFiscalData.spec.js
View File

@ -2,10 +2,11 @@ const app = require('vn-loopback/server/server');
describe('Client updateFiscalData', () => { describe('Client updateFiscalData', () => {
const clientId = 101; const clientId = 101;
const employeeId = 1;
const salesAssistantId = 21; const salesAssistantId = 21;
const administrativeId = 5; const administrativeId = 5;
afterAll(async done => { afterAll(async done => {
const ctx = {req: {accessToken: {userId: 5}}}; const ctx = {req: {accessToken: {userId: administrativeId}}};
ctx.args = {postcode: 46460}; ctx.args = {postcode: 46460};
await app.models.Client.updateFiscalData(ctx, clientId); await app.models.Client.updateFiscalData(ctx, clientId);
@ -13,8 +14,8 @@ describe('Client updateFiscalData', () => {
done(); done();
}); });
it('should return an error if the user is not administrative and the isTaxDataChecked value is true', async() => { it('should return an error if the user is not salesAssistant and the isTaxDataChecked value is true', async() => {
const ctx = {req: {accessToken: {userId: 1}}}; const ctx = {req: {accessToken: {userId: employeeId}}};
ctx.args = {}; ctx.args = {};
let error; let error;
@ -26,7 +27,7 @@ describe('Client updateFiscalData', () => {
expect(error.message).toEqual(`You can't make changes on a client with verified data`); expect(error.message).toEqual(`You can't make changes on a client with verified data`);
}); });
joan marked this conversation as resolved
carlosjr commented 2020-11-04 12:25:07 +00:00
Review
Copy Link

who is d?

who is d?
it('should return an error if the user is not d and the isTaxDataChecked value is true', async() => { it('should return an error if the salesAssistant did not fill the sage data before checking verified data', async() => {
const client = await app.models.Client.findById(clientId); const client = await app.models.Client.findById(clientId);
await client.updateAttribute('isTaxDataChecked', false); await client.updateAttribute('isTaxDataChecked', false);

2
modules/client/front/fiscal-data/index.html
View File

@ -30,7 +30,7 @@
data="sageTransactionTypes" data="sageTransactionTypes"
order="transaction"> order="transaction">
</vn-crud-model> </vn-crud-model>
<form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md" disabled="true"> <form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
carlosjr commented 2020-11-04 12:29:44 +00:00
Outdated
Review
Copy Link

disabled not needed

disabled not needed
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-horizontal> <vn-horizontal>
<vn-textfield <vn-textfield