Skip to content

Commit 9afe10b

Browse files
tfilianotfiliano
authored
Merge branch 'master' into nfe_cancelamento
2 parents 094052c + 6c3d6d5 commit 9afe10b

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

‎nfetest.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ let cert = {
1616
let empresa = {
1717
razaoSocial: 'TESTE',
1818
nomeFantasia: 'TESTE',
19-
cnpj: '18885949000181',
20-
inscricaoEstadual: '144895078115',
19+
cnpj: 'OBRIGATORIO',
20+
inscricaoEstadual: 'OBRIGATORIO',
2121
inscricaoMunicipal: '',
2222
codRegimeTributario: '1',//2
2323
endereco: {
@@ -214,7 +214,6 @@ let nfce = {
214214
infoAdicional: infoAdic
215215
};
216216

217-
218217
const configuracoes = {
219218
empresa,
220219
certificado: cert,
@@ -243,7 +242,7 @@ async function testeEmissaoNFe() {
243242
console.log('Resultado Emissão NF-e: \n\n' + result);
244243
}
245244

246-
// TESTES STATUS SERVICO:
245+
:
247246
async function testeConsultaStatusServico(empresa, ambiente, modelo) {
248247
const statusProc = new lib.StatusServicoProcessor(empresa, ambiente, modelo);
249248
let result = await statusProc.processarDocumento();
@@ -268,6 +267,7 @@ async function testeEventoCancelar() {
268267

269268
const ini = new Date();
270269
let result = await eventoProc.executar(evento);
270+
271271
const fin = new Date();
272272
console.log(`${(fin.getTime() - ini.getTime())/1000}s`)
273273

@@ -298,4 +298,4 @@ testeEventoCancelar()
298298
// openssl pkcs12 -in mycaservercert.pfx -nodes -nocerts -out mycaservercertkey.key
299299
// openssl rsa -in mycaservercertkey.pem -check -out mycaservercertkeyrsa.pem
300300
// limpar primeiras linhas do mycaservercert.pem ou no linux, executar awk 'NF {sub(/\r/, ""); printf "%s\\n",$0;}' cert-name.pem
301-
// REFERENCIA: https://docs.vmware.com/br/Unified-Access-Gateway/3.2/com.vmware.uag-32-deploy-config.doc/GUID-870AF51F-AB37-4D6C-B9F5-4BFEB18F11E9.html
301+
// REFERENCIA: https://docs.vmware.com/br/Unified-Access-Gateway/3.2/com.vmware.uag-32-deploy-config.doc/GUID-870AF51F-AB37-4D6C-B9F5-4BFEB18F11E9.html

‎src/factory/processor/nfeProcessor.ts

+29-23
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,15 @@ export class NFeProcessor {
989989
return result;
990990
}
991991

992+
// private getImpostoII() {
993+
// return <schema.TNFeInfNFeDetImpostoII> {
994+
// vBC: '',
995+
// vDespAdu: '',
996+
// vII: '',
997+
// vIOF: ''
998+
// }
999+
// }
1000+
9921001
private getImpostoISSQN() {
9931002
return <schema.TNFeInfNFeDetImpostoISSQN>{
9941003
vBC: '',
@@ -1016,12 +1025,12 @@ export class NFeProcessor {
10161025
// if (!GerarTagIPIparaNaoTributado) && (!['00', '49', '50', '99'].includes(ipi.CST)) return;
10171026
//se valores padrão de quando não foi preenchido a TAG IPI
10181027

1019-
if ((ipi.cEnq = '') && (ipi.CST = '00') && (ipi.vBC = 0) && (ipi.qUnid = 0) && (ipi.vUnid = 0) && (ipi.pIPI = 0) && (ipi.vIPI = 0)) return;
1028+
if ((ipi.cEnq = '') && (ipi.CST = '00') && (ipi.vBC = 0) && (ipi.qUnid = 0) && (ipi.vUnid = 0) && (ipi.pIPI = 0) && (ipi.vIPI = 0)) return;
10201029
if ((ipi.vBC + ipi.pIPI > 0) && (ipi.qUnid + ipi.vUnid > 0)) throw 'As TAG <vBC> e <pIPI> não podem ser informadas em conjunto com as TAG <qUnid> e <vUnid>';
10211030

10221031

10231032
result = {
1024-
IPI: <schema.TIpi>{
1033+
IPI: <schema.TIpi> {
10251034
CNPJProd: ipi.CNPJProd,
10261035
cSelo: ipi.cSelo,
10271036
qSelo: ipi.qSelo,
@@ -1049,7 +1058,6 @@ export class NFeProcessor {
10491058
// result.IPI.IPINT = { CST: ipi.CST }
10501059
return result;
10511060
}
1052-
10531061
private getImpostoII(ii: II, cfop: string) {
10541062
if (!ii) return;
10551063
if ((ii.vBC > 0) || (ii.vDespAdu > 0) || (ii.vII > 0) || (ii.vIOF > 0) || (cfop[0] === '3')) {
@@ -1060,7 +1068,7 @@ export class NFeProcessor {
10601068
vIOF: ii.vIOF
10611069
};
10621070
}
1063-
return;
1071+
return ;
10641072
}
10651073

10661074
private getImpostoPIS(pis: Pis, modelo: string) {
@@ -1076,7 +1084,7 @@ export class NFeProcessor {
10761084
case '01':
10771085
case '02':
10781086
result = {
1079-
PISAliq: <schema.TNFeInfNFeDetImpostoPIS>{
1087+
PISAliq: <schema.TNFeInfNFeDetImpostoPIS> {
10801088
CST: pis.CST,
10811089
vBC: pis.vBC,
10821090
pPIS: pis.pPIS,
@@ -1086,7 +1094,7 @@ export class NFeProcessor {
10861094
break;
10871095
case '03':
10881096
result = {
1089-
PISQtde: <schema.TNFeInfNFeDetImpostoPIS>{
1097+
PISQtde: <schema.TNFeInfNFeDetImpostoPIS> {
10901098
CST: pis.CST,
10911099
vBCProd: pis.vBCProd,
10921100
vAliqProd: pis.vAliqProd,
@@ -1101,7 +1109,7 @@ export class NFeProcessor {
11011109
case '08':
11021110
case '09':
11031111
result = {
1104-
PISNT: <schema.TNFeInfNFeDetImpostoPIS>{
1112+
PISNT: <schema.TNFeInfNFeDetImpostoPIS> {
11051113
CST: pis.CST
11061114
}
11071115
}
@@ -1133,7 +1141,7 @@ export class NFeProcessor {
11331141
if (pis.qBCProd + pis.vAliqProd <= 0) return undefined;
11341142

11351143
result = {
1136-
PISOutr: <schema.TNFeInfNFeDetImpostoPIS>{
1144+
PISOutr: <schema.TNFeInfNFeDetImpostoPIS> {
11371145
CST: pis.CST,
11381146
qBCProd: pis.qBCProd,
11391147
vAliqProd: pis.vAliqProd,
@@ -1142,7 +1150,7 @@ export class NFeProcessor {
11421150
}
11431151
default:
11441152
result = {
1145-
PISOutr: <schema.TNFeInfNFeDetImpostoPIS>{
1153+
PISOutr: <schema.TNFeInfNFeDetImpostoPIS> {
11461154
CST: pis.CST,
11471155
vBC: pis.vBC,
11481156
pPIS: pis.pPIS,
@@ -1168,7 +1176,7 @@ export class NFeProcessor {
11681176
case '01':
11691177
case '02':
11701178
result = {
1171-
COFINSAliq: <schema.TNFeInfNFeDetImpostoCOFINS>{
1179+
COFINSAliq: <schema.TNFeInfNFeDetImpostoCOFINS> {
11721180
CST: cofins.CST,
11731181
vBC: cofins.vBC,
11741182
pCOFINS: cofins.pCOFINS,
@@ -1178,7 +1186,7 @@ export class NFeProcessor {
11781186
break;
11791187
case '03':
11801188
result = {
1181-
COFINSQtde: <schema.TNFeInfNFeDetImpostoCOFINS>{
1189+
COFINSQtde: <schema.TNFeInfNFeDetImpostoCOFINS> {
11821190
CST: cofins.CST,
11831191
qBCProd: cofins.qBCProd,
11841192
vAliqProd: cofins.vAliqProd,
@@ -1193,7 +1201,7 @@ export class NFeProcessor {
11931201
case '08':
11941202
case '09':
11951203
result = {
1196-
COFINSNT: <schema.TNFeInfNFeDetImpostoCOFINS>{
1204+
COFINSNT: <schema.TNFeInfNFeDetImpostoCOFINS> {
11971205
CST: cofins.CST
11981206
}
11991207
}
@@ -1226,7 +1234,7 @@ export class NFeProcessor {
12261234
if (cofins.qBCProd + cofins.vAliqProd <= 0) return undefined;
12271235

12281236
result = {
1229-
COFINSOutr: <schema.TNFeInfNFeDetImpostoCOFINS>{
1237+
COFINSOutr: <schema.TNFeInfNFeDetImpostoCOFINS> {
12301238
CST: cofins.CST,
12311239
qBCProd: cofins.qBCProd,
12321240
vAliqProd: cofins.vAliqProd,
@@ -1236,7 +1244,7 @@ export class NFeProcessor {
12361244
break
12371245
default:
12381246
result = {
1239-
COFINSOutr: <schema.TNFeInfNFeDetImpostoCOFINS>{
1247+
COFINSOutr: <schema.TNFeInfNFeDetImpostoCOFINS> {
12401248
CST: cofins.CST,
12411249
vBC: cofins.vBC,
12421250
pCOFINS: cofins.pCOFINS,
@@ -1250,13 +1258,13 @@ export class NFeProcessor {
12501258

12511259
private getImpostoPISST(PISST: PisST) {
12521260
let result;
1253-
if (!PISST) return;
1261+
if (!PISST) return ;
12541262
if ((PISST.vBC > 0) || (PISST.pPIS > 0) || (PISST.qBCProd > 0) || (PISST.vAliqProd > 0) || (PISST.vPIS > 0)) {
12551263
if ((PISST.vBC + PISST.pPIS > 0) && (PISST.qBCProd + PISST.vAliqProd > 0)) throw 'As TAG <vBC> e <pPIS> não podem ser informadas em conjunto com as TAG <qBCProd> e <vAliqProd>';
12561264

12571265
if (PISST.vBC + PISST.pPIS > 0) {
12581266
result = {
1259-
PISST: <schema.TNFeInfNFeDetImpostoPISST>{
1267+
PISST: <schema.TNFeInfNFeDetImpostoPISST> {
12601268
vBC: PISST.vBC,
12611269
pPIS: PISST.pPIS,
12621270
vPIS: PISST.vPIS,
@@ -1266,7 +1274,7 @@ export class NFeProcessor {
12661274

12671275
if (PISST.qBCProd + PISST.vAliqProd > 0) {
12681276
result = {
1269-
PISST: <schema.TNFeInfNFeDetImpostoPISST>{
1277+
PISST: <schema.TNFeInfNFeDetImpostoPISST> {
12701278
qBCProd: PISST.qBCProd,
12711279
vAliqProd: PISST.vAliqProd,
12721280
vPIS: PISST.vPIS,
@@ -1277,7 +1285,6 @@ export class NFeProcessor {
12771285
}
12781286
return result;
12791287
}
1280-
12811288
private getImpostoCOFINSST(COFINSST: CofinsST) {
12821289
let result;
12831290
if (!COFINSST) return;
@@ -1286,7 +1293,7 @@ export class NFeProcessor {
12861293

12871294
if (COFINSST.vBC + COFINSST.pCOFINS > 0) {
12881295
result = {
1289-
COFINSST: <schema.TNFeInfNFeDetImpostoCOFINSST>{
1296+
COFINSST: <schema.TNFeInfNFeDetImpostoCOFINSST> {
12901297
vBC: COFINSST.vBC,
12911298
pCOFINS: COFINSST.pCOFINS,
12921299
vCOFINS: COFINSST.vCOFINS,
@@ -1296,7 +1303,7 @@ export class NFeProcessor {
12961303

12971304
if (COFINSST.qBCProd + COFINSST.vAliqProd > 0) {
12981305
result = {
1299-
COFINSST: <schema.TNFeInfNFeDetImpostoCOFINSST>{
1306+
COFINSST: <schema.TNFeInfNFeDetImpostoCOFINSST> {
13001307
qBCProd: COFINSST.qBCProd,
13011308
vAliqProd: COFINSST.vAliqProd,
13021309
vCOFINS: COFINSST.vCOFINS,
@@ -1307,10 +1314,9 @@ export class NFeProcessor {
13071314
}
13081315
return result;
13091316
}
1310-
13111317
private getImpostoDevolucao(devol: impostoDevol) {
13121318
return {
1313-
impostoDevol: <schema.TNFeInfNFeDetImpostoDevol>{
1319+
impostoDevol: <schema.TNFeInfNFeDetImpostoDevol> {
13141320
pDevol: devol.pDevol,
13151321
IPI: {
13161322
vIPIDevol: devol.vIPIDevol
@@ -1324,7 +1330,7 @@ export class NFeProcessor {
13241330
if (!icmsUfDest) return;
13251331
if (icmsUfDest.pICMSInterPart <= 0) return;
13261332
return {
1327-
ICMSUFDest: <schema.TNFeInfNFeDetImpostoICMSUFDest>{
1333+
ICMSUFDest: <schema.TNFeInfNFeDetImpostoICMSUFDest> {
13281334
vBCUFDest: icmsUfDest.vBCUFDest,
13291335
vBCFCPUFDest: icmsUfDest.vBCFCPUFDest,
13301336
pFCPUFDest: icmsUfDest.pFCPUFDest,

0 commit comments

Comments
 (0)