artfully_ose 1.2.0 → 1.3.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (577) hide show
  1. checksums.yaml +5 -13
  2. data/app/assets/images/actions/open.png +0 -0
  3. data/app/assets/images/actions/pledge.png +0 -0
  4. data/app/assets/images/actions/pledge.psd +0 -0
  5. data/app/assets/images/glyphish/gray/cancel.png +0 -0
  6. data/app/assets/images/loading_gray.gif +0 -0
  7. data/app/assets/javascripts/application.js +30 -4
  8. data/app/assets/javascripts/baseball_card.js.coffee +235 -0
  9. data/app/assets/javascripts/boxoffice.js +12 -49
  10. data/app/assets/javascripts/contributions.js +264 -0
  11. data/app/assets/javascripts/custom/advanced_searches.js +142 -0
  12. data/app/assets/javascripts/custom/endless-scroll.js +1 -1
  13. data/app/assets/javascripts/custom/job-monitor.js +73 -0
  14. data/app/assets/javascripts/custom/kits-config.js +0 -2
  15. data/app/assets/javascripts/custom/mailchimp.js +14 -0
  16. data/app/assets/javascripts/custom/people.js +31 -2
  17. data/app/assets/javascripts/custom/person-finder.js +34 -0
  18. data/app/assets/javascripts/custom/searches.js +12 -0
  19. data/app/assets/javascripts/custom/user-finder.js +111 -0
  20. data/app/assets/javascripts/households.js +12 -5
  21. data/app/assets/javascripts/ical.js +138 -0
  22. data/app/assets/javascripts/jquery-lib/jquery.timeago.js +221 -0
  23. data/app/assets/javascripts/locationselector.js +1 -1
  24. data/app/assets/javascripts/memberships.js +24 -0
  25. data/app/assets/javascripts/relationships.js +10 -0
  26. data/app/assets/javascripts/search.js +22 -0
  27. data/app/assets/javascripts/store/sliding-wizard.js +2 -2
  28. data/app/assets/javascripts/store/store.js +51 -6
  29. data/app/assets/javascripts/tags.js +44 -0
  30. data/app/assets/stylesheets/application.sass +331 -32
  31. data/app/assets/stylesheets/bootstrap-overrides.css +24 -9
  32. data/app/assets/stylesheets/boxoffice.css.scss +0 -4
  33. data/app/assets/stylesheets/sass/_campaigns.sass +43 -0
  34. data/app/assets/stylesheets/sass/_tags.sass +10 -1
  35. data/app/assets/stylesheets/sass/fa-color.css.scss +13 -0
  36. data/app/assets/stylesheets/sass/store.sass +7 -7
  37. data/app/concerns/cart_finder.rb +10 -0
  38. data/app/concerns/oh_noes.rb +1 -1
  39. data/app/controllers/actions_controller.rb +5 -5
  40. data/app/controllers/addresses_controller.rb +1 -1
  41. data/app/controllers/advanced_search_segments_controller.rb +97 -0
  42. data/app/controllers/advanced_searches_controller.rb +118 -0
  43. data/app/controllers/appeals_controller.rb +63 -0
  44. data/app/controllers/artfully_ose_controller.rb +20 -2
  45. data/app/controllers/campaigns_controller.rb +90 -0
  46. data/app/controllers/charts_controller.rb +8 -2
  47. data/app/controllers/console_sales_controller.rb +21 -23
  48. data/app/controllers/contributions_controller.rb +74 -43
  49. data/app/controllers/converts_controller.rb +21 -0
  50. data/app/controllers/delete_ticket_types_controller.rb +35 -0
  51. data/app/controllers/events_pass_types_controller.rb +10 -2
  52. data/app/controllers/export_controller.rb +4 -4
  53. data/app/controllers/households_controller.rb +63 -15
  54. data/app/controllers/imports_controller.rb +13 -10
  55. data/app/controllers/job_monitors_controller.rb +9 -0
  56. data/app/controllers/members/people_controller.rb +7 -5
  57. data/app/controllers/members/sessions_controller.rb +1 -0
  58. data/app/controllers/membership_comps_controller.rb +5 -20
  59. data/app/controllers/memberships_controller.rb +2 -2
  60. data/app/controllers/merges_controller.rb +7 -6
  61. data/app/controllers/mobile/users_controller.rb +18 -6
  62. data/app/controllers/notes_controller.rb +5 -1
  63. data/app/controllers/orders_controller.rb +30 -13
  64. data/app/controllers/organizations_controller.rb +8 -0
  65. data/app/controllers/passes_kits_controller.rb +2 -4
  66. data/app/controllers/people_controller.rb +105 -17
  67. data/app/controllers/pledges_controller.rb +64 -0
  68. data/app/controllers/preview_rows_controller.rb +29 -0
  69. data/app/controllers/regular_donation_kits_controller.rb +11 -6
  70. data/app/controllers/sales_controller.rb +72 -40
  71. data/app/controllers/searches_controller.rb +37 -6
  72. data/app/controllers/segments_controller.rb +33 -2
  73. data/app/controllers/settlements_controller.rb +13 -7
  74. data/app/controllers/shows_controller.rb +58 -24
  75. data/app/controllers/statements_controller.rb +2 -2
  76. data/app/controllers/store/checkouts_controller.rb +43 -26
  77. data/app/controllers/store/donations_controller.rb +27 -11
  78. data/app/controllers/store/memberships_controller.rb +37 -4
  79. data/app/controllers/store/orders_controller.rb +26 -10
  80. data/app/controllers/store/passes_controller.rb +30 -3
  81. data/app/controllers/tags_controller.rb +42 -0
  82. data/app/controllers/ticket_types_controller.rb +9 -2
  83. data/app/controllers/tickets_controller.rb +6 -4
  84. data/app/controllers/unacknowledged_gifts_controller.rb +45 -0
  85. data/app/controllers/user_memberships_controller.rb +47 -8
  86. data/app/helpers/advanced_searches_helper.rb +252 -0
  87. data/app/helpers/artfully_ose_helper.rb +33 -4
  88. data/app/helpers/checkouts_helper.rb +16 -0
  89. data/app/helpers/mailchimp_lists_for_search_helper.rb +21 -0
  90. data/app/helpers/orders_helper.rb +11 -0
  91. data/app/helpers/people_helper.rb +28 -1
  92. data/app/helpers/relationships_helper.rb +6 -0
  93. data/app/helpers/sales_helper.rb +3 -1
  94. data/app/helpers/searches_helper.rb +3 -1
  95. data/app/helpers/segments_helper.rb +3 -0
  96. data/app/mailers/order_mailer.rb +8 -1
  97. data/app/mailers/producer_mailer.rb +39 -0
  98. data/app/mailers/reports_mailer.rb +6 -1
  99. data/app/models/ability.rb +15 -8
  100. data/app/models/action.rb +33 -4
  101. data/app/models/actions/change_action.rb +3 -1
  102. data/app/models/actions/comp_action.rb +3 -1
  103. data/app/models/actions/convert_action.rb +19 -0
  104. data/app/models/actions/do_action.rb +3 -1
  105. data/app/models/actions/exchange_action.rb +3 -1
  106. data/app/models/actions/get_action.rb +3 -1
  107. data/app/models/actions/give_action.rb +8 -2
  108. data/app/models/actions/go_action.rb +3 -1
  109. data/app/models/actions/hear_action.rb +15 -1
  110. data/app/models/actions/join_action.rb +3 -1
  111. data/app/models/actions/mailchimp_hear_action.rb +17 -0
  112. data/app/models/actions/pledge_action.rb +19 -0
  113. data/app/models/actions/refund_action.rb +3 -1
  114. data/app/models/actions/say_action.rb +3 -1
  115. data/app/models/actions/system_action.rb +17 -0
  116. data/app/models/address.rb +76 -31
  117. data/app/models/advanced_search.rb +434 -0
  118. data/app/models/advanced_search_segment.rb +12 -0
  119. data/app/models/appeal.rb +106 -0
  120. data/app/models/box_office.rb +1 -1
  121. data/app/models/budget_restriction.rb +9 -0
  122. data/app/models/campaign.rb +141 -0
  123. data/app/models/cart.rb +39 -4
  124. data/app/models/chart.rb +2 -2
  125. data/app/models/checkout.rb +54 -10
  126. data/app/models/comp.rb +7 -5
  127. data/app/models/company.rb +2 -0
  128. data/app/models/console_sale.rb +26 -0
  129. data/app/models/contribution.rb +327 -62
  130. data/app/models/convert.rb +62 -0
  131. data/app/models/daily_membership_report.rb +1 -1
  132. data/app/models/database_views/item_view.rb +91 -49
  133. data/app/models/discount.rb +1 -1
  134. data/app/models/discounts/discount_type.rb +2 -1
  135. data/app/models/donation.rb +27 -2
  136. data/app/models/donation_search.rb +188 -10
  137. data/app/models/door_list.rb +39 -2
  138. data/app/models/event.rb +31 -15
  139. data/app/models/ext.rb +3 -3
  140. data/app/models/ext/delayed_indexing.rb +41 -1
  141. data/app/models/ext/integrations.rb +6 -0
  142. data/app/models/forwarding_job_monitor.rb +2 -0
  143. data/app/models/household.rb +1 -1
  144. data/app/models/import.rb +39 -8
  145. data/app/models/imports/donations_import.rb +110 -19
  146. data/app/models/imports/events_import.rb +3 -2
  147. data/app/models/imports/mappings.rb +991 -0
  148. data/app/models/imports/memberships_import.rb +218 -20
  149. data/app/models/imports/people_import.rb +9 -1
  150. data/app/models/imports/rollback.rb +9 -0
  151. data/app/models/imports/validations.rb +7 -0
  152. data/app/models/individual.rb +3 -1
  153. data/app/models/item.rb +55 -17
  154. data/app/models/job/acknowledge_job.rb +23 -0
  155. data/app/models/job/checkout_processor.rb +1 -1
  156. data/app/models/job/convert_order_processor.rb +14 -0
  157. data/app/models/job/daily_email_report_job.rb +1 -12
  158. data/app/models/job/destroy_show_job.rb +1 -6
  159. data/app/models/job/destroy_tag_job.rb +18 -0
  160. data/app/models/job/door_list_generator_job.rb +33 -0
  161. data/app/models/job/door_list_mailer_job.rb +15 -0
  162. data/app/models/job/email_organization_sales_report_job.rb +32 -0
  163. data/app/models/job/expire_ticket_job.rb +19 -2
  164. data/app/models/job/export_people_job.rb +47 -0
  165. data/app/models/job/export_settlements_job.rb +24 -0
  166. data/app/models/job/geocode_address_job.rb +2 -7
  167. data/app/models/job/mailchimp_sync_job.rb +61 -3
  168. data/app/models/job/merge_job.rb +19 -0
  169. data/app/models/job/order_export_job.rb +36 -0
  170. data/app/models/job/order_mailer_job.rb +1 -2
  171. data/app/models/job/order_processor.rb +17 -6
  172. data/app/models/job/person_lifetime_value_job.rb +1 -0
  173. data/app/models/job/search_export_job.rb +33 -0
  174. data/app/models/job/suggest_households_by_address_job.rb +29 -0
  175. data/app/models/job/suggest_households_by_spouse_job.rb +22 -0
  176. data/app/models/job_monitor.rb +14 -0
  177. data/app/models/kit.rb +35 -8
  178. data/app/models/kits/campaigns_kit.rb +27 -0
  179. data/app/models/kits/mailchimp_kit.rb +548 -124
  180. data/app/models/kits/membership_kit.rb +14 -6
  181. data/app/models/kits/passes_kit.rb +14 -6
  182. data/app/models/kits/regular_donation_kit.rb +29 -2
  183. data/app/models/{relationships_kit.rb → kits/relationships_kit.rb} +3 -7
  184. data/app/models/kits/scannable_tickets_kit.rb +0 -5
  185. data/app/models/kits/sponsored_donation_kit.rb +2 -12
  186. data/app/models/kits/ticketing_kit.rb +9 -1
  187. data/app/models/linking_job_monitor.rb +2 -0
  188. data/app/models/list_grouping.rb +10 -0
  189. data/app/models/member.rb +35 -23
  190. data/app/models/member_number_generator.rb +2 -0
  191. data/app/models/membership.rb +23 -14
  192. data/app/models/membership_change.rb +17 -1
  193. data/app/models/membership_comp.rb +48 -23
  194. data/app/models/membership_comp_job.rb +7 -0
  195. data/app/models/membership_type.rb +13 -7
  196. data/app/models/monitorable.rb +19 -0
  197. data/app/models/note.rb +10 -1
  198. data/app/models/order.rb +170 -21
  199. data/app/models/order_handler.rb +13 -2
  200. data/app/models/orders/convert_order.rb +11 -0
  201. data/app/models/organization.rb +87 -9
  202. data/app/models/parsed_row.rb +142 -67
  203. data/app/models/pass.rb +13 -7
  204. data/app/models/pass_type.rb +17 -4
  205. data/app/models/passes_report.rb +6 -3
  206. data/app/models/payment.rb +16 -6
  207. data/app/models/payments/cash_payment.rb +1 -0
  208. data/app/models/payments/check_payment.rb +1 -5
  209. data/app/models/payments/comp_payment.rb +0 -1
  210. data/app/models/payments/credit_card_payment.rb +2 -7
  211. data/app/models/permission.rb +28 -0
  212. data/app/models/person.rb +503 -94
  213. data/app/models/phone.rb +3 -0
  214. data/app/models/redis_manager.rb +39 -0
  215. data/app/models/relationship.rb +31 -4
  216. data/app/models/relationship_builder.rb +0 -3
  217. data/app/models/rolling_membership_type.rb +5 -1
  218. data/app/models/s3_coordinator.rb +21 -0
  219. data/app/models/sale.rb +7 -4
  220. data/app/models/scheduled_pledge_payment.rb +69 -0
  221. data/app/models/search.rb +236 -24
  222. data/app/models/section.rb +6 -4
  223. data/app/models/show.rb +21 -12
  224. data/app/models/show_validator.rb +45 -0
  225. data/app/models/soft_credit.rb +126 -0
  226. data/app/models/subscribed_list.rb +52 -0
  227. data/app/models/suggested_household.rb +8 -2
  228. data/app/models/ticket.rb +35 -10
  229. data/app/models/ticket/locker.rb +25 -0
  230. data/app/models/ticket_summary.rb +1 -1
  231. data/app/models/ticket_type.rb +14 -2
  232. data/app/models/user.rb +42 -3
  233. data/app/models/user_membership.rb +57 -3
  234. data/app/models/valuation/lifetime_donations.rb +2 -2
  235. data/app/models/valuation/lifetime_pledges.rb +35 -0
  236. data/app/models/valuation/lifetime_value.rb +5 -1
  237. data/app/models/valuation_query.rb +109 -0
  238. data/app/models/venue.rb +8 -0
  239. data/app/views/actions/_action.html.haml +1 -1
  240. data/app/views/actions/_form.html.haml +2 -2
  241. data/app/views/actions/give/_show.html.haml +1 -1
  242. data/app/views/actions/pledge/_show.html.haml +8 -0
  243. data/app/views/actions/shared/_show.html.haml +1 -1
  244. data/app/views/addresses/_address.html.haml +3 -1
  245. data/app/views/advanced_search_segments/_advanced_searches_results.html.haml +15 -0
  246. data/app/views/advanced_search_segments/index.html.haml +18 -0
  247. data/app/views/advanced_search_segments/show.html.haml +46 -0
  248. data/app/views/advanced_searches/_form.html.haml +61 -0
  249. data/app/views/advanced_searches/_hit.html.haml +10 -0
  250. data/app/views/advanced_searches/_household.html.haml +7 -0
  251. data/app/views/advanced_searches/_new_condition.html.haml +3 -0
  252. data/app/views/advanced_searches/_people_count.html.erb +3 -0
  253. data/app/views/advanced_searches/_people_list.html.haml +5 -0
  254. data/app/views/advanced_searches/filters/_action.html.haml +12 -0
  255. data/app/views/advanced_searches/filters/_birthday.html.haml +9 -0
  256. data/app/views/advanced_searches/filters/_discount_code.html.haml +7 -0
  257. data/app/views/advanced_searches/filters/_donated.html.haml +17 -0
  258. data/app/views/advanced_searches/filters/_email.html.haml +7 -0
  259. data/app/views/advanced_searches/filters/_has_purchased_for.html.haml +9 -0
  260. data/app/views/advanced_searches/filters/_keyword.html.haml +9 -0
  261. data/app/views/advanced_searches/filters/_lifetime_value.html.haml +13 -0
  262. data/app/views/advanced_searches/filters/_limit_results.html.haml +7 -0
  263. data/app/views/advanced_searches/filters/_location.html.haml +11 -0
  264. data/app/views/advanced_searches/filters/_mailchimp_group.html.haml +8 -0
  265. data/app/views/advanced_searches/filters/_mailchimp_list.html.haml +8 -0
  266. data/app/views/advanced_searches/filters/_membership_ended.html.haml +9 -0
  267. data/app/views/advanced_searches/filters/_membership_started.html.haml +9 -0
  268. data/app/views/advanced_searches/filters/_membership_status.html.haml +8 -0
  269. data/app/views/advanced_searches/filters/_membership_type.html.haml +8 -0
  270. data/app/views/advanced_searches/filters/_orders.html.haml +10 -0
  271. data/app/views/advanced_searches/filters/_pass_type.html.haml +9 -0
  272. data/app/views/advanced_searches/filters/_relationships.html.haml +8 -0
  273. data/app/views/advanced_searches/filters/_segment.html.haml +8 -0
  274. data/app/views/advanced_searches/filters/_tagging.html.haml +9 -0
  275. data/app/views/advanced_searches/new.html.haml +12 -0
  276. data/app/views/advanced_searches/show.html.haml +107 -0
  277. data/app/views/advanced_searches/shows_for_org.html.haml +1 -0
  278. data/app/views/advanced_searches/ticket_types_for_org.html.haml +1 -0
  279. data/app/views/advanced_searches/update.js.erb +9 -0
  280. data/app/views/appeals/_form.html.haml +113 -0
  281. data/app/views/appeals/_header.html.haml +6 -0
  282. data/app/views/appeals/_heard_action.html.haml +16 -0
  283. data/app/views/appeals/edit.html.haml +8 -0
  284. data/app/views/appeals/new.html.haml +6 -0
  285. data/app/views/campaigns/_campaign_donations.html.haml +19 -0
  286. data/app/views/campaigns/_campaign_stats.html.haml +28 -0
  287. data/app/views/campaigns/_form.html.haml +48 -0
  288. data/app/views/campaigns/_header.html.haml +6 -0
  289. data/app/views/campaigns/edit.html.haml +6 -0
  290. data/app/views/campaigns/index.html.haml +33 -0
  291. data/app/views/campaigns/new.html.haml +6 -0
  292. data/app/views/campaigns/show.html.haml +132 -0
  293. data/app/views/console_sales/_cart.html.haml +3 -2
  294. data/app/views/console_sales/_payment.html.haml +14 -1
  295. data/app/views/console_sales/new.html.haml +11 -6
  296. data/app/views/contributions/_form.html.haml +139 -37
  297. data/app/views/contributions/_header.html.haml +5 -0
  298. data/app/views/contributions/_match_eligible.html.haml +24 -0
  299. data/app/views/contributions/_pledge_payment.html.haml +22 -0
  300. data/app/views/contributions/_search.html.haml +30 -0
  301. data/app/views/contributions/_soft_credit.html.haml +25 -0
  302. data/app/views/contributions/edit.html.haml +5 -8
  303. data/app/views/contributions/find_person.html.haml +16 -15
  304. data/app/views/contributions/index.html.haml +61 -24
  305. data/app/views/contributions/new.html.haml +5 -5
  306. data/app/views/converts/_grouped_form.html.haml +11 -0
  307. data/app/views/converts/new.html.haml +35 -0
  308. data/app/views/delete_ticket_types/_cannot_destroy_modal.html.haml +11 -0
  309. data/app/views/delete_ticket_types/_cannot_destroy_modal.rb +0 -0
  310. data/app/views/delete_ticket_types/_confirm_destroy_modal.html.haml +13 -0
  311. data/app/views/delete_ticket_types/show.html.haml +4 -0
  312. data/app/views/discounts/_form.html.haml +1 -1
  313. data/app/views/events/_day_date_show.html.haml +4 -2
  314. data/app/views/events/_glance.html.haml +12 -12
  315. data/app/views/events/_header.html.haml +1 -1
  316. data/app/views/events/_list.html.haml +1 -1
  317. data/app/views/events/_menu.html.haml +26 -21
  318. data/app/views/events/_section_fields.html.haml +1 -1
  319. data/app/views/events/_tax_deductible_message.html.haml +3 -0
  320. data/app/views/events/_ticket_type_fields.html.haml +13 -3
  321. data/app/views/events/index.html.haml +2 -1
  322. data/app/views/events/messages.html.haml +12 -10
  323. data/app/views/events/show.html.haml +6 -6
  324. data/app/views/events/temp_discount_form.html.haml +1 -1
  325. data/app/views/events_pass_types/_form.html.haml +1 -1
  326. data/app/views/events_pass_types/new.html.haml +1 -2
  327. data/app/views/households/_edit_modal.html.haml +9 -4
  328. data/app/views/households/_form.html.haml +6 -1
  329. data/app/views/households/_header.html.haml +9 -18
  330. data/app/views/households/confirm.html.haml +43 -0
  331. data/app/views/households/new.html.haml +3 -1
  332. data/app/views/households/show.html.haml +2 -1
  333. data/app/views/households/suggested.html.haml +10 -27
  334. data/app/views/imports/_export_links.html.haml +2 -2
  335. data/app/views/imports/donations/_new.html.haml +49 -6
  336. data/app/views/imports/donations/_pending.html.haml +69 -22
  337. data/app/views/imports/donations/_preview.html.haml +23 -0
  338. data/app/views/imports/events/_new.html.haml +8 -8
  339. data/app/views/imports/index.html.haml +26 -21
  340. data/app/views/imports/memberships/_approved.html.haml +16 -0
  341. data/app/views/imports/memberships/_caching.html.haml +17 -0
  342. data/app/views/imports/memberships/_failed.html.haml +5 -0
  343. data/app/views/imports/memberships/_imported.html.haml +45 -0
  344. data/app/views/imports/memberships/_importing.html.haml +20 -0
  345. data/app/views/imports/memberships/_invalid.html.haml +5 -0
  346. data/app/views/imports/memberships/_new.html.haml +155 -0
  347. data/app/views/imports/memberships/_pending.html.haml +85 -0
  348. data/app/views/imports/memberships/_preview_rows.html.haml +38 -0
  349. data/app/views/imports/people/_new.html.haml +81 -15
  350. data/app/views/imports/shared/_inspect_modal.html.haml +10 -1
  351. data/app/views/imports/shared/_new_sidebar.html.haml +12 -0
  352. data/app/views/imports/show.html.haml +0 -3
  353. data/app/views/index/_action.html.haml +4 -3
  354. data/app/views/index/_recent_activity.html.haml +14 -7
  355. data/app/views/index/dashboard.html.haml +27 -14
  356. data/app/views/job_monitors/_job_monitor_show.html.haml +34 -0
  357. data/app/views/job_monitors/_linking_job_monitor_show.html.haml +31 -0
  358. data/app/views/job_monitors/show.html.haml +1 -0
  359. data/app/views/layouts/_google_analytics.html.haml +9 -11
  360. data/app/views/layouts/_menu.html.haml +5 -3
  361. data/app/views/layouts/application.html.haml +12 -4
  362. data/app/views/layouts/devise_layout.html.haml +1 -1
  363. data/app/views/layouts/storefront.html.haml +7 -10
  364. data/app/views/members/index/index.html.haml +82 -4
  365. data/app/views/members/mailer/_invitation_body.html.haml +2 -2
  366. data/app/views/members/passwords/new.html.haml +13 -0
  367. data/app/views/members/sessions/new.html.haml +1 -1
  368. data/app/views/membership_comps/confirm.html.haml +10 -8
  369. data/app/views/membership_comps/create.html.haml +1 -3
  370. data/app/views/membership_kits/edit.html.haml +6 -0
  371. data/app/views/membership_types/_form.html.haml +1 -1
  372. data/app/views/membership_types/index.html.haml +11 -3
  373. data/app/views/memberships/index.html.haml +122 -109
  374. data/app/views/merges/find_person.html.haml +5 -3
  375. data/app/views/merges/new.html.haml +13 -4
  376. data/app/views/notes/_note.html.haml +3 -3
  377. data/app/views/order_mailer/confirmation_for.html.haml +1 -0
  378. data/app/views/order_mailer/confirmation_for.text.haml +1 -0
  379. data/app/views/orders/_assignable_donations.html.haml +25 -0
  380. data/app/views/orders/_assignable_pledges.html.haml +26 -0
  381. data/app/views/orders/_item_table.haml +20 -8
  382. data/app/views/orders/_order_sidebar.html.haml +37 -7
  383. data/app/views/orders/membership.html.haml +2 -2
  384. data/app/views/orders/passes.html.haml +4 -4
  385. data/app/views/orders/sales.html.haml +5 -5
  386. data/app/views/orders/show.html.haml +26 -7
  387. data/app/views/organizations/_form.html.haml +0 -5
  388. data/app/views/pass_types/index.html.haml +13 -5
  389. data/app/views/passes/index.html.haml +50 -39
  390. data/app/views/passes_kits/edit.html.haml +6 -0
  391. data/app/views/passes_reports/index.html.haml +1 -1
  392. data/app/views/pdfs/member.html.haml +1 -1
  393. data/app/views/pdfs/member_card_generator/blanks_usa_idc6.html.haml +1 -1
  394. data/app/views/pdfs/order.html.haml +5 -3
  395. data/app/views/people/_address_fields.html.haml +40 -0
  396. data/app/views/people/_convert_to_company_modal.html.haml +3 -0
  397. data/app/views/people/_edit_modal.html.haml +121 -38
  398. data/app/views/people/_form.html.haml +8 -14
  399. data/app/views/people/_header.html.haml +11 -16
  400. data/app/views/people/_list.html.haml +3 -9
  401. data/app/views/people/_mailchimp_group.html.haml +3 -0
  402. data/app/views/people/_phone_fields.html.haml +1 -1
  403. data/app/views/people/_relationship_fields.html.haml +10 -5
  404. data/app/views/people/_work_with_menu.html.haml +14 -8
  405. data/app/views/people/index.html.haml +10 -9
  406. data/app/views/people/new.html.haml +18 -4
  407. data/app/views/people/pledges.html.haml +13 -0
  408. data/app/views/people/show.html.haml +96 -45
  409. data/app/views/pledges/_none_scheduled_payment_table.html.haml +17 -0
  410. data/app/views/pledges/_receive_pledge.html.haml +87 -0
  411. data/app/views/pledges/_scheduled_payments_table.html.haml +18 -0
  412. data/app/views/pledges/index.html.haml +47 -0
  413. data/app/views/preview_rows/index.html.haml +1 -0
  414. data/app/views/producer_mailer/donation_notification.html.haml +9 -0
  415. data/app/views/producer_mailer/donation_notification.text.erb +8 -0
  416. data/app/views/producer_mailer/door_list_notification.html.haml +10 -0
  417. data/app/views/producer_mailer/door_list_notification.text.erb +6 -0
  418. data/app/views/producer_mailer/mailchimp_kit_initial_sync_notification.html.haml +2 -2
  419. data/app/views/regular_donation_kits/edit.html.haml +29 -1
  420. data/app/views/relationships/index.html.haml +1 -1
  421. data/app/views/sales/_boxoffice.html.haml +15 -5
  422. data/app/views/sales/_doorlist.html.haml +2 -2
  423. data/app/views/sales/new.html.haml +2 -2
  424. data/app/views/searches/_company.html.haml +7 -0
  425. data/app/views/searches/_form.html.haml +75 -8
  426. data/app/views/searches/_household.html.haml +2 -2
  427. data/app/views/searches/_individual.html.haml +7 -0
  428. data/app/views/searches/show.html.haml +59 -23
  429. data/app/views/segments/index.html.haml +1 -1
  430. data/app/views/segments/show.html.haml +36 -1
  431. data/app/views/shared/_baseball_card.html.haml +40 -0
  432. data/app/views/shared/_tags.html.haml +10 -8
  433. data/app/views/shows/_empty_ticket_table.html.haml +12 -0
  434. data/app/views/shows/_sections_table.html.haml +78 -69
  435. data/app/views/shows/_ticket_table.html.haml +10 -7
  436. data/app/views/shows/index.html.haml +95 -85
  437. data/app/views/statements/_shows.html.haml +1 -1
  438. data/app/views/store/checkouts/_event_information.html.haml +89 -0
  439. data/app/views/store/checkouts/_shopping_cart_display.haml +8 -0
  440. data/app/views/store/checkouts/_thanks.html.haml +40 -0
  441. data/app/views/store/checkouts/create.html.haml +1 -0
  442. data/app/views/store/checkouts/shopping_cart_display/_discounts.haml +8 -0
  443. data/app/views/store/checkouts/shopping_cart_display/_donations.haml +15 -0
  444. data/app/views/store/checkouts/{_membership_info.html.haml → shopping_cart_display/_membership_info.html.haml} +0 -0
  445. data/app/views/store/checkouts/shopping_cart_display/_memberships.haml +8 -0
  446. data/app/views/store/checkouts/shopping_cart_display/_passes.haml +9 -0
  447. data/app/views/store/checkouts/shopping_cart_display/_tickets.haml +10 -0
  448. data/app/views/store/checkouts/shopping_cart_display/_total.haml +10 -0
  449. data/app/views/store/donations/index.html.haml +4 -0
  450. data/app/views/store/events/_contact_info.html.haml +8 -0
  451. data/app/views/store/events/_venue.html.haml +14 -7
  452. data/app/views/store/events/calendar.html.haml +2 -9
  453. data/app/views/store/events/show.html.haml +2 -9
  454. data/app/views/store/events/single_show.html.haml +3 -3
  455. data/app/views/store/memberships/index.html.haml +3 -3
  456. data/app/views/store/orders/blank.html.erb +34 -0
  457. data/app/views/store/orders/show.html.haml +15 -6
  458. data/app/views/store/passes/index.html.haml +3 -3
  459. data/app/views/store/shared/_small_donate_form.html.haml +21 -18
  460. data/app/views/tags/_edit_modal.html.haml +16 -0
  461. data/app/views/tags/index.html.haml +23 -0
  462. data/app/views/unacknowledged_gifts/_heard_action.html.haml +10 -0
  463. data/app/views/unacknowledged_gifts/index.html.haml +76 -0
  464. data/app/views/user_memberships/_list.html.haml +147 -24
  465. data/config/initializers/delayed_job_config.rb +10 -1
  466. data/config/routes.rb +85 -9
  467. data/db/migrate/20140422193345_add_email_copy_to_pass_type.rb +1 -1
  468. data/db/migrate/20140616045851_add_birthdate_to_search.rb +7 -0
  469. data/db/migrate/20140623131025_create_campaigns.rb +27 -0
  470. data/db/migrate/20140627120214_create_appeals.rb +28 -0
  471. data/db/migrate/20140630151406_add_deleted_at_to_campaigns.rb +9 -0
  472. data/db/migrate/20140701124100_add_segment_id_and_notes_to_appeals.rb +12 -0
  473. data/db/migrate/20140702115815_add_campaign_id_and_appeal_id_to_donations.rb +14 -0
  474. data/db/migrate/20140702121928_add_materials_to_appeals.rb +11 -0
  475. data/db/migrate/20140702150521_add_deleted_at_to_appeals.rb +9 -0
  476. data/db/migrate/20140709151816_add_campaign_id_and_appeal_id_to_orders.rb +14 -0
  477. data/db/migrate/20140723133850_remove_campaign_id_and_apeal_id_from_orders.rb +11 -0
  478. data/db/migrate/20140723134923_add_commitment_date_to_donations.rb +6 -0
  479. data/db/migrate/20140730141515_add_match_eligible_to_donations.rb +15 -0
  480. data/db/migrate/20140818141140_create_soft_credits.rb +12 -0
  481. data/db/migrate/20140903140113_add_pledge_to_donations.rb +9 -0
  482. data/db/migrate/20140904183953_add_destroyed_at_to_relationships.rb +7 -0
  483. data/db/migrate/20140905080503_create_scheduled_pledge_payments.rb +16 -0
  484. data/db/migrate/20140909150251_add_org_to_suggested_household.rb +7 -0
  485. data/db/migrate/20141007114614_add_order_id_to_donations.rb +15 -0
  486. data/db/migrate/20141021134013_add_lifetime_pledges_to_people.rb +5 -0
  487. data/db/migrate/20141027191307_default_overwrite_member_addresses_to_false.rb +5 -0
  488. data/db/migrate/20141031193839_update_relations.rb +9 -0
  489. data/db/migrate/20141126183258_add_mailchimp_status_fields_to_people.rb +6 -0
  490. data/db/migrate/20141126184811_add_processing_at_to_ticket.rb +5 -0
  491. data/db/migrate/20141127135743_add_import_to_campaigns.rb +6 -0
  492. data/db/migrate/20141128143944_add_fiscal_year_to_donations.rb +5 -0
  493. data/db/migrate/20141128151407_remove_fiscal_year_from_scheduled_pledge_payments.rb +3 -0
  494. data/db/migrate/20141204164400_add_more_indexes_to_actions.rb +7 -0
  495. data/db/migrate/20141204171612_add_indexes_to_charts.rb +12 -0
  496. data/db/migrate/20141204172658_add_hide_on_recent_activity_to_actions.rb +5 -0
  497. data/db/migrate/20141204173004_add_indexes_to_ept.rb +9 -0
  498. data/db/migrate/20141204211933_remove_membership_counts_from_members.rb +13 -0
  499. data/db/migrate/20141205202030_create_subscribed_lists.rb +19 -0
  500. data/db/migrate/20141208225228_add_mailchimp_lists_to_searches.rb +5 -0
  501. data/db/migrate/20141210162329_add_bounced_to_subscribed_lists.rb +5 -0
  502. data/db/migrate/20141211165307_add_external_reference_to_actions.rb +5 -0
  503. data/db/migrate/20141212172119_add_not_mailchimp_lists_to_searches.rb +5 -0
  504. data/db/migrate/20141229204605_normalize_states_in_addresses.rb +11 -0
  505. data/db/migrate/20150113091344_add_fiscal_to_organizations.rb +11 -0
  506. data/db/migrate/20150113091434_create_budget_restrictions.rb +14 -0
  507. data/db/migrate/20150113091503_add_budget_restriction_to_campaigns.rb +14 -0
  508. data/db/migrate/20150129091354_add_campaign_to_searches.rb +13 -0
  509. data/db/migrate/20150203174456_create_list_groupings.rb +12 -0
  510. data/db/migrate/20150203222451_add_groupings_to_searches.rb +6 -0
  511. data/db/migrate/20150219153827_add_roles_to_user_memberships.rb +13 -0
  512. data/db/migrate/20150223145657_add_daily_sales_to_user_membership.rb +13 -0
  513. data/db/migrate/20150318171857_create_advanced_searches.rb +16 -0
  514. data/db/migrate/20150319185940_add_org_id_index_to_orders.rb +5 -0
  515. data/db/migrate/20150325085516_add_received_amount_to_donations.rb +16 -0
  516. data/db/migrate/20150325173053_add_pass_index_to_tickets.rb +5 -0
  517. data/db/migrate/20150331084817_add_creator_id_to_orders.rb +11 -0
  518. data/db/migrate/20150406162656_index_tickets_on_action_id.rb +5 -0
  519. data/db/migrate/20150408123349_add_donor_instructions_to_orders.rb +9 -0
  520. data/db/migrate/20150408125600_add_index_to_imports.rb +5 -0
  521. data/db/migrate/20150414193419_add_index_to_phone.rb +5 -0
  522. data/db/migrate/20150414193646_add_index_to_taggings.rb +5 -0
  523. data/db/migrate/20150415113013_add_nickname_to_people.rb +11 -0
  524. data/db/migrate/20150420143707_add_indexes_to_donations.rb +7 -0
  525. data/db/migrate/20150421092302_add_kind_to_addresses.rb +11 -0
  526. data/db/migrate/20150513154513_add_name_to_advanced_search.rb +5 -0
  527. data/db/migrate/20150518131946_add_receive_donation_notification_to_user_memberships.rb +9 -0
  528. data/db/migrate/20150520182350_remove_name_from_advanced_search.rb +9 -0
  529. data/db/migrate/20150520202900_create_advanced_search_segments.rb +9 -0
  530. data/db/migrate/20150520210658_add_advanced_search_id_to_advanced_search_segment.rb +5 -0
  531. data/db/migrate/20150521183507_add_organization_id_to_advanced_search_segment.rb +5 -0
  532. data/db/migrate/20150602204548_add_index_on_deleted_at.rb +5 -0
  533. data/db/migrate/20150711143014_add_receive_door_list_to_user_memberships.rb +10 -0
  534. data/db/migrate/20150716000301_create_job_monitors_table.rb +12 -0
  535. data/db/migrate/20150807005404_re_refresh_show_stats.rb +8 -0
  536. data/db/migrate/20150810133417_convert_business_to_work.rb +5 -0
  537. data/db/migrate/20150812135205_update_notes_nulls.rb +9 -0
  538. data/db/migrate/20150813202745_index_household_id.rb +6 -0
  539. data/db/migrate/20150814075653_add_maiden_name_to_people.rb +9 -0
  540. data/db/migrate/20150911203530_normalize_countries_in_addresses.rb +11 -0
  541. data/db/migrate/20150922155253_add_advanced_search_segment_id_to_membership_types.rb +5 -0
  542. data/db/migrate/20150922155308_add_advanced_search_segment_id_to_pass_types.rb +5 -0
  543. data/db/migrate/20151006180702_add_deleted_at_to_ticket_types.rb +5 -0
  544. data/db/migrate/20151009175206_add_receipt_details_to_ticket_types.rb +5 -0
  545. data/db/migrate/20151112174723_index_list_groupings.rb +5 -0
  546. data/lib/artfully_ose/common_abilities.rb +80 -57
  547. data/lib/artfully_ose/version.rb +1 -1
  548. data/lib/tasks/artfully_ose.rake +46 -4
  549. data/spec/factories/action_factories.rb +2 -0
  550. data/spec/factories/address_factories.rb +2 -2
  551. data/spec/factories/advanced_search_factories.rb +45 -0
  552. data/spec/factories/advanced_search_segment_factories.rb +6 -0
  553. data/spec/factories/advanced_segment_factories.rb +6 -0
  554. data/spec/factories/campaign_factories.rb +20 -0
  555. data/spec/factories/cart_factories.rb +24 -0
  556. data/spec/factories/chart_factories.rb +4 -0
  557. data/spec/factories/event_factories.rb +6 -0
  558. data/spec/factories/item_factories.rb +23 -1
  559. data/spec/factories/kit_factories.rb +27 -3
  560. data/spec/factories/member_factories.rb +8 -1
  561. data/spec/factories/membership_factories.rb +12 -0
  562. data/spec/factories/membership_type_factories.rb +18 -0
  563. data/spec/factories/note_factories.rb +7 -0
  564. data/spec/factories/order_factories.rb +7 -0
  565. data/spec/factories/pass_factories.rb +6 -0
  566. data/spec/factories/payments_factories.rb +1 -1
  567. data/spec/factories/person_factories.rb +46 -4
  568. data/spec/factories/scheduled_pledge_payment_factories.rb +10 -0
  569. data/spec/factories/show_factories.rb +8 -3
  570. data/spec/factories/soft_credit_factories.rb +8 -0
  571. data/spec/factories/ticket_factories.rb +22 -9
  572. data/spec/factories/user_factories.rb +16 -8
  573. metadata +342 -59
  574. data/app/controllers/comps_controller.rb +0 -47
  575. data/app/models/household_suggester.rb +0 -58
  576. data/app/views/searches/_person.html.haml +0 -10
  577. data/app/views/store/checkouts/thanks.html.haml +0 -134
