Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F872164
D48.id119.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
Thu, May 8, 10:49 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Fri, May 9, 10:49 AM (2 h, 41 m)
Engine
blob
Format
Raw Data
Handle
617812
Attached To
D48: MINC-118 - Fix notices on Shipping/Billing tab of order in "To Ship" status
D48.id119.diff
View Options
Index: modules/in-commerce/admin_templates/orders/orders_edit_billing.tpl
===================================================================
--- modules/in-commerce/admin_templates/orders/orders_edit_billing.tpl
+++ modules/in-commerce/admin_templates/orders/orders_edit_billing.tpl
@@ -106,8 +106,6 @@
<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="VATIncluded"/>
- <!--<inp2:m_RenderElement name="inp_gwresults" prefix="ord" display_field="score" field="VerificationResult" title="la_fld_VerificationResult" />-->
-
<inp2:m_if check="ord_UsingCreditCard">
<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
@@ -155,8 +153,6 @@
<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
<inp2:m_RenderElement name="inp_label" prefix="ord" field="VATIncluded"/>
- <inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="VerificationResult" display_field="score" title="la_fld_VerificationResult" />
-
<inp2:m_if check="ord_UsingCreditCard">
<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
@@ -217,4 +213,4 @@
<input type="hidden" name="check_credit_card" value="true" />
</inp2:m_if>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: modules/in-commerce/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- modules/in-commerce/admin_templates/orders/orders_edit_shipping.tpl
+++ modules/in-commerce/admin_templates/orders/orders_edit_shipping.tpl
@@ -208,14 +208,14 @@
</td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10" format="$ %.2f"/>
+ <inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10" currency="selected"/>
- <inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" format="$ %.2f"/>
+ <inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
<inp2:m_RenderElement design="form_row" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30">
<td valign="top" class="control-cell">
- <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>"/>
+ <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>"/>
<inp2:m_if check="{$prefix}_USPSLabelFound" field="$field">
<a href="#" onClick="javascript:submit_event('<inp2:m_Param name="prefix"/>', 'OnDownloadLabel'); return false;"><inp2:m_Phrase label="la_ViewLabel"/></a>
@@ -243,4 +243,4 @@
</script>
</inp2:m_if>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: modules/in-commerce/units/shipping/shipping_tag_processor.php
===================================================================
--- modules/in-commerce/units/shipping/shipping_tag_processor.php
+++ modules/in-commerce/units/shipping/shipping_tag_processor.php
@@ -242,7 +242,8 @@
}
$last_shippings[$package_id] = $shipping_types;
- if ( $this->Application->isAdminUser && $key ) {
+
+ if ( $this->Application->isAdminUser && isset($key) && $key ) {
$orig_name = ltrim($last_shippings[$package_id][$key]['ShippingName'], 'Original: ');
$last_shippings[$package_id][$key]['ShippingName'] = $orig_name;
}
@@ -334,4 +335,4 @@
return $o;
}
-}
\ No newline at end of file
+}
Event Timeline
Log In to Comment