effective_learndash 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43df5441a08d0a4f6974c1833c3967e007f0b84d29bb0211a574b9b5803ecf6e
-  data.tar.gz: '019f88430901977c58b6ae5a2266aa9b27a548689d1d14aa78926ec32639f582'
+  metadata.gz: bb60befd537b5ed6b7111baf26c546997223c4350c60d0b66cf6803281616c64
+  data.tar.gz: '0087f4c16776214a5bb6b098078ade3f3a215742f75820b1c9046180faa0cf0b'
 SHA512:
-  metadata.gz: ebb0420d408114b919048393146dc0fbfb25c66f635672e8da07beef5847f78388e11cc08b243299db4ef132cd220025ba945715b83e87440e957b37f9ed71f2
-  data.tar.gz: dc6af37f79445a95ebed1e4501be634ec795d5e1f7ca09e997087e25a0aa95cb8d392a892cd51207998d2ea0d2c30ba885fc8865364860fee0d9260d70cdcb32
+  metadata.gz: 0a9def7fbe45dec58d8768454a9adccffb989b44a1f387ee1b04de0c56f9db48ba5f104012ee4060fbf4adb9e35ec3ebc0281ff4274f10c486efc3ba7416e526
+  data.tar.gz: 5b8bd37c4ea919fc77aa4f61d6f8aa8b4c638dbb8b9deb72bcf632fa4c56cd01da62024f0e8ff98656060e9e2d25315a5882bebb4760a6b21d7c860cc49165f6

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,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
@@ -151,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
@@ -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.5'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_learndash
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 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