Merge pull request #86 from yandex-money/release/v1.9.2

Release/1.9.2
yoomoney · Oct 6, 2020 · bca5689 · bca5689
2 parents 6a1a4bc + bfc96f5
commit bca5689
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v1.9.2 от 06.10.2020
+* Добавлена ставка НДС 20% для СББОЛ
+
 ### v1.9.1 от 25.09.2020
 * Изменен принцип подключения внутренних шаблонов
 * Фикс шаблона номера телефона для второго чека

diff --git a/src/install.xml b/src/install.xml
@@ -2,7 +2,7 @@
 <modification>
     <name>Y.CMS for Opencart 3.x</name>
     <code>ycms.2.0</code>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
     <author>Yandex.Money</author>
     <!-- Вставка кнопки в историю заказов-->
     <file path="catalog/controller/account/order.php">

diff --git a/src/upload/admin/controller/extension/payment/yandex_money.php b/src/upload/admin/controller/extension/payment/yandex_money.php
@@ -12,7 +12,7 @@
 class ControllerExtensionPaymentYandexMoney extends Controller
 {
     const MODULE_NAME = 'yandex_money';
-    const MODULE_VERSION = '1.9.1';
+    const MODULE_VERSION = '1.9.2';
 
     const WIDGET_INSTALL_STATUS_SUCCESS = true;
     const WIDGET_INSTALL_STATUS_FAIL    = false;

diff --git a/src/upload/admin/language/en-gb/extension/payment/yandex_money.php b/src/upload/admin/language/en-gb/extension/payment/yandex_money.php
@@ -409,6 +409,7 @@
 $_['b2b_tax_rate_7_label']           = '7%';
 $_['b2b_tax_rate_10_label']          = '10%';
 $_['b2b_tax_rate_18_label']          = '18%';
+$_['b2b_tax_rate_20_label']          = '20%';
 $_['b2b_sberbank_tax_message']       = 'There is a restriction for payments via Sberbank Business Online: one receipt can only contain products with the same VAT rate. If the client wants to pay for products with different VAT rates at the same time, we will show him the message explaining that it\'s not possible.';
 
 $_['kassa_payment_mode_default_label']          = 'Признак способа расчета';

diff --git a/src/upload/admin/language/ru-ru/extension/payment/yandex_money.php b/src/upload/admin/language/ru-ru/extension/payment/yandex_money.php
@@ -459,6 +459,7 @@
 $_['b2b_tax_rate_7_label']           = '7%';
 $_['b2b_tax_rate_10_label']          = '10%';
 $_['b2b_tax_rate_18_label']          = '18%';
+$_['b2b_tax_rate_20_label']          = '20%';
 $_['b2b_sberbank_tax_message']       = 'При оплате через Сбербанк Бизнес Онлайн есть ограничение: в одном чеке могут быть только товары с одинаковой ставкой НДС. Если клиент захочет оплатить за один раз товары с разными ставками — мы покажем ему сообщение, что так сделать не получится.';
 
 $_['kassa_payment_mode_default_label']          = 'Признак способа расчета';

diff --git a/src/upload/admin/model/extension/payment/yandex_money.php b/src/upload/admin/model/extension/payment/yandex_money.php
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYandexMoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '1.9.1';
+    const MODULE_VERSION = '1.9.2';
     const YCMS_EVENT_SECOND_RECEIPT_CODE = 'ycms_second_receipt_trigger';
 
     private $kassaModel;

diff --git a/src/upload/admin/view/template/extension/payment/yandex_money/kassa.twig b/src/upload/admin/view/template/extension/payment/yandex_money/kassa.twig
@@ -134,7 +134,7 @@
             <div class="col-sm-5">
                 <label class="form-check-label">
                     <input type="checkbox" name="yandex_money_kassa_currency_convert" value="on"
-                           id="currency_convert="
+                           id="currency_convert"
                            class="form-check-input"{{ kassa.getCurrencyConvert() ? ' checked' : '' }} />
                     {{ language.get('kassa_currency_convert') }}
                 </label>
@@ -387,11 +387,11 @@
                     </label>
                     <div class="col-sm-10">
                         <label style="font-weight: 600; padding-top: 9px; cursor: pointer" class="form-check-label">
-                            <input style="vertical-align:middle;margin:-2px 3px 0 0;cursor: pointer" type="radio" name="yandex_money_kassa_second_receipt_enable" value="1" class="form-check-input" {{ kassa.isSecondReceipt() ? ' checked' : '' }}/>
+                            <input style="vertical-align:middle;margin:-2px 3px 0 0;cursor: pointer" type="radio" id="kassa-second-receipt-enable-on" name="yandex_money_kassa_second_receipt_enable" value="1" class="form-check-input" {{ kassa.isSecondReceipt() ? ' checked' : '' }}/>
                             {{ language.get('kassa_second_receipt_enable') }}
                         </label>
                         <label style="font-weight: 600; margin-left: 10px; cursor: pointer" class="form-check-label">
-                            <input style="vertical-align:middle;margin:-2px 3px 0 0;cursor: pointer" type="radio" name="yandex_money_kassa_second_receipt_enable" value="0" class="form-check-input" {{ kassa.isSecondReceipt() ? ' ' : ' checked' }}/>
+                            <input style="vertical-align:middle;margin:-2px 3px 0 0;cursor: pointer" type="radio" id="kassa-second-receipt-enable-off" name="yandex_money_kassa_second_receipt_enable" value="0" class="form-check-input" {{ kassa.isSecondReceipt() ? ' ' : ' checked' }}/>
                             {{ language.get('kassa_second_receipt_disable') }}
                         </label>
                     </div>
@@ -406,7 +406,7 @@
                                     </label>
                                 </td>
                                 <td style="border: none">
-                                    <select name="yandex_money_kassa_second_receipt_status" class="form-control col-xl-4 col-md-4" data-toggle="tooltip" data-placement="left" title="">
+                                    <select id="kassa-second-receipt-status" name="yandex_money_kassa_second_receipt_status" class="form-control col-xl-4 col-md-4" data-toggle="tooltip" data-placement="left" title="">
                                         {% for id, name in orderStatuses %}
                                             <option value="{{ id }}"{{ kassa.getSecondReceiptStatus == id ? ' selected' : '' }}>{{ name }}</option>
                                         {% endfor %}
@@ -425,7 +425,7 @@
         <div class="form-group">
             <label class="col-sm-2 control-label">Показывать ссылку на сайт Кассы</label>
             <div class="col-sm-10">
-                <select id="kassa-debug-log" name="yandex_money_kassa_show_in_footer" class="form-control">
+                <select id="kassa-show-in-footer" name="yandex_money_kassa_show_in_footer" class="form-control">
                     <option value="off"
                             {% if not kassa.getShowLinkInFooter() %}selected{% endif %}>{{ language.get('kassa_debug_log_off') }}</option>
                     <option value="on"

diff --git a/src/upload/catalog/controller/extension/payment/yandex_money.php b/src/upload/catalog/controller/extension/payment/yandex_money.php
@@ -21,7 +21,7 @@
 class ControllerExtensionPaymentYandexMoney extends Controller
 {
     const MODULE_NAME = 'yandex_money';
-    const MODULE_VERSION = '1.9.1';
+    const MODULE_VERSION = '1.9.2';
 
     /**
      * @var ModelExtensionPaymentYandexMoney

diff --git a/src/upload/catalog/model/extension/payment/yandex_money.php b/src/upload/catalog/model/extension/payment/yandex_money.php
@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYandexMoney extends Model
 {
-    const MODULE_VERSION = '1.9.1';
+    const MODULE_VERSION = '1.9.2';
 
     private $kassaModel;
     private $walletModel;

diff --git a/src/upload/catalog/model/extension/payment/yandex_money/Model/KassaModel.php b/src/upload/catalog/model/extension/payment/yandex_money/Model/KassaModel.php
@@ -220,7 +220,7 @@ public function getTaxRateList()
 
     public function getB2bTaxRateList()
     {
-        return array(VatDataType::UNTAXED, VatDataRate::RATE_7, VatDataRate::RATE_10, VatDataRate::RATE_18);
+        return array(VatDataType::UNTAXED, VatDataRate::RATE_7, VatDataRate::RATE_10, VatDataRate::RATE_18, VatDataRate::RATE_20);
     }
 
     public function getB2bTaxRateId($shopTaxRateId)

diff --git a/ycms2.oc3x.ocmod.zip b/ycms2.oc3x.ocmod.zip