artfully_ose 1.2.0.pre.3 → 1.2.0.pre.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ5MzdhZmU4MmM3OTExYjViMGExNTY2OWU4ZTcxMWEyM2U5YTQxNQ==
+    NmQ2NGM0MWY2M2QxY2I0ZDJkNDIxZjExZjM4YTVjM2FmNDhmNzg4ZQ==
   data.tar.gz: !binary |-
-    MTNiYWI5ZThiMTQwOTViODA4NmQ0NmM1M2Q4NTBlMTg5NTFjZDk4OQ==
+    N2JkMGRhNDlmNWRmNmI5ZGI5YTA0MDlkNTRkMWEwYmY4ZDIxM2RhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzdmMjM4NDgwNWRlMTI1MGY4YzM3YjFjNzNhMGY2MjIzOGI1NjU5MWZmMjQy
-    ZDgyZDc4ZTI0ZTVjODY1ZGY2NDc0NzYyYzliYzUyNTZlY2Q2MGY1N2YxOWU3
-    MjIyODcyZWZiYmFkOGFlZWU0MmZlN2QxMDkzNTg3ZDlkOGQ3OWI=
+    ZTVmYjZhZmY1OWJlZDU4OGY0YzU4OGVlMWU5ODEzODZhMGE4YzVkOGMwZjI1
+    ZTMwODcwYTU5YjBlYWI2MTg2OWU0M2U1YWM5YzE0MDgyOTlhNjM5NzAyNDg3
+    YzI3YmRiMzIxNzhkNTAwODkxZGY4MTBjNTM2MjZmNGMyMDE1NWM=
   data.tar.gz: !binary |-
-    NmUwOWE4ZmE2OWEzZjhhZTI1N2NkZWJlMzZmOGQyMGNhZTE0NzY4Njk3Mzgw
-    Mjk3YzFmZTczMmM2NjBjMmMyNDY3ZTgyNGNlMzA0ZDBiMjhkNWY5OWE0YmM0
-    OWIyNDdlZjZlYzE5ZDE4ZjE5ZGJhZmM5YjBmYjU2ZTQ3ZTJjMjI=
+    MzhmOTY4YzE2ZWExMjk0MDU4OWY2ZTdkNzU4MDc3NGZlODNmMDFiYjZmNjE1
+    NGE4ZmQyZWJlZDdiMGU1YTg4OTdmZjhiNmNkZDMzYzU4MWE0YmMyMWFhMjc3
+    N2U2MDk5ODYzMjJjNzQ2YTFhMjRhNzNjOTM3Mzk2YTExMDRkN2Y=

data/app/assets/javascripts/store/store.js

