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
data/app/views/store/events/calendar.html.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  - content_for :title do
2
- Buy tickets to #{@event.name}
2
+ Get tickets to #{@event.name}
3
3
  .container#multi-show-container
4
4
  #event-header
5
5
  %h1#logo= @event.name
@@ -36,14 +36,7 @@
36
36
  =simple_format @event.description
37
37
  .side-section
38
38
  =render :partial => "venue", :locals => { :event => @event }
39
- - unless @event.contact_email.blank? && @event.contact_phone.blank?
40
- #contact.side-section
41
- %h6 Contact
42
- - unless @event.contact_email.blank?
43
- = mail_to @event.contact_email
44
- <br />
45
- - unless @event.contact_phone.blank?
46
- = @event.contact_phone
39
+ =render :partial => "contact_info", :locals => {:event => @event}
47
40
 
48
41
  #poster-modal.modal.hide.fade
49
42
  .modal-body
data/app/views/store/events/show.html.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  - content_for :title do
2
- Buy tickets to #{@event.name}
2
+ Get tickets to #{@event.name}
3
3
  .container#multi-show-container
4
4
  #event-header
5
5
  %h1#logo= @event.name
@@ -36,14 +36,7 @@
36
36
  =simple_format @event.description
37
37
  .side-section
38
38
  =render :partial => "venue", :locals => { :event => @event }
39
- - unless @event.contact_email.blank? && @event.contact_phone.blank?
40
- #contact.side-section
41
- %h6 Contact
42
- - unless @event.contact_email.blank?
43
- = mail_to @event.contact_email
44
- <br />
45
- - unless @event.contact_phone.blank?
46
- = @event.contact_phone
39
+ =render :partial => "contact_info", :locals => {:event => @event}
47
40
 
48
41
  #poster-modal.modal.hide.fade
49
42
  .modal-body
data/app/views/store/events/single_show.html.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  - content_for :title do
2
- Buy tickets to #{@event.name}
2
+ Get tickets to #{@event.name}
3
3
 
4
4
  .container#single-show-container
5
5
  .row
@@ -37,8 +37,8 @@
37
37
  = image_tag @event.image.url, :class => "event-poster", "data-toggle" => "modal", "data-target" => "#poster-modal"
38
38
 
39
39
  .side-section.store-event-display
40
- - unless @event.venue.address_as_string.blank?
41
- =render :partial => "venue", :locals => { :event => @event }
40
+ =render :partial => "venue", :locals => { :event => @event }
41
+ =render :partial => "contact_info", :locals => {:event => @event}
42
42
 
43
43
  #poster-modal.modal.hide.fade
44
44
  .modal-body
data/app/views/store/memberships/index.html.haml CHANGED
@@ -7,7 +7,7 @@
7
7
  .row#membership-storefront
8
8
  .span8
9
9
  #salesy{:style => "margin-bottom: 20px"}
10
- =@membership_kit.marketing_copy_heading.html_safe
10
+ =(@membership_kit.marketing_copy_heading || "").html_safe
11
11
 
12
12
  - @membership_types.each do |membership_type|
13
13
  .row-fluid{:id => "membership-type-#{membership_type.id}"}
@@ -17,7 +17,7 @@
17
17
  .title.active
18
18
  .price
19
19
  =number_as_cents membership_type.price_for(current_member)
20
- .membership_type_name
20
+ .type_name
21
21
  =membership_type.name
22
22
  =membership_type.description
23
23
  %br
@@ -37,4 +37,4 @@
37
37
 
38
38
  .span4
39
39
  .side-section
