Shop-Script v.11.2.1

  * Fixed incorrect transfer of the order amount, containing taxes, to a payment gateway, which occurred in the update to version 11.2.0.

Author: Leonix

lib/classes/shopHelper.class.php

@@ -2071,19 +2071,6 @@ public static function getWaOrder($order, $options = array())
 
         }
 
-        $tax_included = null;
-        foreach ($order['items'] as $item_id => $item) {
-            if (isset($item['tax_included'])) {
-                if ($tax_included !== null) {
-                    if ($tax_included != !!$item['tax_included']) {
-                        $tax_included = 0;
-                    }
-                } else {
-                    $tax_included = !!$item['tax_included'];
-                }
-            }
-        }
-
         $item_options = array(
             'order_currency'   => ifset($order['currency'], $default_currency),
             'shipping_address' => $shipping_address,
@@ -2163,10 +2150,6 @@ public static function getWaOrder($order, $options = array())
             $order_data['dimensions_unit'] = $options['dimensions'];
         }
 
-        if (in_array($tax_included, array(true, false), true)) {
-            $order_data['tax_included'] = $tax_included;
-        }
-
         if (isset($order['params']['shipping_tax_percent'])) {
             $order_data['shipping_tax_rate'] = $order['params']['shipping_tax_percent'];
         }
@@ -2187,17 +2170,20 @@ public static function getWaOrder($order, $options = array())
             $order_data['discount'] = 0;
         }
 
+        // order.total always includes all taxes
+        $order_data['tax_included'] = true;
         $order_data['total'] = $order_data['shipping'];
+        if (empty($order_data['shipping_tax_included']) && !empty($order_data['shipping_tax_rate'])) {
+            $order_data['total'] *= 1 + $order_data['shipping_tax_rate']/100;
+        }
         foreach ($order_data['items'] as $item) {
-            $item_subtotal = $item['price'] * $item['quantity'];
+            $item_subtotal = $item['price'] * $item['quantity'] - ifset($item, 'total_discount', 0);
             if (isset($item['tax_included']) && empty($item['tax_included']) && !empty($item['tax_rate'])) {
                 $item_subtotal *= 1 + $item['tax_rate']/100;
             }
             $order_data['total'] += $item_subtotal;
         }
 
-        $order_data['total'] -= $order_data['discount'];
-
         $total = self::workupValue($order['total'], 'price', $options['currency'], $order['currency']);
 
         if ($total !== $order_data['total']) {

lib/config/app.php

@@ -13,8 +13,8 @@
     'pages'            => true,
     'mobile'           => true,
     'my_account'       => true,
-    'version'          => '11.2.0',
-    'critical'         => '11.2.0',
+    'version'          => '11.2.1',
+    'critical'         => '11.2.1',
     'vendor'           => 'webasyst',
     'csrf'             => true,
     'payment_plugins'  => array(