Payments made when authenticated will be donations, and not connected to customer in any way.

5 files changed, 10 insertions, 30 deletions

diff --git a/billing/app/views/payments/_customer_data.html.haml b/billing/app/views/payments/_customer_data.html.haml
deleted file mode 100644
index e9df040..0000000
--- a/billing/app/views/payments/_customer_data.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-%legend= t(:customer_information)
-%dl
-  %dt First Name
-  %dd= @customer.first_name
-  %dt Last Name
-  %dd= @customer.last_name
-  %dt Phone
-  %dd= @customer.phone
-%legend= t(:credit_card_information)
-%dl
-  %dt Number
-  %dd= @default_cc.masked_number
-  %dt Expiration Date
-  %dd= @default_cc.expiration_date
-  - if current_user == @user
-    = link_to t(:edit_saved_data), edit_customer_path(@user.id), :class => :btn
diff --git a/billing/app/views/payments/_non_customer_fields.html.haml b/billing/app/views/payments/_non_customer_fields.html.haml
index 99b420d..77cfe95 100644
--- a/billing/app/views/payments/_non_customer_fields.html.haml
+++ b/billing/app/views/payments/_non_customer_fields.html.haml
@@ -1,4 +1,4 @@
-= field_set_tag "Customer" do
+= field_set_tag "Personal Information" do
   = f.fields_for :customer do |c|
     %div= c.label :first_name, "First Name"
     %div= c.text_field :first_name
diff --git a/billing/app/views/payments/_transaction_details.html.haml b/billing/app/views/payments/_transaction_details.html.haml
index 030639e..85e4f6a 100644
--- a/billing/app/views/payments/_transaction_details.html.haml
+++ b/billing/app/views/payments/_transaction_details.html.haml
@@ -11,5 +11,5 @@
   - if sub_start = transaction.subscription_details.billing_period_start_date
     From subscription which started
     = sub_start
-  - else
+  - else # should not have any of these
     Not paid as part of subscription
\ No newline at end of file
diff --git a/billing/app/views/payments/confirm.html.haml b/billing/app/views/payments/confirm.html.haml
index 640c30a..45af3c9 100644
--- a/billing/app/views/payments/confirm.html.haml
+++ b/billing/app/views/payments/confirm.html.haml
@@ -1,5 +1,5 @@
 %h1 Payment Result
-%div Thank you for your payment.
+%div Thank you for your donation.
 %h2 Transaction Details
 %table
   %tr
@@ -23,7 +23,4 @@
     %td= h @result.transaction.credit_card_details.masked_number
   %tr
     %td Card Type:
-    %td= h @result.transaction.credit_card_details.card_type
-- if logged_in?
-  - customer = Customer.find_by_user_id(@user.id)
-  = link_to 'View Customer Info', show_customer_path(@user.id), :class=> :btn
\ No newline at end of file
+    %td= h @result.transaction.credit_card_details.card_type
\ No newline at end of file
diff --git a/billing/app/views/payments/new.html.haml b/billing/app/views/payments/new.html.haml
index 4523e13..e9a8273 100644
--- a/billing/app/views/payments/new.html.haml
+++ b/billing/app/views/payments/new.html.haml
@@ -1,18 +1,17 @@
 %h1
-  = t(:payment)
+  = t(:Donation)
+- if logged_in?
+  = t(:donation_not_payment)
 - if @result and @result.errors.size > 0
   %div{:style => "color: red;"}
     = h @result.errors.size
     error(s)
-- if @result and @result.transaction and @result.transaction.status == 'processor_declined'
+- if @result and @result.transaction and @result.transaction.status != 'success'
   %div{:style => "color: red;"}
     = t(:processor_declined)
 = braintree_form_for :transaction, :html => {:autocomplete => "off"} do |f|
   = f.label :amount, t(:amount)
   = f.text_field :amount
-  - if !@customer
-    = render :partial => 'non_customer_fields', :locals => {:f => f}
-  - else
-    = render :partial => 'customer_data'
+  = render :partial => 'non_customer_fields', :locals => {:f => f}
   = hidden_field_tag :tr_data, @tr_data
-  = f.submit "Submit Payment", :class => 'btn btn-primary'
+  = f.submit "Submit Donation", :class => 'btn btn-primary'