40
- =@membership_kit.marketing_copy_sidebar.html_safe
40
+ =(@membership_kit.marketing_copy_sidebar || "").html_safe
data/app/views/store/orders/blank.html.erb ADDED
@@ -0,0 +1,34 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>The page you were looking for doesn't exist (404)</title>
5
+ <link rel="stylesheet" type="text/css" href="/stylesheets/bootstrap.css">
6
+ </head>
7
+
8
+ <body style="padding:50px">
9
+ <div class="well">
10
+ <div style="width:800px; margin:0 auto; text-align:center">
11
+ <img src="/images/logo-404-500.png">
12
+
13
+ <h1>
14
+ Oh No! We can't process your order.
15
+ </h1>
16
+ <h3>It's possible that the tickets in your cart have expired. We're sorry about this.</h3>
17
+ <h3>Please try one of the following:</h3>
18
+ </div>
19
+ <div class="row">
20
+ <div class="span8 offset3">
21
+ <p>
22
+ <ul style="font-size:18px;">
23
+ <li style="margin-bottom:20px;">Press your browser's back button and try adding the tickets or making the donation again.</li>
24
+ <li style="margin-bottom:20px;">Notify us by emailing <a href="mailto:support@artful.ly">support@artful.ly</a>. Describe as much of the problem as possible and we'll help out as soon as we can.</li>
25
+ <li style="margin-bottom:20px;">Notify the organization from whom you're trying to purchase tickets.</li>
26
+ <li style="margin-bottom:20px;">Search our <a href="http://www.fracturedatlas.org/site/knowledgebase/topic/Artful.ly">Knowledge Base</a></li>
27
+ </ul>
28
+ </p>
29
+ <h3>Thanks for using Artful.ly!</h3>
30
+ </div>
31
+ </div>
32
+ </div>
33
+ </body>
34
+ </html>
data/app/views/store/orders/show.html.haml CHANGED
@@ -72,6 +72,8 @@
72
72
  %b Total
73
73
  %td.right#cart-total
74
74
  %b=number_as_cents current_cart.total
75
+
76
+ = tax_deductible_message
75
77
 
76
78
  = link_to "Clear My Cart", store_order_path, :method => :delete, :data => { :confirm => 'Are you sure you want to empty your cart?' }
77
79
 
@@ -86,8 +88,7 @@
86
88
  %h2 Checkout
87
89
  .span4{:style => "padding-top: 10px"}
88
90
  .pull-right
89
- -unless session[:last_event_id].blank?
90
- =link_to "Return to Event", store_old_storefront_event_url(session[:last_event_id]), :class => "btn"
91
+ =link_to "Keep Shopping", store_events_path(@store_organization.cached_slug), :class => "btn"
91
92
 
92
93
  .navbar.clean
93
94
  .navbar-inner
@@ -123,7 +124,7 @@
123
124
  .controls= address.select(:country, [], :class => 'required')
124
125
  .control-group
125
126
  = address.label :state, "State", :class => 'control-label required'
126
- .controls= address.select(:state, [params.fetch(:address, {}).fetch(:state, "")], :value => params.fetch(:address, {}).fetch(:state, ""), :class => 'required')
127
+ .controls= address.select(:state, [params.fetch(:address, {}).fetch(:state, "")], {:value => params.fetch(:address, {}).fetch(:state, "")}, :class => 'required')
127
128
  .control-group
128
129
  = address.label :city, "City", :class => 'control-label required'
129
130
  .controls= address.text_field :city, :class => 'required', :value => params.fetch(:address, {}).fetch(:city, "")
@@ -155,14 +156,16 @@
155
156
  .control-group
156
157
  = card.label :expiration, "Expiration", :class => 'control-label'
157
158
  .controls
158
- = card.select 'month', options_for_select((1..12).map{|m| "%02d" % m}), {}, :class => "span2"
159
+ = card.select 'month', options_for_select((1..12).map{|m| "%02d" % m}), {:include_blank => true, :name => 'month'}, :id => "credit_card_month", :class => "required current_value span2"
159
160
  \/
160
- = card.select 'year', options_for_select(Date.today.year..Date.today.year+10), {}, :class => "span2"
161
+ = card.select 'year', options_for_select(Date.today.year..Date.today.year+10), {:include_blank => true, :name => 'year'}, :id => "credit_card_year", :type => 'year', :class => "required current_value span2"
162
+ .expiration-error.hidden
163
+ %span.help-inline="A valid date is required."
161
164
 
