refactor, add js api dadata in docs

remotes/origin/mitri4
Dmitriy Shesterkin 9 years ago
parent 0e55585998
commit 56f79f73d8
  1. 9
      project/commons/context_processors.py
  2. 4
      project/customer/views/clients.py
  3. 4
      project/customer/views/profile.py
  4. 1
      project/settings.py
  5. 8
      project/static/js/profile/search-main-external-api.js
  6. 5
      project/templates/docs/_base/base_add.html

@ -0,0 +1,9 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from django.conf import settings
def get_dadata_api_key(request):
return {
"dadata_api_key": settings.DADATA_API_KEY
}

@ -25,13 +25,11 @@ def clients_list(request, page_num=None):
page, pagination_form = pagination(request, client_list, page_num) page, pagination_form = pagination(request, client_list, page_num)
client_form = forms.ClientForm() client_form = forms.ClientForm()
dadata_api_key = settings.DADATA_API_KEY
dictionary = { dictionary = {
'page': page, 'page': page,
'pagination_form': pagination_form, 'pagination_form': pagination_form,
'client_form': client_form, 'client_form': client_form
'dadata_api_key': dadata_api_key
} }
return render(request, template_name, dictionary) return render(request, template_name, dictionary)

@ -87,7 +87,6 @@ def profile_edit(request):
accounts = models.BankAccount.objects.get_all(profile) accounts = models.BankAccount.objects.get_all(profile)
bank_account_form = forms.BankAccountForm(initial={'company': profile}) bank_account_form = forms.BankAccountForm(initial={'company': profile})
dadata_api_key = settings.DADATA_API_KEY
if request.method == 'POST': if request.method == 'POST':
form = form_class(data=request.POST, files=request.FILES, instance=profile) form = form_class(data=request.POST, files=request.FILES, instance=profile)
@ -113,8 +112,7 @@ def profile_edit(request):
'form': form, 'form': form,
'profile': profile, 'profile': profile,
'accounts': accounts, 'accounts': accounts,
'bank_account_form': bank_account_form, 'bank_account_form': bank_account_form
'dadata_api_key': dadata_api_key
} }
return render(request, template_name, dictionary) return render(request, template_name, dictionary)

@ -140,6 +140,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'sekizai.context_processors.sekizai', 'sekizai.context_processors.sekizai',
'project.callback.context_processors.add_forms', 'project.callback.context_processors.add_forms',
'project.customer.context_processors.license_check_soon_ends', 'project.customer.context_processors.license_check_soon_ends',
'project.commons.context_processors.get_dadata_api_key',
) )

@ -65,8 +65,10 @@ $(document).ready(function() {
if (data.name && data.name.full) if (data.name && data.name.full)
profileOrgFullName.val(join([data.opf && data.opf.full || "", data.name.full], " ")); profileOrgFullName.val(join([data.opf && data.opf.full || "", data.name.full], " "));
if (data.address) { if (data.address) {
profileAddress.val(data.address.value); var address = data.address.value;
profileLegalAddress.val(data.address.value); profileAddress.val(address);
profileLegalAddress.val(address);
profilePostalAddress.val(address);
} }
if (data.management) { if (data.management) {
@ -131,7 +133,7 @@ $(document).ready(function() {
profileInputs = [ profileInputs = [
profileOrgName, profileOrgFullName, profileInn, profileKpp, profileOrgName, profileOrgFullName, profileInn, profileKpp,
profileOqrn, profileBossName, profileBossSurname, profileBossMiddleName, profileOqrn, profileBossName, profileBossSurname, profileBossMiddleName,
profileAddress, profileLegalAddress profileAddress, profileLegalAddress, profilePostalAddress
]; ];
} else { } else {

@ -23,4 +23,9 @@
<script src="{{ STATIC_URL }}js/docs/client.form.js"></script> <script src="{{ STATIC_URL }}js/docs/client.form.js"></script>
{% include form_template_js %} {% include form_template_js %}
<script src="{{ STATIC_URL }}js/lib/jquery.suggestions.min.js"></script>
<script src="{{ STATIC_URL }}js/client/search-external-api.js"></script>
{% include 'hbs/bank-tpl.html' %}
{% endblock %} {% endblock %}

Loading…
Cancel
Save