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
@@ -41,16 +41,27 @@ class OrderHandler
41
41
  end
42
42
 
43
43
  def handle_donation(params, organization)
44
+ #donation amount as string
44
45
  donation_amount = params[:donation_amount].present? ? params[:donation_amount] : params[:donation_amount_fixed]
46
+
45
47
  if donation_amount
46
48
  self.cart.clear_donations
47
- if donation_amount.to_i == 0
49
+
50
+ #strip any dollar signs
51
+ donation_amount = donation_amount.tr("$", "")
52
+
53
+ #convert to BigDecimal, then to integer
54
+ #note that the second parameter to BigDecimal.new is precision, not a default value
55
+ donation_amount = (BigDecimal.new(donation_amount, 0) * 100).to_i
56
+ if donation_amount == 0
48
57
  self.error = "Please enter a donation amount."
49
58
  return
50
59
  end
51
60
 
52
61
  donation = Donation.new
53
- donation.amount = donation_amount.to_i * 100
62
+ donation.amount = donation_amount
63
+ donation.campaign_id = params[:campaign_id]
64
+ donation.appeal_id = params[:appeal_id]
54
65
  donation.organization = organization
55
66
  self.cart.donations << donation
56
67
  end
@@ -0,0 +1,11 @@
1
+ class ConvertOrder < ::Order
2
+
3
+ def location
4
+ "Artful.ly"
5
+ end
6
+
7
+ def processor_class
8
+ ConvertOrderProcessor
9
+ end
10
+
11
+ end
@@ -4,7 +4,7 @@ class Organization < ActiveRecord::Base
4
4
  include Ext::Resellable::Organization
5
5
  include Ext::Integrations::Organization
6
6
 
7
- attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report, :country, :state, :zip, :phone_number, :website, :discipline, :cached_slug
7
+ attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report, :country, :state, :zip, :phone_number, :website, :discipline, :cached_slug, :fiscal_month, :fiscal_day, :budget_restrictions_attributes
8
8
 
9
9
  has_many :events
10
10
  has_many :charts
@@ -14,6 +14,7 @@ class Organization < ActiveRecord::Base
14
14
 
15
15
  has_many :people
16
16
  has_many :segments
17
+ has_many :advanced_search_segments
17
18
  has_many :households
18
19
 
19
20
  has_many :user_memberships
@@ -27,14 +28,28 @@ class Organization < ActiveRecord::Base
27
28
  has_many :pass_types
28
29
 
29
30
  has_many :searches
31
+ has_many :advanced_searches
32
+ has_many :job_monitors
30
33
 
31
- has_many :users, :through => :user_memberships, :order => 'user_memberships.owner desc'
34
+ has_many :users, :through => :user_memberships
32
35
  has_many :kits, :before_add => :check_for_duplicates,
33
36
  :after_add => lambda { |u,k| k.activate! unless k.activated? }
34
37
 
35
38
  has_many :imports
39
+ has_many :suggested_households
36
40
 
37
- scope :receiving_sales_email, where(:receive_daily_sales_report => true)
41
+ has_many :campaigns
42
+ has_many :soft_credits
43
+ has_many :scheduled_pledge_payments
44
+ has_many :budget_restrictions
45
+
46
+ validates :ein, :presence => true, :if => :updating_tax_info
47
+ validates :legal_organization_name, :presence => true, :if => :updating_tax_info
48
+ validates_presence_of :fiscal_day, :if => :fiscal_month
49
+
50
+ scope :receiving_sales_email, joins(:user_memberships).where('user_memberships.receive_daily_sales_report = ?', true).uniq
51
+
52
+ accepts_nested_attributes_for :budget_restrictions, :reject_if => lambda { |p| p[:name].blank? }, :allow_destroy => true
38
53
 
39
54
  is_sluggable :name, :editable => true
40
55
  validates :cached_slug,
@@ -80,8 +95,12 @@ class Organization < ActiveRecord::Base
80
95
  self.tags_for(tagged_association).all.map(&:name).uniq
81
96
  end
82
97
 
98
+ def admin_limit_reached?
99
+ self.owner.present? && self.administrator_limited?
100
+ end
101
+
83
102
  #
84
- # Will promote user to owner and demote any other owners
103
+ # Will promote user to organization_administrator
85
104
  #
86
105
  def make_owner(user)
87
106
  UserMembership.promote(user, self)
