Fix eInvoice signer code

Author: mabaega

Certificates/PrivateKey.pem

@@ -1 +1 @@
-MHQCAQEEIPi7yWosBf7cNCTetGt7SkR6V3CCkjZS5fHfAVnRaO2BoAcGBSuBBAAKoUQDQgAEtltXb3iQh3NuhQhpxBOyVdmpcuLFUW9kvyy4j+mOkgOVVu5OtGXFRC4KZOPVudLvyO+/ExL1/YqFmz18Ja5Dtg==
+MHQCAQEEIEPoOx8ZrKZSdNk4l9E+jxPyeEXWcBUi4S1XGu7qui7ooAcGBSuBBAAKoUQDQgAECUAIXZEmNQyLo2Sh/kCis18pwaOyZFWOFFu5cDtK6XIhQZ2yLWrBespUciiAzPKvQxjkcC/U3YR7gDNYffqSzg==

Certificates/PublicKey.pem

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MDYwEAYHKoZIzj0CAQYFK4EEAAoDIgACtltXb3iQh3NuhQhpxBOyVdmpcuLFUW9k
-vyy4j+mOkgM=
+MDYwEAYHKoZIzj0CAQYFK4EEAAoDIgACCUAIXZEmNQyLo2Sh/kCis18pwaOyZFWO
+FFu5cDtK6XI=
 -----END PUBLIC KEY-----

Certificates/certificateInfo.json

