Changeset 3000299

Timestamp:

11/22/2023 05:07:18 PM (17 months ago)

Author:

flyplugins

Message:

2.0 Release

Location:

memberpress-addon-for-wp-courseware

Files:

• tags/2.0 (added)
• tags/2.0/includes (added)
• tags/2.0/includes/class-wpcw-mp-addon.php (added)
• tags/2.0/includes/class-wpcw-mp-members.php (added)
• tags/2.0/includes/class-wpcw-mp-membership.php (added)
• tags/2.0/includes/class-wpcw-mp-menu-courses.php (added)
• tags/2.0/includes/deprecated.php (added)
• tags/2.0/includes/functions.php (added)
• tags/2.0/languages (added)
• tags/2.0/languages/wpcw-mp-addon.pot (added)
• tags/2.0/readme.txt (added)
• tags/2.0/wp-courseware-memberpress.php (added)
• trunk/includes/class-wpcw-mp-members.php (modified) (5 diffs)
• trunk/includes/class-wpcw-mp-membership.php (modified) (2 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/wp-courseware-memberpress.php (modified) (2 diffs)

memberpress-addon-for-wp-courseware/trunk/includes/class-wpcw-mp-members.php

@@ -127 +127 @@
             );
 
+            if ( isset( $_REQUEST['action'] ) && 'retroactiveassignment' === $_REQUEST['action'] ) {
+                $level_ID = $levelDetails['id'];
+                $this->retroactive_assignment( $level_ID );
+
+                return;
+            }
+
             // Get a list of course IDs that exist.
             $courses = wpcw_mp_addon_get_courses( false );
@@ -149 +156 @@
             $elem = new FormElement( 'retroactive_assignment', __( 'Do you want to retroactively assign these courses to current customers?', 'wpcw-mp-addon' ), true );
             $elem->setTypeAsRadioButtons( array(
-                'Yes' => __( 'Yes', 'wpcw-mp-addon' ),
-                'No'  => __( 'No', 'wpcw-mp-addon' ),
+                'Yes' => __( 'Yes, enroll students into newly selected course(s)', 'wpcw-wc-addon' ),
+                'No'  => __( 'No, just associate course(s) with the membership level.', 'wpcw-wc-addon' ),
             ) );
+
             $form->addFormElement( $elem );
 
@@ -165 +173 @@
                     global $wpdb, $wpcwdb;
                     $wpdb->show_errors();
+
+                    $current_levelList = array();
+
+                    if ( $this->getCourseAccessListForLevel( $levelDetails['id'] ) ){
+                        $current_levelList = array_keys( $this->getCourseAccessListForLevel( $levelDetails['id'] ) );
+                    }
 
                     // Remove all previous level mappings (as some will have been removed).
