artfully_ose 1.2.0.alpha.1 → 1.2.0.alpha.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM5NDY5OGFmYWNhMDRkZTJkMjAzZTUwOGIyMDVlMjA5ZGZkNTFlOQ==
+    NTZhNzA2MTY4YzkyODhmMDIzZDhiZGQ4ZDhlMzE5Yjk1YWZhNDBkOA==
   data.tar.gz: !binary |-
-    ZjI4MTRiNDUzZmY4OTU3NjEyZGQ1MjBhZTA1ZWZjZmMzMjU2YmYyZg==
+    OGYyZThlYTUwMzBlNDM3MmNkZGE2OGRiYzM0NTAyMjc0YjA3NGJhNw==
 SHA512:
   metadata.gz: !binary |-
-    YzkxNjg3YWY3NWMzNWNhOWViMWZiMjExOTE3N2NjN2MxMjQxNDI0MGRjOGE4
-    YmUxZTdlMGRmYTFmYjBlMDg0NjA5ZjNlYWViZGRhZDU5MzM2ODY5YzVlNWFh
-    NjlmYmI3YTJiY2U1NDJjMjI3MjYzNTQ3Y2UxMTEwNjU2MzNhNjU=
+    ZDNlMDZiMmJjNGYxNGUwYWNhOWZiZjJiYzFiMGYxYTE0MTQ0OGU1NTA2ZDgz
+    YTIxOTYxMTg3N2UwMzQ1YjhkYTVkNTA4Mjg4NGQ4ZWRmZDc1MDQ4ODQyZmJi
+    YmNmMTgyMmI1MWRhNzhmZWVmMzM3YTYwNDExMzU0NzBiOWMxMzA=
   data.tar.gz: !binary |-
-    Yjc4NThiMWFkYzhjMDE1ZmQxMWJhN2RmMTYxZWUzZWFjNzJiMTViYzA3YjFk
-    MDk4Y2I3ZmVmZDc3NjU3MjkzOWVjZjQwMmY3Nzg1YzZjMmNhZTUwZDFkYmJj
-    ZDYxMGRkYmY2ODcwMDZhZTVmODIxNmEzN2U0MzEzZGE2MmM1MzQ=
+    ZTRjM2Q4ZGY0YzdhYmFkYmYzNTU1MDE2Zjc1YTEzMjQ3NDRmMmZkMjRjYmEy
+    OTIxZDA1N2M4MDMxODY3N2QzYjA2YjA1OGE3ZmM3ZWI5MzRhYWQ0MGM2ZDhh
+    NjE4ZTAzZTZlMDRiNWYxZjMwYmU2NTY0NGU2ZGIwZDM1MjQ1NTA=

data/app/models/order.rb

@@ -256,7 +256,6 @@ class Order < ActiveRecord::Base
 
   def self.membership_sale_search(search)
     standard = ::Order.
-      where("orders.type != ?", ::Reseller::Order.name).
       joins(:items).
       joins("INNER JOIN memberships ON (items.product_type = #{::Item.sanitize('Membership')} AND items.product_id = memberships.id)").
       joins("INNER JOIN membership_types ON (membership_types.id = memberships.membership_type_id)").

data/app/models/pass_type.rb

@@ -8,7 +8,7 @@ class PassType < ActiveRecord::Base
   attr_accessible :name, :description, :hide_fee, :thanks_copy, :email_copy, :sales_start_at, :sales_end_at, 
                   :on_sale, :price, :tickets_allowed, :starts_at, :ends_at
 
-  validates :name, :description, :price, :tickets_allowed, :presence => true
+  validates :name, :description, :price, :tickets_allowed, :starts_at, :ends_at, :presence => true
 
   scope :storefront, where(:on_sale => true).where("sales_start_at < ? or sales_start_at is null", DateTime.now).where("sales_end_at > ? or sales_end_at is null", DateTime.now)
   scope :on_sale, where(:on_sale => true)

data/app/views/events/_ticket_type_fields.html.haml

@@ -6,26 +6,41 @@
         =f.text_field :name, :class => 'span4'
 
     -with_kit :membership do
