Merge pull request #20 from robokassa/new_vat

new vat
robokassa · Dec 24, 2024 · cff0369 · cff0369
2 parents dc54296 + c2330d9
commit cff0369
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 42 deletions.
diff --git a/OpenCart 3.x/install.xml b/OpenCart 3.x/install.xml
@@ -1,7 +1,7 @@
 <modification>
   <code>Robokassa</code>
   <name>Robokassa opencart</name>
-  <version>1.0.0</version>
+  <version>1.0.2</version>
   <author>Robokassa</author>
   <link>https://robokassa.com</link>
   <file path="catalog/controller/api/order.php">

diff --git a/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php b/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php
@@ -178,8 +178,12 @@ public function index()
         $data['robokassa_tax_list'] = array(
             'none' => 'без НДС',
             'vat0' => 'НДС по ставке 0%',
+            'vat5' => 'НДС по ставке 5%',
+            'vat7' => 'НДС по ставке 7%',
             'vat10' => 'НДС чека по ставке 10%',
             'vat20' => 'НДС чека по ставке 20%',
+            'vat105' => 'НДС чека по расчетной ставке 5/105',
+            'vat107' => 'НДС чека по расчетной ставке 7/107',
             'vat110' => 'НДС чека по расчетной ставке 10/110',
             'vat120' => 'НДС чека по расчетной ставке 20/120',
         );

diff --git a/OpenCart 3.x/upload/catalog/model/extension/payment/robokassa.php b/OpenCart 3.x/upload/catalog/model/extension/payment/robokassa.php
@@ -239,18 +239,26 @@ function robokassa_hold_confirm($order_id)
         }
 
         $shipping = $this->getTotalShipping($order_id);
