Changeset 1592857

Timestamp:

02/09/2017 11:38:22 PM (8 years ago)

Author:

instamojo

Message:

• Updated supported WordPress version to 4.7.2
• Fixed issue related to checking WooCommerce and cURL before plugin activation.

Location:

woo-instamojo

Files:

• README.md (modified) (1 diff)
• tags/1.0.6 (added)
• tags/1.0.6/index.php (added)
• tags/1.0.6/instamojo-settings.php (added)
• tags/1.0.6/lib (added)
• tags/1.0.6/lib/CurlException.php (added)
• tags/1.0.6/lib/Instamojo.php (added)
• tags/1.0.6/lib/ValidationException.php (added)
• tags/1.0.6/lib/cacert.pem (added)
• tags/1.0.6/lib/cookie.txt (added)
• tags/1.0.6/lib/curl.php (added)
• tags/1.0.6/lib/index.php (added)
• tags/1.0.6/payment_confirm.php (added)
• tags/1.0.6/readme.txt (added)
• tags/1.0.6/woo-instamojo.php (added)
• trunk/lib/curl.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/woo-instamojo.php (modified) (3 diffs)

woo-instamojo/README.md

@@ -60 +60 @@
 Changelog
 ---------
+
+**1.0.6**
+
+* Updated supported WordPress version to 4.7.2
+* Fixed issue related to checking WooCommerce and cURL before plugin activation.
 
 **1.0.5**

woo-instamojo/trunk/lib/curl.php

@@ -20 +20 @@
     function __construct()
     {
+         if (!function_exists('curl_init')) {
+            throw new Exception('<b>Instamojo</b> <a href="https://www.digitalocean.com/community/questions/curl-is-not-installed-in-your-php-installation">plugin requires <b>cURL</b> to be installed first</a>');
+            
+         }
          $this->ch = curl_init();
          $this->cookie_file = dirname(__FILE__)."/cookie.txt";

woo-instamojo/trunk/readme.txt

@@ -4 +4 @@
 Tags: commerce, e-commerce, ecommerce, online store, sell digital downloads, sell online, shop, store, wordpress ecommerce, WordPress shopping cart, sell event tickets, sell subscriptions, sell memberships, sell physical goods, payments, easy payments, payments button, widget
 Requires at least: 3.3
-Tested up to: 4.7.1
-Stable tag: 1.0.5
+Tested up to: 4.7.2
+Stable tag: 1.0.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -53 +53 @@
 
 == Changelog ==
+
+= 1.0.6 =
+
+* Updated supported WordPress version to 4.7.2
+* Fixed issue related to checking WooCommerce and cURL before plugin activation.
 
 = 1.0.5 =

woo-instamojo/trunk/woo-instamojo.php

@@ -4 +4 @@
 Plugin URI: http://www.instamojo.com
 Description: Instamojo Payment Gateway for WooCommerce. Instamojo lets you collect payments instantly.
-Version: 1.0.5
+Version: 1.0.6
 Author: instamojo
 Email: [email protected]
@@ -16 +16 @@
 }
 
