Skip to content
This repository has been archived by the owner on Sep 26, 2018. It is now read-only.

Network balance limit (Client dependent) #38

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Network balance limit (Client dependent) #38

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e88b74
Credit limit setting
shivkumarsah Jun 2, 2017
847fc80
Denomination
shivkumarsah Jun 2, 2017
1e5832b
refactored code
piyushabad88 Jun 8, 2017
75f24ad
removed print statement
piyushabad88 Jun 8, 2017
f32fa02
updated test case and error print statement
piyushabad88 Jun 13, 2017
07e0730
review comments incorporated to display text description for max bala…
piyushabad88 Jun 29, 2017
d745522
resolved conflicts
piyushabad88 Jun 29, 2017
8c1a4e8
Merge branch 'master' of https://github.com/facebookincubator/Communi…
piyushabad88 Jul 21, 2017
3c1352c
updated with master and comments incorporated as per linter
piyushabad88 Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cloud/endagaweb/forms/dashboard_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,3 +368,38 @@ def __init__(self, *args, **kwargs):
self.helper.form_action = '/dashboard/staff/tower-monitoring'
self.helper.add_input(Submit('submit', 'Select'))
self.helper.layout = Layout('tower')

class NetworkBalanceLimit(forms.Form):

"""Crispy form to set Network balance limit and transaction.
set min_value =0.01 so that it will not accept 0 value"""

max_balance = forms.CharField(required=False, label="Maximum Balance Limit",
max_length=10)
max_unsuccessful_transaction = forms.CharField(required=False, max_length=3,
label='Maximum Permissible Unsuccessful '
'Transactions')

def __init__(self, *args, **kwargs):
super(NetworkBalanceLimit, self).__init__(*args, **kwargs)
self.helper = FormHelper()
self.helper.form_id = 'id-NetworkBalanceLimitForm'
self.helper.form_method = 'post'
self.helper.form_action = '/dashboard/network/balance-limit'
self.helper.form_class = 'col-xs-12 col-sm-8 col-md-12 col-xl-8'
self.helper.add_input(Submit('submit', 'Save'))
self.helper.layout = Layout('max_balance', 'max_unsuccessful_transaction')

def clean_network_balance(self):
cleaned_data = super(NetworkBalanceLimit, self).clean()
max_balance = self.cleaned_data.get('max_balance', None)
max_unsuccessful_transaction = self.cleaned_data.\
get('max_unsuccessful_transaction', None)
if max_balance == "" and max_unsuccessful_transaction == "":
raise forms.ValidationError('Error : please provide value.')
if max_unsuccessful_transaction == "" and float(max_balance) <= 0:
raise forms.ValidationError('Error : enter positive and non-zero value ' \
'for maximum balance Limit.')

return cleaned_data

23 changes: 23 additions & 0 deletions cloud/endagaweb/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,9 @@ class Network(models.Model):
# Network environments let you specify things like "prod", "test", "dev",
# etc so they can be filtered out of alerts. For internal use.
environment = models.TextField(default="default")
# Added for Network Balance Limit
max_balance = models.BigIntegerField(default=10000)
max_failure_transaction = models.PositiveIntegerField(blank=True, default=3)

