From 2e1d21f53f0f96fba544b592fde84af2f4879a24 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Mon, 21 Sep 2015 23:27:05 -0500
Subject: subscriptions, haml and translations

---
 .../views/subscriptions/_customer_form.html.erb    | 13 ++++++++
 .../billing/app/views/subscriptions/new.html.erb   | 35 ++++++++++++++++++++++
 .../billing/app/views/subscriptions/new.html.haml  | 15 ----------
 3 files changed, 48 insertions(+), 15 deletions(-)
 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/subscriptions')

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 @@
+<p>Please enter your personal info:</p>
+<div class="mb1">
+  <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %>
+</div>
+<div class="mb1">
+  <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %>
+</div>
+<div class="mb1">
+  <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %>
+</div>
+<div class="mb1">
+  <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %>
+</div>
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 @@
+<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
+<h2 class="mbs">Subscriptions</h2>
+<br>
+<%= form_tag subscriptions_path, id: "checkout-form" do %>
+  <% if current_user and !current_user.has_payment_info? %>
+    <%= render 'customer_form' unless @anonymous_user%>
+  <% end %>
+<br>
+<p>Choose subcription:</p>
+<ul>
+  <% @subscriptions.each do |subscription| %>
+  <li>
+    <%= subscription.name %>
+    -
+    <%= subscription.price %>
+    <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
+      <input type="hidden" name="plan_id" id="" value="<%= subscription.id%>" />
+      <div id="payment-form-<%= subscription.id%>"></div>
+      <div class="form-actions">
+        <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
+      </div>
+      <script type="text/javascript" charset="utf-8">
+        var clientToken = "<%= @client_token %>";
+        braintree.setup(clientToken, "dropin", {
+          container: "payment-form-<%= subscription.id%>",
+          coinbase: { container: "coinbase-container-id" }
+        });
+      </script>
+    <% end %>
+  </li>
+  <% end %>
+</ul>
+<div id="payment-form"></div>
+<div id='coinbase-container-id'></div>
+<% 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 <soficeli0@gmail.com>
Date: Tue, 22 Sep 2015 10:48:14 -0500
Subject: subscriptions, translation

---
 .../billing/app/views/subscriptions/new.html.erb   | 52 +++++++++++++---------
 .../app/views/subscriptions/new12.html.haml        | 27 +++++++++++
 2 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 engines/billing/app/views/subscriptions/new12.html.haml

(limited to 'engines/billing/app/views/subscriptions')

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 @@
 <br>
 <%= 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 %>
 <br>
 <p>Choose subcription:</p>
-<ul>
-  <% @subscriptions.each do |subscription| %>
-  <li>
-    <%= subscription.name %>
-    -
-    <%= subscription.price %>
-    <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
-      <input type="hidden" name="plan_id" id="" value="<%= subscription.id%>" />
-      <div id="payment-form-<%= subscription.id%>"></div>
-      <div class="form-actions">
-        <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
+<br>
+<ul class="nav nav-tabs nav-stacked">
+   <% @subscriptions.each do |subscription| %>
+     <li>
+      <div class="btn-group">
+        <button class="btn"> <%= subscription.name %>
+          <%= subscription.price %> </button>
       </div>
-      <script type="text/javascript" charset="utf-8">
-        var clientToken = "<%= @client_token %>";
-        braintree.setup(clientToken, "dropin", {
-          container: "payment-form-<%= subscription.id%>",
-          coinbase: { container: "coinbase-container-id" }
-        });
-      </script>
-    <% end %>
-  </li>
+      <br>
+      <br>
+      <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
+        <input type="hidden" name="plan_id" id="" value="<%= subscription.id%>" />
+        <div id="payment-form-<%= subscription.id%>"></div>
+        <div class="form-actions">
+         <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
+        </div>
+        <script type="text/javascript" charset="utf-8">
+          var clientToken = "<%= @client_token %>";
+          braintree.setup(clientToken, "dropin", {
+            container: "payment-form-<%= subscription.id%>",
+            coinbase: { container: "coinbase-container-id" }
+          });
+        </script>
+      <% end %>
+      </li>
   <% end %>
 </ul>
 <div id="payment-form"></div>
 <div id='coinbase-container-id'></div>
 <% 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 <soficeli0@gmail.com>
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/subscriptions')

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 @@
+<h2 class="mbs">Subscriptions</h2>
+<br>
+<br>
+<p>Choose subcription:</p>
+<br>
+<ul class="nav nav-tabs nav-stacked">
+   <% @subscriptions.each do |subscription| %>
+     <li>
+      <div class="btn-group">
+        <button class="btn"> <%= subscription.name %>
+          <%= subscription.price %> </button>
+      </div>
+      <div>
+        <%=link_to "Checkout", :show_subscription, class: "button" %>
+    </div>
+      </li>
+    <% end %>
+</ul>
+
+
+
+
+
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 @@
-<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
-<h2 class="mbs">Subscriptions</h2>
-<br>
-<%= form_tag subscriptions_path, id: "checkout-form" do %>
-  <% if current_user and !current_user.has_payment_info? %>
-     <%= render 'customer_form' %>
-   <% end %>
-<br>
-<p>Choose subcription:</p>
-<br>
-<ul class="nav nav-tabs nav-stacked">
-   <% @subscriptions.each do |subscription| %>
-     <li>
-      <div class="btn-group">
-        <button class="btn"> <%= subscription.name %>
-          <%= subscription.price %> </button>
-      </div>
-      <br>
-      <br>
-      <%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
-        <input type="hidden" name="plan_id" id="" value="<%= subscription.id%>" />
-        <div id="payment-form-<%= subscription.id%>"></div>
-        <div class="form-actions">
-         <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
-        </div>
-        <script type="text/javascript" charset="utf-8">
-          var clientToken = "<%= @client_token %>";
-          braintree.setup(clientToken, "dropin", {
-            container: "payment-form-<%= subscription.id%>",
-            coinbase: { container: "coinbase-container-id" }
-          });
-        </script>
-      <% end %>
-      </li>
-  <% end %>
-</ul>
-<div id="payment-form"></div>
-<div id='coinbase-container-id'></div>
-<% 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 <soficeli0@gmail.com>
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/subscriptions')

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 @@
 <h2 class="mbs">Subscriptions</h2>
 <br>
 <br>
