Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2895 from claudiosmweb/address_filters 

Added new filters to format the address
This commit is contained in:
Mike Jolley 2013-04-08 12:35:33 -07:00
parent 6ef24149ac 2aa712ef4a
commit de3cce85dc
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/woocommerce-admin-users.php
View File

@ -72,7 +72,7 @@ function woocommerce_user_column_values( $value, $column_name, $user_id ) {
break; break;
case "woocommerce_billing_address" : case "woocommerce_billing_address" :
$address = array( $address = apply_filters( 'woocommerce_user_column_billing_address', array(
'first_name' => get_user_meta( $user_id, 'billing_first_name', true ), 'first_name' => get_user_meta( $user_id, 'billing_first_name', true ),
'last_name' => get_user_meta( $user_id, 'billing_last_name', true ), 'last_name' => get_user_meta( $user_id, 'billing_last_name', true ),
'company' => get_user_meta( $user_id, 'billing_company', true ), 'company' => get_user_meta( $user_id, 'billing_company', true ),
@ -82,7 +82,7 @@ function woocommerce_user_column_values( $value, $column_name, $user_id ) {
'state' => get_user_meta( $user_id, 'billing_state', true ), 'state' => get_user_meta( $user_id, 'billing_state', true ),
'postcode' => get_user_meta( $user_id, 'billing_postcode', true ), 'postcode' => get_user_meta( $user_id, 'billing_postcode', true ),
'country' => get_user_meta( $user_id, 'billing_country', true ) 'country' => get_user_meta( $user_id, 'billing_country', true )
); ), $user_id );
$formatted_address = $woocommerce->countries->get_formatted_address( $address ); $formatted_address = $woocommerce->countries->get_formatted_address( $address );
@ -94,7 +94,7 @@ function woocommerce_user_column_values( $value, $column_name, $user_id ) {
$value = wpautop( $value ); $value = wpautop( $value );
break; break;
case "woocommerce_shipping_address" : case "woocommerce_shipping_address" :
$address = array( $address = apply_filters( 'woocommerce_user_column_shipping_address', array(
'first_name' => get_user_meta( $user_id, 'shipping_first_name', true ), 'first_name' => get_user_meta( $user_id, 'shipping_first_name', true ),
'last_name' => get_user_meta( $user_id, 'shipping_last_name', true ), 'last_name' => get_user_meta( $user_id, 'shipping_last_name', true ),
'company' => get_user_meta( $user_id, 'shipping_company', true ), 'company' => get_user_meta( $user_id, 'shipping_company', true ),
@ -104,7 +104,7 @@ function woocommerce_user_column_values( $value, $column_name, $user_id ) {
'state' => get_user_meta( $user_id, 'shipping_state', true ), 'state' => get_user_meta( $user_id, 'shipping_state', true ),
'postcode' => get_user_meta( $user_id, 'shipping_postcode', true ), 'postcode' => get_user_meta( $user_id, 'shipping_postcode', true ),
'country' => get_user_meta( $user_id, 'shipping_country', true ) 'country' => get_user_meta( $user_id, 'shipping_country', true )
); ), $user_id );
$formatted_address = $woocommerce->countries->get_formatted_address( $address ); $formatted_address = $woocommerce->countries->get_formatted_address( $address );

2
classes/class-wc-countries.php
View File

@ -647,7 +647,7 @@ class WC_Countries {
'{state_upper}' => strtoupper( $full_state ), '{state_upper}' => strtoupper( $full_state ),
'{postcode_upper}' => strtoupper( $postcode ), '{postcode_upper}' => strtoupper( $postcode ),
'{country_upper}' => strtoupper( $full_country ), '{country_upper}' => strtoupper( $full_country ),
) ) ; ), $args ) ;
$replace = array_map( 'esc_html', $replace ); $replace = array_map( 'esc_html', $replace );

10
classes/class-wc-order.php
View File

@ -294,8 +294,8 @@ class WC_Order {
global $woocommerce; global $woocommerce;
// Formatted Addresses // Formatted Addresses
$address = array( $address = apply_filters( 'woocommerce_order_formatted_billing_address', array(
'first_name' => $this->billing_first_name, 'first_name' => $this->billing_first_name,
'last_name' => $this->billing_last_name, 'last_name' => $this->billing_last_name,
'company' => $this->billing_company, 'company' => $this->billing_company,
'address_1' => $this->billing_address_1, 'address_1' => $this->billing_address_1,
@ -304,7 +304,7 @@ class WC_Order {
'state' => $this->billing_state, 'state' => $this->billing_state,
'postcode' => $this->billing_postcode, 'postcode' => $this->billing_postcode,
'country' => $this->billing_country 'country' => $this->billing_country
); ), $this );
$this->formatted_billing_address = $woocommerce->countries->get_formatted_address( $address ); $this->formatted_billing_address = $woocommerce->countries->get_formatted_address( $address );
} }
@ -347,7 +347,7 @@ class WC_Order {
global $woocommerce; global $woocommerce;
// Formatted Addresses // Formatted Addresses
$address = array( $address = apply_filters( 'woocommerce_order_formatted_shipping_address', array(
'first_name' => $this->shipping_first_name, 'first_name' => $this->shipping_first_name,
'last_name' => $this->shipping_last_name, 'last_name' => $this->shipping_last_name,
'company' => $this->shipping_company, 'company' => $this->shipping_company,
@ -357,7 +357,7 @@ class WC_Order {
'state' => $this->shipping_state, 'state' => $this->shipping_state,
'postcode' => $this->shipping_postcode, 'postcode' => $this->shipping_postcode,
'country' => $this->shipping_country 'country' => $this->shipping_country
); ), $this );
$this->formatted_shipping_address = $woocommerce->countries->get_formatted_address( $address ); $this->formatted_shipping_address = $woocommerce->countries->get_formatted_address( $address );
} }

4
templates/myaccount/my-address.php
View File

@ -46,7 +46,7 @@ $col = 1;
</header> </header>
<address> <address>
<?php <?php
$address = array( $address = apply_filters( 'woocommerce_my_address_formatted_address', array(
'first_name' => get_user_meta( $customer_id, $name . '_first_name', true ), 'first_name' => get_user_meta( $customer_id, $name . '_first_name', true ),
'last_name' => get_user_meta( $customer_id, $name . '_last_name', true ), 'last_name' => get_user_meta( $customer_id, $name . '_last_name', true ),
'company' => get_user_meta( $customer_id, $name . '_company', true ), 'company' => get_user_meta( $customer_id, $name . '_company', true ),
@ -56,7 +56,7 @@ $col = 1;
'state' => get_user_meta( $customer_id, $name . '_state', true ), 'state' => get_user_meta( $customer_id, $name . '_state', true ),
'postcode' => get_user_meta( $customer_id, $name . '_postcode', true ), 'postcode' => get_user_meta( $customer_id, $name . '_postcode', true ),
'country' => get_user_meta( $customer_id, $name . '_country', true ) 'country' => get_user_meta( $customer_id, $name . '_country', true )
); ), $customer_id, $name );
$formatted_address = $woocommerce->countries->get_formatted_address( $address ); $formatted_address = $woocommerce->countries->get_formatted_address( $address );