From 9f95edf203e5fda1ee4fd6acb089f5c6f0a5e884 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Thu, 30 Jan 2020 00:29:00 +0700
Subject: [PATCH] Move billing button to setting page

---
 app/dashboard/templates/dashboard/setting.html | 14 +++++++++++++-
 templates/header.html                          |  6 +-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 49d6d37d..0fa8eb92 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -8,7 +8,7 @@
 
 {% block default_content %}
 
-  <div class="col-md-8 offset-md-2">
+  <div class="col-md-8 offset-md-2 pb-3">
     <form method="post" enctype="multipart/form-data">
       {{ form.csrf_token }}
       <input type="hidden" name="form-name" value="update-profile">
@@ -103,6 +103,18 @@
         <button type="submit" class="btn btn-outline-primary">Submit</button>
       </form>
 
+
+    {% if current_user.get_subscription() %}
+      <hr>
+      <h3 class="mb-0">Billing</h3>
+      <div class="small-text mb-3">
+        Manage your current subscription.
+      </div>
+      <a href="{{ url_for('dashboard.billing') }}" class="btn btn-outline-primary">
+        Manage Billing
+      </a>
+    {% endif %}
+
     <hr>
     <h3 class="mb-0">Export Data</h3>
     <div class="small-text mb-3">
diff --git a/templates/header.html b/templates/header.html
index f9bc896a..8e246774 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -32,11 +32,7 @@
           </a>
 
           <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-            {% if current_user.get_subscription() %}
-              <a class="dropdown-item" href="{{ url_for('dashboard.billing') }}">
-                <i class="dropdown-icon fe fe-dollar-sign"></i> Billing
-              </a>
-            {% endif %}
+
 
             <a class="dropdown-item" href="{{ url_for('auth.logout') }}">
               <i class="dropdown-icon fe fe-log-out"></i> Sign out