162
165
  -unless @special_instructions_hash.empty?
163
166
  .navbar.clean
164
167
  .navbar-inner
165
- .brand.brand-lite Special Instructions
168
+ .brand.brand-lite Special
166
169
 
167
170
  #special-instructions
168
171
  - @special_instructions_hash.each do |event_id, caption|
@@ -172,6 +175,12 @@
172
175
  .controls= special_instructions.text_area event_id
173
176
 
174
177
  #purchase
178
+ - if @store_organization.kits.mailchimp && @store_organization.kits.mailchimp.default_list?
179
+ .control-group
180
+ .controls
181
+ %label.checkbox
182
+ = @store_organization.kits.mailchimp.fan_subscribe_question
183
+ = check_box_tag "subscribe"
175
184
  .control-group
176
185
  .controls
177
186
  %label.checkbox
data/app/views/store/passes/index.html.haml CHANGED
@@ -7,7 +7,7 @@
7
7
  .row#membership-storefront
8
8
  .span8
9
9
  #salesy{:style => "margin-bottom: 20px"}
10
- =@passes_kit.marketing_copy_heading.html_safe
10
+ =(@passes_kit.marketing_copy_heading || "").html_safe
11
11
 
12
12
  - @pass_types.each do |pass_type|
13
13
  .row-fluid{:id => "pass-type-#{pass_type.id}"}
@@ -17,7 +17,7 @@
17
17
  .title.active
18
18
  .price
19
19
  =number_as_cents pass_type.price
20
- .pass_type_name
20
+ .type_name
21
21
  =pass_type.name
22
22
  =pass_type.description
23
23
  %br
@@ -30,4 +30,4 @@
30
30
 
31
31
  .span4
32
32
  .side-section
33
- =@passes_kit.marketing_copy_sidebar.html_safe
33
+ =(@passes_kit.marketing_copy_sidebar || "").html_safe
data/app/views/store/shared/_small_donate_form.html.haml CHANGED
@@ -1,22 +1,25 @@
1
1
  - donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
2
- %h6 Donate
3
2
 
4
- - if donation_kit
5
- -if donation_kit.donation_nudge_text.present?
6
- %p= donation_kit.donation_nudge_text
7
- -else
8
- %p
9
- Help support our work by adding a donation to your order!
10
- %br
11
- Donations are tax-deductible to the extent permitted by law.
12
- - else @store_organization.authorization_hash[:type] == :sponsored
13
- %p= "#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
3
+ - if current_cart.donations.empty?
4
+ #storefront-donate-now-container
5
+ %h6 Donate
14
6
 
15
- = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
16
- = hidden_field_tag :_source, 'cart'
17
- .preset-amount.last
18
- .input-prepend
19
- %span.add-on $
20
- = text_field_tag :donation_amount, '', :class => 'span1'
7
+ - if donation_kit
8
+ -if donation_kit.donation_nudge_text.present?
9
+ %p= donation_kit.donation_nudge_text
10
+ -else
11
+ %p
12
+ Help support our work by adding a donation to your order!
13
+ %br
14
+ Donations are tax-deductible to the extent permitted by law.
15
+ - elsif @store_organization.authorization_hash[:type] == :sponsored
16
+ %p= "#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
21
17
 
