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

Merge branch 'master' of git://github.com/woothemes/woocommerce

This commit is contained in:
Manos Psychogyiopoulos 2012-07-09 23:37:36 +03:00
parent 73214c421d d6183d7853
commit 7eb80ed0a2
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/woocommerce-admin-status.php
View File

@ -343,12 +343,15 @@ function woocommerce_status() {
// WP Remote Post Check // WP Remote Post Check
$posting['wp_remote_post']['name'] = __('WP Remote Post Check','woocommerce'); $posting['wp_remote_post']['name'] = __('WP Remote Post Check','woocommerce');
$request['cmd'] = '_notify-validate';
$params = array( $params = array(
'sslverify' => false, 'sslverify' => false,
'timeout' => 60, 'timeout' => 60,
'user-agent' => 'WooCommerce/' . $woocommerce->version 'user-agent' => 'WooCommerce/' . $woocommerce->version,
'body' => $request
); );
$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params ); $response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) { if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
$posting['wp_remote_post']['note'] = __('wp_remote_post() was successful - PayPal IPN is working.', 'woocommerce'); $posting['wp_remote_post']['note'] = __('wp_remote_post() was successful - PayPal IPN is working.', 'woocommerce');
$posting['wp_remote_post']['success'] = true; $posting['wp_remote_post']['success'] = true;

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

@ -679,6 +679,11 @@ class WC_Countries {
'placeholder' => __('Province', 'woocommerce') 'placeholder' => __('Province', 'woocommerce')
) )
), ),
'CO' => array(
'postcode' => array(
'required' => false
)
),
'CZ' => array( 'CZ' => array(
'state' => array( 'state' => array(
'required' => false 'required' => false

2
languages/woocommerce-it_IT.po
View File

@ -10555,7 +10555,7 @@ msgstr ""
#@ woocommerce #@ woocommerce
#: templates/single-product/add-to-cart/variable.php:43 #: templates/single-product/add-to-cart/variable.php:43
msgid "Clear selection" msgid "Clear selection"
msgstr "" msgstr "Annulla selezione"
#@ woocommerce #@ woocommerce
#: templates/single-product/review.php:25 #: templates/single-product/review.php:25

3
readme.txt
View File

@ -166,6 +166,9 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Fix - Windows CRT fix * Fix - Windows CRT fix
* Fix - Order count clear transient on delete * Fix - Order count clear transient on delete
* Fix - When placing an order again, clear current cart. * Fix - When placing an order again, clear current cart.
* Fix - Colombia zipcodes are not required
* Fix - Conflict with WPML joins
* Fix - IPN check with PayPal redesign
= 1.5.8 - 21/06/2012 = = 1.5.8 - 21/06/2012 =
* Tweak - Textarea for notes and enabled HTML * Tweak - Textarea for notes and enabled HTML

13
woocommerce-core-functions.php
View File

@ -602,11 +602,18 @@ add_action( 'comment_feed_where', 'woocommerce_exclude_order_comments_from_feed_
function woocommerce_exclude_order_comments( $clauses ) { function woocommerce_exclude_order_comments( $clauses ) {
global $wpdb, $typenow; global $wpdb, $typenow;
if (is_admin() && $typenow=='shop_order') return $clauses; // Don't hide when viewing orders in admin if ( is_admin() && $typenow == 'shop_order' )
return $clauses; // Don't hide when viewing orders in admin
$clauses['join'] = "LEFT JOIN $wpdb->posts ON $wpdb->comments.comment_post_ID = $wpdb->posts.ID"; if ( ! $clauses['join'] )
$clauses['join'] = '';
if ($clauses['where']) $clauses['where'] .= ' AND '; $clauses['join'] .= "
LEFT JOIN $wpdb->posts ON $wpdb->comments.comment_post_ID = $wpdb->posts.ID
";
if ( $clauses['where'] )
$clauses['where'] .= ' AND ';
$clauses['where'] .= " $clauses['where'] .= "
$wpdb->posts.post_type NOT IN ('shop_order') $wpdb->posts.post_type NOT IN ('shop_order')