From 1fdd539252654cc3b91844fa5ac7f25cc12284ef Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Fri, 31 Jan 2014 20:20:37 +0400
Subject: [PATCH] fixes

---
 intaro.intarocrm/classes/general/ICrmOrderActions.php |  4 ++--
 intaro.intarocrm/install/index.php                    |  2 ++
 intaro.intarocrm/install/step2.php                    | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index 004d859f..3d010185 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -380,7 +380,7 @@ class ICrmOrderActions
                 // we dont need new orders without any customers (can check only for externalId)
                 if(!isset($order['customer']['externalId']) && !$order['customer']['externalId']) {
                     if (!$order['customer']['email']) {
-                        $login = 'user_' . (microtime(true) * 100);
+                        $login = 'user_' . (microtime(true) * 1000) . mt_rand(1, 1000);
                         $server_name = 0 < strlen(SITE_SERVER_NAME)?
                             SITE_SERVER_NAME : 'server.com';
                         $order['customer']['email'] = $login . '@' . $server_name;
@@ -395,7 +395,7 @@ class ICrmOrderActions
                             $arUser = $dbUser->Fetch();
                             $registeredUserID = $arUser['ID'];
                         } else {
-                            $login = 'user_' . (microtime(true) * 100);
+                            $login = 'user_' . (microtime(true) * 1000) . mt_rand(1, 1000);
                             $registerNewUser = true;
                         }
                     }
diff --git a/intaro.intarocrm/install/index.php b/intaro.intarocrm/install/index.php
index 2163f70f..9c7388b8 100755
--- a/intaro.intarocrm/install/index.php
+++ b/intaro.intarocrm/install/index.php
@@ -383,6 +383,8 @@ class intaro_intarocrm extends CModule {
                                 '<optgroup label="' . $orderStatusGroup['name'] . '">';
 
                         foreach ($orderStatusGroup['statuses'] as $payment) {
+                            if(!isset($arResult['paymentList'][$payment])) continue;
+
                             if ($paymentStatusesArr[$bitrixPaymentStatus['ID']] == $arResult['paymentList'][$payment]['code']) {
                                 $input['payment-status-' . $bitrixPaymentStatus['ID']] .=
                                         '<option value="' . $arResult['paymentList'][$payment]['code'] . '" selected>';
diff --git a/intaro.intarocrm/install/step2.php b/intaro.intarocrm/install/step2.php
index c3a83e72..d8e12cb3 100755
--- a/intaro.intarocrm/install/step2.php
+++ b/intaro.intarocrm/install/step2.php
@@ -191,10 +191,12 @@ $defaultPayment = array(
                         <?php foreach($arResult['paymentGroupList'] as $orderStatusGroup): if(!empty($orderStatusGroup['statuses'])) : ?>
                         <optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>">
                             <?php foreach($orderStatusGroup['statuses'] as $payment): ?>
-                            <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>" 
-                                <?php if ($defaultPayStatuses[$bitrixPaymentStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>>
-                                <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
-                            </option>
+                                <?php if(isset($arResult['paymentList'][$payment])): ?>
+                                    <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>"
+                                        <?php if ($defaultPayStatuses[$bitrixPaymentStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>>
+                                        <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
+                                    </option>
+                                <?php endif; ?>
                             <?php endforeach; ?>
                         </optgroup>
                         <?php endif; endforeach; ?>