@@ -50,7 +50,8 @@ $(document).ready(function(){
         $("ul#shows li").parent().attr('style','opacity:1')
         $("ul#shows li").hide();  
         targetLiEl.html(data);  
-        targetLi.fadeIn('slow'); 
+        targetLi.fadeIn('slow');
+        hookupToggle() 
       }).error(function ( data ) {
         loadingMessage.css('visibility', 'hidden')
         errorMessage.css('display', 'block')

data/app/controllers/store/orders_controller.rb

@@ -23,6 +23,21 @@ class Store::OrdersController < Store::StoreController
         @special_instructions_hash[event.id] = event.special_instructions_caption
       end
     end
+
+    if member_signed_in?
+      params[:first_name] ||= current_member.person.first_name
+      params[:last_name]  ||= current_member.person.last_name
+      params[:email]      ||= current_member.person.email
+      params[:phone]      ||= current_member.person.phones.first.try(:number)
+
+      params[:address]    ||= {}
+      params[:address][:address1] = current_member.person.address.try(:address1)
+      params[:address][:country] = current_member.person.address.try(:country)
+      params[:address][:city] = current_member.person.address.try(:city)
+      params[:address][:state] = current_member.person.address.try(:state)
+      params[:address][:zip] = current_member.person.address.try(:zip)
+
+    end
   end
 
   def destroy

data/app/models/import.rb

@@ -169,6 +169,24 @@ class Import < ActiveRecord::Base
     person.skip_commit = true
     person
   end
+  
+  def create_person(parsed_row)
+    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating person")
+    if !parsed_row.email.blank?
+      person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
+        p.import = self
+      end
+    else    
+      person = attach_person(parsed_row)
+      if !person.save
+        Rails.logger.info("Import #{id} DONATION_IMPORT: Person save failed")
+        self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ")
+        self.reload
+        fail!
+      end 
+    end
+    person  
+  end
 
   class RowError < ArgumentError
   end

data/app/models/imports/donations_import.rb

@@ -48,24 +48,6 @@ class DonationsImport < Import
     validate_amounts(parsed_row)
     true
   end
-  
-  def create_person(parsed_row)
-    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating person")
-    if !parsed_row.email.blank?
-      person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
-        p.import = self
-      end
-    else    
-      person = attach_person(parsed_row)
-      if !person.save
-        Rails.logger.info("Import #{id} DONATION_IMPORT: Person save failed")
-        self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ")
-        self.reload
-        fail!
-      end 
-    end
-    person  
-  end
    
   def create_contribution(parsed_row, person)
     Rails.logger.info("Import #{id} DONATION_IMPORT: Creating contribution")

data/app/models/imports/events_import.rb

@@ -38,24 +38,6 @@ class EventsImport < Import
     true
   end
   
-  def create_person(parsed_row)
-    if !attach_person(parsed_row).naming_details_available?
-      person = self.organization.dummy
-    elsif !parsed_row.email.blank?
-      person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
-        p.import = self
-      end
-    else    
-      person = attach_person(parsed_row)
-      if !person.save
-        self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ")
-        self.reload
-        fail!
-      end 
-    end
-    person  
-  end
-  
   def create_chart(parsed_row, event, show)
     Rails.logger.info("Import #{id} EVENT_IMPORT: Creating chart")
     chart = show.chart || show.create_chart({ :name => event.name, :skip_create_first_section => true })   

data/app/models/imports/memberships_import.rb

@@ -0,0 +1,43 @@
+class MembershipsImport < Import
+  include Imports::Rollback
+  include Imports::Validations
+  
+  def kind
+    "memberships"
+  end
+  
+  def row_valid?(parsed_row)
+    raise Import::RowError, "No Amount included in this row: #{parsed_row.row}" if parsed_row.unparsed_amount.blank?
+    raise Import::RowError, "Please include a first name, last name, email, or company name in this row: #{parsed_row.row}" unless attach_person(parsed_row).naming_details_available?
+    raise Import::RowError, "Please include a payment method in this row: #{parsed_row.row}" if parsed_row.payment_method.blank?
+    valid_amount? parsed_row.unparsed_amount      unless parsed_row.unparsed_amount.blank?
+    valid_date?   parsed_row.order_date           unless parsed_row.order_date.blank?
+    true
+  end
+  
+  def process(parsed_row)
+    row_valid?(parsed_row)
+    membership_type        = create_membership_type(parsed_row)
+    person                 = create_person(parsed_row)
+    order                  = create_order(parsed_row, person, membership_type)
+    actions                = create_actions(parsed_row, person, memberships_type)
+  end
+
+  def create_membership_type(parsed_row)
+    membership_type = self.organization.membership_types.build({
+      :name => parsed_row.membership_name
+    })
+    membership_type.plan = parsed_row.membership_plan
+    membership_type
+  end
+
+  def create_order(parsed_row, person, membership_type)
+    #get order from hash
+    # for 0 to parsed_row.number_of_memberships
+         # create an item for this membership_type
+    #add the item to the order
+    #save the order
+    #update get_action
+    #hash order by order key (person, membership_type, payment_method)
+  end
+end

data/app/models/item.rb

@@ -42,7 +42,7 @@ class Item < ActiveRecord::Base
 
   #
   # If the product that this item points to (a ticket, for instance) gets refunded or returned
-  # then re-sold to someone else, this item wil stil lshow up on the original purchaser's 
+  # then re-sold to someone else, this item will still show up on the original purchaser's 
   # action feed
   #
   def order_summary_description
@@ -104,15 +104,15 @@ class Item < ActiveRecord::Base
   end
 
   def refundable?
-    (not settlement_issued?) and product and product.refundable?
+    (not settlement_issued?) and (not dead?) and product and product.refundable?
   end
 
   def exchangeable?
-    (not settlement_issued?) and product and product.exchangeable?
+    (not settlement_issued?) and (not dead?) and product and product.exchangeable?
   end
 
   def returnable?
-    product and product.returnable?
+    (not dead?) and product and product.returnable?
   end
 
   #
@@ -179,7 +179,7 @@ class Item < ActiveRecord::Base
   end
 
   def dead?
-    refunded? || refund? || return?
+    refunded? || refund? || exchanged? || return?
   end
   
   def return?
@@ -212,7 +212,7 @@ class Item < ActiveRecord::Base
   def exchanged?
     state.eql? "exchanged"
   end
-  
+
   #TODO: This isn't used anymore.  It needs to go
   def exchangee?
     state.eql? "exchangee"

data/app/models/member.rb

@@ -18,7 +18,6 @@ class Member < ActiveRecord::Base
   def headers_for(action)
     case action.to_s
     when "invitation_instructions"
-      puts "aye"
       {:from => self.organization.email}
     else
       {}

data/app/models/parsed_row.rb

@@ -43,6 +43,18 @@ class ParsedRow
     :subtype          => [ "Type", "Subtype" ]
   })
   
