artfully_ose 1.2.0.pre.21 → 1.2.0.pre.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc1ZGFhYjJlMjczOGExMjQ2MWMwMjRlNGIzYTA5MjlhMmM4YTQ4ZA==
+    ODcyYzg1ZTUzZmI5NjVlNzgzNDdmMTcyN2EwNDMwOTI1NTJjZjQ1Zg==
   data.tar.gz: !binary |-
-    YjUzYjk1MzdiZWE5ZmY5NzJmMzhhNDZjNTY0NzBiNWZhMGU1YTY0ZA==
+    MDljN2U0ODMzZWZiMWY2NWEwOTU4ZWE0ZWZjYTIzOTYzZjEyYTNkOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjdiOWI1ZmZjNTBiOTc1NjAwNTZlMTgwNGZlYjc1NWQxM2E4NGM3M2FmZmQ3
-    OTE4MjZjNzMwMmZlZjBmMGRjODMwN2RjZjMxNzVjNTZlMTFhNzZjMzNmM2Qx
-    NTAzM2RkN2E2NDE3YTg0NzA1ZWZjY2Y4MmY4MzA1YTJlMzIwZGQ=
+    ZTcwMzgwY2NiNWExZTVlYzkxYTg5ZmUxZjBmYzM2OGEwYzIwZTk1OTQ2Mzc2
+    YjllMTgyMWUyMzRlM2NlNzExYmI4N2I4ZDUwM2Q3YjA2ZDA0NDI0YzFjYjgx
+    N2E5NzgxZWZhMjZlMTVjOTRmZTA2YThjMzc1ZjdmYTc0Nzk0NjY=
   data.tar.gz: !binary |-
-    YjEzZDcxNjQ1MmI3OTkyMmY3N2U5MWQ1NmQyYTQ3YzM1YmZiYTA1ZWY4NzEx
-    Y2E4NTc0MTY0MDQ4ZTBiZjA3NzE4YWZlNTg3YzBkYjIzYmUwZGE3NjYzN2Fh
-    YjgzMDE3NzM0NTliZTFiYjJlNmM0NGQxNmI5ZjlkNmFiYzEyNjg=
+    ZWE5MTFhMTI3YWFiNGJhMmRlMDU3ZmNkM2JiYmJjYWM1ZDQ3NWRiNWE3YTU1
+    NzJkZGUwMTlhZTg3Y2Y1ZWU0YjY2MGViYzU3YWY2NWE0MzM5YThjMTcyN2Yx
+    MjAwMzIwMTZmNWRiMDk2MTFhOTU1ZDFjZjQ4NGI1NjBhN2EyMDU=

data/app/assets/javascripts/change-membership.js

