artfully_ose 1.2.0.pre.19 → 1.2.0.pre.20

data/app/views/membership_mailer/refund_problem.text.haml

@@ -0,0 +1,14 @@
+="Refund Failed"
+="-------------"
+
+Order number: #{@order.id}
+Refund total: -$#{format("%.2f", @amount)}
+
+- unless @items.empty?
+  There was a problem while attempting to issue a refund for these memberships:
+
+  - @items.each do |item|
+    ="  * #{item.product.membership_type.name}"
+
+Message:
+="  #{@message}"

data/app/views/membership_types/_form.html.haml

@@ -5,12 +5,12 @@
     .control-group
       = f.label :name, "Name", :class => 'control-label'
       .controls
-        = f.text_field :name, :class => 'input'
+        = f.text_field :name, :class => 'input span6'
     .control-group
       = f.label :description, "Description", :class => 'control-label'
       .controls
-        = f.text_area :description, :rows => "5"
-    .control-group
+        = f.text_area :description, :rows => "5", :class => "span6"
+    .control-group{:style => "display: none"}
       = f.label :number_of_tickets, "Number of Tickets", :class => 'control-label'
       .controls
         = f.text_field :number_of_tickets, :class => "span1"
@@ -21,14 +21,7 @@
     .control-group
       = f.label :price, "Price", :class => 'control-label'
       .controls
-        = f.text_field :price, :class => 'input-small section-price currency'
-
-    .control-group
-      =f.label :hide_fee, "Hide service fee?", :class => 'control-label'
-      .controls
-        = f.select :hide_fee, options_for_select([["Yes", true], ["No", false]]), {}, :class => 'span1'
-        %br
-        =link_to "Learn more", "#pricing-example", "data-toggle" => "modal"
+        = f.text_field :price, :class => 'span2 section-price currency'
 
     .control-group
       = f.label :offer_renewal, "Offer renewal price?", :class => 'control-label'
@@ -39,55 +32,24 @@
     .control-group#renewal-price-group
       = f.label :renewal_price, "Renewal Price", :class => 'control-label'
       .controls
-        = f.text_field :renewal_price, :class => 'input-small section-price currency'
-
-    #pricing-example.modal
-      .modal-header
-        .close{'data-dismiss'=>'modal'} x
-        %h3 Pricing Example
-      .modal-body
-        %table.table.table-compact
-          %tr
-            %th
-            %th.right Hidden fee
-            %th.right Shown fee
-          %tr
-            %td Membership price
-            %td.right $100
-            %td.right $100
-          %tr
-            %td Patron pays
-            %td.right $100
-            %td.right $100 + 5% service = $105
-          %tr
-            %td You receive
-            %td.right 
-              $100
-              %br
-                ="- 5% service" 
-              %br
-                ="- 3.5% processing" 
-              %br
-                ="$91.68"
-            %td.right $100 - 3.5% processing = $96.5
-      .modal-footer
-        = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'
+        = f.text_field :renewal_price, :class => 'span2 section-price currency'
 
+    =render :partial => "membership_type_fees", :locals => {:f => f}
 
-    / .control-group
-    /   = f.label :fee, "Member Fee", :class => 'control-label'
-    /   .controls
-    /     = f.text_field :fee, :class => 'input-small section-price currency'
   %fieldset
     %legend Storefront Copy
     .control-group
-      = f.label :thanks_copy, "Thanks Message", :class => 'control-label'
+      = f.label :thanks_copy, :class => 'control-label' do
+        Thanks Message
+        .tip.muted Thanks message will appear on the confirmation page after the patron completes purchase of the membership
       .controls
-        = f.text_area :thanks_copy, :rows => "5"
+        = f.text_area :thanks_copy, :rows => "5", :class => "span6"
     .control-group
-      = f.label :invitation_email_text_copy, "Email Message", :class => 'control-label'
+      = f.label :invitation_email_text_copy, :class => 'control-label' do
+        Email Message
+        .tip.muted Email message will appear in the email confirming the patron's membership
       .controls
-        = f.text_area :invitation_email_text_copy, :rows => "5"
+        = f.text_area :invitation_email_text_copy, :rows => "5", :class => "span6"
 
   %fieldset
     %legend Sales
@@ -101,7 +63,10 @@
         = f.text_field :sales_end_at, :value => "#{(l @membership_type.sales_end_at, :format => :date_for_input)  unless @membership_type.sales_end_at.nil?}", :class => :datepicker
 
     .control-group
-      = f.label :on_sale, "Show On Storefront", :class => 'control-label'
+      = f.label :on_sale, :class => 'control-label' do
+        Show On Storefront
+        .tip.muted If checked, this will be available on your
+        =link_to "Membership Storefront", store_memberships_path(current_user.current_organization.cached_slug), :target => "_blank"
       .controls
         %label
           = f.check_box :on_sale

data/app/views/membership_types/index.html.haml

