effective_learndash 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83cc9e6d5daa0a6e08e491f1ea9edec7f8e394b045801a2d704eaacab5c93f18
-  data.tar.gz: 467de056d4e11255c927a212e0f893b54ddcac8720ec12bf80299873ff5e2910
+  metadata.gz: 47f234d26d444d3ba71d72409db15186e4b1db00e1bf3c6aa007853143307265
+  data.tar.gz: d97eea26d3a6cce1d8df2f154b06b8dbc558e8df8c731fdbff268185cb3d465c
 SHA512:
-  metadata.gz: 1cbb48faa89c8d2a6fee3f47b78cdb41f3cf20871b354f7e88852a5103e0a294d4b2dd1d2eca63be1525dd546e365fd8143416e35942d714039ecd6031a12a0c
-  data.tar.gz: ee47891e98f74e0c8ecdbacbd76f37071a16d95a347bca7014f421a4aeb007b7ffc92d0f96c080dea39c8d57b15b92aa83f06f5558a0ee2182049dfa442952c0
+  metadata.gz: 6aeaa81878fe93276c6bcdc366ec2f61f1fdc5ee952a6b9328890387619605ddb7883210765f203bef8ae053065c781eb59c109b084b06d164be079ebe7689b8
+  data.tar.gz: 2d53168beee83ee8766389eaec11b48f6208e97e202d63ba3155f85278357b673ff1fab06de53cf9e8570fb57397ed5cf4cbfb4a2500a870c42691512fe061b8

data/README.md

@@ -1,6 +1,6 @@
-# Effective Learndash
+# Effective LearnDash
 
-Create Wordpress users and read Learndash course progress. This is an unoffocial integration that is not supported or affiliated with WordPress or Learndash.
+Create Wordpress users and read LearnDash course progress. This is an unofficial integration that is not supported or affiliated with WordPress or LearnDash.
 
 ## Getting Started
 
