Skip to content

Commit fa5121e

Browse files
magento-teammagento-team
committed
Update as of 8/30/2012
* Fixes: * Fixed name, title, markup, styles at "Orders and Returns" homepage * Fixed displaying products in the shopping cart item block at the backend
1 parent f149438 commit fa5121e

File tree

4 files changed

+67
-79
lines changed

4 files changed

+67
-79
lines changed

‎CHANGELOG.markdown‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Update as of 8/30/2012
2+
======================
3+
* Fixes:
4+
* Fixed name, title, markup, styles at "Orders and Returns" homepage
5+
* Fixed displaying products in the shopping cart item block at the backend
6+
17
Update as of 8/26/2012
28
======================
39
* Decoupled Tag module functionality from other modules

‎app/code/core/Mage/Adminhtml/controllers/CustomerController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public function viewCartAction()
502502
$layout = $this->loadLayout()
503503
->getLayout()
504504
->getBlock('admin.customer.view.cart')
505-
->setWebsiteId();
505+
->setWebsiteId((int)$this->getRequest()->getParam('website_id'));
506506
$this->renderLayout();
507507
}
508508

‎app/code/core/Mage/Sales/controllers/GuestController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function formAction()
8181
return;
8282
}
8383
$this->loadLayout();
84+
$this->getLayout()->getBlock('head')->setTitle($this->__('Orders and Returns'));
8485
Mage::helper('Mage_Sales_Helper_Guest')->getBreadcrumbs($this);
8586
$this->renderLayout();
8687
}

‎app/code/core/Mage/Sales/view/frontend/guest/form.phtml‎

