hatchy 0.0.6.pre → 0.0.7.pre

data/app/models/concerns/hatchy/contribution_states.rb

@@ -0,0 +1,63 @@
+module Hatchy::ContributionStates
+  extend ActiveSupport::Concern
+
+  included do 
+    before_create :send_to_pending, :first_step
+    validate :with_steps
+
+    def send_to_pending
+      self.status = "pending"
+    end
+
+    def first_step
+      self.step = "reward_data"
+    end
+
+    def send_to_waiting
+      if self.status == "pending"
+        self.status == "waiting_confirmation"
+      else
+        errors.add(:status, "Contribution needs to be pending in order to change to waiting status")
+      end
+    end
+
+    def send_to_invalid
+      self.status = "invalid_payment"
+    end
+
+    def send_to_confirm
+      if self.status == ("pending" || "confirmed" || "waiting_confirmation" || "canceled" || "deleted")
+        self.status = "confirmed"
+      end
+    end
+
+    def send_to_cancel
+      self.status = "canceled"
+    end
+
+    def request_refund
+      if self.status == "confirmed"
+        self.status = "requested_refund"
+      end
+    end
+
+    def send_to_refund
+      if self.status == ("requested_refund" || "confirmed")
+        self.status = "refunded"
+      end
+    end
+
+    private
+    def with_steps
+      case self.step
+      when "reward_data"
+        validates_presence_of :user, :project, :value, :status, :step
+      when "billing_data"
+        validates_presence_of :user, :project, :value, :status, :step
+      when "payment_data"
+        validates_presence_of :user, :project, :value, :status, :step
+      end
+    end
+
+  end
+end

data/app/models/concerns/hatchy/project_states.rb

@@ -6,7 +6,11 @@ module Hatchy::ProjectStates
     before_create :send_to_draft
     validate :with_status
     before_save :set_dates, if: lambda { |project| project.online? }
+    after_create :create_empty_reward
 
+    def create_empty_reward
+      self.rewards.create(min_value: 10.0, description: 'No reward contributions')
+    end
     
     def send_to_draft
       self.status = "draft"

data/app/models/hatchy/contribution.rb

@@ -1,19 +1,18 @@
 module Hatchy
   class Contribution < ActiveRecord::Base  
+    include Hatchy::ContributionStates
+    
     attr_accessor :card_number, :card_verification
     belongs_to  :user,    class_name:'Hatchy::User'
     belongs_to  :reward,  class_name:'Hatchy::Reward'
     belongs_to  :project, class_name:'Hatchy::Project'
     belongs_to  :country, class_name:'Hatchy::Country'
     
-    validates_presence_of :user, :project, :value, :email, 
-      :name, :address_street, :address_number, :address_city, 
-      :address_state, :address_zip, :address_phone
-
     validates_numericality_of :value, greater_than_or_equal_to: 10.00
-    validate :validate_card, on: :create
-    validate :reward_is_from_project, :value_greater_equal_than_reward, 
-      :cant_contribute_if_max_contribution
+    validate :reward_is_from_project
+    validate :value_greater_equal_than_reward
+    #validate :cant_contribute_if_max_contribution
+    #validate :validate_card, on: :create
 
     private
 

data/app/models/hatchy/reward.rb

@@ -3,6 +3,6 @@ module Hatchy
     belongs_to :project,      class_name:'Hatchy::Project'
     has_many  :contributions, class_name:'Hatchy::Contribution', dependent: :nullify
     has_many  :payments,      through: :contributions
-    validates_presence_of :min_value, :description, :deliver_at
+    validates_presence_of :min_value, :description
   end
 end

data/app/views/hatchy/admin/contributions/_basic_info.html.haml