@@ -91,29 +91,29 @@ if user.admin?
 end
 ```
 
-## Configuring Learndash
+## Configuring LearnDash
 
-Your Wordpress should be configured ahead of time with the Learndash plugin.
+Your WordPress should be configured ahead of time with the LearnDash plugin.
 
 Please generate an application password via:
 
 https://make.wordpress.org/core/2020/11/05/application-passwords-integration-guide/
 
-and fill in the username/password details in config/initializers/effective_leardash.rb
+and fill in the username/password details in config/initializers/effective_learndash.rb
 
-## Working with Learndash
+## Working with LearnDash
 
 Visit `/admin/learndash_courses` and Refresh the list of Courses.
 
-Create a New Learndash User will create a new Wordpress/Learndash account with a username/password according to the settings in the config file.
+Create a New LearnDash User will create a new WordPress/LearnDash account with a username/password according to the settings in the config file.
 
 When you create a user, you only get access to the password once. So any existing users will have an unknown password.
 
-Create a new Learndash Enrollment to enroll a learndash user into a course. This will begin tracking their progress.
+Create a new LearnDash Enrollment to enroll a LearnDash user into a course. This will begin tracking their progress.
 
-There are no webhooks or callbacks from Learndash, everything is a GET request that updates the local database.
+There are no webhooks or callbacks from LearnDash, everything is a GET request that updates the local database.
 
-You can refresh an entire learndash user in one operation and it will sync the entire user at once, `user.learndash_user.refresh!`
+You can refresh an entire LearnDash user in one operation and it will sync the entire user at once, `user.learndash_user.refresh!`
 
 ## License
 

data/app/controllers/admin/learndash_courses_controller.rb

@@ -7,7 +7,7 @@ module Admin
 
     def refresh
       resource_scope.refresh!
-      flash[:success] = "Successfully refreshed Courses from Learndash"
+      flash[:success] = "Successfully refreshed Courses from LearnDash"
       redirect_to effective_learndash.admin_learndash_courses_path
     end
 

data/app/datatables/admin/effective_learndash_courses_datatable.rb

@@ -4,7 +4,7 @@ module Admin
       order :title
 
       col :id, visible: false
-      col :course_id, label: 'Learndash Id', visible: false
+      col :course_id, label: 'LearnDash Id', visible: false
 
       col :title
       col :status

data/app/datatables/admin/effective_learndash_users_datatable.rb

@@ -2,7 +2,7 @@ module Admin
   class EffectiveLearndashUsersDatatable < Effective::Datatable
     datatable do
       col :id, visible: false
-      col :user_id, label: 'Learndash Id', visible: false
+      col :user_id, label: 'LearnDash Id', visible: false
 
       col :last_refreshed, visible: true do |user|
         time_ago_in_words(user.last_synced_at) + ' ago'

data/app/datatables/effective_course_registrations_datatable.rb

@@ -6,12 +6,12 @@ class EffectiveCourseRegistrationsDatatable < Effective::Datatable
     col :token, visible: false
     col :created_at, visible: false
 
-    col(:submitted_at, label: 'Registered on') do |registration|
-      registration.submitted_at&.strftime('%F') || 'Incomplete'
+    col :learndash_course, label: 'Title', search: :string do |registration|
+      registration.learndash_course.to_s
     end
 
-    col :learndash_course, search: :string do |registration|
-      registration.learndash_course.to_s
+    col(:submitted_at, label: 'Registered on') do |registration|
+      registration.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
     col :owner, visible: false, search: :string

data/app/datatables/effective_learndash_courses_datatable.rb

@@ -10,12 +10,14 @@ class EffectiveLearndashCoursesDatatable < Effective::Datatable
     order :title
     col :id, visible: false
 
-    col :title, label: 'Title' do |learndash_course|
-      link_to(learndash_course.to_s, effective_learndash.learndash_course_path(learndash_course))
+    col :title do |learndash_course|
+      learndash_course.to_s
     end
 
     actions_col show: false do |learndash_course|
-      if learndash_course.can_register?
+      if current_user.learndash_enrollment(course: learndash_course).present?
+        'Registered. Please access from the home dashboard or applicant wizard.'
+      elsif learndash_course.can_register?
         dropdown_link_to('Register', effective_learndash.new_learndash_course_course_registration_path(learndash_course))
       end
     end

data/app/datatables/effective_learndash_enrollments_datatable.rb

@@ -1,11 +1,11 @@
 # Dashboard LearndashUsers
 class EffectiveLearndashEnrollmentsDatatable < Effective::Datatable
   datatable do
-    col :learndash_course do |enrollment|
-      link_to(enrollment.learndash_course, EffectiveLearndash.learndash_url, target: '_blank')
+    col :learndash_course, label: 'Title' do |enrollment|
+      enrollment.learndash_course.to_s
     end
 
-    col :progress_status
+    col :progress_status, label: 'Status'
 
     col :last_step, visible: false
     col :steps_completed, visible: false
@@ -16,9 +16,9 @@ class EffectiveLearndashEnrollmentsDatatable < Effective::Datatable
 
     actions_col(show: false) do |enrollment|
       if enrollment.not_started?
-        dropdown_link_to('Start', EffectiveLearndash.learndash_url, target: '_blank')
+        dropdown_link_to('Access Course', EffectiveLearndash.learndash_url, target: '_blank')
       elsif enrollment.in_progress?
-        dropdown_link_to('Continue', EffectiveLearndash.learndash_url, target: '_blank')
+        dropdown_link_to('Continue Course', EffectiveLearndash.learndash_url, target: '_blank')
       else
         dropdown_link_to('Show', EffectiveLearndash.learndash_url, target: '_blank')
       end

data/app/models/concerns/effective_learndash_course_registration.rb

@@ -87,9 +87,9 @@ module EffectiveLearndashCourseRegistration
       course_registrants
     end
 
+    # Enroll them in all courses.
     def after_submit_purchased!
-      # Enroll them in the course!
-      learndash_owner.create_learndash_enrollment(course: learndash_course)
+      course_registrants.each { |registrant| registrant.owner.create_learndash_enrollment(course: registrant.learndash_course) }
     end
 
   end
@@ -116,7 +116,7 @@ module EffectiveLearndashCourseRegistration
   end
 
   def build_course_registrant
-    course_registrants.build(owner: owner)
+    course_registrants.build(owner: owner, learndash_course: learndash_course)
   end
 
   def learndash_owner
@@ -127,11 +127,16 @@ module EffectiveLearndashCourseRegistration
     learndash_owner.membership_present?
   end
 
-  def assign_pricing
-    price = (member_pricing? ? learndash_course.member_price : learndash_course.regular_price)
+  def registration_price
+    raise('expected a learndash course') unless learndash_course.present?
+    raise('expected a learndash owner') unless learndash_owner.present?
 
+    member_pricing? ? learndash_course.member_price : learndash_course.regular_price
+  end
+
+  def assign_pricing
     course_registrant.assign_attributes(
-      price: price,
+      price: registration_price,
       qb_item_name: learndash_course.qb_item_name,
       tax_exempt: learndash_course.tax_exempt
     )
@@ -146,7 +151,7 @@ module EffectiveLearndashCourseRegistration
 
     # Assign prices
     assign_pricing()
-    raise('expected course_registrant to have a price') if course_registrant.price.blank?
+    raise('expected course_registrants to have a price') if course_registrants.any? { |registrant| registrant.price.blank? }
 
     # Save record
     save!

data/app/models/effective/learndash_api.rb

@@ -30,7 +30,7 @@ module Effective
     def find_user(value)
       # Find by email
       if value.kind_of?(String) && value.include?('@')
-        return find_by("/wp/v2/users", :email, value)
+        return find_by("/wp/v2/users", :email, email_for(value))
       end
 
       # Fetch by saved param value
@@ -39,7 +39,7 @@ module Effective
       return user if user.present?
 
       # Find by email
-      email = value.try(:email)
+      email = email_for(value)
       user = find_by("/wp/v2/users", :email, email) if email
       return user if user.present?
 
@@ -122,7 +122,6 @@ module Effective
 
     # private under this point
 
-
     def user_id(resource)
       if resource.class.respond_to?(:effective_learndash_owner?) # This is a user
         resource.learndash_user&.user_id
@@ -146,26 +145,24 @@ module Effective
     end
 
     def username_for(resource)
-      raise('expected a learndash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
-
+      raise('expected a LearnDash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
       name = EffectiveLearndash.wp_username_for(resource)
-      name = "test#{name}" unless Rails.env.production?
-      name
-    end
-
-    def email_for(resource)
-      raise('expected a learndash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
 
-      email = resource.email
-      email = "test#{email}" unless Rails.env.production?
-      email
+      Rails.env.production? ? name : "test#{name}"
     end
 
     def password_for(resource)
-      raise('expected a learndash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
+      raise('expected a LearnDash owner') unless resource.class.respond_to?(:effective_learndash_owner?) # This is a user
       EffectiveLearndash.wp_password_for(resource)
     end
 
+    def email_for(value)
+      email = value.try(:email) || value.to_s
+      return nil unless email.present? && email.include?('@')
+
+      Rails.env.production? ? email : "test#{email}"
+    end
+
     def find(endpoint, params = nil)
       response = get(endpoint, params)
 
@@ -178,7 +175,7 @@ module Effective
       elsif response.kind_of?(Array)
         response.first
       else
-        raise("unexpected Learndash API response #{response}")
+        raise("unexpected LearnDash API response #{response}")
       end
     end
 
@@ -199,7 +196,7 @@ module Effective
         elsif response.kind_of?(Array)
           response
         else
-          raise("unexpected Learndash API find_by response #{response}")
+          raise("unexpected LearnDash API find_by response #{response}")
         end
       )
 

data/app/views/admin/learndash_courses/_form.html.haml

@@ -6,7 +6,7 @@
     = tab 'Enrollments' do
       %h2 Enrollments
       %p Click the New button from the below table to enroll a user into this course.
-      %p Enrolling a user here will enroll them on the Learndash site.
+      %p Enrolling a user here will enroll them on the LearnDash site.
       %p Alternately, if this course is available for registration, the enrollment will be created upon registration purchase.
 
       - datatable = Admin::EffectiveLearndashEnrollmentsDatatable.new(learndash_course: learndash_course)

data/app/views/admin/learndash_courses/_learndash_course.html.haml

@@ -1,10 +1,10 @@
-= card('Learndash Course') do
+= card('LearnDash Course') do
   %p= learndash_course.title
   %p= link_to(learndash_course.link, learndash_course.link, target: '_blank')
 
-  %p= link_to "Learndash LMS Course Admin", EffectiveLearndash.learndash_url.chomp('/') + "/wp-admin/post.php?post=#{learndash_course.course_id}}&action=edit", target: '_blank'
+  %p= link_to "LearnDash LMS Course Admin", EffectiveLearndash.learndash_url.chomp('/') + "/wp-admin/post.php?post=#{learndash_course.course_id}}&action=edit", target: '_blank'
 
-%h3 Learndash User Enrollments
+%h3 LearnDash User Enrollments
 
 %p Click the New button from the below table to enroll a user into this course.
 

data/app/views/admin/learndash_owners/_form.html.haml

@@ -1,5 +1,5 @@
 - if owner.learndash_user.blank?
-  %p #{owner} does not yet have an account on Learndash.
+  %p #{owner} does not yet have an account on LearnDash.
 
 - if owner.learndash_user.present?
   = render('admin/learndash_users/learndash_user', learndash_user: owner.learndash_user)

data/app/views/admin/learndash_users/_form.html.haml

@@ -1,6 +1,6 @@
 = effective_form_with(model: [:admin, learndash_user], engine: true) do |f|
 
   = f.select :owner, {'Owners' => current_user.class.sorted }, polymorphic: true,
-    hint: 'Create a Learndash user account for this website user'
+    hint: 'Create a LearnDash account for this user'
 
   = f.submit

data/app/views/admin/learndash_users/_learndash_user.html.haml

@@ -1,19 +1,19 @@
-= card('Learndash User') do
+= card('LearnDash') do
   %p
     = link_to(learndash_user.owner, "/admin/users/#{learndash_user.owner.to_param}/edit")
-    has an existing account on Learndash.
+    has an existing account on LearnDash.
 
   %ul
     %li Email: #{learndash_user.email}
     %li Username: #{learndash_user.username}
     %li Password: #{learndash_user.password}
 
-  %p= link_to "Learndash LMS User Admin", EffectiveLearndash.learndash_url.chomp('/') + "/wp-admin/user-edit.php?user_id=#{learndash_user.user_id}", target: '_blank'
+  %p= link_to "LearnDash LMS User Admin", EffectiveLearndash.learndash_url.chomp('/') + "/wp-admin/user-edit.php?user_id=#{learndash_user.user_id}", target: '_blank'
 
   %p
     %small Last refreshed #{time_ago_in_words(learndash_user.last_synced_at)} ago.
 
-%h3 Learndash Course Enrollments
+%h3 LearnDash Course Enrollments
 
 %p Click the New button from the below table to manually enroll this user into a new course.
 

data/app/views/effective/course_registrations/_summary.html.haml

@@ -2,19 +2,23 @@
   %table.table.table-sm
     %tbody
       %tr
-        %th.border-0 Learndash Course
+        %th.border-0 Course
         %td.border-0
-          %p= link_to(course_registration.course, EffectiveLearndash.learndash_url, target: '_blank')
+          %p
+            %strong=course_registration.course
 
-          %p Please sign into Learndash with the following credentials:
           - learndash_user = course_registration.learndash_owner.learndash_user
+          %p Your course account credentials are:
 
           %ul
-            %li Email: #{learndash_user.email}
-            %li Username: #{learndash_user.username}
-            %li Password: #{learndash_user.password}
+            %li
+              %strong Username:
+              #{learndash_user.username}
+            %li
+              %strong Password:
+              #{learndash_user.password}
 
-          %p= link_to('Learndash LMS', EffectiveLearndash.learndash_url, target: '_blank')
+          %p= link_to('Sign in to your course account', EffectiveLearndash.learndash_url, target: '_blank', class: 'btn btn-primary mb-2')
 
       - if request.path.start_with?('/admin')
         %tr

data/app/views/effective/course_registrations/course.html.haml

@@ -2,9 +2,8 @@
   = render 'effective/course_registrations/content', resource: resource
 
   = card('Course') do
-    = render('effective/learndash_courses/learndash_course', learndash_course: resource.learndash_course)
-
-    %p You qualify for #{resource.member_pricing? ? 'member' : 'regular'} pricing.
+    %p= resource.learndash_course
+    %p= price_to_currency(resource.registration_price)
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

data/app/views/effective/course_registrations/start.html.haml

@@ -13,12 +13,13 @@
         .alert.alert-warning
           You are already enrolled in #{link_to(resource.course, EffectiveLearndash.learndash_url, target: '_blank')}.
 
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+      - if existing.blank?
+        = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+          = f.hidden_field :id
 
-        = f.hidden_field :learndash_course_id
+          = f.hidden_field :learndash_course_id
 
-        = f.hidden_field :owner_type
-        = f.hidden_field :owner_id
+          = f.hidden_field :owner_type
+          = f.hidden_field :owner_id
 
-        = f.save 'Save and Continue'
+          = f.save 'Save and Continue'

data/app/views/effective/course_registrations/submitted.html.haml

@@ -10,7 +10,6 @@
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
   = render 'effective/course_registrations/summary', course_registration: resource
-  = render 'effective/course_registrations/course_registration', course_registration: resource
   = render 'effective/course_registrations/orders', course_registration: resource
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'

data/app/views/effective/learndash/_dashboard.html.haml

@@ -1,31 +1,29 @@
 - learndash_user = current_user.try(:learndash_user)
 - authorized = learndash_user && EffectiveResources.authorized?(self, :show, learndash_user)
 
-%h2 Learndash Courses
+%h2 Courses
 
 - if learndash_user.blank?
-  %p You do not have a Learndash account.
-
-- if learndash_user.present?
-  %p
-    = succeed('.') do
-      You have an existing account on
-      = link_to('Learndash', EffectiveLearndash.learndash_url, target: '_blank')
+  %p You do not have an account to access courses. When you are enrolled in a course, your account credentials will be displayed here.
 
 - if learndash_user.present? && authorized
   - learndash_user.refresh!
 
-  %p Please sign into Learndash with the following credentials:
+  %p Your course account credentials are:
 
   %ul
-    %li Email: #{learndash_user.email}
-    %li Username: #{learndash_user.username}
-    %li Password: #{learndash_user.password}
+    %li
+      %strong Username:
+      #{learndash_user.username}
+    %li
+      %strong Password:
+      #{learndash_user.password}
 
-  - if learndash_user.learndash_enrollments.present?
-    %p You are enrolled in #{pluralize(learndash_user.learndash_enrollments.length, 'course')}.
+  %p= link_to('Sign in to your course account', EffectiveLearndash.learndash_url, target: '_blank', class: 'btn btn-primary')
 
+  - if learndash_user.learndash_enrollments.present?
     - datatable = EffectiveResources.best('EffectiveLearndashEnrollmentsDatatable').new(self)
     = render_datatable(datatable, simple: true)
+
   - else
-    You are not enrolled in any Learndash courses.
+    %p You are not enrolled in any courses.

data/app/views/effective/learndash_courses/_learndash_course.html.haml

@@ -4,7 +4,7 @@
       %th Regular Price
       %td= price_to_currency(learndash_course.regular_price)
     %tr
-      %th Member Price
+      %th Discounted Price
       %td= price_to_currency(learndash_course.member_price)
 
     - if learndash_course.body.present?

data/config/routes.rb

@@ -7,7 +7,7 @@ end
 EffectiveLearndash::Engine.routes.draw do
   # Public routes
   scope module: 'effective' do
-    resources :learndash_courses, only: [:index, :show] do
+    resources :learndash_courses, only: [:index] do
       resources :course_registrations, only: [:new, :show, :destroy] do
         resources :build, controller: :course_registrations, only: [:show, :update]
       end

data/lib/effective_learndash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLearndash
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_learndash
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Create Wordpress users and read Learndash course progress
+description: Create Wordpress users and read LearnDash course progress
 email:
 - info@codeandeffect.com
 executables: []
@@ -259,5 +259,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
-summary: Create Wordpress users and read Learndash course progress
+summary: Create Wordpress users and read LearnDash course progress
 test_files: []