Skip to content

Добавила домен для разных регионов #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nyafo4ka wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Добавила домен для разных регионов #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658bd29
Добавила домен для использования bitrix
nyafka Oct 15, 2019
f561035
Обновила README с BITRIX24_API_DOMAIN
nyafka Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ python_bitrix24 installation

$ pip install python_bitrix24

Если используется Django, то в настройках проекта можно указать BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD и BITRIX24_API_MAIN_USER_NAME.
Если используется Django, то в настройках проекта можно указать BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD, BITRIX24_API_MAIN_USER_NAME и BITRIX24_API_DOMAIN.
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ https://github.com/moshkov/python_bitrix24

$ pip install python_bitrix24

Если используется Django, то в настройках проекта можно указать BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD и BITRIX24_API_MAIN_USER_NAME.
Если используется Django, то в настройках проекта можно указать BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD, BITRIX24_API_MAIN_USER_NAME и BITRIX24_API_DOMAIN.


Описание
Expand All @@ -46,7 +46,7 @@ https://github.com/moshkov/python_bitrix24

from python_bitrix24.bitrix24 import Bitrix24Connection

bitrix24Connection = Bitrix24Connection('YOU_BITRIX24_API_LOGIN', 'YOU_BITRIX24_API_PASSWORD', 'YOU_BITRIX24_API_MAIN_USER_NAME')
bitrix24Connection = Bitrix24Connection('YOU_BITRIX24_API_LOGIN', 'YOU_BITRIX24_API_PASSWORD', 'YOU_BITRIX24_API_MAIN_USER_NAME', 'YOU_BITRIX24_API_DOMAIN')

b24_result = bitrix24Connection.add_lead('My dear Lead, {
'NAME': 'Vasya Pupkin',
Expand All @@ -60,7 +60,7 @@ https://github.com/moshkov/python_bitrix24

...

Для Django (если в настройках заданы BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD и BITRIX24_API_MAIN_USER_NAME):
Для Django (если в настройках заданы BITRIX24_API_LOGIN, BITRIX24_API_PASSWORD, BITRIX24_API_MAIN_USER_NAME и BITRIX24_API_DOMAIN):

.. code-block:: python

Expand Down
5 changes: 3 additions & 2 deletions python_bitrix24/bitrix24.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ class Bitrix24Connection(object):
_api_password = None
_api_url = None

def __init__(self, api_login, api_password, api_main_user_name):
def __init__(self, api_login, api_password, api_main_user_name, api_domain='ru'):
self._api_login = api_login
self._api_password = api_password
self._api_main_user_name = api_main_user_name
self._api_url = "https://%s.bitrix24.ru/" % self._api_main_user_name
self._api_domain = api_domain
self._api_url = "https://{}.bitrix24.{}/".format(self._api_main_user_name, self._api_domain)

def _build_url(self, path):
return "%s%s" % (self._api_url, path)
Expand Down
2 changes: 1 addition & 1 deletion python_bitrix24/python_bitrix24_django/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from django.conf import settings

bitrix24Connection = Bitrix24Connection(settings.BITRIX24_API_LOGIN, settings.BITRIX24_API_PASSWORD,
settings.BITRIX24_API_MAIN_USER_NAME)
settings.BITRIX24_API_MAIN_USER_NAME, settings.BITRIX24_API_DOMAIN)