@@ -0,0 +1,49 @@
+%table.table.table-condensed.table-striped
+  %tr
+    %th Project
+    %td= link_to @contribution.project.name, admin_project_path(@contribution.project.id)
+    %th Project Owner
+    %td= link_to @contribution.project.user.full_name, admin_user_path(@contribution.project.user.id)
+  %tr
+    %th User
+    %td= link_to @contribution.user.full_name, admin_user_path(@contribution.user.id)
+    %th Email
+    %td= @contribution.user.email
+  %tr
+    %th Country
+    %td= @contribution.country ? @contribution.country.name : "-"
+    %th State
+    %td= @contribution.address_state
+  %tr
+    %th City
+    %td= @contribution.address_city
+    %th Zipcode
+    %td= @contribution.address_zip
+  %tr
+    %th Street
+    %td= @contribution.address_street
+    %th Number
+    %td= @contribution.address_number
+  %tr
+    %th Phone
+    %td= @contribution.address_phone
+    %th Anonymous
+    %td= check_box "Anonymous", @contribution.anonymous, checked: @contribution.anonymous, disabled:true
+  %tr
+    %th Document
+    %td= @contribution.document
+    %th IP Address
+    %td= @contribution.ip_address
+  %tr
+    %th Status
+    %td= @contribution.status
+    %th Step
+    %td= @contribution.step
+  %tr
+    %th Credit Card Type
+    %td= @contribution.card_type
+    %th Credit Card Expiration Date
+    %td= @contribution.card_expires_on.strftime("%m/%y") if @contribution.card_expires_on
+  %tr
+    %th Value
+    %td= number_to_currency @contribution.value

data/app/views/hatchy/admin/contributions/index.html.haml

@@ -0,0 +1,21 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1 Contributions
+      %hr
+    .row
+      .col-md-12
+        = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_contributions_path, new_view: ""
+        %table.table.table-condensed.table-striped.ajax-data-table{width:'100%', data:{source:admin_contributions_url(format: :json)}}
+          %thead
+            %tr
+              %th Id
+              %th Project
+              %th Project Owner
+              %th Contribution Owner
+              %th Reward
+              %th Value
+              %th Status
+              %th Controls
+          %tbody

data/app/views/hatchy/admin/contributions/show.html.haml

@@ -0,0 +1,21 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1= "Contribution: #{@contribution.project.name}"
+      %hr
+    .row
+      .col-md-12
+        %ul.nav.nav-tabs
+          %li{class: "#{current_page?(admin_contributions_path) ? 'active' : ''}" }
+            = link_to admin_contributions_path do 
+              %i.fa.fa-list
+              %span Index
+        %h3 Basic Info
+        = render 'hatchy/admin/contributions/basic_info'
+        %hr
+        %h3 Reward Info
+        = render 'hatchy/admin/shared/model_show', resource: @contribution.reward
+        %hr
+        .col-sm-offset-2.col-sm-10
+          = link_to "Delete", admin_contribution_path(@contribution), method: :delete, data:{confirm: "Are you sure?"}, class:'btn btn-danger btn-lg'

data/app/views/hatchy/admin/projects/_about.html.haml

@@ -1,8 +1,8 @@
 .col-md-7
   %h3 About
-  = @project.about.html_safe
+  = @project.about.html_safe if @project.about
   %hr
   %h3 Budget
-  = @project.budget.html_safe
+  = @project.budget.html_safe if @project.budget
 .col-md-4
   = render "hatchy/shared/project", project: @project

data/app/views/hatchy/admin/projects/index.html.haml

@@ -7,7 +7,7 @@
     .row
       .col-md-12
         = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_projects_path, new_view: ""
-        %table.table.table-condensed.table-striped.ajax-data-table{data:{source:admin_projects_url(format: :json)}}
+        %table.table.table-condensed.table-striped.ajax-data-table{width:'100%', data:{source:admin_projects_url(format: :json)}}
           %thead
             %tr
               %th Id
@@ -18,8 +18,5 @@
               %th City
               %th Status
               %th Goal
-              %th Draft At
-              %th Online Days
-              %th Online Date
-              %th Expires At
+              %th Controls
           %tbody

data/app/views/hatchy/admin/shared/_model_form.html.haml

@@ -19,4 +19,8 @@
                 = f.check_box k.to_sym, class: 'checkbox'
   .form-group
     .col-sm-offset-2.col-sm-10
-      = f.submit "Submit", class: 'btn btn-primary'
+      = f.submit "Submit", class: 'btn btn-primary'
+      - if controller.action_name == "edit"
+        = link_to 'Back', Hatchy::Engine.routes.url_helpers.send("admin_#{resource.class.to_s.gsub(/Hatchy::/,'').downcase}_path", resource), class: 'btn btn-default'
+      - elsif controller.action_name == "new"
+        = link_to 'Back', Hatchy::Engine.routes.url_helpers.send("admin_#{resource.class.to_s.gsub(/Hatchy::/,'').downcase.pluralize}_path", resource), class: 'btn btn-default'

data/app/views/hatchy/admin/users/_contributions.html.haml