@@ -12,7 +12,7 @@
12
12
  .container
13
13
  = render :partial => 'layouts/devise_menu'
14
14
  .row
15
- #content.span6.offset3
15
+ #content.devise-content.span6.offset3
16
16
  = render :partial => 'layouts/flash', :locals => { :flash => flash }
17
17
  - flash.discard
18
18
  = yield
@@ -11,9 +11,9 @@
11
11
  = link_to @store_organization.name, store_organization_events_url(@store_organization.cached_slug), :class => 'brand'
12
12
  %ul.nav#main-menu-options
13
13
  %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
14
- - if @store_organization.has_kit?(:passes)
14
+ - if @store_organization.has_active_passes_storefront?
15
15
  %li= link_to "Buy Passes", store_passes_path(@store_organization.cached_slug)
16
- - if @store_organization.has_kit?(:membership)
16
+ - if @store_organization.has_active_membership_storefront?
17
17
  -if member_signed_in?
18
18
  %li= link_to "Buy Memberships", store_memberships_path(@store_organization.cached_slug)
19
19
  -else
@@ -32,18 +32,15 @@
32
32
  %li= link_to "My Membership", members_root_path
33
33
  %li= link_to "Sign Out", destroy_member_session_path
34
34
  -else
35
- %li= link_to "Member Login", new_member_session_path
36
-
35
+ %li= link_to "Member Login", new_member_session_path({ :org_name => @store_organization.name })
36
+ %ul.nav.pull-right
37
+ %li
38
+ =icon_link_to("#{current_cart.items.size}", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', 'cart-item-count')
37
39
 
38
40
  .content.container
39
- -unless (current_page? store_order_path(@store_organization.cached_slug)) || (current_cart.items.size == 0)
40
- .pull-right
41
- %ul.nav.nav-pills
42
- %li.active
43
- =icon_link_to("#{current_cart.items.size}    Checkout Now", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', '')
44
-
45
41
  = render :partial => 'layouts/flash', :locals => { :flash => flash }
46
42
  - flash.discard
43
+ = javascript_include_tag 'ical'
47
44
  = yield
48
45
 
49
46
  = javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"
@@ -9,13 +9,13 @@
9
9
  %td=current_member.member_number
10
10
  %tr
11
11
  %td Member Through
12
- %td=l current_member.member_through, :format => :date
12
+ %td=l current_member.member_through, :format => :date unless current_member.memberships.current.empty?
13
13
  %tr
14
14
  %td Membership
15
- %td=current_member.memberships.current.first.membership_type.name
15
+ %td=current_member.memberships.current.first.membership_type.name unless current_member.memberships.current.empty?
16
16
  %tr
17
17
  %td Memberships
18
- %td=current_member.memberships.current.count
18
+ %td=current_member.memberships.current.count unless current_member.memberships.current.empty?
19
19
  %tr
20
20
  %td Membership Card
21
21
  %td=link_to "download", current_member.download_link_for(:pdf)
@@ -38,4 +38,82 @@
38
38
  -# =current_member.organization.phone
39
39
 
40
40
  #edit-address-modal.modal.hide
41
- =render :partial => 'people/edit_modal', :locals => { :url => members_person_path(current_member.person), :header => "Edit Your Information", :except => [:convert, :relationships, :households, :social, :merge, :delete], :return_to => members_root_path }
41
+ =render :partial => 'people/edit_modal', :locals => { :url => members_person_path(current_member.person), :header => "Edit Your Information", :except => [:convert, :relationships, :households, :social, :merge, :delete], :return_to => members_root_path}
42
+
43
+ %script{:src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'.html_safe}
44
+ :javascript
45
+ $(document).ready(function() {
46
+ var $primary_checks_group = $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']")
47
+ checkPrimary($primary_checks_group);
48
+
49
+ $("select[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_country']").each(function() {
50
+ setLocationSelector($(this).attr("id"));
51
+ });
52
+
53
+ $('.tab-relationships a').click(function (e) {
54
+ e.preventDefault();
55
+ $(this).tab('show');
56
+ })
57
+ $('.tab-households a').click(function (e) {
58
+ e.preventDefault();
59
+ $(this).tab('show');
60
+ })
61
+ $('.tab a').click(function (e) {
62
+ e.preventDefault();
63
+ $(this).tab('show');
64
+ $('#edit-person .save-person').show();
65
+ })
66
+ });
67
+
68
+ function setLocationSelector(countryId) {
69
+ $(document).locationSelector({
70
+ 'countryField' : "#" + countryId,
71
+ 'regionField' : "#" + countryId.replace("country", "state")
72
+ });
73
+ }
74
+
75
+ function onAddAddress() {
76
+ setLocationSelector($("select[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_country']").last().attr('id'));
77
+
78
+ var $primary_checks_group = $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible")
79
+ checkPrimary($primary_checks_group);
80
+
81
+ if ($primary_checks_group.length > 1) {
82
+ $primary_checks_group.each(function() {
83
+ $(this).removeAttr('disabled');
84
+ });
85
+ $primary_checks_group.last().prop('checked', false);
86
+ }
87
+ }
88
+
89
+ function onRemoveAddress() {
90
+ var $primary_checks_group = $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible")
91
+ checkPrimary($primary_checks_group);
92
+
93
+ var checked_count = $("input[id^='#{@person.type.downcase}_addresses_attributes_'][id$='_is_primary']:visible:checked").length
94
+ if (checked_count == 0) {
95
+ $primary_checks_group.first().prop('checked', true);
96
+ }
97
+ }
98
+
99
+ function checkPrimary($primary_checks_group) {
100
+
101
+ //if single address, mark it primary and checkbox is not editable
102
+ if($primary_checks_group.length == 1) {
103
+ var $primary_check = $primary_checks_group.first()
104
+ $primary_check.prop('checked', true);
105
+ $primary_check.attr('disabled', true);
106
+ $primary_check.parent().find('input:hidden:first').val(1);
107
+ }
108
+
109
+ // is_primary checkboxes behave like radio buttons
110
+ $("input:checkbox").click(function(){
111
+ $primary_checks_group.each(function() {
112
+ $(this).prop("checked",false);
113
+ $(this).parent().find('input:hidden:first').val(0);
114
+ });
115
+ $(this).prop("checked",true);
116
+ });
117
+ }
118
+
119
+ function bindMemberTickets() {}
@@ -10,9 +10,9 @@
10
10
  %p
11
11
  =membership_type.invitation_email_text_copy
12
12
 
13
- = link_to 'Setup your account now', accept_invitation_url(resource, :invitation_token => invitation_token)
13
+ = link_to 'To access membership benefits, please set up your member account password now.', accept_invitation_url(resource, :invitation_token => invitation_token)
14
14
 
15
15
  %p
16
- ="Thanks!"
16
+ ="Thank you,"
17
17
  %br
18
18
  =organization.name
@@ -0,0 +1,13 @@
1
+ = devise_error_messages!
2
+
3
+ = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f|
4
+ %fieldset
5
+ %legend Forgot your member password?
6
+
7
+ .control-group
8
+ = f.label :email, :class=>'control-label', :tabindex => "1"
9
+ .controls
10
+ = f.text_field :email
11
+
12
+ .form-actions
13
+ = f.submit "Send Password Reset Instructions", :class => "btn btn-primary"
@@ -3,7 +3,7 @@
3
3
  = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
4
4
 
5
5
  %fieldset
6
- %legend Sign In
6
+ %legend Member Sign In
7
7
 
8
8
  .control-group
9
9
  = f.label :email, :class=>'control-label', :tabindex => "1"
@@ -37,14 +37,16 @@
37
37
  =check_mark
38
38
  Nobody will receive emails about their membership.
39
39
 
40
- -if @number_of_companies > 0
41
- %p
42
- =check_mark
43
- We can't comp memberships to #{pluralize @number_of_companies, "company"}.
44
- -if @number_without_emails > 0
45
- %p
46
- =check_mark
47
- We can't comp memberships to #{pluralize @number_without_emails, "person"} because we don't have an email address on file.
40
+ - if @number_of_companies > 0 || @number_without_emails > 0
41
+ %h3 Please Note...
42
+ -if @number_of_companies > 0
43
+ %p
44
+ =check_mark
45
+ We can't comp memberships to #{pluralize @number_of_companies, "company"} because we can't comp memberships to companies.
46
+ -if @number_without_emails > 0
47
+ %p
48
+ =check_mark
49
+ We can't comp memberships to #{pluralize @number_without_emails, "person"} because we don't have an email address on file.
48
50
 
49
51
 
50
52
  =form_for @membership_comp do |form|
@@ -13,8 +13,6 @@
13
13
  .center
14
14
  .bottom-room
15
15
  %h3 Where to?
16
- -if @membership_comp.people.length == 1
17
- .bottom-room=link_to "View This Patron", person_path(@membership_comp.people.first), :class => "btn btn-large", :style => "Width: 200px"
18
16
  .bottom-room=link_to "Home Dashboard", root_path, :class => "btn btn-large", :style => "Width: 200px"
19
17
  .bottom-room=link_to "People Search", people_path, :class => "btn btn-large", :style => "Width: 200px"
20
- .bottom-room=link_to "Advanced Search", new_search_path, :class => "btn btn-large", :style => "Width: 200px"
18
+ .bottom-room=link_to "Advanced Search", new_advanced_search_path, :class => "btn btn-large", :style => "Width: 200px"
@@ -23,6 +23,12 @@
23
23
  .span9
24
24
  = f.text_area :marketing_copy_sidebar, :class => "input-xxlarge wysihtml5", :rows => "8"
25
25
 
26
+ .row-fluid.bottom-room
27
+ .span3
28
+ = f.label :membership_storefront, 'Show Membership Storefront', :class => 'control-label'
29
+ .span9
30
+ = f.check_box :membership_storefront, :checked => @kit.organization.has_active_membership_storefront?
31
+
26
32
  .row-fluid.bottom-room
27
33
  .span3
28
34
  &nbsp
@@ -47,7 +47,7 @@
47
47
  .control-group
48
48
  = f.label :invitation_email_text_copy, :class => 'control-label' do
49
49
  Email Message
50
- .tip.muted Email message will appear in the email confirming the patron's membership
50
+ .tip.muted This text will appear in the email instructing new members how to set up their member password
51
51
  .controls
52
52
  = f.text_area :invitation_email_text_copy, :rows => "5", :class => "span6"
53
53
 
@@ -3,7 +3,8 @@
3
3
 
4
4
  .row.bottom-room
5
5
  .pull-right
6
- =icon_link_to("New Membership Type", new_membership_type_path, 'fa-plus', 'btn','')
6
+ -if current_user.can? :manage, Membership
7
+ =icon_link_to("New Membership Type", new_membership_type_path, 'fa-plus', 'btn','')
7
8
  =link_to "Download CSV", membership_types_path(:format => "csv"), :class => "btn"
8
9
 
9
10
  %table.table#membership-types-table
@@ -16,9 +17,16 @@
16
17
  %th.right
17
18
  -@membership_types.each do |membership_type|
18
19
  %tr
19
- %td=link_to membership_type.name, edit_membership_type_path(membership_type)
20
+ %td
21
+ -if current_user.can? :edit, Membership
22
+ =link_to membership_type.name, edit_membership_type_path(membership_type)
23
+ - else
24
+ =membership_type.name
20
25
  %td.right=membership_type.memberships.count
21
- %td.right=link_to membership_type.members.group(:member_id).length, segment_path(membership_type.segment)
26
+ - if membership_type.segment.present?
27
+ %td.right=link_to membership_type.members.group(:member_id).length, segment_path(membership_type.segment)
28
+ - if membership_type.advanced_search_segment.present?
29
+ %td.right=link_to membership_type.members.group(:member_id).length, advanced_search_segment_path(membership_type.advanced_search_segment)
22
30
  %td.right=number_as_cents membership_type.price
23
31
  %td.right
24
32
  %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"}
@@ -1,41 +1,49 @@
1
1
  - in_section :people
2
2
  - content_for :title do
3
3
  #{@person}
4
+ - content_for :custom_js do
5
+ = javascript_include_tag 'memberships'
4
6
 
5
7
  =render "people/header"
6
8
 
7
9
  .row
8
10
  .span12
9
- .row-fluid
10
- .span6
11
- %ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
12
- %li.dropdown{:id => "#menu#bulkactions"}
13
- =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
14
- =image_tag "loading.gif", :class => 'loading-indicator', 'ng-show' => 'loading'
15
- .alert{'ng-show' => 'error'}
16
- %button.close{'ng-click' => 'error = false'}
17
- ×
18
- ='{{errorMessage}}'
19
- %ul.dropdown-menu
20
- -# %li= link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
21
- -# %li= link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
22
- %li
23
- = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
24
- %li
25
- = link_to "Change Membership Type", "#change", 'ng-click' => 'change($event)'
26
- %li
27
- = link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
28
- .span6.right
29
- = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
30
- -# = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
31
- = link_to "Reset Password", "#reset-password-modal", 'data-toggle' => 'modal', :class => 'btn btn-danger'
11
+ -if current_user.can? :manage, Membership
12
+ .row-fluid
13
+ .span6
14
+ %ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
15
+ %li.dropdown{:id => "#menu#bulkactions"}
16
+ =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown memberships btn', '', {'data-toggle'=>"tooltip"})
17
+ =image_tag "loading.gif", :class => 'loading-indicator', 'ng-show' => 'loading'
18
+ .alert{'ng-show' => 'error'}
19
+ %button.close{'ng-click' => 'error = false'}
20
+ ×
21
+ ='{{errorMessage}}'
22
+ %ul.dropdown-menu
23
+ -# %li= link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
24
+ -# %li= link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
25
+ %li
26
+ = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
27
+ %li
28
+ = link_to "Change Membership Type", "#change", 'ng-click' => 'change($event)'
29
+ %li
30
+ = link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
31
+ .span6.right
32
+ = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
33
+ -# = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
34
+ = link_to "Reset Password", "#reset-password-modal", 'data-toggle' => 'modal', :class => 'btn btn-danger'
35
+ -else
36
+ .row-fluid
37
+ .span6
38
+ .span6.right
39
+ = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
32
40
 
33
41
  =form_tag bulk_update_person_memberships_path(@person), :method => :post do
34
42
  #items
35
43
  %table.zebra.table{'ng-init' => "scope = { showExpired: false, expiredStyle: {textDecoration: 'line-through'} }"}
36
44
  %thead
37
45
  %tr
38
- %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
46
+ %th.grouped-checkbox.membership_check_box= check_box_tag :all, nil, false, :class => 'checkall'
39
47
  %th Membership Type
40
48
  %th Starts
41
49
  %th Expires
@@ -44,14 +52,17 @@
44
52
  - @person.memberships.each do |membership|
45
53
  - if membership.expired?
46
54
  %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
47
- %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
55
+ %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", :class => 'membership_check_box'
48
56
  %td.item-description=membership.membership_type.name
49
57
  %td.starts-at=l membership.starts_at, :format => :slashed_date
50
58
  %td.ends-at=l membership.ends_at, :format => :slashed_date
51
59
  %td.price.right=number_as_cents membership.total_paid
52
60
  - else
53
61
  %tr
54
- %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
62
+ %td.grouped-checkbox
63
+ -if current_user.can? :manage, Membership
64
+ = check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", :class => 'membership_check_box'
65
+
55
66
  %td.item-description=membership.membership_type.name
56
67
  %td.starts-at=l membership.starts_at, :format => :slashed_date
57
68
  %td.ends-at=l membership.ends_at, :format => :slashed_date
@@ -61,100 +72,102 @@
61
72
  = link_to "See #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
62
73
  = link_to "Hide #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
63
74
 
64
- #extend.modal
75
+ -if current_user.can? :manage, Membership
76
+ #extend.modal
77
+ .modal-header
78
+ .close{'data-dismiss'=>'modal'} x
79
+ %h3 Change Expiration
80
+ .modal-body
81
+ .control-group
82
+ %label Change the expiration of these memberships to:
83
+ .controls
84
+ .datepicker-alt-field
85
+ =hidden_field_tag "ends_at", ""
86
+ .modal-footer
87
+ =submit_tag "Change Expiration", :class => "btn btn-success"
88
+ =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
89
+
90
+ -if current_user.can? :manage, Membership
91
+ #full-refund.modal
65
92
  .modal-header
66
93
  .close{'data-dismiss'=>'modal'} x
67
- %h3 Change Expiration
94
+ %h3 Refund Membership
68
95
  .modal-body
69
- .control-group
70
- %label Change the expiration of these memberships to:
71
- .controls
72
- .datepicker-alt-field
73
- =hidden_field_tag "ends_at", ""
96
+ %p="#{@person} will receive a full refund for these memberships"
74
97
  .modal-footer
75
- =submit_tag "Change Expiration", :class => "btn btn-success"
76
- =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
98
+ =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
99
+ =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
100
+
101
+ #change.modal{'ng-controller' => 'ChangeMembershipController'}
102
+ =form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
103
+ .modal-header
104
+ .close{'data-dismiss'=>'modal'} x
105
+ %h3 Change Membership Type
106
+ .modal-body
107
+ .control-group
108
+ %label.control-label="Selected Memberships"
109
+ .controls
110
+ %ol
111
+ %li{'ng-repeat' => 'membership in selected'}
112
+ = hidden_field_tag('membership_ids[]', '{{membership.id}}')
113
+ %label='{{membership.type}} - {{membership.price}}'
114
+ .control-group
115
+ %label.control-label="New Membership Type"
116
+ .controls
117
+ = select_tag :membership_type_id, options_for_membership_types(@membership_types, include_price: true)
118
+
119
+ .control-group
120
+ %label.control-label Payment Method
121
+ #payment-controls.controls
122
+ = select_tag :payment_method, options_for_select([%w(Cash cash), %w(Comp comp), ['Credit card', 'credit_card_manual']]), :prompt => '--', 'ng-model' => 'payment_method'
123
+
124
+ .control-group{'ng-show' => '!comped()'}
125
+ %label.control-label Change Fee Per Membership
126
+ .controls
127
+ = text_field_tag :price, '0', :class => 'span1 currency', 'ng-model' => 'price', 'ng-change' => 'updateTotal()'
77
128
 
78
- #full-refund.modal
79
- .modal-header
80
- .close{'data-dismiss'=>'modal'} x
81
- %h3 Refund Membership
82
- .modal-body
83
- %p="#{@person} will receive a full refund for these memberships"
84
- .modal-footer
85
- =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
86
- =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
129
+ .control-group{'ng-show' => '!comped()'}
130
+ %label.control-label Total Change Fee
131
+ .controls
132
+ %label.total='{{total}}'
87
133
 
88
- #change.modal{'ng-controller' => 'ChangeMembershipController'}
89
- =form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
134
+ #payment-info.well{'ng-show' => "!comped() && 'credit_card_manual' == payment_method"}
135
+ .control-group
136
+ %label.control-label='Name on Card'
137
+ .controls= text_field_tag('credit_card_info[name]')
138
+ .control-group
139
+ %label.control-label='Card Number'
140
+ .controls= text_field_tag('credit_card_info[number]')
141
+ .control-group
142
+ %label.control-label='Expiration Date'
143
+ .date_field.controls
144
+ = select_tag('credit_card_info[month]', options_for_select(1..12), :class => 'input-small inline')
145
+ = select_tag('credit_card_info[year]', options_for_select(Time.now.year..Time.now.year + 10), :class => 'input-small inline')
146
+
147
+ .modal-footer
148
+ = submit_tag "Process Membership Change", :class => "btn btn-success"
149
+ =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
150
+
151
+ #partial-refund.modal
90
152
  .modal-header
91
153
  .close{'data-dismiss'=>'modal'} x
92
- %h3 Change Membership Type
154
+ %h3 Refund Membership
93
155
  .modal-body
94
156
  .control-group
95
- %label.control-label="Selected Memberships"
96
- .controls
97
- %ol
98
- %li{'ng-repeat' => 'membership in selected'}
99
- = hidden_field_tag('membership_ids[]', '{{membership.id}}')
100
- %label='{{membership.type}} - {{membership.price}}'
101
- .control-group
102
- %label.control-label="New Membership Type"
157
+ %label Enter refund amount:
103
158
  .controls
104
- = select_tag :membership_type_id, options_for_membership_types(@membership_types, include_price: true)
105
-
106
- .control-group
107
- %label.control-label Payment Method
108
- #payment-controls.controls
109
- = select_tag :payment_method, options_for_select([%w(Cash cash), %w(Comp comp), ['Credit card', 'credit_card_manual']]), :prompt => '--', 'ng-model' => 'payment_method'
110
-
111
- .control-group{'ng-show' => '!comped()'}
112
- %label.control-label Change Fee Per Membership
113
- .controls
114
- = text_field_tag :price, '0', :class => 'span1 currency', 'ng-model' => 'price', 'ng-change' => 'updateTotal()'
115
-
116
- .control-group{'ng-show' => '!comped()'}
117
- %label.control-label Total Change Fee
118
- .controls
119
- %label.total='{{total}}'
120
-
121
- #payment-info.well{'ng-show' => "!comped() && 'credit_card_manual' == payment_method"}
122
- .control-group
123
- %label.control-label='Name on Card'
124
- .controls= text_field_tag('credit_card_info[name]')
125
- .control-group
126
- %label.control-label='Card Number'
127
- .controls= text_field_tag('credit_card_info[number]')
128
- .control-group
129
- %label.control-label='Expiration Date'
130
- .date_field.controls
131
- = select_tag('credit_card_info[month]', options_for_select(1..12), :class => 'input-small inline')
132
- = select_tag('credit_card_info[year]', options_for_select(Time.now.year..Time.now.year + 10), :class => 'input-small inline')
159
+ =text_field_tag "whatever", "", :class => "currency"
160
+ %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."
161
+ .modal-footer
162
+ =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
163
+ =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
133
164
 
165
+ #reset-password-modal.modal
166
+ .modal-header
167
+ .close{'data-dismiss'=>'modal'} x
168
+ %h3 Reset Password
169
+ .modal-body
170
+ %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."
134
171
  .modal-footer
135
- = submit_tag "Process Membership Change", :class => "btn btn-success"
172
+ =link_to "Send Password Reset", reset_password_person_path(@person), :class => "btn btn-primary", 'data-dismiss'=>'modal', :method => :post
136
173
  =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
137
-
138
- #partial-refund.modal
139
- .modal-header
140
- .close{'data-dismiss'=>'modal'} x
141
- %h3 Refund Membership
142
- .modal-body
143
- .control-group
144
- %label Enter refund amount:
145
- .controls
146
- =text_field_tag "whatever", "", :class => "currency"
147
- %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."
148
- .modal-footer
149
- =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
150
- =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
151
-
152
- #reset-password-modal.modal
153
- .modal-header
154
- .close{'data-dismiss'=>'modal'} x
155
- %h3 Reset Password
156
- .modal-body
157
- %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."
158
- .modal-footer
159
- =link_to "Send Password Reset", reset_password_person_path(@person), :class => "btn btn-primary", 'data-dismiss'=>'modal', :method => :post
160
- =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'