-        $shipping_name = $shipping['title'];
-        $shipping_price = $shipping['value'];
+        // Проверяем, есть ли доставка
+        if (is_array($shipping) && isset($shipping['title'], $shipping['value'])) {
+            $shipping_name = $shipping['title'];
+            $shipping_price = $shipping['value'];
 
-        if ($shipping_price > 0) {
-            $receipt_items[] = array(
-                'name' => utf8_substr(trim(htmlspecialchars($shipping_name)), 0, 63),
-                'quantity' => 1,
-                'sum' => $this->currency->format($shipping_price, 'RUB', false, false),
-                'tax' => $this->config->get('payment_robokassa_tax'),
-                'payment_method' => 'full_prepayment',
-                'payment_object' => $this->config->get('payment_robokassa_payment_object'),
-            );
+            // Добавляем данные о доставке в чек, если цена доставки больше 0
+            if ($shipping_price > 0) {
+                $receipt_items[] = array(
+                    'name' => utf8_substr(trim(htmlspecialchars($shipping_name)), 0, 63),
+                    'quantity' => 1,
+                    'sum' => $this->currency->format($shipping_price, 'RUB', false, false),
+                    'tax' => $this->config->get('payment_robokassa_tax'),
+                    'payment_method' => 'full_prepayment',
+                    'payment_object' => $this->config->get('payment_robokassa_payment_object'),
+                );
+            }
+        } else {
+            // Если доставка отсутствует, устанавливаем значения по умолчанию
+            $shipping_name = '';
+            $shipping_price = 0;
         }
 
         $request_data = array(

diff --git a/OpenCart 4.x/upload/robokassa/admin/controller/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/admin/controller/payment/robokassa.php
@@ -182,8 +182,12 @@ public function index()
         $data['robokassa_tax_list'] = array(
             'none' => 'без НДС',
             'vat0' => 'НДС по ставке 0%',
+            'vat5' => 'НДС по ставке 5%',
+            'vat7' => 'НДС по ставке 7%',
             'vat10' => 'НДС чека по ставке 10%',
             'vat20' => 'НДС чека по ставке 20%',
+            'vat105' => 'НДС чека по расчетной ставке 5/105',
+            'vat107' => 'НДС чека по расчетной ставке 7/107',
             'vat110' => 'НДС чека по расчетной ставке 10/110',
             'vat120' => 'НДС чека по расчетной ставке 20/120',
         );

diff --git a/OpenCart 4.x/upload/robokassa/admin/language/en-gb/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/admin/language/en-gb/payment/robokassa.php
@@ -5,7 +5,7 @@
 // Text 
 $_['text_payment']      	= 'Оплата';
 $_['text_success']       	= 'Настройки модуля оплаты Робокасса обновлены!';
-$_['text_robokassa'] 		= '<a target="_blank" href="https://robokassa.ru/"><img src="/admin/view/image/payment/robokassa.png" alt="robokassa" style="max-width:140px" /></a>';
+$_['text_robokassa'] 		= '<a target="_blank" href="https://robokassa.ru/"><img src="/extension/robokassa/admin/view/image/payment/robokassa.png" alt="robokassa" style="max-width:140px" /></a>';
 $_['text_edit']      	    = 'Редактирование модуля "Робокасса"';
 $_['text_enabled']          = 'Включено';
 $_['text_disabled']         = 'Отключено';

diff --git a/OpenCart 4.x/upload/robokassa/admin/language/ru-ru/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/admin/language/ru-ru/payment/robokassa.php
@@ -5,7 +5,7 @@
 // Text 
 $_['text_payment']      	= 'Оплата';
 $_['text_success']       	= 'Настройки модуля оплаты Робокасса обновлены!';
-$_['text_robokassa'] 		= '<a target="_blank" href="https://robokassa.ru/"><img src="/admin/view/image/payment/robokassa.png" alt="robokassa" style="max-width:140px" /></a>';
+$_['text_robokassa'] 		= '<a target="_blank" href="https://robokassa.ru/"><img src="/extension/robokassa/admin/view/image/payment/robokassa.png" alt="robokassa" style="max-width:140px" /></a>';
 $_['text_edit']      	    = 'Редактирование модуля "Робокасса"';
 $_['text_enabled']          = 'Включено';
 $_['text_disabled']         = 'Отключено';

diff --git a/OpenCart 4.x/upload/robokassa/catalog/language/en-gb/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/catalog/language/en-gb/payment/robokassa.php
@@ -1,4 +1,4 @@
 <?php
 // Text
-$_['text_title']       = 'Робокасса <img src="image/payment/robokassa.png" alt="" style="max-width: 150px;">';
+$_['text_title']       = 'Робокасса';
 $_['text_description']       = 'Робокасса <img src="image/payment/robokassa.png" alt="" style="max-width: 150px;">';
diff --git a/OpenCart 4.x/upload/robokassa/catalog/language/ru-ru/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/catalog/language/ru-ru/payment/robokassa.php
@@ -1,4 +1,4 @@
 <?php
 // Text
-$_['text_title']       = 'Робокасса <img src="image/payment/robokassa.png" alt="" style="max-width: 150px;">';
+$_['text_title']       = 'Робокасса';
 $_['text_description']       = 'Робокасса <img src="image/payment/robokassa.png" alt="" style="max-width: 150px;">';
diff --git a/OpenCart 4.x/upload/robokassa/catalog/model/payment/robokassa.php b/OpenCart 4.x/upload/robokassa/catalog/model/payment/robokassa.php
@@ -3,34 +3,25 @@
 
 class Robokassa extends \Opencart\System\Engine\Model {
 
-	public function getMethods($address) {
-		$this->load->language('extension/robokassa/payment/robokassa');
-
-		if ($this->config->get('payment_robokassa_status')) {
+    public function getMethods($address)
+    {
+        $this->load->language('extension/robokassa/payment/robokassa');
 
-			if (!$this->config->get('payment_robokassa_geo_zone_id')) {
-				$status = TRUE;
-			} else {
-				$status = FALSE;
-			}
-		} else {
-			$status = FALSE;
-		}
-
-		$method_data = array();
-
-		if ($status) {
-			$method_data = array(
-				'code'       => 'robokassa',
-				'title'      => $this->language->get('text_title'),
-				'terms'      => '',
-				'sort_order' => $this->config->get('payment_robokassa_sort_order')
-			);
-		}
-		return $method_data;
-	}
-
+        $option_data['robokassa'] = [
+            'code' => 'robokassa.robokassa',
+            'name' => $this->language->get('text_title')
+        ];
 
+        $method_data = array(
+            'code'          => 'robokassa',
+            'option'        => $option_data,
+            'name'          => $this->language->get('text_title'),
+            'sort_order'    => $this->config->get('payment_robokassa_sort_order'),
+        );
+
+        return $method_data;
+    }
+
     protected static function formatSignReplace($string)
     {
     	return \strtr(