-<p>Choose subcription:</p>
-<br>
-<ul class="nav nav-tabs nav-stacked">
-   <% @subscriptions.each do |subscription| %>
-     <li>
-      <div class="btn-group">
-        <button class="btn"> <%= subscription.name %>
-          <%= subscription.price %> </button>
-      </div>
-      <div>
-        <%=link_to "Checkout", :show_subscription, class: "button" %>
-    </div>
-      </li>
+<div id="last"> Lastest Subscriptions:
+  <% if params[:search] == "active" %>
+    <%= render :partial => "subscriptions/subscription_details" %>
+    <%# Add destroy, route %>
+    <%=link_to "Unsubscribe", :show_subscription, class: "button" %>
+  </div>
+  <br>
+  <% else %>
+    <p> No subscriptions </p>
+    <p>Choose subcription:</p>
+    <br>
+    <ul class="nav nav-tabs nav-stacked">
+      <% @subscriptions.each do |subscription| %>
+        <li>
+        <div class="btn-group">
+          <button class="btn"> <%= subscription.name %>
+            <%= subscription.price %> </button>
+        </div>
+        <div>
+          <%=link_to "Subscribe", :show_subscription, class: "button" %>
+        </div> <br>
+        </li>
+      <% end %>
     <% end %>
 </ul>
 
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 @@
+<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
+<h2 class="mbs">New Subscription
+</h2>
+<br/>
+<%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
+  <input name="plan_id" type="hidden" value="<%= subscription.id %>"></input>
+  <% if current_user and !current_user.has_payment_info? %>
+    <%= render 'customer_form'%>
+  <% end %>
+  <br/>
+  <p> Please enter payment details: </p>
+  <div id="payment-form-<%= subscription.id %>"></div>
+  <div class="form-actions">
+    <%= f.submit t(:choose), :class => 'btn btn-primary' %>
+  </div>
+  <script charset="utf-8" type="text/javascript">
+    var clientToken = "<%= @client_token %>";
+    braintree.setup(clientToken, "dropin", {
+      container: "payment-form-#{subscription.id}",
+      coinbase: { container: "coinbase-container-id" }
+      });
+    </script>
+  <% end %>
+<div id="payment-form"></div>
+<div id="coinbase-container-id"></div>
+
-- 
cgit v1.2.3


From b26d10fe7d87b570bd888fa2a2543f3675278f8b Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Fri, 25 Sep 2015 00:04:19 -0500
Subject: add subscriptions

---
 .../billing/app/views/subscriptions/index.html.erb | 38 ++++++++++++----------
 .../billing/app/views/subscriptions/show.html.erb  | 16 ++++-----
 2 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'engines/billing/app/views/subscriptions')

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 @@
 <h2 class="mbs">Subscriptions</h2>
 <br>
-<br>
-<div id="last"> Lastest Subscriptions:
-  <% if params[:search] == "active" %>
-    <%= render :partial => "subscriptions/subscription_details" %>
-    <%# Add destroy, route %>
-    <%=link_to "Unsubscribe", :show_subscription, class: "button" %>
-  </div>
+<h4><div id="last"> Lastest Subscriptions:</h4>
+  <% if @user.subscription_id %>
+  <ul>
+    <% @subscription.transactions.each do |transaction| %>
+      <li>
+        Date: <%= transaction.created_at %>
+        </li>
+    <% end %>
+  </ul>
+  <ul>
+    <%= link_to "Unsubscribe from #{@plan.name}", unsubscribe_subscription_path(@subscription.plan_id), method: :delete, class: "btn btn-danger" %>
+  </ul>
+</div>
   <br>
   <% else %>
