fix production server ip problem

Author: dipudey

config/upay.php

@@ -2,6 +2,7 @@
 
 return [
     "sandbox"                => env("UPAY_SANDBOX", false),
+    "server_ip"              => env("UPAY_SERVER_IP", ""),
     "merchant_id"            => env("UPAY_MERCHANT_ID", ""),
     "merchant_key"           => env("UPAY_MERCHANT_KEY", ""),
     "merchant_code"          => env("UPAY_MERCHANT_CODE", ""),

src/Managers/BaseApi.php

@@ -4,18 +4,31 @@
 
 use Codeboxr\Upay\Exception\UpayException;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Http\Client\PendingRequest;
 
 class BaseApi
 {
+    /**
+     * @var string
+     */
     protected $token = "";
 
+    /**
+     * @var string
+     */
     protected $baseUrl = "";
 
     public function __construct()
     {
         $this->baseUrl = config('upay.sandbox') == true ? "https://uat-pg.upay.systems/" : "https://pg.upaysystem.com/";
     }
 
+    /**
+     * Set headers
+     *
+     * @return string[]
+     * @throws UpayException
+     */
     protected function headers()
     {
         return [
@@ -24,22 +37,41 @@ protected function headers()
         ];
     }
 
+    /**
+     * Token generate
+     *
+     * @return mixed|null
+     * @throws UpayException
+     */
     protected function getToken()
     {
         if (empty($this->token)) {
-            $response = Http::acceptJson()
-                ->post($this->baseUrl . "payment/merchant-auth/", [
-                    "merchant_id"  => config("upay.merchant_id"),
-                    "merchant_key" => config("upay.merchant_key"),
-                ]);
+            $response = $this->request()->post($this->baseUrl . "payment/merchant-auth/", [
+                "merchant_id"  => config("upay.merchant_id"),
+                "merchant_key" => config("upay.merchant_key"),
+            ]);
 
             $result = json_decode($response->body());
             if ($response->failed()) {
                 throw new UpayException($result->message, $response->status());
             }
+
             $this->token = optional($result->data)->token;
         }
 
         return $this->token;
     }
+
+    /**
+     * request
+     *
+     * @return PendingRequest
+     */
+    protected function request()
+    {
+        return Http::acceptJson()
+            ->withOptions([
+                'curl' => [CURLOPT_INTERFACE => config("upay.server_ip"), CURLOPT_IPRESOLVE => 1],
+            ]);
+    }
 }

src/Managers/Payment.php

@@ -2,8 +2,12 @@
 
 namespace Codeboxr\Upay\Managers;
 
+use Illuminate\Http\JsonResponse;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Http\RedirectResponse;
 use Codeboxr\Upay\Exception\UpayException;
+use Illuminate\Contracts\Foundation\Application;
 
 class Payment extends BaseApi
 {
@@ -15,12 +19,12 @@ class Payment extends BaseApi
      * @param string $txnId
      * @param string $date
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      * @throws UpayException
      */
     public function createPayment($amount, $invoiceId, $txnId, $date)
     {
-        $upayResponse = Http::withHeaders($this->headers())
+        $upayResponse = $this->request()
             ->post($this->baseUrl . "payment/merchant-payment-init/", [
                 "date"                      => $date,
                 "txn_id"                    => $txnId,
@@ -61,7 +65,7 @@ public function createPayment($amount, $invoiceId, $txnId, $date)
      * @param string $txnId
      * @param string $date
      *
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void
+     * @return Application|RedirectResponse|Redirector|void
      * @throws UpayException
      */
     public function executePayment($amount, $invoiceId, $txnId, $date)
@@ -75,13 +79,12 @@ public function executePayment($amount, $invoiceId, $txnId, $date)
      *
      * @param string $txnId
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      * @throws UpayException
      */
     public function queryPayment(string $txnId)
     {
-        $upayResponse = Http::withHeaders($this->headers())
-            ->get($this->baseUrl . "payment/single-payment-status/{$txnId}/");
+        $upayResponse = $this->request()->get($this->baseUrl . "payment/single-payment-status/{$txnId}/");
 
         $result = json_decode($upayResponse->body());
         if ($upayResponse->failed()) {
@@ -106,12 +109,12 @@ public function queryPayment(string $txnId)
      *
      * @param array $txnIds
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      * @throws UpayException
      */
     public function getMultiStatus(array $txnIds)
     {
-        $upayResponse = Http::withHeaders($this->headers())
+        $upayResponse = $this->request()
             ->post($this->baseUrl . "payment/bulk-payment-status/", [
                 "txn_id_list" => $txnIds
             ]);