From 4bdb8c2cfd34a7bc603d56cd29650eb021331650 Mon Sep 17 00:00:00 2001
From: SNH_NL <seansan@users.noreply.github.com>
Date: Sat, 1 Feb 2020 12:42:25 +0100
Subject: [PATCH 1/3] Couponcode adminhtml updated pull (#447)

* solve longstanding order shortcoming (so actual coupon code on order view)

solve longstanding order shortcoming (so actual coupon code on order view in adminhtml)
now our logistics see the description @ totals overview: but have to ask the customer: which code was it? esp. handy when using generated codes
simple fix: please improve if you think this can be done better.
Breaks nothing, quickwin for admin users

* Sloppy missed clsoing div

* Updated string

* Add coupon code translations

* Update Mage_Adminhtml.csv

* Added coupon code

* Escape coupon code and description in template.

Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
---
 .../default/default/template/sales/order/view/tab/info.phtml   | 3 +++
 app/locale/en_US/Mage_Sales.csv                                | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
index 16186d92c2f..e6be697ed85 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
@@ -45,6 +45,9 @@
             <fieldset>
                 <?php echo $this->getPaymentHtml() ?>
                 <div><?php echo Mage::helper('sales')->__('Order was placed using %s', $_order->getOrderCurrencyCode()) ?></div>
+                <?php if ($_order->getCouponCode()): ?>
+                    <div><?php echo Mage::helper('sales')->__('Coupon code used: %s (%s)', $this->escapeHtml($_order->getCouponCode()), $this->escapeHtml($_order->getDiscountDescription())); ?></div>
+                <?php endif; ?>
             </fieldset>
         </div>
     </div>
diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv
index c22c2960579..17f2a6ed83b 100644
--- a/app/locale/en_US/Mage_Sales.csv
+++ b/app/locale/en_US/Mage_Sales.csv
@@ -60,6 +60,7 @@
 "Append Comments","Append Comments"
 "Apply","Apply"
 "Apply Coupon Code","Apply Coupon Code"
+"Coupon code used: %s (%s)","Coupon code used: %s (%s)"
 "Approved the payment online.","Approved the payment online."
 "Are you sure you want to accept this payment?","Are you sure you want to accept this payment?"
 "Are you sure you want to cancel this order?","Are you sure you want to cancel this order?"

From a81d2507376599460fc2c683fb2ba791d66afd15 Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:31:45 +0200
Subject: [PATCH 2/3] fixed return value of saveCache method (#583)

---
 app/code/core/Mage/Core/Model/Layout/Update.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php
index 0d715cb0192..38de7e36bfa 100644
--- a/app/code/core/Mage/Core/Model/Layout/Update.php
+++ b/app/code/core/Mage/Core/Model/Layout/Update.php
@@ -246,13 +246,14 @@ public function saveCache()
         // Cache key is sha1 hash of actual XML string
         $hash = sha1($str);
         $tags[] = self::LAYOUT_GENERAL_CACHE_TAG;
-        Mage::app()->saveCache($hash, $this->getCacheId(), $tags, null);
+        $returnValue = Mage::app()->saveCache($hash, $this->getCacheId(), $tags, null);
 
         // Only save actual XML to cache if it doesn't already exist
         if (!Mage::app()->testCache(self::XML_KEY_PREFIX . $hash)) {
-            Mage::app()->saveCache($str, self::XML_KEY_PREFIX . $hash, $tags, null);
+            $returnValue = Mage::app()->saveCache($str, self::XML_KEY_PREFIX . $hash, $tags, null);
         }
-        return true;
+
+        return $returnValue;
     }
 
     /**

From 8c6d0e1bc08923203cfdaa3c241a28cbd3d8983f Mon Sep 17 00:00:00 2001
From: Lubos Hubacek <lubos.hubacek@ateli.cz>
Date: Sat, 10 Apr 2021 12:30:21 +0200
Subject: [PATCH 3/3] Copied #575

---
 .../rwd/default/template/checkout/onepage/shipping.phtml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index 9aafa8fc376..4b06b088303 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -50,7 +50,7 @@
                     </li>
             <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
                     <li class="wide">
-                        <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
+                        <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>
@@ -58,7 +58,7 @@
             <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
             <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                     <li class="wide">
-                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
+                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>