-    <p> No subscriptions </p>
-    <p>Choose subcription:</p>
+    <p> No subscriptions. </p>
+    <br>
+    <h4>Choose subcription:</h4>
     <br>
     <ul class="nav nav-tabs nav-stacked">
       <% @subscriptions.each do |subscription| %>
         <li>
-        <div class="btn-group">
-          <button class="btn"> <%= subscription.name %>
-            <%= subscription.price %> </button>
+        <div class="well">
+           <%= subscription.name %>
+           <%= subscription.price %>
         </div>
         <div>
-          <%=link_to "Subscribe", :show_subscription, class: "button" %>
+          <%= link_to "Choose", subscription_path(subscription.id), class: "btn btn-info" %>
         </div> <br>
         </li>
       <% end %>
     <% end %>
 </ul>
-
-
-
-
-
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 @@
 <script src="https://js.braintreegateway.com/v2/braintree.js"></script>
 <h2 class="mbs">New Subscription
 </h2>
-<br/>
-<%= simple_form_for :subscription, :url => :subscriptions, :id => "checkout-form-#{subscription.id}" do |f| %>
-  <input name="plan_id" type="hidden" value="<%= subscription.id %>"></input>
+<%= 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 %>
   <br/>
   <p> Please enter payment details: </p>
-  <div id="payment-form-<%= subscription.id %>"></div>
+  <div id="payment-form"></div>
+  <div id="coinbase-container-id"></div>
   <div class="form-actions">
-    <%= f.submit t(:choose), :class => 'btn btn-primary' %>
+    <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
   </div>
   <script charset="utf-8" type="text/javascript">
     var clientToken = "<%= @client_token %>";
     braintree.setup(clientToken, "dropin", {
-      container: "payment-form-#{subscription.id}",
+      container: "payment-form",
       coinbase: { container: "coinbase-container-id" }
       });
     </script>
-  <% end %>
-<div id="payment-form"></div>
-<div id="coinbase-container-id"></div>
-
+<% end %>
-- 
cgit v1.2.3


From 6c4f02fd2d530c28899561fac40ca76075975dc8 Mon Sep 17 00:00:00 2001
From: claucece <soficeli0@gmail.com>
Date: Sun, 27 Sep 2015 23:04:55 -0500
Subject: update to haml, created translations, deleted files

---
 .../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 -----
 12 files changed, 60 insertions(+), 129 deletions(-)
 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/subscriptions')

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 @@
-<p>Please enter your personal info:</p>
-<div class="mb1">
-  <%= text_field_tag :first_name, "",placeholder: "First Name", class: "radius" %>
-</div>
-<div class="mb1">
-  <%= text_field_tag :last_name, "",placeholder: "Last Name", class: "radius" %>
-</div>
-<div class="mb1">
-  <%= text_field_tag :company, "",placeholder: "Company", class: "radius" %>
-</div>
-<div class="mb1">
-  <%= text_field_tag :phone, "",placeholder: "Phone", class: "radius" %>
-</div>
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 @@
-<h2 class="mbs">Subscriptions</h2>
-<br>
-<h4><div id="last"> Lastest Subscriptions:</h4>
-  <% if @user.subscription_id %>
-  <ul>
-    <% @subscription.transactions.each do |transaction| %>
-      <li>
-        Date: <%= transaction.created_at %>
-        </li>
-    <% end %>
-  </ul>
-  <ul>
-    <%= link_to "Unsubscribe from #{@plan.name}", unsubscribe_subscription_path(@subscription.plan_id), method: :delete, class: "btn btn-danger" %>
-  </ul>
-</div>
-  <br>
-  <% else %>
-    <p> No subscriptions. </p>
-    <br>
-    <h4>Choose subcription:</h4>
-    <br>
-    <ul class="nav nav-tabs nav-stacked">
-      <% @subscriptions.each do |subscription| %>
-        <li>
-        <div class="well">
-           <%= subscription.name %>
-           <%= subscription.price %>
-        </div>
-        <div>
-          <%= link_to "Choose", subscription_path(subscription.id), class: "btn btn-info" %>
-        </div> <br>
-        </li>
-      <% end %>
-    <% end %>
-</ul>
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 @@
-<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
-<h2 class="mbs">New Subscription
-</h2>
-<%= 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 %>
-  <br/>
-  <p> Please enter payment details: </p>
-  <div id="payment-form"></div>
-  <div id="coinbase-container-id"></div>
-  <div class="form-actions">
-    <%= f.submit t(:subscribe), :class => 'btn btn-primary' %>
-  </div>
-  <script charset="utf-8" type="text/javascript">
-    var clientToken = "<%= @client_token %>";
-    braintree.setup(clientToken, "dropin", {
-      container: "payment-form",
-      coinbase: { container: "coinbase-container-id" }
-      });
-    </script>
-<% 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