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

Commits on 1.9.3.x that are not on 1.9.4.x #2184

Closed
wants to merge 8 commits into from
Closed

Conversation

fballiano
Copy link
Contributor

Since github doesn't allow to dismiss the "compare & pull request" button I've to create this PR. I will close it right away since no commit in the 1.9.3.x branch should be ported to 1.9.4.x at this point in time.

We should probably freeze old branches if possible

Flyingmana and others added 8 commits October 8, 2019 12:19
* 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>
remove password from account_new email template
* Update shipping.phtml

Wrong translation field fix

* Fixed typo

Co-authored-by: sv3n <github-sr@hotmail.com>
@fballiano fballiano closed this Jun 1, 2022
@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Checkout Relates to Mage_Checkout Component: Core Relates to Mage_Core Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales environment Template : admin Relates to admin template Template : rwd Relates to rwd template translations Relates to app/locale labels Jun 1, 2022
@ADDISON74
Copy link
Collaborator

Nice find but you closed the PR. Are those commits merged in latest OM? Did we miss others?

@fballiano
Copy link
Contributor Author

I don't think there could be something merge in older branches (older than 1.9.3) but I closed it because, at this point in time, it could be dangerous to merge some commits from milion years ago just because we found them.

@ADDISON74
Copy link
Collaborator

Can we revert and leave them open for discussions? Or shall we recreate them?

@fballiano
Copy link
Contributor Author

anyone can cherry-pick one any comment into another branch

@ADDISON74
Copy link
Collaborator

I will let someone more advanced in Git to do this task. If you can do it would be great because you know what it's about. The most important thing is not to lose them and to capitalize the efforts made in the past if they are still relevant.

@ADDISON74 ADDISON74 added needs rewrite for new versions and removed Component: Checkout Relates to Mage_Checkout Component: lib/Varien Relates to lib/Varien Component: Sales Relates to Mage_Sales Template : rwd Relates to rwd template Component: Adminhtml Relates to Mage_Adminhtml Component: lib/* Relates to lib/* translations Relates to app/locale needs rewrite for new versions labels Jun 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants