Changeset 2001946

Timestamp:

12/26/2018 11:34:54 PM (7 years ago)

Author:

felipemontoya

Message:

Adding version 1.6.0 to the trunk

Location:

edunext-openedx-integrator/trunk

Files:

• includes/class-wp-edunext-eox-core-api.php (modified) (4 diffs)
• includes/class-wp-edunext-marketing-site-settings.php (modified) (1 diff)
• includes/class-wp-edunext-marketing-site.php (modified) (1 diff)
• includes/templates/exoapi_settings_custom_html.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• wp-edunext-marketing-site.php (modified) (2 diffs)

edunext-openedx-integrator/trunk/includes/class-wp-edunext-eox-core-api.php

@@ -64 +64 @@
             add_action('eoxapi_after_settings_page_html', array($this, 'eoxapi_settings_custom_html'));
             add_action('wp_ajax_save_users_ajax', array($this, 'save_users_ajax'));
+            add_action('wp_ajax_get_users_ajax', array($this, 'get_users_ajax'));
             add_action('wp_ajax_get_userinfo_ajax', array($this, 'get_userinfo_ajax'));
             add_action('wp_ajax_save_enrollments_ajax', array($this, 'save_enrollments_ajax'));
@@ -92 +93 @@
                     'default' => '',
                     'placeholder' => ''
+                ) ,
+                array(
+                    'id' => 'eox_client_wc_field_mappings',
+                    'label' => __('User fields mappings', 'wp-edunext-marketing-site') ,
+                    'description' => __('Mapping of user fields for pre-filling, from Open-edX (extended_profile) to Woocommerce', 'wp-edunext-marketing-site', 'wp-edunext-marketing-site') ,
+                    'type' => 'text',
+                    'default' => '',
+                    'placeholder' => '{"wc_example": "example"}'
                 )
             )
@@ -145 +154 @@
             }
         }
+        $this->show_notices();
+        wp_die();
+    }
+
+    /**
+     * Called with AJAX function to POST to users API
+     */
+    public function get_users_ajax() {
+        $new_users = $this->handle_ajax_json_input($_POST['users']);
+        $users_info = [];
+        if ($new_users) {
+            foreach ($new_users as $user) {
+                $users_info[] = $this->get_user_info($user);
+            }
+        }
+        $this->add_notice('user-info', '<pre>' . json_encode($users_info, JSON_PRETTY_PRINT) . '</pre>');
         $this->show_notices();
         wp_die();
@@ -244 +269 @@
         $success_message = 'User creation success!';
         return $this->api_call($api_url, $data, $ref, $success_message);
+    }
+
+    /**
+     * Function to execute the API calls required to get an existing edxapp user
+     */
+    public function get_user_info($args) {
+        $args = (array)$args;
+        $api_url = self::PATH_USER_API;
+        $ref = $args['email'] ?: $args['username'] ?: '';
+        $success_message = 'User fetching success!';
+        $api_url .= '?' . http_build_query($args);
+        return $this->api_call($api_url, NULL, $ref, $success_message);
     }
 

edunext-openedx-integrator/trunk/includes/class-wp-edunext-marketing-site-settings.php

@@ -155 +155 @@
                     'default'       => '',
                     'placeholder'   => __( '', 'wp-edunext-marketing-site' )
+                ),
+                array(
+                    'id'                => 'enable_woocommerce_integration',
+                    'label'             => __( 'Enable Eox-core Woocommerce integrations' , 'wp-edunext-marketing-site' ),
+                    'description'       => __( 'Features: Checkout pre-filling', 'wp-edunext-marketing-site' ),
+                    'type'              => 'checkbox',
+                    'default'           => false,
+                    'placeholder'       => __( '', 'wp-edunext-marketing-site' ),
+                    'advanced_setting'  => true
                 ),
                 array(

edunext-openedx-integrator/trunk/includes/class-wp-edunext-marketing-site.php

@@ -117 +117 @@
         // Add attributes for menus items
         add_action( 'init', array( 'Edx_Walker_Nav_Menu_Edit', 'setup' ) );
+
+        if ( get_option('wpt_enable_woocommerce_integration') ) {
+            $this->woocommerce = new WP_eduNEXT_Woocommerce_Integration();
+        }
 
         if ( is_admin() ) {

edunext-openedx-integrator/trunk/includes/templates/exoapi_settings_custom_html.php

@@ -52 +52 @@
         <option value="exoapi-add-new-users" selected>Users</option>
         <option value="exoapi-add-new-enrollments">Enrollments</option>
+        <option value="exoapi-get-users">Get users info</option>
     </select>
-    
+    <div class="exoapi-get-users">
+        <h2>Get Open edx users info</h2>
+        <p>
+            Write an array of users as JSON array:
+        </p>
+        <textarea name="eox-api-get-users" id="eox-api-get-users" cols="70" rows="10">
+[{
+    "username": "honor"
+}]</textarea>
+        <button class="button-secondary get-users-button">Execute API call</button>
+    </div>
     <div class="exoapi-add-new-users">
         <h2>Add new Open edx users</h2>
@@ -109 +120 @@
     });
 
+    $('.get-users-button').click(function (e) {
+        var data = {users: $('#eox-api-get-users').val()};
+        callAction('get_users_ajax', data);
+        e.stopPropagation();
+        return false;
+    });
+
     $('.save-enrollments-button').click(function (e) {
         var data = {enrollments: $('#eox-api-new-enrollments').val()};

edunext-openedx-integrator/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9
 Tested up to: 4.9.5
-Stable tag: 1.5.0
+Stable tag: 1.6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

edunext-openedx-integrator/trunk/wp-edunext-marketing-site.php

@@ -23 +23 @@
 require_once( 'includes/class-wp-edunext-marketing-site-settings.php' );
 require_once( 'includes/class-wp-edunext-eox-core-api.php' );
+require_once( 'includes/class-wp-edunext-eox-woocommerce-integration.php' );
 
 // Load plugin libraries
@@ -63 +64 @@
 
 WP_EoxCoreApi();
-