/feature Add ATM page

This commit is contained in:
Reena_Aheer 2022-04-25 04:03:59 +02:00
parent 19c11dbfa0
commit bc4bb66251
7 changed files with 309 additions and 325 deletions

View File

@ -95,8 +95,8 @@ class CreateAtmForm(forms.Form):
required=False,
)
""" lobby = forms.CharField(
label=' Lobby Opening Hours',
lobby = forms.CharField(
label='Opening Hours',
widget=forms.Textarea(
attrs={
'placeholder': 'None',
@ -104,10 +104,10 @@ class CreateAtmForm(forms.Form):
}
),
required=False,
)"""
)
monday = forms.CharField(
label=' Monday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -117,7 +117,7 @@ class CreateAtmForm(forms.Form):
)
tuesday = forms.CharField(
label='Tuesday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -127,7 +127,7 @@ class CreateAtmForm(forms.Form):
)
wednesday = forms.CharField(
label=' Wednesday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -137,7 +137,7 @@ class CreateAtmForm(forms.Form):
)
thursday = forms.CharField(
label=' Thursday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -147,7 +147,7 @@ class CreateAtmForm(forms.Form):
)
friday = forms.CharField(
label=' Friday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -157,7 +157,7 @@ class CreateAtmForm(forms.Form):
)
saturday = forms.CharField(
label=' Saturday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -167,7 +167,7 @@ class CreateAtmForm(forms.Form):
)
sunday = forms.CharField(
label=' Sunday',
widget=forms.Textarea(
widget=forms.TextInput(
attrs={
'placeholder': 'None',
'class': 'form-control',
@ -175,6 +175,15 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
is_accessible = forms.ChoiceField(
label='is accessible',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
located_at = forms.CharField(
label='ATM location',
widget=forms.TextInput(
@ -185,18 +194,45 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
is_accessible = forms.ChoiceField(
label='is accessible',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
accessibleFeatures = forms.CharField(
more_info = forms.CharField(
label='More information',
widget=forms.TextInput(
attrs={
'placeholder': 'short walk to the lake from here',
'class': 'form-control',
}
),
required=False,
)
has_deposit_capability = forms.ChoiceField(
label='Deposit Capabilities',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
supported_languages = forms.ChoiceField(
label='Supported Languages',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
services = forms.CharField(
label='Services',
widget=forms.TextInput(
attrs={
'placeholder': 'Service store',
'class': 'form-control',
}
),
required=False,
)
accessibility_features = forms.CharField(
label='Accessible Features',
widget=forms.TextInput(
attrs={
@ -206,29 +242,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
services = forms.CharField(
label='Services',
widget=forms.TextInput(
attrs={
'placeholder': 'Service store',
'class': 'form-control',
}
),
required=False,
)
more_info = forms.CharField(
label='More information',
widget=forms.TextInput(
attrs={
'placeholder': 'short walk to the lake from here',
'class': 'form-control',
}
),
required=False,
)
supported_currencies = forms.ChoiceField(
label='Supported Currencies',
widget=forms.Select(
@ -238,7 +251,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
notes = forms.ChoiceField(
label='Write Notes',
widget=forms.Select(
@ -248,7 +260,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
location_categories = forms.ChoiceField(
label='Write location Category',
widget=forms.Select(
@ -258,7 +269,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
minimum_withdrawal = forms.CharField(
label='Minimum Withdrawal',
widget=forms.TextInput(
@ -269,7 +279,26 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
branch_identification = forms.CharField(
label='Branch Identification',
widget=forms.TextInput(
attrs={
'placeholder': 'Enter your Branch Identification',
'class': 'form-control',
}
),
required=False,
)
site_identification = forms.CharField(
label='Site Identification',
widget=forms.TextInput(
attrs={
'placeholder': 'Enter your Site Identification',
'class': 'form-control',
}
),
required=False,
)
site_name = forms.CharField(
label='Site Name',
widget=forms.TextInput(
@ -280,30 +309,7 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
branch_identification = forms.CharField(
label='Branch Identification',
widget=forms.TextInput(
attrs={
'placeholder': 'Enter your Branch Identification',
'class': 'form-control',
}
),
required=False,
)
site_identification = forms.CharField(
label='Site Identification',
widget=forms.TextInput(
attrs={
'placeholder': 'Enter your Site Identification',
'class': 'form-control',
}
),
required=False,
)
services = forms.CharField(
"""services = forms.CharField(
label='Services',
widget=forms.TextInput(
attrs={
@ -312,28 +318,7 @@ class CreateAtmForm(forms.Form):
}
),
required=False,
)
supported_languages = forms.ChoiceField(
label='supported_languages',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
has_deposit_capability = forms.ChoiceField(
label='Deposit Capabilities',
widget=forms.Select(
attrs={
'class': 'form-control',
}
),
required=False,
)
)"""
cash_withdrawal_national_fee = forms.CharField(
label='Cash Withdrawal National fee',
widget=forms.TextInput(
@ -344,7 +329,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
cash_withdrawal_international_fee = forms.CharField(
label='Cash Withdrawal international fee',
widget=forms.TextInput(
@ -355,7 +339,6 @@ class CreateAtmForm(forms.Form):
),
required=False,
)
balance_inquiry_fee = forms.CharField(
label='Balance Inquiry Fee',
widget=forms.TextInput(

View File

@ -8,7 +8,6 @@
{{ form.non_field_errors }}
</div>
{% endif %}
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.atm_id.errors %}
@ -32,7 +31,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.services.errors %}
@ -58,7 +56,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.meta_license_name.errors %}
@ -83,7 +80,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.is_accessible.errors %}
@ -94,11 +90,11 @@
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.accessibleFeatures.errors %}
<div class="alert alert-danger">{{ form.accessibleFeatures.errors }}
{% if form.accessibility_features.errors %}
<div class="alert alert-danger">{{ form.accessibility_features.errors }}
</div>{% endif %}
<div class="form-group">
{{ form.accessibleFeatures.label_tag }} {{ form.accessibleFeatures }}
{{ form.accessibility_features.label_tag }} {{ form.accessibility_features }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
@ -109,7 +105,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.notes.errors %}
@ -270,7 +265,6 @@
</li>
<li>ATM Type: {{atm.branch_type}}</li>
<li>More Info: {{atm.more_info}}</li>
<!-- <li>Phone Number: {{atm.phone_number}}</li>-->
<li>Accessible Features: {{atm.accessibleFeatures}}</li>
</ul>
</div>

View File

@ -9,6 +9,13 @@
</div>
{% endif %}
<div class="row" style="display: None">
<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 }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.bank_id.errors %}
<div class="alert alert-danger">{{ form.bank_id.errors }}</div>{% endif %}
@ -16,16 +23,6 @@
{{ 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 }}
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.name.errors %}
<div class="alert alert-danger">{{ form.name.errors }}</div>{% endif %}
@ -33,77 +30,6 @@
{{ form.name.label_tag }} {{ form.name }}
</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_id.errors %}
<div class="alert alert-danger">{{ form.meta_license_id.errors }}
</div>{% endif %}
<div class="form-group">
{{ form.meta_license_id.label_tag }} {{ form.meta_license_id }}
</div>
</div>
<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.accessibleFeatures.errors %}
<div class="alert alert-danger">{{ form.accessibleFeatures.errors }}
</div>{% endif %}
<div class="form-group">
{{ form.accessibleFeatures.label_tag }} {{ form.accessibleFeatures }}
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.atm_routing_scheme.errors %}
<div class="alert alert-danger">{{ form.atm_routing_scheme.errors }}
</div>{% endif %}
<div class="form-group">
{{ form.atm_routing_scheme.label_tag }} {{ form.atm_routing_scheme }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.atm_routing_address.errors %}
<div class="alert alert-danger">{{ form.branch_routing_address.errors }}</div>{% endif %}
<div class="form-group">
{{ form.atm_routing_address.label_tag }} {{ form.atm_routing_address }}
</div>
</div>
<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>
<div class="row">
@ -114,6 +40,65 @@
{{ 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 }}
</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 %}
@ -121,6 +106,22 @@
{{ form.more_info.label_tag }} {{ form.more_info }}
</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 %}
@ -129,25 +130,70 @@
</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 %}
{% if form.location_categories.errors %}
<div class="alert alert-danger">{{ form.location_categories.errors }}</div>{% endif %}
<div class="form-group">
{{ form.services.label_tag }} {{ form.services }}
{{ form.location_categories.label_tag }} {{ form.location_categories }}
</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 %}
{% if form.minimum_withdrawal.errors %}
<div class="alert alert-danger">{{ form.minimum_withdrawal.errors }}</div>{% endif %}
<div class="form-group">
{{ form.has_deposit_capability.label_tag }} {{ form.has_deposit_capability }}
{{ 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 %}
@ -163,14 +209,6 @@
{{ form.lobby.label_tag }} {{ form.lobby }}
</div>
</div>
<!-- <div class="col-xs-12 col-sm-4">
{% if form.drive_up.errors %}<div class="alert alert-danger">{{ form.drive_up.errors }}</div>{% endif %}
<div class="form-group">
{{ form.drive_up.label_tag }}
{{ form.drive_up }}
</div>
</div>-->
</div>
<input type="submit" value="Update" class="btn btn-primary" />

View File

@ -1,70 +0,0 @@
{
"id":"atme0352a-9a0f-4bfa-b30b-9003aa467f51",
"bank_id":"gh.29.uk",
"name":"Atm by the Lake",
"address":{
"line_1":"No 1 the Road",
"line_2":"The Place",
"line_3":"The Hill",
"city":"Berlin",
"county":"",
"state":"Brandenburg",
"postcode":"13359",
"country_code":"DE"
},
"location":{
"latitude":11.45,
"longitude":11.45
},
"meta":{
"license":{
"id":"ODbL-1.0",
"name":"Open Database License"
}
},
"monday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"tuesday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"wednesday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"thursday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"friday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"saturday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"sunday":{
"opening_time":"10:00",
"closing_time":"18:00"
},
"is_accessible":"true",
"located_at":"no-example-provided",
"more_info":"no-example-provided",
"has_deposit_capability":"true",
"supported_languages":["es","fr","de"],
"services":["ATBP","ATBA"],
"accessibility_features":["ATAC","ATAD"],
"supported_currencies":["EUR","MXN","USD"],
"notes":["String1","String2"],
"location_categories":["ATBI","ATBE"],
"minimum_withdrawal":"5",
"branch_identification":"no-example-provided",
"site_identification":"no-example-provided",
"site_name":"no-example-provided",
"cash_withdrawal_national_fee":"no-example-provided",
"cash_withdrawal_international_fee":"no-example-provided",
"balance_inquiry_fee":"no-example-provided"
}

View File

@ -32,8 +32,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
form.api = self.api
fields = form.fields
try:
#fields["atm_id"]=
fields['bank_id'].choices = self.api.get_bank_id_choices()
fields['is_accessible'].choices = [('','Choose...'),(True, True), (False, False)]
fields['has_deposit_capability'].choices = [('','Choose...'),(True, True), (False, False)]
@ -41,15 +39,50 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
fields['notes'].choices = [('','Choose...'),("String1", "String1"), ("String2", "String2")]
fields['supported_currencies'].choices = [('','Choose...'),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")]
fields['location_categories'].choices = [('','Choose...'),("ATBI", "ATBI"), ("ATBE", "ATBE")]
#fields['lobby'].initial = json.dumps({
fields["monday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["tuesday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["wednesday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["thursday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["friday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["saturday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
fields["sunday"].initial=json.dumps({"opening_time": "10:00","closing_time": "18:00"})
#}, indent=4)
fields['lobby'].initial = json.dumps({
"monday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"tuesday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"wednesday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"thursday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"friday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"saturday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
],
"sunday": [
{
"opening_time": "10:00",
"closing_time": "18:00"
}
]
}, indent=4)
fields['address'].initial = json.dumps({
"line_1":"No 1 the Road",
@ -71,11 +104,9 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
def form_valid(self, form):
try:
data = form.cleaned_data
#print(data["id"], "This is a id from data")
urlpath = '/banks/{}/atms'.format(data['bank_id'])
print(data["atm_id"], "This is a atm_id")
payload = {
"id": data["atm_id"],
payload ={
"id": data["atm_id"],
"bank_id": data["bank_id"],
"name": data["name"],
"address": json.loads(data['address']),
@ -85,24 +116,48 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
},
"meta": {
"license": {
"id": "PDDL",
"name": data["meta_license_name"] if data["meta_license_name"]!="" else "license name"
"id": "PDDL",
"name": data["meta_license_name"] if data["meta_license_name"]!="" else "license name"
}
},
"monday":data["monday"] if data["monday"]!= "" else "false",
"tuesday":data["tuesday"] if data["tuesday"]!= "" else "false",
"wednesday":data["wednesday"] if data["wednesday"]!= "" else "false",
"thursday":data["thursday"] if data["thursday"]!= "" else "false",
"friday":data["friday"] if data["friday"]!= "" else "false",
"saturday":data["saturday"] if data["saturday"]!= "" else "false",
"sunday":data["sunday"] if data["sunday"]!= "" else "false",
"monday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"tuesday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"wednesday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"thursday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"friday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"saturday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"sunday": {
"opening_time": "10:00",
"closing_time": "18:00"
},
"is_accessible": data["is_accessible"] if data["is_accessible"]!="" else "false",
"located_at": data["located_at"] if data["located_at"]!="" else "false",
"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"] if data["supported_languages"]!="" else "false",
"supported_currencies": data["supported_currencies"] if data["supported_currencies"]!="" else "false",
"notes": data["notes"] if data["notes"]!="" else "false",
"location_categories": data["location_categories"] if data["location_categories"]!="" else "false",
"accessible_features": data["accessibleFeatures"] if data["accessibleFeatures"]!="" 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",
@ -110,25 +165,18 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
"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",
"more_info": data["more_info"] if data["more_info"]!="" else "false",
"located_at": data["located_at"] if data["located_at"]!="" else "false",
"services": data["services"] if data["services"]!="" else "false",
}
#payload=json.dumps(payload)
result = self.api.post(urlpath, payload=payload)
print(result, "Hello World")
except APIError as err:
messages.error(self.request, err)
messages.error(self.request, "Unknown Error")
return super(IndexAtmsView, self).form_invalid(form)
except Exception as err:
messages.error(self.request, err)
messages.error(self.request, "Unknown Error")
return super(IndexAtmsView, self).form_invalid(form)
if 'code' in result and result['code']>=400:
messages.error(self.request, "result Unknown Error")
print(result, "Result is")
messages.error(self.request, result['message'])
return super(IndexAtmsView, self).form_valid(form)
#msg = ("Record has been created successfully!")
msg = 'atm {} for Bank {} has been created successfully!', result['bank_id']
msg = 'atm {} for Bank {} has been created successfully!'.format(result["id"],result['bank_id'])
messages.success(self.request, msg)
return super(IndexAtmsView, self).form_valid(form)
@ -137,7 +185,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
try:
urlpath = '/banks'
result = api.get(urlpath)
print(result, "get_banks")
if 'banks' in result:
return [bank['id'] for bank in sorted(result['banks'], key=lambda d: d['id'])]
else:
@ -156,7 +203,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
urlpath = '/banks/{}/atms'.format(bank_id)
result = api.get(urlpath)
print(result,"get_atms")
if 'atms' in result:
atms_list.extend(result['atms'])
except APIError as err:
@ -177,7 +223,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
})
return context
class UpdateAtmsView(LoginRequiredMixin, FormView):
template_name = "atms/update.html"
success_url = '/atms/'
@ -195,7 +240,6 @@ class UpdateAtmsView(LoginRequiredMixin, FormView):
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:
@ -220,7 +264,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView):
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['accessibleFeatures']
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']
@ -259,14 +303,12 @@ class UpdateAtmsView(LoginRequiredMixin, FormView):
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"],
#"id": data["atm_id"],
"bank_id": data["bank_id"],
"name": data["name"],
"address": json.loads(data['address']),
@ -280,9 +322,8 @@ class UpdateAtmsView(LoginRequiredMixin, FormView):
"name": data["meta_license_name"]
}
},
"lobby": json.loads(data["lobby"]),
"has_deposit_capability": data["has_deposit_capability"],
"accessibleFeatures": data["accessibleFeatures"],
"accessibility_features": data["accessibility_features"],
"minimum_withdrawal": data["minimum_withdrawal"],
"branch_identification": data["branch_identification"],
"site_identification": data["site_identification"],

View File

@ -141,7 +141,6 @@
{{ 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">

View File

@ -132,7 +132,6 @@ class IndexBranchesView(LoginRequiredMixin, FormView):
try:
data = form.cleaned_data
urlpath = '/banks/{}/branches'.format(data['bank_id'])
print(urlpath)
payload = {
"id": data["branch_id"],
"bank_id": data["bank_id"],