22
- = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
18
+ = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
19
+ = hidden_field_tag :_source, 'cart'
20
+ .preset-amount.last
21
+ .input-prepend
22
+ %span.add-on $
23
+ = text_field_tag :donation_amount, '', :class => 'span1'
24
+
25
+ = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
data/app/views/tags/_edit_modal.html.haml ADDED
@@ -0,0 +1,16 @@
1
+ #tag-modal.modal.hide.fade
2
+ .modal-header
3
+ %button.close{'data-dismiss' => 'modal', 'aria-hidden' => 'true'}
4
+ &times;
5
+ %h3 Edit
6
+ .modal-body
7
+ %p If you edit the name of a tag, the change will be reflected on every record with this tag.
8
+ %br
9
+
10
+ = form_tag update_tag_tags_path, :id => 'edit_tag' do
11
+ = hidden_field_tag :tag_id
12
+ = label_tag :name
13
+ = text_field_tag :name, nil, :class => 'tag_name'
14
+ .modal-footer
15
+ = submit_tag 'Save', :class => 'submit btn btn-small'
16
+ = button_tag 'Cancel', 'data-dismiss' => 'modal', :class => 'btn btn-small'
data/app/views/tags/index.html.haml ADDED
@@ -0,0 +1,23 @@
1
+ - content_for :title do
2
+ Tags List
3
+ - content_for :header do
4
+ %h1 Tags List
5
+
6
+ - content_for :custom_js do
7
+ = javascript_include_tag 'tags'
8
+
9
+ .row
10
+ .span6.offset3
11
+ - @tags.each do |tag|
12
+ .row.tag-row
13
+ .span2
14
+ = link_to tag, searches_path(:search => {'tagging' => tag.name}), :class => 'tag rounder', :method => 'POST'
15
+ .span2
16
+ = link_to 'Edit', '#', :class => 'edit-tag btn btn-small pull-right', :data => {'tag-name' => tag.name, 'tag-id' => tag.id}
17
+ .span1
18
+ = link_to 'Delete', tag_path(tag), :method => :delete, :class => 'btn btn-small pull-right', :confirm => 'Are you sure?'
19
+ %br
20
+
21
+ = will_paginate @tags
22
+
23
+ = render :partial => 'edit_modal'
data/app/views/unacknowledged_gifts/_heard_action.html.haml ADDED
@@ -0,0 +1,10 @@
1
+ - action = Action.for_organization(current_user.current_organization)
2
+ .modal{:id => "heard-modal"}
3
+ .modal-header
4
+ %h3 New Heard Action
5
+ .modal-body
6
+ = select_tag :subtype, options_for_select(HearAction.subtypes, action.subtype), :class => 'action-subtype input-medium', :style => 'margin-bottom:15px'
7
+ = text_field_tag :occurred_at, "#{l(action.occurred_at_local_to_organization, :format => :datetime_for_input)}", :readonly => true, :class => :datetimepicker, :style => 'margin-bottom:15px'
8
+ = text_area_tag :details, 'Gift acknowledgement sent', {:size => "125x5", :style => 'margin-bottom:15px; width:500px'}
9
+ = submit_tag "Save", :class => 'btn btn-primary'
10
+ = link_to "Cancel", "#", :class => 'btn', 'data-dismiss'=>'modal'
data/app/views/unacknowledged_gifts/index.html.haml ADDED
@@ -0,0 +1,76 @@
1
+ - in_section :fundraising
2
+ - content_for :header do
3
+ %h1="Unacknowledged Gifts"
4
+
5
+ =form_tag(unacknowledged_gifts_path, :method => :get, :class=>'well form-horizontal') do
6
+ .row-fluid
7
+ .pull-left
8
+
9
+ .control-group
10
+ = label_tag :start, "From", :class => "control-label"
11
+ .controls
12
+ = text_field_tag :start,"#{l @report.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small', :style=>'float:left'
13
+
14
+ = label_tag :stop, "To", :class => "control-label", :style=>'width:30px;margin-right:18px'
15
+
16
+ = text_field_tag :stop, "#{l @report.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
17
+ .control-group
18
+ = label_tag :type, "Gift Type", :class => "control-label"
19
+ .controls
20
+ = select_tag :type, options_for_select(Donation::GIFT_TYPES.invert.to_a, @report.type), :style => 'width:255px'
21
+ .control-group
22
+ = label_tag :campaign_id, "Campaign", :class => "control-label"
23
+ .controls
24
+ = select_tag :campaign_id, options_from_collection_for_select(current_user.current_organization.campaigns.active, :id, :name, @report.campaign_id), :onchange => "loadAppeals('campaign_id','appeal_id', #{@campaign_appeals.to_json})", :include_blank => true, :style => 'width:255px'
25
+ .control-group
26
+ = label_tag :appeal_id, "Appeal", :class => "control-label"
27
+ .controls
28
+ = select_tag :appeal_id, options_from_collection_for_select(@report.campaign ? @report.campaign.appeals.active : [], :id, :name, @report.appeal_id), :include_blank => true, :style => 'width:255px'
29
+ .pull-right
30
+ .control-group
31
+ = label_tag :person, "Person/Company", :class => "control-label"
32
+ .controls
33
+ = text_field_tag :search, params[:search], :placeholder => 'Search Person/Company'
34
+ .row-fluid
35
+ .pull-right
36
+
37
+ %ul{:style=>'margin-top:-45px'}
38
+ %li{:style=>'float: left;margin-left: 5px;'}
39
+ = submit_tag "Search", :class => "btn"
40
+
41
+ %li.dropdown{:id => "#menu#bulkactions", :style=>'float: left;margin-left: 5px;'}
42
+ =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
43
+ %ul.dropdown-menu
44
+ %li= link_to 'Set Acknowledgement Date', "#heard-modal", :id => 'heard-link', 'data-toggle' => 'modal'
45
+ %li= link_to 'Export to CSV', params.merge(:format => 'csv').delete_if {|k,v| :commit == k.to_sym }
46
+
47
+ =form_tag bulk_acknowledge_unacknowledged_gifts_path, :method => :post do
48
+ = render :partial => 'heard_action'
49
+
50
+ -if @rows.any?
51
+ %table.table
52
+ %tr
53
+ %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
54
+ %th Order
55
+ %th Date
56
+ %th Person
57
+ %th Campaign
58
+ %th Appeal
59
+ %th Type
60
+ %th Amount
61
+ - @rows.each do |row|
62
+ %tr
63
+ %td.grouped-checkbox= check_box_tag "order_ids[]", row.order.id
64
+ %td= link_to row.order.id, order_path(row.order.id)
65
+ %td= l(row.date, :format => '%m/%d/%Y')
66
+ %td= link_to_person row.order.person
67
+ %td= row.donation.campaign.name unless row.donation.campaign.nil?
68
+ %td= row.donation.appeal.name unless row.donation.appeal.nil?
69
+ %td= row.type
70
+ %td= number_as_cents row.order.sum_donations
71
+ =will_paginate @rows
72
+ -else
73
+ %h3="No Results Found"
74
+
75
+ -content_for :custom_js do
76
+ = javascript_include_tag 'contributions'
data/app/views/user_memberships/_list.html.haml CHANGED
@@ -1,30 +1,153 @@
1
- .row
2
- .span3
1
+ .row-fluid
2
+ .span8
3
3
  %h3{:style => "margin-top: 0px"} Users