Lines changed: 59 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -25,89 +25,70 @@
2525
*/
2626
?>
2727
<div class="page-title">
28-
<h1><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Returns') ?></h1>
28+
<h1><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Orders and Returns') ?></h1>
2929
</div>
30-
<div class="block-content">
31-
<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
32-
<ul class="form-alt">
33-
<li style="clear:both;">
34-
<div class="input-box" style="float:left;width:150px;">
35-
<label for="oar_order_id" class="required"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Order ID') ?> <em>*</em></label>
36-
</div>
37-
<div class="input-box" style="float:left;width:305px;">
38-
<input type="text" class="input-text required-entry" id="oar_order_id" name="oar_order_id" style="width:300px;"/>
39-
</div>
40-
</li>
41-
<li style="clear:both;">
42-
<div class="input-box">
43-
<?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Enter the billing last name and email/ZIP as in the order billing address') ?>.
30+
<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
31+
<div class="fieldset">
32+
<h2 class="legend"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Order Information') ?></h2>
33+
<ul class="form-list">
34+
<li class="fields">
35+
<div class="field">
36+
<label for="oar_order_id" class="required"><em>*</em><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Order ID') ?></label>
37+
<div class="input-box">
38+
<input type="text" class="input-text required-entry" id="oar_order_id" name="oar_order_id" />
39+
</div>
4440
</div>
45-
</li>
46-
<li style="clear:both;">
47-
<div class="input-box" style="float:left;width:150px;">
48-
<label for="oar_billing_lastname" class="required"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Billing Last Name') ?> <em>*</em></label>
49-
</div>
50-
<div class="input-box" style="float:left;width:305px;">
51-
<input type="text" class="input-text required-entry" id="oar_billing_lastname" name="oar_billing_lastname" style="width:300px;"/>
52-
</div>
53-
</li>
54-
<li style="clear:both;">
55-
<div class="input-box" style="float:left;width:150px;">
56-
<label class="required"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Find Order By:') ?></label>
57-
</div>
58-
<div class="input-box" style="float:left;width:305px;">
59-
<select name="oar_type" id="quick_search_type_id" class="select guest-select" title="" onchange="showIdentifyBlock(this.value);">
60-
<option value="email"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Email Address'); ?></option>
61-
<option value="zip"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('ZIP Code'); ?></option>
62-
</select>
63-
</div>
64-
</li>
65-
<li id="oar-email" style="clear:both;">
66-
<div class="input-box" style="float:left;width:150px;">
67-
<label for="oar_email" class="required"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Email Address') ?> <em>*</em></label>
68-
</div>
69-
<div class="input-box" style="float:left;width:305px;">
70-
<input type="text" class="input-text validate-email required-entry" id="oar_email" name="oar_email" style="width:300px;"/>
71-
</div>
72-
</li>
73-
<li id="oar-zip" style="display:none;clear:both;">
74-
<div class="input-box" style="float:left;width:150px;">
75-
<label for="oar_zip" class="required"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Billing ZIP Code') ?> <em>*</em></label>
76-
</div>
77-
<div class="input-box" style="float:left;width:305px;">
78-
<input type="text" class="input-text required-entry" id="oar_zip" name="oar_zip" style="width:300px;"/>
79-
</div>
80-
</li>
81-
<li style="clear:both;">
82-
<div class="input-box" style="float:left;text-align:right;width:455px">
83-
<button type="submit" title="Continue" class="button"><span><span><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Continue') ?></span></span></button>
84-
</div>
85-
</li>
41+
<div class="field">
42+
<label for="oar_billing_lastname" class="required"><em>*</em><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Billing Last Name') ?></label>
43+
<div class="input-box">
44+
<input type="text" class="input-text required-entry" id="oar_billing_lastname" name="oar_billing_lastname" />
45+
</div>
46+
</div>
47+
</li>
48+
<li class="fields">
49+
<div class="field">
50+
<label for="quick_search_type_id" class="required"><em>*</em><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Find Order By:') ?></label>
51+
<div class="input-box">
52+
<select name="oar_type" id="quick_search_type_id" class="select" onchange="showIdentifyBlock(this.value);">
53+
<option value="email"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Email Address'); ?></option>
54+
<option value="zip"><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('ZIP Code'); ?></option>
55+
</select>
56+
</div>
57+
</div>
58+
<div id="oar-email" class="field">
59+
<label for="oar_email" class="required"><em>*</em><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Email Address') ?></label>
60+
<div class="input-box">
61+
<input type="text" class="input-text validate-email required-entry" id="oar_email" name="oar_email"/>
62+
</div>
63+
</div>
64+
<div id="oar-zip" class="field">
65+
<label for="oar_zip" class="required"><em>*</em><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Billing ZIP Code') ?></label>
66+
<div class="input-box">
67+
<input type="text" class="input-text required-entry" id="oar_zip" name="oar_zip"/>
68+
</div>
69+
</div>
70+
</li>
8671
</ul>
87-
</form>
88-
</div>
72+
</div>
73+
<div class="buttons-set form-buttons">
74+
<button type="submit" title="<?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Continue') ?>" class="button"><span><span><?php echo Mage::helper('Mage_Sales_Helper_Data')->__('Continue') ?></span></span></button>
75+
</div>
76+
</form>
8977
<script type="text/javascript">
9078
//<![CDATA[
91-
if ($('quick_search_type_id').value == 'zip') {
92-
$('oar-zip').show();
93-
$('oar-email').hide();
94-
} else {
95-
$('oar-zip').hide();
96-
$('oar-email').show();
97-
}
79+
var dataForm = new VarienForm('oar_widget_orders_and_returns_form', true);
9880

99-
var dataForm = new VarienForm('oar_widget_orders_and_returns_form', true);
100-
101-
function showIdentifyBlock(id)
102-
{
103-
if (id == 'zip') {
104-
$('oar-zip').show();
105-
$('oar-email').hide();
106-
} else if (id == 'email') {
107-
$('oar-zip').hide();
108-
$('oar-email').show();
109-
}
110-
return false;
111-
}
81+
function showIdentifyBlock(id)
82+
{
83+
if (id == 'zip') {
84+
$('oar-zip').show();
85+
$('oar-email').hide();
86+
} else {
87+
$('oar-zip').hide();
88+
$('oar-email').show();
89+
}
90+
return false;
91+
}
92+
showIdentifyBlock($('quick_search_type_id').value);
11293
//]]>
11394
</script>

0 commit comments

Comments
 (0)