Merge pull request #11 from wes4m/dev

Experimental release v0.1.3 release
wes4m · Oct 18, 2022 · 13770e0 · 13770e0
2 parents e9a4383 + 765dc55
commit 13770e0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
   <br/>
   <img src="./docs/logo.png"/>
-  <p>v0.1.2 (experimental)</p>
+  <p>v0.1.3 (experimental)</p>
   <br/>
   <br/>
   <p>
@@ -17,7 +17,7 @@
         <img src="https://img.shields.io/badge/maintainer-wes4m-blue"/>
     </a>
     <a href="https://badge.fury.io/js/zatca-xml-js">
-      <img src="https://badge.fury.io/js/zatca-xml-js.svg/?v=0.1.2"/>
+      <img src="https://badge.fury.io/js/zatca-xml-js.svg/?v=0.1.3"/>
     </a>
   </p>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zatca-xml-js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "An implementation of Saudi Arabia ZATCA's E-Invoicing requirements, processes, and standards.",
   "main": "lib/index.js",
   "files": ["lib/**/*"],

diff --git a/src/zatca/ZATCASimplifiedTaxInvoice.ts b/src/zatca/ZATCASimplifiedTaxInvoice.ts
@@ -166,9 +166,10 @@ export class ZATCASimplifiedTaxInvoice {
                 "@_currencyID": "SAR",
                 "#text": tax_exclusive_subtotal
             },
+            // BR-DEC-14
             "cbc:TaxInclusiveAmount": {
                 "@_currencyID": "SAR",
-                "#text": tax_exclusive_subtotal + taxes_total
+                "#text": (tax_exclusive_subtotal + taxes_total).toFixed(2)
             },
             "cbc:AllowanceTotalAmount": {
                 "@_currencyID": "SAR",
@@ -178,9 +179,10 @@ export class ZATCASimplifiedTaxInvoice {
                 "@_currencyID": "SAR",
                 "#text": 0
             },
+            // BR-DEC-18
             "cbc:PayableAmount": {
                 "@_currencyID": "SAR",
-                "#text": tax_exclusive_subtotal + taxes_total
+                "#text": (tax_exclusive_subtotal + taxes_total).toFixed(2)
             }
         }
     }

diff --git a/src/zatca/signing/index.ts b/src/zatca/signing/index.ts
@@ -118,7 +118,8 @@ export const getCertificateInfo = (certificate_string: string): {hash: string, i
  * @returns String base64 encoded certificate body.
  */
 export const cleanUpCertificateString = (certificate_string: string): string => {
-    return certificate_string.replace("-----BEGIN CERTIFICATE-----\n", "").replace("-----END CERTIFICATE-----", "").trim()
+    const r = process.platform === "win32" ? "\r" : "";
+    return certificate_string.replace(`-----BEGIN CERTIFICATE-----${r}\n`, "").replace("-----END CERTIFICATE-----", "").trim()
 }
 
 /**
@@ -127,7 +128,8 @@ export const cleanUpCertificateString = (certificate_string: string): string =>
  * @returns String base64 encoded private key body.
  */
  export const cleanUpPrivateKeyString = (certificate_string: string): string => {
-    return certificate_string.replace("-----BEGIN EC PRIVATE KEY-----\n", "").replace("-----END EC PRIVATE KEY-----", "").trim()
+    const r = process.platform === "win32" ? "\r" : "";
+    return certificate_string.replace(`-----BEGIN EC PRIVATE KEY-----${r}\n`, "").replace("-----END EC PRIVATE KEY-----", "").trim()
 }