4
- - if can? :manage, current_user.current_organization
5
- = link_to "Invite User", "#userForm", 'data-toggle' => 'modal', :class => 'btn'
6
- .span9
7
- %ul#memberships.detailed-list.row-fluid
8
- - organization.users.each do |user|
9
- %li.row-fluid
10
- .span2
11
- = gravatar_image_tag(user.email, :alt => 'User icon', :class => 'user-grav bordered', :gravatar => { :size => 48 })
12
- .span9
13
- .email= truncate(user.email)
14
- .remove
15
- - if user == current_user.current_organization.owner
16
- Organization Administrator
17
- - elsif can? :manage, current_user.current_organization
18
- = link_to "Remove", organization_user_membership_path(@organization, user.membership_in(organization)), :method => :delete
4
+ %p
5
+ -if @ability.can? :manage, User
6
+ Add or remove users on your organization's account. Set users' permission levels.
7
+ %br
8
+ =link_to "Learn more about permissions.", "#learnMore", 'data-toggle' => 'modal'
9
+ .span4
10
+ .pull-right
11
+ - if can? :manage, current_user.current_organization
12
+ = link_to "Invite User", "#userForm", 'data-toggle' => 'modal', :class => 'btn btn-success'
19
13
 
20
- #userForm.modal
21
- = form_tag organization_user_memberships_path(@organization.id), :action => "create" do
14
+
15
+ #user-list
16
+ - @sorted_user_memberships.each do |user_membership|
17
+ .user-container{:id => "user-container-#{user_membership.user_id}"}
18
+ .row-fluid
19
+ .span1.user-image
20
+ = gravatar_image_tag(user_membership.user.email, :alt => 'User icon', :class => 'user-grav circle-grav', :gravatar => { :size => 48 })
21
+
22
+ .span4.user-email
23
+ .email
24
+ = truncate(user_membership.user.email, :length => 40)
25
+ -if user_membership.receive_daily_sales_report?
26
+ %i.icon-envelope.artfully-tooltip#daily-sales-report-icon{"data-toggle"=>"tooltip", :rel => "tooltip", "data-original-title" => "This user will receive the daily sales report.", "data-trigger" => "hover"}
27
+ .other
28
+ ="#{pluralize user_membership.user.sign_in_count, 'login'}. #{last_login(user_membership.user.current_sign_in_at)}."
29
+ .span5.user-role
30
+ =user_membership.role_title
31
+
32
+ .span2.user-actions
33
+ -if (@ability.can? :manage, current_user.current_organization)
34
+ = link_to "Edit", "#editForm#{user_membership.user_id}", 'data-toggle' => 'modal'
35
+ %br
36
+ -unless user_membership.user_id == current_user.id
37
+ = link_to "Remove", "#removeForm#{user_membership.user_id}", 'data-toggle' => 'modal'
38
+
39
+ -if (@ability.can? :manage, current_user.current_organization)
40
+ #userForm.modal
41
+ = form_tag organization_user_memberships_path(@organization.id), :action => "create", :class => "form-horizontal" do
42
+ .modal-header
43
+ .close{'data-dismiss'=>'modal'} x
44
+ %h3 Add A User To Your Organization
45
+ .modal-body
46
+ %p
47
+ Enter the user's email address below and select a role. The user will receive an email with a link to join Artful.ly and set his or her password.
48
+ .control-group#email-controls
49
+ %label.control-label Email
50
+ .controls
51
+ = text_field_tag :user_email, "", :placeholder => "Enter an email address..."
52
+ .control-group#role-controls
53
+ %label.control-label Permissions
54
+ .controls
55
+ =select_tag :permission, options_for_select(Permission.available_permissions_for(current_user.current_organization), "Manager")
56
+ .control-group#daily-sales-controls
57
+ %label.control-label Send user daily report?
58
+ .controls
59
+ =check_box_tag :receive_daily_sales_report
60
+ -if current_user.current_organization.has_kit?(:regular_donation)
61
+ .control-group#donation_report
62
+ %label.control-label Send user email when donation is made?
63
+ .controls
64
+ =check_box_tag :receive_donation_notification
65
+ .control-group#receive-door-list
66
+ %label.control-label Send door list 90 minutes before show time?
67
+ .controls
68
+ =check_box_tag :receive_door_list
69
+ .modal-footer
70
+ = submit_tag "Invite", :class => "btn btn-success"
71
+ = link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
72
+
73
+ -if (@ability.can? :manage, current_user.current_organization)
74
+ - @sorted_user_memberships.each do |user_membership|
75
+ .modal{:id => "editForm#{user_membership.user_id}"}
76
+ = form_tag organization_user_membership_path(@organization.id, user_membership), :method => :put, :class => "form-horizontal" do
77
+ .modal-header
78
+ .close{'data-dismiss'=>'modal'} x
79
+ %h3 Edit User
80
+ .modal-body
81
+ -unless user_membership.user_id == current_user.id
82
+ .control-group#role-controls
83
+ %label.control-label Permissions
84
+ .controls
85
+ =select_tag :permission, options_for_select(Permission.available_permissions_for(current_user.current_organization), user_membership.role_title)
86
+ .control-group#daily-sales-controls
87
+ %label.control-label Send user daily report?
88
+ .controls
89
+ =check_box_tag :receive_daily_sales_report, true, user_membership.receive_daily_sales_report?
90
+ -if current_user.current_organization.has_kit?(:regular_donation)
91
+ .control-group#donation_report
92
+ %label.control-label Send user email when donation is made?
93
+ .controls
94
+ =check_box_tag :receive_donation_notification, true, user_membership.receive_donation_notification?
95
+ .control-group#door_list
96
+ %label.control-label Send door list 90 minutes before show time?
97
+ .controls
98
+ =check_box_tag :receive_door_list, true, user_membership.receive_door_list?
99
+ .modal-footer
100
+ = submit_tag "Save", :class => "btn btn-success"
101
+ = link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
102
+
103
+ -if (@ability.can? :manage, current_user.current_organization)
104
+ - @sorted_user_memberships.each do |user_membership|
105
+ .modal{:id => "removeForm#{user_membership.user_id}"}
106
+ = form_tag organization_user_memberships_path(@organization.id, user_membership), :action => "destroy" do
22
107
  .modal-header
