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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +8 -8
  2. data/app/controllers/memberships_controller.rb +1 -0
  3. data/app/views/memberships/index.html.haml +21 -8
  4. data/lib/artfully_ose/engine.rb +1 -0
  5. data/lib/artfully_ose/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MmU3MDk2YWI5YTZiNmM0M2MxYjgxMWFlYTU2MmQ5NGY0MWMxYTkxYQ==
4
+ MGNjMDg0YzRmMDRiM2FkYjFhMzU0NzBmY2YyNjA2OTNjMjUzMzAwNw==
5
5
  data.tar.gz: !binary |-
6
- ZDJhNTlhMzlhYTI0MTNjZTJhMWFkMjk4NzdhNjQzNDYyNjcxOTkzNA==
6
+ ODQ0MWUxN2EwYTNhOTRhOTdjNWEwM2I5NDViMTJlMzZjYmJmM2U3NQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NTJhNGYzZDM0OGY3MDdjZTI3YWI5NDYzNzBmZGI3OWI4ODkyZTU1NTQyNjBk
10
- NWE5NGFkMmQxNjEzNGI3NzI0NjZmZTM5NDliYmY3NTBjMzIyOGUyMzNkM2Y4
11
- ZDQxNWE4ZjM5MTNjZmY3NjVlMDkzMTkxYjIwYWUwMmUxYzlhZmY=
9
+ MmRkN2FhMzU0NmQzYmE5ZDk1OTFjZWZkNjkyMGQ4YjRhYWRlY2IzYWQ3ODdh
10
+ ZmU1MGNiNmZjOThjMjE5MDRkOGViOTBmMmYzYTUzZjNiYTEwYjNlOTQyYjFk
11
+ OWE3NDM1M2U0ZDAyNThkOGVjMDI1NGRmMzE2ZjQ0ZjYyODNiNmE=
12
12
  data.tar.gz: !binary |-
13
- NzAxOTg1MThkMTlmYWEyMTU1NGIwNGRjNThlZDM0YTM1ZjgzOTJjOGFjOTgy
14
- MWU2ZGE5Mzk1NWEwMWNkOGFhM2Y0YThiMzMwOGEyYzVjODkzZWVhNjNmZjVj
15
- N2M4NDAzNDBlOTJkN2ZmNTA0MjkzNGIwYjU4NTVmNzZlMDAxMzQ=
13
+ ZjJmNGE5YzdlMTdkMDc4ODZlYzQ3MzA3OTc2NjA5OGY5MDdlNjBhNjY3YmVk
14
+ Y2EyZWQ1MzQ2OWNjZTU5OWRjZWY4NWZiNWY0OTBiZmM3MWE2N2YwY2VhM2Y2
15
+ YTZjMDA1M2IyYjljNmJlNGUwMjA2NjZlYzk3Y2M5NjU4NTMyMTg=
data/app/controllers/memberships_controller.rb CHANGED
@@ -3,6 +3,7 @@ class MembershipsController < ArtfullyOseController
3
3
 
4
4
  def index
5
5
  @person = Person.find(params[:person_id])
6
+ @expired_count = @person.memberships.lapsed.count
6
7
  @membership_types = current_organization.membership_types
7
8
  end
8
9
 
data/app/views/memberships/index.html.haml CHANGED
@@ -29,7 +29,7 @@
29
29
 
30
30
  =form_tag bulk_update_person_memberships_path(@person), :method => :post do
31
31
  #items
32
- %table.zebra.table
32
+ %table.zebra.table{'ng-init' => "scope = { showExpired: false, expiredStyle: {textDecoration: 'line-through'} }"}
33
33
  %thead
34
34
  %tr
35
35
  %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
@@ -40,13 +40,26 @@
40
40
  %th.right Fee
41
41
  %tbody
42
42
  - @person.memberships.each do |membership|
43
- %tr
44
- %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
45
- %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
46
- %td.starts-at=l membership.starts_at, :format => :slashed_date
47
- %td.ends-at=l membership.ends_at, :format => :slashed_date
48
- %td.price.right=number_as_cents membership.sold_price
49
- %td.fee.right TODO
43
+ - if membership.expired?
44
+ %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
45
+ %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
46
+ %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
47
+ %td.starts-at=l membership.starts_at, :format => :slashed_date
48
+ %td.ends-at=l membership.ends_at, :format => :slashed_date
49
+ %td.price.right=number_as_cents membership.sold_price
50
+ %td.fee.right TODO
51
+ - else
52
+ %tr
53
+ %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
54
+ %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
55
+ %td.starts-at=l membership.starts_at, :format => :slashed_date
56
+ %td.ends-at=l membership.ends_at, :format => :slashed_date
57
+ %td.price.right=number_as_cents membership.sold_price
58
+ %td.fee.right TODO
59
+
60
+ - if @expired_count > 0
61
+ = link_to "See #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
62
+ = link_to "Hide #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
50
63
 
51
64
  #extend.modal
52
65
  .modal-header
data/lib/artfully_ose/engine.rb CHANGED
@@ -20,6 +20,7 @@ module ArtfullyOse
20
20
 
21
21
  initializer "artfully_ose.payment_model_paths" do |app|
22
22
  puts "ArtfullyOse: Initializing payment model paths"
23
+ puts config.root
23
24
  app.config.payment_model_paths = []
24
25
  app.config.payment_model_paths += Dir["#{config.root}/app/models/payments/*.rb"]
25
26
  end
data/lib/artfully_ose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ArtfullyOse
2
- VERSION = "1.2.0.pre.17"
2
+ VERSION = "1.2.0.pre.18"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: artfully_ose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.pre.17
4
+ version: 1.2.0.pre.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artful.ly
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-12 00:00:00.000000000 Z
11
+ date: 2013-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails