Merge pull request #9 from IntaSend/dev

Improved wallet funding

Author: felixcheruiyot

src/Checkout.php

@@ -14,7 +14,7 @@ public function init($credentials)
         $this->credentials = $credentials;
     }
 
-    public function create($amount, $currency, Customer $customer, $host, ?string $redirect_url, ?string $api_ref, ?string $comment, ?string $method, $card_tarrif = "BUSINESS-PAYS", $mobile_tarrif = "BUSINESS-PAYS")
+    public function create($amount, $currency, Customer $customer, $host, ?string $redirect_url, ?string $api_ref, ?string $comment, ?string $method, $card_tarrif = "BUSINESS-PAYS", $mobile_tarrif = "BUSINESS-PAYS", $wallet_id=null)
     {
         $payload = [
             "public_key" => $this->credentials['publishable_key'],
@@ -35,10 +35,11 @@ public function create($amount, $currency, Customer $customer, $host, ?string $r
             "comment" => $comment,
             "card_tarrif" => $card_tarrif,
             "mobile_tarrif" => $mobile_tarrif,
-            "host" => $host
+            "host" => $host,
+            "wallet_id"=> $wallet_id
         ];
         $payload = json_encode($payload);
-        return $this->send_request('POST', '/checkout/', $payload);
+        return $this->send_request($method='POST', $url='/checkout/', $payload=$payload, $auth=false);
     }
 
     public function check_status($signature, $checkout_id, $invoice_id)

src/Collection.php

@@ -12,7 +12,7 @@ public function init($credentials)
         $this->credentials=$credentials;
     }
 
-    public function create($amount, $phone_number, $currency="KES", $method="MPESA_STK_PUSH", $api_ref="API Request", $name=null, $email=null)
+    public function create($amount, $phone_number, $currency="KES", $method="MPESA_STK_PUSH", $api_ref="API Request", $email=null, $wallet_id=null)
     {
         if ($method == 'MPESA_STK_PUSH') {
             $payload=[
@@ -21,9 +21,9 @@ public function create($amount, $phone_number, $currency="KES", $method="MPESA_S
                 'method'=> $method,
                 'amount'=> $amount,
                 'api_ref'=> $api_ref,
-                'name'=> $name,
                 'phone_number'=> $phone_number,
                 'email'=> $email,
+                'wallet_id'=>$wallet_id
             ];
             $payload=json_encode($payload);
             return $this->send_request('POST','/payment/mpesa-stk-push/',$payload);
@@ -34,8 +34,8 @@ public function create($amount, $phone_number, $currency="KES", $method="MPESA_S
     /**
      * Shortcut method to send MPesa STK Push request
      */
-    public function mpesa_stk_push($amount, $phone_number, $api_ref="API Request", $name=null, $email=null) {
-        return $this->create($amount, $phone_number, "KES", "MPESA_STK_PUSH", $api_ref, $name, $email);
+    public function mpesa_stk_push($amount, $phone_number, $api_ref="API Request", $email=null) {
+        return $this->create($amount, $phone_number, "KES", "MPESA_STK_PUSH", $api_ref, $email);
     }
 
     public function status($invoice_id)

src/Traits/BaseAPITrait.php

@@ -54,12 +54,12 @@ private function get_env_call($payload) {
         throw new \Exception('Invalid tokens provided. We could not identify the target enviroment for this request');
     }
 
-    private function send_request($method, $url, $payload = null)
+    private function send_request($method, $url, $payload = null, $auth= true)
     {
         $headers = [
             'Content-Type' => 'application/json'
         ];
-        if (isset($this->credentials['token'])) {
+        if (isset($this->credentials['token']) && $auth) {
             $headers = [
                 'Authorization' => 'Bearer ' . $this->credentials['token'],
                 'Content-Type' => 'application/json'

src/Transfer.php

@@ -40,33 +40,33 @@ public function status($tracking_id)
         return $this->send_request('POST','/send-money/status/', $payload);
     }
 
-    public function mpesa($currency, $transactions, $callback_url=null)
+    public function mpesa($currency, $transactions, $callback_url=null, $wallet_id=null)
     {
         $provider = "MPESA-B2C";
-        return $this->send_money($provider, $currency, $transactions, $callback_url=null);
+        return $this->send_money($provider, $currency, $transactions, $callback_url=$callback_url, $wallet_id=$wallet_id);
     }
 
-    public function mpesa_b2b($currency, $transactions, $callback_url=null)
+    public function mpesa_b2b($currency, $transactions, $callback_url=null, $wallet_id=null)
     {
         $provider = "MPESA-B2B";
-        return $this->send_money($provider, $currency, $transactions, $callback_url=null);
+        return $this->send_money($provider, $currency, $transactions, $callback_url=$callback_url, $wallet_id=$wallet_id);
     }
 
-    public function intasend($currency, $transactions, $callback_url=null)
+    public function intasend($currency, $transactions, $callback_url=null, $wallet_id=null)
     {
         $provider = "INTASEND";
-        return $this->send_money($provider, $currency, $transactions, $callback_url=null);
+        return $this->send_money($provider, $currency, $transactions, $callback_url=$callback_url, $wallet_id=$wallet_id);
     }
 
-    public function bank($currency, $transactions, $callback_url=null)
+    public function bank($currency, $transactions, $callback_url=null, $wallet_id=null)
     {
         $provider = "PESALINK";
-        return $this->send_money($provider, $currency, $transactions, $callback_url=null);
+        return $this->send_money($provider, $currency, $transactions, $callback_url=$callback_url, $wallet_id=$wallet_id);
     }
 
-    public function airtime($currency, $transactions, $callback_url=null)
+    public function airtime($currency, $transactions, $callback_url=null, $wallet_id=null)
     {
         $provider = "AIRTIME";
-        return $this->send_money($provider, $currency, $transactions, $callback_url=null);
+        return $this->send_money($provider, $currency, $transactions, $callback_url=$callback_url, $wallet_id=$wallet_id);
     }
 }

src/Wallet.php

@@ -52,11 +52,19 @@ public function intra_transfer( $origin_id, $destination_id, $amount, $narrative
         return $this->send_request('POST','/wallets/'.$origin_id.'/intra_transfer/',$payload);
     }
 
-    public function fund($phone_number, $email=null, $amount, $method="MPESA_STK_PUSH", $currency="KES", $api_ref="API Request", $name=null)
+    public function fund_mpesa_stk_push($wallet_id, $phone_number, $email=null, $amount, $api_ref="API Request")
     {
         $collection=new Collection();
         $collection->init($this->credentials);
-        return $collection->create($amount, $phone_number, $currency, $method, $api_ref, $name, $email);
+        return $collection->create($amount=$amount, $phone_number=$phone_number, $currency="KES", $method="MPESA_STK_PUSH", $api_ref=$api_ref, $email=null, $wallet_id=$wallet_id);
+    }
+
+    public function fund_checkout($wallet_id, $currency, $customer, $amount, $host, $redirect_url=null, $api_ref="API Request", $card_tarrif = "BUSINESS-PAYS", $mobile_tarrif = "BUSINESS-PAYS"){
+        $checkout = new Checkout();
+        $checkout->init($this->credentials);
+
+        return $checkout->create($amount = $amount, $currency = $currency, $customer = $customer, $host=$host, $redirect_url = $redirect_url, $api_ref = $api_ref, $comment = null, $method = null, $card_tarrif = "BUSINESS-PAYS", $mobile_tarrif = "BUSINESS-PAYS", $wallet_id=$wallet_id);
+
     }
 
 }