Skip to content
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.

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

Неавторизованный заказ (Resolve #1) #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion install/components/opensource/order/.parameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
'MULTIPLE' => 'N',
'DEFAULT' => '/personal/cart/',
'PARENT' => 'ADDITIONAL_SETTINGS',
]
],
'ALLOW_UNAUTH_ORDER' => [
'NAME' => Loc::getMessage('OPEN_SOURCE_ORDER_ALLOW_UNAUTH_ORDER'),
'TYPE' => 'CHECKBOX',
'DEFAULT' => 'N',
'PARENT' => 'ADDITIONAL_SETTINGS',
],
]
];
7 changes: 6 additions & 1 deletion install/components/opensource/order/class.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ public function createVirtualOrder(int $personTypeId)
throw new RuntimeException(Loc::getMessage('OPEN_SOURCE_ORDER_UNKNOWN_PERSON_TYPE'));
}

$userID = intval($USER->GetID());
if( ! $userID && 'Y' !== $this->arParams['ALLOW_UNAUTH_ORDER'] ) {
throw new RuntimeException(Loc::getMessage('OPEN_SOURCE_ORDER_USER_NOT_AUTH'));
}

$siteId = Context::getCurrent()
->getSite();

Expand All @@ -126,7 +131,7 @@ public function createVirtualOrder(int $personTypeId)
throw new LengthException(Loc::getMessage('OPEN_SOURCE_ORDER_EMPTY_BASKET'));
}

$this->order = Order::create($siteId, $USER->GetID());
$this->order = Order::create($siteId, $userID ?: CSaleUser::GetAnonymousUserID());
$this->order->setPersonTypeId($personTypeId);
$this->order->setBasket($basketItems);

Expand Down
3 changes: 2 additions & 1 deletion install/components/opensource/order/lang/ru/.parameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
$MESS['OPEN_SOURCE_ORDER_DEFAULT_PAY_SYSTEM_ID'] = 'Платежная система по умолчанию';
$MESS['OPEN_SOURCE_ORDER_USE_DEFAULT_USER_ID'] = 'Сохранять заказ на указанного пользователя, если покупатель не авторизован';
$MESS['OPEN_SOURCE_ORDER_DEFAULT_USER_ID'] = 'ID пользователя битрикс для заказов без авторизации';
$MESS['OPEN_SOURCE_ORDER_PATH_TO_BASKET'] = 'Путь до раздела с корзиной';
$MESS['OPEN_SOURCE_ORDER_PATH_TO_BASKET'] = 'Путь до раздела с корзиной';
$MESS['OPEN_SOURCE_ORDER_ALLOW_UNAUTH_ORDER'] = 'Разрешить заказ без авторизации';
3 changes: 2 additions & 1 deletion install/components/opensource/order/lang/ru/class.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
$MESS['OPEN_SOURCE_ORDER_NO_PAY_SYSTEM_SELECTED'] = 'Не выбрана платежная система';
$MESS['OPEN_SOURCE_ORDER_PROPERTY_REQUIRED'] = 'Свойство #PROPERTY_NAME# обязательное';
$MESS['OPEN_SOURCE_ORDER_PROPERTY_ENUM_INVALID_OPTION'] = 'В свойсте #PROPERTY_NAME# выбрано неверное значение';
$MESS['OPEN_SOURCE_ORDER_PROPERTY_DATE_WRONG_FORMAT'] = 'Дата в свойстве #PROPERTY_NAME# указана в неверном формате';
$MESS['OPEN_SOURCE_ORDER_PROPERTY_DATE_WRONG_FORMAT'] = 'Дата в свойстве #PROPERTY_NAME# указана в неверном формате';
$MESS['OPEN_SOURCE_ORDER_USER_NOT_AUTH'] = 'Для продолжения необходимо авторизироваться';