2 Commits
Author SHA1 Message Date
ivan.sadovin 1f29a07f63 Merge branch 'main' into 'release'
fix: remove stale shipping receipt line breaking Pay URL

See merge request products/cashier/cms/OpenCart3!16
2026-10-21 12:33:17 +03:00
ivan.sadovin 14af1646dd fix: remove stale shipping receipt line breaking Pay URL 2026-10-21 12:33:17 +03:00
4 changed files with 4 additions and 25 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
![PHP](https://img.shields.io/badge/PHP-5.6%2B-purple) ![PHP](https://img.shields.io/badge/PHP-5.6%2B-purple)
![License](https://img.shields.io/badge/License-MIT-green) ![License](https://img.shields.io/badge/License-MIT-green)
> **📦 Версия модуля: 1.0.4** > **📦 Версия модуля: 1.0.5**
> **ℹ️ Совместимость версий OpenCart:** > **ℹ️ Совместимость версий OpenCart:**
> 3.0.0.0, 3.0.1.1, 3.0.1.2, 3.0.2.0, 3.0.3.0, 3.0.3.1, 3.0.3.2, 3.0.3.3, 3.0.3.4, 3.0.3.5, 3.0.3.6, 3.0.3.7, 3.0.3.8, 3.0.3.9, 3.0.4.0, 3.0.4.1, 3.0.5.0 > 3.0.0.0, 3.0.1.1, 3.0.1.2, 3.0.2.0, 3.0.3.0, 3.0.3.1, 3.0.3.2, 3.0.3.3, 3.0.3.4, 3.0.3.5, 3.0.3.6, 3.0.3.7, 3.0.3.8, 3.0.3.9, 3.0.4.0, 3.0.4.1, 3.0.5.0
+1 -1
View File
@@ -2,7 +2,7 @@
<modification> <modification>
<name>PayAnyWay</name> <name>PayAnyWay</name>
<code>payanyway</code> <code>payanyway</code>
<version>1.0.4</version> <version>1.0.5</version>
<author>PayAnyWay</author> <author>PayAnyWay</author>
<link>https://payanyway.ru/</link> <link>https://payanyway.ru/</link>
<!-- <!--
@@ -9,7 +9,7 @@
class ControllerExtensionPaymentPayanyway extends Controller { class ControllerExtensionPaymentPayanyway extends Controller {
const CMS_NAME = 'OpenCart'; const CMS_NAME = 'OpenCart';
const MODULE_NAME = 'payanyway'; const MODULE_NAME = 'payanyway';
const MODULE_VERSION = '1.0.4'; const MODULE_VERSION = '1.0.5';
const MODULE_DEFAULT_SORT_ORDER = 0; const MODULE_DEFAULT_SORT_ORDER = 0;
/** Маркер вставки OCMOD из install.xml в роутере витрины (приём Check/Pay URL методом POST). */ /** Маркер вставки OCMOD из install.xml в роутере витрины (приём Check/Pay URL методом POST). */
@@ -7,7 +7,7 @@
*/ */
class ControllerExtensionPaymentPayanyway extends Controller { class ControllerExtensionPaymentPayanyway extends Controller {
const MODULE_NAME = 'payanyway'; const MODULE_NAME = 'payanyway';
const MODULE_VERSION = '1.0.4'; const MODULE_VERSION = '1.0.5';
const CMS_NAME = 'OpenCart'; const CMS_NAME = 'OpenCart';
const PAYMENT_SERVER_PROD = 'prod'; const PAYMENT_SERVER_PROD = 'prod';
@@ -871,18 +871,6 @@ class ControllerExtensionPaymentPayanyway extends Controller {
$inventory[] = $position; $inventory[] = $position;
} }
$name = isset($deliveryInfo['title']) ? $deliveryInfo['title'] : '';
$price = isset($deliveryInfo['value']) ? (float)$deliveryInfo['value'] : 0;
$inventory[] = array(
'name' => $this->validateString($name, self::ITEM_NAME_MAX_LENGTH),
'price' => $this->formatPrice($price),
'quantity' => '1',
'vatTag' => $this->vatRate,
'pm' => self::DEFAULT_PAYMENT_METHOD,
'po' => self::SHIPPING_PAYMENT_OBJECT,
'measure' => self::DEFAULT_MEASURE,
);
return json_encode($inventory, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); return json_encode($inventory, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
} }
@@ -1263,13 +1251,4 @@ class ControllerExtensionPaymentPayanyway extends Controller {
return self::CMS_NAME; return self::CMS_NAME;
} }
/**
* @return array
* @throws \Exception
*/
public function getAccountOrderProducts() {
$this->load->model('account/order');
return $this->model_account_order->getOrderProducts($this->orderId);
}
} }