artfully_ose 1.2.0.pre.17 → 1.2.0.pre.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU3MDk2YWI5YTZiNmM0M2MxYjgxMWFlYTU2MmQ5NGY0MWMxYTkxYQ==
+    MGNjMDg0YzRmMDRiM2FkYjFhMzU0NzBmY2YyNjA2OTNjMjUzMzAwNw==
   data.tar.gz: !binary |-
-    ZDJhNTlhMzlhYTI0MTNjZTJhMWFkMjk4NzdhNjQzNDYyNjcxOTkzNA==
+    ODQ0MWUxN2EwYTNhOTRhOTdjNWEwM2I5NDViMTJlMzZjYmJmM2U3NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTJhNGYzZDM0OGY3MDdjZTI3YWI5NDYzNzBmZGI3OWI4ODkyZTU1NTQyNjBk
-    NWE5NGFkMmQxNjEzNGI3NzI0NjZmZTM5NDliYmY3NTBjMzIyOGUyMzNkM2Y4
-    ZDQxNWE4ZjM5MTNjZmY3NjVlMDkzMTkxYjIwYWUwMmUxYzlhZmY=
+    MmRkN2FhMzU0NmQzYmE5ZDk1OTFjZWZkNjkyMGQ4YjRhYWRlY2IzYWQ3ODdh
+    ZmU1MGNiNmZjOThjMjE5MDRkOGViOTBmMmYzYTUzZjNiYTEwYjNlOTQyYjFk
+    OWE3NDM1M2U0ZDAyNThkOGVjMDI1NGRmMzE2ZjQ0ZjYyODNiNmE=
   data.tar.gz: !binary |-
-    NzAxOTg1MThkMTlmYWEyMTU1NGIwNGRjNThlZDM0YTM1ZjgzOTJjOGFjOTgy
-    MWU2ZGE5Mzk1NWEwMWNkOGFhM2Y0YThiMzMwOGEyYzVjODkzZWVhNjNmZjVj
-    N2M4NDAzNDBlOTJkN2ZmNTA0MjkzNGIwYjU4NTVmNzZlMDAxMzQ=
+    ZjJmNGE5YzdlMTdkMDc4ODZlYzQ3MzA3OTc2NjA5OGY5MDdlNjBhNjY3YmVk
+    Y2EyZWQ1MzQ2OWNjZTU5OWRjZWY4NWZiNWY0OTBiZmM3MWE2N2YwY2VhM2Y2
+    YTZjMDA1M2IyYjljNmJlNGUwMjA2NjZlYzk3Y2M5NjU4NTMyMTg=

data/app/controllers/memberships_controller.rb

@@ -3,6 +3,7 @@ class MembershipsController < ArtfullyOseController
 
   def index
     @person = Person.find(params[:person_id])
+    @expired_count = @person.memberships.lapsed.count
     @membership_types = current_organization.membership_types
   end
 

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

@@ -29,7 +29,7 @@
 
     =form_tag bulk_update_person_memberships_path(@person), :method => :post do
       #items
-        %table.zebra.table
+        %table.zebra.table{'ng-init' => "scope = { showExpired: false, expiredStyle: {textDecoration: 'line-through'} }"}
           %thead
             %tr
               %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
@@ -40,13 +40,26 @@
               %th.right Fee
           %tbody
             - @person.memberships.each do |membership|
-              %tr
-                %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
-                %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
-                %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 membership.expired?
+                %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
+                  %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
+                  %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
+                  %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}"
+                  %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
+                  %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'
+        = link_to "Hide #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
 
       #extend.modal
         .modal-header

data/lib/artfully_ose/engine.rb

@@ -20,6 +20,7 @@ module ArtfullyOse
     
     initializer "artfully_ose.payment_model_paths" do |app|
       puts "ArtfullyOse: Initializing payment model paths"
+      puts config.root
       app.config.payment_model_paths       = []
       app.config.payment_model_paths      += Dir["#{config.root}/app/models/payments/*.rb"]
     end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.17"
+  VERSION = "1.2.0.pre.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.17
+  version: 1.2.0.pre.18
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails