From 6a9b2a7e59e91306a40426eaaa3d1660f4812dbd Mon Sep 17 00:00:00 2001
From: Dmitry Akolzin <akolzinvs@gmail.com>
Date: Wed, 12 Apr 2017 15:04:24 +0300
Subject: [PATCH] 	update:     
 admin/controller/extension/module/retailcrm.php 	update:     
 admin/view/template/extension/module/retailcrm.tpl 	update:     
 catalog/controller/api/retailcrm.php 	update:      system/cron/export.php

---
 .../controller/extension/module/retailcrm.php |  1 +
 .../template/extension/module/retailcrm.tpl   | 31 ++++---------------
 catalog/controller/api/retailcrm.php          |  4 +--
 system/cron/export.php                        |  1 -
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/admin/controller/extension/module/retailcrm.php b/admin/controller/extension/module/retailcrm.php
index becfc88..8a47e69 100644
--- a/admin/controller/extension/module/retailcrm.php
+++ b/admin/controller/extension/module/retailcrm.php
@@ -369,6 +369,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
 
         $this->load->model('extension/retailcrm/order');
         $this->model_extension_retailcrm_order->uploadToCrm($fullOrders);
+        $file = fopen(DIR_SYSTEM . '/cron/export_done.txt', "x");
     }
 
     /**
diff --git a/admin/view/template/extension/module/retailcrm.tpl b/admin/view/template/extension/module/retailcrm.tpl
index aee1e63..a90b004 100644
--- a/admin/view/template/extension/module/retailcrm.tpl
+++ b/admin/view/template/extension/module/retailcrm.tpl
@@ -63,31 +63,7 @@
                         <?php endforeach; ?>
                         </div>
                     </div>
-                    <h3><?php echo $retailcrm_upload_order; ?></h3>
-                    <div class="retailcrm_unit">
-                        <label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
-                        <button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
-                    </div>
-
-                    <h3><?php echo $retailcrm_countries_settings; ?></h3>
-                    <div class="retailcrm_unit">
-                        <div class="well well-sm" style="height: 150px; overflow: auto; width: 30%;">
-                        <?php foreach($countries as $country) : ?>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="<?php echo 'retailcrm_country[]'; ?>" value="<?php echo $country['country_id']; ?>" <?php if(isset($saved_settings['retailcrm_country']) && in_array($country['country_id'], $saved_settings['retailcrm_country'])): echo 'checked'; endif;?>>
-                            <?php echo $country['name']; ?>
-                            </label>
-                        </div>
-                        <?php endforeach; ?>
-                        </div>
-                    </div>
-                    <h3><?php echo $retailcrm_upload_order; ?></h3>
-                    <div class="retailcrm_unit">
-                        <label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
-                        <button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
-                    </div>
-
+                
                     <?php if (isset($saved_settings['retailcrm_apikey']) && $saved_settings['retailcrm_apikey'] != '' && isset($saved_settings['retailcrm_url']) && $saved_settings['retailcrm_url'] != ''): ?>
 
                     <?php if (!empty($retailcrm_errors)) : ?>
@@ -95,6 +71,11 @@
                     <div class="warning"><?php echo $retailcrm_error ?></div>
                     <?php endforeach; ?>
                     <?php else: ?>
+                    <h3><?php echo $retailcrm_upload_order; ?></h3>
+                    <div class="retailcrm_unit">
+                        <label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
+                        <button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
+                    </div>
                     <h3><?php echo $retailcrm_dict_settings; ?></h3>
 
                     <h4><?php echo $retailcrm_dict_delivery; ?></h4>
diff --git a/catalog/controller/api/retailcrm.php b/catalog/controller/api/retailcrm.php
index d33ca2b..2a127d6 100644
--- a/catalog/controller/api/retailcrm.php
+++ b/catalog/controller/api/retailcrm.php
@@ -59,14 +59,14 @@ class ControllerApiRetailcrm extends Controller
 							$this->load->language('extension/shipping/' . $shippingModule['code']);
 							$quote_data[] = array(
 								'code' => $shippingModule['code'],
-								'title' => $this->language->get('text_description')
+								'title' => $this->language->get('text_title')
 							);
 						}
 					} else {
 						$this->load->language('extension/shipping/' . $shippingModule['code']);
 							$quote_data[] = array(
 								'code' => $shippingModule['code'],
-								'title' => $this->language->get('text_description')
+								'title' => $this->language->get('text_title')
 							);
 					}
 				}
diff --git a/system/cron/export.php b/system/cron/export.php
index cbf86bf..5880920 100644
--- a/system/cron/export.php
+++ b/system/cron/export.php
@@ -1,4 +1,3 @@
 <?php
 $cli_action = 'extension/module/retailcrm/export';
 require_once('dispatch.php');
-$file = fopen(DIR_SYSTEM . '/cron/export_done.txt', "x");
\ No newline at end of file