artfully_ose 1.2.0.pre.19 → 1.2.0.pre.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E4OTBlNDU5Zjc0NGJmODQyY2ZmNzQ2ODI1OGEzYjQ2N2Q1ODAyZQ==
+    NzIwYmNmYWQyNWJhNWY3OGVlMGYxYjYzMzFlYzlhMTA5MzMyZWUzNw==
   data.tar.gz: !binary |-
-    ZGI1ZmRhMjY3MjhlZjc0YjJhYmNhZDQ0Yjc5ZDZhNGE4NGQ3NTlmNQ==
+    ZGNiZTkwODAyZjJkOGM3OGYxM2ZkMzg2YzI2N2VkNWRkMjBjYzZjNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODhhZDk0ZWFjOWMwNGU2NmQxMGI1NzkzNjI2NGFjZjQ2MDYwYjQzNjE0YWY0
-    MTUxZmFjMzdlMTI1MjA3YzYyZDBmNWRhOTgyYWVjODcyYWFjNThlMzJhYzA0
-    MzJjY2I0MmQ4MmJiNjJmMGMyYWU3YThhZDFjNzc2ZGE5MjgwOWY=
+    YjNmNmM0MWU4ODJiMDBjYTg2MWQzNTk5M2RjOGE3MzE2NGMxNDQ1MDg3MzZl
+    Yzk2YmNjMTNlMWZhYzM5OTdjZGUyNjk1YzFmY2VlNjc3YmVmNWYwNzdhNzA5
+    OWJkZDg2Zjg4NzI0YmMxYzhjZmZiNWVlNWUyMDIxM2U0YWE2MTI=
   data.tar.gz: !binary |-
-    ZjUyNWY5ODY4ZDA3NGY2MjU3YWU3OWM5NmNlYzA4MmM0Mzc3MjM4MGVkN2Jm
-    YjI4NmM2Njk5MzAzMTgzZTEzZWJjOTVmOTk1YzVhYTRhN2Y0MmRjZTZkMjM1
-    ZjI2YmFlZTFmOWRhYjJhYTQwNTAzYzI1MGFjM2UwMDg4MmJlN2Y=
+    Y2E4ZTI2NjIyYjcwNmU0ZTQzOTdlNTZmZWJhZGQ0ZDkxYjI4MzY0OTgyOTVj
+    MTUwNTA4MDA4ODIwZmJhYWUwMDNjYjIxYjI0MmE2MmNkODQzNWMyZWM0ZjBl
+    NzJiZTRmMjAzZjM2Yjk4MmUxNTFiODhjYzc0MmE4NDAyOGFmOWE=

data/README.md

