Changeset 2426245

Timestamp:

11/26/2020 05:07:05 AM (5 years ago)

Author:

felipemontoya

Message:

Update trunk to version 2.6.1

Location:

edunext-openedx-integrator/trunk

Files:

• assets/js/commons.min.js (modified) (2 diffs)
• assets/js/wcWorkflow.min.js (modified) (4 diffs)
• assets/screenshot-1.jpg (modified) (previous)
• assets/screenshot-2.jpg (modified) (previous)
• assets/screenshot-3.jpg (modified) (previous)
• assets/screenshot-4.jpg (modified) (previous)
• assets/screenshot-5.jpg (modified) (previous)
• assets/screenshot-6.jpg (modified) (previous)
• assets/screenshot-7.jpg (modified) (previous)
• includes/class-wp-edunext-marketing-site-settings.php (modified) (3 diffs)
• includes/class-wp-edunext-marketing-site.php (modified) (1 diff)
• includes/lib/class-wp-edunext-marketing-site-menu-items-attributes.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• wp-edunext-marketing-site.php (modified) (2 diffs)

edunext-openedx-integrator/trunk/assets/js/commons.min.js

@@ -4 +4 @@
 ENEXT.OPENEDX_DOMAIN = ENEXT_SRV.lms_base_url;
 ENEXT.WP_LOGOUT_URL = ENEXT_SRV.wp_logout_url;
+ENEXT.WP_USER_LOGGEDIN = Boolean(ENEXT_SRV.wp_user_logged_in);
 ENEXT.ENROLLMENT_API_LOCATION = ENEXT.OPENEDX_DOMAIN + ENEXT_SRV.enrollment_api_location;
 
