effective_events 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25070167849b6086995bc9e6e31bcdf0f8d9a36353ce8bb98c32a46d07c50318
-  data.tar.gz: 91f62a8a03323a83c7aaa2f54c39e2aeb3b2e1c89824de9be544d1e5cf955081
+  metadata.gz: 19f4a303dbab49f23b15a28c71bce29f9d55036371c533a27f36ad3ac70ca1b4
+  data.tar.gz: ad51623c2087ccf9a1c2a2a97d1623f89224be38cd7aae06b246aedb2108e2e3
 SHA512:
-  metadata.gz: 3c3d87e21be01edf5b1395ad4a94a828cac98141b000d5ac43e7fc4af61e638399e620c17c9e0e137901aaed5c672fcc75deec074ef83b6cb3db2c7fc498ffde
-  data.tar.gz: 57626a1e76dc8ffdc26c687746de28f217b98fc6ce4fceefd8e13f4c59afc98519290184b49750cfeb4a04d86f494d6b4c8914a53cd2e437f28d7770f1e73baf
+  metadata.gz: 7d51690029093356830ee881f54881054b4eafa9b0aaf99d2389c9d8966a2d76b2d8456f11e9ef45ef7df92cddce73c89961094802c21a198a766b04373b0eb8
+  data.tar.gz: 68e1785f75da39ad9916a065c89dc79a3995602c250315276e165b58f4abf43bc4ab116c45698e1ee36cccfa7b7fe2c364efefab73d382deb58bd623e8064325

data/README.md

@@ -68,10 +68,34 @@ All authorization checks are handled via the effective_resources gem found in th
 The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
-can :index, Effective::Event
+can([:index, :show], Effective::Event) { |event| !event.draft? }
+can([:new, :create], EffectiveEvents.EventRegistration)
+can([:show, :index], Effective::EventRegistrant) { |registrant| registrant.owner == user || registrant.owner.blank? }
+can([:show, :index], Effective::EventPurchase) { |purchase| purchase.owner == user || purchase.owner.blank? }
+can([:show, :index], EffectiveEvents.EventRegistration) { |registration| registration.owner == user }
+can([:update, :destroy], EffectiveEvents.EventRegistration) { |registration| registration.owner == user && !registration.was_submitted? }
 
 if user.admin?