@@ -6,14 +6,12 @@
     =icon_link_to("New Membership Type", new_membership_type_path, 'icon-plus', 'btn','')
     =link_to "Download CSV", membership_types_path(:format => "csv"), :class => "btn"
 
-%table.table
+%table.table#membership-types-table
   %tr
     %th Name
     %th.right # Sold
     %th.right Members
-    %th.right Tickets
     %th.right Price
-    %th.right Fee
     %th.right Visibility
     %th.right
   -@membership_types.each do |membership_type|
@@ -21,9 +19,7 @@
       %td=link_to membership_type.name, edit_membership_type_path(membership_type)
       %td.right=membership_type.memberships.count
       %td.right=link_to membership_type.members.count, segment_path(membership_type.segment)
-      %td.right=membership_type.number_of_tickets || "unlimited"
       %td.right=number_as_cents membership_type.price
-      %td.right=number_as_cents membership_type.fee
       %td.right
         %a{:href => "#", :class => "artfully-tooltip", :rel => "tooltip", "data-original-title" => "This membership is currently #{"not" unless membership_type.on_sale?} visible in your online Storefront.", "data-trigger" => "hover"}
           %span.badge{:class => "#{'badge-success' if membership_type.on_sale?}"}="S"

data/app/views/memberships/_membership_scripts.js.erb

@@ -0,0 +1,15 @@
+<% content_for :custom_js do %>
+<script type="text/javascript" charset="utf-8">
+ angular.module('artfully').factory('Memberships', function() {
+    var self = this;
+
+    this.personId = function() {
+      return <%= j(@person.id.to_s) %>;
+    };
+
+    return {
+      personId: this.personId
+    }
+  });
+</script>
+<% end %>

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

@@ -8,24 +8,27 @@
   .span12
     .row-fluid
       .span6
-        %ul.in-table
+        %ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
           %li.dropdown{:id => "#menu#bulkactions"}
             =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '')
+            =image_tag "loading.gif", :class => 'loading-indicator', 'ng-show' => 'loading'
+            .alert{'ng-show' => 'error'}
+              %button.close{'ng-click' => 'error = false'}
+                ×
+              ='{{errorMessage}}'
             %ul.dropdown-menu
-              %li
-                = link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
-              %li
-                = link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
+              -# %li= link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
+              -# %li= link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
               %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Change Membership Type", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
+                = link_to "Change Membership Type", "#change", 'ng-click' => 'change($event)'
               %li
-                = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
+                = link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
       .span6.right
         = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
-        = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
-        = link_to "Reset Password", "#", 'data-toggle' => 'modal', :class => 'btn btn-danger'
+        -# = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
+        = link_to "Reset Password", "#reset-password-modal", 'data-toggle' => 'modal', :class => 'btn btn-danger'
 
     =form_tag bulk_update_person_memberships_path(@person), :method => :post do
       #items
@@ -37,7 +40,6 @@
               %th Starts
               %th Expires
               %th.right Price Paid
-              %th.right Fee
           %tbody
             - @person.memberships.each do |membership|
               - if membership.expired?
@@ -47,7 +49,6 @@
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price
-                  %td.fee.right TODO
               - else
                 %tr
                   %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
@@ -55,7 +56,6 @@
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price
-                  %td.fee.right TODO
 
       - if @expired_count > 0
         = link_to "See #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
@@ -157,12 +157,13 @@
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
-    #cancel.modal
+    #reset-password-modal.modal
       .modal-header
         .close{'data-dismiss'=>'modal'} x
-        %h3 Cancel Membership
+        %h3 Reset Password
       .modal-body
-        %p="These memberships will be cancelled."  
+        %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."  
       .modal-footer
-        =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+        =link_to "Send Password Reset", reset_password_person_path(@person), :class => "btn btn-primary", 'data-dismiss'=>'modal', :method => :post
+        =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
+= render partial: 'membership_scripts.js'

data/app/views/order_mailer/confirmation_for.html.haml

@@ -52,3 +52,11 @@
         %span.price= "$#{format("%.2f", (item.price/100.00))}:"
         %span.name= "Donation to #{@order.organization.name_for_donations}"
 
+- unless @order.memberships.empty?
+  %h4 Memberships
+  %ul.donation-list
+    - @order.memberships.each do |item|
+      %li
+        %span.price= "$#{format("%.2f", (item.price/100.00))}:"
+        %span.name= "#{item.product.membership_type.membershipize}"
+

data/app/views/orders/_order_sidebar.html.haml

@@ -54,11 +54,9 @@
     .value= order.details
   %li
     %h6.key-full Special Instructions
-  %li
     .value= order.special_instructions
-  %li
+  %li#notes-display
     %h6.key-full Order Notes
-  %li
     .value= order.notes
     
 #edit-order-popup.modal

data/app/views/organizations/_form.html.haml

@@ -12,6 +12,12 @@
       = form.email_field :email, :placeholder => 'contact@organization.org', :required => true, :class => 'input-xlarge email-popup', "data-content" => "Your patrons will be able to respond to this email address when receiving ticket/donation receipts. You can change this at any time."
       %span.help-inline (default contact for your patrons)
 
+  - unless @organization.new_record?
+    .control-group
+      = form.label :cached_slug, 'Storefront URL', :class=>'control-label'
+      .controls
+        = form.text_field :cached_slug, :placeholder => @organization.cached_slug, :required => true, :class => 'input-xlarge'
+
 %fieldset
   %legend Details
   .control-group

data/app/views/pdfs/member.html.haml

@@ -0,0 +1,66 @@
+:plain
+  <style>
+    @import http://artfully-pdf-css.s3.amazonaws.com/helvetica.css;
+    
+    body {
+      padding: 0;
+      margin: 0;
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 13px;
+      line-height: 18px;
+      color: #000;
+    }
+    .card {
+      width: 3.5in; 
+      height: 2in;
+      border: 1px solid #000;
+      clear: both;
+      margin-bottom: 1in;
+    }
+    .qr-code img {
+      margin-left: 1px;
+      margin-top: 1px;
+      width: 150px;
+      height: 150px;
+    }
+    .left-side {
+      float: left
+    }
+    .right-side {
+      margin-top: 10px;
+    }
+    .organization-name {
+      font-weight: bold;
+    }
+    .membership {
+      margin-bottom: 10px;
+    }
+    .person-name {
+      font-weight: bold;
+    }
+    .membership-number {
+      margin-bottom: 10px;
+    }
+    .expiration {
+      font-size: 11px;
+    }
+  </style>
+
+:ruby
+  member     = pdfable
+  membership = member.memberships.current.first
+  person     = member.person
+
+.card
+  .left-side
+    .qr-code
+      %img{:src => (member.download_link_for(:qr_code) rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
+
+  .right-side
+    .organization-name #{member.organization.name}
+    .membership Member: #{membership.membership_type.name}
+
+    .person-name #{person.first_name} #{person.last_name}
+    .membership-number Member ##{member.member_number}
+
+    .expiration Valid until #{I18n.localize membership.ends_at, :format => :date}

data/app/views/pdfs/order.html.haml

@@ -0,0 +1,84 @@
+:plain
+  <style>
+    @import http://artfully-pdf-css.s3.amazonaws.com/helvetica.css;
+    
+    body {
+      padding: 0;
+      margin: 0;
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 13px;
+      line-height: 18px;
+      color: #000;
+    }
+    .ticket {
+      width: 5.5in; 
+      height: 2in;
+      border: 1px solid #000;
+      clear: both;
+      margin-bottom: 20px;
+      box-sizing: border-box;
+    }
+    .ticket:nth-child(4n+4) {
+      margin-bottom: 1.1in;
+    }
+    .qr-code img {
+      margin-left: 1px;
+      margin-top: 1px;
+      width: 150px;
+      height: 150px;
+    }
+    .left-side {
+      margin-left: 10px;
+      margin-top: 10px;
+    }
+    .show-name {
+      font-weight: bold;
+    }
+    .show-time {
+      margin-bottom: 10px;
+    }
+    .right-side {
+      float: right;
+    }
+    .order-number {
+      margin-left: 10px;
+    }
+    .venue {
+      margin-bottom: 10px;
+    }
+    .person-name {
+      font-weight: bold;
+    }
+  </style>
+
+- pdfable.tickets.each do |item|
+  :ruby
+    order        = pdfable
+    person       = order.person
+    organization = order.organization
+    product      = item.product
+    event        = product.event
+    show         = product.show
+    venue        = event.venue
+
+  .ticket
+    .right-side
+      .qr-code
+        %img{:src => (product.qr_code_url rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
+      .order-number Order ##{order.id}
+
+    .left-side
+      .organization-name= organization.name
+      .show-name= event.name
+      .show-time= I18n.localize show.datetime_local_to_event
+
+      .venue
+        #{venue.name} <br /> 
+        - if venue.address1.present?
+          #{venue.address1} <br /> 
+        - if venue.address2.present?
+          #{venue.address2} <br /> 
+        #{[venue.city,venue.state].select {|s| s.present?}.join(',')} #{venue.zip}
+
+      .person-name #{person.first_name} #{person.last_name}
+      .product #{product.ticket_type.name} #{number_as_cents product.price}

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

@@ -0,0 +1,23 @@
+-with_kit (:membership) do
+  -if person.email.blank?
+    %p= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
+    #comp-membership.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Comp Membership
+      .modal-body
+        Sorry! We can't comp memberships to patrons who don't have an email.
+      .modal-footer
+        = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'
+  -elsif person.company?
+    %p= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
+    #comp-membership.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Comp Membership
+      .modal-body
+        Sorry! We can't comp memberships to companies or institutions.
+      .modal-footer
+        = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'
+  -else
+    %p= link_to "Comp Membership", new_person_membership_comp_path(person)