+  MEMBERSHIP_FIELDS = SHARED_FIELDS.merge( {
+    :membership_name       => [ "Membership Name", "Membership", "Name" ],
+    :membership_plan       => [ "Membership Plan", "Plan"],           #PAYG, ALL IN ONE, OTHER
+    :start_date            => [ "Start Date" ],
+    :end_date              => [ "End Date" ],
+    :amount                => [ "Amount" ],
+    :payment_method        => [ "Payment Method" ],
+    :order_date            => [ "Order Date", "Date" ],
+
+    :number_of_memberships => [ "Quantity" ]
+  })
+  
   EVENT_FIELDS = SHARED_FIELDS.merge( {
     :event_name       => [ "Event", "Event Name" ],
     :venue_name       => [ "Venue", "Venue Name" ],
@@ -65,7 +77,7 @@ class ParsedRow
     #TODO: Total contribution sanity check
   })
   
-  FIELDS = PEOPLE_FIELDS.merge(ADDRESS_FIELDS).merge(EVENT_FIELDS).merge(DONATION_FIELDS)
+  FIELDS = PEOPLE_FIELDS.merge(ADDRESS_FIELDS).merge(EVENT_FIELDS).merge(DONATION_FIELDS).merge(MEMBERSHIP_FIELDS)
 
   # Enumerated columns default to the last value if the data value is not valid.
   #

data/app/models/phone.rb

@@ -2,14 +2,6 @@ class Phone < ActiveRecord::Base
   attr_accessible :kind, :number
   belongs_to :person
 
-  #This method is here solely to parse phones in the Athena migration
-  #There were in the form type:number
-  def self.from_athena(unparsed_phone)
-    Phone.new.tap do |phone|
-      phone.kind, phone.number = unparsed_phone.split(":")
-    end
-  end
-
   def self.kinds
     [ "Work", "Home", "Cell", "Fax", "Other" ]
   end

data/app/views/layouts/_menu.html.haml

@@ -4,15 +4,16 @@
       .brand Artful.ly
       %ul.nav
         %li{ :class => "dropdown #{active?(:events)}" }
-          = nav_dropdown "Events"
+          = nav_dropdown "Sell"
           %ul.dropdown-menu
-            %li= link_to "All Events", events_path
-            %li= link_to "Create Event", new_event_path
+            %li= link_to "Events", events_path
+            %li= link_to "Memberships", membership_types_path
 
         %li{ :class => "dropdown #{active?(:people)}" }
           = nav_dropdown "People"
           %ul.dropdown-menu
             %li= link_to "New Contact", new_person_path
+            %li= link_to "Members", "#"
             %li= link_to "Search", people_path
             %li= link_to "Advanced Search", new_search_path
             %li= link_to "List Segments", segments_path
@@ -27,11 +28,12 @@
             %li= link_to "Imports / Exports", imports_path
 
         %li{ :class => "dropdown #{active?(:transactions)}"}
-          = nav_dropdown "Transactions"
+          = nav_dropdown "Orders"
           %ul.dropdown-menu
-            %li= link_to "Sales", sales_orders_path
+            %li= link_to "Tickets", sales_orders_path
             %li= link_to "Donations", contributions_path
-            %li= link_to "Search", orders_path
+            %li= link_to "Memberships", "#"
+            %li= link_to "Search All", orders_path
 
         %li.divider-vertical
         %li.dropdown

data/app/views/people/show.html.haml

@@ -8,7 +8,7 @@
   .span4
     -unless @person.dummy?
       %p= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal'
-      / %p= link_to "Award Membership", new_person_membership_award_path(@person)
+      %p= link_to "Award Membership", new_person_membership_award_path(@person)
 
       = render @person.address
 

data/lib/artfully_ose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.3
+  version: 1.2.0.pre.4
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1977,6 +1977,7 @@ files:
 - app/models/import_row.rb
 - app/models/imports/donations_import.rb
 - app/models/imports/events_import.rb
+- app/models/imports/memberships_import.rb
 - app/models/imports/people_import.rb
 - app/models/imports/processing.rb
 - app/models/imports/rollback.rb