Commit Graph

24219 Commits

Author SHA1 Message Date
Mike Jolley 67144be628
Merge pull request #17727 from woocommerce/fix/get_object_subtotal
Fix variable in get_object_subtotal
2017-11-16 12:03:58 +00:00
Mike Jolley 72b3b5055b FIx variable in get_object_subtotal 2017-11-16 12:03:02 +00:00
Mike Jolley 11d0293ddd non-enabled children should not be ignored
This fixes #17713 by also returning private children (non-enabled).
2017-11-16 11:56:51 +00:00
Mike Jolley 541dde95b3
Merge pull request #17710 from woocommerce/fix/17697-coupon-spend-incl-taxes
Coupon min/max spend based on displayed subtotal
2017-11-16 10:59:43 +00:00
Gerhard Potgieter a59f325f41 Add get_object_subtotal helper method, remove subtotal variable in favor of helper method 2017-11-16 12:43:50 +02:00
Gerhard Potgieter 3af77f13d8 Change tooltip to just say subtotal 2017-11-16 12:28:43 +02:00
Chris Marslender 961c24e373
Merge branch 'master' into feature/network-order-widget 2017-11-15 18:43:34 -07:00
Claudiu Lodromanean 6c82861522
Merge pull request #17716 from woocommerce/fix/use-add_filter
Use `add_filter` for `comment_feed_where` hook.
2017-11-15 14:37:34 -08:00
Claudiu Lodromanean 6b3fd8e403
Merge pull request #17715 from woocommerce/update/17601
Variation add to cart logic
2017-11-15 14:35:52 -08:00
Claudiu Lodromanean f05ca1176c
Merge pull request #17714 from woocommerce/fix/17630
Fix event propagation on click
2017-11-15 14:32:44 -08:00
Akeda Bagus 6572ee7852
Added missing meta info (author and date) when adding order note.
Fixes #17717.
2017-11-16 02:03:07 +07:00
Akeda Bagus 6ae10e64e2
Use `add_filter` for `comment_feed_where` hook. 2017-11-16 00:43:12 +07:00
The Dramatist 31155ed531 Woocommerce download readfile chunk number hook proposal (#17699)
* A hook proposal to modify the chunk number.

`woocommerce_download_readfile_chunk_number` hook is proposed to make modifying the chunk number easily.

* Constant IMO declared for changeable chunk size. 

New constant `WC_CHUNK_SIZE` declared to make `WC_Download_Handler` class's `readfile_chunked` method's chunk size changeable.
2017-11-15 16:32:28 +00:00
Mike Jolley c92f61d6d4 Variation add to cart logic 2017-11-15 16:29:04 +00:00
Mike Jolley 17710b864d Tweak IPN setting wording
@claudiulodro
2017-11-15 15:12:52 +00:00
Mike Jolley cbc16f7e2b Min 2017-11-15 14:34:42 +00:00
Mike Jolley 36ce76434a Fix propagation on click
Fixes #17630
2017-11-15 14:34:35 +00:00
Mike Jolley cbc143e021
Merge pull request #16700 from woocommerce/tweak/order-screens
Order screen simplification, preview function, and list table refactor.
2017-11-15 14:13:54 +00:00
Mike Jolley 56d86aee96 trashed styling 2017-11-15 13:41:20 +00:00
Mike Jolley 128b826791 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/class-wc-admin-post-types.php
2017-11-15 13:36:13 +00:00
Mike Jolley 4b3f8817cf Responsive styles 2017-11-15 13:30:39 +00:00
Mike Jolley dea454c88e Clickable elements 2017-11-15 12:51:14 +00:00
Mike Jolley e0bb7b35fd Cursors 2017-11-15 12:35:41 +00:00
Mike Jolley 4bb7bcd3af Fix sorting position 2017-11-15 12:32:02 +00:00
Mike Jolley da004f3229 fix edit link 2017-11-15 12:25:44 +00:00
Mike Jolley a57edb97a7 Use passed location 2017-11-15 12:14:55 +00:00
Gerhard Potgieter 4521011219 Adjust discount on min/max spend to work based on the displayed subtotal. 2017-11-15 13:44:07 +02:00
Mike Jolley ef4859aaf0
Merge pull request #17711 from woocommerce/update/17502
Improve the Add Payment Methods display
2017-11-15 11:05:11 +00:00
Mike Jolley bb2e506a2b Tweak wording 2017-11-15 11:04:20 +00:00
Mike Jolley 599b10b286 Merge branch 'pr/17664' 2017-11-15 10:31:40 +00:00
Mike Jolley 9e2786a0a3 Today up logic 2017-11-15 10:31:31 +00:00
Gerhard Potgieter 0436e9afcb Rework tax calculations to work with inclusive and exclusive pricing 2017-11-15 12:23:52 +02:00
Mike Jolley 6a8966382d Merge branch 'pr/17690' 2017-11-15 10:21:49 +00:00
Mike Jolley e9bbb3a10f phpcs 2017-11-15 10:21:38 +00:00
Mike Jolley 76adff572e woocommerce_recently_viewed_products_widget_query_args filter
Closes #17678
2017-11-15 10:19:11 +00:00
Gerhard Potgieter 8cbca4d9d9 Include taxes in minimum and maximum coupon validation checks. 2017-11-15 12:04:02 +02:00
Mike Jolley 8dcd7f5b59
Merge pull request #17696 from yratof/patch-1
Removed class within class for admin meta boxes
2017-11-15 10:02:19 +00:00
Mike Jolley bff529878e
Merge pull request #17709 from shivapoudel/revert-17356-backbonejs-changes
Revert "Add correct method to define new in a backbone"
2017-11-15 09:59:39 +00:00
Gerhard Potgieter 0abac7b58e Log to a seperate log file dedicated to images 2017-11-15 10:34:28 +02:00
Gerhard Potgieter 14bc175241 Remove unused variable, make sure we have the wp image functions loaded before calling them. 2017-11-15 10:23:54 +02:00
Gerhard Potgieter 329f28f08b Fix SQL query for job queue processing, fix issue where admin images were trying to go through the image resize function. 2017-11-15 10:18:10 +02:00
Gerhard Potgieter 67d2b8e9c5 Use static variable on static class 2017-11-15 10:03:59 +02:00
Gerhard Potgieter c698b13f6c Completed background image regeneration using a job and queue. 2017-11-15 09:23:36 +02:00
Gerhard Potgieter 5af93f68ad Add basic background queue processing framework for image regeneration 2017-11-15 08:36:57 +02:00
Shiva Poudel 07784c3ee2
Revert "Add correct method to define new in a backbone" 2017-11-15 11:24:10 +05:45
Chris Marslender 8f4720cb1c
remove the new line before the closing `}` for the order controller classes, to be consistent with other controllers 2017-11-14 19:44:29 -07:00
Chris Marslender 28500258bc
Move the orders/network endpoint to its own class, and extend the schema with the new fields 2017-11-14 19:42:31 -07:00
Chris Marslender a8ac58af79
Make table headings translatable 2017-11-14 19:05:44 -07:00
Chris Marslender e953bd3e68
Coding standards fixes for the API endpoint 2017-11-14 19:04:45 -07:00
Chris Marslender 2731de7461
Updates for coding standards 2017-11-14 18:59:20 -07:00