Skip to content
Permalink
Browse files

upstream

  • Loading branch information...
SiR-DanieL committed Feb 19, 2015
1 parent 2dbfadd commit 9493c5a7b1a86d5392305775e46620be04c6c07b
Showing with 1,386 additions and 1,353 deletions.
  1. +21 −10 .scrutinizer.yml
  2. +0 −1 .travis.yml
  3. +1 −1 assets/css/admin.css
  4. +5 −0 assets/css/admin.scss
  5. +1 −1 assets/css/prettyPhoto.css
  6. +1 −1 assets/css/select2.css
  7. +1 −1 assets/css/woocommerce.css
  8. +13 −4 assets/js/frontend/checkout.js
  9. +1 −1 assets/js/frontend/checkout.min.js
  10. +198 −178 i18n/languages/woocommerce-admin.pot
  11. +183 −191 i18n/languages/woocommerce.pot
  12. +4 −4 includes/abstracts/abstract-wc-order.php
  13. +1 −1 includes/abstracts/abstract-wc-payment-gateway.php
  14. +20 −3 includes/abstracts/abstract-wc-product.php
  15. +4 −3 includes/admin/class-wc-admin-dashboard.php
  16. +8 −16 includes/admin/class-wc-admin-duplicate-product.php
  17. +1 −1 includes/admin/class-wc-admin-menus.php
  18. +1 −1 includes/admin/class-wc-admin-welcome.php
  19. +14 −2 includes/admin/class-wc-admin.php
  20. +2 −2 includes/admin/importers/class-wc-tax-rate-importer.php
  21. +4 −3 includes/admin/meta-boxes/class-wc-meta-box-product-data.php
  22. +5 −14 includes/admin/meta-boxes/views/html-order-item.php
  23. +1 −1 includes/admin/reports/class-wc-admin-report.php
  24. +223 −237 includes/admin/reports/class-wc-report-sales-by-date.php
  25. +2 −3 includes/admin/reports/class-wc-report-sales-by-product.php
  26. +69 −68 includes/admin/reports/class-wc-report-taxes-by-code.php
  27. +73 −39 includes/admin/reports/class-wc-report-taxes-by-date.php
  28. +6 −6 includes/admin/settings/class-wc-settings-emails.php
  29. +14 −12 includes/admin/settings/views/settings-tax.php
  30. +22 −0 includes/admin/views/html-admin-page-status-report.php
  31. +1 −1 includes/admin/views/html-notice-frontend-colors.php
  32. +1 −1 includes/admin/views/html-notice-template-check.php
  33. +1 −1 includes/admin/views/html-notice-theme-support.php
  34. +2 −1 includes/admin/wc-admin-functions.php
  35. +30 −191 includes/api/class-wc-api-reports.php
  36. +17 −14 includes/class-wc-ajax.php
  37. +1 −1 includes/class-wc-autoloader.php
  38. +5 −2 includes/class-wc-breadcrumb.php
  39. +1 −3 includes/class-wc-coupon.php
  40. +33 −12 includes/class-wc-customer.php
  41. +2 −2 includes/class-wc-download-handler.php
  42. +1 −1 includes/class-wc-emails.php
  43. +13 −15 includes/class-wc-form-handler.php
  44. +1 −1 includes/class-wc-frontend-scripts.php
  45. +26 −9 includes/class-wc-geolocation.php
  46. +3 −1 includes/class-wc-install.php
  47. +2 −2 includes/class-wc-post-types.php
  48. +11 −6 includes/class-wc-tracker.php
  49. +132 −136 includes/emails/class-wc-email-cancelled-order.php
  50. +10 −14 includes/emails/class-wc-email-customer-completed-order.php
  51. +10 −14 includes/emails/class-wc-email-customer-invoice.php
  52. +10 −14 includes/emails/class-wc-email-new-order.php
  53. +38 −17 includes/emails/class-wc-email.php
  54. +3 −1 includes/gateways/paypal/class-wc-gateway-paypal.php
  55. +3 −3 includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
  56. +4 −4 includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
  57. +12 −12 includes/libraries/class-emogrifier.php
  58. +1 −1 includes/shortcodes/class-wc-shortcode-checkout.php
  59. +4 −4 includes/shortcodes/class-wc-shortcode-my-account.php
  60. +1 −1 includes/wc-cart-functions.php
  61. +16 −2 includes/wc-core-functions.php
  62. +4 −3 includes/wc-order-functions.php
  63. +14 −2 includes/wc-page-functions.php
  64. +3 −3 includes/wc-template-functions.php
  65. +5 −2 includes/wc-user-functions.php
  66. +5 −15 license.txt
  67. +29 −3 readme.txt
  68. +1 −1 templates/cart/cart-empty.php
  69. +1 −1 templates/checkout/form-login.php
  70. +1 −1 templates/checkout/payment.php
  71. +1 −1 templates/checkout/thankyou.php
  72. +1 −1 templates/emails/customer-invoice.php
  73. +1 −1 templates/emails/customer-new-account.php
  74. +1 −1 templates/emails/customer-reset-password.php
  75. +2 −2 templates/emails/email-header.php
  76. +1 −1 templates/emails/plain/customer-invoice.php
  77. +1 −1 templates/emails/plain/customer-new-account.php
  78. +1 −1 templates/emails/plain/customer-reset-password.php
  79. +16 −17 templates/global/breadcrumb.php
  80. +1 −1 templates/myaccount/my-account.php
  81. +1 −1 templates/myaccount/my-orders.php
  82. +2 −2 woocommerce.php
@@ -1,17 +1,28 @@
filter:
excluded_paths:
- tests/*
- apigen/*
- includes/api/v1/*
- includes/libraries/*
- includes/updates/*
- includes/gateways/simplify-commerce/includes/*
- tests/*
- apigen/*
- dummy-data/*
- i18n/*
- includes/api/v1/*
- includes/libraries/*
- includes/updates/*
- includes/gateways/simplify-commerce/includes/*

checks:
php:
code_rating: true
duplication: true
variable_existence: false
verify_access_scope_valid: false
verify_argument_usable_as_reference: false
verify_property_names: false
no_global_keyword: false
psr2_switch_declaration: false
psr2_control_structure_declaration: false
psr2_class_declaration: false
one_class_per_file: false
no_exit: false
avoid_superglobals: false
avoid_closing_tag: false

tools:
external_code_coverage:
timeout: 600
sensiolabs_security_checker: true
@@ -12,7 +12,6 @@ env:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=4.1 WP_MULTISITE=0
- WP_VERSION=4.0 WP_MULTISITE=0
- WP_VERSION=3.9.2 WP_MULTISITE=0

matrix:
include:

Large diffs are not rendered by default.

@@ -3642,6 +3642,11 @@ img.ui-datepicker-trigger {
font-weight: normal;
display: block;
font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;

del {
color: #e74c3c;
font-weight: normal;
}
}

&:hover {

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -19,7 +19,7 @@ jQuery( function( $ ) {
$( 'body' ).bind( 'init_checkout', this.init_checkout );

// Payment methods
this.$order_review.on( 'click', '.payment_methods input.input-radio', this.payment_method_selected );
this.$order_review.on( 'click', 'input[name=payment_method]', this.payment_method_selected );

// Form submission
this.$checkout_form.on( 'submit', this.submit );
@@ -37,7 +37,7 @@ jQuery( function( $ ) {
this.$checkout_form.on( 'change', '#ship-to-different-address input', this.ship_to_different_address );

// Trigger events
this.$order_review.find( 'input[name=payment_method]:checked' ).triggerHandler( 'click' );
this.$order_review.find( 'input[name=payment_method]:checked' ).trigger( 'click' );
this.$checkout_form.find( '#ship-to-different-address input' ).change();

// Update on page load
@@ -161,11 +161,20 @@ jQuery( function( $ ) {
$parent.removeClass( 'woocommerce-invalid woocommerce-invalid-required-field' ).addClass( 'woocommerce-validated' );
}
},
update_checkout: function() {
update_checkout: function() {
// Small timeout to prevent multiple requests when several fields update at the same time
wc_checkout_form.reset_update_checkout_timer();
wc_checkout_form.updateTimer = setTimeout( wc_checkout_form.update_checkout_action, '5' );
},
update_checkout_action: function() {
if ( wc_checkout_form.xhr ) {
wc_checkout_form.xhr.abort();
}

if ( $( 'form.checkout' ).size() === 0 ) {
return;
}

var shipping_methods = [];

$( 'select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]' ).each( function( index, input ) {
@@ -273,7 +282,7 @@ jQuery( function( $ ) {
}

// Trigger click e on selected payment method
$( '.woocommerce-checkout' ).find( 'input[name=payment_method]:checked' ).triggerHandler( 'click' );
$( '.woocommerce-checkout' ).find( 'input[name=payment_method]:checked' ).trigger( 'click' );

// Fire updated_checkout e
$( 'body' ).trigger( 'updated_checkout' );

Large diffs are not rendered by default.

0 comments on commit 9493c5a

Please sign in to comment.
You can’t perform that action at this time.