harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

DRY, have a single "No billing address" modal dialog.

Browse Source
This commit is contained in:
Pēteris Caune 2020-05-29 15:33:33 +03:00
parent 95279f6f3f
commit cfb294862f
No known key found for this signature in database
GPG Key ID: E28D7679E9A9EDE2
3 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/css/billing.css
View File

@ -39,11 +39,6 @@
#payment-method-modal .modal-header { #payment-method-modal .modal-header {
border-bottom: 0; border-bottom: 0;
padding: 30px 30px 0 30px;
}
#payment-method-modal .modal-body {
padding: 15px 30px;
} }
#payment-method-modal .modal-footer { #payment-method-modal .modal-footer {

5
static/js/billing.js
View File

@ -76,6 +76,11 @@ $(function () {
}); });
$("#update-payment-method").click(function() { $("#update-payment-method").click(function() {
if ($("#no-billing-address-modal").length) {
$("#no-billing-address-modal").modal("show");
return;
}
showPaymentMethodForm($("#old-plan-id").val()); showPaymentMethodForm($("#old-plan-id").val());
}); });

45
templates/accounts/billing.html
View File

@ -66,7 +66,11 @@
<button <button
data-toggle="modal" data-toggle="modal"
{% if sub.address_id %}
data-target="#change-billing-plan-modal" data-target="#change-billing-plan-modal"
{% else %}
data-target="#no-billing-address-modal"
{% endif %}
class="btn btn-default pull-right"> class="btn btn-default pull-right">
Change Billing Plan Change Billing Plan
</button> </button>
@ -88,7 +92,8 @@
<button <button
id="update-payment-method" id="update-payment-method"
class="btn btn-default pull-right"> class="btn btn-default pull-right">
Change Payment Method</button> Change Payment Method
</button>
</div> </div>
{% if payment_method_status == "success" %} {% if payment_method_status == "success" %}
<div class="panel-footer"> <div class="panel-footer">
@ -168,9 +173,9 @@
</div> </div>
</div> </div>
{% if sub.address_id %}
<div id="change-billing-plan-modal" class="modal"> <div id="change-billing-plan-modal" class="modal">
<div class="modal-dialog"> <div class="modal-dialog">
{% if sub.address_id %}
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
@ -284,35 +289,13 @@
</button> </button>
</div> </div>
</div> </div>
{% else %}
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4>Country not specified.</h4>
</div>
<div class="modal-body">
<p>For tax accounting purposes, please specify
your <strong>Country</strong> in the "Billing Details"
section.
</p>
<p>
Optionally, add your
<strong>company name</strong>, <strong>address</strong>
and <strong>VAT ID</strong>
to have them displayed on invoices.
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
</div>
</div>
{% endif %}
</div> </div>
</div> </div>
{% endif %}
{% if sub.address_id %}
<div id="payment-method-modal" class="modal pm-modal"> <div id="payment-method-modal" class="modal pm-modal">
<div class="modal-dialog"> <div class="modal-dialog">
{% if sub.address_id %}
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
@ -330,7 +313,13 @@
</button> </button>
</div> </div>
</div> </div>
{% else %} </div>
</div>
{% endif %}
{% if not sub.address_id %}
<div id="no-billing-address-modal" class="modal">
<div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
@ -352,9 +341,9 @@
<button type="button" class="btn btn-default" data-dismiss="modal">OK</button> <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
</div> </div>
</div> </div>
{% endif %}
</div> </div>
</div> </div>
{% endif %}
<div id="billing-address-modal" class="modal"> <div id="billing-address-modal" class="modal">
<div class="modal-dialog"> <div class="modal-dialog">