@@ -193 +207 @@
                     if ( 'Yes' == $retroactive_assignment && count( $mapplingList ) >= 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName
                         $level_ID = $levelDetails['id']; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+                        $new_levelList = array_keys( $mapplingList );
+                        $remove_courses = array_diff( $current_levelList, $new_levelList );
+                        $add_courses = array_diff( $new_levelList, $current_levelList );
+
+                        if ( $add_courses ){
+                            set_transient( 'wpcw_add_courses_' . $level_ID, $add_courses, 60*60*12 );
+                        }
+                        
+                        if ( $remove_courses ){
+                            set_transient( 'wpcw_remove_courses_' . $level_ID, $remove_courses, 60*60*12 );
+                        }
+
                         $this->retroactive_assignment( $level_ID ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+                        return;
                         // $page->showMessage(__('All members were successfully retroactively enrolled into the selected courses.', 'wpcw-mp-addon'));
                     }
@@ -273 +302 @@
                         // Show which courses will be added to users created at this level.
                         foreach ( $courses as $courseID => $courseName ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+                            if ( ! isset($courseListInDB[ $courseID ]) ){
+                                continue;
+                            }
                             $data['wpcw_members_levels'] .= sprintf( '<li class="wpcw_%s">%s</li>', ( isset( $courseListInDB[ $courseID ] ) ? 'enabled' : 'disabled' ), $courseName ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName
                         }

memberpress-addon-for-wp-courseware/trunk/includes/class-wpcw-mp-membership.php

@@ -111 +111 @@
 
             $mepr_db = new MeprDb();
-            $page    = new PageBuilder( false );
+
+            $page = new PageBuilder( false );
+
+            $batch = 50;
+            $step  = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
+            $count = isset( $_GET['count'] ) ? absint( $_GET['count'] ) : 0;
+            $steps = isset( $_GET['steps'] ) ? $_GET['steps'] : 'continue';
+
+            $coursesToAdd = get_transient( 'wpcw_add_courses_' . $level_id );
+            $coursesToRemove = get_transient( 'wpcw_remove_courses_' . $level_id );
+
+            $summary_url = add_query_arg( array( 'page' => $this->extensionID ), admin_url( 'admin.php' ) );
+            $course_url  = add_query_arg( array( 'page' => $this->extensionID, 'level_id' => $level_id ), admin_url( 'admin.php' ) );
+
+            if ( 'finished' === $steps ) {
+                $page->showMessage(
+                    esc_html__( 'Course access settings successfully updated.', 'wpcw-wc-addon' )
+                    . '<br />' .
+                    esc_html__( 'All existing customers were retroactively enrolled into the selected courses successfully.', 'wpcw-wc-addon' )
+                    . '<br /><br />' .
+                    /* translators: %s - Summary Url. */
+                    sprintf( __( 'Want to return to the <a href="%s">Course Access Settings</a>?', 'wpcw-wc-addon' ), $summary_url )
+                );
+
+                printf( '<br /><a href="%s" class="button-primary">%s</a>', $course_url, __( '&laquo; Return to Course', 'wpcw-wc-addon' ) );
+
+                if ( $coursesToRemove ){
+                    delete_transient( 'wpcw_remove_courses_' . $level_id );
+                }
+
+                if ( $coursesToAdd ){
+                    delete_transient( 'wpcw_add_courses_' . $level_id );
+                }
+
+                return;
+            }
+
+            if ( isset( $_POST['retroactive_assignment'] ) ) {
+                $step  = 1;
+                $count = 0;
+                $steps = 'continue';
+            }
 
             // Get user's assigned products and enroll them into courses accordingly.
-            $transations = $wpdb->get_results(
+            $customers = $wpdb->get_results(
                 $wpdb->prepare(
                     "SELECT user_id, id
                      FROM {$mepr_db->transactions}
                      WHERE product_id = %d
-                     AND (status = 'confirmed' OR status = 'complete')",
-                    $level_id
-                )
-            );
-
-            if ( $transations ) {
-                foreach ( $transations as $transaction ) {
-                    $user_id = $transaction->user_id;
-                    $user    = new MeprUser( $user_id );
-
-                    $product_subscriptions = $user->active_product_subscriptions( 'ids', true );
-
-                    $this->handle_courseSync( $user_id, $product_subscriptions );
-                }
-
-                $page->showMessage( __( 'All members were retroactively enrolled into the selected courses successfully.', 'wpcw-mp-addon' ) );
+                     AND (status = 'confirmed' OR status = 'complete')
+                     LIMIT %d
+                     OFFSET %d",
+                    $level_id,
+                    $batch,
+                    $count
+                ), ARRAY_A );
+
+            if ( ! $customers && ! isset( $_GET['action'] ) ) {
+                $page->showMessage( esc_html__( 'No existing customers found for the specified product.', 'wpcw-wc-addon' ) );
 
                 return;
-            } else {
-                $page->showMessage( __( 'No existing members found for the specified product.', 'wpcw-mp-addon' ) );
-            }
+            }
+
+            if ( $customers && 'continue' === $steps ) {
+                if ( count( $customers ) < $batch ) {
+                    $steps = 'finished';
+                }
+                
+                foreach ( $customers as $customer ) {
+                    wpcw_log($customer);
+                    $customer_id = $customer['user_id'];
+                    $user    = new MeprUser( $customer_id );
+
+                if ( $coursesToRemove ){
+                        $products = array();
+                        $courseIDList = array();
+
+                        $product_subscriptions = $user->active_product_subscriptions( 'ids', true );
+
+                        foreach ( $product_subscriptions as $subscription ) { 
+                                // Got courses for this product.
+                                $courses = $this->getCourseAccessListForLevel( $subscription ); 
+
+                                if ( $courses ) {
+                                    foreach ( $courses as $courseIDToKeep => $levelID ) { 
+                                        $courseIDList[] = $courseIDToKeep; 
+                                    }
+                                }
+                            }
+
+                        $removeCourses = array_diff( $coursesToRemove, $courseIDList );
+
+                        // De-enroll students from specified courses
+                        $this->handle_course_de_enrollment( $customer_id, $removeCourses );
+
+                }
+
+                if ( $coursesToAdd ){
+                        // Enroll students into specified courses
+                        WPCW_courses_syncUserAccess( $customer_id, $coursesToAdd, 'add' );
+                    }
+                    // Increment Count.
+                    $count += 1;
+                }
+
+                $step += 1;
+            }  else {
+                $steps = 'finished';
+            }
+
+            $page->showMessage( esc_html__( 'Please wait. Retroactively updating existing customers...', 'wpcw-wc-addon' ) );
+
+            $location_url = add_query_arg( array(
+                'page'     => $this->extensionID,
+                'level_id' => $level_id,
+                'step'     => $step,
+                'count'    => $count,
+                'steps'    => $steps,
+                'action'   => 'retroactiveassignment'
+            ), admin_url( 'admin.php' ) );
+
+            ?>
+            <script type="text/javascript">
+                setTimeout( function () {
+                    document.location.href = "<?php echo $location_url; ?>";
+                }, 1000 );
+            </script>
+            <?php
         }
 
