_boxoffice.html.haml in artfully_ose-1.3.0.pre1

- old
+ new

@@ -18,31 +18,31 @@
 
         - if @event.organization.authorization_hash[:authorized]
           .ticket
             .input-prepend
               %span.add-on $
-              = number_field_tag 'donation', nil, :placeholder => '0.00', :id => 'order-donation', :class => 'order-donation'
+              = number_field_tag 'donation_amount', nil, :placeholder => '0.00', :id => 'order-donation', :class => 'order-donation'
               %span.lead
                 %strong
                   Donation
 
-        - if Discount.where(event_id:@event.id).any?
+        - if @show_discount_field
           .discount
             .ticket
               .input
-                = text_field_tag 'discount', nil, :id => 'order-discount', :class => 'order-discount'
+                = text_field_tag 'discount_or_pass_code', nil, :id => 'order-discount', :class => 'order-discount'
                 %span.lead
                   %strong
-                    Discount Code
+                    =@discount_caption
 
             .ticket
               .input
                 %span.lead.message
 
         #order-total
           %h3
-            .loading.hide
+            .loading.hide{:style=>"background: none !important"}
               #{image_tag('loading.gif')} calculating total...
             .message
               $0.00 Total
           = hidden_field_tag 'total'
   .row.row-blue-padded
@@ -123,9 +123,19 @@
     .span10
       .control-group
         %label.checkbox
           = check_box_tag "auto_check_in"
           Mark tickets as received on doorlist.
+  - if current_user.current_organization.kits.mailchimp && current_user.current_organization.kits.mailchimp.default_list_id.present?
+    .row.row-blue-padded
+      .span2
+        .row-blue-padded-left
+          %h6 5. MailChimp
+      .span10
+        .control-group
+          %label.checkbox
+            = check_box_tag "subscribe"
+            Send invitation to join our email list?
 
   .row
     .span10.offset2
       = submit_tag 'Checkout', :class => 'btn btn-large', :disabled => 'disabled', :id => 'checkout-now-button'
 