artfully_ose 1.2.0.pre.7 → 1.2.0.pre.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQxYTM0Zjg3MzYyNmExODYwMjczYjYwYzQzY2YzZTI1ZjgwNjcyNg==
+    Y2U1Njk3MDg2YWQyMzMzNDg0ODQwMmVlZjRiMDAxZDNkMDc3NWQ3Zg==
   data.tar.gz: !binary |-
-    NDU3MzllOGU0Mjc3ODFiMjlkNTI0OWYwZjg4ODc2YjBkZTEwMTZiOQ==
+    OGU0NjI2ZGVjZmNkY2E2MWYzM2RiYWUxMjdjZTFhMmZlZmI5ZGZiZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWFkMmYwNWQ1ZDExNjY5NzUwN2Q4ODg4MDUyM2QzNTM4ZTE0ZGEwM2Q4MDA4
-    NWEwYTE3MzFiMTA0ZTVjMGE1YWRlM2ExNjY3ZWI4OGUxZTU5ZmU0YWQwYmNl
-    YzViY2Y3N2MzODY3MjQzZWMzMDFhODc1MGQ0N2YxYjQxOWM0MGM=
+    NzNkMzk2OWY1ZjY1YzQxNWJlNmU1NWMwNDVjOWU2MzMzMDkxNzFiMTk1YmNl
+    NjRiMDBkZTUwODIxMTUxZDMzZmJiZGE0ZTJlNzIwNzBiNjg0MWIzNTEyNzk5
+    ODBmMDJhMTQxMDU5ZWM0ODMxODBhNWUyOWMxNmNiMmEwOTFkYTE=
   data.tar.gz: !binary |-
-    YzllOGQzNzMyMGMzM2NiMDJmYTUwOWM1YjM0MGI0OWYxNzRlMWE2YzZjZjI2
-    Nzc3ZTc0ODhiZThmNTIyODdjYzYzNjJmNmZjOWI0MTFjOWNhZWZlYzk2ZmI4
-    YzhhZTQ0YmY2OThhYjhiZWQzZDc5OGM2MTYwNGI3ZGQ4ZjU5OGE=
+    ZmQyYWU3ZTA5NzM4M2E3MWM5YjRmZDAwZDQ1NTdlZWRhY2NiM2QyZGIzYWJk
+    ODRkNDA4YjFhMDNjOTMzNjc5MGYxOGJiMGE0ZjUxNTkzYmI4ZmMxNDUzOGQ1
+    MGNmOWU1YmRjYzEyNmRhZTIxNDM1NGI4NTk1MjMzNTQ4MjJlOWY=

data/app/assets/javascripts/custom/show.js

@@ -39,7 +39,12 @@ $(document).ready(function () {
         var hour = $('#show-time-hour').val()
         var minute = $('#show-time-minute').val()
         var meridian = $('#show-time-meridian').val()
+
         var hour24 = hour
+        if (hour24 == "12") {
+          hour24 = "0"
+        }
+
         if (meridian == "p") {
           hour24 = (+hour24 + 12).toString()
         }

data/app/controllers/members/invitations_controller.rb

@@ -0,0 +1,7 @@
+class Members::InvitationsController < Devise::InvitationsController
+  layout 'devise_layout'
+
+  def after_accept_path_for(resource)
+    members_root_path
+  end
+end

data/app/models/kits/mailchimp_kit.rb

@@ -51,7 +51,7 @@ class MailchimpKit < Kit
   end
 
   def lists
-    gibbon.lists["data"].map do |list|
+    gibbon.lists({:start => 0, :limit=> 100})["data"].map do |list|
       [list["name"], list["id"]]
     end
   end

data/app/models/membership_type.rb

@@ -1,5 +1,7 @@
 class MembershipType < ActiveRecord::Base
-  attr_accessible :name, :price, :fee, :number_of_shows, :plan, :on_sale, :description, :ends_at, :starts_at, :duration, :type, :period
+  attr_accessible :name, :price, :fee, :number_of_shows, 
+                  :plan, :on_sale, :description, :ends_at, 
+                  :starts_at, :duration, :type, :period, :number_of_tickets
 
   belongs_to :organization
   has_many :memberships

data/app/views/store/memberships/index.html.haml

@@ -23,7 +23,7 @@
             %br
             %br
             .section
-              = form_for membership_type, :as => :membership_type, :url => store_order_path(@store_organization.cached_slug), :method => :post do |f| 
+              = form_for membership_type, :as => :membership_type, :url => store_order_path(@store_organization.cached_slug), :html => {:id => "edit_membership_type_#{membership_type.id}"}, :method => :post do |f| 
                 = f.hidden_field :id
                 = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{membership_type.name} Membership"), i]})
                 = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'

data/config/routes.rb

@@ -35,7 +35,7 @@ Rails.application.routes.draw do
     resource :checkout, :only => :create
   end
 
-  devise_for :members
+  devise_for :members, :controllers => { :invitations => "members/invitations" }
   devise_for :users, :controllers => {:sessions => "users/sessions"}
   devise_scope :user do
     get "sign_up", :to => "devise/registrations#new"

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.7"
+  VERSION = "1.2.0.pre.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.7
+  version: 1.2.0.pre.8
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1871,6 +1871,7 @@ files:
 - app/controllers/imports_controller.rb
 - app/controllers/index_controller.rb
 - app/controllers/members/index_controller.rb
+- app/controllers/members/invitations_controller.rb
 - app/controllers/members/members_controller.rb
 - app/controllers/membership_awards_controller.rb
 - app/controllers/membership_types_controller.rb