artfully_ose 1.2.0 → 1.3.0.pre1

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

@@ -6,18 +6,24 @@
 
 .row
   .span12
-    .row-fluid
-      .span6
-        %ul.in-table
-          %li.dropdown{:id => "#menu#bulkactions"}
-            =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
-            %ul.dropdown-menu
-              %li
-                = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
-                = link_to "Send Reminder", "#pass-reminder-modal", 'data-toggle' => 'modal'
-      .span6.right
-        = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
-        = link_to "View Pass Codes", "#", :class => "btn", :id => "view-pass-codes"
+    - if current_user.can? :manage, Pass
+      .row-fluid
+        .span6
+          %ul.in-table
+            %li.dropdown{:id => "#menu#bulkactions"}
+              =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+              %ul.dropdown-menu
+                %li
+                  = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
+                  = link_to "Send Reminder", "#pass-reminder-modal", 'data-toggle' => 'modal'
+        .span6.right
+          = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
+          = link_to "View Pass Codes", "#", :class => "btn", :id => "view-pass-codes"
+    -else
+      .row-fluid
+        .span6
+        .span6.right
+          = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')    
     
     =form_tag bulk_update_person_passes_path(@person), :id => 'bulk-update-form', :method => :post do
       %table.table#passes-table{'ng-init' => "scope = { showExpired: false, expiredStyle: {textDecoration: 'line-through'} }"}
@@ -32,16 +38,19 @@
             %th.right Tickets Purchased
         - @passes.each do |pass|
           %tr
-            %td.grouped-checkbox= check_box_tag "pass_ids[]", pass.id, false, :id => "pass_id_#{pass.id}", :class => "pass-id-checkbox"
+            %td.grouped-checkbox
+              -if current_user.can? :manage, Pass
+                = check_box_tag "pass_ids[]", pass.id, false, :id => "pass_id_#{pass.id}", :class => "pass-id-checkbox"
             %td
               %span.pass-name=pass.pass_type.name
-              %span.pass-code-display.invisible
-                %strong=pass.pass_code
+              -if current_user.can? :manage, Pass
+                %span.pass-code-display.invisible
+                  %strong=pass.pass_code
             %td.right=l pass.created_at, :format => :slashed_date
             %td.right=l pass.starts_at, :format => :slashed_date
             %td.right=l pass.ends_at, :format => :slashed_date
             %td.right=pass.tickets_allowed
-            %td.right=pass.tickets_purchased
+            %td.right=pass.tickets.length
 
         - if @expired_passes.length > 0
           %tr
@@ -62,30 +71,32 @@
             %td.right=pass.tickets_allowed
             %td.right=pass.tickets.length
 
-      #extend.modal
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Change Expiration
-        .modal-body
-          .control-group
-            %label Change the expiration of these passes to:
-            .controls
-              .datepicker-alt-field
-              =hidden_field_tag "ends_at", ""
-        .modal-footer
-          =submit_tag "Change Expiration", :class => "btn btn-success"
-          =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal' 
+      -if current_user.can? :manage, Pass
+        #extend.modal
+          .modal-header
+            .close{'data-dismiss'=>'modal'} x
+            %h3 Change Expiration
+          .modal-body
+            .control-group
+              %label Change the expiration of these passes to:
+              .controls
+                .datepicker-alt-field
+                =hidden_field_tag "ends_at", ""
+          .modal-footer
+            =submit_tag "Change Expiration", :class => "btn btn-success"
+            =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
 
-    #pass-reminder-modal.modal
-      =form_tag reminder_person_passes_path(@person), :class => "form-horizontal", :id => "pass-reminder-form", :method => :post do
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Send Pass Reminder
-        .modal-body
-          %p="This passholder will receive an email with details on the selected passes."  
-        .modal-footer
-          =submit_tag "Resend Passes", :class => "btn btn-primary"
-          =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
+    -if current_user.can? :manage, Pass
+      #pass-reminder-modal.modal
+        =form_tag reminder_person_passes_path(@person), :class => "form-horizontal", :id => "pass-reminder-form", :method => :post do
+          .modal-header
+            .close{'data-dismiss'=>'modal'} x
+            %h3 Send Pass Reminder
+          .modal-body
+            %p="This passholder will receive an email with details on the selected passes."  
+          .modal-footer
+            =submit_tag "Resend Passes", :class => "btn btn-primary"
+            =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
 
 - content_for :custom_js do
   :javascript

data/app/views/passes_kits/edit.html.haml

@@ -23,6 +23,12 @@
       .span9
         = f.text_area :marketing_copy_sidebar, :class => "input-xxlarge wysihtml5", :rows => "8"
 
