diff --git a/INSTALL b/INSTALL index 1d5ec8c..1716ec6 100644 --- a/INSTALL +++ b/INSTALL @@ -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. diff --git a/README.rst b/README.rst index 87fbb39..461892f 100644 --- a/README.rst +++ b/README.rst @@ -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. Описание @@ -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', @@ -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 diff --git a/python_bitrix24/bitrix24.py b/python_bitrix24/bitrix24.py index 67c7af2..c363cda 100644 --- a/python_bitrix24/bitrix24.py +++ b/python_bitrix24/bitrix24.py @@ -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) diff --git a/python_bitrix24/python_bitrix24_django/__init__.py b/python_bitrix24/python_bitrix24_django/__init__.py index 51217b2..3541411 100644 --- a/python_bitrix24/python_bitrix24_django/__init__.py +++ b/python_bitrix24/python_bitrix24_django/__init__.py @@ -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)