Merge branch 'dev'

arif98741 · Nov 11, 2020 · 6b6691a · 6b6691a
2 parents 5c06187 + f8b437e
commit 6b6691a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/RequestHandler.php b/src/RequestHandler.php
@@ -59,11 +59,9 @@ public function __construct(Base $base)
      */
     public function fire()
     {
-
-        $postUrl = $this->base->getBaseUrl() . $this->apiUrl;
-
-        $this->base->getMerchantID() .
-        "/" . $this->base->getInvoice();
+        $postUrl = $this->base->getBaseUrl() . $this->apiUrl
+            . $this->base->getMerchantID() .
+            "/" . $this->base->getInvoice();
 
         $sensitiveData = array(
             'merchantId' => $this->base->keyObject->getAppMerchantID(),
@@ -79,7 +77,6 @@ public function fire()
             'signature' => $this->helper->SignatureGenerate(json_encode($sensitiveData))
         );
 
-
         $resultData = $this->helper->HttpPostMethod($postUrl, $postData);
 
         if ($resultData === NULL) {

diff --git a/src/lib/Key.php b/src/lib/Key.php
@@ -18,8 +18,8 @@
 
 use Dotenv\Dotenv;
 
-define('NAGAD_ABSPATH', __DIR__ . '/../../../../../');
-$dotenv = Dotenv::create(NAGAD_ABSPATH);
+define('NAGAD_ABSPATH', __DIR__ . '/../../');
+$dotenv = Dotenv::createImmutable(NAGAD_ABSPATH);
 $dotenv->load();