Fixes for #1564 and #1289 (#1568)

* 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 <[email protected]>

Author: ADDISON

app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php

@@ -225,8 +225,6 @@ public function getComparableAttributes()
             $this->_comparableAttributes = array();
             $setIds = $this->_getAttributeSetIds();
             if ($setIds) {
-                $attributeIds = $this->_getAttributeIdsBySetIds($setIds);
-
                 $select = $this->getConnection()->select()
                     ->from(array('main_table' => $this->getTable('eav/attribute')))
                     ->join(
@@ -236,10 +234,15 @@ public function getComparableAttributes()
                     ->joinLeft(
                         array('al' => $this->getTable('eav/attribute_label')),
                         'al.attribute_id = main_table.attribute_id AND al.store_id = ' . (int) $this->getStoreId(),
-                        array('store_label' => $this->getConnection()->getCheckSql('al.value IS NULL', 'main_table.frontend_label', 'al.value'))
+                        array('store_label' => new Zend_Db_Expr('IFNULL(al.value, main_table.frontend_label)'))
+                    )
+                    ->joinLeft(
+                        array('ai' => $this->getTable('eav/entity_attribute')), 
+                        'ai.attribute_id = main_table.attribute_id'
                     )
                     ->where('additional_table.is_comparable=?', 1)
-                    ->where('main_table.attribute_id IN(?)', $attributeIds);
+                    ->where('ai.attribute_set_id IN(?)', $setIds)
+                    ->order(array('ai.attribute_group_id ASC', 'ai.sort_order ASC'));
                 $attributesData = $this->getConnection()->fetchAll($select);
                 if ($attributesData) {
                     $entityType = Mage_Catalog_Model_Product::ENTITY;

app/code/core/Mage/Checkout/etc/adminhtml.xml

@@ -31,7 +31,7 @@
             <children>
                 <checkoutagreement translate="title" module="checkout">
                     <sort_order>100</sort_order>
-                    <title>Terms and conditions</title>
+                    <title>Terms and Conditions</title>
                     <action>adminhtml/checkout_agreement/</action>
                 </checkoutagreement>
             </children>

app/design/frontend/base/default/template/checkout/onepage/agreements.phtml

@@ -35,13 +35,15 @@
 <ol class="checkout-agreements">
 <?php foreach ($this->getAgreements() as $_a): ?>
     <li>
-        <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
-            <?php if ($_a->getIsHtml()):?>
-                <?php echo $_a->getContent() ?>
-            <?php else: ?>
-                <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
-            <?php endif ?>
-        </div>
+        <?php if ($_a->getContent()):?>
+            <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
+                <?php if ($_a->getIsHtml()):?>
+                    <?php echo $_a->getContent() ?>
+                <?php else: ?>
+                    <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
+                <?php endif ?>
+            </div>
+        <?php endif; ?>
         <p class="agree">
             <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
         </p>