merge conflicts

admin/view/template/common/home.tpl

@@ -57,12 +57,12 @@
               <td><?php echo $total_review_approval; ?></td>
             </tr>
             <tr>
-              <td><?php echo $text_total_affiliate; ?></td>
-              <td><?php echo $total_affiliate; ?></td>
+              <td><?php //echo $text_total_affiliate; ?></td>
+              <td><?php //echo $total_affiliate; ?></td>
             </tr>
             <tr>
-              <td><?php echo $text_total_affiliate_approval; ?></td>
-              <td><?php echo $total_affiliate_approval; ?></td>
+              <td><?php //echo $text_total_affiliate_approval; ?></td>
+              <td><?php //echo $total_affiliate_approval; ?></td>
             </tr>
           </table>
         </div>

admin/view/template/sale/contact.tpl

@@ -55,16 +55,21 @@
                 <?php } else { ?>
                 <option value="customer"><?php echo $text_customer; ?></option>
                 <?php } ?>
-                <?php if ($to == 'affiliate_all') { ?>
-                <option value="affiliate_all" selected="selected"><?php echo $text_affiliate_all; ?></option>
-                <?php } else { ?>
-                <option value="affiliate_all"><?php echo $text_affiliate_all; ?></option>
-                <?php } ?>
-                <?php if ($to == 'affiliate') { ?>
-                <option value="affiliate" selected="selected"><?php echo $text_affiliate; ?></option>
-                <?php } else { ?>
-                <option value="affiliate"><?php echo $text_affiliate; ?></option>
-                <?php } ?>
+
+
+                <!--
+                <?php //if ($to == 'affiliate_all') { ?>
+                <option value="affiliate_all" selected="selected"><?php //echo $text_affiliate_all; ?></option>
+                <?php //} else { ?>
+                <option value="affiliate_all"><?php //echo $text_affiliate_all; ?></option>
+                <?php //} ?>
+                <?php //if ($to == 'affiliate') { ?>
+                <option value="affiliate" selected="selected"><?php //echo $text_affiliate; ?></option>
+                <?php //} else { ?>
+                <option value="affiliate"><?php //echo $text_affiliate; ?></option>
+                <?php //} ?>
+                -->
+
                 <?php if ($to == 'product') { ?>
                 <option value="product" selected="selected"><?php echo $text_product; ?></option>
                 <?php } else { ?>

admin/view/template/sale/customer_form.tpl

@@ -17,9 +17,13 @@
     </div>
     <div class="content">
       <div id="htabs" class="htabs"><a href="#tab-general"><?php echo $tab_general; ?></a>
-        <?php if ($customer_id) { ?>
-        <a href="#tab-transaction"><?php echo $tab_transaction; ?></a><a href="#tab-reward"><?php echo $tab_reward; ?></a>
-        <?php } ?>
+
+      <!--
+        <?php //if ($customer_id) { ?>
+        <a href="#tab-transaction"><?php //echo $tab_transaction; ?></a><a href="#tab-reward"><?php //echo $tab_reward; ?></a>
+        <?php //} ?>
+      -->
+
         <a href="#tab-ip"><?php echo $tab_ip; ?></a></div>
       <form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data" id="form">
         <div id="tab-general">

catalog/language/english/checkout/success.php

@@ -3,7 +3,9 @@
 $_['heading_title'] = 'Your Order Has Been Processed!';
 
 // Text
-$_['text_customer'] = '<p>Your order has been successfully processed!</p><p>You can view your order history by going to the <a href="%s">my account</a> page and by clicking on <a href="%s">history</a>.</p>If your purchase has an associated download, you can goto the account <a href="%s">downloads</a> page to view them.</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
+$_['text_customer'] = '<p>Your order has been successfully processed!</p><p>You can view your order history by going to the <a href="%s">my account</a> page and by clicking on <a href="%s">history</a>.</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
+
+//If your purchase has an associated download, you can goto the account <a href="%s">downloads</a> page to view them.</p>
 $_['text_guest']    = '<p>Your order has been successfully processed!</p><p>Please direct any questions you have to the <a href="%s">store owner</a>.</p><p>Thanks for shopping with us online!</p>';
 $_['text_basket']   = 'Basket';
 $_['text_checkout'] = 'Checkout';

catalog/view/theme/default/template/product/product.tpl

@@ -40,9 +40,11 @@
         <?php if ($tax) { ?>
         <span class="price-tax"><?php echo $text_tax; ?> <?php echo $tax; ?></span><br />
         <?php } ?>
-        <?php if ($points) { ?>
-        <span class="reward"><small><?php echo $text_points; ?> <?php echo $points; ?></small></span> <br />
-        <?php } ?>
+        <!--
+        <?php //if ($points) { ?>
+        <span class="reward"><small><?php //echo $text_points; ?> <?php //echo $points; ?></small></span> <br />
+        <?php //} ?>
+        -->
         <?php if ($discounts) { ?>
         <br />
         <div class="discount">
@@ -224,9 +226,13 @@
     </div>
   </div>
   <div id="tabs" class="htabs"><a href="#tab-description"><?php echo $tab_description; ?></a>
-    <?php if ($attribute_groups) { ?>
-    <a href="#tab-attribute"><?php echo $tab_attribute; ?></a>
-    <?php } ?>
+
+    <!--
+    <?php //if ($attribute_groups) { ?>
+    <a href="#tab-attribute"><?php //echo $tab_attribute; ?></a>
+    <?php //} ?>
+    -->
+
     <?php if ($review_status) { ?>
     <a href="#tab-review"><?php echo $tab_review; ?></a>
     <?php } ?>
@@ -235,7 +241,8 @@
     <?php } ?>
   </div>
   <div id="tab-description" class="tab-content"><?php echo $description; ?></div>
-  <?php if ($attribute_groups) { ?>
+  <!--
+  <?php //if ($attribute_groups) { ?>
   <div id="tab-attribute" class="tab-content">
     <table class="attribute">
       <?php foreach ($attribute_groups as $attribute_group) { ?>
@@ -255,7 +262,8 @@
       <?php } ?>
     </table>
   </div>
-  <?php } ?>
+  <?php //} ?>
+  -->
   <?php if ($review_status) { ?>
   <div id="tab-review" class="tab-content">
     <div id="review"></div>