-      .control-group
-        =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
-        .controls
-          %label.radio.inline
-            = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
-            Yes
-          %label.radio.inline
-            = f.radio_button :member_ticket, false, :class => "member-ticket-no"
-            No
-
-      .membership-fields{:style => "display: none"}
+      - if current_user.current_organization.membership_types.empty?
         .control-group
-          =f.label :membership_type_id, "Membership", :class => 'control-label'
+          =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
           .controls
-            =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play(current_user.current_organization), 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+            %label.radio.inline
+              = f.radio_button :member_ticket, true, :class => "member-ticket-yes", :disabled => "true"
+              Yes
+            %label.radio.inline
+              = f.radio_button :member_ticket, false, :class => "member-ticket-no", :disabled => "true"
+              No  
+            %p.muted
+              You need to create a membership before you can sell member tickets.
+              =link_to "Get started here.", new_membership_type_path
 
+      - else
         .control-group
-          =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+          =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
           .controls
-            =f.text_field :tickets_per_membership, :class => 'input-small'
+            %label.radio.inline
+              = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
+              Yes
+            %label.radio.inline
+              = f.radio_button :member_ticket, false, :class => "member-ticket-no"
+              No
+
+        .membership-fields{:style => "display: none"}
+          .control-group
+            =f.label :membership_type_id, "Membership", :class => 'control-label'
+            .controls
+              =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play(current_user.current_organization), 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+
+          .control-group
+            =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+            .controls
+              =f.text_field :tickets_per_membership, :class => 'input-small'
 
     .control-group
       =f.label :price, "Price", :class => 'control-label'

data/app/views/people/show.html.haml

@@ -68,10 +68,10 @@
               %span Do Not Email
           = form.submit "Save", :class => 'btn btn-primary hidden'
 
-      %h5 Email Lists
-      %section#subscription-listing
-        = form_for @person do |form|
-          - if @person.organization.kits.mailchimp
+      - with_kit(:mailchimp) do
+        %h5 Email Lists
+        %section#subscription-listing
+          = form_for @person do |form|
             .mailchimp-list
               - mailchimp_kit = @person.organization.kits.mailchimp
               = hidden_field_tag "person[subscribed_lists][]", nil, :id => "person_subscribed_lists_empty"
@@ -79,7 +79,7 @@
                 = label_tag "", :class => "checkbox" do
                   = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_lists.include?(list[:list_id]), :class => "mail-chimp-list", :disabled => @person.do_not_email
                   %span= list[:list_name]
-          = form.submit "Save", :class => 'btn btn-primary hidden'
+            = form.submit "Save", :class => 'btn btn-primary hidden'
 
   .span8
     #notes
@@ -146,13 +146,14 @@
   = render 'convert_to_company_modal'
   #edit-order-popup.modal
 
-- if current_user.current_organization.kits.mailchimp
-  .modal#subscribe-modal(role="dialog")
-    .modal-header
-      %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
-      %h3 MailChimp List Subscription
-    .modal-body
-      %p #{@person} will receive an email from MailChimp confirming their addition to this list
-    .modal-footer
-      %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
-      %button(class="btn btn-primary") OK
+-with_kit(:mailchimp) do
+  - if current_user.current_organization.kits.mailchimp
+    .modal#subscribe-modal(role="dialog")
+      .modal-header
+        %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
+        %h3 MailChimp List Subscription
+      .modal-body
+        %p #{@person} will receive an email from MailChimp confirming their addition to this list
+      .modal-footer
+        %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
+        %button(class="btn btn-primary") OK

data/config/locales/en.yml

@@ -184,6 +184,8 @@
         ends_at: "Membership ends"
       pass_type:
         tickets_allowed: "Number of Tickets"
+        starts_at: "Pass Starts"
+        ends_at: "Pass Ends"
       organization:
         # Blithering hack to get around Rails' miserable validation message handling
         cached_slug: "Sorry,"

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.alpha.1"
+  VERSION = "1.2.0.alpha.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.1
+  version: 1.2.0.alpha.2
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails