Commit Graph

22638 Commits

Author SHA1 Message Date
Mike Jolley e99471c0cd Removed manual discounts code 2017-08-18 10:36:10 +01:00
Claudio Sanches 12b3f94992 Merge pull request #16506 from woocommerce/fix/16489
Fixed extra "!" and ")" on #16489
2017-08-17 19:06:45 -03:00
Claudio Sanches 909c3f6c8f Fixed extra "!" and ")" on #16489 2017-08-17 19:05:46 -03:00
Claudio Sanches 3fb17f23e7 Merge pull request #16478 from ramiy/patch-1
i18n: Rewrite the translation string logic
2017-08-17 13:59:37 -03:00
Claudio Sanches bf81af778b Merge pull request #16489 from aj-adl/master
Add filter to woocommerce_order_again_button to match WC_Form_Handler
2017-08-17 13:55:49 -03:00
Mike Jolley cd15e18e68 Fix failing test 2017-08-17 15:45:26 +01:00
Alex James Bishop d4a02819a7 Add filter to woocommerce_order_again_button to match WC_Form_Handler->order_again
This commit adds the `woocommerce_valid_order_statuses_for_order_again` filter to the conditional check
before displaying the order-again button.

The purpose is to enable consistency when altering the valid order again statuses - in the past a dev would
need to use this filter to let the order through the form handler, and then override the template file for a really
trivial reason just to get the button to display.
2017-08-17 11:31:06 +09:30
Corey Smith a6cf08d8cf Wrapped 'Delete selected row(s)' button in condition 2017-08-16 11:56:30 -05:00
Claudiu Lodromanean 5ff7704db4 Merge pull request #16476 from woocommerce/fix/16455
Fix breadcrumbs for regular categories
2017-08-16 08:49:01 -07:00
Rami Yushuvaev 4ae42313ce i18n: Rewrite the translation string logic
The single translation string `by` is not easy to translate without a context. In this case, using the context function `_x()` is not the best solution.