-  can :manage, Effective::Event
+  can :admin, :effective_events
+
+  can(crud - [:destroy], Effective::Event)
+  can(:destroy, Effective::Event) { |et| et.event_registrants_count == 0 }
+
+  can(crud - [:destroy], Effective::EventRegistrant)
+  can(:mark_paid, Effective::EventRegistrant) { |er| !er.event_registration_id.present? }
+  can(:destroy, Effective::EventRegistrant) { |er| !er.purchased? }
+
+  can(crud - [:destroy], Effective::EventPurchase)
+  can(:mark_paid, Effective::EventPurchase) { |er| !er.event_registration_id.present? }
+  can(:destroy, Effective::EventPurchase) { |er| !er.purchased? }
+
+  can(crud - [:destroy], Effective::EventTicket)
+  can(:destroy, Effective::EventTicket) { |et| et.purchased_event_registrants_count == 0 }
+
+  can(crud - [:destroy], Effective::EventProduct)
+  can(:destroy, Effective::EventProduct) { |et| et.purchased_event_purchases_count == 0 }
+
+  can([:index, :show], EffectiveEvents.EventRegistration)
 end
 ```
 

data/app/datatables/admin/effective_events_datatable.rb

@@ -15,14 +15,13 @@ module Admin
 
       col :title
       col :draft
-      col :start_at, label: 'Event Date'
-
-      col :end_at, visible: false
+      col :start_at, label: 'Event Start Date'
+      col :end_at, label: 'Event End Date', visible: false
       col :excerpt, visible: false
 
-      col :registration_start_at, label: 'Registration opens'
-      col :registration_end_at, label: 'Registration closes'
-      col :early_bird_end_at, label: 'Early bird ends'
+      col :registration_start_at, label: 'Registration opens', visible: false
+      col :registration_end_at, label: 'Registration closes', visible: false
+      col :early_bird_end_at, label: 'Early bird ends', visible: false
 
       col :early_bird do |event|
         if event.early_bird?
@@ -33,7 +32,9 @@ module Admin
       end
 
       col :event_tickets, search: :string
+      col :event_products, search: :string
       col :event_registrants, search: :string
+      col :event_purchases, search: :string
 
       col :roles, visible: false
       col :authenticate_user, visible: false

data/app/datatables/effective_event_registrations_datatable.rb

@@ -16,7 +16,8 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
 
     col :owner, visible: false, search: :string
     col :status, visible: false
-    col :event_registrants, search: :string
+    col :event_registrants, label: 'Registrants', search: :string
+    col :event_purchases, label: 'Purchases', search: :string
     col :orders, action: :show, visible: false, search: :string
 
     actions_col(actions: []) do |er|

data/app/views/effective/event_registrations/_purchases.html.haml

@@ -1,10 +1,9 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= event_registration.wizard_step_title(:purchases)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:purchases)) if edit_effective_event_registrations_wizard?
+= card do
+  .row
+    .col-sm
+      %h5.card-title= event_registration.wizard_step_title(:purchases)
+    .col-sm-auto.text-right
+      = link_to('Edit', wizard_path(:purchases)) if edit_effective_event_registrations_wizard?
 
-    - datatable = EffectiveEventPurchasesDatatable.new(event_registration: event_registration)
-    .mb-4= render_simple_datatable(datatable)
+  - datatable = EffectiveEventPurchasesDatatable.new(event_registration: event_registration)
+  .mb-4= render_simple_datatable(datatable)

data/app/views/effective/event_registrations/_registrants.html.haml

@@ -1,10 +1,9 @@
-.card
-  .card-body
-    .row
-      .col-sm
-        %h5.card-title= event_registration.wizard_step_title(:registrants)
-      .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:registrants)) if edit_effective_event_registrations_wizard?
+= card do
+  .row
+    .col-sm
+      %h5.card-title= event_registration.wizard_step_title(:registrants)
+    .col-sm-auto.text-right
+      = link_to('Edit', wizard_path(:registrants)) if edit_effective_event_registrations_wizard?
 
-    - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
-    .mb-4= render_simple_datatable(datatable)
+  - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
+  .mb-4= render_simple_datatable(datatable)

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

@@ -1,29 +1,26 @@
-.card
-  .card-body
-    %h5 Event Registration
+= card('Event Registration') do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %th.border-0 Event
+        %td.border-0
+          = link_to(event_registration.event, effective_events.event_path(event_registration.event))
 
-    %table.table.table-sm
-      %tbody
+      - if request.path.start_with?('/admin')
         %tr
-          %th.border-0 Event
-          %td.border-0
-            = link_to(event_registration.event, effective_events.event_path(event_registration.event))
-
-        - if request.path.start_with?('/admin')
-          %tr
-            %th Registered by
-            %td
-              - url = (polymorphic_admin_path(event_registration.owner) rescue "/admin/users/#{event_registration.owner.to_param}/edit")
-              = link_to(event_registration.owner, url)
-        - else
-          %tr
-            %th Registered by
-            %td= event_registration.owner
+          %th Registered by
+          %td
+            - url = (polymorphic_admin_path(event_registration.owner) rescue "/admin/users/#{event_registration.owner.to_param}/edit")
+            = link_to(event_registration.owner, url)
+      - else
+        %tr
+          %th Registered by
+          %td= event_registration.owner
 
 
-        - if event_registration.orders.present?
-          %tr
-            %th Order
-            %td
-              - event_registration.orders.each do |order|
-                = link_to(order, effective_orders.order_path(order))
+      - if event_registration.orders.present?
+        %tr
+          %th Order
+          %td
+            - event_registration.orders.each do |order|
+              = link_to(order, effective_orders.order_path(order))

data/app/views/effective/event_registrations/billing.html.haml

@@ -3,12 +3,13 @@
 
   - raise('expected owner to respond to billing_address') unless resource.owner.respond_to?(:billing_address)
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+  = card('Billing Address') do
+    %p Please enter your billing address
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = effective_address_fields(fu, :billing)
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.save 'Save and Continue'
+      = f.fields_for(:owner, f.object.owner) do |fu|
+        = effective_address_fields(fu, :billing)
+
+      = f.save 'Save and Continue'

data/config/effective_events.rb

@@ -1,7 +1,9 @@
 EffectiveEvents.setup do |config|
   config.events_table_name = :events
   config.event_tickets_table_name = :event_tickets
+  config.event_products_table_name = :event_products
   config.event_registrants_table_name = :event_registrants
+  config.event_purchases_table_name = :event_purchases
   config.event_registrations_table_name = :event_registrations
 
   # Layout Settings

data/db/migrate/01_create_effective_events.rb.erb

@@ -1,6 +1,6 @@
 class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
   def change
-    create_table :events do |t|
+    create_table <%= @events_table_name %> do |t|
       t.string :title
 
       t.string :slug
@@ -22,10 +22,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    add_index :events, :title
-    add_index :events, :end_at
+    add_index <%= @events_table_name %>, :title
+    add_index <%= @events_table_name %>, :end_at
 
-    create_table :event_tickets do |t|
+    create_table <%= @event_tickets_table_name %> do |t|
       t.integer :event_id
 
       t.string :title
@@ -43,7 +43,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_registrants do |t|
+    create_table <%= @event_registrants_table_name %> do |t|
       t.integer :event_id
       t.integer :event_ticket_id
 
@@ -67,7 +67,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_products do |t|
+    create_table <%= @event_products_table_name %> do |t|
       t.integer :event_id
 
       t.string :title
@@ -84,7 +84,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_purchases do |t|
+    create_table <%= @event_purchases_table_name %> do |t|
       t.integer :event_id
       t.integer :event_product_id
 
@@ -102,7 +102,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table :event_registrations do |t|
+    create_table <%= @event_registrations_table_name %> do |t|
       t.string :token
 
       t.integer :event_id
@@ -127,9 +127,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :event_registrations, [:owner_id, :owner_type]
-    add_index :event_registrations, :status
-    add_index :event_registrations, :token
+    add_index <%= @event_registrations_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @event_registrations_table_name %>, :status
+    add_index <%= @event_registrations_table_name %>, :token
 
   end
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/lib/effective_events.rb

@@ -6,7 +6,8 @@ module EffectiveEvents
 
   def self.config_keys
     [
-      :events_table_name, :event_registrants_table_name, :event_tickets_table_name, :event_registrations_table_name,
+      :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
+      :event_registrations_table_name, :event_products_table_name, :event_purchases_table_name,
       :layout, :per_page, :use_effective_roles,
       :event_registration_class_name
     ]

data/lib/generators/effective_events/install_generator.rb

@@ -21,6 +21,11 @@ module EffectiveEvents
 
       def create_migration_file
         @events_table_name  = ':' + EffectiveEvents.events_table_name.to_s
+        @event_products_table_name  = ':' + EffectiveEvents.event_products_table_name.to_s
+        @event_purchases_table_name  = ':' + EffectiveEvents.event_purchases_table_name.to_s
+        @event_registrants_table_name  = ':' + EffectiveEvents.event_registrants_table_name.to_s
+        @event_registrations_table_name  = ':' + EffectiveEvents.event_registrations_table_name.to_s
+        @event_tickets_table_name = ':' + EffectiveEvents.event_tickets_table_name.to_s
 
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_events.rb.erb', 'db/migrate/create_effective_events.rb'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Code and Effect