@@ -94,8 +113,23 @@ class Organization < ActiveRecord::Base
94
113
  users.order('user_memberships.id asc').first
95
114
  end
96
115
 
116
+ #
117
+ # A shorthand for "first org admin" basically meaning "Just get me someone at the org"
118
+ #
97
119
  def owner
98
- @owner ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:owner => true).first.try(:user)
120
+ @owner ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:organization_administrator => true).first.try(:user)
121
+ end
122
+
123
+ def daily_sales_report_recipients
124
+ @recipients ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:receive_daily_sales_report => true).collect(&:user)
125
+ end
126
+
127
+ def donation_notification_recipients
128
+ @donation_notification_recipients ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:receive_donation_notification => true).collect(&:user)
129
+ end
130
+
131
+ def door_list_recipients
132
+ @door_list_recipients ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:receive_door_list => true).collect(&:user)
99
133
  end
100
134
 
101
135
  def dummy
@@ -116,12 +150,18 @@ class Organization < ActiveRecord::Base
116
150
 
117
151
  delegate :can?, :cannot?, :to => :ability
118
152
  def ability
119
- OrganizationAbility.new(self)
153
+ @ability ||= OrganizationAbility.new(self)
120
154
  end
121
155
 
122
156
  attr_accessor :updating_tax_info
123
157
  def update_tax_info(params)
124
158
  @updating_tax_info = true