@@ -4,22 +4,24 @@
       %th Project
       %th User
       %th Reward
-      %th Anonymous
-      %th Document
-      %th Ip Address
-      %th Card Type
       %th Value
       %th Status
+      %th Step
+      %th Document
+      %th IP Address
+      %th Card Type
+      %th Anonymous
 
   %tbody
     - contributions.each do |contribution|
       %tr
         %td= link_to contribution.project.name, admin_projects_path
         %td= link_to contribution.user.full_name, admin_users_path
-        %td= link_to contribution.reward.id, "#"
-        %td= check_box "Anonymous", contribution.anonymous, checked: contribution.anonymous, disabled:true
+        %td= number_to_currency contribution.reward.min_value
+        %td= number_to_currency contribution.value
+        %td= contribution.status
+        %td= contribution.step.humanize if contribution.step
         %td= contribution.document
         %td= contribution.ip_address
         %td= contribution.card_type
-        %td= number_to_currency contribution.value
-        %td= contribution.status
+        %td= check_box "Anonymous", contribution.anonymous, checked: contribution.anonymous, disabled:true

data/app/views/hatchy/admin/users/_projects.html.haml

@@ -15,7 +15,7 @@
   %tbody
     - projects.each do |project|
       %tr
-        %td= project.name
+        %td= link_to project.name, admin_project_path(project)
         %td= check_box "recommended", project.recommended, checked: project.recommended, disabled:true
         %td= link_to project.category.name, admin_category_path(project.category)
         %td= project.city

data/app/views/hatchy/admin/users/edit.html.haml

@@ -0,0 +1,17 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1= @user.first_name
+      %hr
+    .row
+      .col-md-12
+        = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_users_path, new_view: "", edit_path: edit_admin_user_path
+        = form_for [:admin, @user], html:{class:'form-horizontal'} do |f|
+          = form_group_for f, :admin do 
+            .col-sm-5
+              = f.check_box :admin
+          .form-group
+            .col-sm-offset-2.col-sm-10
+              = f.submit class: 'btn btn-primary'
+              = link_to 'Back', admin_user_path(@user), class: 'btn btn-default'

data/app/views/hatchy/admin/users/index.html.haml

@@ -7,18 +7,15 @@
     .row
       .col-md-12
         = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_users_path, new_view: ""
-        %table.table.table-condensed.table-striped.ajax-data-table{data:{source:admin_users_url(format: :json)}}
+        %table.table.table-condensed.table-striped.ajax-data-table{width:'100%', data:{source:admin_users_url(format: :json)}}
           %thead
             %tr
               %th Id
-              %th Admin
               %th First Name
               %th Last Name
+              %th Admin
               %th Email
-              %th Document
               %th Phone
               %th Mobile
-              %th Newsletter
-              %th Signin Count
-              %th Last Signin At
+              %th Controls
           %tbody

data/app/views/hatchy/dashboard/_contributions.html.haml

@@ -0,0 +1,10 @@
+%section
+  .container
+    %h2.text-center Your Contributions
+    .section-content
+      .owl-carousel#owl-contributions
+        - @contributions.each do |contribution|
+          = render "hatchy/shared/project", project: contribution.project
+    .section-footer
+      %p.text-center
+        %a.btn.btn-primary.btn-lg.btn-outline{href:"#"} Explore All

data/app/views/hatchy/dashboard/index.html.haml

@@ -4,5 +4,5 @@
   - unless @my_projects.empty?
     = render "your_projects"
 .row
-  /- unless @supported_projects.empty?
-  /  = render "projects_you_support"
+  - unless @contributions.empty?
+    = render "contributions"

data/app/views/hatchy/home/explore.html.haml

@@ -10,7 +10,7 @@
               = cat.name
               %span.badge= cat.total_projects
       %hr
-      .projects-content
+      %section
         - if !@category_id.blank?
           .row
             .pull-right
@@ -26,4 +26,4 @@
           .owl-carousel#owl-projects
             - @projects.each do |project|
               .items
-                = render "hatchy/shared/project", project: project
+                = render "hatchy/shared/small_project", project: project

data/app/views/hatchy/projects/_reward_fields.html.haml

@@ -4,10 +4,10 @@
       .col-sm-8
         .input-group
           .input-group-addon $
-          = f.number_field :min_value, class: "form-control", min:0.0, step:50
+          = f.number_field :min_value, class: "form-control", min:10.0
     = form_group_for f, :deliver_at do
       .col-sm-8
