From 14541107881a78d5aba688e1b76b54acbeace0f3 Mon Sep 17 00:00:00 2001 From: Reena-cell Date: Thu, 20 Oct 2022 23:08:34 +0200 Subject: [PATCH 1/7] remove js code from systemview --- apimanager/base/static/css/base.css | 7 ++++++- .../systemviews/static/systemviews/js/systemviews.js | 5 ----- apimanager/systemviews/templates/systemviews/update.html | 0 apimanager/systemviews/views.py | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 apimanager/systemviews/templates/systemviews/update.html diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css index 7ee084e..b887c71 100644 --- a/apimanager/base/static/css/base.css +++ b/apimanager/base/static/css/base.css @@ -210,6 +210,11 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo .language-select { text-decoration: none; color:#fff; - cursor:pointer; margin-left:5rem; } +#uk { + cursor:pointer; +} +#es { + cursor:pointer; +}1 \ No newline at end of file diff --git a/apimanager/systemviews/static/systemviews/js/systemviews.js b/apimanager/systemviews/static/systemviews/js/systemviews.js index 338fe9e..e69de29 100644 --- a/apimanager/systemviews/static/systemviews/js/systemviews.js +++ b/apimanager/systemviews/static/systemviews/js/systemviews.js @@ -1,5 +0,0 @@ -$(document).ready(function($) { - $('#info').click(function() { - alert("Hello World") - }); -}); diff --git a/apimanager/systemviews/templates/systemviews/update.html b/apimanager/systemviews/templates/systemviews/update.html deleted file mode 100644 index e69de29..0000000 diff --git a/apimanager/systemviews/views.py b/apimanager/systemviews/views.py index 8070546..d247479 100644 --- a/apimanager/systemviews/views.py +++ b/apimanager/systemviews/views.py @@ -14,7 +14,6 @@ from django.http import HttpResponse from django.views.generic import FormView,TemplateView, View from obp.api import API, APIError -import csv class SystemView(LoginRequiredMixin, FormView): template_name = "systemviews/index.html" From 9804b982d951473b1cf7f6d321925f57c93ca4db Mon Sep 17 00:00:00 2001 From: Reena-cell Date: Thu, 20 Oct 2022 23:08:51 +0200 Subject: [PATCH 2/7] remove js code from systemview --- apimanager/base/templates/base.html | 3 +- apimanager/locale/es/LC_MESSAGES/django.mo | Bin 19011 -> 19014 bytes apimanager/locale/es/LC_MESSAGES/django.po | 144 +++++++++++++----- .../templates/systemviews/index.html | 1 - 4 files changed, 111 insertions(+), 37 deletions(-) diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html index 1a745cb..40fe4e9 100644 --- a/apimanager/base/templates/base.html +++ b/apimanager/base/templates/base.html @@ -63,7 +63,8 @@
  • {% trans "Resources" %}
      -
    • {% trans "System View" %}
      • +
    • {% trans "System View" %}
      • +
    • {% trans "Customers" %}
    • {% trans "Customer List" %}
    • {% trans "Branches" %}
      • diff --git a/apimanager/locale/es/LC_MESSAGES/django.mo b/apimanager/locale/es/LC_MESSAGES/django.mo index 7423b4f0fa14d830e88f495b1914c05a779c329a..4ccbebf163957da8d1300909bd05c8d620f2e980 100644 GIT binary patch delta 1082 zcmXZbPe@cz6vy#9nDeKyvYaS0=9M*@j3fj>g_tSFlA@$QA_#_=w-^!!W~>(dc|t+Z zqQzhofMeQ_%Sq0XjXd_s(h}tC4BCzkzIjhe-_uY5ydFS3YKNVV-3RQbr zgQRmVk#epDGuV#ja0?bOhLgAz@8Wu#vH4kSC4Ob|?=VXI9yj7Ai@%}r{X*@tikq+{ z?E)8J(2;g)?!#u{F4V?{%>mTL8Qh5@xEU{@HoS&Pd>cEkf?<4#D*QF7&^m6wFSrZ8 zr-R0z>1e}**^f#viYn+LDp4L2cop?U53mnsQ3;nVUd0{6eaDoU(Yt;!)I>Uogka8>l0@hhcn(d-0LQbEu=Mqt-1WM;f@F40@ROi>mzK zP@|9(s)au4jBlduz#WWW1$76e&F41%236o3szV=8d6%#aS5S8(cHFr*`@19qB^tm8 zp2W4kz~+k>XFjm!_stnpK~K%9`4)9o7Emq!j8Xi7%D;l@#6QXYZu<#4bJQ*F#dSD{ z`b~yWxAwd}_fZMUxF4@$7@wHWa1U`6L%4`~|05p3CDeP~uyeJp`0oSBGo@nA&-*1W iJLZ-B(v?EKSn~3|m%TjUk53eG*<4}1HeO4oLb3n-UWQTt delta 1079 zcmXZbPe@cz6vy#9)Xb>;oopyeaqQ8ef7D_iZBfjOW=cqbSP%pWuY6!4<4n|)yn>)b zi-DLBBnkp+QBvTdb`rv@0&7vU5iD9ntwdS`F8cm_XZ5+~zW2^O_uTvHwb()}_BNXe zJ?C6|&bcjEz&&^#x8o=_;w0|C2iSzuHa~+Y;x{(`0UL-v;%59}@efqKKd5!qa4R_RPEz!n_9Z8(Bj@FptpJ#57)Ch#??@HteWb=-vCa4-JM zhta?lB3sQ)RDwZNL6=a8u3$TsP&=yO37kPCT()=(cM~7)W)pZ0+wd+P!>33S++xT; zm8E*39eb#SkKhK(Vl#H4-aBhvMzwg{;z?8|tEl&5s{aUVXhcpi0hb<}&y$dQKbH-jt_e^Hem?2QUJ ziE806>Wpur?!bLaVik1HAH*_oqmaTYgX9`&2_ zqHgVwJs(CT9LN253lsRve1RRrvlzog)c2q96fU8@YwPFFIGkQR\n" "Language-Team: LANGUAGE \n" @@ -36,6 +36,8 @@ msgstr "Es Compartible" #: apicollections/templates/apicollections/index.html:18 #: consumers/templates/consumers/detail.html:175 #: consumers/templates/consumers/index.html:59 +#: productlist/templates/productlist/productlist.html:27 +#: systemviews/templates/systemviews/index.html:11 msgid "Description" msgstr "Descripción" @@ -58,24 +60,25 @@ msgstr "Creada" msgid "Delete" msgstr "Eliminar" -#: apimanager/settings.py:181 +#: apimanager/settings.py:184 msgid "English" msgstr "Inglés" -#: apimanager/settings.py:182 +#: apimanager/settings.py:185 msgid "French" msgstr "francés" -#: apimanager/settings.py:183 +#: apimanager/settings.py:186 msgid "Spanish" msgstr "español" #: atmlist/templates/atmlist/atmlist.html:2 -#: atmlist/templates/atmlist/atmlist.html:4 base/templates/base.html:70 +#: atmlist/templates/atmlist/atmlist.html:4 base/templates/base.html:71 msgid "ATM List" msgstr "Vista de Cajeros Automáticos" #: atmlist/templates/atmlist/atmlist.html:6 +#: customerlist/templates/customerlist/customerlist.html:6 #: productlist/templates/productlist/productlist.html:6 #: users/templates/users/includes/filter_pagination.html:12 msgid "Export CSV" @@ -87,6 +90,7 @@ msgstr "ID del cajero automático" #: atmlist/templates/atmlist/atmlist.html:12 atms/forms.py:25 #: branches/templates/branches/index.html:161 +#: customerlist/templates/customerlist/customerlist.html:12 #: productlist/templates/productlist/productlist.html:12 #: users/templates/users/detail.html:97 #: users/templates/users/invitation.html:22 @@ -98,6 +102,7 @@ msgid "ATM Name" msgstr "Nombre del cajero automático" #: atmlist/templates/atmlist/atmlist.html:14 +#: customerlist/templates/customerlist/customerlist.html:14 #: productlist/templates/productlist/productlist.html:14 msgid "More info" msgstr "Más información" @@ -105,19 +110,20 @@ msgstr "Más información" #: atmlist/templates/atmlist/atmlist.html:27 atms/forms.py:46 #: branches/forms.py:43 branches/templates/branches/index.html:176 #: branches/templates/branches/index.html:203 -#: productlist/templates/productlist/productlist.html:27 msgid "Address" msgstr "Dirección" #: atmlist/templates/atmlist/atmlist.html:36 #: consumers/templates/consumers/index.html:76 +#: customerlist/templates/customerlist/customerlist.html:36 #: productlist/templates/productlist/productlist.html:36 +#: systemviews/templates/systemviews/index.html:21 #: users/templates/users/index.html:69 msgid "View" msgstr "Ver" #: atms/forms.py:35 branches/forms.py:33 -#: consumers/templates/consumers/index.html:58 +#: consumers/templates/consumers/index.html:58 products/forms.py:45 msgid "Name" msgstr "Nombre" @@ -274,17 +280,18 @@ msgstr "Cargo internacional por retiro de efectivo" msgid "Balance Inquiry Fee" msgstr "Cargo por consulta de saldo" -#: atms/templates/atms/index.html:3 base/templates/base.html:69 +#: atms/templates/atms/index.html:3 base/templates/base.html:70 msgid "ATM Create" msgstr "Creada" #: atms/templates/atms/index.html:250 #: branches/templates/branches/index.html:151 +#: products/templates/products/index.html:76 #: users/templates/users/detail.html:81 users/templates/users/detail.html:86 msgid "Add" msgstr "Agregar" -#: atms/templates/atms/update.html:4 +#: atms/templates/atms/update.html:4 products/templates/products/update.html:8 msgid "ATM Detail" msgstr "Descripción" @@ -351,56 +358,75 @@ msgstr "Panel de KPI" msgid "Resources" msgstr "Recursos" -#: base/templates/base.html:66 customers/templates/customers/create.html:5 +#: base/templates/base.html:66 systemviews/templates/systemviews/index.html:2 +#: systemviews/templates/systemviews/index.html:4 +msgid "System View" +msgstr "" + +#: base/templates/base.html:67 customers/templates/customers/create.html:5 msgid "Customers" msgstr "Consumidores" -#: base/templates/base.html:68 branches/templates/branches/index.html:9 +#: base/templates/base.html:68 +#: customerlist/templates/customerlist/customerlist.html:2 +#: customerlist/templates/customerlist/customerlist.html:4 +#, fuzzy +#| msgid "Customers" +msgid "Customer List" +msgstr "Consumidores" + +#: base/templates/base.html:69 branches/templates/branches/index.html:9 msgid "Branches" msgstr "Sucursales" -#: base/templates/base.html:71 +#: base/templates/base.html:72 products/templates/products/index.html:8 +#, fuzzy +#| msgid "Function Name" +msgid "Product Create" +msgstr "Nombre de la función" + +#: base/templates/base.html:73 #: productlist/templates/productlist/productlist.html:2 #: productlist/templates/productlist/productlist.html:4 msgid "Product List" msgstr "Produkt Liste" -#: base/templates/base.html:76 +#: base/templates/base.html:78 msgid "Configurations" msgstr "Configuraciones" -#: base/templates/base.html:78 config/templates/config/index.html:8 +#: base/templates/base.html:80 config/templates/config/index.html:8 msgid "Config" msgstr "Configuraciones" -#: base/templates/base.html:80 +#: base/templates/base.html:82 msgid "Webui Props" msgstr "Accesorios webui" -#: base/templates/base.html:82 +#: base/templates/base.html:84 msgid "Method Routings" msgstr "Enrutamiento de métodos" -#: base/templates/base.html:84 +#: base/templates/base.html:86 #: connectormethod/templates/connectormethod/detail.html:6 #: connectormethod/templates/connectormethod/index.html:6 msgid "Connector Methods" msgstr "Métricas del conector" -#: base/templates/base.html:86 +#: base/templates/base.html:88 #: dynamicendpoints/templates/dynamicendpoints/index.html:7 msgid "Dynamic Endpoints" msgstr "Puntos finales dinámicos" -#: base/templates/base.html:89 +#: base/templates/base.html:91 msgid "My API Collections" msgstr "Mis colecciones de API" -#: base/templates/base.html:94 +#: base/templates/base.html:96 msgid "API Tester" msgstr "Métricas de la API" -#: base/templates/base.html:100 +#: base/templates/base.html:102 msgid "Logout" msgstr "Cerrar la sesión" @@ -448,26 +474,26 @@ msgstr "Seleccione..." #: base/templates/home.html:36 msgid "Proceed to authentication server" -msgstr "Weiter zum Authentifizierungsserver" +msgstr "Proceder al servidor de autenticación" #: branches/forms.py:13 branches/templates/branches/index.html:160 msgid "Branch Id" msgstr "Identificación de la sucursal" -#: branches/forms.py:24 customers/forms.py:15 users/forms.py:24 -#: users/forms.py:40 +#: branches/forms.py:24 customers/forms.py:15 products/forms.py:24 +#: users/forms.py:24 users/forms.py:40 msgid "Bank" msgstr "Banco" -#: branches/forms.py:36 +#: branches/forms.py:36 products/forms.py:48 products/forms.py:58 msgid "The name of the branch" msgstr "La configuración de la API" -#: branches/forms.py:75 +#: branches/forms.py:75 products/forms.py:86 msgid "meta_license_id" msgstr "Nombre de la metalicencia" -#: branches/forms.py:86 +#: branches/forms.py:86 products/forms.py:97 msgid "meta_license_name" msgstr "Nombre de la metalicencia" @@ -584,6 +610,8 @@ msgid "id" msgstr "identificación" #: branches/templates/branches/index.html:197 +#: products/templates/products/index.html:28 +#: products/templates/products/update.html:28 msgid "name" msgstr "nombre" @@ -786,6 +814,23 @@ msgstr "Identificación" msgid "Action" msgstr "Acción" +#: customerlist/templates/customerlist/customerlist.html:11 +#, fuzzy +#| msgid "Customers" +msgid "Customer Id" +msgstr "Consumidores" + +#: customerlist/templates/customerlist/customerlist.html:13 +#: customers/forms.py:42 +msgid "Legal Name" +msgstr "Nombre_juridico" + +#: customerlist/templates/customerlist/customerlist.html:28 +#, fuzzy +#| msgid "More Info" +msgid "Other Info" +msgstr "Más información" + #: customers/forms.py:24 users/templates/users/index.html:58 msgid "Username" msgstr "Nombre de usuario" @@ -798,10 +843,6 @@ msgstr "La configuración de la API" msgid "Customer Number" msgstr "Número de cliente" -#: customers/forms.py:42 -msgid "Legal Name" -msgstr "Nombre_juridico" - #: customers/forms.py:62 users/forms.py:67 users/templates/users/detail.html:16 #: users/templates/users/index.html:59 users/templates/users/invitation.html:71 msgid "Email" @@ -1505,7 +1546,7 @@ msgstr "Maximo de llamadas por día" msgid "Calls per month" msgstr "llamadas por mes" -#: productlist/templates/productlist/productlist.html:11 +#: productlist/templates/productlist/productlist.html:11 products/forms.py:13 msgid "Product Code" msgstr "" @@ -1515,6 +1556,42 @@ msgstr "" msgid "Product Name" msgstr "Nombre de la función" +#: products/forms.py:34 products/forms.py:37 +msgid "parent_product_code" +msgstr "" + +#: products/forms.py:55 +#, fuzzy +#| msgid "more_info" +msgid "more_info_url" +msgstr "más información" + +#: products/forms.py:65 products/forms.py:68 +msgid "terms_and_conditions_url" +msgstr "" + +#: products/forms.py:75 products/forms.py:78 +#: products/templates/products/index.html:52 +#: products/templates/products/update.html:52 +#, fuzzy +#| msgid "Description" +msgid "description" +msgstr "Descripción" + +#: systemviews/templates/systemviews/index.html:8 +msgid "Id" +msgstr "" + +#: systemviews/templates/systemviews/index.html:9 +#, fuzzy +#| msgid "Site Name" +msgid "Short Name" +msgstr "Nobre del sitio" + +#: systemviews/templates/systemviews/index.html:10 +msgid "Is Public" +msgstr "" + #: users/forms.py:15 users/templates/users/detail.html:67 #: users/templates/users/detail.html:96 msgid "Role name" @@ -1768,9 +1845,6 @@ msgstr "Ahorrar" #~ msgid "accessibleFeatures" #~ msgstr "Funciones accesibles" -#~ msgid "more_info" -#~ msgstr "más información" - #~ msgid "phone_number" #~ msgstr "número_de_teléfono" diff --git a/apimanager/systemviews/templates/systemviews/index.html b/apimanager/systemviews/templates/systemviews/index.html index f2d5221..079c219 100644 --- a/apimanager/systemviews/templates/systemviews/index.html +++ b/apimanager/systemviews/templates/systemviews/index.html @@ -11,7 +11,6 @@ {% trans "Description" %} - {{ system_view.id }} {{ system_view.short_name }} From 3268eb621c29483be596d33c529b6ac5f90e64de Mon Sep 17 00:00:00 2001 From: Reena-cell Date: Thu, 20 Oct 2022 23:59:02 +0200 Subject: [PATCH 3/7] /feature- add create account page --- apimanager/accounts/__init__.py | 0 apimanager/accounts/apps.py | 5 + apimanager/accounts/forms.py | 172 +++++++++++++ .../accounts/static/accounts/css/accounts.css | 18 ++ .../accounts/static/accounts/js/accounts.js | 0 .../accounts/templates/accounts/index.html | 166 ++++++++++++ .../accounts/templates/accounts/update.html | 223 ++++++++++++++++ apimanager/accounts/tests.py | 3 + apimanager/accounts/urls.py | 18 ++ apimanager/accounts/views.py | 242 ++++++++++++++++++ apimanager/apimanager/settings.py | 1 + apimanager/apimanager/urls.py | 1 + apimanager/base/templates/base.html | 3 +- 13 files changed, 851 insertions(+), 1 deletion(-) create mode 100644 apimanager/accounts/__init__.py create mode 100644 apimanager/accounts/apps.py create mode 100644 apimanager/accounts/forms.py create mode 100644 apimanager/accounts/static/accounts/css/accounts.css create mode 100644 apimanager/accounts/static/accounts/js/accounts.js create mode 100644 apimanager/accounts/templates/accounts/index.html create mode 100644 apimanager/accounts/templates/accounts/update.html create mode 100644 apimanager/accounts/tests.py create mode 100644 apimanager/accounts/urls.py create mode 100644 apimanager/accounts/views.py diff --git a/apimanager/accounts/__init__.py b/apimanager/accounts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/apimanager/accounts/apps.py b/apimanager/accounts/apps.py new file mode 100644 index 0000000..9b3fc5a --- /dev/null +++ b/apimanager/accounts/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class AccountsConfig(AppConfig): + name = 'accounts' diff --git a/apimanager/accounts/forms.py b/apimanager/accounts/forms.py new file mode 100644 index 0000000..0885dd2 --- /dev/null +++ b/apimanager/accounts/forms.py @@ -0,0 +1,172 @@ +""" +Forms of Accounts app +""" + +from django import forms +from django.utils.translation import ugettext_lazy as _ + +import random + + +class CreateAccountForm(forms.Form): + + account_id = forms.CharField( + label=_('Account Id'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'account-id-{}'.format(random.randint(1,1000)), + 'class': 'form-control', + } + ), + initial='account-id-{}'.format(random.randint(1,1000)), + ) + + user_id = forms.CharField( + label=_('User Id'), + widget=forms.TextInput( + attrs={ + 'class': 'form-control', + } + ), + required=True + ) + bank_id = forms.ChoiceField( + label=_('Bank Id'), + widget=forms.Select( + attrs={ + 'class': 'form-control', + } + ), + choices=[], + ) + + label = forms.CharField( + label=_('Label'), + widget=forms.TextInput( + attrs={ + 'placeholder': _('Select the label'), + 'class': 'form-control', + } + ), + required=False + ) + + product_code = forms.CharField( + label=_('Write Product Code'), + widget=forms.TextInput( + attrs={ + 'placeholder': "1234BW", + 'class': 'form-control', + } + ), + required=False + ) + + balance_currency = forms.CharField( + label=_('Currency'), + widget=forms.TextInput( + attrs={ + 'placeholder': "EUR", + 'class': 'form-control', + } + ), + required=True, + ) + + balance_amount = forms.FloatField( + label=_('Amount'), + widget=forms.TextInput( + attrs={ + 'placeholder': "0", + 'class': 'form-control', + } + ), + required=False, + ) + + branch_id = forms.CharField( + label=_('Branch Id'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'DERBY6', + 'class': 'form-control', + } + ), + required=False, + ) + + account_routings_scheme = forms.CharField( + label=_('Account Number'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'Account Number', + 'class': 'form-control', + } + ), + required=False, + ) + + account_routings_address = forms.CharField( + label=_('Address'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'Address', + 'class': 'form-control', + } + ), + required=False, + ) + account_attributes_product_code = forms.CharField( + label=_('Account Attribute Product Code'), + widget=forms.TextInput( + attrs={ + 'placeholder': '1234BW', + 'class': 'form-control', + } + ), + required=False, + ) + account_attributes_id = forms.CharField( + label=_('Account Attribute Id'), + widget=forms.TextInput( + attrs={ + 'placeholder': '613c83ea-80f9-4560-8404-b9cd4ec42a7f', + 'class': 'form-control', + } + ), + required=False, + ) + account_attributes_name = forms.CharField( + label=_('Account Attribute Name'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'OVERDRAFT_START_DATE', + 'class': 'form-control', + } + ), + required=False, + ) + account_attributes_value = forms.CharField( + label=_('Thursday'), + widget=forms.TextInput( + attrs={ + 'placeholder': '2012-04-23', + 'class': 'form-control', + } + ), + required=False, + ) + account_attributes_instance_code = forms.CharField( + label=_('Account Attribute Instance Code'), + widget=forms.TextInput( + attrs={ + 'placeholder': 'LKJL98769F', + 'class': 'form-control', + } + ), + required=False, + ) + + def __init__(self, *args, **kwargs): + kwargs.setdefault('label_suffix', '') + super(CreateAccountForm, self).__init__(*args, **kwargs) diff --git a/apimanager/accounts/static/accounts/css/accounts.css b/apimanager/accounts/static/accounts/css/accounts.css new file mode 100644 index 0000000..ab9482c --- /dev/null +++ b/apimanager/accounts/static/accounts/css/accounts.css @@ -0,0 +1,18 @@ +#accounts div { + margin: 5px 0; +} + +/* The actual popup (appears on top) */ +.popuptext { + width: 250px; + background-color: #555; + color: #fff; + text-align: left; + border-radius: 6px; + padding: 8px 0; + z-index: 1; + /*bottom: 125%;*/ + top:100%; + left: 50%; + margin-left: -80px; +} diff --git a/apimanager/accounts/static/accounts/js/accounts.js b/apimanager/accounts/static/accounts/js/accounts.js new file mode 100644 index 0000000..e69de29 diff --git a/apimanager/accounts/templates/accounts/index.html b/apimanager/accounts/templates/accounts/index.html new file mode 100644 index 0000000..aeb611a --- /dev/null +++ b/apimanager/accounts/templates/accounts/index.html @@ -0,0 +1,166 @@ +{% extends 'base.html' %} {% load static %} {% load i18n %} {% block page_title %}{{ block.super }} / Account{% endblock page_title %} {% block content %} +
      +

      {% trans "Account Create" %}

      + +
      + {% csrf_token %} {% if form.non_field_errors %} +
      {{ form.non_field_errors }}
      + {% endif %} +
      +
      + {% if form.account_id.errors %} +
      {{ form.account_id.errors }}
      + {% endif %} +
      + {{ form.account_id.label_tag }} {{ form.account_id }} +
      +
      +
      + {% if form.user_id.errors %} +
      {{ form.user_id.errors }}
      + {% endif %} +
      + {{ form.user_id.label_tag }} {{ form.user_id }} +
      +
      +
      + {% if form.label.errors %} +
      {{ form.label.errors }}
      + {% endif %} +
      + {{ form.label.label_tag }} {{ form.label }} +
      +
      +
      +
      +
      + {% if form.product_code.errors %} +
      + {{ form.product_code.errors }} +
      + {% endif %} +
      + {{ form.product_code.label_tag }} {{ form.product_code }} +
      +
      +
      + {% if form.balance_currency.errors %} +
      + {{ form.balance_currency.errors }} +
      + {% endif %} +
      + {{ form.balance_currency.label_tag }} {{ form.balance_currency }} +
      +
      +
      + {% if form.balance_amount.errors %} +
      + {{ form.balance_amount.errors }} +
      + {% endif %} +
      + {{ form.balance_amount.label_tag }} {{ form.balance_amount }} +
      +
      +
      +
      +
      + {% if form.branch_id.errors %} +
      {{ form.branch_id.errors }}
      + {% endif %} +
      + {{ form.branch_id.label_tag }} {{ form.branch_id }} +
      +
      +
      + {% if form.account_routings_scheme.errors %} +
      + {{ form.account_routings_scheme.errors }} +
      + {% endif %} +
      + {{ form.account_routings_scheme.label_tag }} {{ form.account_routings_scheme }} +
      +
      +
      + {% if form.account_routings_address.errors %} +
      {{ form.account_routings_address.errors }}
      + {% endif %} +
      + {{ form.account_routings_address.label_tag }} {{ form.account_routings_address }} +
      +
      +
      +
      +
      + {% if form.account_attributes_product_code.errors %} +
      + {{ form.account_attributes_product_code.errors }} +
      + {% endif %} +
      + {{ form.account_attributes_product_code.label_tag }} {{ form.account_attributes_product_code }} +
      +
      +
      + {% if form.account_attributes_id.errors %} +
      {{ form.account_attributes_id.errors }}
      + {% endif %} +
      + {{ form.account_attributes_id.label_tag }} {{ form.account_attributes_id }} +
      +
      +
      + {% if form.account_attributes_name.errors %} +
      {{ form.account_attributes_name.errors }}
      + {% endif %} +
      + {{ form.account_attributes_name.label_tag }} {{ form.account_attributes_name }} +
      +
      +
      +
      +
      + {% if form.bank_id.errors %} +
      {{ form.bank_id.errors }}
      + {% endif %} +
      + {{ form.bank_id.label_tag }} {{ form.bank_id }} +
      +
      +
      + {% if form.account_attributes_value.errors %} +
      + {{ form.account_attributes_value.errors }} +
      + {% endif %} +
      + {{ form.account_attributes_value.label_tag }} {{ form.account_attributes_value }} +
      +
      +
      + {% if form.account_attributes_instance_code.errors %} +
      + {{ form.account_attributes_instance_code.errors }} +
      + {% endif %} +
      + {{ form.account_attributes_instance_code.label_tag }} {{ form.account_attributes_instance_code }} +
      +
      +
      +
      + +
      +
      +
      + +{% endblock %} {% block extrajs %} {% endblock extrajs %} {% block extracss %} + {% endblock extracss %} diff --git a/apimanager/accounts/templates/accounts/update.html b/apimanager/accounts/templates/accounts/update.html new file mode 100644 index 0000000..672e61e --- /dev/null +++ b/apimanager/accounts/templates/accounts/update.html @@ -0,0 +1,223 @@ +{% extends 'base.html' %} {% load static %} {% load i18n %} +{% block page_title %}{{ block.super }} / Atms{% endblock page_title %} {% block content %} +
      +

      {% trans "ATM Detail" %}

      +

      {{ bank_id }} : {{ atm_id }}

      +
      + {% csrf_token %} {% if form.non_field_errors %} +
      + {{ form.non_field_errors }} +
      + {% endif %} + + +
      +
      + {% if form.services.errors %} +
      {{ form.services.errors }}
      {% endif %} +
      + {{ form.services.label_tag }} {{ form.services }} +
      +
      +
      + {% if form.location_latitude.errors %} +
      {{ form.location_latitude.errors }} +
      {% endif %} +
      + {{ form.location_latitude.label_tag }} {{ form.location_latitude }} +
      +
      +
      + {% if form.location_longitude.errors %} +
      {{ form.location_longitude.errors }} +
      {% endif %} +
      + {{ form.location_longitude.label_tag }} {{ form.location_longitude }} +
      +
      +
      +
      +
      + {% if form.meta_license_name.errors %} +
      {{ form.meta_license_name.errors }} +
      {% endif %} +
      + {{ form.meta_license_name.label_tag }} {{ form.meta_license_name }} +
      +
      +
      + {% if form.located_at.errors %} +
      {{ form.located_at.errors }} +
      {% endif %} +
      + {{ form.located_at.label_tag }} {{ form.located_at }} +
      +
      +
      + {% if form.has_deposit_capability.errors %} +
      {{ form.has_deposit_capability.errors }} +
      {% endif %} +
      + {{ form.has_deposit_capability.label_tag }} {{ form.has_deposit_capability }} +
      +
      +
      +
      +
      + {% if form.is_accessible.errors %} +
      {{ form.is_accessible.errors }}
      {% endif %} +
      + {{ form.is_accessible.label_tag }} {{ form.is_accessible }} +
      +
      +
      + {% if form.accessibility_features.errors %} +
      {{ form.accessibility_features.errors }}
      + {% endif %} +
      + {{ form.accessibility_features.label_tag }} {{ form.accessibility_features }} +
      +
      +
      + {% if form.more_info.errors %} +
      {{ form.more_info.errors }}
      {% endif %} +
      + {{ form.more_info.label_tag }} {{ form.more_info }} +
      +
      +
      +
      +
      + {% if form.notes.errors %} +
      {{ form.notes.errors }}
      {% endif %} +
      + {{ form.notes.label_tag }} {{ form.notes }} +
      +
      +
      + {% if form.supported_languages.errors %} +
      {{ form.supported_languages.errors }}
      {% endif %} +
      + {{ form.supported_languages.label_tag }} {{ form.supported_languages }} +
      +
      +
      + {% if form.supported_currencies.errors %} +
      {{ form.supported_currencies.errors }}
      {% endif %} +
      + {{ form.supported_currencies.label_tag }} {{ form.supported_currencies }} +
      +
      +
      +
      +
      + {% if form.location_categories.errors %} +
      {{ form.location_categories.errors }}
      {% endif %} +
      + {{ form.location_categories.label_tag }} {{ form.location_categories }} +
      +
      +
      + {% if form.minimum_withdrawal.errors %} +
      {{ form.minimum_withdrawal.errors }}
      {% endif %} +
      + {{ form.minimum_withdrawal.label_tag }} {{ form.minimum_withdrawal }} +
      +
      +
      + {% if form.site_name.errors %} +
      {{ form.site_name.errors }}
      {% endif %} +
      + {{ form.site_name.label_tag }} {{ form.site_name }} +
      +
      +
      +
      +
      + {% if form.branch_identification.errors %} +
      {{ form.branch_identification.errors }}
      {% endif %} +
      + {{ form.branch_identification.label_tag }} {{ form.branch_identification }} +
      +
      +
      + {% if form.site_identification.errors %} +
      {{ form.site_identification.errors }}
      {% endif %} +
      + {{ form.site_identification.label_tag }} {{ form.site_identification }} +
      +
      +
      + {% if form.cash_withdrawal_national_fee.errors %} +
      {{ form.cash_withdrawal_national_fee.errors }}
      {% endif %} +
      + {{ form.cash_withdrawal_national_fee.label_tag }} {{ form.cash_withdrawal_national_fee }} +
      +
      +
      +
      +
      + {% if form.balance_inquiry_fee.errors %} +
      {{ form.balance_inquiry_fee.errors }}
      {% endif %} +
      + {{ form.balance_inquiry_fee.label_tag }} {{ form.balance_inquiry_fee }} +
      +
      +
      + {% if form.cash_withdrawal_international_fee.errors %} +
      {{ form.cash_withdrawal_international_fee.errors }}
      {% endif %} +
      + {{ form.cash_withdrawal_international_fee.label_tag }} {{ form.cash_withdrawal_international_fee }} +
      +
      +
      +
      + +
      + {% if form.address.errors %} +
      {{ form.address.errors }}
      {% endif %} +
      + {{ form.address.label_tag }} {{ form.address }} +
      +
      + +
      + {% if form.lobby.errors %} +
      {{ form.lobby.errors }}
      {% endif %} +
      + {{ form.lobby.label_tag }} {{ form.lobby }} +
      +
      +
      + + +
      +
      +{% endblock content %} {% block extrajs %} {% comment %} + + +{% endcomment %} {% endblock extrajs %} {% block extracss %} + {% endblock extracss %} \ No newline at end of file diff --git a/apimanager/accounts/tests.py b/apimanager/accounts/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/apimanager/accounts/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apimanager/accounts/urls.py b/apimanager/accounts/urls.py new file mode 100644 index 0000000..d8e49e1 --- /dev/null +++ b/apimanager/accounts/urls.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +""" +URLs for metrics app +""" + +from django.conf.urls import url +from .views import IndexAccountsView +#UpdateAccountsView + +urlpatterns = [ + url(r'^create', + IndexAccountsView.as_view(), + name='accounts-create'), + +] +"""url(r'^update/(?P[ 0-9\w|\W\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', + UpdateAccountsView.as_view(), + name='accounts_update'),""" \ No newline at end of file diff --git a/apimanager/accounts/views.py b/apimanager/accounts/views.py new file mode 100644 index 0000000..378985d --- /dev/null +++ b/apimanager/accounts/views.py @@ -0,0 +1,242 @@ + +from django.shortcuts import render + +# Create your views here. +# -*- coding: utf-8 -*- +""" +Views of Accounts app +""" +from django.contrib import messages +from django.contrib.auth.mixins import LoginRequiredMixin +import json +from django.urls import reverse_lazy +from django.views.generic import FormView +from obp.api import API, APIError +from .forms import CreateAccountForm +from django.utils.translation import ugettext_lazy as _ + +class IndexAccountsView(LoginRequiredMixin, FormView): + + """Index view for Accounts""" + template_name = "accounts/index.html" + form_class = CreateAccountForm + success_url = reverse_lazy('accounts-create') + + def dispatch(self, request, *args, **kwargs): + self.api = API(request.session.get('obp')) + return super(IndexAccountsView, self).dispatch(request, *args, **kwargs) + + def get_form(self, *args, **kwargs): + form = super(IndexAccountsView, self).get_form(*args, **kwargs) + # Cannot add api in constructor: super complains about unknown kwarg + form.api = self.api + fields = form.fields + try: + fields['bank_id'].choices = self.api.get_bank_id_choices() + except APIError as err: + messages.error(self.request, err) + except Exception as err: + messages.error(self.request, err) + return form + + def form_valid(self, form): + try: + data = form.cleaned_data + urlpath = '/banks/{}/accounts/{}'.format(data['bank_id'], data['account_id']) + payload ={ + "user_id": data["user_id"], + "label": data["label"], + "product_code": data["product_code"], + "balance": { + "currency": data["balance_currency"] if data["balance_currency"] is not None else "EUR", + "amount": data["balance_amount"] if data["balance_amount"] is not None else 0 + }, + "account_routings": [{ + "scheme": data["account_routings_scheme"] if data["account_routings_scheme"] !="" else "scheme", + "address": data["account_routings_address"] if data["account_routings_address"]!="" else "address" + }], + } + result = self.api.put(urlpath, payload=payload) + except APIError as err: + messages.error(self.request, "Unknown Error") + return super(IndexAccountsView, self).form_invalid(form) + except Exception as err: + messages.error(self.request, err, "Unknown Error") + return super(IndexAccountsView, self).form_invalid(form) + if 'code' in result and result['code']>=400: + messages.error(self.request, result['message']) + return super(IndexAccountsView, self).form_valid(form) + msg = 'Account has been created successfully!' + messages.success(self.request, msg) + return super(IndexAccountsView, self).form_valid(form) + +"""class UpdateAccountsView(LoginRequiredMixin, FormView): + template_name = "accounts/update.html" + success_url = '/atms/list' + form_class = CreateAccountForm + + def dispatch(self, request, *args, **kwargs): + self.api = API(request.session.get('obp')) + return super(UpdateAccountsView, self).dispatch(request, *args, **kwargs) + + def get_form(self, *args, **kwargs): + form = super(UpdateAccountsView, self).get_form(*args, **kwargs) + # Cannot add api in constructor: super complains about unknown kwarg + form.api = self.api + fields = form.fields + urlpath = "/banks/{}/atms/{}".format(self.kwargs['bank_id'], self.kwargs['atm_id']) + try: + fields['bank_id'].choices = self.api.get_bank_id_choices() + except APIError as err: + messages.error(self.request, err) + except: + messages.error(self.request, "Unknown Error") + try: + result = self.api.get(urlpath) + fields['bank_id'].initial = self.kwargs['bank_id'] + fields['atm_id'].initial = self.kwargs['atm_id'] + fields['name'].initial = result['name'] + fields['address'].initial = json.dumps(result['address'], indent=4) + fields['location_latitude'].initial = result['location']['latitude'] + fields['location_longitude'].initial = result['location']['longitude'] + fields['meta_license_id'].initial = result['meta']['license']['id'] + fields['meta_license_name'].initial = result['meta']['license']['name'] + fields['minimum_withdrawal'].initial = result['minimum_withdrawal'] + fields['branch_identification'].initial = result['branch_identification'] + if result['is_accessible'].lower()=='true': + fields['is_accessible'].choices = [(True, True), (False, False)] + else: + fields['is_accessible'].choices = [(False, False), (True, True)] + if result['has_deposit_capability'].lower()=='true': + fields['has_deposit_capability'].choices = [(True, True), (False, False)] + else: + fields['has_deposit_capability'].choices = [(False, False), (True, True)] + fields['has_deposit_capability'].initial = result['accessibility_features'] + fields['site_identification'].initial = result['site_identification'] + fields['site_name'].initial = result['site_name'] + fields['cash_withdrawal_national_fee'].initial = result['cash_withdrawal_national_fee'] + fields['cash_withdrawal_international_fee'].initial = result['cash_withdrawal_international_fee'] + fields['balance_inquiry_fee'].initial = result['balance_inquiry_fee'] + fields['services'].initial = result['services'] + fields['located_at'].initial = result['located_at'] + fields['more_info'].initial = result['more_info'] + fields['located_at'].initial = result['located_at'] + if result['supported_languages'][0].lower()=='en': + fields['supported_languages'].choices = [("en", "en"), ("fr", "fr"), ("de", "de")] + elif result['supported_languages'][0].lower()=='fr': + fields['supported_languages'].choices = [("fr", "fr"), ("en", "en"), ("de", "de")] + else: + fields['supported_languages'].choices = [("de", "de"),("fr", "fr"), ("en", "en")] + fields['supported_languages'].initial = result['supported_languages'] + if result['supported_currencies'][0].lower()=='EUR': + fields['supported_currencies'].choices = [("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] + elif result['supported_currencies'][0].lower()=='MXN': + fields['supported_currencies'].choices = [("MXN", "MXN"), ("EUR", "EUR"), ("USD", "USD")] + else: + fields['supported_currencies'].choices = [("USD", "USD"),("MXN", "MXN"), ("EUR", "EUR")] + fields['supported_currencies'].initial = result['supported_currencies'] + if result['notes'][0].lower()=='string1': + fields['notes'].choices = [("String1", "String1"),("String2", "String2")] + else: + fields['notes'].choices = [("String2", "String2"),("String1", "String1")] + fields['notes'].initial = result['notes'] + if result['location_categories'][0].lower()=='atbi': + fields['location_categories'].choices = [("ATBI", "ATBI"),("ATBE", "ATBE")] + else: + fields['location_categories'].choices = [("ATBE", "ATBE"),("ATBI", "ATBI")] + fields['location_categories'].initial = result['location_categories'] + except APIError as err: + messages.error(self.request, err) + except Exception as err: + messages.error(self.request, "Unknown Error {}".format(err)) + return form + def form_valid(self, form): + data = form.cleaned_data + urlpath = '/banks/{}/atms/{}'.format(data["bank_id"],data["atm_id"]) + payload = { + "id": data["atm_id"], + "bank_id": data["bank_id"], + "name": data["name"], + "address": json.loads(data['address']), + "location": { + "latitude": float(data["location_latitude"]) if data["location_latitude"] is not None else "", + "longitude": float(data["location_longitude"]) if data["location_longitude"] is not None else "" + }, + "meta": { + "license": { + "id": "ODbL-1.0", + "name": data["meta_license_name"] if data["meta_license_name"]!="" else "license name" + } + }, + "monday": { + "opening_time": " ", + "closing_time": " " + }, + "tuesday": { + "opening_time": " ", + "closing_time": " " + }, + "wednesday": { + "opening_time": " ", + "closing_time": " " + }, + "thursday": { + "opening_time": " ", + "closing_time": " " + }, + "friday": { + "opening_time": " ", + "closing_time": " " + }, + "saturday": { + "opening_time": " ", + "closing_time": " " + }, + "sunday": { + "opening_time": " ", + "closing_time": " " + }, + "is_accessible": data["is_accessible"] if data["is_accessible"]!="" else "false", + "located_at": data["located_at"] if data["located_at"]!="no-example-provided" else " ", + "more_info": data["more_info"] if data["more_info"]!="" else "false", + "has_deposit_capability": data["has_deposit_capability"] if data["has_deposit_capability"]!="" else "false", + "supported_languages":[data["supported_languages"]], + "services":[data["services"]], + "accessibility_features":[data["accessibility_features"]], + "supported_currencies":[data["supported_currencies"]], + "notes":[data["notes"]], + "location_categories":[data["location_categories"]], + "minimum_withdrawal": data["minimum_withdrawal"] if data["minimum_withdrawal"]!="" else "false", + "branch_identification": data["branch_identification"] if data["branch_identification"]!="" else "false", + "site_identification": data["site_identification"] if data["site_identification"]!="" else "false", + "site_name": data["site_name"] if data["site_name"]!="" else "false", + "cash_withdrawal_national_fee": data["cash_withdrawal_national_fee"] if data["cash_withdrawal_national_fee"]!="" else "false", + "cash_withdrawal_international_fee": data["cash_withdrawal_international_fee"] if data["cash_withdrawal_international_fee"]!="" else "false", + "balance_inquiry_fee": data["balance_inquiry_fee"] if data["balance_inquiry_fee"]!="" else "false", + } + try: + result = self.api.put(urlpath, payload=payload) + if 'code' in result and result['code']>=400: + messages.error(self.request, result['message']) + return super(UpdateAccountsView, self).form_invalid(form) + except APIError as err: + messages.error(self.request, err) + return super(UpdateAccountsView, self).form_invalid(form) + except Exception as e: + messages.error(self.request, e) + return super(UpdateAccountsView, self).form_invalid(form) + msg = 'Atm {} for Bank {} has been updated successfully!'.format( # noqa + data["atm_id"], data["bank_id"]) + messages.success(self.request, msg) + return super(UpdateAccountsView, self).form_valid(form) + + def get_context_data(self, **kwargs): + context = super(UpdateAccountsView, self).get_context_data(**kwargs) + self.bank_id = self.kwargs['bank_id'] + self.atm_id = self.kwargs['atm_id'] + context.update({ + 'atm_id': self.atm_id, + 'bank_id': self.bank_id + }) + return context +""" diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index 251309d..d9f1922 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -51,6 +51,7 @@ INSTALLED_APPS = [ 'base', 'obp', 'consumers', + 'accounts', 'systemviews', 'users', 'branches', diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py index 4ed38b9..8e84678 100644 --- a/apimanager/apimanager/urls.py +++ b/apimanager/apimanager/urls.py @@ -35,6 +35,7 @@ urlpatterns += i18n_patterns( url(r'^logout$', LogoutView.as_view(), name='oauth-logout'), url(r'^systemviews/', include('systemviews.urls')), + url(r'^accounts/', include('accounts.urls')), url(r'^consumers/', include('consumers.urls')), url(r'^entitlementrequests/', include('entitlementrequests.urls')), url(r'^users/', include('users.urls')), diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html index 40fe4e9..f599dcf 100644 --- a/apimanager/base/templates/base.html +++ b/apimanager/base/templates/base.html @@ -59,12 +59,13 @@
    • {% trans "KPI Dashboard" %}
    • - {% url "system_view" as system_view_url %} {% url "branches_list" as branches_list_url %} {% url "customers-create" as customers_create_url %} {% url "customer-list" as customer_list_url %} {% url "atms_create" as atms_create_url %} {% url "atm-list" as atm_list_url %} {% url "product-list" as product_list_url %} {% url "products-create" as product_create_url %} + {% url "system_view" as system_view_url %} {% url "accounts-create" as accounts_create_url %} {% url "branches_list" as branches_list_url %} {% url "customers-create" as customers_create_url %} {% url "customer-list" as customer_list_url %} {% url "atms_create" as atms_create_url %} {% url "atm-list" as atm_list_url %} {% url "product-list" as product_list_url %} {% url "products-create" as product_create_url %}
  • {% trans "Resources" %}
    • {% trans "System View" %}
      • +
    • {% trans "Account Create" %}
    • {% trans "Customers" %}
    • {% trans "Customer List" %}
    • {% trans "Branches" %}
      • From 28604a3a9bad4b5640987acb622f60bbebe4c847 Mon Sep 17 00:00:00 2001 From: Reena-cell Date: Mon, 24 Oct 2022 11:10:37 +0200 Subject: [PATCH 4/7] Merge branches --- .../accounts/templates/accounts/update.html | 333 +++++++----------- apimanager/accounts/urls.py | 10 +- apimanager/accounts/views.py | 6 +- apimanager/atmlist/views.py | 11 +- apimanager/base/views.py | 14 + 5 files changed, 163 insertions(+), 211 deletions(-) diff --git a/apimanager/accounts/templates/accounts/update.html b/apimanager/accounts/templates/accounts/update.html index 672e61e..5fc17bc 100644 --- a/apimanager/accounts/templates/accounts/update.html +++ b/apimanager/accounts/templates/accounts/update.html @@ -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 %}
      -

      {% trans "ATM Detail" %}

      -

      {{ bank_id }} : {{ atm_id }}

      +

      {% trans "Account Create" %}

      +
      {% csrf_token %} {% if form.non_field_errors %} -
      - {{ form.non_field_errors }} -
      +
      {{ form.non_field_errors }}
      {% endif %} -