Merge pull request #117 from yoomoney/release/v2.2.3

Release/2.2.3
yoomoney · Dec 15, 2021 · c6d5bb1 · c6d5bb1
2 parents 85dc603 + f542962
commit c6d5bb1
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### v2.2.3 от 15.12.2021
+* Добавлены поля для дефолтных значений для типа и предмета оплаты для сертификатов в настройках модуля
+* Исправлено получение дефолтных значений для доставки при формировании чека
+* Изменен порядок текстовых полей в разделе настроек параметров чеков в настройках модуля
+
 ### v2.2.2 от 07.12.2021
 * Оптимизация под новые версии Opencart
 

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

diff --git a/src/upload/admin/language/en-gb/extension/payment/yoomoney.php b/src/upload/admin/language/en-gb/extension/payment/yoomoney.php
@@ -282,3 +282,7 @@
 
 $_['kassa_delivery_payment_mode_default_label']    = 'Признак способа расчета для доставки';
 $_['kassa_delivery_payment_subject_default_label'] = 'Признак предмета расчета для доставки';
+
+$_['kassa_voucher_payment_mode_default_label']    = 'Признак способа расчета для сертификата';
+$_['kassa_voucher_payment_subject_default_label'] = 'Признак предмета расчета для сертификата';
+$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
diff --git a/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php b/src/upload/admin/language/ru-ru/extension/payment/yoomoney.php
@@ -333,3 +333,7 @@
 
 $_['kassa_delivery_payment_mode_default_label']    = 'Признак способа расчета для доставки';
 $_['kassa_delivery_payment_subject_default_label'] = 'Признак предмета расчета для доставки';
+
+$_['kassa_voucher_payment_mode_default_label']    = 'Признак способа расчета для сертификата';
+$_['kassa_voucher_payment_subject_default_label'] = 'Признак предмета расчета для сертификата';
+$_['kassa_voucher_default_description'] = 'Признаки предмета расчёта и способа расчёта для сертификатов будут браться из следующих полей:';
diff --git a/src/upload/admin/model/extension/payment/yoomoney.php b/src/upload/admin/model/extension/payment/yoomoney.php
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '2.2.2';
+    const MODULE_VERSION = '2.2.3';
     const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
 
     private $kassaModel;

diff --git a/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig b/src/upload/admin/view/template/extension/payment/yoomoney/kassa.twig
@@ -360,6 +360,7 @@
                         <p class="help-block">{{ language.get('kassa_tax_system_default_description') }}</p>
                     </div>
                 </div>
+                <p class="help-block receipt-only">{{ language.get('kassa_payment_subject_default_description') }}</p>
                 <div class="form-group receipt-only">
                     <label class="col-sm-2 control-label" for="kassa-payment-mode-default">
                         {{ language.get('kassa_payment_mode_default_label') }}
@@ -412,7 +413,35 @@
                         </select>
                     </div>
                 </div>
-                <p class="help-block receipt-only">{{ language.get('kassa_payment_subject_default_description') }}</p>
+{#Voucher#}
+                <p class="help-block receipt-only">{{ language.get('kassa_voucher_default_description') }}</p>
+                <div class="form-group receipt-only">
+                    <label class="col-sm-2 control-label" for="kassa-voucher-payment-mode-default">
+                        {{ language.get('kassa_voucher_payment_mode_default_label') }}
+                    </label>
+                    <div class="col-sm-10">
+                        <select id="kassa-voucher-payment-mode-default" name="yoomoney_kassa_voucher_payment_mode_default"
+                                class="form-control">
+                            {% for id, name in kassa.getPaymentModeEnum() %}
+                                <option value="{{ id }}"{{ kassa.getDefaultDeliveryPaymentMode() == id ? ' selected' : '' }}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group receipt-only">
+                    <label class="col-sm-2 control-label" for="kassa-voucher-payment-subject">
+                        {{ language.get('kassa_voucher_payment_subject_default_label') }}
+                    </label>
+                    <div class="col-sm-10">
+                        <select id="kassa-voucher-payment-subject" name="yoomoney_kassa_voucher_payment_subject_default"
+                                class="form-control">
+                            {% for id, name in kassa.getPaymentSubjectEnum() %}
+                                <option value="{{ id }}"{{ kassa.getDefaultDeliveryPaymentSubject() == id ? ' selected' : '' }}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+{#End Voucher#}
                 <div class="form-group receipt-only">
 
                     <label class="col-sm-2 control-label">

diff --git a/src/upload/catalog/controller/extension/payment/yoomoney.php b/src/upload/catalog/controller/extension/payment/yoomoney.php
@@ -22,7 +22,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.2.2';
+    const MODULE_VERSION = '2.2.3';
 
     /**
      * @var ModelExtensionPaymentYoomoney

diff --git a/src/upload/catalog/model/extension/payment/yoomoney.php b/src/upload/catalog/model/extension/payment/yoomoney.php
@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYoomoney extends Model
 {
-    const MODULE_VERSION = '2.2.2';
+    const MODULE_VERSION = '2.2.3';
 
     private $kassaModel;
     private $walletModel;
@@ -565,8 +565,10 @@ private function addReceipt($builder, $orderInfo)
         $defaultTaxSystemCode           = $this->config->get('yoomoney_kassa_tax_system_default');
         $defaultPaymentSubject          = $this->config->get('yoomoney_kassa_payment_subject_default');
         $defaultPaymentMode             = $this->config->get('yoomoney_kassa_payment_mode_default');
-        $defaultDeliveryPaymentSubject  = $this->config->get('yoomoney_kassa_payment_subject_default');
-        $defaultDeliveryPaymentMode     = $this->config->get('yoomoney_kassa_payment_mode_default');
+        $defaultDeliveryPaymentSubject  = $this->config->get('yoomoney_kassa_delivery_payment_subject_default');
+        $defaultDeliveryPaymentMode     = $this->config->get('yoomoney_kassa_delivery_payment_mode_default');
+        $defaultVoucherPaymentMode     = $this->config->get('yoomoney_kassa_voucher_payment_mode_default');
+        $defaultVoucherPaymentSubject     = $this->config->get('yoomoney_kassa_voucher_payment_subject_default');
 
         $orderProducts = $this->model_account_order->getOrderProducts($orderInfo['order_id']);
         foreach ($orderProducts as $prod) {
@@ -586,6 +588,23 @@ private function addReceipt($builder, $orderInfo)
             $builder->addReceiptItem($prod['name'], $price, $prod['quantity'], $vatCode, $paymentMode, $paymentSubject);
         }
 
+        $orderVouchers = $this->model_account_order->getOrderVouchers($orderInfo['order_id']);
+
+        foreach ($orderVouchers as $voucher) {
+            $paymentMode    = $defaultVoucherPaymentMode;
+            $paymentSubject = $defaultVoucherPaymentSubject;
+            $price          = $this->currency->format($voucher['amount'], 'RUB', '', false);
+
+            $builder->addReceiptItem(
+                $voucher['description'],
+                $price,
+                1,
+                $defaultVatCode,
+                $paymentMode,
+                $paymentSubject
+            );
+        }
+
         $order_totals = $this->model_account_order->getOrderTotals($orderInfo['order_id']);
         foreach ($order_totals as $total) {
             if (isset($total['code']) && $total['code'] === 'shipping') {

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