-        = f.date_select :deliver_at,{discard_day:true},{class: "form-control", style:"width:auto; display:inline;"}
+        = f.date_select :deliver_at,{discard_day:true, prompt:true},{class: "form-control", style:"width:auto; display:inline;"}
     = form_group_for f, :description do
       .col-sm-8
         = f.text_field :description, class: "form-control"

data/app/views/hatchy/projects/contributions/_billing.html.haml

@@ -1,40 +1,44 @@
-%h2 Complete and review the data for payment
-%p These data will be reported to the project owner
-.col-md-8
-	= form_group_for f, :name do
-		.col-sm-8
-			= f.text_field :name, value:"#{@user.first_name} #{@user.last_name}", class: 'form-control'
-	= form_group_for f, :email do
-		.col-sm-8
-			= f.email_field :email, value: @user.email, class: 'form-control'
-	= form_group_for f, :document do
-		.col-sm-8
-			= f.text_field :document, value: @user.document, class: 'form-control'
-	.form-group
-		.col-sm-8.col-sm-offset-2
-			= f.check_box :anonymous
-			= f.label :anonymous
+.row#billing_data
+	= form_for [@project, @contribution], html:{class: "form-horizontal"} do |f|
+		%h2 Complete and review the data for payment
+		%p These data will be reported to the project owner
+		.col-md-8
+			= form_group_for f, :name do
+				.col-sm-8
+					= f.text_field :name, value:"#{@user.first_name} #{@user.last_name}", class: 'form-control'
+			= form_group_for f, :email do
+				.col-sm-8
+					= f.email_field :email, value:"#{@user.email}", class: 'form-control'
+			= form_group_for f, :document do
+				.col-sm-8
+					= f.text_field :document, class: 'form-control'
+			.form-group
+				.col-sm-8.col-sm-offset-2
+					= f.check_box :anonymous
+					= f.label :anonymous
 
-	= form_group_for f, :country do
-		.col-sm-8
-			= f.collection_select :country_id, @countries, :id, :name,{selected: "#{@user.country.id if @user.country.present?}"}, class: "form-control"
-	= form_group_for f, :address_state do
-		.col-sm-8
-			= f.text_field :address_state, value: @user.address_state, class: "form-control", required: true
-	= form_group_for f, :address_city do
-		.col-sm-8
-			= f.text_field :address_city, value: @user.address_city, class: "form-control", required: true
-	= form_group_for f, :address_street do
-		.col-sm-8
-			= f.text_field :address_street, value: @user.address_street, class: "form-control", required: true
-	= form_group_for f, :address_zip do
-		.col-sm-8
-			= f.text_field :address_zip, value: @user.address_zip, class: "form-control", required: true
-	= form_group_for f, :address_number do
-		.col-sm-8
-			= f.text_field :address_number, value: @user.address_number, class: "form-control", required: true
-	= form_group_for f, :address_phone do
-		.col-sm-8
-			= f.text_field :address_phone, value: @user.phone, class: "form-control", required: true
-	.col-sm-8.col-sm-offset-2
-		= link_to 'Continue', '#payment', id:'billing_continue', class: 'btn btn-primary btn-lg'
+			= form_group_for f, :country do
+				.col-sm-8
+					= f.collection_select :country_id, @countries, :id, :name,{selected: "#{@user.country.id if @user.country.present?}"}, class: "form-control"
+			= form_group_for f, :address_state do
+				.col-sm-8
+					= f.text_field :address_state, class: "form-control", required: true
+			= form_group_for f, :address_city do
+				.col-sm-8
+					= f.text_field :address_city, class: "form-control", required: true
+			= form_group_for f, :address_street do
+				.col-sm-8
+					= f.text_field :address_street, class: "form-control", required: true
+			= form_group_for f, :address_zip do
+				.col-sm-8
+					= f.text_field :address_zip, class: "form-control", required: true
+			= form_group_for f, :address_number do
+				.col-sm-8
+					= f.text_field :address_number, class: "form-control", required: true
+			= form_group_for f, :address_phone do
+				.col-sm-8
+					= f.text_field :address_phone, class: "form-control", required: true
+			.col-sm-8.col-sm-offset-2
+				= hidden_field_tag 'anchor', 'payment_data'
+				= f.hidden_field :step, value:'billing_data'
+				= f.submit 'Continue', class: 'btn btn-primary btn-lg'