@@ -46 +47 @@
 
 ENEXT.assertSessionSynchrony = function() {
-    if (!ENEXT.amILoggedIn()) {
+    if (!ENEXT.amILoggedIn() && ENEXT.WP_USER_LOGGEDIN) {
         jQuery.ajax({
             url: ENEXT.WP_LOGOUT_URL

edunext-openedx-integrator/trunk/assets/js/wcWorkflow.min.js

@@ -1 +1 @@
 'use strict';
 window.ENEXT = window.ENEXT || {};
+window.ENEXT_SRV = window.ENEXT_SRV || {};
+window.ENEXT_SC = window.ENEXT_SC || {};
 
-ENEXT.OPENEDX_DOMAIN = ENEXT_SRV.lms_base_url;
+ENEXT.OPENEDX_DOMAIN = ENEXT_SRV.lms_base_url || ENEXT_SC.lms_base_url;
 ENEXT.LOGIN_NEXT = ENEXT_SRV.lms_wp_return_path;
 ENEXT.LOGIN_PATH = ENEXT_SRV.lms_login_path;
-ENEXT.RUN_FUNCTIONS = ENEXT_SRV.run_functions;
+ENEXT.RUN_FUNCTIONS = [].concat(ENEXT_SRV.run_functions).concat(ENEXT_SC.run_shortcode);
+ENEXT.PREFILL_MAPPINGS = ENEXT_SRV.prefill_mappings;
 
 ENEXT.CACHE = {};
 
 
-ENEXT.callMeAtOpenEdx = function() {
-    if ('api_user_v1_me' in ENEXT.CACHE) {
-        return ENEXT.CACHE['api_user_v1_me'];
+ENEXT.callApiAtOpenEdx = function(endpoint) {
+    if ('api_user_v1_' + endpoint in ENEXT.CACHE) {
+        return ENEXT.CACHE['api_user_v1_' + endpoint];
     }
-    ENEXT.CACHE['api_user_v1_me'] = jQuery.ajax({
-        url: ENEXT.OPENEDX_DOMAIN + "/api/user/v1/me",
+    ENEXT.CACHE['api_user_v1_' + endpoint] = jQuery.ajax({
+        url: ENEXT.OPENEDX_DOMAIN + "/api/user/v1/" + endpoint,
         method: "GET",
         xhrFields: {
@@ -21 +24 @@
         }
     })
-    return ENEXT.CACHE['api_user_v1_me'];
+    return ENEXT.CACHE['api_user_v1_' + endpoint];
 }
 
-ENEXT.assertOpenEdxLoggedIn = function() {
-    ENEXT.callMeAtOpenEdx().fail(function(xhr) {
+ENEXT.assertOpenEdxLoggedIn = function(includeData) {
+    var endpoint = 'me';
+    if (includeData) {
+        var endpoint = 'accounts';
+    }
+
+    ENEXT.callApiAtOpenEdx(endpoint).fail(function(xhr) {
         if (xhr.status === 401) {
             // Not logged in, redirecting
@@ -41 +49 @@
 };
 
-ENEXT.addUsernameToCheckout = function() {
-    ENEXT.callMeAtOpenEdx().success(function(data) {
-        if ('username' in data) {
-            var apiUsername = data.username;
-            jQuery('form[name="checkout"]').append('<input type="hidden" name="wpt_oer_username" value="' + apiUsername + '">');
+ENEXT.assertOpenEdxLoggedInWithData = function(includeData) {
+    ENEXT.assertOpenEdxLoggedIn(true);
+}
+
+ENEXT.prefillVisibleFields = function() {
+    ENEXT.callApiAtOpenEdx('accounts').success(function(dataArray) {
+        var data = dataArray[0];
+        var mappings = JSON.parse(ENEXT.PREFILL_MAPPINGS);
+        data['extended_profile'].map(( ({field_name, field_value}) => data[field_name] = field_value));
+
+        for (let prop in mappings) {
+            jQuery('form[name="checkout"] #' + prop).val(data[mappings[prop]]);
         }
-        else {
-            console.warn("The openedx integrator plugin could not find the username to insert to the checkout form.");
+    });
+}
+
+ENEXT.replaceShortcodeFields = function() {
+    ENEXT.callApiAtOpenEdx('accounts').success(function(dataArray) {
+        var data = dataArray[0];
+        jQuery('.js-order-info-sc').each(function(index, item){
+            var $item = jQuery(item);
+            if ($item.data('field') in data) {
+                $item.html(data[$item.data('field')]);
+            }
+        });
+    });
+}
+
+ENEXT.addInfoToCheckout = function() {
+    ENEXT.callApiAtOpenEdx('accounts').success(function(dataArray) {
+        var data = dataArray[0];
+        var fields = ['username', 'name', 'email'];
+        for (var i = fields.length - 1; i >= 0; i--) {
+            if (fields[i] in data) {
+                jQuery('form[name="checkout"]').append('<input type="hidden" name="wpt_oer_' + fields[i] + '" value="' + data[fields[i]] + '">');
+            }
+            else {
+                console.warn("The openedx integrator plugin could not find the " + fields[i] + " to insert to the checkout form.");
+            }
         }
     });
@@ -55 +94 @@
 // Run the defined functions
 for (var i = 0; i < ENEXT.RUN_FUNCTIONS.length; i++) {
-    ENEXT[ENEXT.RUN_FUNCTIONS[i]]();
+    if (ENEXT.RUN_FUNCTIONS[i] in ENEXT) {
+        ENEXT[ENEXT.RUN_FUNCTIONS[i]]();
+    }
 }

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

@@ -204 +204 @@
                 array(
                     'id'               => 'enable_session_existence_sync',
-                    'label'            => __( 'Log out of WP when openedx is not logged in', 'wp-edunext-marketing-site' ),
-                    'description'      => __( 'This will force the users to login on openedx to mantain a valid session on WordPress.', 'wp-edunext-marketing-site' ),
+                    'label'            => __( 'Log out of WP when Open edX is not logged in', 'wp-edunext-marketing-site' ),
+                    'description'      => __( 'This will force the users to login on Open edX to mantain a valid session on WordPress.', 'wp-edunext-marketing-site' ),
                     'type'             => 'checkbox',
                     'default'          => false,
@@ -661 +661 @@
                 array(
                     'id'               => 'enable_wc_checkout_loggedin_intervention',
-                    'label'            => __( 'Get username information from openedx into the checkout page', 'wp-edunext-marketing-site' ),
+                    'label'            => __( 'Get username information from Open edX into the checkout page', 'wp-edunext-marketing-site' ),
                     'description'      => __( 'Make sure that users have a valid session when they access the woocommerce checkout form. The username for said session is then used for the order fulfillment.', 'wp-edunext-marketing-site' ),
                     'type'             => 'checkbox',
@@ -675 +675 @@
                     'default'     => '/checkout',
                     'placeholder' => '/cart',
+                ),
+                array(
+                    'id'               => 'enable_wc_checkout_client_prefill',
+                    'label'            => __( 'Enable Checkout client-side fields pre-filling', 'wp-edunext-marketing-site' ),
+                    'description'      => __( 'Enables the pre-filling of the checkout form fields by the calls to the Open edX accounts API. Requires the users to have a valid Open edX session.', 'wp-edunext-marketing-site' ),
+                    'type'             => 'checkbox',
+                    'default'          => false,
+                    'placeholder'      => '',
+                    'advanced_setting' => true,
+                ),
+                array(
+                    'id'               => 'enable_wc_checkout_client_prefill_mappings',
+                    'label'            => __( 'User Profile fields mapping for client-side pre-filling', 'wp-edunext-marketing-site' ),
+                    'description'      => __( 'Mapping of user fields for pre-filling, from the accounts api in Open edX to the to Woocommerce chekout form fields.', 'wp-edunext-marketing-site', 'wp-edunext-marketing-site' ),
+                    'type'             => 'textarea',
+                    'default'          => '{"billing_email": "email" , "billing_first_name": "name"}',
+                    'placeholder'      => '{"billing_email": "email" , "billing_first_name": "name", ...}',
+                    'advanced_setting' => true,
                 ),
             ),

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

@@ -280 +280 @@
             'user_enrollment_url'        => get_option( 'wpt_user_enrollment_url' ),
             'course_has_not_started_url' => get_option( 'wpt_course_has_not_started_url' ),
+            'wp_user_logged_in'          => is_user_logged_in(),
             'wp_logout_url'              => false,
         );

edunext-openedx-integrator/trunk/includes/lib/class-wp-edunext-marketing-site-menu-items-attributes.php

@@ -15 +15 @@
         $item_output = '';
         parent::start_el( $item_output, $item, $depth, $args );
+
         // Inject $new_fields before: <div class="menu-item-actions description-wide submitbox">.
-        if ( $new_fields = Edx_Nav_Menu_Item_Custom_Fields::get_field( $item, $depth, $args ) ) {
+        $new_fields = Edx_Nav_Menu_Item_Custom_Fields::get_field( $item, $depth, $args );
+        if ( $new_fields ) {
             $label       = '<p class="edx-hide-if">Hide if Open edX user is:</p>';
             $new_html    = '<div class="clear">' . $label . $new_fields . '</div>';

edunext-openedx-integrator/trunk/readme.txt

@@ -3 +3 @@
 Tags: wordpress, Open edX, LMS
 Requires at least: 4.0
-Tested up to: 5.2
-Stable tag: 2.1.0
+Tested up to: 5.5.3
+Stable tag: 2.6.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -131 +131 @@
     [edunext_enroll_button course_id="course-v1:organization+coursenumber+courserun" label_enroll="Enroll in the course now"]
 
-== Screenshots ==       
-1. General Settings     
-2. Configuration of the User Menu       
-3. Addition of the User Menu        
-4. Configuration of the course buttons      
-5. Addition of course buttons       
-6. Woocommerce integration      
+== Screenshots ==
+1. General Settings
+2. Configuration of the User Menu
+3. Addition of the User Menu
+4. Configuration of the course buttons
+5. Addition of course buttons
+6. Woocommerce integration
 7. EOX - API backend
 
@@ -168 +168 @@
 * Initial release
 
-== Translations ==      
-* English - default, always included        
+== Translations ==
+* English - default, always included
 
 Note: All the strings in this plugins are localized / translateable by default. In case you need assistance with a particular localization issue, or want to contribute with one traslation, please reach out to eduNEXT (https://edunext.co)

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

@@ -2 +2 @@
 /**
  * Plugin Name: Open edX LMS and WordPress integrator (LITE)
- * Version: 2.1.0
+ * Version: 2.6.1
  * Description: Set up your WordPress site as the front end site or marketing site for your online learning initiative powered by the open edX platform.
  * Author: eduNEXT
  * Author URI: https://edunext.co/
  * Requires at least: 4.0
- * Tested up to: 5.2
+ * Tested up to: 5.5.3
  *
  * Text Domain: wp-edunext-marketing-site
@@ -43 +43 @@
  */
 function WP_eduNEXT_Marketing_Site() {
-    $instance = WP_eduNEXT_Marketing_Site::instance( __FILE__, '2.1.0' );
+    $instance = WP_eduNEXT_Marketing_Site::instance( __FILE__, '2.6.1' );
 
     if ( is_null( $instance->settings ) ) {