class Meta:
permissions = (
Expand Down Expand Up @@ -1460,6 +1463,26 @@ def create_ledger(sender, instance, created, **kwargs):
post_save.connect(Network.create_billing_tiers, sender=Network)


class NetworkDenomination(models.Model):
"""Network has its own denomination bracket for rechange and validity

Subscriber status depends on recharge under denomination bracket
"""
start_amount = models.BigIntegerField()
end_amount = models.BigIntegerField()
validity_days = models.PositiveIntegerField(blank=True, default=0)

# The denomination group associated with the network
network = models.ForeignKey('Network', null=True, on_delete=models.CASCADE)

def __unicode__(self):
return "Amount %s - %d for %s(days)" % (
self.start_amount, self.end_amount, self.validity_days)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: humanize_credits on this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit # 1367cfd
Its part of PR #39

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please dont open new PRs for fixes to existing PRs its difficult to keep track of changes this way


class Meta:
ordering = ('start_amount',)


class ConfigurationKey(models.Model):
"""A key->value mapping for storing settings.

Expand Down
305 changes: 305 additions & 0 deletions cloud/endagaweb/templates/dashboard/network_detail/denomination.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,305 @@
{% extends "dashboard/layout.html" %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per our phone call, lets make the denominations a continuous range?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be fixed as part of sprint 5

{% comment %}
Copyright (c) 2016-present, Facebook, Inc.
All rights reserved.

This source code is licensed under the BSD-style license found in the
LICENSE file in the root directory of this source tree. An additional grant
of patent rights can be found in the PATENTS file in the same directory.
{% endcomment %}
{% load apptags %}
{% load humanize %}
{% load crispy_forms_tags %}
{% load render_table from django_tables2 %}


{% block title %}
{% if network.name %}
{% tmpl_const "SITENAME" %} | "{{ network.name }}"
{% else %}
{% tmpl_const "SITENAME" %} | Network
{% endif %}
{% endblock %}

{% block pagestyle %}
<style>

.btn{
margin-left: 5px;
}
.btn:last-child{
margin-left: 0;
}
table tbody tr.highlight td {
background-color: #ddd;
}
</style>
{% endblock %}

{% block content %}
{% include "dashboard/network_detail/header.html" with network=network %}

<div class='row'>
{% include "dashboard/network_detail/nav.html" with active_tab='network-denominations' %}

<div class='content col-xs-12 col-sm-10 col-md-6'>
{% for message in messages %}
<div class="message alert alert-{{ message.tags }}">
<a href="#" class="close" data-dismiss="alert">&times;</a>
{{ message }}
</div>
{% endfor %}
<div class="table-container">
{% if denomination %}
{% render_table denominations_table %}
{% else %}
<p>There are currently no denominations associated with this network.</p>
{% endif %}
</div>
</div>
{% if user_profile.user.is_staff %}
<div class='content col-xs-12 col-sm-10 col-md-4'>
<div class="panel panel-default">
<div class="panel-heading">Create Denomination</div>
<div class="panel-body">
<div class="row-fluid">
<form action="/dashboard/network/denominations" id="network_form" name="network_form" method="POST"
data-toggle="validator" class="form-horizontal">{% csrf_token %}
<div class="form-group row">
<div class="col-md-12">
<label for="start_amount" id="ariaLable" class="col-3 col-form-label">
Start Amount <span class="aseriskField">*</span>
</label>
<div class="input-group col-xs-8">
<input class="form-control number" type="text" id="start_amount" name="start_amount"
placeholder="Enter start amount" maxlength="10" required/>
</div>
</div>
</div>

<div class="form-group row">
<div class="col-md-12">
<label for="end_amount" id="ariaLable" class="col-3 col-form-label">
End Amount <span class="aseriskField">*</span>
</label>
<div class="input-group col-xs-8">
<input class="form-control number" type="text" id="end_amount" name="end_amount"
placeholder="Enter end amount" maxlength="10" required/>
</div>
</div>
</div>

<div class="form-group row">
<div class="col-md-12">
<label for="start_amount" id="ariaLable" class="col-3 col-form-label">
Validity (days)<span class="aseriskField">*</span>
</label>
<div class="input-group col-xs-8">
<input class="form-control" type="text" id="validity_days" name="validity_days"
placeholder="Enter validity as number of days" required/>
</div>
</div>
</div>

<div class="form-group row">
<div class="col-md-12">
<div class="input-group col-xs-8">
<input type="hidden" id="dnm_id" name="dnm_id" value="0" />
<input type="submit" id="submit" class="btn btn-primary pull-right" value="Create"/>
<input type="button" id="cancel" class="btn btn-primary pull-right" value="Cancel" style="display: none;"/>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
{% endif %}

</div>

<div class='modal fade' id='delete-denom-modal'>
<div class='modal-dialog'>
<div class='modal-content'>
<div class='modal-header'>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class='modal-title'>
Confirmation
</h4>
</div>
<div class='modal-body'>
<h4>
Are you sure you want to delete "<span id="denom_text"></span>"?
</h4>
</div>
<div class='modal-footer'>
<button type='button' class='btn btn-default' data-dismiss='modal'>Cancel</button>
<button class='btn btn-primary' type='button' id='delete-confirm'>Confirm</button>
<div id='user-messages-container'></div>
</div>
</div>
</div>
</div><!-- /.delete-user-modal -->

{% endblock %}
{% block js %}

<script type="text/javascript"
src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check your jquery version matches the rest of the site. Try to use the same CDN if possible

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit # 1367cfd
Its part of PR #39

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please keep changes local to the PR. This will result in merge conflicts

<script type="text/javascript">
$(document).ready(function () {
$('.number').keypress(function (event) {
var $this = $(this);
if ((event.which != 46 || $this.val().indexOf('.') != -1) &&
((event.which < 48 || event.which > 57) &&
(event.which != 0 && event.which != 8))) {
event.preventDefault();
}

var text = $(this).val();
if(text.length>= 10){
event.preventDefault();
return;
}
if ((event.which == 46) && (text.indexOf('.') == -1)) {
setTimeout(function () {
if ($this.val().substring($this.val().indexOf('.')).length > 3) {
$this.val($this.val().substring(0, $this.val().indexOf('.') + 3));
}
}, 1);
}

if ((text.indexOf('.') != -1) &&
(text.substring(text.indexOf('.')).length > 2) &&
(event.which != 0 && event.which != 8) &&
($(this)[0].selectionStart >= text.length - 2)) {
event.preventDefault();
}
});

$('.number').bind("paste", function (e) {
var text = e.originalEvent.clipboardData.getData('Text');
if ($.isNumeric(text)) {
if ((text.substring(text.indexOf('.')).length > 3) && (text.indexOf('.') > -1)) {
e.preventDefault();
$(this).val(text.substring(0, text.indexOf('.') + 3));
}
}
else {
e.preventDefault();
}
});
$("#validity_days").keydown(function (e) {
// Allow: backspace, delete, tab, escape and enter
if ($.inArray(e.keyCode, [46, 8, 9, 27, 13, 110]) !== -1 ||
// Allow: Ctrl+A, Command+A
(e.keyCode === 65 && (e.ctrlKey === true || e.metaKey === true)) ||
// Allow: home, end, left, right, down, up
(e.keyCode >= 35 && e.keyCode <= 40)) {
// let it happen, don't do anything
return;
}
// Ensure that it is a number and stop the keypress
if ((e.shiftKey || (e.keyCode < 48 || e.keyCode > 57)) && (e.keyCode < 96 || e.keyCode > 105)) {
e.preventDefault();
}
});

$('#network_form').validate({
highlight: function (element) {
$(element).closest('.form-group').addClass('has-error');
},
unhighlight: function (element) {
$(element).closest('.form-group').removeClass('has-error');
},
errorElement: 'span',
errorClass: 'help-block',
errorPlacement: function (error, element) {
if (element.parent('.input-group').length) {
error.insertAfter(element.parent());
} else {
error.insertAfter(element);
}
}
});
$('#cancel').click(function () {
$('#dnm_id').val(0);
$('#start_amount').val('');
$('#end_amount').val('');
$('#validity_days').val('');
$('.panel-heading').html("Create Denomination");
$('#submit').val("Create");
$('#cancel').hide();
$('table tbody tr').removeClass('highlight');
});
$('table tbody tr').on('click', function(event) {
$(this).addClass('highlight').siblings().removeClass('highlight');
});
});

function doAction(action, id) {
$("#dnm_id").val(id);
$.ajax({
url: '/dashboard/network/denominations?id=' + id,
type: 'GET',
success: function (response) {
if(action == 'edit') {
$('#network_form').validate().resetForm();
$(".form-group").removeClass("has-error");

$('#dnm_id').val(response.data.id);
$('#start_amount').val(response.data.start_amount);
$('#end_amount').val(response.data.end_amount);
$('#validity_days').val(response.data.validity_days);
$('.panel-heading').html("Edit Denomination");
$('#submit').val("Update");
$('#cancel').show();
} else {
var denom_text = response.data.start_amount+"-"+response.data.end_amount+" ("+response.data.validity_days+" days)";
$("#denom_text").html(denom_text);
}
}
});
}
$('#delete-confirm').click(function () {
// Show a 'working' message.
var message = 'Working..';
var html = "<div class='alert alert-success'>" + message + "</div>";
$('#user-messages-container').html(html).show();
// Post to the endagaweb API.
$.ajax({
url: '/dashboard/network/denominations?id=' + $("#dnm_id").val(),
type: 'DELETE',
beforeSend: function (xhr) {
xhr.setRequestHeader("X-CSRFToken", '{{ csrf_token }}');
},
success: function (response) {
// Show a success message after a small delay.
// Then, after some more time has passed, redirect back to /subscribers.
setTimeout(function () {
var message = 'Done!, redirecting..';
var html = "<div class='alert alert-success'>" + message + "</div>";
$('#user-messages-container').html(html).show();
}, 1000);
setTimeout(function () {
$('#delete-user-modal').modal('hide');
window.location.href = '/dashboard/network/denominations';
}, 2000);
},
error: function (response) {
// Show an error message after a small delay.
setTimeout(function () {
var message = 'Error: ' + response.status;
var html = "<div class='alert alert-danger'>" + message + "</div>";
$('#user-messages-container').html(html).show();
}, 800);
},
});

});
</script>

{% endblock %}
Loading