@@ -112,12 +112,16 @@ angular.module('artfully').controller('MembershipActionsCtrl', ['$scope', 'membe
 angular.module('artfully').controller('ChangeMembershipController', ['$scope', 'membershipSelections', function($scope, membershipSelections) {
 
   // Template variables
-  $scope.payment_method = 'cash';
+  $scope.payment_method = '';
   $scope.price          = 0;
-  $scope.total          = 0;
+  $scope.total          = '$0.00';
   $scope.selected       = {};
 
   // Helpers
+  $scope.comped = function() {
+    return !!('' == $scope.payment_method || 'comp' == $scope.payment_method);
+  }
+
   $scope.updateTotal = function() {
     var price = parseFloat($scope.price.substr(1).replace(/,/, ""));
     var total = (Object.keys($scope.selected).length * price);
@@ -135,9 +139,9 @@ angular.module('artfully').controller('ChangeMembershipController', ['$scope', '
 
   // Clear the list of selected ids when the modal is hidden
   $("#change").on('hidden', function(hidden) {
-    $scope.payment_method = 'cash';
+    $scope.payment_method = '';
     $scope.price = 0;
-    $scope.total = 0;
+    $scope.updateTotal();
     $scope.selected = {};
 
     // Reset the form

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

@@ -2,12 +2,12 @@ $(document).ready(function () {
 
   /***** Calendar for existing shows *****/
 
-  var cal = $('#show-calendar')
-  cal.fullCalendar({
+  var showCal = $('#show-calendar')
+  showCal.fullCalendar({
     height: 500
     ,eventSources: [ 
       { 
-        url: '/events/'+cal.attr('data-event-id')+'.json', color: "#adadad"
+        url: '/events/'+showCal.attr('data-event-id')+'.json', color: "#adadad"
         ,success: function(data) { 
           $.each(data, function (index, obj) {
             if(obj.state == "unpublished") {
@@ -31,7 +31,7 @@ $(document).ready(function () {
   var cal = $('#new-show-calendar')
   cal.fullCalendar({
       height: 400
-      ,eventSources: [ { url: '/events/'+cal.attr('data-event-id')+'.json', color: "#adadad" } ]
+      ,eventSources: [ { url: '/'+cal.attr('data-event-type')+'/'+cal.attr('data-event-id')+'.json', color: "#adadad" } ]
       ,events: eventArray
       ,dayClick: function(date, allDay, jsEvent, view) {
         var validShow = true
@@ -147,10 +147,15 @@ $(document).ready(function () {
   });
 
   $(".sprited").on("ajax:success", function(xhr, show){
-    var $row = $(this).closest(".sprited-container");
-    $(this).find(":submit").removeAttr('disabled');
-    $row.removeClass("pending built published unpublished")
-    $row.addClass(show.state);
+    var container = $(this).parents(".sprited-container");
+    var sprited = $(".sprited-element", container)
+    sprited.push(container)
+
+    $.each(sprited, function () {
+      $(this).find(":submit").removeAttr('disabled');
+      $(this).removeClass("pending built published unpublished")
+      $(this).addClass(show.state);
+    }) 
     $('.show-state').html(show.state)
   });
 

data/app/assets/javascripts/locationselector.js

@@ -43,7 +43,7 @@
       "Canada": new Array('Alberta','British Columbia','Manitoba','New Brunswick','Newfoundland and Labrador','Northwest Territories','Nova Scotia','Nunavut','Ontario','Prince Edward Island','Quebec','Saskatchewan','Yukon'),
       "France": new Array('Alsace','Aquitaine','Auvergne','Basse-Normandie','Bourgogne','Bretagne','Centre','Champagne-Ardenne','Corse','Franche-Comté','Guadeloupe','Guyanne','Haute-Normandie','Île-de-France','Languedoc-Rousillon','Limousin','Lorraine','Martinique','Midi-Pyrénées','Nord-Pas-de-Calais','Pays de la Loire','Picardie','Poitou-Charentes','Provence-Alpes-Côte d\'Azur','Réunion','Rhône-Alpes'),
       "United Kingdom": new Array('Aberdeen City','Aberdeenshire','Angus','Antrim','Argyll and Bute','Armagh','Avon','Bedfordshire','Berkshire','Blaenau Gwent','Borders','Bridgend','Bristol','Buckinghamshire','Caerphilly','Cambridgeshire','Cardiff','Carmarthenshire','Ceredigion','Channel Islands','Cheshire','Clackmannan','Cleveland','Conwy','Cornwall','Cumbria','Denbighshire','Derbyshire','Devon','Dorset','Down','Dumfries and Galloway','Dundee (City of)','Durham','East Ayrshire','East Dunbartonshire','East Lothian','East Renfrewshire','East Riding of Yorkshire','East Sussex','Edinburgh (City of)','Essex','Falkirk','Fermanagh','Fife Glasgow (City of)','Flintshire','Gloucestershire','Greater Manchester','Gwynedd','Hampshire','Herefordshire','Hertfordshire','Highland','Humberside','Humberside','Inverclyde','Isle of Anglesey','Isle of Man','Isle of Wight','Isles of Scilly','Kent','Lancashire','Leicestershire','Lincolnshire','London','Londonderry','Merseyside','Merthyr Tydfil','Middlesex','Midlothian','Monmouthshire','Moray','Neath Port Talbot','Newport','Norfolk','North Ayrshire','North Lanarkshire','North Yorkshire','Northamptonshire','Northumberland','Nottinghamshire','Orkney','Oxfordshire','Pembrokeshire','Perthshire and Kinross','Powys','Renfrewshire','Rhondda Cynon Taff','Rutland','Shetland','Shropshire','Somerset','South Ayrshire','South Lanarkshire','South Yorkshire','Staffordshire','Stirling','Suffolk','Surrey','Swansea','The Vale of Glamorgan','Torfaen','Tyne and Wear','Tyrone','Warwickshire','West Dunbartonshire','West Lothian','West Midlands','West Sussex','West Yorkshire','Western Isles','Wiltshire','Worcestershire','Wrexham'),
-      "United States": new Array('Alaska','Alabama','American Samoa','Arkansas','Armed Forces Africa','Armed Forces Europe','Armed Forces Pacific','Arizona','California','Colorado','Connecticut','District of Columbia','Delaware','Federated States of Micronesia','Florida','Georgia','Guam','Hawaii','Iowa','Idaho','Illinois','Indiana','Kansas','Kentucky','Louisiana','Massachusetts','Northern Mariana Islands','Marshall Islands','Maryland','Maine','Michigan','Minnesota','Missouri','Mississippi','Montana','North Carolina','North Dakota','Nebraska','New Hampshire','New Jersey','New Mexico','Nevada','New York','Ohio','Oklahoma','Oregon','Pennsylvania','Palau','Puerto Rico','Rhode Island','South Carolina','South Dakota','Tennessee','Texas','Utah','Virginia','Virgin Islands','Vermont','Washington','Wisconsin','West Virgina','Wyoming')
+      "United States": new Array('Alaska','Alabama','American Samoa','Arkansas','Armed Forces Africa','Armed Forces Europe','Armed Forces Pacific','Arizona','California','Colorado','Connecticut','District of Columbia','Delaware','Federated States of Micronesia','Florida','Georgia','Guam','Hawaii','Iowa','Idaho','Illinois','Indiana','Kansas','Kentucky','Louisiana','Massachusetts','Northern Mariana Islands','Marshall Islands','Maryland','Maine','Michigan','Minnesota','Missouri','Mississippi','Montana','North Carolina','North Dakota','Nebraska','New Hampshire','New Jersey','New Mexico','Nevada','New York','Ohio','Oklahoma','Oregon','Pennsylvania','Palau','Puerto Rico','Rhode Island','South Carolina','South Dakota','Tennessee','Texas','Utah','Virginia','Virgin Islands','Vermont','Washington','Wisconsin','West Virginia','Wyoming')
     }
   
     return this.each(function() {

data/app/assets/javascripts/store/store.js

@@ -71,6 +71,13 @@ $(document).ready(function(){
     $('tr#discount-input').show();
   });
 
+  $('#pass-code-link a').click(function(e) {
+    e.preventDefault();
+    $('tr#pass-code-link').hide();
+    $('tr#pass-code-display').hide();
+    $('tr#pass-code-input').show();
+  });
+
   // add * to required field labels
   $('label.required').append('&nbsp;<strong>*</strong>&nbsp;');
 

data/app/assets/stylesheets/application.sass

@@ -118,6 +118,13 @@ ul#memberships
   height: 150px
   #text
     padding-top: 50px
+
+#add-a-pass-type
+  text-align: center
+  width: 75%
+  height: 150px
+  #text
+    padding-top: 50px
     
 #day-date
   width: 95%
@@ -229,7 +236,14 @@ ul.built li.built,
 ul.pending li.pending, 
 ul.destroyable li.destroyable
   display: inline
+
+tr.unpublished
+  background-color: #EEE
   
+tr.valign
+  td
+    vertical-align: middle
+
 .dialog
   display: none
   
@@ -434,7 +448,7 @@ a.artfully-tooltip, a.artfully-tooltip:hover
   text-decoration: none
 
 // People Records
-body[data-controller=people][data-action=show], body[data-controller=memberships][data-action=index]
+body[data-controller=people][data-action=show], body[data-controller=memberships][data-action=index], body[data-controller=passes][data-action=index]
   padding-top: 10px
 
 .person-header
@@ -676,3 +690,9 @@ p.alternate_form_link
 
 .bordered-section
   border-bottom: 1px solid #ACACAE
+
+.control-group
+  .controls
+    label
+      margin-bottom: 5px
+      padding-top: 5px

data/app/assets/stylesheets/sass/_tags.sass

@@ -39,11 +39,22 @@ ul.tags
     
 .tag
   background-color: #f8930a
-  border-right: 1px solid #a85300
-  border-bottom: 1px solid #a85300
   padding: 2px 4px 2px 4px
   font-size: 10pt
   color: #EEEEEE
+.tag-member
+  background-color: #175c71
+  padding: 3px 5px 3px 5px
+  a 
+    font-weight: normal
+    color:white
+.tag-passholder
+  background-color: #8e0a34
+  padding: 3px 5px 3px 5px
+  font-weight: normal
+  a 
+    font-weight: normal
+    color:white
 
 .tag-error
   color: #991111

data/app/controllers/discounts_controller.rb

@@ -60,6 +60,13 @@ private
   end
 
   def grab_ticket_type_names
-    @ticket_type_names = @event.charts.includes(:sections => :ticket_types).collect{|c| c.ticket_types.collect{|s| s.name}}.flatten.uniq.sort
+    @ticket_type_names = []
+    @event.charts.includes(:sections => :ticket_types).each do |chart|
+      chart.sections.each do |section|
+        @ticket_type_names << section.ticket_types.collect{ |tt| tt.name }
+      end
+    end
+    @ticket_type_names = @ticket_type_names.flatten.uniq.sort
+    @ticket_type_names
   end
 end

data/app/controllers/events_controller.rb

@@ -1,7 +1,7 @@
 class EventsController < ArtfullyOseController
   respond_to :html, :json
 
-  before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin ]
+  before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin, :passes ]
   before_filter :upcoming_shows, :only => :show
   before_filter { authorize! :view, @event if @event }
 
@@ -71,18 +71,8 @@ class EventsController < ArtfullyOseController
     authorize! :edit, @event
 
     if @event.update_attributes(params[:event])
-      if user_requesting_next_step?
-        if user_just_uploaded_an_image?
-          redirect_to messages_event_path(@event)
-        elsif user_set_special_instructions?
-          redirect_to event_shows_path(@event)
-        else
-          redirect_to edit_event_venue_path(@event)
-        end
-      else
-        flash[:notice] = "Your event has been updated."
-        redirect_to event_url(@event)
-      end
+      build_flash_message
+      redirect_to redirect_path and return
     else
       render :edit
     end
@@ -107,6 +97,9 @@ class EventsController < ArtfullyOseController
   def prices
   end
 
+  def passes
+  end
+
   def messages
   end
 
@@ -116,6 +109,29 @@ class EventsController < ArtfullyOseController
   end
 
   private
+  
+    def redirect_path
+      if user_requesting_next_step?
+        if user_just_uploaded_an_image?
+          messages_event_path(@event)
+        elsif user_set_special_instructions?
+          event_shows_path(@event)
+        else
+          edit_event_venue_path(@event)
+        end
+      else
+        event_url(@event)
+      end
+    end
+    
+    def build_flash_message
+      if user_just_uploaded_an_image?
+        flash[:notice] = "We're processing your image and will have the new image up in a few minutes."
+      else
+        flash[:notice] = "Your event has been updated."
+      end
+    end
+    
     def find_event
       @event = Event.find(params[:id])
     end

data/app/controllers/events_pass_types_controller.rb

@@ -0,0 +1,75 @@
+class EventsPassTypesController < ArtfullyOseController
+  before_filter :find_event, :grab_ticket_type_names
+  before_filter { authorize! :view, @event if @event }
+
+  def index
+    @no_pass_types = current_organization.pass_types.empty?
+    @events_pass_types = @event.events_pass_types
+
+    # if they've set up a pass type but this event doesn't have any pass types yet, then kick them right to /new
+    if @events_pass_types.empty? && !@no_pass_types
+      redirect_to new_event_events_pass_type_path(@event) and return
+    end
+  end
+
+  def new
+    @events_pass_type = EventsPassType.new
+    @pass_type_options = current_organization.pass_types
+                                             .reject{|pt| @event.events_pass_types.collect(&:pass_type_id).include?(pt.id)}
+                                             .collect{|pass_type| [pass_type.name, pass_type.id]}.sort{|a, b| a[0] <=> b[0]}
+    
+    @pass_types = current_organization.pass_types.empty?
+  end
+
+  def create
+    @events_pass_type = EventsPassType.new.tap do |ept|
+      ept.organization = current_organization
+      ept.event = @event
+      ept.pass_type = current_organization.pass_types.find(params[:events_pass_type][:pass_type])
+      ept.ticket_types = Set.new(params[:events_pass_type][:ticket_types].reject!(&:blank?))
+      ept.excluded_shows = Set.new(params[:events_pass_type][:excluded_shows].reject!(&:blank?))
+      ept.active = params[:events_pass_type][:active]
+    end
+
+    if @events_pass_type.save
+      flash[:notice] = "Your pass has been attached to this event."
+    else
+      flash[:error] = @events_pass_type.errors.full_messages.to_sentence
+    end
+    redirect_to event_events_pass_types_path(@event)
+  end
+
+  def edit
+    @events_pass_type = EventsPassType.find(params[:id])
+  end
+
+  def update 
+    @events_pass_type = EventsPassType.find(params[:id])
+    @events_pass_type.ticket_types = Set.new(params[:events_pass_type][:ticket_types].reject!(&:blank?))
+    @events_pass_type.excluded_shows = Set.new(params[:events_pass_type][:excluded_shows].reject!(&:blank?))
+    @events_pass_type.active = params[:events_pass_type][:active]
+
+    if @events_pass_type.save
+      flash[:notice] = "Your pass has been updated."
+    else
+      flash[:error] = @events_pass_type.errors.full_messages.to_sentence
+    end
+    redirect_to event_events_pass_types_path(@event)
+  end
+
+  private
+    def find_event
+      @event = current_organization.events.includes(:events_pass_types => :pass_type).find(params[:event_id])
+    end
+
+    def grab_ticket_type_names
+      @ticket_type_names = []
+      @event.charts.includes(:sections => :ticket_types).each do |chart|
+        chart.sections.each do |section|
+          @ticket_type_names << section.ticket_types.collect{ |tt| tt.name }
+        end
+      end
+      @ticket_type_names = @ticket_type_names.flatten.uniq.sort
+      @ticket_type_names
+    end
+end

data/app/controllers/imports_controller.rb

@@ -5,7 +5,7 @@ class ImportsController < ArtfullyOseController
 
   def index
     @imports = organization.imports.includes(:user, :organization).order('created_at desc').all
-    @sales_csv_download_link = sales_csv_download_link
+    @sales_csv_download_link, @donations_csv_download_link = download_links
   end
 
   def approve
@@ -104,7 +104,7 @@ class ImportsController < ArtfullyOseController
       @type = (params[:type] || session[:type])
     end
 
-    def sales_csv_download_link
+    def download_links
       s3 = AWS::S3.new(
           :access_key_id     => ENV['S3_ACCESS_KEY_ID'],
           :secret_access_key => ENV['S3_SECRET_ACCESS_KEY']
@@ -112,7 +112,14 @@ class ImportsController < ArtfullyOseController
       bucket = s3.buckets[ENV['S3_BUCKET']]
       object = bucket.objects[ItemView.sales_export_filename_for(current_organization)]
       url    = object.url_for(:read, :expires => 10*60)
-      url.to_s
+      sales_link = url.to_s
+
+      bucket = s3.buckets[ENV['S3_BUCKET']]
+      object = bucket.objects[ItemView.donations_export_filename_for(current_organization)]
+      url    = object.url_for(:read, :expires => 10*60)
+      donations_link = url.to_s
+
+      [sales_link, donations_link]
     end
 
 end

data/app/controllers/membership_types_controller.rb

@@ -18,6 +18,7 @@ class MembershipTypesController < ArtfullyOseController
   def new
     with_type_selected do
       @membership_type = Kernel.const_get(params[:type].camelize).new
+      @membership_type.hide_fee = true
     end
   end
 

data/app/controllers/pass_types_controller.rb

@@ -0,0 +1,42 @@
+class PassTypesController < ArtfullyOseController
+  requires_kit :passes
+
+  def index
+    @pass_types = current_organization.pass_types.includes(:passes).paginate(:page => params[:page], :per_page => 50)
+
+    respond_to do |format|
+      format.html
+
+      format.csv do
+        @filename = 'pass_types.csv'
+        @csv_string = @pass_types.to_comma
+        send_data @csv_string, :filename => @filename, :type => 'text/csv', :disposition => 'attachment'
+      end
+    end
+  end
+
+  def new
+    @pass_type = PassType.new
+  end
+
+  def create
+    @pass_type = PassType.new(params[:pass_type])
+    @pass_type.organization = current_organization
+    unless @pass_type.save
+      flash[:error] = @pass_type.errors.full_messages.to_sentence
+      render "new" and return
+    end
+    redirect_to pass_types_path
+  end
+
+  def edit
+    @pass_type = current_user.current_organization.pass_types.where(:id => params[:id]).first
+  end
+
+  def update
+    @pass_type = PassType.find(params[:id])
+    @pass_type.update_attributes(params[:pass_type])
+    flash[:notice] = "Your changes have been saved"
+    redirect_to pass_types_path
+  end
+end