@@ -164 +263 @@
             // Over to the parent class to handle the sync of data.
             $this->handle_courseSync( $user_id, $product_subscriptions );
+        }
+
+        /**
+         * Handle Course De-Enrollment.
+         *
+         * @since 1.5.0
+         *
+         * @param int   $student_id The student id.
+         * @param array $course_ids The course ids to enroll.
+         */
+        public function handle_course_de_enrollment( $student_id, $course_ids = array() ) {
+            global $wpdb, $wpcwdb;
+
+            if ( empty( $course_ids ) || ! is_array( $course_ids ) ) {
+                return;
+            }
+
+            $csv_course_ids = implode( ',', $course_ids );
+
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpcwdb->user_courses} WHERE user_id = %d AND course_id IN ({$csv_course_ids})", $student_id ) ); // phpcs:ignore WordPress.DB
+
+            WPCW_queue_dripfeed::updateQueueItems_removeUser_fromCourseList( $student_id, $course_ids );
         }
 

memberpress-addon-for-wp-courseware/trunk/readme.txt

@@ -3 +3 @@
 Donate link: https://flyplugins.com/donate
 Tags: learning management system, selling online courses
-Requires at least: 4.8
-Tested up to: 6.2.2
-Stable tag: 1.4.2
+Requires at least: 4.9
+Tested up to: 6.4.1
+Stable tag: 2.0
+Requires PHP: 5.2.4
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
-This plugin adds integration between MemberPress and WP Courseware which allows you to associate courses to products for automatic enrollment.
+This plugin adds integration between MemberPress and WP Courseware which allows you to associate course(s) to products for automatic enrollment.
 
 == Description ==
@@ -15 +16 @@
 
 = Would you like to sell an online course with MemberPress? =
-The MemberPress Addon for WP Courseware will add full integration with WP Courseware. Simply assign WP Courseware courses to a MemberPress product. When a student purchases the product, they will automatically be enrolled into the associated courses.
+The MemberPress Addon for WP Courseware will add full integration with WP Courseware. Simply assign WP Courseware course(s) to a MemberPress product. When a student purchases the product, they will automatically be enrolled into the associated course(s).
 
 With this addon, you will be able to create a fully automated [Learning Management System](https://flyplugins.com/wp-courseware) and sell online courses.
@@ -23 +24 @@
 
 = Basic Configuration Steps =
-1. Create a course with WP Courseware and add modules, units, and quizzes
+1. Create a course with WP Courseware and add module(s), unit(s), and quiz(zes)
 2. Create a course outline page using [shortcode]
 3. Create a product and set a price
 4. Associate one or more WP Courseware courses with the product
-5. New student pays for the product, and WP Courseware enrolls them to the appropriate courses based on the purchased product
+5. New student pays for the product, and WP Courseware enrolls them to the appropriate course(s) based on the purchased product
 
 = Check out Fly Plugins =
@@ -76 +77 @@
 == Changelog ==
 
+= 2.0 =
+* New: Added ability to retoactively enroll a large quantity of students.
+* New: Added new filter wpcw_mp_addon_can_load to allow enrollment method to be changed to "add" instead of "sync"
+
 = 1.4.2 =
 * Fix: Fixed issue where course list only displaying 20 courses

memberpress-addon-for-wp-courseware/trunk/wp-courseware-memberpress.php

@@ -2 +2 @@
 /**
  * Plugin Name: WP Courseware - MemberPress Add On
- * Version: 1.4.2
+ * Version: 2.0
  * Plugin URI: http://flyplugins.com
  * Description: The official extension for WP Courseware to add support for the MemberPress membership plugin for WordPress.
@@ -19 +19 @@
 
 // Constants.
-define( 'WPCW_MP_ADDON_VERSION', '1.4.2' );
+define( 'WPCW_MP_ADDON_VERSION', '1.5.0' );
 
 /**
  * WP Courseware Memberpress Addon.
  *
- * @since 1.4.0
+ * @since 1.5.0
  */
 function _wpcw_mp_addon() {