From 3623a8e1340e02742f1564132db9622d6fb7b5f8 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Wed, 9 Oct 2013 19:29:07 +0400
Subject: [PATCH] order final fixes

---
 intaro.intarocrm/classes/general/ICrmOrderActions.php | 6 ------
 intaro.intarocrm/options.php                          | 8 +++++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index 00bcec65..06749116 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -301,18 +301,13 @@ class ICrmOrderActions
  
         $dateStart = COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, null);
 
-        var_dump($dateStart);
-        
         $orderHistory = $api->orderHistory($dateStart);
-
-        var_dump($orderHistory);
         
         if($dateStart)
             $dateStart = new \DateTime($dateStart);
         
         // pushing existing orders
         foreach ($orderHistory as $order) {
-            var_dump($order['externalId']);
 
             if(!isset($order['externalId']) && !$order['externalId']) {
 
@@ -498,7 +493,6 @@ class ICrmOrderActions
                             implode(" ", $contactName), $order['externalId']);
 
                 foreach($order['items'] as $item) {
-                    var_dump($item);
                     // del from basket
                     if(isset($item['deleted']) && $item['deleted']) {
                         $p = CSaleBasket::GetList(
diff --git a/intaro.intarocrm/options.php b/intaro.intarocrm/options.php
index cb45c217..b5004e13 100755
--- a/intaro.intarocrm/options.php
+++ b/intaro.intarocrm/options.php
@@ -505,9 +505,11 @@ if (isset($_POST['Update']) && ($_POST['Update'] == 'Y')) {
                 <?php foreach($arResult['paymentGroupList'] as $orderStatusGroup): if(!empty($orderStatusGroup['statuses'])) : ?>
                 <optgroup label="<?php echo $orderStatusGroup['name']; ?>">
                     <?php foreach($orderStatusGroup['statuses'] as $payment): ?>
-                    <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>" <?php if ($optionsPayStatuses[$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 ($optionsPayStatuses[$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; ?>