@@ -1,11 +1,11 @@
 {
     "environmentType": "NonProduction",
-    "csr": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0NCk1JSUNHVENDQWI4Q0FRQXdkVEVtTUNRR0ExVUVBd3dkVkZOVUxUZzROalF6TVRFME5TMHpPVGs1T1RrNU9UazUNCk1EQXdNRE14RmpBVUJnTlZCQXNNRFZKcGVXRmthQ0JDY21GdVkyZ3hKakFrQmdOVkJBb01IVTFoZUdsdGRXMGcNClUzQmxaV1FnVkdWamFDQlRkWEJ3YkhrZ1RGUkVNUXN3Q1FZRFZRUUdFd0pUUVRCV01CQUdCeXFHU000OUFnRUcNCkJTdUJCQUFLQTBJQUJMWmJWMjk0a0lkemJvVUlhY1FUc2xYWnFYTGl4VkZ2Wkw4c3VJL3BqcElEbFZidVRyUmwNCnhVUXVDbVRqMWJuUzc4anZ2eE1TOWYyS2haczlmQ1d1UTdhZ2dlb3dnZWNHQ1NxR1NJYjNEUUVKRGpHQjJUQ0INCjFqQWtCZ2tyQmdFRUFZb2ZGQUlFRnhNVlZGTlVXa0ZVUTBFdFEyOWtaUzFUYVdkdWFXNW5NSUd0QmdOVkhSRUUNCmdhVXdnYUtrZ1o4d2dad3hPekE1QmdOVkJBUU1NakV0VkZOVWZESXRWRk5VZkRNdFpXUXlNbVl4WkRndFpUWmgNCk1pMHhNVEU0TFRsaU5UZ3RaRGxoT0dZeE1XVTBORFZtTVI4d0hRWUtDWkltaVpQeUxHUUJBUXdQTXprNU9UazUNCk9UazVPVEF3TURBek1RMHdDd1lEVlFRTURBUXhNVEF3TVJFd0R3WURWUVFhREFoU1VsSkVNamt5T1RFYU1CZ0cNCkExVUVEd3dSVTNWd2NHeDVJR0ZqZEdsMmFYUnBaWE13Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnVUVkSk1BUUoNCnQ0M1A0eWZ3djk0M0RUZWZTV3hyV0s2VW0zOGJTdDRMbjVFQ0lRRFEyUkIwUjdWMTJlRitCa1MvV3hXNWpxVlgNClJNRE5mRGlDY0Q0TmI3MkZBQT09DQotLS0tLUVORCBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0NCg==",
-    "privateKey": "MHQCAQEEIPi7yWosBf7cNCTetGt7SkR6V3CCkjZS5fHfAVnRaO2BoAcGBSuBBAAKoUQDQgAEtltXb3iQh3NuhQhpxBOyVdmpcuLFUW9kvyy4j+mOkgOVVu5OtGXFRC4KZOPVudLvyO+/ExL1/YqFmz18Ja5Dtg==",
+    "csr": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJQ0ZqQ0NBYjBDQVFBd2RURUxNQWtHQTFVRUJoTUNVMEV4RmpBVUJnTlZCQXNNRFZKcGVXRmthQ0JDY21GdQpZMmd4SmpBa0JnTlZCQW9NSFUxaGVHbHRkVzBnVTNCbFpXUWdWR1ZqYUNCVGRYQndiSGtnVEZSRU1TWXdKQVlEClZRUUREQjFVVTFRdE9EZzJORE14TVRRMUxUTTVPVGs1T1RrNU9Ua3dNREF3TXpCV01CQUdCeXFHU000OUFnRUcKQlN1QkJBQUtBMElBQlB1NDF4UVVQQlJkNm4xdXpibmlFZzYyd2ttTTk2Tlp1RWFoZWZvek1MYVdORFR0MnZrRQp4cjFWWDVLOXo4V09RMkdIQ1o4YTBVRStnU1M5a0p6ZUpvYWdnZWd3Z2VVR0NTcUdTSWIzRFFFSkRqR0IxekNCCjFEQWlCZ2tyQmdFRUFZSTNGQUlFRlZSVFZGcEJWRU5CTFVOdlpHVXRVMmxuYm1sdVp6Q0JyUVlEVlIwUkJJR2wKTUlHaXBJR2ZNSUdjTVRzd09RWURWUVFFRERJeExWUlRWSHd5TFZSVFZId3pMV1ZrTWpKbU1XUTRMV1UyWVRJdApNVEV4T0MwNVlqVTRMV1E1WVRobU1URmxORFExWmpFZk1CMEdDZ21TSm9tVDhpeGtBUUVNRHpNNU9UazVPVGs1Ck9Ua3dNREF3TXpFTk1Bc0dBMVVFREF3RU1URXdNREVSTUE4R0ExVUVHZ3dJVWxKU1JESTVNamt4R2pBWUJnTlYKQkE4TUVWTjFjSEJzZVNCaFkzUnBkbWwwYVdWek1Bb0dDQ3FHU000OUJBTUNBMGNBTUVRQ0lEU0ZpS3ZrbEJBeQppRmNBeWtyOU9BdlRXMStLOUYzblhsd2JyTE1PK0dTQ0FpQXJicDZRcURpTjF5dld5VTFwUHpZQzRNbHBDR0NwCkFJYTgybXV1MjhDY1BRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUgUkVRVUVTVC0tLS0tCg==",
+    "privateKey": "MHQCAQEEIEFYBmc46NEaSB977Zybsp/ppM6miR2LbDWw8DzZjEofoAcGBSuBBAAKoUQDQgAE+7jXFBQ8FF3qfW7NueISDrbCSYz3o1m4RqF5+jMwtpY0NO3a+QTGvVVfkr3PxY5DYYcJnxrRQT6BJL2QnN4mhg==",
     "OTP": "123456",
     "ccsid_requestID": 1234567890123,
-    "ccsid_binarySecurityToken": "TUlJQ1BUQ0NBZU9nQXdJQkFnSUdBWkxnbkFESU1Bb0dDQ3FHU000OUJBTUNNQlV4RXpBUkJnTlZCQU1NQ21WSmJuWnZhV05wYm1jd0hoY05NalF4TURNeE1ETXlOakE0V2hjTk1qa3hNRE13TWpFd01EQXdXakIxTVNZd0pBWURWUVFEREIxVVUxUXRPRGcyTkRNeE1UUTFMVE01T1RrNU9UazVPVGt3TURBd016RVdNQlFHQTFVRUN3d05VbWw1WVdSb0lFSnlZVzVqYURFbU1DUUdBMVVFQ2d3ZFRXRjRhVzExYlNCVGNHVmxaQ0JVWldOb0lGTjFjSEJzZVNCTVZFUXhDekFKQmdOVkJBWVRBbE5CTUZZd0VBWUhLb1pJemowQ0FRWUZLNEVFQUFvRFFnQUV0bHRYYjNpUWgzTnVoUWhweEJPeVZkbXBjdUxGVVc5a3Z5eTRqK21Pa2dPVlZ1NU90R1hGUkM0S1pPUFZ1ZEx2eU8rL0V4TDEvWXFGbXoxOEphNUR0cU9Cd1RDQnZqQU1CZ05WSFJNQkFmOEVBakFBTUlHdEJnTlZIUkVFZ2FVd2dhS2tnWjh3Z1p3eE96QTVCZ05WQkFRTU1qRXRWRk5VZkRJdFZGTlVmRE10WldReU1tWXhaRGd0WlRaaE1pMHhNVEU0TFRsaU5UZ3RaRGxoT0dZeE1XVTBORFZtTVI4d0hRWUtDWkltaVpQeUxHUUJBUXdQTXprNU9UazVPVGs1T1RBd01EQXpNUTB3Q3dZRFZRUU1EQVF4TVRBd01SRXdEd1lEVlFRYURBaFNVbEpFTWpreU9URWFNQmdHQTFVRUR3d1JVM1Z3Y0d4NUlHRmpkR2wyYVhScFpYTXdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWdWV29FUTFoUWFPVTVISXAydXlYV2lWOS9WRmRsRHBQOGxlYkprQjdLa044Q0lRQ0tHZzFqMWNTcUVodVVuenB4RnVHWHpXeVJ0eDFLSDZLYUxnK1NRSnpZVFE9PQ==",
-    "ccsid_secret": "ZN/+4cmummahzSn69X4A8mhegSd+ImFBZpW2Vh4SGvk=",
+    "ccsid_binarySecurityToken": "TUlJQ1BUQ0NBZU9nQXdJQkFnSUdBWk10N3lsc01Bb0dDQ3FHU000OUJBTUNNQlV4RXpBUkJnTlZCQU1NQ21WSmJuWnZhV05wYm1jd0hoY05NalF4TVRFMU1ETTBOelF6V2hjTk1qa3hNVEUwTWpFd01EQXdXakIxTVFzd0NRWURWUVFHRXdKVFFURVdNQlFHQTFVRUN3d05VbWw1WVdSb0lFSnlZVzVqYURFbU1DUUdBMVVFQ2d3ZFRXRjRhVzExYlNCVGNHVmxaQ0JVWldOb0lGTjFjSEJzZVNCTVZFUXhKakFrQmdOVkJBTU1IVlJUVkMwNE9EWTBNekV4TkRVdE16azVPVGs1T1RrNU9UQXdNREF6TUZZd0VBWUhLb1pJemowQ0FRWUZLNEVFQUFvRFFnQUUrN2pYRkJROEZGM3FmVzdOdWVJU0RyYkNTWXozbzFtNFJxRjUrak13dHBZME5PM2ErUVRHdlZWZmtyM1B4WTVEWVljSm54clJRVDZCSkwyUW5ONG1ocU9Cd1RDQnZqQU1CZ05WSFJNQkFmOEVBakFBTUlHdEJnTlZIUkVFZ2FVd2dhS2tnWjh3Z1p3eE96QTVCZ05WQkFRTU1qRXRWRk5VZkRJdFZGTlVmRE10WldReU1tWXhaRGd0WlRaaE1pMHhNVEU0TFRsaU5UZ3RaRGxoT0dZeE1XVTBORFZtTVI4d0hRWUtDWkltaVpQeUxHUUJBUXdQTXprNU9UazVPVGs1T1RBd01EQXpNUTB3Q3dZRFZRUU1EQVF4TVRBd01SRXdEd1lEVlFRYURBaFNVbEpFTWpreU9URWFNQmdHQTFVRUR3d1JVM1Z3Y0d4NUlHRmpkR2wyYVhScFpYTXdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBSWFyNnhDd1dRaXVCLzlRMmxiYXdMZU00WE5nKzRGY3BremRrZzMwSXk4N0FpQmVuTjROcFFlVEFPdHRFS0tibWR4Vi9UYW1qemlMZEV4OTRBWWJLN3U1TkE9PQ==",
+    "ccsid_secret": "ykYE1tiZG7YUhzqjkCanSby3lQZRd1lPNzcVtmdUJiM=",
     "pcsid_requestID": 30368,
     "pcsid_binarySecurityToken": "TUlJRDNqQ0NBNFNnQXdJQkFnSVRFUUFBT0FQRjkwQWpzL3hjWHdBQkFBQTRBekFLQmdncWhrak9QUVFEQWpCaU1SVXdFd1lLQ1pJbWlaUHlMR1FCR1JZRmJHOWpZV3d4RXpBUkJnb0praWFKay9Jc1pBRVpGZ05uYjNZeEZ6QVZCZ29Ka2lhSmsvSXNaQUVaRmdkbGVIUm5ZWHAwTVJzd0dRWURWUVFERXhKUVVscEZTVTVXVDBsRFJWTkRRVFF0UTBFd0hoY05NalF3TVRFeE1Ea3hPVE13V2hjTk1qa3dNVEE1TURreE9UTXdXakIxTVFzd0NRWURWUVFHRXdKVFFURW1NQ1FHQTFVRUNoTWRUV0Y0YVcxMWJTQlRjR1ZsWkNCVVpXTm9JRk4xY0hCc2VTQk1WRVF4RmpBVUJnTlZCQXNURFZKcGVXRmthQ0JDY21GdVkyZ3hKakFrQmdOVkJBTVRIVlJUVkMwNE9EWTBNekV4TkRVdE16azVPVGs1T1RrNU9UQXdNREF6TUZZd0VBWUhLb1pJemowQ0FRWUZLNEVFQUFvRFFnQUVvV0NLYTBTYTlGSUVyVE92MHVBa0MxVklLWHhVOW5QcHgydmxmNHloTWVqeThjMDJYSmJsRHE3dFB5ZG84bXEwYWhPTW1Obzhnd25pN1h0MUtUOVVlS09DQWdjd2dnSURNSUd0QmdOVkhSRUVnYVV3Z2FLa2daOHdnWnd4T3pBNUJnTlZCQVFNTWpFdFZGTlVmREl0VkZOVWZETXRaV1F5TW1ZeFpEZ3RaVFpoTWkweE1URTRMVGxpTlRndFpEbGhPR1l4TVdVME5EVm1NUjh3SFFZS0NaSW1pWlB5TEdRQkFRd1BNems1T1RrNU9UazVPVEF3TURBek1RMHdDd1lEVlFRTURBUXhNVEF3TVJFd0R3WURWUVFhREFoU1VsSkVNamt5T1RFYU1CZ0dBMVVFRHd3UlUzVndjR3g1SUdGamRHbDJhWFJwWlhNd0hRWURWUjBPQkJZRUZFWCtZdm1tdG5Zb0RmOUJHYktvN29jVEtZSzFNQjhHQTFVZEl3UVlNQmFBRkp2S3FxTHRtcXdza0lGelZ2cFAyUHhUKzlObk1Ic0dDQ3NHQVFVRkJ3RUJCRzh3YlRCckJnZ3JCZ0VGQlFjd0FvWmZhSFIwY0RvdkwyRnBZVFF1ZW1GMFkyRXVaMjkyTG5OaEwwTmxjblJGYm5KdmJHd3ZVRkphUlVsdWRtOXBZMlZUUTBFMExtVjRkR2RoZW5RdVoyOTJMbXh2WTJGc1gxQlNXa1ZKVGxaUFNVTkZVME5CTkMxRFFTZ3hLUzVqY25Rd0RnWURWUjBQQVFIL0JBUURBZ2VBTUR3R0NTc0dBUVFCZ2pjVkJ3UXZNQzBHSlNzR0FRUUJnamNWQ0lHR3FCMkUwUHNTaHUyZEpJZk8reG5Ud0ZWbWgvcWxaWVhaaEQ0Q0FXUUNBUkl3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdNR0NDc0dBUVVGQndNQ01DY0dDU3NHQVFRQmdqY1ZDZ1FhTUJnd0NnWUlLd1lCQlFVSEF3TXdDZ1lJS3dZQkJRVUhBd0l3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUxFL2ljaG1uV1hDVUtVYmNhM3ljaThvcXdhTHZGZEhWalFydmVJOXVxQWJBaUE5aEM0TThqZ01CQURQU3ptZDJ1aVBKQTZnS1IzTEUwM1U3NWVxYkMvclhBPT0=",
     "pcsid_secret": "CkYsEXfV8c1gFHAtFWoZv73pGMvh/Qyo4LzKM2h/8Hg=",

Certificates/taxpayer.csr

@@ -1 +1 @@
-LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0NCk1JSUNHVENDQWI4Q0FRQXdkVEVtTUNRR0ExVUVBd3dkVkZOVUxUZzROalF6TVRFME5TMHpPVGs1T1RrNU9UazUNCk1EQXdNRE14RmpBVUJnTlZCQXNNRFZKcGVXRmthQ0JDY21GdVkyZ3hKakFrQmdOVkJBb01IVTFoZUdsdGRXMGcNClUzQmxaV1FnVkdWamFDQlRkWEJ3YkhrZ1RGUkVNUXN3Q1FZRFZRUUdFd0pUUVRCV01CQUdCeXFHU000OUFnRUcNCkJTdUJCQUFLQTBJQUJMWmJWMjk0a0lkemJvVUlhY1FUc2xYWnFYTGl4VkZ2Wkw4c3VJL3BqcElEbFZidVRyUmwNCnhVUXVDbVRqMWJuUzc4anZ2eE1TOWYyS2haczlmQ1d1UTdhZ2dlb3dnZWNHQ1NxR1NJYjNEUUVKRGpHQjJUQ0INCjFqQWtCZ2tyQmdFRUFZb2ZGQUlFRnhNVlZGTlVXa0ZVUTBFdFEyOWtaUzFUYVdkdWFXNW5NSUd0QmdOVkhSRUUNCmdhVXdnYUtrZ1o4d2dad3hPekE1QmdOVkJBUU1NakV0VkZOVWZESXRWRk5VZkRNdFpXUXlNbVl4WkRndFpUWmgNCk1pMHhNVEU0TFRsaU5UZ3RaRGxoT0dZeE1XVTBORFZtTVI4d0hRWUtDWkltaVpQeUxHUUJBUXdQTXprNU9UazUNCk9UazVPVEF3TURBek1RMHdDd1lEVlFRTURBUXhNVEF3TVJFd0R3WURWUVFhREFoU1VsSkVNamt5T1RFYU1CZ0cNCkExVUVEd3dSVTNWd2NHeDVJR0ZqZEdsMmFYUnBaWE13Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnVUVkSk1BUUoNCnQ0M1A0eWZ3djk0M0RUZWZTV3hyV0s2VW0zOGJTdDRMbjVFQ0lRRFEyUkIwUjdWMTJlRitCa1MvV3hXNWpxVlgNClJNRE5mRGlDY0Q0TmI3MkZBQT09DQotLS0tLUVORCBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0NCg==
+LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0NCk1JSUNHRENDQWI4Q0FRQXdkVEVtTUNRR0ExVUVBd3dkVkZOVUxUZzROalF6TVRFME5TMHpPVGs1T1RrNU9UazUNCk1EQXdNRE14RmpBVUJnTlZCQXNNRFZKcGVXRmthQ0JDY21GdVkyZ3hKakFrQmdOVkJBb01IVTFoZUdsdGRXMGcNClUzQmxaV1FnVkdWamFDQlRkWEJ3YkhrZ1RGUkVNUXN3Q1FZRFZRUUdFd0pUUVRCV01CQUdCeXFHU000OUFnRUcNCkJTdUJCQUFLQTBJQUJBbEFDRjJSSmpVTWk2TmtvZjVBb3JOZktjR2pzbVJWamhSYnVYQTdTdWx5SVVHZHNpMXENCndYcktWSElvZ016eXIwTVk1SEF2MU4yRWU0QXpXSDM2a3M2Z2dlb3dnZWNHQ1NxR1NJYjNEUUVKRGpHQjJUQ0INCjFqQWtCZ2tyQmdFRUFZb2ZGQUlFRnhNVlZGTlVXa0ZVUTBFdFEyOWtaUzFUYVdkdWFXNW5NSUd0QmdOVkhSRUUNCmdhVXdnYUtrZ1o4d2dad3hPekE1QmdOVkJBUU1NakV0VkZOVWZESXRWRk5VZkRNdFpXUXlNbVl4WkRndFpUWmgNCk1pMHhNVEU0TFRsaU5UZ3RaRGxoT0dZeE1XVTBORFZtTVI4d0hRWUtDWkltaVpQeUxHUUJBUXdQTXprNU9UazUNCk9UazVPVEF3TURBek1RMHdDd1lEVlFRTURBUXhNVEF3TVJFd0R3WURWUVFhREFoU1VsSkVNamt5T1RFYU1CZ0cNCkExVUVEd3dSVTNWd2NHeDVJR0ZqZEdsMmFYUnBaWE13Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnTWV5emMyMUENClFPeW8vMkFkOVhVR2Q4b1JoRHlqQlFwQVp5aWlOSVIrRkxjQ0lDa1VsTHhoODdXc01PUDdyRG1KQlNCY1pIcVoNCnB1ODA1aDYyTVRrb1IxeFQNCi0tLS0tRU5EIENFUlRJRklDQVRFIFJFUVVFU1QtLS0tLQ0K

approval_test

@@ -0,0 +1,90 @@
+import json
+import base64
+import time
+from utilities.api_helper import api_helper
+from utilities.invoice_helper import invoice_helper
+from utilities.einvoice_signer import einvoice_signer
+from lxml import etree 
+
+def main():
+    print("\n3: Sending Sample Documents\n")
+
+    cert_info = api_helper.load_json_from_file("certificates/certificateInfo.json")
+    xml_template_path = "templates\invoice.xml"
+
+    private_key = cert_info["privateKey"]
+    x509_certificate_content = base64.b64decode(cert_info["pcsid_binarySecurityToken"]).decode('utf-8')
+
+    parser = etree.XMLParser(remove_blank_text=False)
+    base_document = etree.parse(xml_template_path, parser)
+    document_types = [
+        ["STDSI", "388", "Standard Invoice", ""],
+        ["STDCN", "383", "Standard CreditNote", "InstructionNotes for Standard CreditNote"],
+        ["STDDN", "381", "Standard DebitNote", "InstructionNotes for Standard DebitNote"],
+        ["SIMSI", "388", "Simplified Invoice", ""],
+        ["SIMCN", "383", "Simplified CreditNote", "InstructionNotes for Simplified CreditNote"],
+        ["SIMDN", "381", "Simplified DebitNote", "InstructionNotes for Simplified DebitNote"]
+    ]
+
+    icv = 0
+    pih = "NWZlY2ViNjZmZmM4NmYzOGQ5NTI3ODZjNmQ2OTZjNzljMmRiYzIzOWRkNGU5MWI0NjcyOWQ3M2EyN2ZiNTdlOQ=="
+
+    for doc_type in document_types:
+        prefix, type_code, description, instruction_note = doc_type
+        icv += 1
+        is_simplified = prefix.startswith("SIM")
+
+        print(f"Processing {description}...\n")
+
+        new_doc = invoice_helper.modify_xml(
+            base_document,
+            f"{prefix}-0001",
+            "0200000" if is_simplified else "0100000",
+            type_code,
+            icv,
+            pih,
+            instruction_note
+        )
+        
+        json_payload = einvoice_signer.get_request_api(new_doc, x509_certificate_content, private_key)
+        
+        #print(json_payload)
+
+        
+        if einvoice_signer.is_simplified_invoice(new_doc):
+            response = api_helper.invoice_reporting(cert_info, json_payload)
+            request_type = "Reporting Api"
+            api_url = cert_info["reportingUrl"]
+        else:
+            response = api_helper.invoice_clearance(cert_info, json_payload)
+            request_type = "Clearance Api"
+            api_url = cert_info["clearanceUrl"]
+
+        clean_response = api_helper.clean_up_json(response, request_type, api_url)
+
+        json_decoded_response = json.loads(response)
+
+        if json_decoded_response:
+            print(f"Reporting api Server Response: \n{clean_response}")
+        else:
+            print(f"Invalid JSON Response: \n{response}")
+            exit(1)
+
+        if response is None:
+            print(f"Failed to process {description}: serverResult is null.\n")
+            exit(1)
+
+        status = json_decoded_response["reportingStatus"] if is_simplified else json_decoded_response["clearanceStatus"]
+
+        if "REPORTED" in status or "CLEARED" in status:
+            json_payload = json.loads(json_payload)
+            pih = json_payload["invoiceHash"]
+            print(f"\n{description} processed successfully\n\n")
+        else:
+            print(f"Failed to process {description}: status is {status}\n")
+            exit(1)
+
+        time.sleep(1) 
+
+if __name__ == "__main__":
+    main()

csrgenerator_test.py

@@ -0,0 +1,59 @@
+# main.py
+import base64
+import json
+import requests
+from utilities.csr_generator import CsrGenerator
+
+environment_type = "NonProduction"
+
+config = {
+    "csr.common.name": "TST-886431145-399999999900003",
+    "csr.serial.number": "1-TST|2-TST|3-ed22f1d8-e6a2-1118-9b58-d9a8f11e445f",
+    "csr.organization.identifier": "399999999900003",
+    "csr.organization.unit.name": "Riyadh Branch",
+    "csr.organization.name": "Maximum Speed Tech Supply LTD",
+    "csr.country.name": "SA",
+    "csr.invoice.type": "1100",
+    "csr.location.address": "RRRD2929",
+    "csr.industry.business.category": "Supply activities"
+}
+
+csr_gen = CsrGenerator(config, environment_type)
+private_key_content, csr_base64 = csr_gen.generate_csr()
+
+print("\nPrivate Key (without header and footer):")
+print(private_key_content)
+print("\nBase64 Encoded CSR:")
+print(csr_base64)
+
+# Test ZATCA Compliance for Generated CSR
+print("\n2. Get Compliance CSID")
+
+csr = csr_base64
+OTP = '123456'
+url = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/compliance"
+
+json_payload = json.dumps({
+    'csr': csr
+})
+
+headers = {
+    'accept': 'application/json',
+    'accept-language': 'en',
+    'OTP': OTP,
+    'Accept-Version': 'V2',
+    'Content-Type': 'application/json',
+}
+
+try:
+    response = requests.post(url, headers=headers, data=json_payload)
+
+    # Output server response
+    if response.status_code == 200:
+        print("\n\nServer Response: \n")
+        print(json.dumps(response.json(), indent=4))
+    else:
+        print("\n\nServer Response: \n" + response.text)
+
+except Exception as e:
+    print('Error: ' + str(e))

main.py

@@ -2,18 +2,34 @@
 import base64
 import time
 from utilities.api_helper import api_helper
-from utilities.csr_generator import generate_csr_and_privatekey
+from utilities.csr_generator_cli import generate_csr_and_privatekey
+from utilities.csr_generator import CsrGenerator
 from utilities.invoice_helper import invoice_helper
 from utilities.einvoice_signer import einvoice_signer
 from lxml import etree 
 
 def main():
+    
+    print("\nPYTHON CODE ONBOARDING\n")
 
     # Define Variable
     environment_type = 'NonProduction'
     OTP = '123456'  # For Simulation and Production Get OTP from fatooraPortal
 
-    config_file_path = 'certificates/csr-config-example-EN.properties'
+    csr_config = {
+    "csr.common.name": "TST-886431145-399999999900003",
+    "csr.serial.number": "1-TST|2-TST|3-ed22f1d8-e6a2-1118-9b58-d9a8f11e445f",
+    "csr.organization.identifier": "399999999900003",
+    "csr.organization.unit.name": "Riyadh Branch",
+    "csr.organization.name": "Maximum Speed Tech Supply LTD",
+    "csr.country.name": "SA",
+    "csr.invoice.type": "1100",
+    "csr.location.address": "RRRD2929",
+    "csr.industry.business.category": "Supply activities"
+    }
+
+    #config_file_path = 'certificates/csr-config-example-EN.properties'
+
     api_path = 'developer-portal'  # Default value
 
     # Determine API path based on environment type
@@ -49,7 +65,19 @@ def main():
     print("\n1. Generate CSR and PrivateKey\n")
 
     #Generate CSR & Private Key
-    cert_info = generate_csr_and_privatekey(cert_info, config_file_path)
+    cert_info = generate_csr_and_privatekey(cert_info, "certificates\csr-config-example-EN.properties")
+    exit
+    csr_gen = CsrGenerator(csr_config, environment_type)
+    private_key_content, csr_base64 = csr_gen.generate_csr()
+
+    print("\nPrivate Key (without header and footer):")
+    print(private_key_content)
+    print("\nBase64 Encoded CSR:")
+    print(csr_base64)
+
+    cert_info["csr"] = csr_base64
+    cert_info["privateKey"] = private_key_content
+
     api_helper.save_json_to_file("certificates/certificateInfo.json", cert_info)
 
     # 2. Get Compliance CSID
@@ -78,7 +106,7 @@ def main():
     print("\n3: Sending Sample Documents\n")
 
     cert_info = api_helper.load_json_from_file("certificates/certificateInfo.json")
-    xml_template_path = "Resources/Invoice.xml"
+    xml_template_path = "templates\invoice.xml"
 
     private_key = cert_info["privateKey"]
     x509_certificate_content = base64.b64decode(cert_info["ccsid_binarySecurityToken"]).decode('utf-8')
@@ -113,7 +141,7 @@ def main():
             pih,
             instruction_note
         )
-
+        
         json_payload = einvoice_signer.get_request_api(new_doc, x509_certificate_content, private_key)
 
         #print(json_payload)
@@ -146,7 +174,7 @@ def main():
             print(f"Failed to process {description}: status is {status}\n")
             exit(1)
 
-        time.sleep(0.2)  # 200 ms delay
+        #time.sleep(1)  
 
     # 4. Get Production CSID
 
@@ -167,10 +195,10 @@ def main():
 
         api_helper.save_json_to_file("certificates/certificateInfo.json", cert_info)
 
-        print(f"complianceCSID Server Response: \n{clean_response}")
+        print(f"Production CSID Server Response: \n{clean_response}")
 
     except json.JSONDecodeError:
-        print(f"complianceCSID Server Response: \n{clean_response}")
+        print(f"Production CSID Server Response: \n{clean_response}")
 
 
 if __name__ == "__main__":