Skip to content

Couponcode adminhtml updated pull #447

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

Merged
merged 7 commits into from
Feb 1, 2020
Merged

Couponcode adminhtml updated pull #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1139b4f
solve longstanding order shortcoming (so actual coupon code on order …
seansan Aug 30, 2017
2a0840a
Sloppy missed clsoing div
seansan Aug 30, 2017
c31f7cc
Updated string
seansan Feb 8, 2018
86e4014
Add coupon code translations
seansan Feb 8, 2018
83a2968
Update Mage_Adminhtml.csv
seansan Feb 8, 2018
8bab068
Added coupon code
seansan Feb 8, 2018
f6dcf3e
Escape coupon code and description in template.
colinmollenhour Mar 15, 2018
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
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
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