+    .row-fluid.bottom-room
+      .span3
+        = f.label :passes_storefront, 'Show Passes Storefront', :class => 'control-label'
+      .span9
+        = f.check_box :passes_storefront, :checked => @kit.organization.has_active_passes_storefront?
+
     .row-fluid.bottom-room
       .span3
         &nbsp

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

@@ -22,7 +22,7 @@
       %h3=@report.header
     .span3
       .pull-right
-        =link_to "Download CSV", passes_reports_path(code: @report.pass_type, start_date: @report.start_date, end_date: @report.end_date, format: "csv"), :class => "btn"
+        =link_to "Download CSV", passes_reports_path(:pass_type => @report.pass_type, :start_date => @report.start_date, :end_date => @report.end_date, :format => "csv"), :class => "btn"
 
   #statement-summary.bottom-room.well
     .row-fluid

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

@@ -54,7 +54,7 @@
 .card
   .left-side
     .qr-code
-      %img{:src => (member.download_link_for(:qr_code) rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
+      %img{:src => (member.download_link_for(:qr_code).html_safe rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
 
   .right-side
     .organization-name #{member.organization.name}

data/app/views/pdfs/member_card_generator/blanks_usa_idc6.html.haml

@@ -97,7 +97,7 @@
       %div{:class => classes.join(' ')}
         .left-side
           .qr-code
-            %img{:src => (member.download_link_for(:qr_code) rescue 'http://placehold.it/120/ffffff.png&text=No+QR+Code')}
+            %img{:src => (member.download_link_for(:qr_code).html_safe rescue 'http://placehold.it/120/ffffff.png&text=No+QR+Code')}
 
         .right-side
           .organization-name #{member.organization.name}

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

@@ -19,7 +19,7 @@
       box-sizing: border-box;
     }
     .ticket:nth-child(4n+4) {
-      margin-bottom: 1.1in;
+      margin-bottom: 2.2in;
     }
     .qr-code img {
       margin-left: 1px;
@@ -51,7 +51,9 @@
     }
   </style>
 
-- pdfable.tickets.each do |item|
+- pdfable = @order if @order.present?
+    
+- pdfable.printable_tickets.each do |item|
   :ruby
     order        = pdfable
     person       = order.person
@@ -64,7 +66,7 @@
   .ticket
     .right-side
       .qr-code
-        %img{:src => (product.qr_code_url rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
+        %img{:src => (product.qr_code_url.html_safe rescue 'http://placehold.it/150/ffffff.png&text=No+QR+Code')}
       .order-number Order ##{order.id}
 
     .left-side

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

@@ -0,0 +1,40 @@
+.fields.address-fields
+  .controls
+    = f.label :address, :class => 'control-label'
+    .control
+      = f.text_field :address1
+      %span.remove-fields-link
+        = f.hidden_field :_destroy
+        %i.fa.fa-minus-circle.icon-gray
+        = link_to_remove_fields "remove", f, "onRemoveAddress()"
+
+  .controls
+    %label{:class => 'control-label'}
+    .control
+      = f.text_field :address2
+  .controls
+    = f.label :country, :class => 'control-label'
+    .control
+      = f.select :country, [f.object.country], :selected => f.object.country
+  .controls
+    = f.label :state, "State / Province", :class => 'control-label'
+    .control
+      = f.select :state, [f.object.state], :selected => f.object.state, :class => "region"
+  .controls
+    = f.label :city, :class => 'control-label'
+    .control
+      = f.text_field :city
+  .controls
+    = f.label :zip, "Zip / Postal Code", :class => 'control-label'
+    .control
+      = f.text_field :zip
+  .controls
+    = f.label ' ', :class => 'control-label'
+    .control
+      = f.select :kind, Address.kinds, {}, :class => 'input-small'
+      %label.checkbox{:style=> 'display:inline-block'}
+        = f.check_box :is_primary
+        Primary
+
+  %br
+

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

@@ -20,6 +20,9 @@
           %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Other'}", "ng-click" => "data.subtype = 'Other'"} Other
         = form.label :company_name, "Company Name"
         = form.text_field :company_name, "ng-model" => "data.company_name", "ng-init" => "data.company_name = '#{@person.company_name}'"
+        = form.hidden_field :birth_day, value: nil
+        = form.hidden_field :birth_month, value: nil
+        = form.hidden_field :birth_year, value: nil
     .modal-footer
       = form.submit 'Convert', :class => 'btn btn-primary save-person', "ng-disabled" => "!data.subtype || !data.company_name"
       = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'

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

@@ -13,7 +13,7 @@
       .row
         .span2
           %ul.nav.nav-accordion
-            %li.active.tab= link_to 'Basics', '#basics', 'data-toggle' => 'tab' unless except.include? :basics
+            %li.active.tab= link_to 'Names', '#basics', 'data-toggle' => 'tab' unless except.include? :basics
             %li.tab= link_to 'Address', '#address', 'data-toggle' => 'tab' unless except.include? :address
             %li.tab= link_to 'Phone', '#phone', 'data-toggle' => 'tab' unless except.include? :phone
             %li.tab= link_to 'Social Media', '#social-media', 'data-toggle' => 'tab' unless except.include? :social
@@ -21,7 +21,7 @@
               %li.tab-relationships= link_to 'Relationships', '#relationships' unless except.include? :relationships
             -with_kit(:relationships) do
               - if @person.individual?
-                %li.tab-households= link_to 'Households', '#households' unless except.include? :households
+                %li.tab-households= link_to 'Household', '#households' unless except.include? :households
         .span7
           .tab-content
             - unless except.include? :basics
@@ -51,22 +51,36 @@
                   .controls
                     = form.label :suffix, :class => 'control-label'
                     .control= form.text_field :suffix
+                  .controls
+                    = form.label :nickname, :class => 'control-label'
+                    .control= form.text_field :nickname
+                  .controls
+                    = form.label :listing_name, "Listing Name", :class => 'control-label'
+                    .control= form.text_field :listing_name
+                  .controls
+                    = form.label :maiden_name, "Maiden Name", :class => 'control-label'
+                    .control= form.text_field :maiden_name
                   .controls
                     = form.label :title, :class => 'control-label'
                     .control= form.text_field :title
                 .controls
                   = form.label :company_name, "Company Name", :class => 'control-label'
                   .control= form.text_field :company_name
+                -if @person.company?
+                  .controls
+                    = form.label :nickname, :class => 'control-label'
+                    .control= form.text_field :nickname
                 .controls
                   = form.label :email, :class => 'control-label'
                   .control= form.text_field :email
-                .controls.control-label Birthday
-                .year{:data => { 'person-birth_year' => @person.birth_year }}
-                .day{:data => { 'person-birth_day' => @person.birth_day }}
-                  .control
-                    = form.select :birth_month, [["January", 1], ["February", 2], ["March", 3], ["April", 4], ["May", 5], ["June", 6], ["July", 7], ["August", 8], ["September", 9], ["October", 10], ["November", 11], ["December", 12]], { :include_blank => true }, { :class => 'span2', :id => 'birth_month' }
-                    = form.select :birth_day, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_day' }
-                    = form.select :birth_year, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_year' }
+                - if @person.individual?
+                  .controls.control-label Birthday
+                  .year{:data => { 'person-birth_year' => @person.birth_year }}
+                  .day{:data => { 'person-birth_day' => @person.birth_day }}
+                    .control
+                      = form.select :birth_month, [["January", 1], ["February", 2], ["March", 3], ["April", 4], ["May", 5], ["June", 6], ["July", 7], ["August", 8], ["September", 9], ["October", 10], ["November", 11], ["December", 12]], { :include_blank => true }, { :class => 'span2', :id => 'birth_month' }
+                      = form.select :birth_day, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_day' }
+                      = form.select :birth_year, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_year' }
                 - if @person.individual? && @person.member.nil?
                   .controls
                     - unless except.include? :convert
@@ -74,31 +88,14 @@
 
             - unless except.include? :address
               #address.tab-pane
-                = form.fields_for :address do |address_form|
-                  .controls
-                    = address_form.label :address, :class => 'control-label'
-                    .control
-                      = address_form.text_field :address1
-                  .controls
-                    %label{:class => 'control-label'}
-                    .control
-                      = address_form.text_field :address2
-                  .controls
-                    = address_form.label :country, :class => 'control-label'
-                    .control
-                      = address_form.select :country, [@person.address.country], :selected => @person.address.country
-                  .controls
-                    = address_form.label :state, "State / Province", :class => 'control-label'
-                    .control
-                      = address_form.select :state, [@person.address.state], :selected => @person.address.state, :class => "region"
-                  .controls
-                    = address_form.label :city, :class => 'control-label'
-                    .control
-                      = address_form.text_field :city
-                  .controls
-                    = address_form.label :zip, "Zip / Postal Code", :class => 'control-label'
-                    .control
-                      = address_form.text_field :zip
+                - @person.addresses.build if @person.addresses.empty?
+                = form.fields_for :addresses do |address_form|
+                  = render "people/address_fields", :f => address_form
+                .control-group
+                  %label.control-label
+                  .controls.address-section-disabled
+                    %i.fa.fa-plus-circle.icon-gray
+                    = link_to_add_fields 'Add another address', form, :addresses, "people", "onAddAddress()"
 
             - unless except.include? :phone
               #phone.tab-pane
@@ -136,7 +133,7 @@
                   = form.label :linked_in_url, 'LinkedIn', :class => 'control-label'
                   .control
                     .input-prepend
-                      %span.add-on http://linkedin.com/in/
+                      %span.add-on http://linkedin.com/
                       = form.text_field :linked_in_url
 
             - unless except.include? :relationships
@@ -146,9 +143,8 @@
                   = render "relationship_fields", :f => relationship_form
 
                 .control-group
-                  %label.control-label
                   .controls
-                    %i.fa.fa-plus-cirlce.icon-gray
+                    %i.fa.fa-plus-circle.icon-gray
                     = link_to_add_fields 'Add another relationship', form, :relationships
 
             - unless except.include? :households
@@ -162,14 +158,43 @@
                       = link_to "Add to new household", new_household_url(:individuals => [@person.id]), :class => "btn"
 
     .modal-footer
-      = form.submit 'Save', :class => 'btn btn-primary save-person'
+      = form.submit 'Save', :class => 'btn btn-primary save-person', :data => {:disable_with => "Saving..."}
       = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
 
 
 - content_for :custom_js do
   // change modal based on tab
   :javascript
+
+    $(function(){
+      var relations = #{Relation.all.to_json(:except => [:created_at, :updated_at])};
+      $('.relationship-fields select').on('change', function(){
+        var value = $(this).val();
+        var relation;
+        for (var i in relations){
+          if(relations[i]["id"] == value){
+            relation = relations[i];
+          }
+        }
+        var elem = $(this).closest('.controls').find('.other-input');
+        if(relation.other_can_be_company && relation.other_can_be_individual){
+          elem.attr('placeholder', 'Individual or Company');
+        } else if (relation.other_can_be_company) {
+          elem.attr('placeholder', 'Company');
+        } else {
+          elem.attr('placeholder', 'Individual');
+        }
+      });
+    });
+
     $(document).ready(function() {
+      var $primary_checks_group =  $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']")
+      checkPrimary($primary_checks_group);
+
+      $("select[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_country']").each(function() {
+        setLocationSelector($(this).attr("id"));
+      });
+
       $('.tab-relationships a').click(function (e) {
         e.preventDefault();
         $(this).tab('show');
@@ -184,3 +209,61 @@
         $('#edit-person .save-person').show();
       })
     });
+
+    function setLocationSelector(countryId) {
+      $(document).locationSelector({
+        'countryField' : "#" + countryId,
+        'regionField' : "#" + countryId.replace("country", "state")
+      });
+    }
+
+    function onAddAddress() {
+      setLocationSelector($("select[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_country']").last().attr('id'));
+
+      var $primary_checks_group =  $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible")
+      checkPrimary($primary_checks_group);
+
+      if ($primary_checks_group.length > 1) {
+        $primary_checks_group.each(function() {
+          $(this).removeAttr('disabled');
+        });
+        $primary_checks_group.last().prop('checked', false);
+      }
+    }
+
+    function onRemoveAddress() {
+      var $primary_checks_group =  $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible")
+      checkPrimary($primary_checks_group);
+
+      var checked_count = $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible:checked").length
+      if (checked_count == 0) {
+        $primary_checks_group.first().prop('checked', true);
+      }
+    }
+
+    function checkPrimary($primary_checks_group) {
+      //if single address, mark it primary and checkbox is not editable
+      if($primary_checks_group.length == 1) {
+        var $primary_check = $primary_checks_group.first()
+        $primary_check.prop('checked', true);
+        $primary_check.attr('disabled', true);
+        $primary_check.parent().find('input:hidden:first').val(1);
+      }
+
+      // is_primary checkboxes behave like radio buttons
+      $(".tab-pane#address input:checkbox").click(function(){
+        $primary_checks_group.each(function() {
+          $(this).prop("checked",false);
+          $(this).parent().find('input:hidden:first').val(0);
+        });
+        $(this).prop("checked",true);
+      });
+
+      // allow adding max 3 addresses
+      if($primary_checks_group.length > 2) {
+        $('.address-section-disabled a').css("pointer-events", "none").css("color", "grey").text('Add another address (limit 3)');
+      } else {
+        $('.address-section-disabled a').css("pointer-events", "auto").css("color", "#08c").text('Add another address');
+      }
+
+    }