@@ -0,0 +1,28 @@
+# Artful.ly OSE
+
+Welcome to Artful.ly OSE
+
+## About
+
+Artful.ly Open Source Edition is the core code of the Artful.ly app downloadable for free and ready for you to roll up your sleeves and build a custom management system for your arts business. The Artful.ly OSE framework gives software developers a base from which they can add features, integrate with other apps, and much more!
+
+## Before You Begin
+
+You'll want the following running on your machine:
+
+- Ruby 1.9.3
+- MySQL 
+
+## Usage
+
+Artful.ly Open Source Engine is a Rails Engine.  **It is not intended to be mounted into an existing project** but rather to be used with the reference implementation [here](http://www.github.com/fracturedatlas/artfully_app)
+
+## Branch strategy
+
+Master is the current development branch.  Every effort is made to make master tidy and working at all times but it is the edge and problems do happen.  For any stable production applications, you'll *absolutely* want to be pointing to a published, stable gem.  A list can be found [on Rubygems](https://rubygems.org/gems/artfully_ose)
+
+## Contributors
+
+Gary Moore - Lead Developer at Fractured Atlas
+
+Clinton Judy - Open Source Lead at Fractured Atlas

data/app/assets/javascripts/change-membership.js

@@ -1,6 +1,7 @@
 //
 // Service for keeping track of which memberships are selected
 //
+
 angular.module('artfully').factory('membershipSelections', function() {
   // Map of selected membership ids
   var map = {};
@@ -10,14 +11,15 @@ angular.module('artfully').factory('membershipSelections', function() {
 
   // Watch for changes
   $('body').on('change', 'input[name=membership_ids\\[\\]]', function(change) {
-    var e     = $(change.target);
-    var row   = e.closest('tr');
-    var type  = $(row.find('.item-description')[0]);
-    var price = $(row.find('.price')[0]);
+    var e = $(change.target);
     var membership_id = e.val();
 
     if ($(e).prop( "checked" )) {
       // Add the membership id if it's not already in the list
+      var row   = e.closest('tr');
+      var type  = $(row.find('.item-description')[0]);
+      var price = $(row.find('.price')[0]);
+
       if (map[membership_id] === undefined) {
         map[membership_id] = {
           id: membership_id,
@@ -38,27 +40,28 @@ angular.module('artfully').factory('membershipSelections', function() {
 //
 // Controller
 //
-angular.module('artfully').controller('ChangeMembershipController', ['$scope', 'membershipSelections', function($scope, membershipSelections) {
 
-  // Template variables
-  $scope.payment_method = 'cash';
-  $scope.price          = 0;
-  $scope.total          = 0;
-  $scope.selected       = {};
+angular.module('artfully').controller('MembershipActionsCtrl', ['$scope', 'membershipSelections', function($scope, membershipSelections) {
+  $scope.loading      = false;
+  $scope.error        = false;
+  $scope.errorMessage = '';
+
+  $scope.checkSelected = function() {
+    $scope.error = false;
+    $scope.errorMessage = '';
 
-  // Helpers
-  $scope.anySelected = function() {
     if (Object.keys(membershipSelections).length == 0 ) {
+      $scope.error = true;
+      $scope.errorMessage = "Select one or more memberships.";
       return false;
     }
     return true;
   }
 
-  $scope.changeSelected = function(click) {
+  $scope.change = function(click) {
     click.preventDefault();
 
-    if (!$scope.anySelected()) {
-      alert("Select one or more memberships to change.");
+    if (!$scope.checkSelected()) {
       return false;
     }
 
@@ -67,11 +70,58 @@ angular.module('artfully').controller('ChangeMembershipController', ['$scope', '
     return false;
   }
 
+  $scope.cancel = function(click) {
+    click.preventDefault();
+
+    if (!$scope.checkSelected()) {
+      return false;
+    }
+
+    $scope.loading = true;
+
+    // Get membership_cancellations/new (fetches and displays the modal)
+    $.ajax({
+      url: 'membership_cancellations/new.js',
+      data: {membership_ids: Object.keys(membershipSelections)},
+      dataType: 'script',
+      success: function (script, status, xhr) {
+        $scope.$apply(function() {
+          $scope.loading = false;
+        });
+      },
+      error: function (xhr, text, error) {
+        $scope.$apply(function() {
+          $scope.loading = false;
+          $scope.error = true;
+
+          var message = error;
+          if (xhr &&
+            xhr.responseText !== undefined &&
+            xhr.responseText != '' &&
+            xhr.responseText != ' ') {
+            message = xhr.responseText;
+          }
+          $scope.errorMessage = message;
+        });
+      }
+    });
+  }
+
+}]);
+
+angular.module('artfully').controller('ChangeMembershipController', ['$scope', 'membershipSelections', function($scope, membershipSelections) {
+
+  // Template variables
+  $scope.payment_method = 'cash';
+  $scope.price          = 0;
+  $scope.total          = 0;
+  $scope.selected       = {};
+
+  // Helpers
   $scope.updateTotal = function() {
     var price = parseFloat($scope.price.substr(1).replace(/,/, ""));
     var total = (Object.keys($scope.selected).length * price);
 
-
     $scope.total = '$'+total.toFixed(2);
   }
 

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

@@ -12,6 +12,10 @@ $(document).ready(function(){
     'regionField'  : '#payment_customer_address_state'
   });
 
+  $(document).locationSelector({
+    'countryField' : '#individual_address_attributes_country', 
+    'regionField'  : '#individual_address_attributes_state'
+  });
 
   // toggle a showing's sections
   $('#multi-show-container .title').click(function() {

data/app/assets/stylesheets/sass/store.sass

@@ -429,6 +429,8 @@ table.calendar
 
 .store-event-display
   margin-bottom: 20px
+  h1 
+    margin-top: 0px
 
 #shopping-cart-display
   table

data/app/concerns/pdf_generation.rb

@@ -0,0 +1,71 @@
+require 'json'
+require 'digest/md5'
+
+class PdfGeneration
+  PDF_POST_URL     = "http://quick-pdf.geminisbs.net/pdfs.json"
+  PDF_GET_URL      = "http://quick-pdf.geminisbs.net/pdfs/:id.json?api_key=:key"
+  PDF_DOWNLOAD_URL = "http://quick-pdf.geminisbs.net/pdfs/:id/download?api_key=:key"
+
+  def initialize(pdfable, pdf_api_key = PDF_API_KEY, http_party = HTTParty, sleeper = Kernel)
+    @pdfable      = pdfable
+    @pdf_api_key  = pdf_api_key
+    @http_party   = http_party
+    @sleeper      = sleeper
+  end
+
+  def generate
+    response = http_party.post(PDF_POST_URL, pdf_attributes)
+    json     = JSON.parse(response.body)
+
+    while !json["complete"]
+      response = http_party.get(status_url(json))
+      json     = JSON.parse(response.body)
+
+      sleeper.sleep 1 unless json["complete"]
+    end
+
+    download_url(json)
+  end
+
+  def content
+    file_name   = pdfable.class.name.underscore
+    file_name   = 'order' if file_name.ends_with?('order')
+    template    = File.read("#{ArtfullyOse::Engine.root}/app/views/pdfs/#{file_name}.html.haml")
+    haml_engine = Haml::Engine.new(template)
+    scope       = Object.new.extend(ArtfullyOseHelper)
+    output      = haml_engine.render(scope, {:pdfable => pdfable})
+    output.gsub("'","\'") # necessary to escape single '
+  end
+
+  private
+  attr_reader :pdfable, :pdf_api_key, :http_party, :sleeper
+  def pdf_attributes
+    {
+      :body => {
+        :api_key => pdf_api_key,
+        :pdf => {
+          :html_doc => content,
+          :filename => filename,
+          :pdf_options => {
+            :margin_top => "0.5in",
+            :margin_bottom => "0.5in",
+            :margin_left => "0.5in",
+            :margin_right => "0.5in"
+          }
+        }
+      }
+    }
+  end
+
+  def filename
+    "#{Digest::MD5.hexdigest pdfable.id.to_s}.pdf"
+  end
+
+  def status_url(json)
+    PDF_GET_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
+  end
+
+  def download_url(json)
+    PDF_DOWNLOAD_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
+  end
+end

data/app/controllers/export_controller.rb

@@ -16,11 +16,7 @@ class ExportController < ArtfullyOseController
   end
 
   def ticket_sales
-    @organization = current_user.current_organization
-    @filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-    @items = ItemView.where(:organization_id => current_organization).where(:product_type => "Ticket").all
-    @csv_string = @items.to_comma(:ticket_sale)    
-    send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
+    # Moved to s3. Generated nightly with rake csv:sales
   end
 
 end

data/app/controllers/imports_controller.rb

@@ -5,6 +5,7 @@ class ImportsController < ArtfullyOseController
 
   def index
     @imports = organization.imports.includes(:user, :organization).order('created_at desc').all
+    @sales_csv_download_link = sales_csv_download_link
   end
 
   def approve
@@ -103,4 +104,15 @@ class ImportsController < ArtfullyOseController
       @type = (params[:type] || session[:type])
     end
 
+    def sales_csv_download_link
+      s3 = AWS::S3.new(
+          :access_key_id     => ENV['S3_ACCESS_KEY_ID'],
+          :secret_access_key => ENV['S3_SECRET_ACCESS_KEY']
+      )
+      bucket = s3.buckets[ENV['S3_BUCKET']]
+      object = bucket.objects[ItemView.sales_export_filename_for(current_organization)]
+      url    = object.url_for(:read, :expires => 10*60)
+      url.to_s
+    end
+
 end

data/app/controllers/members/index_controller.rb

@@ -1,4 +1,4 @@
 class Members::IndexController < Members::MembersController
-	def index
+  def index
 	end
 end

data/app/controllers/members/members_controller.rb

@@ -1,4 +1,9 @@
 class Members::MembersController < Store::StoreController
-  skip_before_filter :authenticate_user!
   before_filter      :authenticate_member!
+  skip_before_filter :authenticate_user!
+  skip_filter        :require_more_info 
+
+  def update
+    address = Address.unhash(person_params.delete("address_attributes"))
+  end 
 end

data/app/controllers/members/passwords_controller.rb

@@ -0,0 +1,10 @@
+class Members::PasswordsController < Devise::PasswordsController
+  layout 'devise_layout'
+
+  protected
+    
+    #This method changed from devise 2.0 and 3.0
+    def after_sign_in_path_for(resource)
+      members_root_path
+    end
+end

data/app/controllers/members/people_controller.rb

@@ -0,0 +1,17 @@
+class Members::PeopleController < Members::MembersController
+  def update
+    address = Address.unhash(person_params.delete("address_attributes"))
+    @person = current_member.person
+    results = @person.update_attributes(person_params)
+    @person.delay.new_note("Member made the following changes from their dashboard: #{@person.previous_changes_sentence}", Time.now, nil, current_member.organization.id)
+    @person.address.update_with_note(@person, nil, address, current_member.organization.time_zone, "member dashboard")
+    
+    flash[:notice] = "Your changes have been saved."
+    redirect_to members_root_path
+  end
+
+  private
+    def person_params
+      @person_params ||= params.fetch((:person),{}).merge(params.fetch(:company, {})).merge(params.fetch(:individual,{}))
+    end
+end

data/app/controllers/membership_cancellations_controller.rb

@@ -0,0 +1,46 @@
+class MembershipCancellationsController < ApplicationController
+  before_filter :set_person
+  before_filter :require_membership_ids
+  before_filter :require_memberships_for_person
+
+  respond_to :js
+
+  def new
+    @cancellation = MembershipCancellation.new(params[:membership_ids])
+    respond_with
+  end
+
+  def create
+    @membership_count = params[:membership_ids].count
+    MembershipCancellation.enqueue(params[:membership_ids])
+  end
+
+  private
+
+  def require_membership_ids
+    if params[:membership_ids].present?
+      true
+    else
+      render :text => ' ', :status => :bad_request
+      false
+    end
+  end
+
+  def require_memberships_for_person
+    # Count memberships for this person that match the given membership ids
+    query = Membership.where(id: params[:membership_ids], member_id: @person.member.id)
+
+    # This is true if the person owns ALL of the given membership ids
+    if query.count == params[:membership_ids].count
+      true
+    else
+      render :text => 'This person does not own the memberships.', :status => :unauthorized
+      false
+    end
+  end
+
+  def set_person
+    @person = Person.find(params[:person_id])
+    true
+  end
+end

data/app/controllers/membership_comps_controller.rb

@@ -0,0 +1,97 @@
+class MembershipCompsController < ArtfullyOseController
+  requires_kit :membership
+  
+  def new
+    @membership_types = current_organization.membership_types.all
+    @membership_types_hash = {}
+    @membership_types.each {|mt| @membership_types_hash[mt.id] = I18n.l(mt.ends_at, :format => :date_for_input)}
+
+    @membership_comp = MembershipComp.new
+    @membership_comp.membership_type             ||= @membership_types.first
+    @membership_comp.ends_at                     ||= I18n.l(@membership_types.first.ends_at, :format => :date_for_input)
+    @membership_comp.send_email                  ||= true
+    @membership_comp.number_of_memberships       ||= 1
+    @membership_comp.person_id                    = params[:person_id]
+    @membership_comp.segment_id                    = params[:segment_id]
+    @membership_comp.search_id                    = params[:search_id]
+    @membership_comp.people = find_people
+  end
+
+  def index
+    @membership_comp = MembershipComp.new
+    @membership_comp.membership_type = current_user.current_organization.membership_types.first
+    render "create" and return
+  end
+
+  def create
+    @membership_comp = from_params(params)
+    if params[:membership_comp][:confirm].present?
+      @membership_comp.benefactor = current_user
+      @membership_comp.award
+      render 'create' and return
+    else
+      @number_without_emails  =  @membership_comp.people.select{ |person| person.email.blank? }.length
+      @number_of_companies    =  @membership_comp.people.select{ |person| person.company? }.length
+      @email_preview          =  generate_invitation_preview_for(@membership_comp)
+      if !@membership_comp.valid?
+        flash[:error] = @membership_comp.errors.full_messages.to_sentence
+        redirect_to :back and return 
+      end
+      render "confirm" and return
+    end
+  end
+
+  private 
+    def generate_invitation_preview_for(membership_comp)
+      @resource = Member.new
+      render_to_string( :partial    => 'members/mailer/invitation_body', 
+                        :layout     => false,
+                        :locals     => {:resource => @resource, 
+                                        :person => membership_comp.people.first,
+                                        :welcome_message => membership_comp.welcome_message,
+                                        :membership_types => [membership_comp.membership_type],
+                                        :invitation_token => "",
+                                        :organization => current_user.current_organization})
+
+    end
+
+    def from_params(params)
+      membership_comp                       = MembershipComp.new
+      membership_comp_params                = params[:membership_comp]
+      membership_comp.membership_type       = MembershipType.find(membership_comp_params[:membership_type])
+      membership_comp.ends_at               = membership_comp_params[:ends_at]
+      membership_comp.send_email            = membership_comp_params[:send_email] == "true"
+      membership_comp.number_of_memberships = membership_comp_params[:number_of_memberships]
+      membership_comp.welcome_message       = membership_comp_params[:welcome_message]
+      membership_comp.notes                 = membership_comp_params[:notes]
+      membership_comp.person_id             = membership_comp_params[:person_id]
+      membership_comp.search_id             = membership_comp_params[:search_id]
+      membership_comp.segment_id            = membership_comp_params[:segment_id]
+
+      membership_comp.organization          = current_user.current_organization
+      membership_comp.people                = find_people(membership_comp_params)
+      membership_comp
+    end
+
+    def cache_key
+      current_user.id.to_s + "membership_comp_person_ids"
+    end
+
+    def find_people(p = params)
+
+      return @people unless @people.nil?
+
+      if p[:person_id].present?
+        @ids = Array.wrap(p[:person_id])
+      elsif p[:segment_id].present?
+        @ids = current_user.current_organization.segments.where(:id => p[:segment_id]).first.people.collect(&:id)
+      elsif p[:search_id].present?
+        @ids = current_user.current_organization.searches.where(:id => p[:search_id]).first.people.collect(&:id)
+      else
+        []
+      end
+
+      @people = Array.wrap(Person.find(@ids))
+      @people
+    end
+end