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.

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

Conversation

Sekiphp
Copy link
Contributor

@Sekiphp Sekiphp commented Apr 10, 2021

Description (*)

I cherry-picked all ahead commits from 1.9.3.x, except commit with updating of travis (we do not use Travis anymore). Commits from #575 was not possible to cherry-pick from some reason, so I copied this code. Please check, if this PR is complete :-)

Fixed Issues (if relevant)

#1526

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)

seansan and others added 2 commits April 10, 2021 12:16
* 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>
@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Core Relates to Mage_Core Component: Sales Relates to Mage_Sales Template : admin Relates to admin template translations Relates to app/locale labels Apr 10, 2021
@github-actions github-actions bot added Component: Checkout Relates to Mage_Checkout Template : rwd Relates to rwd template labels Apr 10, 2021
@Flyingmana Flyingmana merged commit f42744f into OpenMage:1.9.4.x Jul 30, 2021
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
6 runs  +4  4 ✔️ +2  2 💤 +2  0 ❌ ±0 

Results for commit f42744f. ± Comparison against base commit 28ecfb5.

@Sekiphp Sekiphp deleted the move/1.9.3.x-ahead branch September 18, 2021 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Adminhtml Relates to Mage_Adminhtml Component: Checkout Relates to Mage_Checkout Component: Core Relates to Mage_Core Component: Sales Relates to Mage_Sales Template : admin Relates to admin template Template : rwd Relates to rwd template translations Relates to app/locale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants