effective_learndash 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf3a76614af4d9fba4a5d9e483ecfc78ec821c042643b0d59508b42f80aead20
-  data.tar.gz: 3e383233f17438db0bc4c134e8fb767183b3697b0036100ddf89e80961b42332
+  metadata.gz: 8a995bb252c9977d587fad29eb85ed7a700e14623000545f40f86c5ef11578e3
+  data.tar.gz: a8e0082d8e0db22298325ba7bfc074e01ef0f244063e7e4725058dcac0bf704d
 SHA512:
-  metadata.gz: 73041dc5fa8d6e130f865cd0ed5acf4c966ff1d7148168d6482f582f68c29d86fd8521c6d23aeb35227ca1f70810bd54b88408527767c3654b0998f8f6513d37
-  data.tar.gz: 58d39dc3138ff44d2be3152aba69734f7f83146714b1b79a44b084cdc05dcd865974e457b4f61c2c3dd2436e5a81b709db7ea3cde5b68b807a325bf28df7c58e
+  metadata.gz: c4b47b748dcb01abb40f39f7a2db372e15c9ddc872a98f78afb7e6dddd10b4b404c3dbc280d82895ac2b7cb593622292a201e791dbb7f720ad4b4137eb8968da
+  data.tar.gz: 5278f678c4e13c4e08ed936fc53e7d9e3225e8db1ff3b663abf6acc67589001cd39b120a4d802abace3ad9e3710b88f10e676074f10fea7c6c1dd8ee5dbd27af

data/app/datatables/effective_course_registrants_datatable.rb

@@ -2,8 +2,8 @@
 
 class EffectiveCourseRegistrantsDatatable < Effective::Datatable
   datatable do
-    col :learndash_course
-    col :owner, label: 'User', action: false
+    col :learndash_course, label: 'Title'
+    col :owner, label: 'Registrant', action: false
     col :price, as: :price
   end
 

data/app/models/concerns/effective_learndash_course_registration.rb

@@ -87,8 +87,9 @@ module EffectiveLearndashCourseRegistration
       course_registrants
     end
 
-    # Enroll them in all courses.
+    # Create learndash user and enroll in all courses
     def after_submit_purchased!
+      learndash_owner.create_learndash_user
       course_registrants.each { |registrant| registrant.owner.create_learndash_enrollment(course: registrant.learndash_course) }
     end
 
@@ -155,12 +156,6 @@ module EffectiveLearndashCourseRegistration
 
     # Save record
     save!
-
-    # Create a learndash user now before payment to catch any errors in server stuff before payment.
-    learndash_owner.create_learndash_user
-    raise('expected a persisted learndash user') unless learndash_owner.learndash_user&.persisted?
-
-    true
   end
 
   private

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
@@ -147,18 +146,9 @@ module Effective
 
     def username_for(resource)
       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)
@@ -166,6 +156,13 @@ module Effective
       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)
 

data/lib/effective_learndash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLearndash
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_learndash
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails