Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Julian Jöris 2011-12-20 11:00:46 +01:00
commit c07d56f5d0
22 changed files with 330 additions and 124 deletions

View File

@ -106,6 +106,14 @@ $woocommerce_settings['general'] = apply_filters('woocommerce_general_settings',
'type' => 'checkbox',
'checkboxgroup' => ''
),
array(
'desc' => __( 'Enable coupon form on checkout', 'woothemes' ),
'id' => 'woocommerce_enable_coupon_form_on_checkout',
'std' => 'no',
'type' => 'checkbox',
'checkboxgroup' => ''
),
array(
'desc' => __( '"Ship to same address option" checked by default', 'woothemes' ),
@ -246,47 +254,6 @@ $woocommerce_settings['general'] = apply_filters('woocommerce_general_settings',
),
array( 'type' => 'sectionend', 'id' => 'general_options'),
array( 'name' => __( 'ShareThis', 'woothemes' ), 'type' => 'title', 'desc' => '', 'id' => 'share_this' ),
array(
'name' => __( 'ShareThis Publisher ID', 'woothemes' ),
'desc' => sprintf( __( 'Enter your %1$sShareThis publisher ID%2$s to show social sharing buttons on product pages.', 'woothemes' ), '<a href="http://sharethis.com/account/">', '</a>' ),
'id' => 'woocommerce_sharethis',
'type' => 'text',
'std' => '',
'css' => 'min-width:300px;',
),
array( 'type' => 'sectionend', 'id' => 'share_this'),
array( 'name' => __( 'Google Analytics', 'woothemes' ), 'type' => 'title', 'desc' => '', 'id' => 'google_analytics' ),
array(
'name' => __('Google Analytics ID', 'woothemes'),
'desc' => __('Log into your google analytics account to find your ID. e.g. <code>UA-XXXXX-X</code>', 'woothemes'),
'id' => 'woocommerce_ga_id',
'type' => 'text',
'css' => 'min-width:300px;',
),
array(
'name' => __('Tracking code', 'woothemes'),
'desc' => __('Add tracking code to your site\'s footer. You don\'t need to enable this if using a 3rd party analytics plugin.', 'woothemes'),
'id' => 'woocommerce_ga_standard_tracking_enabled',
'type' => 'checkbox',
'checkboxgroup' => 'start'
),
array(
'name' => __('Tracking code', 'woothemes'),
'desc' => __('Add eCommerce tracking code to the thankyou page', 'woothemes'),
'id' => 'woocommerce_ga_ecommerce_tracking_enabled',
'type' => 'checkbox',
'checkboxgroup' => 'end'
),
array( 'type' => 'sectionend', 'id' => 'google_analytics'),
)); // End general settings
@ -935,6 +902,51 @@ $woocommerce_settings['email'] = apply_filters('woocommerce_email_settings', arr
)); // End email settings
$woocommerce_settings['integration'] = apply_filters('woocommerce_intregation_settings', array(
array( 'name' => __( 'ShareThis', 'woothemes' ), 'type' => 'title', 'desc' => __('ShareThis offers a sharing widget which will allow customers to share links to products with their friends.', 'woothemes'), 'id' => 'share_this' ),
array(
'name' => __( 'ShareThis Publisher ID', 'woothemes' ),
'desc' => sprintf( __( 'Enter your %1$sShareThis publisher ID%2$s to show social sharing buttons on product pages.', 'woothemes' ), '<a href="http://sharethis.com/account/">', '</a>' ),
'id' => 'woocommerce_sharethis',
'type' => 'text',
'std' => '',
'css' => 'min-width:300px;',
),
array( 'type' => 'sectionend', 'id' => 'share_this'),
array( 'name' => __( 'Google Analytics', 'woothemes' ), 'type' => 'title', 'desc' => __('Google Analytics is a free service offered by Google that generates detailed statistics about the visitors to a website.', 'woothemes'), 'id' => 'google_analytics' ),
array(
'name' => __('Google Analytics ID', 'woothemes'),
'desc' => __('Log into your google analytics account to find your ID. e.g. <code>UA-XXXXX-X</code>', 'woothemes'),
'id' => 'woocommerce_ga_id',
'type' => 'text',
'css' => 'min-width:300px;',
),
array(
'name' => __('Tracking code', 'woothemes'),
'desc' => __('Add tracking code to your site\'s footer. You don\'t need to enable this if using a 3rd party analytics plugin.', 'woothemes'),
'id' => 'woocommerce_ga_standard_tracking_enabled',
'type' => 'checkbox',
'checkboxgroup' => 'start'
),
array(
'name' => __('Tracking code', 'woothemes'),
'desc' => __('Add eCommerce tracking code to the thankyou page', 'woothemes'),
'id' => 'woocommerce_ga_ecommerce_tracking_enabled',
'type' => 'checkbox',
'checkboxgroup' => 'end'
),
array( 'type' => 'sectionend', 'id' => 'google_analytics'),
)); // End integration settings
/**
* Settings page
*
@ -957,12 +969,17 @@ function woocommerce_settings() {
case "shipping" :
case "tax" :
case "email" :
case "integration" :
woocommerce_update_options( $woocommerce_settings[$current_tab] );
break;
endswitch;
do_action( 'woocommerce_update_options' );
do_action( 'woocommerce_update_options_' . $current_tab );
// Backwards compat 1.4 <
if ($current_tab=='shipping') do_action( 'woocommerce_update_options_shipping_methods' );
flush_rewrite_rules( false );
wp_redirect( add_query_arg( 'subtab', esc_attr(str_replace('#', '', $_POST['subtab'])), add_query_arg( 'saved', 'true', admin_url( 'admin.php?page=woocommerce&tab=' . $current_tab ) )) );
endif;
@ -1041,6 +1058,7 @@ function woocommerce_settings() {
'shipping' => __( 'Shipping', 'woothemes' ),
'payment_gateways' => __( 'Payment Gateways', 'woothemes' ),
'email' => __( 'Emails', 'woothemes' ),
'integration' => __( 'Integration', 'woothemes' )
);
$tabs = apply_filters('woocommerce_settings_tabs_array', $tabs);
@ -1063,6 +1081,7 @@ function woocommerce_settings() {
case "inventory" :
case "tax" :
case "email" :
case "integration" :
woocommerce_admin_fields( $woocommerce_settings[$current_tab] );
break;
case "shipping" :

View File

@ -347,6 +347,12 @@ jQuery(document).ready(function($) {
$(img).attr('src', o_src);
$(link).attr('href', o_link);
}
if (variation.sku) {
$('.product_meta').find('.sku').text( variation.sku );
} else {
$('.product_meta').find('.sku').text('');
}
$('.single_variation_wrap').slideDown('200').trigger('variationWrapShown');
}
@ -490,7 +496,7 @@ jQuery(document).ready(function($) {
}
$('p.password, form.login, div.shipping_address').hide();
$('p.password, form.login, form.checkout_coupon, div.shipping_address').hide();
$('input.show_password').change(function(){
$('p.password').slideToggle();
@ -501,6 +507,11 @@ jQuery(document).ready(function($) {
return false;
});
$('a.showcoupon').click(function(){
$('form.checkout_coupon').slideToggle();
return false;
});
$('#shiptobilling input').change(function(){
$('div.shipping_address').hide();
if (!$(this).is(':checked')) {

File diff suppressed because one or more lines are too long

View File

@ -255,7 +255,7 @@ class woocommerce_checkout {
do_action('woocommerce_before_checkout_process');
if (isset($_POST) && $_POST && !isset($_POST['login'])) :
if (isset($_POST) && $_POST && !isset($_POST['login']) && !isset($_POST['coupon_code'])) :
$woocommerce->verify_nonce('process_checkout');

View File

@ -123,6 +123,7 @@ class woocommerce_order {
unset($address['first_name']);
unset($address['last_name']);
unset($address['company']);
$joined_address = array();
foreach ($address as $part) if (!empty($part)) $joined_address[] = $part;
$this->billing_address_only = implode(', ', $joined_address);
@ -144,6 +145,7 @@ class woocommerce_order {
unset($address['first_name']);
unset($address['last_name']);
unset($address['company']);
$joined_address = array();
foreach ($address as $part) if (!empty($part)) $joined_address[] = $part;
$this->shipping_address_only = implode(', ', $joined_address);
endif;
@ -364,7 +366,7 @@ class woocommerce_order {
if ($_product->exists) :
if ($_product->is_downloadable()) :
$file = '<br/><small>' . $this->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '</small>';
$file = '<br/><small>'.__('Download:', 'woothemes').' <a href="' . $this->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '">' . $this->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '</a></small>';
endif;
endif;

Binary file not shown.

View File

@ -199,13 +199,13 @@ msgid "Invalid order."
msgstr "Foutieve order."
#: woocommerce-functions.php:596
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#@ woothemes
msgid "Sorry, you have reached your download limit for this file. <a href=\"%s\">Go to homepage &rarr;</a>"
msgstr "Sorry, je hebt het maximale aantal downloads voor dit bestand bereikt. <a href=\"%s\">Keer terug naar de homepage &rarr;</a>"
#: woocommerce-functions.php:740
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#@ woothemes
msgid "File not found. <a href=\"%s\">Go to homepage &rarr;</a>"
msgstr "Pagina niet gevonden. <a href=\"%s\">Keer terug naar de homepage &rarr;</a>"
@ -237,7 +237,7 @@ msgid "Order Received"
msgstr "Bestelling ontvangen"
#: classes/woocommerce_email.class.php:143
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#@ woothemes
msgid "[%s] Order Received"
msgstr "[%s] Bestelling ontvangen"
@ -249,13 +249,13 @@ msgid "[%s] Order Complete/Download Links"
msgstr "[%s] Bestelling Compleet/Download Links"
#: classes/woocommerce_email.class.php:173
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#@ woothemes
msgid "[%s] Order Complete"
msgstr "[%s] Bestelling afgerond"
#: classes/woocommerce_email.class.php:207
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format, php-format
#@ woothemes
msgid "[%s] Pay for Order"
msgstr "[%s] Betaal voor bestelling"
@ -317,7 +317,7 @@ msgstr "Product Category"
#: woocommerce.php:462
#@ woothemes
msgid "Search Product Categories"
msgstr "Zoek roduct Categorie"
msgstr "Zoek product Categorie"
#: woocommerce.php:463
#@ woothemes
@ -939,7 +939,7 @@ msgid "Subtotal"
msgstr "subtotaal"
#: admin/post-types/shop_order.php:23
#: admin/woocommerce-admin-settings.php:1040
#: admin/woocommerce-admin-settings.php:1041
#: templates/cart/totals.php:28
#: templates/checkout/pay_for_order.php:18
#: templates/checkout/review_order.php:24
@ -954,7 +954,7 @@ msgid "Free"
msgstr "Gratis"
#: admin/post-types/writepanels/writepanel-product_data.php:33
#: admin/woocommerce-admin-settings.php:1041
#: admin/woocommerce-admin-settings.php:1040
#: classes/countries.class.php:488
#: templates/checkout/pay_for_order.php:22
#: templates/checkout/review_order.php:81
@ -1139,6 +1139,7 @@ msgstr "Eigenschap opslaan"
#: admin/post-types/writepanels/writepanel-order_data.php:165
#: admin/woocommerce-admin-attributes.php:160
#: templates/single-product-reviews.php:79
#: widgets/widget-product_categories.php:120
#@ woothemes
msgid "Name"
msgstr "Naam"
@ -1625,7 +1626,8 @@ msgid "Enabling this option will hide it from the product page image gallery."
msgstr "Inschakelen van deze optie activeert het verbergen van het product pagina-afbeelding galerij."
#: admin/post-types/shop_order.php:20
#: admin/woocommerce-admin-settings.php:1112
#: admin/woocommerce-admin-settings.php:1091
#: admin/woocommerce-admin-settings.php:1154
#: templates/myaccount/my-account.php:46
#@ woothemes
msgid "Status"
@ -2610,6 +2612,7 @@ msgid "Hide out of stock items from the catalog"
msgstr "Verberg out-of-stock producten op de catalogus"
#: admin/woocommerce-admin-settings.php:729
#: admin/woocommerce-admin-settings.php:1070
#@ woothemes
msgid "Shipping Options"
msgstr "Verzendingsopties"
@ -2799,29 +2802,29 @@ msgstr "Catalogus"
msgid "Inventory"
msgstr "Inventaris"
#: admin/woocommerce-admin-settings.php:1042
#: admin/woocommerce-admin-settings.php:1085
#@ woothemes
msgid "Shipping Methods"
msgstr "Verzend mogelijkheden"
#: admin/woocommerce-admin-settings.php:1043
#: admin/woocommerce-admin-settings.php:1092
#: admin/woocommerce-admin-settings.php:1105
#: admin/woocommerce-admin-settings.php:1042
#: admin/woocommerce-admin-settings.php:1134
#: admin/woocommerce-admin-settings.php:1147
#@ woothemes
msgid "Payment Gateways"
msgstr "Betalings gateways"
#: admin/woocommerce-admin-settings.php:1044
#: admin/woocommerce-admin-settings.php:1043
#@ woothemes
msgid "Emails"
msgstr "Emails"
#: admin/woocommerce-admin-settings.php:1164
#: admin/woocommerce-admin-settings.php:1206
#@ woothemes
msgid "Save changes"
msgstr "Wijzigingen opslaan"
#: admin/woocommerce-admin-settings.php:1219
#: admin/woocommerce-admin-settings.php:1261
#@ woothemes
msgid "The changes you made will be lost if you navigate away from this page."
msgstr "De wijzigingen die u gemaakt zullen verloren gaan als u naar een andere pagina toe gaat."
@ -2856,8 +2859,6 @@ msgstr "Korting Type"
#: classes/shipping/shipping-flat_rate.php:323
#: classes/shipping/shipping-flat_rate.php:354
#: classes/shipping/shipping-flat_rate.php:355
#: woocommerce-ajax.php:543
#: woocommerce-ajax.php:544
#@ woothemes
msgid "0.00"
msgstr "0.00"
@ -6369,7 +6370,7 @@ msgstr "Afrekenen &rarr;"
#: widgets/widget-layered_nav.php:319
#: widgets/widget-onsale.php:149
#: widgets/widget-price_filter.php:193
#: widgets/widget-product_categories.php:102
#: widgets/widget-product_categories.php:114
#: widgets/widget-product_search.php:69
#: widgets/widget-product_tag_cloud.php:70
#: widgets/widget-recent_products.php:129
@ -6451,17 +6452,17 @@ msgstr "Een lijst of uitklapmenu van de productcategorieën."
msgid "WooCommerce Product Categories"
msgstr "WooCommerce Product Categorieën"
#: widgets/widget-product_categories.php:106
#: widgets/widget-product_categories.php:124
#@ woothemes
msgid "Show as dropdown"
msgstr "Toon als uitklapmenu"
#: widgets/widget-product_categories.php:109
#: widgets/widget-product_categories.php:127
#@ woothemes
msgid "Show post counts"
msgstr "Toon bericht aantallen"
#: widgets/widget-product_categories.php:112
#: widgets/widget-product_categories.php:130
#@ woothemes
msgid "Show hierarchy"
msgstr "Hierachy bekijken"
@ -6474,7 +6475,7 @@ msgstr "Zoekveld voor producten"
#: widgets/widget-product_search.php:25
#@ woothemes
msgid "WooCommerce Product Search"
msgstr "WooCommerce Recente Reviews"
msgstr "WooCommerce Product Zoeken"
#: widgets/widget-product_search.php:48
#@ woothemes
@ -6781,7 +6782,7 @@ msgstr "Log uit"
#: admin/woocommerce-admin-init.php:25
#@ woothemes
msgid "WooCommerce Settings"
msgstr ""
msgstr "WooCommerce Instellingen"
#: admin/woocommerce-admin-init.php:133
#@ woothemes
@ -6884,7 +6885,7 @@ msgstr "EU Staten"
#: admin/woocommerce-admin-settings-forms.php:357
#@ woothemes
msgid "Done"
msgstr ""
msgstr "Uitgevoerd"
#: admin/woocommerce-admin-settings-forms.php:385
#@ woothemes
@ -6916,12 +6917,6 @@ msgid_plural "(%s states)"
msgstr[0] "(1 staat)"
msgstr[1] "(%s staten"
#: admin/woocommerce-admin-settings-forms.php:527
#, php-format
#@ woothemes
msgid "%s"
msgstr "%s"
#: admin/woocommerce-admin-settings-forms.php:531
#, php-format
#@ woothemes
@ -7026,7 +7021,7 @@ msgstr ""
#: admin/woocommerce-admin-settings.php:241
#@ woothemes
msgid "Localisation"
msgstr ""
msgstr "Lokalisatie"
#: admin/woocommerce-admin-settings.php:242
#@ woothemes
@ -7053,7 +7048,7 @@ msgstr "Google Analytics"
#: admin/woocommerce-admin-settings.php:282
#@ woothemes
msgid "Tracking code"
msgstr ""
msgstr "Traceercode"
#: admin/woocommerce-admin-settings.php:275
#@ woothemes
@ -7095,17 +7090,17 @@ msgstr ""
#: admin/woocommerce-admin-settings.php:733
#@ woothemes
msgid "Enable shipping"
msgstr ""
msgstr "Verzending activeren"
#: admin/woocommerce-admin-settings.php:750
#@ woothemes
msgid "Shipping destination"
msgstr ""
msgstr "Verzend bestemming"
#: admin/woocommerce-admin-settings.php:767
#@ woothemes
msgid "Tax calculations"
msgstr ""
msgstr "BTW berekeningen"
#: admin/woocommerce-admin-settings.php:784
#@ woothemes
@ -7181,7 +7176,7 @@ msgstr ""
#: admin/post-types/writepanels/writepanel-order_data.php:166
#@ woothemes
msgid "Item&nbsp;Meta"
msgstr ""
msgstr "Item&nbsp;Meta"
#: admin/post-types/writepanels/writepanel-order_data.php:169
#@ woothemes
@ -7205,13 +7200,11 @@ msgid "Final cost after discount"
msgstr ""
#: admin/post-types/writepanels/writepanel-order_data.php:232
#: woocommerce-ajax.php:542
#@ woothemes
msgid "0"
msgstr "0"
#: admin/post-types/writepanels/writepanel-order_data.php:244
#: woocommerce-ajax.php:545
#@ woothemes
msgid "0.0000"
msgstr "0.0000"
@ -7272,7 +7265,7 @@ msgstr ""
#: templates/order/order-details-table.php:41
#@ woothemes
msgid "Order Total:"
msgstr ""
msgstr "Bestelling Totalen:"
#: admin/post-types/writepanels/writepanel-order_notes.php:48
#@ woothemes
@ -7354,7 +7347,7 @@ msgstr ""
#: admin/post-types/writepanels/writepanel-product-type-variable.php:301
#@ woothemes
msgid "File path:"
msgstr ""
msgstr "Bestandspad:"
#: admin/post-types/writepanels/writepanel-product-type-variable.php:145
#: admin/post-types/writepanels/writepanel-product-type-variable.php:301
@ -7366,7 +7359,7 @@ msgstr ""
#: admin/post-types/writepanels/writepanel-product-type-variable.php:301
#@ woothemes
msgid "&uarr;"
msgstr ""
msgstr "&uarr;"
#: admin/post-types/writepanels/writepanel-product-type-variable.php:145
#: admin/post-types/writepanels/writepanel-product-type-variable.php:301
@ -7405,7 +7398,7 @@ msgstr ""
#: admin/post-types/writepanels/writepanel-product-type-variable.php:507
#@ woothemes
msgid "Variable product"
msgstr ""
msgstr "Variabel product"
#: admin/post-types/writepanels/writepanel-product_data.php:37
#@ woothemes
@ -7690,7 +7683,7 @@ msgstr ""
#: classes/shipping/shipping-flat_rate.php:59
#@ woothemes
msgid "Flat Rate"
msgstr ""
msgstr "Vast Bedrag"
#: classes/shipping/shipping-flat_rate.php:80
#@ woothemes
@ -7812,7 +7805,7 @@ msgstr ""
#: templates/cart/cart.php:79
#@ woothemes
msgid "Update Cart"
msgstr ""
msgstr "Winkelwagen bijwerken"
#: templates/myaccount/my-account.php:77
#@ woothemes
@ -7889,13 +7882,13 @@ msgstr ""
#: templates/emails/customer_pay_for_order.php:15
#@ woothemes
msgid "Order #"
msgstr ""
msgstr "Bestelling #"
#: templates/myaccount/login.php:38
#: templates/myaccount/login.php:66
#@ woothemes
msgid "Register"
msgstr ""
msgstr "Registreer"
#: templates/myaccount/login.php:56
#@ woothemes
@ -7920,12 +7913,12 @@ msgstr ""
#: widgets/widget-layered_nav.php:344
#@ woothemes
msgid "AND"
msgstr ""
msgstr "EN"
#: widgets/widget-layered_nav.php:345
#@ woothemes
msgid "OR"
msgstr ""
msgstr "OF"
#: widgets/widget-login.php:22
#@ woothemes
@ -7935,13 +7928,13 @@ msgstr ""
#: widgets/widget-login.php:24
#@ woothemes
msgid "WooCommerce Login"
msgstr ""
msgstr "WooCommerce Login"
#: widgets/widget-login.php:42
#: widgets/widget-login.php:180
#@ woothemes
msgid "Customer Login"
msgstr ""
msgstr "Klant Login"
#: widgets/widget-login.php:43
#: widgets/widget-login.php:183
@ -8122,7 +8115,7 @@ msgstr ""
#: woocommerce.php:509
#@ woothemes
msgid "Search Shipping Classes"
msgstr ""
msgstr "Zoek verzendingsklassen"
#: woocommerce.php:510
#@ woothemes
@ -8162,12 +8155,12 @@ msgstr ""
#: templates/single-product/meta.php:14
#@ woothemes
msgid "Category:"
msgstr ""
msgstr "Categorie"
#: templates/single-product/meta.php:16
#@ woothemes
msgid "Tags:"
msgstr ""
msgstr "Tags:"
#: templates/single-product/add-to-cart/external.php:15
#@ woothemes
@ -8215,22 +8208,22 @@ msgstr ""
msgid "Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the \"screen options\" link at the top of the page."
msgstr ""
#: admin/woocommerce-admin-settings.php:1106
#: admin/woocommerce-admin-settings.php:1148
#@ woothemes
msgid "Your activated payment gateways are listed below. Drag and drop rows to re-order them for display on the checkout."
msgstr ""
#: admin/woocommerce-admin-settings.php:1110
#: admin/woocommerce-admin-settings.php:1152
#@ woothemes
msgid "Default"
msgstr ""
#: admin/woocommerce-admin-settings.php:1111
#: admin/woocommerce-admin-settings.php:1153
#@ woothemes
msgid "Gateway"
msgstr ""
#: admin/woocommerce-admin-settings.php:1128
#: admin/woocommerce-admin-settings.php:1170
#@ woothemes
msgid "Gateway ID"
msgstr ""
@ -8396,3 +8389,33 @@ msgstr ""
msgid "Hide if cart is empty"
msgstr ""
#: admin/woocommerce-admin-settings.php:729
#@ woothemes
msgid "Shipping can be enabled and disabled from this section."
msgstr ""
#: admin/woocommerce-admin-settings.php:1086
#@ woothemes
msgid "Your activated shipping methods are listed below. Drag and drop rows to re-order them for display on the frontend."
msgstr ""
#: admin/woocommerce-admin-settings.php:1090
#@ woothemes
msgid "Shipping Method"
msgstr ""
#: admin/woocommerce-admin-settings.php:1101
#@ woothemes
msgid "Method ID"
msgstr ""
#: widgets/widget-product_categories.php:117
#@ woothemes
msgid "Order by:"
msgstr ""
#: widgets/widget-product_categories.php:119
#@ woothemes
msgid "Category Order"
msgstr ""

View File

@ -97,6 +97,10 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
* Option to hide cart widget if the cart is empty
* Category widget - order by option
* Option to re-order shipping methods
* Coupon entry form on checkout (optional)
* paying_customer user meta when order is complete
* Improved download links in emails
* Replaced quantity selector of grouped downloadable products with a button
= 1.3.2.1 - 15/12/2011 =
* Category/Ordering fix

View File

@ -0,0 +1,23 @@
<?php
/**
* Checkout Coupon Form
*/
if (get_option('woocommerce_enable_coupon_form_on_checkout')=="no") return;
$info_message = apply_filters('woocommerce_checkout_coupon_message', __('Have a coupon?', 'woothemes'));
?>
<p class="info"><?php echo $info_message; ?> <a href="#" class="showcoupon"><?php _e('Click here to enter your code', 'woothemes'); ?></a></p>
<form class="checkout_coupon" method="post">
<p class="form-row form-row-first">
<input name="coupon_code" class="input-text" placeholder="<?php _e('Coupon code', 'woothemes'); ?>" id="coupon_code" value="" />
</p>
<p class="form-row form-row-last">
<input type="submit" class="button" name="apply_coupon" value="<?php _e('Apply Coupon', 'woothemes'); ?>" />
</p>
<div class="clear"></div>
</form>

View File

@ -1,6 +1,8 @@
<?php do_action('woocommerce_before_checkout_form');
<?php global $woocommerce; ?>
global $woocommerce;
<?php $woocommerce->show_messages(); ?>
<?php do_action('woocommerce_before_checkout_form');
// If checkout registration is disabled and not logged in, the user cannot checkout
if (get_option('woocommerce_enable_signup_and_login_from_checkout')=="no" && get_option('woocommerce_enable_guest_checkout')=="no" && !is_user_logged_in()) :

View File

@ -6,7 +6,7 @@
<?php if ($order->status=='pending') : ?>
<p><?php echo sprintf( __("An order has been created for you on &ldquo;%s&rdquo;. To pay for this order please use the following link: %s", 'woothemes'), get_bloginfo('name'), $order->get_checkout_payment_url() ); ?></p>
<p><?php echo sprintf( __("An order has been created for you on &ldquo;%s&rdquo;. To pay for this order please use the following link: <a href="%s">Pay</a>", 'woothemes'), get_bloginfo('name'), $order->get_checkout_payment_url() ); ?></p>
<?php endif; ?>

View File

@ -66,6 +66,12 @@ $order = &new woocommerce_order( $order_id );
$item_meta = &new order_item_meta( $item['item_meta'] );
$item_meta->display();
if ($_product->exists && $_product->is_downloadable() && $order->status=='completed') :
echo '<br/><small><a href="' . $order->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '">' . __('Download file &rarr;', 'woothemes') . '</a></small>';
endif;
echo ' </td>
<td>'.$item['qty'].'</td>

View File

@ -24,4 +24,6 @@ if (is_user_logged_in()) return;
<input type="submit" class="button" name="login" value="<?php _e('Login', 'woothemes'); ?>" />
<a class="lost_password" href="<?php echo esc_url( wp_lostpassword_url( home_url() ) ); ?>"><?php _e('Lost Password?', 'woothemes'); ?></a>
</p>
<div class="clear"></div>
</form>

View File

@ -4,6 +4,21 @@
*/
global $woocommerce, $product;
// Put grouped products into an array
$grouped_products = array();
$all_products_are_downloadable = true;
foreach ($product->get_children() as $child_id) :
$child_product = $product->get_child( $child_id );
if ( !$child_product->is_downloadable() || !$child_product->is_virtual() ) $all_products_are_downloadable = false;
$grouped_products[] = array(
'product' => $child_product,
'availability' => $child_product->get_availability()
);
endforeach;
?>
<?php do_action('woocommerce_before_add_to_cart_form'); ?>
@ -11,27 +26,41 @@ global $woocommerce, $product;
<form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>" class="cart" method="post" enctype='multipart/form-data'>
<table cellspacing="0" class="group_table">
<tbody>
<?php foreach ($product->get_children() as $child_id) : $child_product = $product->get_child( $child_id ); $cavailability = $child_product->get_availability(); ?>
<?php foreach ($grouped_products as $child_product) : ?>
<tr>
<td><?php woocommerce_quantity_input( array( 'input_name' => 'quantity['.$child_product->id.']', 'input_value' => '0' ) ); ?></td>
<td><label for="product-<?php echo $child_product->id; ?>"><?php
if ($child_product->is_visible()) echo '<a href="'.get_permalink($child_product->id).'">';
echo $child_product->get_title();
if ($child_product->is_visible()) echo '</a>';
<td>
<?php if ($all_products_are_downloadable) : ?>
<button type="submit" name="quantity[<?php echo $child_product['product']->id; ?>]" value="1" class="button alt"><?php _e('Add to cart', 'woothemes'); ?></button>
<?php else : ?>
<?php woocommerce_quantity_input( array( 'input_name' => 'quantity['.$child_product['product']->id.']', 'input_value' => '0' ) ); ?>
<?php endif; ?>
</td>
<td><label for="product-<?php echo $child_product['product']->id; ?>"><?php
if ($child_product['product']->is_visible()) echo '<a href="'.get_permalink($child_product['product']->id).'">';
echo $child_product['product']->get_title();
if ($child_product['product']->is_visible()) echo '</a>';
?></label></td>
<td class="price"><?php echo $child_product->get_price_html(); ?>
<?php echo apply_filters( 'woocommerce_stock_html', '<small class="stock '.$cavailability['class'].'">'.$cavailability['availability'].'</small>', $cavailability['availability'] ); ?>
<td class="price"><?php echo $child_product['product']->get_price_html(); ?>
<?php echo apply_filters( 'woocommerce_stock_html', '<small class="stock '.$child_product['availability']['class'].'">'.$child_product['availability']['availability'].'</small>', $child_product['availability']['availability'] ); ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php do_action('woocommerce_before_add_to_cart_button'); ?>
<button type="submit" class="button alt"><?php _e('Add to cart', 'woothemes'); ?></button>
<?php do_action('woocommerce_after_add_to_cart_button'); ?>
<?php if (!$all_products_are_downloadable) : ?>
<?php do_action('woocommerce_before_add_to_cart_button'); ?>
<button type="submit" class="button alt"><?php _e('Add to cart', 'woothemes'); ?></button>
<?php do_action('woocommerce_after_add_to_cart_button'); ?>
<?php endif; ?>
</form>

View File

@ -7,7 +7,7 @@ global $post, $product;
?>
<div class="product_meta">
<?php if ($product->is_type('simple') && get_option('woocommerce_enable_sku')=='yes') : ?>
<?php if (($product->is_type('simple') || $product->is_type('variable')) && get_option('woocommerce_enable_sku')=='yes') : ?>
<span itemprop="productID" class="sku"><?php _e('SKU:', 'woothemes'); ?> <?php echo $product->sku; ?>.</span>
<?php endif; ?>

41
uninstall.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/**
* WooCommerce Uninstall
*
* Uninstalling WooCommerce deletes user roles, options, tables, and pages.
*
* @package WooCommerce
* @category Core
* @author WooThemes
* @since 1.4
*/
if( !defined('WP_UNINSTALL_PLUGIN') ) exit();
global $wpdb, $wp_roles;
// Roles
remove_role( 'customer' );
remove_role( 'shop_manager' );
// Capabilities
$wp_roles->remove_cap( 'administrator', 'manage_woocommerce' );
// Pages
wp_delete_post( get_option('woocommerce_shop_page_id'), true );
wp_delete_post( get_option('woocommerce_cart_page_id'), true );
wp_delete_post( get_option('woocommerce_checkout_page_id'), true );
wp_delete_post( get_option('woocommerce_order_tracking_page_id'), true );
wp_delete_post( get_option('woocommerce_myaccount_page_id'), true );
wp_delete_post( get_option('woocommerce_edit_address_page_id'), true );
wp_delete_post( get_option('woocommerce_view_order_page_id'), true );
wp_delete_post( get_option('woocommerce_change_password_page_id'), true );
wp_delete_post( get_option('woocommerce_pay_page_id'), true );
wp_delete_post( get_option('woocommerce_thanks_page_id'), true );
// Tables
$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."woocommerce_attribute_taxonomies");
$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."woocommerce_downloadable_product_permissions");
$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."woocommerce_termmeta");
// Delete options
$wpdb->query("DELETE FROM $wpdb->options WHERE option_name LIKE 'woocommerce_%';");

