From d11768e58b98312c95a8ac5e9c18e3069b4d76dc Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 15 Sep 2015 00:26:52 -0500 Subject: implemented the form and the generate --- engines/billing/app/views/payments/_form.html.erb | 16 +++++++++++++++ engines/billing/app/views/payments/new.html.erb | 25 +++++++++++++++++++++++ engines/billing/app/views/payments/new.html.haml | 17 --------------- 3 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 engines/billing/app/views/payments/_form.html.erb create mode 100644 engines/billing/app/views/payments/new.html.erb delete mode 100644 engines/billing/app/views/payments/new.html.haml (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/_form.html.erb b/engines/billing/app/views/payments/_form.html.erb new file mode 100644 index 0000000..9713981 --- /dev/null +++ b/engines/billing/app/views/payments/_form.html.erb @@ -0,0 +1,16 @@ +-# slim template += form_tag organization_payment_path(organization) do + + #dropin + + = submit_tag 'Confirm', class: 'btn push--ends' + +- content_for :javascript do + = javascript_include_tag "https://js.braintreegateway.com/v2/braintree.js" + javascript: + var client_token = "#{@organization.payment['client_token']}"; + braintree.setup( + client_token, + 'dropin', { + container: 'dropin' + }); diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb new file mode 100644 index 0000000..7eab364 --- /dev/null +++ b/engines/billing/app/views/payments/new.html.erb @@ -0,0 +1,25 @@ +
+
+

New Donation

+

Please enter your donation details (this is a donation, and will not be applied towards your account):

+
+ +<%= braintree_form_for :transaction, :html => {:autocomplete => "off"} do |f|%> + <%= f.label :amount, t(:amount)%> + <%= f.text_field :amount%> +
+ + + <%= f.submit "Submit Donation", :class => 'btn btn-primary'%> +<%end%> + diff --git a/engines/billing/app/views/payments/new.html.haml b/engines/billing/app/views/payments/new.html.haml deleted file mode 100644 index e9a8273..0000000 --- a/engines/billing/app/views/payments/new.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -%h1 - = 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 != '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 - = render :partial => 'non_customer_fields', :locals => {:f => f} - = hidden_field_tag :tr_data, @tr_data - = f.submit "Submit Donation", :class => 'btn btn-primary' -- cgit v1.2.3 From 027086fc7be10607d27a56fa18f905b696f917d4 Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 15 Sep 2015 17:49:35 -0500 Subject: add donate button, bitcoin, payment_method --- engines/billing/app/views/payments/new.html.erb | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb index 7eab364..86a1d64 100644 --- a/engines/billing/app/views/payments/new.html.erb +++ b/engines/billing/app/views/payments/new.html.erb @@ -1,25 +1,25 @@ -
-
-

New Donation

-

Please enter your donation details (this is a donation, and will not be applied towards your account):

-
+

New Donation

+

Please enter your donation details (this is a donation and will not be applied towards your account):

+
+<%= form_tag confirm_payment_path, id: "checkout-form" do %> +
+
+ + +<% end %> -<%= braintree_form_for :transaction, :html => {:autocomplete => "off"} do |f|%> - <%= f.label :amount, t(:amount)%> - <%= f.text_field :amount%> -
- <%= f.submit "Submit Donation", :class => 'btn btn-primary'%> -<%end%> -- cgit v1.2.3 From 234cb9af5f11953f93910e79143fcb842e924248 Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 16 Sep 2015 00:13:01 -0500 Subject: added payment_info, _customer_form, sucess instances --- engines/billing/app/views/payments/_customer_form.html.erb | 13 +++++++++++++ engines/billing/app/views/payments/new.html.erb | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 engines/billing/app/views/payments/_customer_form.html.erb (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/_customer_form.html.erb b/engines/billing/app/views/payments/_customer_form.html.erb new file mode 100644 index 0000000..2e8a3b1 --- /dev/null +++ b/engines/billing/app/views/payments/_customer_form.html.erb @@ -0,0 +1,13 @@ +

Please enter your personal info:

+
+ <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %> +
+
+ <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %> +
+
+ <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %> +
+
+ <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %> +
diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb index 86a1d64..3cdda01 100644 --- a/engines/billing/app/views/payments/new.html.erb +++ b/engines/billing/app/views/payments/new.html.erb @@ -2,6 +2,8 @@

Please enter your donation details (this is a donation and will not be applied towards your account):


<%= form_tag confirm_payment_path, id: "checkout-form" do %> + # add migration to user first. Not sure about the anonymous part. + # <%= render 'customer_form' unless current_user.has_payment_info? && current_user.where.not.is_anonymous? %>
-- cgit v1.2.3 From 4b7fdbee260f703c8d09bec60c55003b2c5528bd Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 16 Sep 2015 00:20:45 -0500 Subject: correctly set up comments --- engines/billing/app/views/payments/new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb index 3cdda01..002377c 100644 --- a/engines/billing/app/views/payments/new.html.erb +++ b/engines/billing/app/views/payments/new.html.erb @@ -2,8 +2,8 @@

Please enter your donation details (this is a donation and will not be applied towards your account):


<%= form_tag confirm_payment_path, id: "checkout-form" do %> - # add migration to user first. Not sure about the anonymous part. - # <%= render 'customer_form' unless current_user.has_payment_info? && current_user.where.not.is_anonymous? %> + <%# add migration to user first. Not sure about the anonymous part. %> + <%# render 'customer_form' unless current_user.has_payment_info? && current_user.where.not.is_anonymous? %>
-- cgit v1.2.3 From e4a012e09a6b16438bd1286b2057aed916a106f7 Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 16 Sep 2015 00:26:26 -0500 Subject: just played a little --- engines/billing/app/views/payments/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb index 002377c..5eb3e35 100644 --- a/engines/billing/app/views/payments/new.html.erb +++ b/engines/billing/app/views/payments/new.html.erb @@ -20,7 +20,7 @@ var clientToken = "<%= @client_token %>"; braintree.setup(clientToken, "dropin", { container: "payment-form", form: "checkout-form", - coinbase: { container: "payment-form" } + coinbase: { container: "coinbase-container-id" } } ); -- cgit v1.2.3 From f55fd33542c68fc8fc4519d622a41ef9517ebee3 Mon Sep 17 00:00:00 2001 From: claucece Date: Fri, 18 Sep 2015 17:33:05 -0500 Subject: added customers, recurring payment and payment_info --- engines/billing/app/views/payments/new.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb index 5eb3e35..03fc5b9 100644 --- a/engines/billing/app/views/payments/new.html.erb +++ b/engines/billing/app/views/payments/new.html.erb @@ -1,9 +1,13 @@

New Donation

-

Please enter your donation details (this is a donation and will not be applied towards your account):


<%= form_tag confirm_payment_path, id: "checkout-form" do %> <%# add migration to user first. Not sure about the anonymous part. %> <%# render 'customer_form' unless current_user.has_payment_info? && current_user.where.not.is_anonymous? %> + <% if current_user and !current_user.has_payment_info? %> + <%= render 'customer_form' unless @anonymous_user%> + <% end %> +
+

Please enter your donation details (this is a donation and will not be applied towards your account):

-- cgit v1.2.3 From 2e1d21f53f0f96fba544b592fde84af2f4879a24 Mon Sep 17 00:00:00 2001 From: claucece Date: Mon, 21 Sep 2015 23:27:05 -0500 Subject: subscriptions, haml and translations --- .../app/views/payments/_customer_form.html.erb | 13 -------- .../app/views/payments/_customer_form.html.haml | 10 +++++++ engines/billing/app/views/payments/_form.html.erb | 16 ---------- .../billing/app/views/payments/default.html.erb | 27 +++++++++++++++++ engines/billing/app/views/payments/new.html.erb | 31 ------------------- engines/billing/app/views/payments/new.html.haml | 21 +++++++++++++ .../views/subscriptions/_customer_form.html.erb | 13 ++++++++ .../billing/app/views/subscriptions/new.html.erb | 35 ++++++++++++++++++++++ .../billing/app/views/subscriptions/new.html.haml | 15 ---------- 9 files changed, 106 insertions(+), 75 deletions(-) delete mode 100644 engines/billing/app/views/payments/_customer_form.html.erb create mode 100644 engines/billing/app/views/payments/_customer_form.html.haml delete mode 100644 engines/billing/app/views/payments/_form.html.erb create mode 100644 engines/billing/app/views/payments/default.html.erb delete mode 100644 engines/billing/app/views/payments/new.html.erb create mode 100644 engines/billing/app/views/payments/new.html.haml create mode 100644 engines/billing/app/views/subscriptions/_customer_form.html.erb create mode 100644 engines/billing/app/views/subscriptions/new.html.erb delete mode 100644 engines/billing/app/views/subscriptions/new.html.haml (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/_customer_form.html.erb b/engines/billing/app/views/payments/_customer_form.html.erb deleted file mode 100644 index 2e8a3b1..0000000 --- a/engines/billing/app/views/payments/_customer_form.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -

Please enter your personal info:

-
- <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %> -
-
- <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %> -
-
- <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %> -
-
- <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %> -
diff --git a/engines/billing/app/views/payments/_customer_form.html.haml b/engines/billing/app/views/payments/_customer_form.html.haml new file mode 100644 index 0000000..82828cd --- /dev/null +++ b/engines/billing/app/views/payments/_customer_form.html.haml @@ -0,0 +1,10 @@ +%p + = t(:personal_info) +%div + = text_field_tag :first_name, "",placeholder: "First Name", class: "radius" +%div + = text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" +%div + = text_field_tag :company, "",placeholder: "Company", class: "radius" +%div + = text_field_tag :phone, "",placeholder: "Phone", class: "radius" diff --git a/engines/billing/app/views/payments/_form.html.erb b/engines/billing/app/views/payments/_form.html.erb deleted file mode 100644 index 9713981..0000000 --- a/engines/billing/app/views/payments/_form.html.erb +++ /dev/null @@ -1,16 +0,0 @@ --# slim template -= form_tag organization_payment_path(organization) do - - #dropin - - = submit_tag 'Confirm', class: 'btn push--ends' - -- content_for :javascript do - = javascript_include_tag "https://js.braintreegateway.com/v2/braintree.js" - javascript: - var client_token = "#{@organization.payment['client_token']}"; - braintree.setup( - client_token, - 'dropin', { - container: 'dropin' - }); diff --git a/engines/billing/app/views/payments/default.html.erb b/engines/billing/app/views/payments/default.html.erb new file mode 100644 index 0000000..bbecf46 --- /dev/null +++ b/engines/billing/app/views/payments/default.html.erb @@ -0,0 +1,27 @@ +

New Donation

+
+<%= form_tag confirm_payment_path, id: "checkout-form" do %> + <% if current_user and !current_user.has_payment_info? %> + <%= render 'customer_form' unless @anonymous_user%> + <% end %> +
+

Please enter your donation details (this is a donation and will not be applied towards your account):

+
+
+ + +<% end %> + + + diff --git a/engines/billing/app/views/payments/new.html.erb b/engines/billing/app/views/payments/new.html.erb deleted file mode 100644 index 03fc5b9..0000000 --- a/engines/billing/app/views/payments/new.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -

New Donation

-
-<%= form_tag confirm_payment_path, id: "checkout-form" do %> - <%# add migration to user first. Not sure about the anonymous part. %> - <%# render 'customer_form' unless current_user.has_payment_info? && current_user.where.not.is_anonymous? %> - <% if current_user and !current_user.has_payment_info? %> - <%= render 'customer_form' unless @anonymous_user%> - <% end %> -
-

Please enter your donation details (this is a donation and will not be applied towards your account):

-
-
- - -<% end %> - - - - diff --git a/engines/billing/app/views/payments/new.html.haml b/engines/billing/app/views/payments/new.html.haml new file mode 100644 index 0000000..8d5bd5a --- /dev/null +++ b/engines/billing/app/views/payments/new.html.haml @@ -0,0 +1,21 @@ +%h2.mbs + = t(:new_donation) +%br/ += form_tag confirm_payment_path, id: "checkout-form" do + - if current_user and !current_user.has_payment_info? + = render 'customer_form' unless current_user.is_anonymous? + %br/ + %p + = t(:donation_info) + %div{:id => "payment-form" } + %div{:id => "coinbase-container-id" } + %input{:name => "amount", :placeholder => "Enter amount", :type => "text"} + %input.btn.btn-primary{:type => "submit", :value => "Donate"} +%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} +:javascript + var clientToken = "#{@client_token}"; + braintree.setup(clientToken, "dropin", { + container: "payment-form", + form: "checkout-form", + coinbase: { container: "coinbase-container-id" } + }); diff --git a/engines/billing/app/views/subscriptions/_customer_form.html.erb b/engines/billing/app/views/subscriptions/_customer_form.html.erb new file mode 100644 index 0000000..2e8a3b1 --- /dev/null +++ b/engines/billing/app/views/subscriptions/_customer_form.html.erb @@ -0,0 +1,13 @@ +

Please enter your personal info:

+
+ <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %> +
+
+ <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %> +
+
+ <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %> +
+
+ <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %> +
diff --git a/engines/billing/app/views/subscriptions/new.html.erb b/engines/billing/app/views/subscriptions/new.html.erb new file mode 100644 index 0000000..f3e143a --- /dev/null +++ b/engines/billing/app/views/subscriptions/new.html.erb @@ -0,0 +1,35 @@ + +

Subscriptions

+
+<%= form_tag subscriptions_path, id: "checkout-form" do %> + <% if current_user and !current_user.has_payment_info? %> + <%= render 'customer_form' unless @anonymous_user%> + <% end %> +
+

Choose subcription:

+
    + <% @subscriptions.each do |subscription| %> +
  • + <%= subscription.name %> + - + <%= subscription.price %> + <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> + +
    +
    + <%= f.submit t(:subscribe), :class => 'btn btn-primary' %> +
    + + <% end %> +
    • + <% end %> +
+
+
+<% end %> diff --git a/engines/billing/app/views/subscriptions/new.html.haml b/engines/billing/app/views/subscriptions/new.html.haml deleted file mode 100644 index 4183458..0000000 --- a/engines/billing/app/views/subscriptions/new.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -- if @payment_method_token - %h1 - Subscribe to plan - = #currently just one plan - = @plans[0].name - = number_to_currency(@plans[0].price) - = simple_form_for :subscription, :url => :subscriptions do |f| - = hidden_field_tag :payment_method_token, @payment_method_token - = hidden_field_tag :plan_id, @plans[0].id - .form-actions - = f.submit t(:subscribe), :class => 'btn btn-primary' -- else - = t(:must_create_customer) - %p - = link_to t(:create_new_customer), new_customer_path -- cgit v1.2.3 From c10bbfa44442c86fda82c16524341d5f21b63664 Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 22 Sep 2015 10:48:14 -0500 Subject: subscriptions, translation --- .../app/views/customer/_subs_form.html.haml | 10 +++++ engines/billing/app/views/customer/new.html.haml | 44 +++++++++--------- .../billing/app/views/subscriptions/new.html.erb | 52 +++++++++++++--------- .../app/views/subscriptions/new12.html.haml | 27 +++++++++++ 4 files changed, 87 insertions(+), 46 deletions(-) create mode 100644 engines/billing/app/views/customer/_subs_form.html.haml create mode 100644 engines/billing/app/views/subscriptions/new12.html.haml (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/customer/_subs_form.html.haml b/engines/billing/app/views/customer/_subs_form.html.haml new file mode 100644 index 0000000..82828cd --- /dev/null +++ b/engines/billing/app/views/customer/_subs_form.html.haml @@ -0,0 +1,10 @@ +%p + = t(:personal_info) +%div + = text_field_tag :first_name, "",placeholder: "First Name", class: "radius" +%div + = text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" +%div + = text_field_tag :company, "",placeholder: "Company", class: "radius" +%div + = text_field_tag :phone, "",placeholder: "Phone", class: "radius" diff --git a/engines/billing/app/views/customer/new.html.haml b/engines/billing/app/views/customer/new.html.haml index e1f5ba9..81185e4 100644 --- a/engines/billing/app/views/customer/new.html.haml +++ b/engines/billing/app/views/customer/new.html.haml @@ -1,24 +1,20 @@ -- if @result - #total-errors{:style => "color:red;"} - = h(@result.errors.size) - error(s) -= braintree_form_for :customer do |f| - = field_set_tag "Customer" do - %dl - %dt= f.label :first_name, 'First Name' - %dd= f.text_field :first_name - %dt= f.label :last_name, 'Last Name' - %dd= f.text_field :last_name - %dt= f.label :phone, 'Phone' - %dd= f.text_field :phone - = field_set_tag "Credit Card" do - - f.fields_for :credit_card do |cc| - %dl - %dt= cc.label :number, 'Number' - %dd= cc.text_field :number - %dt= cc.label :expiration_date, 'Expiration Date (MM/YY)' - %dd= cc.text_field :expiration_date - %dt= cc.label :cvv, 'CVV' - %dd= cc.text_field :cvv - = hidden_field_tag :tr_data, @tr_data - = f.submit 'Save Payment Info' +%h2.mbs New Customer +%br/ += form_tag new_customer_path, id: "checkout-form" do + - if current_user and !current_user.has_payment_info? + = render 'subs_form' unless current_user.is_anonymous? + %br/ + %p + = t(:donation_info) + %div{:id => "payment-form" } + %div{:id => "coinbase-container-id" } + %input{:name => "amount", :placeholder => "Enter amount", :type => "text"} + %input.btn.btn-primary{:type => "submit", :value => "Donate"} +%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} +:javascript + var clientToken = "#{@client_token}"; + braintree.setup(clientToken, "dropin", { + container: "payment-form", + form: "checkout-form", + coinbase: { container: "coinbase-container-id" } + }); diff --git a/engines/billing/app/views/subscriptions/new.html.erb b/engines/billing/app/views/subscriptions/new.html.erb index f3e143a..2336981 100644 --- a/engines/billing/app/views/subscriptions/new.html.erb +++ b/engines/billing/app/views/subscriptions/new.html.erb @@ -3,33 +3,41 @@
<%= form_tag subscriptions_path, id: "checkout-form" do %> <% if current_user and !current_user.has_payment_info? %> - <%= render 'customer_form' unless @anonymous_user%> - <% end %> + <%= render 'customer_form' %> + <% end %>

Choose subcription:

-
    - <% @subscriptions.each do |subscription| %> -
  • - <%= subscription.name %> - - - <%= subscription.price %> - <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> - -
    -
    - <%= f.submit t(:subscribe), :class => 'btn btn-primary' %> +
    +
      + <% @subscriptions.each do |subscription| %> +
    • +
      +
      - - <% end %> -
      • +
      +
      + <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> + +
      +
      + <%= f.submit t(:subscribe), :class => 'btn btn-primary' %> +
      + + <% end %> + <% end %>
    <% end %> + + + + diff --git a/engines/billing/app/views/subscriptions/new12.html.haml b/engines/billing/app/views/subscriptions/new12.html.haml new file mode 100644 index 0000000..8b302f2 --- /dev/null +++ b/engines/billing/app/views/subscriptions/new12.html.haml @@ -0,0 +1,27 @@ +%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} +%h2.mbs Subscriptions +%br/ += form_tag subscriptions_path, id: "checkout-form" do + - if current_user and !current_user.has_payment_info? + = render 'customer_form' + %br/ + %p Choose subcription: + %ul + - @subscriptions.each do |subscription| + %li + = subscription.name + = subscription.price + = simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| + %input{:id => "", :name => "plan_id", :type => "hidden", :value => subscription.id} + %div{:id => "payment-form-#{subscription.id}"} + .form-actions + = f.submit t(:subscribe), :class => 'btn btn-primary' + %script{:charset => "utf-8", :type => "text/javascript"} + :cdata + var clientToken = "#{@client_token}"; + braintree.setup(clientToken, "dropin", { + container: "payment-form-#{subscription.id}", + coinbase: { container: "coinbase-container-id" } + }); +#payment-form +#coinbase-container-id -- cgit v1.2.3 From 5a4f0fa64d36df1d60bdd693580e10ce55949b6a Mon Sep 17 00:00:00 2001 From: claucece Date: Tue, 22 Sep 2015 23:50:04 -0500 Subject: changed routes and links --- .../billing/app/views/subscriptions/index.html.erb | 23 ++++++++++++ .../app/views/subscriptions/index.html.haml | 8 ---- .../app/views/subscriptions/index2.html.haml | 8 ++++ .../billing/app/views/subscriptions/new.html.erb | 43 ---------------------- .../billing/app/views/subscriptions/show.html.haml | 7 ---- .../app/views/subscriptions/show2.html.haml | 7 ++++ 6 files changed, 38 insertions(+), 58 deletions(-) create mode 100644 engines/billing/app/views/subscriptions/index.html.erb delete mode 100644 engines/billing/app/views/subscriptions/index.html.haml create mode 100644 engines/billing/app/views/subscriptions/index2.html.haml delete mode 100644 engines/billing/app/views/subscriptions/new.html.erb delete mode 100644 engines/billing/app/views/subscriptions/show.html.haml create mode 100644 engines/billing/app/views/subscriptions/show2.html.haml (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/subscriptions/index.html.erb b/engines/billing/app/views/subscriptions/index.html.erb new file mode 100644 index 0000000..b47fae6 --- /dev/null +++ b/engines/billing/app/views/subscriptions/index.html.erb @@ -0,0 +1,23 @@ +

    Subscriptions

    +
    +
    +

    Choose subcription:

    +
    +
      + <% @subscriptions.each do |subscription| %> +
    • +
      + +
      +
      + <%=link_to "Checkout", :show_subscription, class: "button" %> +
      +
      • + <% end %> +
    + + + + + diff --git a/engines/billing/app/views/subscriptions/index.html.haml b/engines/billing/app/views/subscriptions/index.html.haml deleted file mode 100644 index 1e3fb25..0000000 --- a/engines/billing/app/views/subscriptions/index.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%h2=t :all_subscriptions -- pending_active_pastdue = false -- @subscriptions.each do |s| - - if ['Pending', 'Active','Past Due'].include? s.status - - pending_active_pastdue = true - = render :partial => "subscription_details", :locals => {:subscription => s} -- if !pending_active_pastdue and @user == current_user - = btn 'subscribe to plan', new_subscription_path diff --git a/engines/billing/app/views/subscriptions/index2.html.haml b/engines/billing/app/views/subscriptions/index2.html.haml new file mode 100644 index 0000000..1e3fb25 --- /dev/null +++ b/engines/billing/app/views/subscriptions/index2.html.haml @@ -0,0 +1,8 @@ +%h2=t :all_subscriptions +- pending_active_pastdue = false +- @subscriptions.each do |s| + - if ['Pending', 'Active','Past Due'].include? s.status + - pending_active_pastdue = true + = render :partial => "subscription_details", :locals => {:subscription => s} +- if !pending_active_pastdue and @user == current_user + = btn 'subscribe to plan', new_subscription_path diff --git a/engines/billing/app/views/subscriptions/new.html.erb b/engines/billing/app/views/subscriptions/new.html.erb deleted file mode 100644 index 2336981..0000000 --- a/engines/billing/app/views/subscriptions/new.html.erb +++ /dev/null @@ -1,43 +0,0 @@ - -

    Subscriptions

    -
    -<%= form_tag subscriptions_path, id: "checkout-form" do %> - <% if current_user and !current_user.has_payment_info? %> - <%= render 'customer_form' %> - <% end %> -
    -

    Choose subcription:

    -
    -
      - <% @subscriptions.each do |subscription| %> -
    • -
      - -
      -
      -
      - <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> - -
      -
      - <%= f.submit t(:subscribe), :class => 'btn btn-primary' %> -
      - - <% end %> -
      • - <% end %> -
    -
    -
    -<% end %> - - - - diff --git a/engines/billing/app/views/subscriptions/show.html.haml b/engines/billing/app/views/subscriptions/show.html.haml deleted file mode 100644 index 246ebf0..0000000 --- a/engines/billing/app/views/subscriptions/show.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -%h1 - - if @subscription.status == 'Active' - Current - Subscription -= render :partial => "subscription_details", :locals => {:subscription => @subscription} -- if allow_cancel_subscription(@subscription) - = destroy_btn :cancel_subscription, user_subscription_path(@user, @subscription.id), type: 'danger' diff --git a/engines/billing/app/views/subscriptions/show2.html.haml b/engines/billing/app/views/subscriptions/show2.html.haml new file mode 100644 index 0000000..246ebf0 --- /dev/null +++ b/engines/billing/app/views/subscriptions/show2.html.haml @@ -0,0 +1,7 @@ +%h1 + - if @subscription.status == 'Active' + Current + Subscription += render :partial => "subscription_details", :locals => {:subscription => @subscription} +- if allow_cancel_subscription(@subscription) + = destroy_btn :cancel_subscription, user_subscription_path(@user, @subscription.id), type: 'danger' -- cgit v1.2.3 From 577c1f3e92040ab79fcd67b818c7dc8531aaa211 Mon Sep 17 00:00:00 2001 From: claucece Date: Wed, 23 Sep 2015 23:57:44 -0500 Subject: add subs_index and start show --- .../billing/app/views/subscriptions/index.html.erb | 36 ++++++++++++++-------- .../billing/app/views/subscriptions/show.html.erb | 26 ++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 engines/billing/app/views/subscriptions/show.html.erb (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/subscriptions/index.html.erb b/engines/billing/app/views/subscriptions/index.html.erb index b47fae6..2037de3 100644 --- a/engines/billing/app/views/subscriptions/index.html.erb +++ b/engines/billing/app/views/subscriptions/index.html.erb @@ -1,19 +1,29 @@

    Subscriptions



    -

    Choose subcription:

    -
    -
      - <% @subscriptions.each do |subscription| %> -
    • -
      - -
      -
      - <%=link_to "Checkout", :show_subscription, class: "button" %> -
      -
      • +
      Lastest Subscriptions: + <% if params[:search] == "active" %> + <%= render :partial => "subscriptions/subscription_details" %> + <%# Add destroy, route %> + <%=link_to "Unsubscribe", :show_subscription, class: "button" %> +
      +
      + <% else %> +

      No subscriptions

      +

      Choose subcription:

      +
      +
        + <% @subscriptions.each do |subscription| %> +
      • +
        + +
        +
        + <%=link_to "Subscribe", :show_subscription, class: "button" %> +

        +
        • + <% end %> <% end %>
      diff --git a/engines/billing/app/views/subscriptions/show.html.erb b/engines/billing/app/views/subscriptions/show.html.erb new file mode 100644 index 0000000..f3c730d --- /dev/null +++ b/engines/billing/app/views/subscriptions/show.html.erb @@ -0,0 +1,26 @@ + +

      New Subscription +

      +
      +<%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> + + <% if current_user and !current_user.has_payment_info? %> + <%= render 'customer_form'%> + <% end %> +
      +

      Please enter payment details:

      +
      +
      + <%= f.submit t(:choose), :class => 'btn btn-primary' %> +
      + + <% end %> +
      +
      + -- cgit v1.2.3 From b26d10fe7d87b570bd888fa2a2543f3675278f8b Mon Sep 17 00:00:00 2001 From: claucece Date: Fri, 25 Sep 2015 00:04:19 -0500 Subject: add subscriptions --- engines/billing/app/views/payments/new.html.haml | 5 ++- .../billing/app/views/subscriptions/index.html.erb | 38 ++++++++++++---------- .../billing/app/views/subscriptions/show.html.erb | 16 ++++----- 3 files changed, 28 insertions(+), 31 deletions(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/new.html.haml b/engines/billing/app/views/payments/new.html.haml index 8d5bd5a..67018b2 100644 --- a/engines/billing/app/views/payments/new.html.haml +++ b/engines/billing/app/views/payments/new.html.haml @@ -4,13 +4,12 @@ = form_tag confirm_payment_path, id: "checkout-form" do - if current_user and !current_user.has_payment_info? = render 'customer_form' unless current_user.is_anonymous? - %br/ %p = t(:donation_info) %div{:id => "payment-form" } %div{:id => "coinbase-container-id" } - %input{:name => "amount", :placeholder => "Enter amount", :type => "text"} - %input.btn.btn-primary{:type => "submit", :value => "Donate"} + %input{:name => "amount", :placeholder => "#{t(:donation_amount)}", :type => "text"} + %input.btn.btn-primary{:type => "submit", :value => "#{t(:donate)}"} %script{:src => "https://js.braintreegateway.com/v2/braintree.js"} :javascript var clientToken = "#{@client_token}"; diff --git a/engines/billing/app/views/subscriptions/index.html.erb b/engines/billing/app/views/subscriptions/index.html.erb index 2037de3..688e371 100644 --- a/engines/billing/app/views/subscriptions/index.html.erb +++ b/engines/billing/app/views/subscriptions/index.html.erb @@ -1,33 +1,35 @@

      Subscriptions


      -
      -
      Lastest Subscriptions: - <% if params[:search] == "active" %> - <%= render :partial => "subscriptions/subscription_details" %> - <%# Add destroy, route %> - <%=link_to "Unsubscribe", :show_subscription, class: "button" %> -
      +

      Lastest Subscriptions:

      + <% if @user.subscription_id %> +
        + <% @subscription.transactions.each do |transaction| %> +
      • + Date: <%= transaction.created_at %> +
        • + <% end %> +
      +
        + <%= link_to "Unsubscribe from #{@plan.name}", unsubscribe_subscription_path(@subscription.plan_id), method: :delete, class: "btn btn-danger" %> +
      +

    <% else %> -

    No subscriptions

    -

    Choose subcription:

    +

    No subscriptions.

    +
    +

    Choose subcription:


      <% @subscriptions.each do |subscription| %>
    • -
      - +
      + <%= subscription.name %> + <%= subscription.price %>
      - <%=link_to "Subscribe", :show_subscription, class: "button" %> + <%= link_to "Choose", subscription_path(subscription.id), class: "btn btn-info" %>

      • <% end %> <% end %>
    - - - - - diff --git a/engines/billing/app/views/subscriptions/show.html.erb b/engines/billing/app/views/subscriptions/show.html.erb index f3c730d..92cf863 100644 --- a/engines/billing/app/views/subscriptions/show.html.erb +++ b/engines/billing/app/views/subscriptions/show.html.erb @@ -1,26 +1,22 @@

    New Subscription

    -
    -<%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %> - +<%= simple_form_for :subscription, :url => subscribe_subscription_path(@plan.id), :id => "checkout-form" do |f| %> <% if current_user and !current_user.has_payment_info? %> <%= render 'customer_form'%> <% end %>

    Please enter payment details:

    -
    +
    +
    - <%= f.submit t(:choose), :class => 'btn btn-primary' %> + <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
    - <% end %> -
    -
    - +<% end %> -- cgit v1.2.3 From 6c4f02fd2d530c28899561fac40ca76075975dc8 Mon Sep 17 00:00:00 2001 From: claucece Date: Sun, 27 Sep 2015 23:04:55 -0500 Subject: update to haml, created translations, deleted files --- .../billing/app/views/billing_admin/show.html.haml | 6 ++-- .../app/views/credit_card_info/confirm.html.haml | 5 ---- .../app/views/credit_card_info/edit.html.haml | 16 ---------- .../app/views/customer/_customer_data.html.haml | 16 ---------- .../app/views/customer/_subs_form.html.haml | 10 ------- .../app/views/customer/_transaction.html.haml | 0 .../billing/app/views/customer/confirm.html.haml | 14 --------- engines/billing/app/views/customer/edit.html.haml | 23 -------------- engines/billing/app/views/customer/new.html.haml | 20 ------------- engines/billing/app/views/customer/show.html.haml | 27 ----------------- .../app/views/payments/_customer_form.html.haml | 8 ++--- .../views/payments/_non_customer_fields.html.haml | 16 ---------- .../views/payments/_transaction_details.html.haml | 15 ---------- .../billing/app/views/payments/confirm.html.haml | 26 ---------------- .../billing/app/views/payments/default.html.erb | 27 ----------------- engines/billing/app/views/payments/index.html.haml | 3 +- .../views/subscriptions/_customer_form.html.erb | 13 -------- .../views/subscriptions/_customer_form.html.haml | 10 +++++++ .../subscriptions/_subscription_details.html.haml | 3 +- .../app/views/subscriptions/create.html.haml | 9 ------ .../app/views/subscriptions/destroy.html.haml | 7 ----- .../billing/app/views/subscriptions/index.html.erb | 35 ---------------------- .../app/views/subscriptions/index.html.haml | 29 ++++++++++++++++++ .../app/views/subscriptions/index2.html.haml | 8 ----- .../app/views/subscriptions/new12.html.haml | 27 ----------------- .../billing/app/views/subscriptions/show.html.erb | 22 -------------- .../billing/app/views/subscriptions/show.html.haml | 19 ++++++++++++ .../app/views/subscriptions/show2.html.haml | 7 ----- 28 files changed, 70 insertions(+), 351 deletions(-) delete mode 100644 engines/billing/app/views/credit_card_info/confirm.html.haml delete mode 100644 engines/billing/app/views/credit_card_info/edit.html.haml delete mode 100644 engines/billing/app/views/customer/_customer_data.html.haml delete mode 100644 engines/billing/app/views/customer/_subs_form.html.haml delete mode 100644 engines/billing/app/views/customer/_transaction.html.haml delete mode 100644 engines/billing/app/views/customer/confirm.html.haml delete mode 100644 engines/billing/app/views/customer/edit.html.haml delete mode 100644 engines/billing/app/views/customer/new.html.haml delete mode 100644 engines/billing/app/views/customer/show.html.haml delete mode 100644 engines/billing/app/views/payments/_non_customer_fields.html.haml delete mode 100644 engines/billing/app/views/payments/_transaction_details.html.haml delete mode 100644 engines/billing/app/views/payments/confirm.html.haml delete mode 100644 engines/billing/app/views/payments/default.html.erb delete mode 100644 engines/billing/app/views/subscriptions/_customer_form.html.erb create mode 100644 engines/billing/app/views/subscriptions/_customer_form.html.haml delete mode 100644 engines/billing/app/views/subscriptions/create.html.haml delete mode 100644 engines/billing/app/views/subscriptions/destroy.html.haml delete mode 100644 engines/billing/app/views/subscriptions/index.html.erb create mode 100644 engines/billing/app/views/subscriptions/index.html.haml delete mode 100644 engines/billing/app/views/subscriptions/index2.html.haml delete mode 100644 engines/billing/app/views/subscriptions/new12.html.haml delete mode 100644 engines/billing/app/views/subscriptions/show.html.erb create mode 100644 engines/billing/app/views/subscriptions/show.html.haml delete mode 100644 engines/billing/app/views/subscriptions/show2.html.haml (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/billing_admin/show.html.haml b/engines/billing/app/views/billing_admin/show.html.haml index 0382cf0..11f3928 100644 --- a/engines/billing/app/views/billing_admin/show.html.haml +++ b/engines/billing/app/views/billing_admin/show.html.haml @@ -1,7 +1,9 @@ +/ same concern as in controller %legend= t(:more_than_90_days_past_due) = render(:partial => "subscriptions/subscription_details", :collection => @past_due_atleast_90_days, :as => 'subscription', :locals => {:show_user => true}) || t(:none) %legend= t(:all_past_due) = render(:partial => "subscriptions/subscription_details", :collection => @all_past_due, :as => 'subscription', :locals => {:show_user => true}) || t(:none) -%legend= t(:your_settings) -= link_to 'view own billing settings', show_or_new_customer_link(current_user) \ No newline at end of file +/needed? +/%legend= t(:your_settings) +/= link_to 'view own billing settings', show_or_new_customer_link(current_user) diff --git a/engines/billing/app/views/credit_card_info/confirm.html.haml b/engines/billing/app/views/credit_card_info/confirm.html.haml deleted file mode 100644 index 9dd8176..0000000 --- a/engines/billing/app/views/credit_card_info/confirm.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%h1 Payment Info Confirmation -%p Your payment information was successfully saved. -%dl - %dt Credit Card - %dd= @result.credit_card.masked_number diff --git a/engines/billing/app/views/credit_card_info/edit.html.haml b/engines/billing/app/views/credit_card_info/edit.html.haml deleted file mode 100644 index 9e44344..0000000 --- a/engines/billing/app/views/credit_card_info/edit.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -%h1 Change Credit Card -- if @result - #total-errors{:style => "color:red;"} - = h(@result.errors.size) - error(s) -= braintree_form_for :credit_card, :existing => @credit_card do |f| - = field_set_tag "Credit Card" do - %dl - %dt= f.label :number, 'Number' - %dd= f.text_field :number - %dt= f.label :expiration_date, 'Expiration Date (MM/YY)' - %dd= f.text_field :expiration_date - %dt= f.label :cvv, 'CVV' - %dd= f.text_field :cvv - = hidden_field_tag :tr_data, @tr_data - = f.button :wrapped, 'Save Payment Info', cancel: edit_customer_path(@user.id) diff --git a/engines/billing/app/views/customer/_customer_data.html.haml b/engines/billing/app/views/customer/_customer_data.html.haml deleted file mode 100644 index 439ae5c..0000000 --- a/engines/billing/app/views/customer/_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 - = btn t(:edit_saved_data), edit_customer_path(@user.id) diff --git a/engines/billing/app/views/customer/_subs_form.html.haml b/engines/billing/app/views/customer/_subs_form.html.haml deleted file mode 100644 index 82828cd..0000000 --- a/engines/billing/app/views/customer/_subs_form.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -%p - = t(:personal_info) -%div - = text_field_tag :first_name, "",placeholder: "First Name", class: "radius" -%div - = text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" -%div - = text_field_tag :company, "",placeholder: "Company", class: "radius" -%div - = text_field_tag :phone, "",placeholder: "Phone", class: "radius" diff --git a/engines/billing/app/views/customer/_transaction.html.haml b/engines/billing/app/views/customer/_transaction.html.haml deleted file mode 100644 index e69de29..0000000 diff --git a/engines/billing/app/views/customer/confirm.html.haml b/engines/billing/app/views/customer/confirm.html.haml deleted file mode 100644 index eab9616..0000000 --- a/engines/billing/app/views/customer/confirm.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -%h1 Payment Info Confirmation -%p Your payment information was successfully saved. -%dl - %dt First Name - %dd= @result.customer.first_name - %dt Last Name - %dd= @result.customer.last_name - %dt Phone - %dd= @result.customer.phone - %dt Credit Card - - @result.customer.credit_cards.each do |cc| - %dd= cc.masked_number -- customer = Customer.find_by_user_id(@user.id) -= btn 'View Customer Info', show_customer_path(@user.id) diff --git a/engines/billing/app/views/customer/edit.html.haml b/engines/billing/app/views/customer/edit.html.haml deleted file mode 100644 index f461fcc..0000000 --- a/engines/billing/app/views/customer/edit.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- if @result - #total-errors{:style => "color:red;"} - = h(@result.errors.size) - error(s) -= braintree_form_for :customer, existing: @customer do |f| - = field_set_tag "Customer" do - %dl - %dt= f.label :first_name, 'First Name' - %dd= f.text_field :first_name - %dt= f.label :last_name, 'Last Name' - %dd= f.text_field :last_name - %dt= f.label :phone, 'Phone' - %dd= f.text_field :phone - - if @default_cc - = # todo, as they will need a credit card, so not sure about conditional? - %dt= t(:stored_credit_card) - %dd - = @default_cc.masked_number - = btn t(:change_credit_card), edit_credit_card_info_path(:id => @default_cc.token) - = hidden_field_tag :tr_data, @tr_data - .form-actions - = f.submit t(:save_customer_info), :class => 'btn btn-primary' - = btn t(:cancel), show_customer_path(@user) diff --git a/engines/billing/app/views/customer/new.html.haml b/engines/billing/app/views/customer/new.html.haml deleted file mode 100644 index 81185e4..0000000 --- a/engines/billing/app/views/customer/new.html.haml +++ /dev/null @@ -1,20 +0,0 @@ -%h2.mbs New Customer -%br/ -= form_tag new_customer_path, id: "checkout-form" do - - if current_user and !current_user.has_payment_info? - = render 'subs_form' unless current_user.is_anonymous? - %br/ - %p - = t(:donation_info) - %div{:id => "payment-form" } - %div{:id => "coinbase-container-id" } - %input{:name => "amount", :placeholder => "Enter amount", :type => "text"} - %input.btn.btn-primary{:type => "submit", :value => "Donate"} -%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} -:javascript - var clientToken = "#{@client_token}"; - braintree.setup(clientToken, "dropin", { - container: "payment-form", - form: "checkout-form", - coinbase: { container: "coinbase-container-id" } - }); diff --git a/engines/billing/app/views/customer/show.html.haml b/engines/billing/app/views/customer/show.html.haml deleted file mode 100644 index ce4d01a..0000000 --- a/engines/billing/app/views/customer/show.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -- if admin? and !@customer - = t(:no_saved_customer) -- else - = render :partial => 'customer_data' - %legend= t(:last_three_transactions) - - counter = 0 - = # these will be ordered with most recently created first, per http://stackoverflow.com/questions/16425475/ - - @transactions.each do |t| - - break if counter > 2 # not ruby-like, but object is a Braintree::ResourceCollection so limited methods available - = render :partial => "payments/transaction_details", :locals => {:transaction => t} - - counter += 1 - = btn :transaction_history, user_payments_path(@user) - %legend= t(:subscriptions) - - if @active_subscription - = render :partial => "subscriptions/subscription_details", :locals => {:subscription => @active_subscription} - - else - %p - = t(:no_relevant_subscription) - - if current_user == @user - %p - .form-actions - = btn :subscribe_to_plan, new_subscription_path - %p - = link_to t(:all_subscriptions), user_subscriptions_path(@user) - -.form-actions - = btn :make_donation, new_payment_path, :type => 'primary' diff --git a/engines/billing/app/views/payments/_customer_form.html.haml b/engines/billing/app/views/payments/_customer_form.html.haml index 82828cd..df61d3d 100644 --- a/engines/billing/app/views/payments/_customer_form.html.haml +++ b/engines/billing/app/views/payments/_customer_form.html.haml @@ -1,10 +1,10 @@ %p = t(:personal_info) %div - = text_field_tag :first_name, "",placeholder: "First Name", class: "radius" + = text_field_tag :first_name, "",placeholder: "#{t(:first_name)}", class: "radius" %div - = text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" + = text_field_tag :last_name, "",placeholder: "#{t(:last_name)}", class: "radius" %div - = text_field_tag :company, "",placeholder: "Company", class: "radius" + = text_field_tag :company, "",placeholder: "#{t(:company)}", class: "radius" %div - = text_field_tag :phone, "",placeholder: "Phone", class: "radius" + = text_field_tag :phone, "",placeholder: "#{t(:phone)}", class: "radius" diff --git a/engines/billing/app/views/payments/_non_customer_fields.html.haml b/engines/billing/app/views/payments/_non_customer_fields.html.haml deleted file mode 100644 index 77cfe95..0000000 --- a/engines/billing/app/views/payments/_non_customer_fields.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -= 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 - %div= c.label :last_name, "Last Name" - %div= c.text_field :last_name - %div= c.label :email, "Email" - %div= c.text_field :email -= field_set_tag "Credit Card" do - = f.fields_for :credit_card do |c| - %div= c.label :number, "Number" - %div= c.text_field :number - %div= c.label :expiration_date, "Expiration Date (MM/YY)" - %div= c.text_field :expiration_date - %div= c.label :cvv, "CVV" - %div= c.text_field :cvv \ No newline at end of file diff --git a/engines/billing/app/views/payments/_transaction_details.html.haml b/engines/billing/app/views/payments/_transaction_details.html.haml deleted file mode 100644 index 85e4f6a..0000000 --- a/engines/billing/app/views/payments/_transaction_details.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -%p - = transaction.id - Type: - = transaction.type - Amount: - = number_to_currency(transaction.amount) - Status: - = transaction.status - Date - = transaction.created_at.strftime("%Y-%m-%d") - - if sub_start = transaction.subscription_details.billing_period_start_date - From subscription which started - = sub_start - - else # should not have any of these - Not paid as part of subscription \ No newline at end of file diff --git a/engines/billing/app/views/payments/confirm.html.haml b/engines/billing/app/views/payments/confirm.html.haml deleted file mode 100644 index 45af3c9..0000000 --- a/engines/billing/app/views/payments/confirm.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -%h1 Payment Result -%div Thank you for your donation. -%h2 Transaction Details -%table - %tr - %td Amount - %td - $#{@result.transaction.amount} - %tr - %td Transaction ID: - %td= @result.transaction.id - %tr - %td First Name: - %td= h @result.transaction.customer_details.first_name - %tr - %td Last Name: - %td= h @result.transaction.customer_details.last_name - %tr - %td Email: - %td= h @result.transaction.customer_details.email - %tr - %td Credit Card: - %td= h @result.transaction.credit_card_details.masked_number - %tr - %td Card Type: - %td= h @result.transaction.credit_card_details.card_type \ No newline at end of file diff --git a/engines/billing/app/views/payments/default.html.erb b/engines/billing/app/views/payments/default.html.erb deleted file mode 100644 index bbecf46..0000000 --- a/engines/billing/app/views/payments/default.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

    New Donation

    -
    -<%= form_tag confirm_payment_path, id: "checkout-form" do %> - <% if current_user and !current_user.has_payment_info? %> - <%= render 'customer_form' unless @anonymous_user%> - <% end %> -
    -

    Please enter your donation details (this is a donation and will not be applied towards your account):

    -
    -
    - - -<% end %> - - - diff --git a/engines/billing/app/views/payments/index.html.haml b/engines/billing/app/views/payments/index.html.haml index 7a89917..01aa660 100644 --- a/engines/billing/app/views/payments/index.html.haml +++ b/engines/billing/app/views/payments/index.html.haml @@ -1,5 +1,6 @@ +/ check if necessary %h2=t :transaction_history - if (@transactions.count == 0) = t(:no_transaction_history) - @transactions.each do |t| - = render :partial => "transaction_details", :locals => {:transaction => t} \ No newline at end of file + = render :partial => "transaction_details", :locals => {:transaction => t} diff --git a/engines/billing/app/views/subscriptions/_customer_form.html.erb b/engines/billing/app/views/subscriptions/_customer_form.html.erb deleted file mode 100644 index 2e8a3b1..0000000 --- a/engines/billing/app/views/subscriptions/_customer_form.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -

    Please enter your personal info:

    -
    - <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %> -
    -
    - <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %> -
    -
    - <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %> -
    -
    - <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %> -
    diff --git a/engines/billing/app/views/subscriptions/_customer_form.html.haml b/engines/billing/app/views/subscriptions/_customer_form.html.haml new file mode 100644 index 0000000..70b9b97 --- /dev/null +++ b/engines/billing/app/views/subscriptions/_customer_form.html.haml @@ -0,0 +1,10 @@ +%p + = t(:personal_info) +%div + = text_field_tag :first_name, "",placeholder: "#{t(:first_name)}", class: "radius" +%div + = text_field_tag :last_name, "",placeholder: "#{t(:last_name)}", class: "radius" +%div + = text_field_tag :company, "",placeholder: "#{t(:company)}", class: "radius" +%div + = text_field_tag :phone, "",placeholder: "#{t(:phone)}", class: "radius" diff --git a/engines/billing/app/views/subscriptions/_subscription_details.html.haml b/engines/billing/app/views/subscriptions/_subscription_details.html.haml index 6145c95..e6cf87d 100644 --- a/engines/billing/app/views/subscriptions/_subscription_details.html.haml +++ b/engines/billing/app/views/subscriptions/_subscription_details.html.haml @@ -1,3 +1,4 @@ +/needed? %p - if local_assigns[:show_user] User: @@ -23,4 +24,4 @@ Status: %font{:color => color} = subscription.status - - # would be good to get plan name but not sure if that is possible? \ No newline at end of file + - # would be good to get plan name but not sure if that is possible? diff --git a/engines/billing/app/views/subscriptions/create.html.haml b/engines/billing/app/views/subscriptions/create.html.haml deleted file mode 100644 index 2b6c5e9..0000000 --- a/engines/billing/app/views/subscriptions/create.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- if @result.success? - %h1 - Subscription Status - = @result.subscription.status - = render :partial => "subscription_details", :locals => {:subscription => @result.subscription} -- else - %h1 - Error: - = @result.message \ No newline at end of file diff --git a/engines/billing/app/views/subscriptions/destroy.html.haml b/engines/billing/app/views/subscriptions/destroy.html.haml deleted file mode 100644 index e6e8578..0000000 --- a/engines/billing/app/views/subscriptions/destroy.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- if @result.success? - Subscription destroyed -- else - Error: - = @result.message -%p - = btn 'Customer Information', show_customer_path(@user) diff --git a/engines/billing/app/views/subscriptions/index.html.erb b/engines/billing/app/views/subscriptions/index.html.erb deleted file mode 100644 index 688e371..0000000 --- a/engines/billing/app/views/subscriptions/index.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -

    Subscriptions

    -
    -

    Lastest Subscriptions:

    - <% if @user.subscription_id %> -
      - <% @subscription.transactions.each do |transaction| %> -
    • - Date: <%= transaction.created_at %> -
      • - <% end %> -
    -
      - <%= link_to "Unsubscribe from #{@plan.name}", unsubscribe_subscription_path(@subscription.plan_id), method: :delete, class: "btn btn-danger" %> -
    -
-
- <% else %> -

No subscriptions.

-
-

Choose subcription:

-
-
    - <% @subscriptions.each do |subscription| %> -
  • -
    - <%= subscription.name %> - <%= subscription.price %> -
    -
    - <%= link_to "Choose", subscription_path(subscription.id), class: "btn btn-info" %> -

    -
    • - <% end %> - <% end %> -
diff --git a/engines/billing/app/views/subscriptions/index.html.haml b/engines/billing/app/views/subscriptions/index.html.haml new file mode 100644 index 0000000..70fbf8d --- /dev/null +++ b/engines/billing/app/views/subscriptions/index.html.haml @@ -0,0 +1,29 @@ +%h2.mbs + = t(:subscriptions) +%h4{ :style => "line-height: 300%;" } + .last + = t(:lastestsubs) + - if @user.subscription_id + %ul + - @subscription.transactions.each do |transaction| + %li + %p{ :style => "font-size: 14px; font-weight: normal;" } + #{t(:date)} #{transaction.created_at} + %ul + = link_to "#{t(:unsubscribe_from)} #{@plan.name}", unsubscribe_subscription_path(@subscription.plan_id), method: :delete, class: "btn btn-danger" + %br + - else + %p{ :style => "font-size: 14px; font-weight: normal;"} + =t(:no_subs) + %h4 + =t(:choose_subs) + %br + %ul.nav.nav-tabs.nav-stacked + - @subscriptions.each do |subscription| + .well + = subscription.name + = "$" + subscription.price.to_s + %div{ :style => "line-height: 300%;" } + = link_to t(:choose_button), subscription_path(subscription.id), class: "btn btn-info" + + diff --git a/engines/billing/app/views/subscriptions/index2.html.haml b/engines/billing/app/views/subscriptions/index2.html.haml deleted file mode 100644 index 1e3fb25..0000000 --- a/engines/billing/app/views/subscriptions/index2.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%h2=t :all_subscriptions -- pending_active_pastdue = false -- @subscriptions.each do |s| - - if ['Pending', 'Active','Past Due'].include? s.status - - pending_active_pastdue = true - = render :partial => "subscription_details", :locals => {:subscription => s} -- if !pending_active_pastdue and @user == current_user - = btn 'subscribe to plan', new_subscription_path diff --git a/engines/billing/app/views/subscriptions/new12.html.haml b/engines/billing/app/views/subscriptions/new12.html.haml deleted file mode 100644 index 8b302f2..0000000 --- a/engines/billing/app/views/subscriptions/new12.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} -%h2.mbs Subscriptions -%br/ -= form_tag subscriptions_path, id: "checkout-form" do - - if current_user and !current_user.has_payment_info? - = render 'customer_form' - %br/ - %p Choose subcription: - %ul - - @subscriptions.each do |subscription| - %li - = subscription.name - = subscription.price - = simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| - %input{:id => "", :name => "plan_id", :type => "hidden", :value => subscription.id} - %div{:id => "payment-form-#{subscription.id}"} - .form-actions - = f.submit t(:subscribe), :class => 'btn btn-primary' - %script{:charset => "utf-8", :type => "text/javascript"} - :cdata - var clientToken = "#{@client_token}"; - braintree.setup(clientToken, "dropin", { - container: "payment-form-#{subscription.id}", - coinbase: { container: "coinbase-container-id" } - }); -#payment-form -#coinbase-container-id diff --git a/engines/billing/app/views/subscriptions/show.html.erb b/engines/billing/app/views/subscriptions/show.html.erb deleted file mode 100644 index 92cf863..0000000 --- a/engines/billing/app/views/subscriptions/show.html.erb +++ /dev/null @@ -1,22 +0,0 @@ - -

New Subscription -

-<%= simple_form_for :subscription, :url => subscribe_subscription_path(@plan.id), :id => "checkout-form" do |f| %> - <% if current_user and !current_user.has_payment_info? %> - <%= render 'customer_form'%> - <% end %> -
-

Please enter payment details:

-
-
-
- <%= f.submit t(:subscribe), :class => 'btn btn-primary' %> -
- -<% end %> diff --git a/engines/billing/app/views/subscriptions/show.html.haml b/engines/billing/app/views/subscriptions/show.html.haml new file mode 100644 index 0000000..45c54cc --- /dev/null +++ b/engines/billing/app/views/subscriptions/show.html.haml @@ -0,0 +1,19 @@ +%script{:src => "https://js.braintreegateway.com/v2/braintree.js"} +%h2.mbs + = t(:new_subs) += simple_form_for :subscription, :url => subscribe_subscription_path(@plan.id), :id => "checkout-form" do |f| + - if current_user and !current_user.has_payment_info? + = render 'customer_form' + %br/ + %p + =t(:pay_details) + #payment-form + #coinbase-container-id + .form-actions + = f.submit t(:subscribe), :class => 'btn btn-primary' + :javascript + var clientToken = "#{@client_token}"; + braintree.setup(clientToken, "dropin", { + container: "payment-form", + coinbase: { container: "coinbase-container-id" } + }); diff --git a/engines/billing/app/views/subscriptions/show2.html.haml b/engines/billing/app/views/subscriptions/show2.html.haml deleted file mode 100644 index 246ebf0..0000000 --- a/engines/billing/app/views/subscriptions/show2.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -%h1 - - if @subscription.status == 'Active' - Current - Subscription -= render :partial => "subscription_details", :locals => {:subscription => @subscription} -- if allow_cancel_subscription(@subscription) - = destroy_btn :cancel_subscription, user_subscription_path(@user, @subscription.id), type: 'danger' -- cgit v1.2.3 From 775835dc1b9a8f79cdd53d450fd6cd35f131b4a6 Mon Sep 17 00:00:00 2001 From: claucece Date: Mon, 5 Oct 2015 21:57:05 -0500 Subject: add test to payments and subscriptions --- engines/billing/app/views/payments/_customer_form.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/billing/app/views') diff --git a/engines/billing/app/views/payments/_customer_form.html.haml b/engines/billing/app/views/payments/_customer_form.html.haml index df61d3d..70b9b97 100644 --- a/engines/billing/app/views/payments/_customer_form.html.haml +++ b/engines/billing/app/views/payments/_customer_form.html.haml @@ -1,10 +1,10 @@ %p - = t(:personal_info) + = t(:personal_info) %div = text_field_tag :first_name, "",placeholder: "#{t(:first_name)}", class: "radius" %div - = text_field_tag :last_name, "",placeholder: "#{t(:last_name)}", class: "radius" + = text_field_tag :last_name, "",placeholder: "#{t(:last_name)}", class: "radius" %div - = text_field_tag :company, "",placeholder: "#{t(:company)}", class: "radius" + = text_field_tag :company, "",placeholder: "#{t(:company)}", class: "radius" %div - = text_field_tag :phone, "",placeholder: "#{t(:phone)}", class: "radius" + = text_field_tag :phone, "",placeholder: "#{t(:phone)}", class: "radius" -- cgit v1.2.3