artfully_ose 1.2.0.pre.7 → 1.2.0.pre.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/assets/javascripts/custom/show.js +5 -0
- data/app/controllers/members/invitations_controller.rb +7 -0
- data/app/models/kits/mailchimp_kit.rb +1 -1
- data/app/models/membership_type.rb +3 -1
- data/app/views/store/memberships/index.html.haml +1 -1
- data/config/routes.rb +1 -1
- data/lib/artfully_ose/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
Y2U1Njk3MDg2YWQyMzMzNDg0ODQwMmVlZjRiMDAxZDNkMDc3NWQ3Zg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OGU0NjI2ZGVjZmNkY2E2MWYzM2RiYWUxMjdjZTFhMmZlZmI5ZGZiZg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NzNkMzk2OWY1ZjY1YzQxNWJlNmU1NWMwNDVjOWU2MzMzMDkxNzFiMTk1YmNl
|
10
|
+
NjRiMDBkZTUwODIxMTUxZDMzZmJiZGE0ZTJlNzIwNzBiNjg0MWIzNTEyNzk5
|
11
|
+
ODBmMDJhMTQxMDU5ZWM0ODMxODBhNWUyOWMxNmNiMmEwOTFkYTE=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZmQyYWU3ZTA5NzM4M2E3MWM5YjRmZDAwZDQ1NTdlZWRhY2NiM2QyZGIzYWJk
|
14
|
+
ODRkNDA4YjFhMDNjOTMzNjc5MGYxOGJiMGE0ZjUxNTkzYmI4ZmMxNDUzOGQ1
|
15
|
+
MGNmOWU1YmRjYzEyNmRhZTIxNDM1NGI4NTk1MjMzNTQ4MjJlOWY=
|
@@ -39,7 +39,12 @@ $(document).ready(function () {
|
|
39
39
|
var hour = $('#show-time-hour').val()
|
40
40
|
var minute = $('#show-time-minute').val()
|
41
41
|
var meridian = $('#show-time-meridian').val()
|
42
|
+
|
42
43
|
var hour24 = hour
|
44
|
+
if (hour24 == "12") {
|
45
|
+
hour24 = "0"
|
46
|
+
}
|
47
|
+
|
43
48
|
if (meridian == "p") {
|
44
49
|
hour24 = (+hour24 + 12).toString()
|
45
50
|
}
|
@@ -1,5 +1,7 @@
|
|
1
1
|
class MembershipType < ActiveRecord::Base
|
2
|
-
attr_accessible :name, :price, :fee, :number_of_shows,
|
2
|
+
attr_accessible :name, :price, :fee, :number_of_shows,
|
3
|
+
:plan, :on_sale, :description, :ends_at,
|
4
|
+
:starts_at, :duration, :type, :period, :number_of_tickets
|
3
5
|
|
4
6
|
belongs_to :organization
|
5
7
|
has_many :memberships
|
@@ -23,7 +23,7 @@
|
|
23
23
|
%br
|
24
24
|
%br
|
25
25
|
.section
|
26
|
-
= form_for membership_type, :as => :membership_type, :url => store_order_path(@store_organization.cached_slug), :method => :post do |f|
|
26
|
+
= 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|
|
27
27
|
= f.hidden_field :id
|
28
28
|
= select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{membership_type.name} Membership"), i]})
|
29
29
|
= f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'
|
data/config/routes.rb
CHANGED
@@ -35,7 +35,7 @@ Rails.application.routes.draw do
|
|
35
35
|
resource :checkout, :only => :create
|
36
36
|
end
|
37
37
|
|
38
|
-
devise_for :members
|
38
|
+
devise_for :members, :controllers => { :invitations => "members/invitations" }
|
39
39
|
devise_for :users, :controllers => {:sessions => "users/sessions"}
|
40
40
|
devise_scope :user do
|
41
41
|
get "sign_up", :to => "devise/registrations#new"
|
data/lib/artfully_ose/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: artfully_ose
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.0.pre.
|
4
|
+
version: 1.2.0.pre.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Artful.ly
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-10-
|
11
|
+
date: 2013-10-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -1871,6 +1871,7 @@ files:
|
|
1871
1871
|
- app/controllers/imports_controller.rb
|
1872
1872
|
- app/controllers/index_controller.rb
|
1873
1873
|
- app/controllers/members/index_controller.rb
|
1874
|
+
- app/controllers/members/invitations_controller.rb
|
1874
1875
|
- app/controllers/members/members_controller.rb
|
1875
1876
|
- app/controllers/membership_awards_controller.rb
|
1876
1877
|
- app/controllers/membership_types_controller.rb
|