Skip to content

Add checkout agreement position, closes #1288 #1480

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

Merged
merged 1 commit into from
Mar 12, 2021
Merged

Add checkout agreement position, closes #1288 #1480

merged 1 commit into from
Mar 12, 2021

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented Mar 2, 2021

Description (*)

  • adds posibility to sort checkout agreements
  • made agreement content optional

See https://magento.stackexchange.com/questions/174332/magento-1-terms-and-conditions-sort-order-if-more-than-one

It's already included in firegento/magesetup and will be updated there too.

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Change order of Terms and Conditions #1288

Manual testing scenarios (*)

  1. add some agreements
  2. visit checkout ...

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)

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Checkout Relates to Mage_Checkout labels Mar 2, 2021
@sreichel sreichel requested a review from kkrieger85 March 11, 2021 01:38
@kkrieger85 kkrieger85 merged commit a703c8a into OpenMage:1.9.4.x Mar 12, 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 
2 runs  ±0  2 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit a703c8a. ± Comparison against base commit 0e2f81d.

@sreichel sreichel added this to the Release 19.4.12 / 20.0.8 milestone Mar 12, 2021
@addison74
Copy link
Contributor

This commit was not merged in OpenMage 20.0.8 even it has a milestone for this version.

Are there any other commits which were not merged in OpenMage? Some missed from human error?

Flyingmana added a commit that referenced this pull request May 16, 2021
* Update agreements.phtml

By PR #1480 which is merged in OM the content field is no longer required. If it is not filled in an empty container will be visible in frontend. This PR comes to solve this issue.

* Uppercase format in Sales menu - Terms and conditions

This commit will change in Backend -> Sales menu a link name from "Terms and conditions" to "Terms and Conditions". 

It is not necessary to add the text in /app/locale/en_US/Mage_Checkout.csv because it already exists. I chose to keep the old version too.

* Wrong attributes order in comparison window

This PR fixes the issue #1289.

* Update Collection.php

Co-authored-by: Daniel Fahlke <flyingmana@googlemail.com>
@sreichel sreichel deleted the feature/agreement-position branch October 13, 2021 23:24
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 enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change order of Terms and Conditions
5 participants