View File

@ -39,7 +39,7 @@ class WooCommerce_Widget_Product_Categories extends WP_Widget {
$c = $instance['count'] ? '1' : '0';
$h = $instance['hierarchical'] ? '1' : '0';
$d = $instance['dropdown'] ? '1' : '0';
$o = $instance['orderby'];
$o = isset($instance['orderby']) ? $instance['orderby'] : 'order';
echo $before_widget;
if ( $title ) echo $before_title . $title . $after_title;

View File

@ -405,6 +405,18 @@ function woocommerce_downloadable_product_permissions( $order_id ) {
endforeach;
}
/**
* Order Status completed - This is a paying customer
**/
add_action('woocommerce_order_status_completed', 'woocommerce_paying_customer');
function woocommerce_paying_customer( $order_id ) {
$order = &new woocommerce_order( $order_id );
if ( $order->user_id > 0 ) update_user_meta( $order->user_id, 'paying_customer', 1 );
}
/**
* Filter to allow product_cat in the permalinks for products.
*

View File

@ -116,11 +116,12 @@ function woocommerce_front_page_archive( $query ) {
* Fix active class in wp_list_pages for shop page
*
* Suggested by jessor - https://github.com/woothemes/woocommerce/issues/177
* Amended Dec '11, by Peter Sterling - http://www.sterling-adventures.co.uk/
**/
function woocommerce_list_pages($pages){
global $post;
if (is_woocommerce() || is_cart() || is_checkout() || is_page(get_option('woocommerce_thanks_page_id'))) {
if (is_woocommerce()) {
$pages = str_replace( 'current_page_parent', '', $pages); // remove current_page_parent class from any item
$shop_page = 'page-item-' . get_option('woocommerce_shop_page_id'); // find shop_page_id through woocommerce options
@ -421,6 +422,25 @@ function woocommerce_process_login() {
endif;
}
/**
* Process the coupon form on the checkout
**/
function woocommerce_process_coupon_form() {
global $woocommerce;
if (isset($_POST['coupon_code']) && $_POST['coupon_code']) :
$coupon_code = stripslashes(trim($_POST['coupon_code']));
$woocommerce->cart->add_discount($coupon_code);
if ( wp_get_referer() ) :
wp_safe_redirect( wp_get_referer() );
exit;
endif;
endif;
}
/**
* Process the registration form
**/

View File

@ -80,6 +80,7 @@ add_action( 'woocommerce_product_tab_panels', 'woocommerce_product_reviews_panel
/* Checkout */
add_action( 'woocommerce_before_checkout_form', 'woocommerce_checkout_login_form', 10 );
add_action( 'woocommerce_before_checkout_form', 'woocommerce_checkout_coupon_form', 10 );
add_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
/* Cart */
@ -119,6 +120,7 @@ add_action( 'init', 'woocommerce_add_to_cart_action' );
/* Login and Registration */
add_action( 'init', 'woocommerce_process_login' );
add_action( 'init', 'woocommerce_process_coupon_form' );
add_action( 'init', 'woocommerce_process_registration' );
/* Product Downloads */

View File

@ -229,6 +229,7 @@ if (!function_exists('woocommerce_variable_add_to_cart')) {
'image_link' => $image_link,
'price_html' => '<span class="price">'.$variation->get_price_html().'</span>',
'availability_html' => $availability_html,
'sku' => __('SKU:', 'woothemes') . ' ' . $variation->sku
);
}
}
@ -431,6 +432,15 @@ if (!function_exists('woocommerce_order_review')) {
}
}
/**
* Coupon form for checkout
**/
if (!function_exists('woocommerce_checkout_coupon_form')) {
function woocommerce_checkout_coupon_form() {
woocommerce_get_template('checkout/coupon-form.php', false);
}
}
/**
* display product sub categories as thumbnails
**/

View File

@ -2,7 +2,7 @@
/*
Plugin Name: WooCommerce
Plugin URI: http://www.woothemes.com/woocommerce/
Description: An eCommerce plugin for wordpress.
Description: An e-commerce toolkit that helps you sell anything. Beautifully.
Version: 1.4
Author: WooThemes
Author URI: http://woothemes.com