A better way would be to create two complete translation strings for refund with a user and without a user.
2017-08-16 14:25:38 +03:00
ragulka d73e7e4f9d Prevent unwanted double cart notices (#16460)
* Don't add shipping zone debug message when doing ajax

Prevent an issue where the "Customer matched zone" debug message is shown twice after first selecting a shipping method and then changing a product's quantity in cart and clicking Update cart.

* Don't pass event object to cart.update_cart

Prevent accidentally preserving cart notices when `wc_update_cart` event is triggered on body. If the event object is passed to update_cart() as the first param, it evaluates to true, forcing existing notices to be preserved.

* Pass custom arguments to cart.update_cart()

Instead of simply not passing the event object, pass any custom arguments, so it's possible to do something like: $( body ).trigger( 'wc_update_cart', true ); to still preserve notices if needed.
2017-08-16 11:34:35 +01:00
Mike Jolley 201b3bc056 Merge pull request #16466 from woocommerce/fix/rounding
Fix discounts rounding issues
2017-08-16 11:28:09 +01:00
Mike Jolley 38ab37597c Merge pull request #16467 from ramiy/patch-1
i18n: Simpler translation string with placeholders
2017-08-16 11:26:06 +01:00
Mike Jolley 34ae983cc9 Merge pull request #16470 from ramiy/patch-4
i18n: Simpler translation string with placeholders
2017-08-16 11:25:48 +01:00
Mike Jolley bf84592e87 Merge pull request #16469 from ramiy/patch-3
i18n: Merge two similar translation strings
2017-08-16 11:25:23 +01:00
Mike Jolley 875956c3aa Merge pull request #16468 from ramiy/patch-2
i18n: Simpler translation string with placeholders
2017-08-16 11:24:56 +01:00
Mike Jolley 3aee17faeb Fix breadcrumbs for regular categories
Closes #16455
2017-08-16 11:22:22 +01:00
Mike Jolley 812ee4b917 Merge pull request #16475 from woocommerce/fix/image-zoom-2017
Fix disappearing image when zoomed on touch devices whilst using 2017 theme
2017-08-16 10:47:08 +01:00
James Koster a2740cf7a5 Fix disappearing image when zoomed on touch devices 2017-08-16 10:20:14 +01:00
Patrick Garman f19a63e1d7 Merge the DB and DB Table Size tables 2017-08-15 19:52:14 -05:00
Rami Yushuvaev 125ead910a i18n: Simpler translation string with placeholders
One more... replacing function name with `%s` placeholder, this way translators can't misspell the function name.
2017-08-16 00:42:32 +03:00
Rami Yushuvaev 43744e4f27 i18n: Merge two similar translation strings
Replace:

`wp_remote_get() failed. Contact your hosting provider.`
`wp_remote_post() failed. Contact your hosting provider.`

With:

`%s failed. Contact your hosting provider.`

Note:

This also a good practice because the function name is outside of the translation string, this way the translator can't misspell the function name.
2017-08-16 00:32:36 +03:00
Rami Yushuvaev d1f4acc730 i18n: Simpler translation string with placeholders
Replace:

`wc_get_product should not be called before the woocommerce_init action.`

With:

`%1$s should not be called before the %2$s action.`
2017-08-16 00:26:14 +03:00
Rami Yushuvaev 0087536296 i18n: Simpler translation string with placeholders
Replace:

`WC_Logger::log was called with an invalid level "%s".`

With:

`%1$s was called with an invalid level "%2$s".`
2017-08-16 00:22:46 +03:00
claudiulodro 9a47146716 Fix discounts rounding issues 2017-08-15 14:11:25 -07:00
Claudio Sanches 88e0138be4 Merge pull request #16464 from iickoo/patch-1
Update add-to-cart-variation.js
2017-08-15 16:28:47 -03:00
iickoo 9bd01a8d44 Update add-to-cart-variation.js 2017-08-15 20:55:19 +02:00
Claudio Sanches 82a6de2e49 Merge pull request #16459 from ramiy/patch-3
i18n: Avoid using HTML tags in translation strings
2017-08-15 14:48:35 -03:00
Claudio Sanches 3a12f7b494 2.1.2 db update functions 2017-08-15 13:01:28 -03:00
Claudio Sanches 339ab41bf1 Remove unfiltered_html capability from Shop Managers 2017-08-15 12:57:12 -03:00
Claudio Sanches 9e8aa83d47 Escape product names on reports 2017-08-15 12:56:35 -03:00
Claudio Sanches 0fec9dbfe7 Merge pull request #16458 from ramiy/patch-2
i18n: Simpler translation string with placeholders
2017-08-15 12:49:31 -03:00
Mike Jolley 129eae141a Fix custom discount amounts not multiplying by qty 2017-08-15 16:25:39 +01:00
Mike Jolley 3c18d5e849 Adjust total discount for ex.tax 2017-08-15 16:25:39 +01:00
Claudio Sanches 7a44c3d700 Merge pull request #16457 from ramiy/patch-1
i18n: Simpler translation string with placeholders
2017-08-15 12:05:32 -03:00
Mike Jolley de35d9ba02 Apply woocommerce_coupon_get_discount_amount without cents
cc @claudiulodro
2017-08-15 15:29:22 +01:00
Claudio Sanches a6017741ad Merge pull request #16456 from woocommerce/update/status-tools
Tool to purge webhook logs
2017-08-15 11:02:27 -03:00
Mike Jolley 835d0ab450 Fix remove tax column
Closes #16443
2017-08-15 14:51:12 +01:00
Rami Yushuvaev 6f7c817b78 i18n: Avoid using HTML tags in translation strings
This PR moves the `<strong>` HTML tags from the translation strings.

Replacing: `Order scheduled for: <strong>%1$s</strong>.`
With: `Order scheduled for: %s.`

We did the same in WordPress core across several releases (4.3 - 4.7). Because it's makes the translation process to RTL language (like Hebrew) much easier.
2017-08-15 15:07:55 +03:00
Rami Yushuvaev 7ce117a0ca i18n: Simpler translation string with placeholders
Replace:

`The provided handler <code>%s</code> does not implement WC_Log_Handler_Interface.`

With:

`The provided handler %1$s does not implement %2$s.`
2017-08-15 14:48:42 +03:00
Rami Yushuvaev 7ad61068e1 i18n: Simpler translation string with placeholders
Replace:

`The class <code>%s</code> provided by woocommerce_logging_class filter must implement <code>WC_Logger_Interface</code>.`

With:

`The class %1$s provided by %2$s filter must implement %3$s.`
2017-08-15 14:39:41 +03:00
Mike Jolley 392ce417bc docblocks 2017-08-15 12:21:12 +01:00
Mike Jolley 3852ce59c8 Tool to purge webhooks 2017-08-15 12:15:17 +01:00
Mike Jolley a44a57b5d9 Improve tools page styling 2017-08-15 12:05:34 +01:00
Mike Jolley f62d505797 Merge pull request #16427 from nyordanov/variation-permalink-infinite-loop
Prevent infinite recursion in WC_Post_Data::variation_post_link()
2017-08-15 10:59:36 +01:00
Mike Jolley 4101e313bb Merge pull request #16392 from woocommerce/feature/admin-apply-discount-15501
[WIP] Admin discounts
2017-08-15 10:07:00 +01:00
Mike Jolley 70248b2fa6 Merge pull request #16419 from woocommerce/fix/1645
Use array_replace in order item apply_changes
2017-08-15 09:59:02 +01:00
claudiulodro 2eb107b0af Add 5.2 fallback 2017-08-14 11:45:54 -07:00
claudiulodro ae80d12d80 Merge master 2017-08-14 11:12:09 -07:00
Claudiu Lodromanean f3bf4a8cb1 Merge pull request #16449 from woocommerce/apply-discount-todos
Calculate coupon taxes in order class
2017-08-14 11:08:05 -07:00