From a4b93d5ad305d8da8667f03e54ff56b43b0b71b1 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 31 Oct 2016 01:52:59 +0100
Subject: [PATCH] Fix shipment stats display (language strings messed up in BE)
in BE order view
---
language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini | 1 +
rules_shipping_base.php | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini b/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini
index 703457a..bfb6627 100755
--- a/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini
+++ b/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini
@@ -39,6 +39,7 @@ OTSHIPMENT_RULES_SHIPPING_NAME="Shipment Name"
OTSHIPMENT_RULES_WEIGHT="Order Weight"
OTSHIPMENT_RULES_ARTICLES="Articles/Products in Order"
OTSHIPMENT_RULES_COST="Shipment Cost"
+OTSHIPMENT_RULES_TAX="Tax"
OTSHIPMENT_RULES_UNKNOWN_VARIABLE="Unknown variable '%s' in rule '%s'"
OTSHIPMENT_RULES_UNKNOWN_OPERATOR="Unknown operator '%s' in shipment rule '%s'"
diff --git a/rules_shipping_base.php b/rules_shipping_base.php
index 3602734..94fb249 100644
--- a/rules_shipping_base.php
+++ b/rules_shipping_base.php
@@ -197,11 +197,11 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
$html = '<table class="adminlist">' . "\n";
$html .= $this->getHtmlHeaderBE ();
- $html .= $this->getHtmlRowBE ('RULES_SHIPPING_NAME', $shipinfo->shipment_name);
- $html .= $this->getHtmlRowBE ('RULES_WEIGHT', $shipinfo->order_weight . ' ' . ShopFunctions::renderWeightUnit ($shipinfo->shipment_weight_unit));
- $html .= $this->getHtmlRowBE ('RULES_ARTICLES', $shipinfo->order_articles . '/' . $shipinfo->order_products);
- $html .= $this->getHtmlRowBE ('RULES_COST', $currency->priceDisplay ($shipinfo->shipment_cost));
- $html .= $this->getHtmlRowBE ('RULES_TAX', $taxDisplay);
+ $html .= $this->getHtmlRowBE ('OTSHIPMENT_RULES_SHIPPING_NAME', $shipinfo->shipment_name);
+ $html .= $this->getHtmlRowBE ('OTSHIPMENT_RULES_WEIGHT', $shipinfo->order_weight . ' ' . ShopFunctions::renderWeightUnit ($shipinfo->shipment_weight_unit));
+ $html .= $this->getHtmlRowBE ('OTSHIPMENT_RULES_ARTICLES', $shipinfo->order_articles . '/' . $shipinfo->order_products);
+ $html .= $this->getHtmlRowBE ('OTSHIPMENT_RULES_COST', $currency->priceDisplay ($shipinfo->shipment_cost));
+ $html .= $this->getHtmlRowBE ('OTSHIPMENT_RULES_TAX', $taxDisplay);
$html .= '</table>' . "\n";
return $html;
--
GitLab