express-pay 1.0.2 → 1.0.3

package/README.md

@@ -1,18 +1,20 @@
 Hello Everyone👋,
 
-- Not Officially Supported By Paynow
-
-I am pleased to introduce you to the Express Pay. This package is a part of "PAYNOW" and aims to simplify the process of implementing EXPRESS CHECKOUT PAYMENTS using ECOCASH.
+I am pleased to introduce you to the Paynow Integration Package. This package is a part of "PAYNOW" and aims to simplify the process of implementing EXPRESS CHECKOUT PAYMENTS using ECOCASH.
 
 
 - SETUP
 
-To set up the package, you simply need to run "npm i express-pay" and configure your keys from https://www.paynow.co.zw/home/businesshome in the .env file. Then, import the downloaded method into your file. Make sure to enter all required arguments for the function to work correctly and implement it as an asynchronous function.
+To set up the package, you simply need to run "npm i paynow_integration" and configure your keys from https://www.paynow.co.zw/home/businesshome in the .env file. Then, import the downloaded method into your file. Make sure to enter all required arguments for the function to work correctly and implement it as an asynchronous function.
 
 
 - USAGE EXAMPLE
 
-const pay = require("express-pay");
+.env VARIABLE NAMES
+PAYNOW_INTEGRATION_KEY=
+PAYNOW_INTEGRATION_ID=
+
+const pay = require("paynow_integration");
 
 REQUIRED ARGUMENTS
 - Payee Contact (String)

package/express_pay.js

@@ -1,5 +1,7 @@
 const {Paynow} = require("paynow");
 require("dotenv").config();
+const axios = require("axios");
+
 
 const ID = process.env.PAYNOW_INTEGRATION_ID;
 const KEY = process.env.PAYNOW_INTEGRATION_KEY;
@@ -9,13 +11,15 @@ module.exports = function Pay(Payee_Contact, Transaction_Reference,Transaction_A
 
   const payment = paynow.createPayment(`${Transaction_Reference}`, `${Customer_Email}`);
   payment.add(`${Product_Name}`, `${Transaction_Amount}`);
-  const maxTimeout = 20000; 
+  const maxTimeout = 30000; 
 
   return paynow.sendMobile(payment, `${Payee_Contact}`, "ecocash")
     .then(async function (response) {
       let initStatus = "Sent";
       const startTime = Date.now();
 
+      console.log("url",response.pollUrl);
+
       return new Promise((resolve, reject) => {
         
         const intervalId = setInterval(async () => {
@@ -30,6 +34,8 @@ module.exports = function Pay(Payee_Contact, Transaction_Reference,Transaction_A
                 resolve("Paid");
               } else if (result === "Cancelled") {
                 resolve("Cancelled");
+              }else if(result==="Sent"){
+                resolve("Not Authorised");
               } else {
                 resolve("Transaction failed")
               }
@@ -46,21 +52,52 @@ module.exports = function Pay(Payee_Contact, Transaction_Reference,Transaction_A
     });
 }
 
-async function getTransactionStatus(response){    
-  let requestOptions = {
-      method: 'GET',
-      redirect: 'follow'
-    };
-   try {
-      const response_1 = await fetch(`${response.pollUrl}`, requestOptions);
-      const result_1 = await response_1.text();
-      const resbody = `${result_1}`;
-      const start = resbody.indexOf('status=') + 'status='.length;
-      const end = resbody.indexOf('&', start);
-      const status = resbody.substring(start, end);
-      return status;
+//Deprecated Method
+// async function getTransactionStatus(response){    
+//   let requestOptions = {
+//       method: 'GET',
+//       redirect: 'follow'
+//     };
+//    try {
+//       const response_1 = await fetch(`${response.pollUrl}`, requestOptions);
+//       const result_1 = await response_1.text();
+//       const resbody = `${result_1}`;
+//       const start = resbody.indexOf('status=') + 'status='.length;
+//       const end = resbody.indexOf('&', start);
+//       const status = resbody.substring(start, end);
+//       return status;
+
+//   } catch (error) {
+//       return console.log('error', error);
+//   }
+
+// }
+
+async function getTransactionStatus(response){  
+  
+
+  try {
+
+   
+    
+
+    const response_1 = await axios.get(`${response.pollUrl}`);
+   
+    const resbody = response_1.data;
+
+
+    const start = resbody.indexOf('status=') + 'status='.length;
+
+
+    const end = resbody.indexOf('&', start);
+    
+
+    const status = resbody.substring(start, end);
+
+    
+
+    return status;
   } catch (error) {
-      return console.log('error', error);
+    return console.log('error', error);
   }
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-pay",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Node Package To Simplify Express Payments Via Ecocash",
   "main": "express_pay.js",
   "bin": "express_pay.js",
@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/Luke-Tembani/Express-Pay#readme",
   "dependencies": {
+    "axios": "^1.4.0",
     "dotenv": "^16.0.3",
     "paynow": "^1.0.9"
   }