23
108
  .close{'data-dismiss'=>'modal'} x
24
- %h3 Add A User To Your Organization
109
+ %h3 Remove User
25
110
  .modal-body
26
- %p
27
- Enter the user's email address below. The user will receive an email with a link to join Artful.ly and set his or her password.
28
- = text_field_tag :user_email, "", :placeholder => "Enter an email address..."
111
+ Are you sure you want to remove this user from your organization? The user will not be notified of this change.
29
112
  .modal-footer
30
- = submit_tag "Add", :class => 'btn'
113
+ = link_to "No, do not remove this user", "#", :class => "btn", 'data-dismiss'=>'modal'
114
+ = link_to "Yes, remove this user", organization_user_membership_path(@organization, user_membership), :method => :delete, :class => "btn btn-danger"
115
+
116
+ .modal#learnMore
117
+ .modal-header
118
+ .close{'data-dismiss'=>'modal'} x
119
+ %h3 Permissions
120
+ Permissions allow users of your organization to do some things while restricting them from doing others. The four permission tiers in Artful.ly are:
121
+ .modal-body
122
+ %h4 Box Office Associate
123
+ %p Limited access for junior staff or volunteers
124
+ %ul{:style => "margin:20px;list-style:disc;"}
125
+ %li Can make sales
126
+ %li Can view and edit just the contact info on people records
127
+ %li Cannot import or export data
128
+ %li Cannot refund or exchange orders
129
+
130
+ %h4 General Associate
131
+ %p Standard access for most staff
132
+ %ul{:style => "margin:10px;padding:10px;list-style:disc;"}
133
+ %li Can view, add, and edit most records or reports
134
+ %li Cannot add or edit events, shows, memberships, passes, or discounts
135
+ %li Cannot make sales
136
+
137
+ %h4 Manager
138
+ %p Advanced access for supervisors
139
+ %ul{:style => "margin:10px;padding:10px;list-style:disc;"}
140
+ %li Can view, add, and edit any record, report, event, show, membership, pass, or discount
141
+ %li Can make sales
142
+ %li Can refund or exchange orders
143
+ %li Can add and configure kits
144
+ %li Cannot add or edit users, permissions, or bank account
145
+
146
+ %h4 Organization Administrator
147
+ %p Full access
148
+ %ul{:style => "margin:10px;padding:10px;list-style:disc;"}
149
+ %li Can view, add, and edit everything
150
+ %li Can add other users and set permission levels
151
+ %li Can edit connected bank account
152
+ .modal-footer
153
+ = link_to "OK", "#", :class => "btn", 'data-dismiss'=>'modal'