159
+
160
+ if ( (params[:ein] || "").gsub(/\D/, '').length != 9 )
161
+ self.errors.add(:base, "Your EIN should be nine digits. Please double-check that it is correct and try again.")
162
+ return false
163
+ end
164
+
125
165
  update_attributes({
126
166
  :ein => params[:ein],
127
167
  :legal_organization_name => params[:legal_organization_name],
@@ -146,11 +186,23 @@ class Organization < ActiveRecord::Base
146
186
  end
147
187
 
148
188
  def donations
149
- Item.includes(:order => [:person => :address]).where(:product_type => "Donation", :orders => { :organization_id => id })
189
+ Item.includes(:order => [:person => :addresses]).where(:product_type => "Donation", :orders => { :organization_id => id })
150
190
  end
151
191
 
152
192
  def ticket_sales
153
- Item.includes(:show => [:event => :venue], :order => [:person => :address]).where(:product_type => "Ticket", :orders => { :organization_id => id })
193
+ tickets.sold_or_comped
194
+ end
195
+
196
+ def tickets_free
197
+ Item.includes(:show => [:event => :venue], :order => [:person => :addresses]).where('product_type = ? AND orders.organization_id = ? AND items.price = ? AND (items.state = ? OR items.state = ? OR items.state = ?)', "Ticket", id, 0, "exchanged", "settled", "purchased")
198
+ end
199
+
200
+ def tickets_paid
201
+ Item.includes(:show => [:event => :venue], :order => [:person => :addresses]).where('product_type = ? AND orders.organization_id = ? AND items.price > ? AND (items.state = ? OR items.state = ? OR items.state = ?)', "Ticket", id, 0, "exchanged", "settled", "purchased")
202
+ end
203
+
204
+ def tickets_comped
205
+ tickets.comped
154
206
  end
155
207
 
156
208
  def kit(name)
@@ -168,7 +220,33 @@ class Organization < ActiveRecord::Base
168
220
  end
169
221
 
170
222
  def has_active_donation_only_storefront?
171
- self.has_kit?(:regular_donation) && self.kit(:regular_donation).donation_only_storefront == '1'
223
+ self.has_active_storefront?(:regular_donation)
224
+ end
225
+
226
+ def has_active_membership_storefront?
227
+ self.has_active_storefront?(:membership)
228
+ end
229
+
230
+ def has_active_passes_storefront?
231
+ self.has_active_storefront?(:passes)
232
+ end
233
+
234
+ def has_active_storefront?(kit)
235
+ self.has_kit?(kit) && self.kit(kit).has_active_storefront?
236
+ end
237
+
238
+ def has_any_storefront_kit?
239
+ self.kit( :regular_donation )||
240
+ self.kit( :membership ) ||
241
+ self.kit( :passes )
242
+ end
243
+
244
+ def ticketing_kit?
245
+ self.has_kit?('TicketingKit')
246
+ end
247
+
248
+ def sponsored_project?
249
+ self.authorization_hash[:type] == :sponsored
172
250
  end
173
251
 
174
252
  private
@@ -1,10 +1,11 @@
1
1
  class ParsedRow
2
-
2
+ include Imports::Mappings
3
+
3
4
  attr_accessor :row
4
5
  attr_accessor :values_hash
5
6
 
6
7
  #Fields which require special parsing such as dollar amounts
7
- EXCEPTIONS = [:amount, :nongift_amount, :deductible_amount]
8
+ EXCEPTIONS = [:amount, :nongift_amount, :deductible_amount, :match_eligible_amount, :soft_credit_amount]
8
9
 
9
10
  SHARED_FIELDS = {
10
11
  :first => [ "First name", "First" ],
@@ -15,19 +16,49 @@ class ParsedRow
15
16
  }
16
17
 
17
18
  ADDRESS_FIELDS = {
18
- :address1 => [ "Address 1", "Address1" ],
19
- :address2 => [ "Address 2", "Address2" ],
20
- :city => [ "City" ],
21
- :state => [ "State" ],
22
- :zip => [ "Zip", "Zip code" ],
23
- :country => [ "Country" ]
19
+ :addressA_address1 => [ "AddressA Address 1", "Address 1", "Address1" ],
20
+ :addressA_address2 => [ "AddressA Address 2", "Address 2", "Address2" ],
21
+ :addressA_city => [ "AddressA City", "City" ],
22
+ :addressA_state => [ "AddressA State", "State" ],
23
+ :addressA_zip => [ "AddressA Zip", "Zip", "Zip code" ],
24
+ :addressA_country => [ "AddressA Country", "Country" ],
25
+ :addressA_type => [ "AddressA Type", "Type" ],
26
+ :addressB_address1 => [ "AddressB Address 1" ],
27
+ :addressB_address2 => [ "AddressB Address 2" ],
28
+ :addressB_city => [ "AddressB City" ],
29
+ :addressB_state => [ "AddressB State" ],
30
+ :addressB_zip => [ "AddressB Zip" ],
31
+ :addressB_country => [ "AddressB Country" ],
32
+ :addressB_type => [ "AddressB Type" ],
33
+ :addressC_address1 => [ "AddressC Address 1" ],
34
+ :addressC_address2 => [ "AddressC Address 2" ],
35
+ :addressC_city => [ "AddressC City" ],
36
+ :addressC_state => [ "AddressC State" ],
37
+ :addressC_zip => [ "AddressC Zip" ],
38
+ :addressC_country => [ "AddressC Country" ],
39
+ :addressC_type => [ "AddressC Type" ]
40
+ }
41
+
42
+ CAMPAIGN_FIELDS = {
43
+ :campaign => [ "Campaign", "Campaign Name" ],
44
+ :appeal => [ "Appeal", "Appeal Name" ],
45
+ :ack_sent_date => [ "Acknowledgement", "Acknowledgement Sent Date" ],
46
+ :match_eligible_matcher => [ "Matcher", "Match Eligible Matcher" ],
47
+ :match_eligible_ratio => [ "Ratio", "Match Eligible Ratio" ],
48
+ :match_eligible_amount => [ "Match Eligible Amount"],
49
+ :soft_credit_email => [ "Soft Credit Email" ],
50
+ :soft_credit_first_name => [ "Soft Credit First Name" ],
51
+ :soft_credit_last_name => [ "Soft Credit Last Name" ],
52
+ :soft_credit_amount => [ "Soft Credit Amount", "Soft Credit"]
24
53
  }
25
54
 
26
55
  PEOPLE_FIELDS = SHARED_FIELDS.merge( {
27
- :salutation => [ "Salutation" ],
56
+ :salutation => [ "Salutation" ],
28
57
  :title => [ "Title" ],
29
58
  :company => [ "Company name", "Company" ],
30
-
59
+ :nickname => [ "Nickname" ],
60
+ :listing_name => [ "Listing Name" ],
61
+ :maiden_name => [ "Maiden Name" ],
31
62
  :phone1_type => [ "Phone1 type", "Phone 1 type" ],
32
63
  :phone1_number => [ "Phone1 number", "Phone 1", "Phone 1 number", "Phone1" ],
33
64
  :phone2_type => [ "Phone2 type", "Phone 2 type" ],
@@ -46,19 +77,19 @@ class ParsedRow
46
77
  :birth_day => [ "Birth Day" ],
47
78
  :birth_year => [ "Birth Year" ]
48
79
  })
49
-
80
+
50
81
  MEMBERSHIP_FIELDS = SHARED_FIELDS.merge( {
51
- :membership_name => [ "Membership Name", "Membership", "Name" ],
52
- :membership_plan => [ "Membership Plan", "Plan"], #PAYG, ALL IN ONE, OTHER
82
+ :membership_name => [ "Membership Name" ],
83
+ :membership_type => [ "Membership Type" ],
53
84
  :start_date => [ "Start Date" ],
54
85
  :end_date => [ "End Date" ],
55
- :amount => [ "Amount" ],
86
+ :period => [ "Period" ],
87
+ :duration => [ "Duration" ],
88
+ :amount => [ "Price Paid", "Amount" ],
56
89
  :payment_method => [ "Payment Method" ],
57
- :order_date => [ "Order Date", "Date" ],
58
-
59
- :number_of_memberships => [ "Quantity" ]
90
+ :order_date => [ "Order Date", "Date" ]
60
91
  })
61
-
92
+
62
93
  EVENT_FIELDS = SHARED_FIELDS.merge( {
63
94
  :event_name => [ "Event", "Event Name" ],
64
95
  :venue_name => [ "Venue", "Venue Name" ],
@@ -67,20 +98,18 @@ class ParsedRow
67
98
  :payment_method => [ "Payment Method" ],
68
99
  :order_date => [ "Order Date", "Date" ]
69
100
  })
70
-
71
- DONATION_FIELDS = SHARED_FIELDS.merge( {
101
+
102
+ DONATION_FIELDS = SHARED_FIELDS.merge(CAMPAIGN_FIELDS).merge( {
72
103
  :payment_method => [ "Payment Method" ],
73
104
  :donation_date => [ "Date", "Order Date" ],
74
105
  :donation_type => [ "Donation Type", "Type" ],
75
106
  :amount => [ "Amount" ],
76
107
  :deductible_amount=> [ "Deductible Amount" ],
77
-
78
- #Internally it is called nongift_amount but the rest of the world says non-deductible
79
- :nongift_amount => [ "Non-Deductible Amount", "Non Deductible Amount" ]
80
-
81
- #TODO: Total contribution sanity check
108
+ :nongift_amount => [ "Non-Deductible Amount", "Non Deductible Amount" ],
109
+ :notes => [ "Notes", "Note" ],
110
+ :fiscal_year => [ "Fiscal Year", "Fiscal" ]
82
111
  })
83
-
112
+
84
113
  FIELDS = PEOPLE_FIELDS.merge(ADDRESS_FIELDS).merge(EVENT_FIELDS).merge(DONATION_FIELDS).merge(MEMBERSHIP_FIELDS)
85
114
 
86
115
  # Enumerated columns default to the last value if the data value is not valid.
@@ -94,9 +123,9 @@ class ParsedRow
94
123
  def self.parse(headers, row)
95
124
  ParsedRow.new(headers, row)
96
125
  end
97
-
126
+
98
127
  def initialize(headers, row)
99
- @values_hash = HashWithIndifferentAccess.new
128
+ @values_hash = HashWithIndifferentAccess.new
100
129
  @headers = headers
101
130
  @header_hash = {}
102
131
  @headers.each_with_index { |header, index| @header_hash[header.to_s.downcase.strip] = index}
@@ -117,7 +146,7 @@ class ParsedRow
117
146
  def load_value(field, column)
118
147
  index = @header_hash[column]
119
148
  value = @row[index] if index
120
-
149
+
121
150
  exist = self.instance_variable_get("@#{field}")
122
151
 
123
152
  if exist.blank?
@@ -141,7 +170,7 @@ class ParsedRow
141
170
  end
142
171
 
143
172
  def check_enumeration(field, value)
144
- if enum = ENUMERATIONS[field]
173
+ if enum = ENUMERATIONS[field]
145
174
  if index = enum.map(&:downcase).index(value.to_s.downcase)
146
175
  enum[index]
147
176
  else
@@ -151,39 +180,93 @@ class ParsedRow
151
180
  value
152
181
  end
153
182
  end
154
-
183
+
184
+ def addressA_state
185
+ normilized_state(@addressA_state)
186
+ end
187
+
188
+ def addressB_state
189
+ normilized_state(@addressB_state)
190
+ end
191
+
192
+ def addressC_state
193
+ normilized_state(@addressC_state)
194
+ end
195
+
196
+ def addressA_country
197
+ normilized_country(@addressA_country)
198
+ end
199
+
200
+ def addressB_country
201
+ normilized_country(@addressB_country)
202
+ end
203
+
204
+ def addressC_country
205
+ normilized_country(@addressC_country)
206
+ end
207
+
208
+ def normilized_state(state)
209
+ return state if state.blank?
210
+ return state.titleize if valid_states.include?(state.titleize)
211
+ return normalized_state(state) if normalizable_state? state
212
+ state
213
+ end
214
+
215
+ def normilized_country(country)
216
+ return country if country.blank?
217
+ return country.titleize if valid_countries.include?(country.titleize)
218
+ return normalized_country(country) if normalizable_country? country
219
+ country
220
+ end
221
+
155
222
  def nongift_amount
156
223
  ((@nongift_amount.to_f || 0) * 100).to_i
157
224
  end
158
-
225
+
159
226
  def unparsed_nongift_amount
160
227
  @nongift_amount
161
228
  end
162
-
229
+
163
230
  def amount
164
231
  ((@amount.to_f || 0) * 100).to_i
165
232
  end
166
-
233
+
167
234
  def unparsed_amount
168
235
  @amount
169
236
  end
170
-
237
+
171
238
  def deductible_amount
172
239
  ((@deductible_amount.to_f || 0) * 100).to_i
173
240
  end
174
-
241
+
175
242
  def unparsed_deductible_amount
176
243
  @deductible_amount
177
244
  end
178
-
245
+
246
+ def match_eligible_amount
247
+ ((@match_eligible_amount.to_f || 0) * 100).to_i
248
+ end
249
+
250
+ def unparsed_match_eligible_amount
251
+ @match_eligible_amount
252
+ end
253
+
254
+ def soft_credit_amount
255
+ (@soft_credit_amount.to_f || 0).to_i
256
+ end
257
+
258
+ def unparsed_soft_credit_amount
259
+ @soft_credit_amount
260
+ end
261
+
179
262
  def birth_month
180
263
  month_to_number(@birth_month) if @birth_month.present?
181
264
  end
182
-
265
+
183
266
  def importing_event?
184
267
  !self.event_name.blank?
185
268
  end
186
-
269
+
187
270
  def preview(field_name)
188
271
  field_name.to_s.ends_with?("amount") ? self.send("unparsed_#{field_name}") : self.send(field_name)
189
272
  end
@@ -191,36 +274,25 @@ class ParsedRow
191
274
  def address_attributes
192
275
  Hash[ADDRESS_FIELDS.keys.map{|k| [k, self.send(k)]}]
193
276
  end
194
-
195
- def month_to_number(input)
196
- case input
197
- when "January" then "1"
198
- when "February" then "2"
199
- when "March" then "3"
200
- when "April" then "4"
201
- when "May" then "5"
202
- when "June" then "6"
203
- when "July" then "7"
204
- when "August" then "8"
205
- when "September" then "9"
206
- when "October" then "10"
207
- when "November" then "11"
208
- when "December" then "12"
209
- when "Jan" then "1"
210
- when "Feb" then "2"
211
- when "Mar" then "3"
212
- when "Apr" then "4"
213
- when "May" then "5"
214
- when "Jun" then "6"
215
- when "Jul" then "7"
216
- when "Aug" then "8"
217
- when "Sep" then "9"
218
- when "Oct" then "10"
219
- when "Nov" then "11"
220
- when "Dec" then "12"
277
+
278
+ def birth_month
279
+ filter_month(@birth_month) if @birth_month.present?
280
+ end
281
+
282
+ def filter_month(month)
283
+
284
+ full_month = Date::MONTHNAMES.index(month)
285
+ abbr_month = Date::ABBR_MONTHNAMES.index(month)
286
+
287
+ if full_month.present?
288
+ month = full_month
289
+ elsif abbr_month.present?
290
+ month = abbr_month
291
+ else
292
+ month
221
293
  end
222
294
  end
223
-
295
+
224
296
  #
225
297
  # These are also used in person.update_from_import
226
298
  #
@@ -233,6 +305,9 @@ class ParsedRow
233
305
  :middle_name => self.middle,
234
306
  :last_name => self.last,
235
307
  :suffix => self.suffix,
308
+ :nickname => self.nickname,
309
+ :listing_name => self.listing_name,
310
+ :maiden_name => self.maiden_name,
236
311
  :company_name => self.company,
237
312
  :website => self.website,
238
313
  :twitter_handle => self.twitter_username,