From 268e5b4279f10b3d520eeebab2e69a9601d74e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?=
 <dkruglovn@gmail.com>
Date: Fri, 6 Dec 2019 11:01:26 +0300
Subject: [PATCH 1/2] fixed output "status_changes" option

---
 .../admin/view/template/extension/module/retailcrm.twig       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig
index 90057bf..55f2e99 100644
--- a/src/upload/admin/view/template/extension/module/retailcrm.twig
+++ b/src/upload/admin/view/template/extension/module/retailcrm.twig
@@ -130,14 +130,14 @@
                                     <div class="col-sm-10">
                                         <label class="radio-inline">
                                         <input type="radio" name="module_retailcrm_status_changes" value="1"
-                                            {% if saved_settings.retailcrm_status_changes is defined and saved_settings.retailcrm_status_changes == 1 %}
+                                            {% if saved_settings.module_retailcrm_status_changes is defined and saved_settings.module_retailcrm_status_changes == 1 %}
                                                 checked
                                             {% endif %} />
                                         {{ text_yes }}
                                     </label>
                                     <label class="radio-inline">
                                         <input type="radio" name="module_retailcrm_status_changes" value="0"
-                                        {% if saved_settings.retailcrm_status_changes is not defined or saved_settings.retailcrm_status_changes == 0 %}
+                                        {% if saved_settings.module_retailcrm_status_changes is not defined or saved_settings.module_retailcrm_status_changes == 0 %}
                                             checked
                                         {% endif %} />
                                         {{ text_no }}

From 2da9acf18d7929468fd1342c894525cbe9c658fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?=
 <dkruglovn@gmail.com>
Date: Wed, 11 Dec 2019 12:29:08 +0300
Subject: [PATCH 2/2] fixed selecting "special_price" in views

---
 src/upload/admin/view/template/extension/module/retailcrm.tpl  | 1 +
 src/upload/admin/view/template/extension/module/retailcrm.twig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/upload/admin/view/template/extension/module/retailcrm.tpl b/src/upload/admin/view/template/extension/module/retailcrm.tpl
index c7fd402..743b958 100644
--- a/src/upload/admin/view/template/extension/module/retailcrm.tpl
+++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl
@@ -176,6 +176,7 @@
                     <label class="col-sm-2 control-label" style="text-align:right!important;" for="opencart_customer_group_<?php echo $customerGroup['customer_group_id']; ?>"><?php echo $customerGroup['name']; ?></label>
                     <div class="col-md-4 col-sm-10">
                       <select id="retailcrm_special_<?php echo $cid; ?>" name="retailcrm_special_<?php echo $cid; ?>" class="form-control">
+                        <option value="" <?php if (empty($saved_settings['retailcrm_special_' . $cid])) echo 'selected'; ?>>---</option>
                         <?php foreach ($priceTypes as $k => $priceType): ?>
                         <?php if ($priceType['active'] == true and $priceType['default'] == false) :?>
                         <option value="<?php echo $priceType['code'];?>" <?php if(isset($saved_settings['retailcrm_special_' . $cid]) && $priceType['code'] == $saved_settings['retailcrm_special_' . $cid]):?>selected="selected"<?php endif;?>>
diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig
index 55f2e99..90679af 100644
--- a/src/upload/admin/view/template/extension/module/retailcrm.twig
+++ b/src/upload/admin/view/template/extension/module/retailcrm.twig
@@ -177,6 +177,7 @@
                                                 <label class="col-sm-2 control-label" for="opencart_customer_group_{{ cud }}">{{ customerGroup.name }}</label>
                                                 <div class="col-md-4 col-sm-10">
                                                     <select id="module_retailcrm_special_{{ cud }}" name="module_retailcrm_special_{{ cud }}" class="form-control">
+                                                        <option value="" {% if saved_settings['module_retailcrm_special_'~cud] is not defined or saved_settings['module_retailcrm_special_'~cud] is empty %}selected{% endif %}>---</option>
                                                         {% for priceType in priceTypes %}
                                                             {% if priceType.active == true and priceType.default == false%}
                                                                 <option value ="{{ priceType.code }}" {% if saved_settings['module_retailcrm_special_'~cud] is defined and priceType.code == saved_settings['module_retailcrm_special_'~cud] %} selected="selected" {% endif %}>