Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ahead commits from 1.9.3.x #1541

Merged
merged 3 commits into from
Jul 30, 2021
Merged

Move ahead commits from 1.9.3.x #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bdb8c2
Couponcode adminhtml updated pull (#447)
seansan Feb 1, 2020
a81d250
fixed return value of saveCache method (#583)
sprankhub Apr 27, 2020
8c6d0e1
Copied #575
Sekiphp Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/code/core/Mage/Core/Model/Layout/Update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
</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>
</li>
<?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>
Expand Down
1 change: 1 addition & 0 deletions app/locale/en_US/Mage_Sales.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?"
Expand Down