Skip to content

Commit

Permalink
fix: remove form filters on templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@tekanokhambane
tekanokhambane committed Apr 29, 2024
1 parent 11fa532 commit 39b802f
Show file tree
Hide file tree
Showing 9 changed files with 436 additions and 557 deletions.
122 changes: 55 additions & 67 deletions multitenancy/billing/templates/multitenancy/billing/credits_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,78 +1,66 @@
{% extends "multitenancy/admin/base.html" %}
{% load static %}

{% block page_title %}Manage Customer Credits{% endblock page_title %}
{%block breadcrumbs%}

<li class="breadcrumb-item " ><a href="{% url 'billing' %}">Billing</a></li>
<li class="breadcrumb-item active">Credits</li>
{% endblock%}


{% block page_title %}
Manage Customer Credits
{% endblock page_title %}
{% block breadcrumbs %}
<li class="breadcrumb-item ">
<a href="{% url 'billing' %}">Billing</a>
</li>
<li class="breadcrumb-item active">Credits</li>
{% endblock %}
{% block main_content %}

<!-- Main content -->
<section class="content">
<div class="container-fluid">
<!-- /.row -->
<div class="row">
<div class="col-md">
<div class="mb-5 mr-3">
<form method="get" id="filter-form" class="input-group input-group-md" style="width: 250px;">
<input type="text" name="q" class="form-control float-right" placeholder="Search by customer id">
<div class="input-group-append">
<button type="submit" disabled id="" class="btn btn-success"><i
class="fas fa-search"></i></button>
</div>
</form>
<!-- Main content -->
<section class="content">
<div class="container-fluid">
<!-- /.row -->
<div class="row">
<div class="col-md">
<div class="mb-5 mr-3"></div>
</div>
</div>

</div>
<div class="row">
<div class="col-12">

<div class="card text-dark">
<div class="card-header">
<h3 class="card-title">Credits</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
<table id="credits-table" class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Id</th>
<th>Customer</th>
<th>Amount</th>
<th>Created Date</th>
<th>Date Upated</th>

</tr>
</thead>
<tbody>

</tbody>
<tfoot>
<tr>
<th>Id</th>
<th>Customer</th>
<th>Amount</th>
<th>Created Date</th>
<th>Date Upated</th>
</tr>
</tfoot>
</table>
<div class="row">
<div class="col-12">
<div class="card text-dark">
<div class="card-header">
<h3 class="card-title">Credits</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
<table id="credits-table"
class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Id</th>
<th>Customer</th>
<th>Amount</th>
<th>Created Date</th>
<th>Date Upated</th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr>
<th>Id</th>
<th>Customer</th>
<th>Amount</th>
<th>Created Date</th>
<th>Date Upated</th>
</tr>
</tfoot>
</table>
</div>
<!-- /.card-body -->
</div>
<!-- /.card-body -->
<!-- /.card -->
</div>
<!-- /.card -->
</div>
</div>
</div><!-- /.container-fluid -->
</section>
<!-- /.content -->
<!-- /.container-fluid -->
</section>
<!-- /.content -->
{% endblock main_content %}

{% block custom_js %}
<script src="{% static "multitenancy/billing/js/credit.js" %}"></script>
{% endblock custom_js %}
<script src="{% static "multitenancy/billing/js/credit.js" %}"></script>
{% endblock custom_js %}
158 changes: 66 additions & 92 deletions multitenancy/billing/templates/multitenancy/billing/invoice_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,105 +1,79 @@
{% extends "multitenancy/admin/base.html" %}
{% load static %}
{% block custom_css %}
<link rel="stylesheet" href="{% static "multitenancy/billing/css/invoice.css" %}">

<link rel="stylesheet" href="{% static "multitenancy/billing/css/invoice.css" %}">
{% endblock custom_css %}
{% block page_title %}Manage Invoices{% endblock page_title %}
{%block breadcrumbs%}

