Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1046756
D236.id571.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Jun 29, 3:56 AM
Size
2 KB
Mime Type
text/x-diff
Expires
Mon, Jun 30, 3:56 AM (4 h, 42 m)
Engine
blob
Format
Raw Data
Handle
676744
Attached To
D236: MINC-178 - Replace billing with shipping email on "Shipping" step during checkout
D236.id571.diff
View Options
Index: modules/in-commerce/units/orders/orders_event_handler.php
===================================================================
--- modules/in-commerce/units/orders/orders_event_handler.php
+++ modules/in-commerce/units/orders/orders_event_handler.php
@@ -1542,7 +1542,7 @@
// shipping address required fields
if ($this->Application->GetVar('check_shipping_address')) {
$has_tangibles = $order->HasTangibleItems();
- $req_fields = array('ShippingTo', 'ShippingAddress1', 'ShippingCity', 'ShippingZip', 'ShippingCountry', /*'ShippingPhone',*/ 'BillingEmail');
+ $req_fields = array('ShippingTo', 'ShippingAddress1', 'ShippingCity', 'ShippingZip', 'ShippingCountry');
$order->setRequired($req_fields, $has_tangibles);
$order->setRequired('ShippingState', $cs_helper->CountryHasStates( $field_values['ShippingCountry'] ));
}
Index: themes/advanced/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
--- themes/advanced/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
+++ themes/advanced/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
@@ -42,7 +42,7 @@
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
</inp2:m_if>
<inp2:m_RenderElement design="inp_edit_buttons" width="200">
@@ -50,4 +50,4 @@
<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress" no_editing="1"/>"/>
</inp2:m_RenderElement>
</table>
-</inp2:m_RenderElement>
\ No newline at end of file
+</inp2:m_RenderElement>
Event Timeline
Log In to Comment