mirror of
https://github.com/OpenBankProject/API-Manager.git
synced 2026-02-06 15:46:44 +00:00
Merge branches
This commit is contained in:
Reena-cell
parent
3268eb621c
commit
28604a3a9b
@ -1,223 +1,162 @@
|
||||
{% extends 'base.html' %} {% load static %} {% load i18n %}
|
||||
{% block page_title %}{{ block.super }} / Atms{% endblock page_title %} {% block content %}
|
||||
{% extends 'base.html' %} {% load static %} {% load i18n %} {% block page_title %}{{ block.super }} / Account{% endblock page_title %} {% block content %}
|
||||
<div id="atms">
|
||||
<h1>{% trans "ATM Detail" %}</h1>
|
||||
<h2>{{ bank_id }} : {{ atm_id }}</h2>
|
||||
<h1>{% trans "Account Create" %}</h1>
|
||||
|
||||
<form method="post">
|
||||
{% csrf_token %} {% if form.non_field_errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.non_field_errors }}
|
||||
</div>
|
||||
<div class="alert alert-danger">{{ form.non_field_errors }}</div>
|
||||
{% endif %}
|
||||
<div class="row" style="display: None">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.account_id.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_id.label_tag }} {{ form.account_id }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.user_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.user_id.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.user_id.label_tag }} {{ form.user_id }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.label.errors %}
|
||||
<div class="alert alert-danger">{{ form.label.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.label.label_tag }} {{ form.label }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.product_code.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.product_code.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.product_code.label_tag }} {{ form.product_code }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.balance_currency.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.balance_currency.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.balance_currency.label_tag }} {{ form.balance_currency }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.balance_amount.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.balance_amount.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.balance_amount.label_tag }} {{ form.balance_amount }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.branch_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.branch_id.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.branch_id.label_tag }} {{ form.branch_id }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_routings_scheme.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.account_routings_scheme.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_routings_scheme.label_tag }} {{ form.account_routings_scheme }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_routings_address.errors %}
|
||||
<div class="alert alert-danger">{{ form.account_routings_address.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_routings_address.label_tag }} {{ form.account_routings_address }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_attributes_product_code.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.account_attributes_product_code.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_attributes_product_code.label_tag }} {{ form.account_attributes_product_code }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_attributes_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.account_attributes_id.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_attributes_id.label_tag }} {{ form.account_attributes_id }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.account_attributes_name.errors %}
|
||||
<div class="alert alert-danger">{{ form.account_attributes_name.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.account_attributes_name.label_tag }} {{ form.account_attributes_name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.bank_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.bank_id.errors }}</div>{% endif %}
|
||||
<div class="alert alert-danger">{{ form.bank_id.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.bank_id.label_tag }} {{ form.bank_id }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.atm_id.errors %}
|
||||
<div class="alert alert-danger">{{ form.atm_id.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.atm_id.label_tag }} {{ form.atm_id }}
|
||||
{% if form.account_attributes_value.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.account_attributes_value.errors }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.name.errors %}
|
||||
<div class="alert alert-danger">{{ form.name.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.name.label_tag }} {{ form.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.services.errors %}
|
||||
<div class="alert alert-danger">{{ form.services.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.services.label_tag }} {{ form.services }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.location_latitude.errors %}
|
||||
<div class="alert alert-danger">{{ form.location_latitude.errors }}
|
||||
</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.location_latitude.label_tag }} {{ form.location_latitude }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.location_longitude.errors %}
|
||||
<div class="alert alert-danger">{{ form.location_longitude.errors }}
|
||||
</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.location_longitude.label_tag }} {{ form.location_longitude }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.meta_license_name.errors %}
|
||||
<div class="alert alert-danger">{{ form.meta_license_name.errors }}
|
||||
</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.meta_license_name.label_tag }} {{ form.meta_license_name }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.located_at.errors %}
|
||||
<div class="alert alert-danger">{{ form.located_at.errors }}
|
||||
</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.located_at.label_tag }} {{ form.located_at }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.has_deposit_capability.errors %}
|
||||
<div class="alert alert-danger">{{ form.has_deposit_capability.errors }}
|
||||
</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.has_deposit_capability.label_tag }} {{ form.has_deposit_capability }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.is_accessible.errors %}
|
||||
<div class="alert alert-danger">{{ form.is_accessible.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.is_accessible.label_tag }} {{ form.is_accessible }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.accessibility_features.errors %}
|
||||
<div class="alert alert-danger">{{ form.accessibility_features.errors }}</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.accessibility_features.label_tag }} {{ form.accessibility_features }}
|
||||
{{ form.account_attributes_value.label_tag }} {{ form.account_attributes_value }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.more_info.errors %}
|
||||
<div class="alert alert-danger">{{ form.more_info.errors }}</div>{% endif %}
|
||||
{% if form.account_attributes_instance_code.errors %}
|
||||
<div class="alert alert-danger">
|
||||
{{ form.account_attributes_instance_code.errors }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.more_info.label_tag }} {{ form.more_info }}
|
||||
{{ form.account_attributes_instance_code.label_tag }} {{ form.account_attributes_instance_code }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.notes.errors %}
|
||||
<div class="alert alert-danger">{{ form.notes.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.notes.label_tag }} {{ form.notes }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.supported_languages.errors %}
|
||||
<div class="alert alert-danger">{{ form.supported_languages.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.supported_languages.label_tag }} {{ form.supported_languages }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.supported_currencies.errors %}
|
||||
<div class="alert alert-danger">{{ form.supported_currencies.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.supported_currencies.label_tag }} {{ form.supported_currencies }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.location_categories.errors %}
|
||||
<div class="alert alert-danger">{{ form.location_categories.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.location_categories.label_tag }} {{ form.location_categories }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.minimum_withdrawal.errors %}
|
||||
<div class="alert alert-danger">{{ form.minimum_withdrawal.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.minimum_withdrawal.label_tag }} {{ form.minimum_withdrawal }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.site_name.errors %}
|
||||
<div class="alert alert-danger">{{ form.site_name.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.site_name.label_tag }} {{ form.site_name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.branch_identification.errors %}
|
||||
<div class="alert alert-danger">{{ form.branch_identification.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.branch_identification.label_tag }} {{ form.branch_identification }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.site_identification.errors %}
|
||||
<div class="alert alert-danger">{{ form.site_identification.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.site_identification.label_tag }} {{ form.site_identification }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.cash_withdrawal_national_fee.errors %}
|
||||
<div class="alert alert-danger">{{ form.cash_withdrawal_national_fee.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.cash_withdrawal_national_fee.label_tag }} {{ form.cash_withdrawal_national_fee }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.balance_inquiry_fee.errors %}
|
||||
<div class="alert alert-danger">{{ form.balance_inquiry_fee.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.balance_inquiry_fee.label_tag }} {{ form.balance_inquiry_fee }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.cash_withdrawal_international_fee.errors %}
|
||||
<div class="alert alert-danger">{{ form.cash_withdrawal_international_fee.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.cash_withdrawal_international_fee.label_tag }} {{ form.cash_withdrawal_international_fee }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.address.errors %}
|
||||
<div class="alert alert-danger">{{ form.address.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.address.label_tag }} {{ form.address }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-4">
|
||||
{% if form.lobby.errors %}
|
||||
<div class="alert alert-danger">{{ form.lobby.errors }}</div>{% endif %}
|
||||
<div class="form-group">
|
||||
{{ form.lobby.label_tag }} {{ form.lobby }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="submit" value="Update" class="btn btn-primary" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
{% endblock content %} {% block extrajs %} {% comment %}
|
||||
<script type="text/javascript" src="{% static 'atms/js/atms.js' %}"></script>
|
||||
<script type="text/javascript">
|
||||
</script>
|
||||
<script type="text/javascript" src="{% static 'accounts/js/accounts.js' %}"></script>
|
||||
{% endcomment %} {% endblock extrajs %} {% block extracss %}
|
||||
<link href="{% static 'atms/css/atms.css' %}" rel="stylesheet"> {% endblock extracss %}
|
||||
<link href="{% static 'accounts/css/accounts.css' %}" rel="stylesheet"> {% endblock extracss %}
|
||||
|
||||
|
||||
@ -4,15 +4,13 @@ URLs for metrics app
|
||||
"""
|
||||
|
||||
from django.conf.urls import url
|
||||
from .views import IndexAccountsView
|
||||
#UpdateAccountsView
|
||||
from .views import IndexAccountsView, UpdateAccountsView
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^create',
|
||||
IndexAccountsView.as_view(),
|
||||
name='accounts-create'),
|
||||
|
||||
url(r'^update/(?P<account_id>[ 0-9\w|\W\@\.\+-]+)/bank/(?P<bank_id>[0-9\w\@\.\+-]+)/$',
|
||||
UpdateAccountsView.as_view(),
|
||||
name='accounts_update'),
|
||||
]
|
||||
"""url(r'^update/(?P<account_id>[ 0-9\w|\W\@\.\+-]+)/bank/(?P<bank_id>[0-9\w\@\.\+-]+)/$',
|
||||
UpdateAccountsView.as_view(),
|
||||
name='accounts_update'),"""
|
||||
@ -70,9 +70,9 @@ class IndexAccountsView(LoginRequiredMixin, FormView):
|
||||
messages.success(self.request, msg)
|
||||
return super(IndexAccountsView, self).form_valid(form)
|
||||
|
||||
"""class UpdateAccountsView(LoginRequiredMixin, FormView):
|
||||
class UpdateAccountsView(LoginRequiredMixin, FormView):
|
||||
template_name = "accounts/update.html"
|
||||
success_url = '/atms/list'
|
||||
success_url = '/accounts/list'
|
||||
form_class = CreateAccountForm
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
@ -239,4 +239,4 @@ class IndexAccountsView(LoginRequiredMixin, FormView):
|
||||
'bank_id': self.bank_id
|
||||
})
|
||||
return context
|
||||
"""
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ from django.urls import reverse_lazy
|
||||
from django.http import HttpResponse
|
||||
from django.views.generic import FormView,TemplateView, View
|
||||
from atms.views import IndexAtmsView
|
||||
from base.views import get_banks
|
||||
from obp.api import API, APIError
|
||||
import csv
|
||||
|
||||
@ -21,7 +22,7 @@ import csv
|
||||
class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
|
||||
template_name = "atmlist/atmlist.html"
|
||||
success_url = '/atms/list'
|
||||
def get_banks(self):
|
||||
"""def get_banks(self):
|
||||
api = API(self.request.session.get('obp'))
|
||||
try:
|
||||
urlpath = '/banks'
|
||||
@ -32,12 +33,12 @@ class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
|
||||
return []
|
||||
except APIError as err:
|
||||
messages.error(self.request, err)
|
||||
return []
|
||||
return []"""
|
||||
|
||||
def get_atms(self, context):
|
||||
def get_atms(self,context):
|
||||
api = API(self.request.session.get('obp'))
|
||||
try:
|
||||
self.bankids = self.get_banks()
|
||||
self.bankids = get_banks(self.request)
|
||||
atms_list = []
|
||||
for bank_id in self.bankids:
|
||||
urlpath = '/banks/{}/atms'.format(bank_id)
|
||||
@ -58,7 +59,7 @@ class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
|
||||
atms_list = self.get_atms(context)
|
||||
context.update({
|
||||
'atms_list': atms_list,
|
||||
'bankids': self.bankids
|
||||
'bankids': get_banks(self.request)
|
||||
})
|
||||
return context
|
||||
class ExportCsvView(LoginRequiredMixin, View):
|
||||
|
||||
@ -7,6 +7,20 @@ from django.conf import settings
|
||||
from django.views.generic import TemplateView
|
||||
from django.shortcuts import render
|
||||
from obp.forms import DirectLoginForm, GatewayLoginForm
|
||||
from obp.api import API, APIError
|
||||
|
||||
def get_banks(request):
|
||||
api = API(request.session.get('obp'))
|
||||
try:
|
||||
urlpath = '/banks'
|
||||
result = api.get(urlpath)
|
||||
if 'banks' in result:
|
||||
return [bank['id'] for bank in sorted(result['banks'], key=lambda d: d['id'])]
|
||||
else:
|
||||
return []
|
||||
except APIError as err:
|
||||
messages.error(self.request, err)
|
||||
return []
|
||||
|
||||
class HomeView(TemplateView):
|
||||
"""View for home page"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user