<li class="breadcrumb-item " ><a href="{% url 'billing' %}">Billing</a></li>
<li class="breadcrumb-item active">Invoices</li>
{% endblock%}


{% block page_title %}
Manage Invoices
{% endblock page_title %}
{% block breadcrumbs %}
<li class="breadcrumb-item ">
<a href="{% url 'billing' %}">Billing</a>
</li>
<li class="breadcrumb-item active">Invoices</li>
{% endblock %}
{% block main_content %}

<!-- Main content -->
<section class="content">
<div class="container-fluid">
<!-- /.row -->
<div class="row">
<div class="col-sm-4">
<div class="mb-5 mr-3">
<form method="get" id="filter-form" class="input-group input-group-md" >
<input type="text" name="q" class="form-control float-right" placeholder="Search invoices">
<div class="input-group-append">
<button type="submit" disabled id="" class="btn bg-navy"><i
class="fas fa-search"></i></button>
</div>
</form>
<!-- Main content -->
<section class="content">
<div class="container-fluid">
<!-- /.row -->
<div class="row">
<div class="col-sm-4">
<div class="mb-5 mr-3"></div>
</div>
<div class="col-sm-4"></div>
</div>
<div class="col-sm-4">
<div class="date-range-picker">
<label for="date-range">Timespan:</label>
<select id="date-range">

<option value="90">Last 90 days</option>
<option value="7">Last 7 days</option>
<option value="14">Last 14 days</option>
<option value="30">Last 30 days</option>
<option value="365">Last 365 days</option>
</select>
</div>

</div>
</div>

<div class="row">
<div class="col-12">

<div class="card text-dark">
<div class="card-header">
<h3 class="card-title">Invoices</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
<table id="invoice-table" class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Subscription</th>
<th>Date Created</th>
<th>Due Date</th>
<th>End Date</th>
<th>Invoice Number</th>
<th>Amount</th>
<th>Credit Used</th>
<th>Payment Method</th>
<th>Status</th>
</tr>
</thead>
<tbody>

</tbody>
<tfoot>
<tr>
<th>Subscription</th>
<th>Date Created</th>
<th>Due Date</th>
<th>End Date</th>
<th>Invoice Number</th>
<th>Amount</th>
<th>Credit Used</th>

<th>Payment Method</th>
<th>Status</th>
</tr>
</tfoot>
</table>
<div class="row">
<div class="col-12">
<div class="card text-dark">
<div class="card-header">
<h3 class="card-title">Invoices</h3>
</div>
<!-- /.card-header -->
<div class="card-body">
<table id="invoice-table"
class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Subscription</th>
<th>Date Created</th>
<th>Due Date</th>
<th>End Date</th>
<th>Invoice Number</th>
<th>Amount</th>
<th>Credit Used</th>
<th>Payment Method</th>
<th>Status</th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr>
<th>Subscription</th>
<th>Date Created</th>
<th>Due Date</th>
<th>End Date</th>
<th>Invoice Number</th>
<th>Amount</th>
<th>Credit Used</th>
<th>Payment Method</th>
<th>Status</th>
</tr>
</tfoot>
</table>
</div>
<!-- /.card-body -->
</div>
<!-- /.card-body -->
<!-- /.card -->
</div>
<!-- /.card -->
</div>
</div>
</div><!-- /.container-fluid -->
{% include 'multitenancy/billing/includes/create_invoice_modal.html' %}
</section>
<!-- /.content -->
<!-- /.container-fluid -->
{% include 'multitenancy/billing/includes/create_invoice_modal.html' %}
</section>
<!-- /.content -->
{% endblock main_content %}

{% block custom_js %}

<script src="{% static "multitenancy/billing/js/invoice.js" %}"></script>
{% endblock custom_js %}
<script src="{% static "multitenancy/billing/js/invoice.js" %}"></script>
{% endblock custom_js %}
Loading

0 comments on commit 39b802f

Please sign in to comment.