diff --git a/apimanager/accounts/forms.py b/apimanager/accounts/forms.py
index 0885dd2..f34a276 100644
--- a/apimanager/accounts/forms.py
+++ b/apimanager/accounts/forms.py
@@ -10,17 +10,6 @@ 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(
@@ -44,7 +33,7 @@ class CreateAccountForm(forms.Form):
label=_('Label'),
widget=forms.TextInput(
attrs={
- 'placeholder': _('Select the label'),
+ 'placeholder': _('Select The Label'),
'class': 'form-control',
}
),
@@ -52,7 +41,7 @@ class CreateAccountForm(forms.Form):
)
product_code = forms.CharField(
- label=_('Write Product Code'),
+ label=_('Product Code'),
widget=forms.TextInput(
attrs={
'placeholder': "1234BW",
@@ -96,7 +85,7 @@ class CreateAccountForm(forms.Form):
)
account_routings_scheme = forms.CharField(
- label=_('Account Number'),
+ label=_('Account Routing Scheme'),
widget=forms.TextInput(
attrs={
'placeholder': 'Account Number',
@@ -107,7 +96,7 @@ class CreateAccountForm(forms.Form):
)
account_routings_address = forms.CharField(
- label=_('Address'),
+ label=_('Account Routing Address'),
widget=forms.TextInput(
attrs={
'placeholder': 'Address',
@@ -116,56 +105,7 @@ class CreateAccountForm(forms.Form):
),
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', '')
diff --git a/apimanager/accounts/templates/accounts/index.html b/apimanager/accounts/templates/accounts/index.html
index b877363..9bc7027 100644
--- a/apimanager/accounts/templates/accounts/index.html
+++ b/apimanager/accounts/templates/accounts/index.html
@@ -7,14 +7,6 @@
{{ 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 }}
@@ -31,8 +23,6 @@
{{ form.label.label_tag }} {{ form.label }}
-
-
{% if form.product_code.errors %}
@@ -43,6 +33,8 @@
{{ form.product_code.label_tag }} {{ form.product_code }}
+
+
{% if form.balance_currency.errors %}
@@ -63,16 +55,15 @@
{{ 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 %}
@@ -91,36 +82,6 @@
{{ 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 }}
@@ -129,26 +90,6 @@
{{ 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 }}
-
-
diff --git a/apimanager/accounts/views.py b/apimanager/accounts/views.py
index a8bb57d..b79ebcc 100644
--- a/apimanager/accounts/views.py
+++ b/apimanager/accounts/views.py
@@ -42,11 +42,13 @@ class IndexAccountsView(LoginRequiredMixin, FormView):
def form_valid(self, form):
try:
data = form.cleaned_data
- urlpath = '/banks/{}/accounts/{}'.format(data['bank_id'], data['account_id'])
+ #urlpath = '/banks/{}/accounts/{}'.format(data['bank_id'], data['account_id'])
+ urlpath = '/banks/{}/accounts'.format(data['bank_id'])
payload ={
"user_id": data["user_id"],
"label": data["label"],
"product_code": data["product_code"],
+ "branch_id": data["branch_id"],
"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
@@ -56,7 +58,7 @@ class IndexAccountsView(LoginRequiredMixin, FormView):
"address": data["account_routings_address"] if data["account_routings_address"]!="" else "address"
}],
}
- result = self.api.put(urlpath, payload=payload)
+ result = self.api.post(urlpath, payload=payload)
except APIError as err:
messages.error(self.request, "Unknown Error")
return super(IndexAccountsView, self).form_invalid(form)