-$activate = TRUE;
-if (!in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins')))){
-    $activate = FALSE;
-    $message = '<b>Instamojo</b> Plugin requires <a href="https://wordpress.org/plugins/woocommerce/">WooCommerce</a> to be Installed First!';
-}
-else if (!function_exists('curl_init')) {
-    $activate = FALSE;
-    $message = '<b>Instamojo</b> <a href="https://www.digitalocean.com/community/questions/curl-is-not-installed-in-your-php-installation">Plugin requires <b>cURL</b> to be installed first</a>';
-}
-if(!$activate){
-    deactivate_plugins(basename(__FILE__)); 
-    exit($message);
-}
-
-
 // Add settings link on plugin page
 function your_plugin_settings_link($links) { 
@@ -54 +39 @@
 add_filter( 'query_vars', 'add_query_vars_filter' );
 
+function instamojo_activation_hook(){
+    
+    $condition1 = !class_exists( 'WC_Payment_Gateway' );
+    $condition2 = !in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins')));
+
+    if ($condition1 or $condition2) {
+      $message = '<b>Instamojo</b> Plugin requires <a href="https://wordpress.org/plugins/woocommerce/">WooCommerce</a> to be installed and activated first!';
+      echo $message;
+      @trigger_error(__($message, 'ap'), E_USER_ERROR);
+    }
+    else if (!function_exists('curl_init')) {
+        $message = '<b>Instamojo</b> <a href="https://www.digitalocean.com/community/questions/curl-is-not-installed-in-your-php-installation">Plugin requires <b>cURL</b> to be installed first</a>';
+        echo $message;
+        @trigger_error(__($message, 'ap'), E_USER_ERROR);
+    }
+
+}
+register_activation_hook(__FILE__, 'instamojo_activation_hook');
+
 # initialize your Gateway Class
 add_action( 'plugins_loaded', 'init_instamojo_payment_gateway' );
 function init_instamojo_payment_gateway()
 {
-    include_once "payment_gateway.php";
+    if (!class_exists('WC_Payment_Gateway')){
+        return;   
+    }
+        
+    Class WP_Gateway_Instamojo extends WC_Payment_Gateway{
+
+      private $testmode;
+      private $client_id;
+      private $client_secret;
+      
+      
+      public function __construct()
+      {
+        $this->id = "instamojo";
+        $this->icon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAeZJREFUOI19krtuE0EUhv9zdmd3LYSECEi20WJBBVTAM8RGioREFwrAtNBQ2E4DNU3WFNSQyJYtpUsaF7kg3gAQUPACdoQgEsQ49to7cyiIE+2uzUinmTPfN/9cKFfZvkfEzwgYYNYgUpGYyveg9HVmGwAuVXY3OHNmWSYhBJLgGaInQ2PM7f36nW9JAaPTetkNivfN8KgBywKMjpXoCcCcIeZP2ZXd62mB0BV02ofd+uJjGYVNUl46pzEgYpcFH5ISBmEMzz2LTvtH91WxLGHYmCkRA2L2khIGAGgNWNYFdFo//yUZNUm585J4LPiYq2xfOxWcSOyF0yTjBjkZgO14EYNtxyXmL/nazk07tsNJkvZBd2lxIV/d+0UkN4SgE6cBAbaAV+KC45jwvPN41yjzgXorF8e3mEgnlwmEyYgXFxAByga4/8BvXv0jOflMcIHE3wAIbCmYcPDcTsHOUbmwVhhE2WgL2gCShsl2oMN+tbdaqvPxHGDbgBo98t8UfuscNiHzYAUzCWu91VJ9+goEpQA1fFhY9/smjy0x+j/wuNYLisF0lkHkQA6f+muX+1FWNiHzYCcFT8PDf/J+Wc7xhuhoxoUBZCmYKKxOY8d6+erOXYBbINEEmBQNOEbkxX5Qej2jh79RaeQT2vwcPgAAAABJRU5ErkJggg==";
+        $this->has_fields = false;
+        $this->method_title = "Instamojo";
+        $this->method_description = "Online Payment Gateway";
+      
+        $this->init_form_fields();
+        $this->init_settings();
+        
+        $this->title          = $this->get_option( 'title' );
+        $this->description    = $this->get_option( 'description' );
+        $this->testmode       = 'yes' === $this->get_option( 'testmode', 'no' );
+        $this->client_id      = $this->get_option( 'client_id' );
+        $this->client_secret  = $this->get_option( 'client_secret' );
+        add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+      }
+      
+      public function init_form_fields()
+      {
+        $this->form_fields = include("instamojo-settings.php");   
+      }
+      
+      public function process_payment($orderId)
+      {
+        include_once "lib/Instamojo.php";
+        $this->log("Creating Instamojo Order for order id: $orderId");
+        $this->log("Client ID: $this->client_id | Client Secret: $this->client_secret  | Testmode: $this->testmode ");
+        
+        $order = new WC_Order( $orderId );
+        try{
+          
+          $api = new Instamojo($this->client_id, $this->client_secret, $this->testmode);
+          
+          $api_data['name'] = substr(trim((html_entity_decode( $order->billing_first_name ." ".$order->billing_last_name, ENT_QUOTES, 'UTF-8'))), 0, 20);
+          $api_data['email']      = substr($order->billing_email, 0, 75);
+          $api_data['phone']      = substr(html_entity_decode($order->billing_phone, ENT_QUOTES, 'UTF-8'), 0, 20);
+          $api_data['amount']     = $this->get_order_total();
+          $api_data['currency']     = "INR";
+          $api_data['redirect_url']   = get_site_url();
+          $api_data['transaction_id'] = time()."-". $orderId;
+          $this->log("Data sent for creating order ".print_r($api_data,true));
+          
+          $response = $api->createOrderPayment($api_data);
+          $this->log("Response from server on creating order".print_r($response,true));
+          if(isset($response->order))
+          {
+            $url = $response->payment_options->payment_url;
+            WC()->session->set( 'payment_request_id',  $response->order->id); 
+            // die( json_encode(array("result"=>"success", "redirect"=>$url)));
+            return array(
+                        'result' => 'success', 
+                        'redirect' => $url
+                    );
+          }
+        
+        }catch(CurlException $e){
+          $this->log("An error occurred on line " . $e->getLine() . " with message " .  $e->getMessage());
+          $this->log("Traceback: " . (string)$e);
+          $json = array(
+            "result"=>"failure",
+            "messages"=>"<ul class=\"woocommerce-error\">\n\t\t\t<li>" . $e->getMessage() . "</li>\n\t</ul>\n",
+            "refresh"=>"false",
+            "reload"=>"false"
+            );
+            
+          die(json_encode($json));
+        }catch(ValidationException $e){
+          $this->log("Validation Exception Occured with response ".print_r($e->getResponse(), true));
+          $errors_html = "<ul class=\"woocommerce-error\">\n\t\t\t";
+          foreach( $e->getErrors() as $error)
+          {
+            $errors_html .="<li>".$error."</li>";
+            
+          }
+          $errors_html .= "</ul>";
+          $json = array(
+            "result"=>"failure",
+            "messages"=>$errors_html,
+            "refresh"=>"false",
+            "reload"=>"false"
+            );
+          die(json_encode($json));
+        }
+        catch(Exception $e){
+          
+          $this->log("An error occurred on line " . $e->getLine() . " with message " .  $e->getMessage());
+          $this->log("Traceback: " . $e->getTraceAsString());
+          $json = array(
+            "result"=>"failure",
+            "messages"=>"<ul class=\"woocommerce-error\">\n\t\t\t<li>".$e->getMessage()."</li>\n\t</ul>\n",
+            "refresh"=>"false",
+            "reload"=>"false"
+            );
+          die(json_encode($json));
+          
+        }
+      }
+      
+      public static function log( $message ) 
+      {
+        insta_log($message);
+      }
+      
+    }
+
 }