Commit Graph

14131 Commits

Author SHA1 Message Date
Gerhard Potgieter 1e887c5afa Add deprecated param to docbloc 2017-11-20 08:13:55 +02:00
Gerhard Potgieter 0725ed11ac Remove webhook comment migration method, not needed. 2017-11-20 08:12:49 +02:00
Gerhard Potgieter 0360801994 Add deprecated param to deprecated functions, use wc_print_r instead of print_r, PHPCS fix 2017-11-20 08:11:10 +02:00
Gerhard Potgieter b7f76e1a1b Make sure sizes array exist before checking for children 2017-11-20 07:50:35 +02:00
Shiva Poudel 4eaeff1729 Tweak - Fix IPN validation for PayPal as its notify URL has different case 2017-11-20 07:52:15 +05:45
axelmm 1a309856c3
Access to importer parameters - DRY
Access (read only) to params can be required in many cases when you're playing with importing. 
In my case it was extending importer with filters and actions (procedural way - within original csv importer process) but it relates to objective way (extending importer class), too.

I wanted to know if 'update_existing' flag is set (other way than $_POST values) within filter 'woocommerce_product_importer_parsed_data' in parse/expand loop (called from class-wc-product-csv-importer.php 'set_parsed_data' method). Unfortunately this (and similiar) filter doesn't receive importer instance, only row data (raw, parsed and product object). Thanks to https://github.com/woocommerce/woocommerce/pull/15796 we have 'woocommerce_product_importer_formatting_callbacks' filter receiving importer instance. Unfortunately importer '$params' field is not accessible (protected in abstract). This PR resolves this simple problem - we can get this flag (and other params) before importing loops, processing rows etc.
2017-11-20 02:09:49 +01:00
James Kemp 5c03d9cbd5
Minor grammar change 2017-11-18 22:08:42 +00:00
Claudiu Lodromanean 106e6533f2
Merge pull request #17781 from woocommerce/fix/17629
When populating defaults, sanitize
2017-11-18 13:40:40 -08:00
Claudiu Lodromanean 89e729cd8e
Merge pull request #17784 from woocommerce/fix/17775-4.9
Fix 4.9 conflict with variation names
2017-11-18 13:37:20 -08:00
Alexandre GASNE 0018b4349e Fix: Apostrophe wrongly escaped for price nav filter and widget nav filters 2017-11-18 20:11:53 +01:00
Michael Weichselgartner ff8326b20e
Fix method upload_dir in class WC_Admin_Post_Types
Fix undefined variable `$uploads` in method `upload_dir` from class `WC_Admin_Post_Types` by reverting back to `$pathdata` as reported in #17789
2017-11-18 20:06:45 +01:00
Mike Jolley 55433aa7a9
Merge pull request #17785 from shivapoudel/fix/visibility-featured
Correct escape for featured product checkbox
2017-11-18 18:29:30 +00:00
Mike Jolley a765367dd5
Merge pull request #17747 from woocommerce/feature/allow-add-content-to-order-preview
Introduce hooks to allow custom content into order preview
2017-11-18 18:26:08 +00:00
Michael Weichselgartner 7164a7e190
Update class-wc-admin-post-types.php 2017-11-18 18:16:18 +01:00
Shiva Poudel 1fbc4e77cc Tweak - Display featured product checkbox inline 2017-11-18 21:43:09 +05:45
Mike Jolley a23541ad5d Fix 4.9 conflict with variation names
`santiize-title` works differently with `/` chars in 4.9. This update
routine keeps variations functioning by doing a DB update on read.

Fixes #17775
2017-11-18 14:53:18 +00:00
Mike Jolley 8a2050e066 When populating defaults, sanitize
part of #17775

Caused by https://github.com/woocommerce/woocommerce/pull/17629/files
leaving attribute names uppercase.
2017-11-18 13:55:26 +00:00
Claudio Sanches b4347f4071 Restore global $GLOBALS['post'] after render products shortcode
Closes #17769
2017-11-17 18:38:30 -02:00
Claudio Sanches 7c955591d7 Introduces _start and _end hooks into order preview template 2017-11-17 18:30:01 -02:00
Claudio Sanches 3f6dfb531c
Merge pull request #17748 from woocommerce/fix/orders-rest-api-schema-types
Rest API: Update the schema types for tax_class and price
2017-11-17 17:54:10 -02:00
Claudio Sanches d9d27a9a97 Fixed "tax_class" type in REST API v1 2017-11-17 17:52:12 -02:00
Claudiu Lodromanean 9c1d3b8108
Merge pull request #17726 from woocommerce/fix/17713
non-enabled children should not be ignored
2017-11-17 10:07:38 -08:00
claudiulodro dddf0ee473 Variable product sync 2017-11-17 08:46:49 -08:00
Mike Jolley 72e078e83e Merge branch 'fix/17236'
# Conflicts:
#	includes/class-woocommerce.php
2017-11-17 12:49:02 +00:00
Gerhard Potgieter fdc89056cd PHPCS fix 2017-11-17 14:47:51 +02:00
Gerhard Potgieter c64a73274d Deprecate WC_Admin_Webhooks::logs_output not used in new crud webhooks 2017-11-17 14:46:09 +02:00
Gerhard Potgieter ba451f68e4 Remove unused filter and deprecate get_delivery_log function. 2017-11-17 14:43:44 +02:00
Mike Jolley 21e51b9fc6
Merge pull request #17692 from woocommerce/update/16925
Add add_to_cart_description method and aria-labels to cart buttons in the loop
2017-11-17 12:35:50 +00:00
Mike Jolley 5ac3129089
Merge pull request #17700 from woocommerce/update/move-settings-to-customizer-17148
Update/move settings to customizer
2017-11-17 12:24:36 +00:00
Mike Jolley 14a657e7cc
Merge pull request #17728 from woocommerce/fix/17712
Default variation tax class should be 'same as parent'
2017-11-17 12:22:11 +00:00
Mike Jolley 8fe5d6bad0
Merge pull request #17676 from woocommerce/update/17672
Clear transients when product terms are updated
2017-11-17 12:21:53 +00:00
Mike Jolley 97d9a35437 Merge branch 'feature/regenerate-images'
# Conflicts:
#	includes/class-woocommerce.php
2017-11-17 12:12:35 +00:00
Mike Jolley 9b68610c7b
Merge pull request #17718 from woocommerce/fix/17717
Added missing meta info (author and date) when adding order note.
2017-11-17 12:03:31 +00:00
Mike Jolley e9ba9736fc
Merge pull request #17740 from woocommerce/fix/wizard-payment-escaping
Wizard: Fix escaping in payment description
2017-11-17 11:47:59 +00:00
Mike Jolley a2fadc0567
Merge pull request #17735 from woocommerce/feature/16446
Webhooks migration script
2017-11-17 11:43:29 +00:00
The Dramatist 85ce4e0078 Class wc emails backorder method extract function removed (#17724)
* Replaced extract() function usage.

Usage of `extract()` is kinda discouraged. Though here the array `$args` is verified, I think avoiding this `extract()` function will make it better. Besides, without `extract()` the code is more readable and easily understandable.

* Object checking should be done.

Checking `$args['product']` is an object or not should be done before `get_formatted_name()` method is being called.
2017-11-17 11:38:26 +00:00
Gerhard Potgieter 2ec3e5d045 Return url when requesting logs 2017-11-17 09:41:14 +02:00
Gerhard Potgieter 3adb2d8fce Use this as class reference, use info method for logging, use consistant log filename. 2017-11-17 09:03:32 +02:00
Gerhard Potgieter 98a382174c Merge branch 'feature/webhook-crud' into feature/webhook-delivery-logging 2017-11-17 08:48:57 +02:00
Kelly Dwan 5bb04dd61f Rest API: Update the schema types for tax_class and price 2017-11-16 16:39:14 -05:00
claudiulodro 0eba98a4e7 Filter by stock status 2017-11-16 13:07:14 -08:00
Claudio Sanches 563896931e Introduced hooks to allow custom content into order preview 2017-11-16 18:48:47 -02:00
Mike Jolley bdea242019 Schema: Attributes are an array of strings 2017-11-16 19:44:14 +00:00
Mike Jolley a899b53b57 Unit test fix: Exclude syntax_highlighting 2017-11-16 18:58:09 +00:00
claudiulodro 0390cf3e26 Bring up-to-date with master 2017-11-16 10:06:07 -08:00
Claudio Sanches 01983e6b96 Query and save only IDs of products when fetching products by shortcode 2017-11-16 15:14:36 -02:00
Claudio Sanches 909b80ae31 Removed "Delete WebHook logs" tool 2017-11-16 15:09:51 -02:00
Valerie e9985146d5 Wizard: Fix escaping in payment description 2017-11-16 11:29:21 -05:00
claudiulodro dd0f748211 Fix invalid html 2017-11-16 08:01:59 -08:00
Claudio Sanches 2669b8edc4 Webhooks migration script 2017-11-16 13:44:01 -02:00
Mike Jolley 591806fd20
Merge pull request #17730 from JeroenSormani/profile-copy-button
Assign type='button' to 'Copy from billing address'
2017-11-16 14:43:46 +00:00
Claudio Sanches 94ae9678c8 Merge branch 'master' into feature/webhook-crud 2017-11-16 12:21:56 -02:00
Claudio Sanches 9fe0c7261e Merge branch 'master' into feature/webhook-crud 2017-11-16 12:20:22 -02:00
JeroenSormani 453862c02f Assign type='button' to 'Copy from billing address' 2017-11-16 14:46:05 +01:00
Gerhard Potgieter a4532b1e0b Make method private again and add new method that checks if new theme declares theme support with custom sizes before generating images. 2017-11-16 15:02:34 +02:00
Gerhard Potgieter c9cd9b033b Public method not private, self not $this. 2017-11-16 14:53:44 +02:00
Boro Sitnikovski fe9b9658a5 Skip wp_kses_post call on image 2017-11-16 13:48:04 +01:00
Gerhard Potgieter 17e588d713 Add method to regenerate images when the theme is switched. 2017-11-16 14:37:33 +02:00
Mike Jolley 710927a278 Default variation tax class should be 'same as parent'
Closes #17712
2017-11-16 12:19:31 +00:00
Gerhard Potgieter 3a738d9235 Move filters before calling the callback. Target specific option only when doing the check. 2017-11-16 14:15:30 +02:00
Mike Jolley 4e836754a8 Merge branch 'master' into fix/17713 2017-11-16 12:04:26 +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
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
claudiulodro 4ef2152881 Hide/set fields depending on whether managing stock 2017-11-15 14:10:06 -08:00
claudiulodro bb7f1b1273 Logic tweaks 2017-11-15 13:04:24 -08:00
claudiulodro be6f9d68bc Automatic transitions for variables 2017-11-15 12:08:19 -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
claudiulodro 68e23911ba Automatically transition stock statuses 2017-11-15 10:48:39 -08: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 8aa9496b93 Structure 2017-11-15 15:05:31 +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 dea454c88e Clickable elements 2017-11-15 12:51:14 +00:00
Gerhard Potgieter 3524ed2cf0 Merge branch 'master' of github.com:woocommerce/woocommerce into feature/webhook-delivery-logging 2017-11-15 14:28:14 +02: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 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 386af1e94e
Merge pull request #17691 from woocommerce/feature/17448
Added support for single-product-postname.php template files
2017-11-15 09:41:56 +00:00
Mike Jolley 19cd9c4fd6 feedback 2017-11-15 09:41:26 +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
Claudiu Lodromanean 4db2a8aa69
Merge pull request #17702 from glagonikas/master
PayPal IPN email notifications should be optional
2017-11-14 15:00:23 -08:00
claudiulodro db117d6344 Backordered products should count as in stock 2017-11-14 14:54:11 -08:00
George Lagonikas 6b7cc782d2
Removing obsolete code 2017-11-14 22:30:28 +00:00
claudiulodro 3050959836 Variations stock status 2017-11-14 14:18:03 -08:00
claudiulodro dbf6db9373 Show backordered items in admin menu 2017-11-14 13:56:56 -08:00
claudiulodro cf7bc61b99 Better code 2017-11-14 13:49:22 -08:00
claudiulodro c312cc35b1 Add new onbackorder stock status 2017-11-14 13:40:03 -08:00
George Lagonikas bca6bc7375
Text changes 2017-11-14 20:31:39 +00:00
George Lagonikas 87a75ce96e
Simplifying logic 2017-11-14 20:30:49 +00:00
Claudiu Lodromanean cc5c182f9d
Merge pull request #17679 from woocommerce/update/12517-download-reporting
Download reporting
2017-11-14 12:23:01 -08:00
SGroupGeorge 64332d82c7 Text changes 2017-11-14 17:51:46 +00:00
SGroupGeorge 3b2eec75d3 Adding checkbox to make IPN emails optional 2017-11-14 17:34:48 +00:00
Mike Jolley 9e79ceff08 Merge branch 'master' into feature/unsupported-theme 2017-11-14 17:03:35 +00:00
Mike Jolley 616d85f9cb Fix option names 2017-11-14 16:59:59 +00:00
Mike Jolley 4cb3a30a60 Fix default 2017-11-14 16:43:35 +00:00
Mike Jolley c0bf381f22 Remove invalid test 2017-11-14 16:41:10 +00:00
Mike Jolley e222cfc9fa Conditional settings 2017-11-14 16:38:39 +00:00
Mike Jolley 992d6e3aed Dump old settings 2017-11-14 16:36:18 +00:00
Mike Jolley 8e7ade8f70 Product options 2017-11-14 16:29:17 +00:00
Mike Jolley 79d918d33e Merge branch 'feature/unsupported-theme' into update/move-settings-to-customizer-17148
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-11-14 16:02:02 +00:00
Mike Jolley bc16a85d22 Cropping settings 2017-11-14 16:01:36 +00:00
Andrew Lazarus ba52e583f9
Removed class within class
'<div class="class="wc-order-item-name"">` outputs `<div class="class=" wc-order-item-name="">`
2017-11-14 16:01:57 +01:00
Gerhard Potgieter 016cfabb75 On the fly image regeneration. 2017-11-14 14:39:28 +02:00
Mike Jolley 9c0446b369 Demo notice 2017-11-14 12:32:20 +00:00
Mike Jolley 286d04153c Add class to handle changes 2017-11-14 12:08:57 +00:00
Mike Jolley babde741db Add add_to_cart_description method and aria-labels to cart buttons in the loop 2017-11-14 11:45:16 +00:00
Mike Jolley a3948e8c6b Added support for single-product-postname.php template files
Closes #17448
2017-11-14 10:39:33 +00:00
Mike Jolley a50f30f792 Remove filter calling deprecated method 2017-11-14 10:21:29 +00:00
Patrik Pärkinen 12d7bf72f3 #16694 Added sort speed fix to ascending sort as well 2017-11-14 11:19:35 +02:00
Claudio Sanches f27120f649 Introduced product category filter threshold and load categories dropdown
Only use WooSelect when have more than 100 terms
2017-11-13 19:47:48 -02:00
Claudio Sanches 487c039b1c Fixed coding standards 2017-11-13 19:40:10 -02:00
claudiulodro 9b40ce842d Remove function that isn't hooked to anything 2017-11-13 12:19:14 -08:00
claudiulodro 493b3b6550 Remove check. ALready handled elsewhere. 2017-11-13 12:16:44 -08:00
claudiulodro 074f9b76b0 Fix init bug and remove nowrap from buttons 2017-11-13 11:56:24 -08:00
The Dramatist a25e871981 Parameter input, but checked wrong variable. (#17681)
Here `$offset` should be `$key`. Cause the parameter is named as `$key`.
2017-11-13 19:40:00 +00:00
Mike Jolley 7347b25ce0 Restore removed action 2017-11-13 19:07:02 +00:00
Mike Jolley 04d8184496 More filter options 2017-11-13 19:03:08 +00:00
claudiulodro 57be95493a phpcs 2017-11-13 10:42:28 -08:00
claudiulodro 9cc69ea021 Add ability to suppress titles to product_page shortcode 2017-11-13 10:36:58 -08:00
claudiulodro f58e4d4b85 Remove stylesheet register 2017-11-13 10:11:50 -08:00
claudiulodro 8e0e0e8747 Cleanup and integrate styles into main stylesheet 2017-11-13 10:08:46 -08:00
Claudiu Lodromanean a2f8e08e85
Merge pull request #17675 from woocommerce/fix/17665
self_admin_url for multisite compatibility
2017-11-13 09:35:38 -08:00
Mike Jolley dab7dd9c42 PHPCS 2017-11-13 16:29:44 +00:00
Mike Jolley 3621736400 PHPCS 2017-11-13 16:24:33 +00:00
Mike Jolley f1f30fc8de Fix download link 2017-11-13 16:10:32 +00:00
Mike Jolley eddd7fbfb4 Feedback 2017-11-13 15:58:22 +00:00
Mike Jolley 04d7ccfaa4 Show guest 2017-11-13 15:54:01 +00:00
Mike Jolley eedf745430 Wording and move report location 2017-11-13 15:36:22 +00:00
Mike Jolley 3e7968d37b Merge branch 'master' into pr/16418 2017-11-13 14:37:18 +00:00
Mike Jolley 4181033371 Clear transients when product terms are updated
Closes #17672
2017-11-13 12:43:12 +00:00
Mike Jolley 4245855625 self_admin_url for multisite compatibility
Fixes #17665
2017-11-13 12:09:13 +00:00
axelmm 59534a09e7
Remove unnecessary html formatting
Dimensions and weight were unnecessary formatted as html (duplicating values of dimensions_html and weight_html), not as expected raw values
2017-11-11 22:33:22 +01:00
soft79 b74eaba287
Update class-wc-discounts.php
'woocommerce_coupon_get_apply_quantity' => ( $apply_quantity, $item, $coupon, $discounts )
2017-11-11 20:33:19 +01:00
axelmm fb94f67b0f
Remove unnecessary formating, fixes #17662
https://github.com/woocommerce/woocommerce/issues/17662
2017-11-11 17:26:09 +01:00
claudiulodro 1934f67daf Move unsupported product singles stuff to template loader class 2017-11-10 12:48:45 -08:00
claudiulodro 2609a4cd30 Bring up-to-date with feature branch 2017-11-10 10:43:15 -08:00
Mike Jolley 3bf47d7d97 Fixed tests 2017-11-10 17:45:01 +00:00
Mike Jolley fb8db3313e Clarify has_archive 2017-11-10 16:32:43 +00:00
Mike Jolley 5adb1edef5 Since options are hidden, remove notices for now - allow use. 2017-11-10 16:26:33 +00:00
Claudio Sanches 74d86cf105 Fixed how update at date displays 2017-11-10 12:37:49 -02:00
Claudio Sanches 30fe4f5ab3 Fixed how check for webhooks dates 2017-11-10 12:34:25 -02:00
Mike Jolley 220728544a
Merge pull request #17631 from woocommerce/update/page-caching-class
Page caching class
2017-11-10 14:12:13 +00:00
Claudio Sanches 6553a71586 Fixed how read empty dates while reading webhooks from database 2017-11-10 11:58:25 -02:00
Claudio Sanches f60b814dd4 Stop creating webhooks when hit the "Add webhook" button
Creates only after save edited webhook.
2017-11-10 11:33:53 -02:00
Claudio Sanches d0f191c363 Use table list search box and update form method to POST 2017-11-10 10:55:58 -02:00
Claudio Sanches fbf5117e05 Merge branch 'db-log-search' of https://github.com/seostudio/woocommerce into seostudio-db-log-search 2017-11-10 10:17:29 -02:00
Mike Jolley 78466a6665
Merge pull request #17599 from JPry/allow_clone_cart
Allow for cloning the WC_Cart object
2017-11-10 12:02:59 +00:00
Gerhard Potgieter b11ab6d8d6 Convert comments to wc_logger logging, remove and deprecate unused functions and introduce a wc_get_log_file_name helper function. Still a couple of todos left regarding deprecating or removing filters related to comments. 2017-11-10 12:20:59 +02:00
Gerhard Potgieter ea73b0851d Remove old webhook log views & deprecate accompanying functions 2017-11-10 08:54:29 +02:00
Gerhard Potgieter d3f0e9da34 Complete upgrade routine to move current webhook logs from comments to a log file. 2017-11-10 08:40:56 +02:00
James Allan c91698cde3 Fix db warnings when using the "Add Order Indexes" tool 2017-11-10 16:21:28 +10:00
Claudiu Lodromanean 9d0f729703
Merge pull request #17642 from woocommerce/fix/rest-api-orders-dp
[REST API] Fixed default value of "dp" on orders and refunds endpoints
2017-11-09 13:57:24 -08:00
Claudio Sanches b04c7bd71e
Merge pull request #17628 from woocommerce/fix/17624
Change how line items are saved in API
2017-11-09 17:36:39 -02:00
Claudio Sanches 5daf476dfa Properly sanitize and format "dp" 2017-11-09 17:34:25 -02:00
Claudio Sanches c6c8af9187 [REST API] Fixed default value of "dp" on orders and refunds endpoints 2017-11-09 17:23:33 -02:00
Claudiu Lodromanean a574401ddc
Merge pull request #17641 from woocommerce/fix/17625
Integrate PHPCompatibility sniffs
2017-11-09 11:19:52 -08:00
claudiulodro fc5a7ae0ca phpcs 2017-11-09 11:07:13 -08:00
claudiulodro 7f37e445b6 Use shortcode-based product page on unsupported themes 2017-11-09 10:47:20 -08:00
Claudio Sanches b2105774c9
Merge pull request #17629 from woocommerce/fix/17613
Set attributes during variation creation
2017-11-09 16:45:57 -02:00
Claudio Sanches 22232f29c7 Fixed PHPCompatibility issues
Closes #17625
2017-11-09 16:36:29 -02:00
Mike Jolley d765e2319c Added theme support vars for grid settings
- product_grid
   - min_rows
   - max_rows
   - min_columns
   - max_columns

If settings violate these, they will be updated.

If loop_shop_columns is defined, settings are hidden with a notice.
2017-11-09 18:11:35 +00:00
Mike Jolley 2a3ace9853 Merge branch 'master' into feature/17550-archives-template-support 2017-11-09 17:34:57 +00:00
Mike Jolley 33995ace01 Helper functions 2017-11-09 17:34:54 +00:00
Chase Wiseman 9558c49e72 Review tweaks 2017-11-09 09:26:17 -08:00
Mike Jolley 0d09d0c0fd Grab description directly to pass through wc_format_content 2017-11-09 16:57:50 +00:00
Mike Jolley 6e08ff0284
Merge pull request #17610 from woocommerce/update/17557
Theme support to declare image sizes
2017-11-09 16:04:22 +00:00
Claudio Sanches f57ee1e792 Removed "trash" actions and included new "delete" actions 2017-11-09 12:07:44 -02:00
Mike Jolley 155f8ed187 paginate 2017-11-09 13:44:24 +00:00
Mike Jolley 22bb92132e Ordering 2017-11-09 13:43:15 +00:00
Claudio Sanches 87eabe4b2c Implements Webhook CRUD into table list 2017-11-09 11:04:31 -02:00
Claudio Sanches 77cb885403 Properly allow to POST data in table list without trigger save settings 2017-11-09 11:03:52 -02:00
Claudio Sanches 61efd99c61 Fixed WC_Webhook_Data_Store::get_webhooks_ids transient 2017-11-09 11:03:14 -02:00
Claudio Sanches 4c4f0c34d5 New settings REST API file 2017-11-09 11:00:11 -02:00
Claudio Sanches f1dfbb2f58 Fixed coding standards for WC_Admin_Settings 2017-11-09 10:57:54 -02:00
Mike Jolley 23aa0277d2 Rows and cols 2017-11-09 12:37:14 +00:00
Mike Jolley 52c4d21d18 Term logic fix 2017-11-09 12:09:11 +00:00
Mike Jolley cc18f85baa Replace usage of global query 2017-11-09 12:01:27 +00:00
Mike Jolley 575075f5f9 phpcs 2017-11-09 11:50:50 +00:00
Mike Jolley e18f2d491c Apply filters to shortcode output 2017-11-09 11:24:44 +00:00
Mike Jolley 1a7d7dd127 Widget base url 2017-11-09 11:24:29 +00:00
Mike Jolley 6e3fb1e096 phpcs 2017-11-09 11:17:02 +00:00
Mike Jolley 1b22d97be2 Combined get_page_base_url 2017-11-09 11:16:47 +00:00
Mike Jolley 95a7857f41 Handle shop content only 2017-11-09 10:44:29 +00:00
Mike Jolley ddb357cc48 Missing var 2017-11-09 10:30:27 +00:00
Gerhard Potgieter d7ca1d8cd8 Webhook logs update routine to move from comments to wc_logger 2017-11-09 08:02:59 +02:00
claudiulodro 45d6579776 Unsupported theme product frontend 2017-11-08 13:55:29 -08:00
Claudio Sanches 9979e4b3e5
Merge pull request #17589 from woocommerce/fix/17585
get_total_ex_tax should exclude fee taxes
2017-11-08 19:05:23 -02:00
Mike Jolley c058921c9c Optimisation of product subcats template functions 2017-11-08 20:00:23 +00:00
Mike Jolley 713226c553 phpcs 2017-11-08 19:57:49 +00:00
Claudio Sanches b58be24b81 Introduced new filters to allow save settings 2017-11-08 17:35:31 -02:00
Claudio Sanches 4970ac6bdf Fixed coding standards in WC_Admin_Menus class 2017-11-08 17:33:04 -02:00
Mike Jolley a0e2e59f9b Orderby support 2017-11-08 18:09:39 +00:00
Mike Jolley eb6b4efc01 Shortcode injection 2017-11-08 16:46:15 +00:00
Mike Jolley 6ff17436dc Support rows attribute 2017-11-08 16:45:48 +00:00
Mike Jolley f10040eca3 Add pagination support to products shortcode 2017-11-08 16:39:40 +00:00
Mike Jolley 8da485e911 Allow reuse of pagination template file 2017-11-08 16:39:28 +00:00
Mike Jolley fe5556b1c0 Disable archive when theme does not support WooCommerce 2017-11-08 16:38:12 +00:00
Grzegorz Rola 9ae73bcc44 wp_unslash() needs to always comes first 2017-11-08 17:02:08 +01:00
Jeremy Pry 0e43551535 Move inline comment into the docblock 2017-11-08 10:18:08 -05:00
Jeremy Pry cf5bd606c6 Rename register_hooks() to init() 2017-11-08 10:17:52 -05:00
Mike Jolley 9f059e17a9 Add helper function instead of calling method, and restore old method for bw compat 2017-11-08 15:07:00 +00:00
Mike Jolley 45c6f0e00d Restore old function name and phpcs 2017-11-08 14:54:13 +00:00
Gerhard Potgieter a3fd99ddd9 GeoDB empty file handling (#17541)
* Make sure we do not save empty geodb files, also add checks to ensure we do not read form an empty geodb file.

* Add logger message when deleting file on checking size
2017-11-08 14:28:03 +00:00
Gerhard Potgieter 7b9fb6c0cb Change nocache_headers hook firing (#17540)
* wp hook is too late to fire the nocache_headers filter, some caching plugins read it before that it seems.

* Create do_not_cache_page helper function and call that instead of nocache_headers

* Must add checks to prevent caching on certain pages as well

* Nothing to return
2017-11-08 14:27:30 +00:00
Mike Jolley 827d133cb2 Improve tests 2017-11-08 13:54:33 +00:00
Mike Jolley bb31ecdff1 Validation 2017-11-08 13:40:30 +00:00
Mike Jolley be3b37f1df Adjust preview position 2017-11-08 13:36:17 +00:00
Mike Jolley 0d25375593 Set attributes during variation creation 2017-11-08 13:12:54 +00:00
Gerhard Potgieter e61160fabe PHPCS fixes for class-wc-webhook.php 2017-11-08 14:46:23 +02:00
Gerhard Potgieter 46a6837a93 Merge branch 'master' into feature/webhook-delivery-logging 2017-11-08 14:42:05 +02:00
Mike Jolley 28fdc73c18 Fix fatal due to _esc_html_e call 2017-11-08 12:34:04 +00:00
Mike Jolley a9b419c9b2 Load item from order object, not DB directly in API 2017-11-08 12:21:55 +00:00
Mike Jolley 7fa02bd4cb Missing cache clear on delete 2017-11-08 12:21:03 +00:00
Mike Jolley 93da46e66e phpcs 2017-11-08 12:20:49 +00:00
Claudiu Lodromanean e90819f92e
Merge pull request #17621 from woocommerce/fix/17607
Add wp_unslash to meta key
2017-11-07 14:48:09 -08:00
Claudiu Lodromanean a8feba3162
Merge pull request #17620 from woocommerce/fix/17583
calculate_totals totals running too often
2017-11-07 13:05:42 -08:00
Mike Jolley fb446e6bdf Add wp_unslash to meta key 2017-11-07 20:23:10 +00:00
Jeremy Madison 0b7f92ac84 Issue #17505: Apply filters to registration-error-email-exists error. (#17507)
* Issue #17505: Apply filters to registration-error-email-exists error message.

* Inlined apply_filters and fixed filter name
2017-11-07 20:16:56 +00:00
Mike Jolley b8f124fb3c
Merge pull request #17619 from woocommerce/fix/17591
Add default to "What type of product do you plan to sell"
2017-11-07 20:14:40 +00:00
Mike Jolley ffcf998a59 calculate_totals totals running too often 2017-11-07 20:10:13 +00:00
Claudiu Lodromanean efee57c7de
Merge pull request #17605 from MounirHamani/master
Add new Belarusian ruble BYN
2017-11-07 11:57:14 -08:00
Claudio Sanches bf6436e0c9 Cache search webhooks results and added method to count webhooks by status 2017-11-07 17:42:14 -02:00
claudiulodro 3c5ede6e14 Dont need placeholder any more 2017-11-07 11:41:12 -08:00
claudiulodro 862060cba9 Add default to "What type of product do you plan to sell" 2017-11-07 11:39:37 -08:00
Mike Jolley 9f6f5f9f17
Merge pull request #17609 from woocommerce/update/17254-input-to-button
Convert input submit elements to button submit elements
2017-11-07 19:21:04 +00:00
Mike Jolley e01ed69db1
Merge pull request #17618 from woocommerce/fix/17553
Allow removing coupons even if coupons disabled
2017-11-07 19:20:41 +00:00
Mike Jolley ffa6637391
Merge pull request #17604 from woocommerce/improve/17549
Underscores wrappers
2017-11-07 19:18:56 +00:00
Mike Jolley 6f693d4d1a Upgrade routine 2017-11-07 19:16:44 +00:00
Mike Jolley cf448398cd Update API 2017-11-07 19:08:06 +00:00
Mike Jolley db4e630600 Replace thumbnail names 2017-11-07 18:48:51 +00:00
Mike Jolley db3122cc57 fix 2017-11-07 18:38:23 +00:00
claudiulodro 0e983c4fe9 Allow removing coupons even if coupons disabled 2017-11-07 10:33:11 -08:00
Mike Jolley e025caf177 Widths and aspect ratios 2017-11-07 18:32:43 +00:00
Claudio Sanches eb63d91516 Fixed coding standards 2017-11-07 16:23:26 -02:00
Claudio Sanches 47ac2f140c Search webhooks with data store 2017-11-07 16:10:38 -02:00
Claudio Sanches cf95a67f7c Added function to get webhook instance 2017-11-07 16:10:12 -02:00
Claudiu Lodromanean f7d52ad0ba
Merge pull request #17542 from MikeKoval/master
Update class-wc-emails.php
2017-11-07 09:37:31 -08:00
Claudio Sanches 3ddb3ad60f Fixed coding standards in webhooks table list class 2017-11-07 15:32:31 -02:00
claudiulodro 6b514aaab8 Make underscores the default 2017-11-07 08:45:05 -08:00
Jan-Paul Kleemans 241e903f9e
Clarify sku param description 2017-11-07 15:55:00 +01:00
Claudio Sanches eada69b241 Merge branch 'feature/webhook-crud' into feature/12439-2 2017-11-07 12:42:50 -02:00
Claudio Sanches 7043245cb5 Merge branch 'master' into feature/webhook-crud 2017-11-07 12:42:28 -02:00
Mike Jolley 54bd73d619 Include theme support in main class 2017-11-07 12:34:11 +00:00
Mike Jolley 2fd540fdf6 Fix theme support checks 2017-11-07 12:33:58 +00:00
Mike Jolley 6701917e5a Remove need for wc_get_core_supported_themes 2017-11-07 12:17:03 +00:00
Mike Jolley fb8c6cd0d2 Add compat class for each wp default theme 2017-11-07 12:11:37 +00:00
Mike Jolley 6139ec8de1 Add theme support in the theme compat file 2017-11-07 11:46:43 +00:00
Mike Jolley 2d2156aeca Fix setting retrievel 2017-11-07 11:46:25 +00:00
Mike Jolley 2f640a1e19 Hide image settings if the theme defines them 2017-11-07 11:04:15 +00:00
Mike Jolley dae70d9be2 Pull sizes from the theme if defined 2017-11-07 11:04:06 +00:00
Mike Jolley 35dc1431ed Add comments to add_image_sizes 2017-11-07 11:03:56 +00:00
Gerhard Potgieter 21377fe5a7 input to button for submit in class-wc-widget-layered-nav.php 2017-11-07 10:56:36 +02:00
Gerhard Potgieter 364d266def PHPCS fixes for class-wc-widget-layered-nav.php 2017-11-07 10:55:27 +02:00
Gerhard Potgieter e0a55cb8dd input to button for submit in wc-template-functions.php 2017-11-07 10:40:28 +02:00
Gerhard Potgieter 2171ae7c0a PHPCS fixes for wc-template-functions.php 2017-11-07 10:39:10 +02:00
Gerhard Potgieter c53543a4b3 input to button for submit in html-report-by-date.php 2017-11-07 10:38:18 +02:00
Gerhard Potgieter 2716f08d91 PHPCS fixes for html-report-by-date.php 2017-11-07 10:36:39 +02:00
Gerhard Potgieter 78251eaa47 input to button for submit in html-admin-settings.php 2017-11-07 10:32:12 +02:00
Gerhard Potgieter ddeee320ef input to button for submit in html-admin-page-status-logs.php 2017-11-07 10:30:41 +02:00
Gerhard Potgieter a9690b37f5 PHPCS fixes for html-admin-page-status-logs.php 2017-11-07 10:29:16 +02:00
Gerhard Potgieter f063aad89c input to button for submit in html-admin-page-product-export.php 2017-11-07 10:27:25 +02:00
Gerhard Potgieter 636a34630e PHPCS fixes for html-admin-page-export.php 2017-11-07 10:24:39 +02:00
Gerhard Potgieter 3109b11dbe input to button for submit in html-webhook-edit.php 2017-11-07 10:23:23 +02:00
Gerhard Potgieter 8b7320dcd6 PHPCS fixes for html-webhook-edit.php 2017-11-07 10:20:51 +02:00
Gerhard Potgieter 416fb697f9 input to button for submit in html-admin-page-shipping-zone-methods.php 2017-11-07 10:14:44 +02:00
Gerhard Potgieter fcd9b206ff PHPCS fixes for html-admin-page-shipping-zone-methods.php 2017-11-07 10:11:19 +02:00
Gerhard Potgieter a8dab20cf8 input to button for submit in html-admin-page-shipping-classes.php 2017-11-07 10:05:32 +02:00
Gerhard Potgieter 7c8cb1150f PHPCS fixes for html-admin-page-shipping-classes.php 2017-11-07 10:03:43 +02:00
Gerhard Potgieter d3d41a4a05 input to button for submit in class-wc-report-sales-by-product.php 2017-11-07 09:56:31 +02:00
Gerhard Potgieter e8b9ad7e17 PHPCS fixes for class-wc-report-sales-by-product 2017-11-07 09:55:19 +02:00
Gerhard Potgieter 02841582de Input to button for submit in class-wc-report-sales-by-category.php 2017-11-07 09:13:47 +02:00
Gerhard Potgieter bb64d6909f PHPCS fixes for class-wc-report-sales-by-category.php 2017-11-07 09:12:40 +02:00
Gerhard Potgieter 4aef57ae40 Change input to button for submit in class-wc-report-coupon-usage.php 2017-11-07 09:03:52 +02:00
Gerhard Potgieter 1842e9b7de PHPCS fixes for class-wc-report-coupon.usage.php 2017-11-07 08:52:45 +02:00
MounirHamani 2c471d3662
Add new Belarusian ruble BYN 2017-11-07 03:24:01 +01:00
Claudiu Lodromanean c4fe2927d7
Merge pull request #17603 from woocommerce/pr/17563
Calculation fixes and unit tests
2017-11-06 14:32:11 -08:00
claudiulodro c3689134d0 Underscores wrappers 2017-11-06 13:46:50 -08:00
Mike Jolley cb61e9dd3d WC_TAX_ROUNDING_MODE auto to support switching in tests 2017-11-06 21:25:02 +00:00
Mike Jolley 42fef1a51a Float handling logic for scientific notation 2017-11-06 20:04:03 +00:00
Mike Jolley 004e58c8b8 Revert "Long floats convert to strings with chars like "E". Let's format to precision setting to avoid this."
This reverts commit 1ac8f6c272.
2017-11-06 20:04:03 +00:00
Mike Jolley 7af6c2f55e Long floats convert to strings with chars like "E". Let's format to precision setting to avoid this. 2017-11-06 20:04:03 +00:00
Mike Jolley 2547861710 Converting to floats messes with storage - keep strings 2017-11-06 20:04:03 +00:00
Grzegorz Rola 0c9ad20986 wp_unslash() needs to always comes first 2017-11-06 19:10:33 +01:00
Grzegorz Rola 4f4a3460a3 Security fix 2017-11-06 18:50:26 +01:00
Claudio Sanches b24519b0c9
Merge pull request #17594 from woocommerce/fix/17582-downloads
Hide downloads from admin emails
2017-11-06 15:30:26 -02:00
Claudio Sanches 955539b648
Merge pull request #17588 from woocommerce/fix/17565
Check valid data when filtering wp_nav_menu_objects
2017-11-06 15:29:33 -02:00
Mike Jolley c824dd7a85 Hide downloads from admin emails 2017-11-06 17:02:35 +00:00
Claudio Sanches 487d7f16cc
Merge pull request #17590 from woocommerce/fix/17544
Fix tax row orders count
2017-11-06 15:01:56 -02:00
Mike Jolley c6c6a1e4b3 Grab all taxes individually 2017-11-06 16:34:45 +00:00
Mike Jolley 0a4adde9aa Fix tax row orders count
Closes #17544

We had doubled up logic.
2017-11-06 16:20:56 +00:00
Mike Jolley 1b49e9a568 get_total_ex_tax should exclude fee taxes
Closes #17585
2017-11-06 16:18:21 +00:00
Claudio Sanches eb594b05ef
Merge pull request #17586 from woocommerce/fix/17572-alt
Unslash shipping forms and addresses
2017-11-06 14:16:18 -02:00
Mike Jolley c05e6d02f7 Check valid data when filtering wp_nav_menu_objects
Closes #17565
2017-11-06 16:05:19 +00:00
Mike Jolley 668fb1486c Unslash shipping form 2017-11-06 15:50:52 +00:00
Mike Jolley fa30b0bb07 Use wp_unslash 2017-11-06 15:48:11 +00:00
Mike Jolley 362867313f Revert "Issue #17575 - perform stripslashes when setting shipping state to avoid unwanted backslashes"
This reverts commit 8771c1f8e2.
2017-11-06 15:47:43 +00:00
Herb Miller 8771c1f8e2 Issue #17575 - perform stripslashes when setting shipping state to avoid unwanted backslashes 2017-11-06 15:47:31 +00:00
Herb Miller 4c9d411b08 Issue #17570 - stripslashes when setting customer data from the session 2017-11-06 15:47:31 +00:00
Gerhard Potgieter 0c5a208057 Change input to button for submit in class-wc-meta-box-order-actions.php 2017-11-06 15:23:00 +02:00
Gerhard Potgieter 8bb051fdcf PHPCS fixes for class-wc-meta-box-order-actions.php 2017-11-06 15:20:37 +02:00
Gerhard Potgieter 956db3c8da Change input to button for submit in html-product-csv-import-form.php 2017-11-06 15:15:31 +02:00
Gerhard Potgieter 56ddba9745 PHPCS fixes for html-product-csv-import-form.php 2017-11-06 15:14:35 +02:00
Gerhard Potgieter 01e4778d61 Change input to button for submit in html-csv-import-mapping.php 2017-11-06 15:12:28 +02:00
Gerhard Potgieter 844661230b PHPCS fixes for html-csv-import-mapping.php 2017-11-06 15:11:15 +02:00
Gerhard Potgieter bb9a29da85 Change input to button for submit in class-wc-tax-rate-importer.php 2017-11-06 15:06:15 +02:00
Gerhard Potgieter fbe7a1e2a2 PHPCS fixes for class-wc-tax-rate-importer.php 2017-11-06 15:05:13 +02:00
Gerhard Potgieter 8add04b92e Change input to button for submit in class-wc-admin-setup-wizard.php 2017-11-06 14:31:22 +02:00
Gerhard Potgieter 99f38e72c1 PHPCS changes for class-wc-admin-setup-wizard.php 2017-11-06 14:26:17 +02:00
Gerhard Potgieter 7aed2acf4a Update class-wc-admin-menus.php to use button instead of input for submit 2017-11-06 13:14:30 +02:00
Gerhard Potgieter 9090f012f9 PHPCS fixes for class-wc-admin-menus.php 2017-11-06 13:10:34 +02:00
Gerhard Potgieter fb66c2066e PHPCS fixes for class-wc-admin-attributes.php 2017-11-06 12:58:57 +02:00
Gerhard Potgieter 2bcf8679be Update class-wc-admin-attributes.php to use button instead of input for submit 2017-11-06 12:45:14 +02:00
Mike Jolley 90203dc704 Set placeholder for variation lxwxh
Fixes #17559
2017-11-06 10:44:49 +00:00
Shiva Poudel aeb07b5fd8 Tweak - Order number to be sortable column
CC @mikejolley
2017-11-05 21:37:42 +05:45
Joel Rowley 390f46f7da Attempt to fix type conversion precision bug 2017-11-04 16:33:23 -04:00
Grzegorz Rola d8a6cc6eb2 Ability to search in DB logs. 2017-11-04 16:09:54 +01:00
Jeremy Pry 9eee3805c0 Allow for cloning the cart object
This handles creating new instances of the `$session` and `$fees_api` properties.
2017-11-03 15:50:43 -04:00
Jeremy Pry 0cca83ff83 Add separate methods to register hooks
This facilitates cloning the cart without registering additonal hooks unnecessarily.
2017-11-03 15:49:45 -04:00
Mike Jolley 0a77632a33 correct escape 2017-11-03 16:22:35 +00:00
Mike Jolley 2eb740e38a Make address columns smaller 2017-11-03 16:12:42 +00:00
Mike Jolley 8f37ea33ed Refactored into list table classes 2017-11-03 16:10:32 +00:00
Caleb Stauffer 189aa66655 add action for webhook status change 2017-11-03 11:37:00 -04:00
Mike Jolley ed49c5b524 Styling improvements 2017-11-03 11:57:44 +00:00
Mike Koval d15aaf682d
Update class-wc-emails.php
Added missing param sent_to_admin to email-addresses template
2017-11-03 11:33:55 +02:00
Mike Jolley 040443a04d Out of base rounding error fixes 2017-11-02 20:00:49 +00:00
Tim Howe 1b08688ea6 Checkout Postcode / Zip validation error message missing Billing / Shipping Identification #17474 (#17535)
* Fix - #17413
Update the `json_search_products` function to use the
`wc_products_array_filter_visible` filter rather then the
`wc_products_array_filter_editable` filter

Added an additional if condition to the `is_visible` function to check
if the product had a parent and it's post status

* remove additional comment from code to keep it clean

* Reverted filter

* Updated the is_visable to check parent product post status using WooCommerce class methods

* Updated the `if empty` check to make it is compatible with older versions of php

* Removed the empty check infavor of just testing on the returned value
Updated the way we are retrieving the partent product object

* Moved the `$parent_product` variable assigment out of the if statement.

* Applied and tested tregenza patch to updates Checkout Postcode / Zip validation error message

* Cleaned up code from testing
2017-11-02 11:54:03 -07:00
Mike Jolley 2e1e9291bc Remove trailing `.`
@claudiulodro Only affects master.
2017-11-02 18:29:34 +00:00
Mike Jolley 98f2fd5685
Merge pull request #17529 from woocommerce/fix/17517
Adjust out of base discount logic
2017-11-02 18:20:09 +00:00
Claudiu Lodromanean d0c1f16f26
Merge pull request #17533 from woocommerce/fix/17509
Remove kses from term description
2017-11-02 10:47:57 -07:00
Claudiu Lodromanean d1157d6f0b
Merge pull request #17521 from woocommerce/fix/sort-tabs-callback
For code doing it wrong, ensure priority is set
2017-11-02 10:46:17 -07:00
Mike Jolley 19c288fa5b
Merge pull request #17530 from woocommerce/fix/17526
Packages should be shippable until proven otherwise.
2017-11-02 17:36:58 +00:00
Mike Jolley 10ea761a7d Pass order location through to order ajax functions which recalc taxes.
Closes #17236
2017-11-02 17:31:03 +00:00
Mike Jolley 92a8bdf616 Remove kses from term description
Closes #17509
2017-11-02 17:13:02 +00:00
Markus Aurich b27602db3f fix: wrong validation of polish postcodes (#17523) 2017-11-02 16:55:37 +00:00
claudiulodro d7161cb711 Refactor it a little bit 2017-11-02 09:24:09 -07:00
Mike Jolley 9ea088f6c9 Adjust discount logic when out of base 2017-11-02 16:18:51 +00:00
Mike Jolley 624c1a9516 Allow items to be sent directly to the discounts class 2017-11-02 16:18:17 +00:00
claudiulodro a3ffd72842 Packages are shippable until proven otherwise 2017-11-02 09:16:17 -07:00
Mike Jolley 130d719d90 Small rounding error in items table 2017-11-02 15:03:43 +00:00
Mike Jolley eb1bcee8b9 For code doing it wrong, ensure priority is set 2017-11-02 11:13:24 +00:00
Chase Wiseman 5c57be18b0 Conditionally display the Add Payment Method button if there are available gateways 2017-11-01 10:13:01 -07:00
Mike Jolley 1f7ecd9fb9 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/js/frontend/checkout.min.js
2017-11-01 16:52:21 +00:00
Mike Jolley bf4063b0cb
Merge pull request #17499 from woocommerce/fix/17492
Removed wp_kses_post() from product archive description
2017-11-01 16:48:31 +00:00
Claudiu Lodromanean 9117414dae
Merge pull request #17491 from woocommerce/update/17101
wc_caught_exception method
2017-11-01 09:31:57 -07:00
Claudio Sanches 9e29ed0bda Removed wp_kses_post() from product archive description
Fixes #17492
2017-11-01 14:16:19 -02:00
Mike Jolley 8fd6864a23 Merge branch 'pr/17457' 2017-11-01 15:48:57 +00:00
Mike Jolley 7606666de9 woocommerce_pre_customer_bought_product 2017-11-01 15:48:46 +00:00
Mike Jolley 9c096b419f Merge branch 'pr/17435' 2017-11-01 13:10:37 +00:00
Mike Jolley 9d92b8a8ff phpcs 2017-11-01 13:10:25 +00:00
Tim Howe abea378245 Variation Displayed in Cross-Sell and Upsells with Parent's Post Status set to 'draft' and 'pending review' (#17423)
* Fix - #17413
Update the `json_search_products` function to use the
`wc_products_array_filter_visible` filter rather then the
`wc_products_array_filter_editable` filter

Added an additional if condition to the `is_visible` function to check
if the product had a parent and it's post status

* remove additional comment from code to keep it clean

* Reverted filter

* Updated the is_visable to check parent product post status using WooCommerce class methods

* Updated the `if empty` check to make it is compatible with older versions of php

* Removed the empty check infavor of just testing on the returned value
Updated the way we are retrieving the partent product object

* Moved the `$parent_product` variable assigment out of the if statement.
2017-11-01 12:52:58 +00:00
Mike Jolley ef4c05a393 Merge branch 'pr/17098' 2017-11-01 12:43:35 +00:00
Mike Jolley 415d1ab061 Use global if it exists to improve performance. 2017-11-01 12:43:26 +00:00
Mike Jolley ff02941a53 Merge branch 'pr/17434' 2017-11-01 12:32:52 +00:00
Mike Jolley 80dfbc0ced phpcs tweaks and escaping 2017-11-01 12:32:35 +00:00
Mike Jolley c17e76adc8
Merge pull request #17113 from woocommerce/add/travis-phpcs
Run PHPCS in Travis CI
2017-11-01 12:18:44 +00:00
Mike Jolley 5d500ba5fb wc_caught_exception method 2017-11-01 11:41:53 +00:00
veisis fbd1b114db
Class name fix in docblock 2017-11-01 11:59:49 +02:00
Claudio Sanches e1a4f6e159
Merge pull request #17470 from woocommerce/pr/16959
Added actions before calculations order totals and taxes and is_vat_excempt support
2017-10-31 12:21:08 -02:00
Claudio Sanches 418bbbfee5
Merge pull request #17467 from woocommerce/fix/17460-currency
Add direction character to currency output
2017-10-31 12:04:37 -02:00
Mike Jolley 7c74e77849 handle tax removal in order class 2017-10-31 13:37:57 +00:00
Mike Jolley 80b16adb0a Revert is_vat_exempt changes in item classes 2017-10-31 13:36:57 +00:00
Mike Jolley bc7484f473 Merge branch 'master' into pr/16959
# Conflicts:
#	includes/abstracts/abstract-wc-order.php
2017-10-31 13:33:09 +00:00
Mike Jolley 01730cdc4f Add method to generate transient name 2017-10-31 12:58:36 +00:00
Mike Jolley 5848590333 Merge branch 'master' into update/14260 2017-10-31 12:54:35 +00:00
Mike Jolley 43ba326ed9 Fix currency position with rtl symbols 2017-10-31 12:22:18 +00:00
Gabor Javorszky d530556a0f Add short circuit to customer bought product function 2017-10-30 17:20:55 +00:00
Mike Jolley 17a6f9fb15
Merge pull request #17421 from woocommerce/fix/method-return-value-in-write-content
Fixed method returning value in write content warning in legacy PHP
2017-10-30 14:17:37 +00:00
Claudio Sanches 83057e3771
Merge pull request #17455 from woocommerce/pr/17450
Use item tax class rather than product tax class for getter
2017-10-30 12:13:58 -02:00
Mike Jolley 9521a0ba1f Improve tax class check and handle non-taxable items 2017-10-30 13:23:15 +00:00
Claudio Sanches 777ba46299
Merge branch 'master' into fix/17424 2017-10-30 11:01:17 -02:00
Mike Jolley cb998799c6
Merge pull request #17298 from dechov/update/ignore-existing-unit-option-values-in-wizard
Ignore existing unit option values in wizard in favor of national unit conventions
2017-10-30 12:55:06 +00:00
Mike Jolley 7ec2c5a736
Merge pull request #17444 from shivapoudel/fix/empty-content
Fix - Undefined variable: empty_content in order screen
2017-10-30 12:25:52 +00:00
Mike Jolley b436ad34e6 Merge branch 'pr/17452' 2017-10-30 12:15:41 +00:00
Mike Jolley c1d86b9994 Split up skip logic 2017-10-30 12:15:32 +00:00
Claudio Sanches 4b13b6e79c
Merge pull request #17409 from woocommerce/tweak/invoice-email-name
Change title of Customer invoice email
2017-10-30 10:09:33 -02:00
Diego Zanella 3576025036 Added filter to process meta to be exported 2017-10-30 10:19:57 +00:00
Ewout Fernhout 029e93fd4f
Use item tax class rather than product tax class for getter
Fixes #17449
2017-10-30 11:04:56 +01:00
Shiva Poudel 53a2dfd77c Fix - Empty content undeclared variable in #17233 2017-10-29 23:02:27 +05:45
Ryan Halliday 671b602db6 Added `{site_title}` replacement to Email footer 2017-10-28 15:18:53 +13:00
Shiva Poudel 289842aacf Tweak - Order panel meta description 2017-10-28 06:37:29 +05:45
claudiulodro f06ecee1c5 Fix order methods and add tests 2017-10-27 13:37:00 -07:00
Claudio Sanches 58d7a3fd3a
Merge pull request #17414 from woocommerce/fix/17412
Cart totals: don't add shipping unless show_shipping is true.
2017-10-27 16:02:02 -02:00
Claudio Sanches 1008ad1203 Fixed method returning value in write content warning in legacy PHP 2017-10-27 16:01:33 -02:00
Mike Jolley a84fe7a314 Merge branch 'cache-variable-products-queries'
# Conflicts:
#	readme.txt
2017-10-27 18:54:53 +01:00
Mike Jolley 635ea09127 Merge branch 'master' into cache-variable-products-queries 2017-10-27 18:53:40 +01:00
Mike Jolley ba3d959e66 Merge branch 'master' into pr/17183 2017-10-27 18:49:27 +01:00
Mike Jolley 65f2ee0f49 Cart totals: don't add shipping unless show_shipping is true.
Closes #17412
2017-10-27 17:30:33 +01:00
Mike Jolley 349e37399f Merge branch 'pr/17315' 2017-10-27 16:42:32 +01:00
Mike Jolley 3c3173b2f8 Rename actions and handle deprecation 2017-10-27 16:42:19 +01:00
Mike Jolley 422638bf75 Merge branch 'pr/17344' 2017-10-27 16:23:15 +01:00
Mike Jolley e72a297842 Break up logic so is callable is only checked on internal meta keys 2017-10-27 16:23:05 +01:00
Mike Jolley a6e5a684d0 Merge branch 'pr/17134' 2017-10-27 16:07:41 +01:00
Mike Jolley e5038e737e Standards 2017-10-27 16:07:30 +01:00
Gerhard Potgieter 1ee7033678 Only invoice in dropdown, too many customer usage. 2017-10-27 17:05:35 +02:00
Mike Jolley 35f5140e1c Merge branch 'pr/17137' 2017-10-27 15:59:56 +01:00
Mike Jolley 47bb63733b Standards 2017-10-27 15:59:47 +01:00
Mike Jolley ced4551413 Merge branch 'pr/16986' 2017-10-27 15:49:00 +01:00
Mike Jolley 7cafc71526 Wording tweaks 2017-10-27 15:48:50 +01:00
Mike Jolley 8695d46637 Merge branch 'pr/17041' 2017-10-27 15:35:43 +01:00
Mike Jolley bfebd204ee Code standards and better action names 2017-10-27 15:35:34 +01:00
Mike Jolley 0ea2264033 Merge pull request #17317 from woocommerce/remove/legacy-rest-api-files
Removed legacy WordPress REST API files
2017-10-27 15:26:34 +01:00
Mike Jolley 22ee1810de Merge remote-tracking branch 'origin/master' 2017-10-27 15:21:18 +01:00
Mike Jolley 43c77c51b5 Merge branch 'pr/17139' 2017-10-27 15:21:12 +01:00
Mike Jolley 6a7af9897a Standards 2017-10-27 15:21:03 +01:00
Mike Jolley 2d021e3786 Merge pull request #17077 from grosssmutttr/patch-2
Update class-wc-widget-layered-nav.php - Avoid duplicate content
2017-10-27 15:19:48 +01:00
Mike Jolley f3d2b2f7f1 Merge pull request #17071 from woocommerce/add/formatting-unit-tests
Formatting functions tests
2017-10-27 15:14:14 +01:00
Gerhard Potgieter 980d688ca0 Change invoice email title to "Customer invoice / Order details" 2017-10-27 15:01:02 +02:00
Mike Jolley 5824cb9358 Update stripe wording
Closes #16385
2017-10-27 13:48:48 +01:00
Rodrigo Primo a3f14c7256 Caches call to load product variation attributes
This commit adds product variation attributes to WP cache when they are first loaded to avoid running the same database queries when the same product is loaded multiple times. This cache will be invalidated whenever product attributes are changed.

Fixes #17120
2017-10-27 10:01:23 -02:00
Gerhard Potgieter 1e66cedaf0 Save order items before adding new one when there are unsaved changes. Closes #17384 (#17402) 2017-10-27 12:38:10 +01:00
Gerhard Potgieter f0b240d33a Merge pull request #17399 from woocommerce/fix/17306
Escape attribute name commas in CSV exporter
2017-10-27 10:59:09 +02:00
Claudio Sanches 2d08ea7d15 Merge pull request #17400 from woocommerce/fix/17377
Clear counts cache when updating product attributes
2017-10-26 20:59:09 -02:00
Mike Jolley 08c4953b61 Clear counts cache when updating product attributes
Closes #17377
2017-10-26 20:16:52 +01:00
claudiulodro 981b2bc445 Escape attribute name commas in CSV exporter 2017-10-26 09:40:35 -07:00
Gerhard Potgieter a3ec0bf85a Merge pull request #17396 from woocommerce/fix/17379
Prevent cookie header sent error, and improve error message wording
2017-10-26 17:03:17 +02:00
Claudiu Lodromanean 3aa43ed5d2 Calculate shipping after discounts (#17364)
* Calculate shipping after discounts

* Calculate grand total after shipping is calculated

* Keep fees calculation before shipping
2017-10-26 15:27:10 +01:00
Mike Jolley fb5e5209e3 Prevent cookie header sent error, and improve error message wording
Closes #17379

To test, reset your password via email.

Then click the reset link in the email again.
2017-10-26 15:22:25 +01:00
Paul Dechov d048e4d355 Use measurement unit defaults in locale-info instead of hard coding 2017-10-26 09:28:18 -04:00
Mike Jolley 87c6ca5ae0 Merge pull request #17368 from james-allan/fix_thirdparty_coupon_calculations
Fix coupon discount calculations for third party coupon types
2017-10-26 14:23:31 +01:00
Paul Dechov fee6f954dc Ignore existing unit option values in wizard, in favor of national conventions 2017-10-26 09:21:35 -04:00
Claudio Sanches 787bb7f0c0 Fixed permalink default values (#17385)
* Fixed permalink default values

`woocommerce_permalinks` may return a list with empty results like:

wp> get_option( 'woocommerce_permalinks', array() )
=> array(5) {
  ["product_base"]=>
    string(8) "/product"
  ["category_base"]=>
    string(16) ""
  ["tag_base"]=>
    string(11) ""
  ["attribute_base"]=>
    string(0) ""
  ["use_verbose_page_rules"]=>
    bool(false)
}

This override all placeholders declared with `wp_parse_args()`.

`wp_parse_args()` can apply default values only when missing, and not empty.

This PR removes all empty values in order to use the placeholders.

Fixes a bug introduced in #17352

* Moved array_filter() before wp_parse_args()
2017-10-26 13:57:40 +01:00
Marcin Bot 234d9e05a5 Fixed the jetpack redirect url for sites in subdirectories (#17312)
* Fixed the jetpack redirect url for sites in subdirectories

* Using admin_url instead of get_admin_url for consistency

* Wrapped the generated url in esc_url_raw
2017-10-26 13:40:54 +01:00
Paul Dechov 9c2df6486c Default currency responds to country selection in setup wizard (#17318)
* Default currency responds to country selection in wizard

* Refactor to use wp_list_pluck

* Use <script> tag to define global instead of using hidden <input>

* Revert ignoring currency option value on page load
2017-10-26 13:39:54 +01:00
Mike Jolley 8590cd297c Merge pull request #17383 from woocommerce/fix/17332
[REST API] Fix category "image" returned type when is empty
2017-10-26 13:01:50 +01:00
Claudio Sanches 6782cfaca5 Fixed how apply strtolower in columns names in the importer auto map
Now apply for all columns names, even when added by the filters.
2017-10-26 08:20:06 -02:00
Claudio Sanches d23448a823 Merge branch 'master' into fix/17300-search-orderby 2017-10-25 20:53:25 -02:00
Claudio Sanches 6e9ad75be5 Category image is a single object 2017-10-25 20:41:31 -02:00
Claudio Sanches 4b90c12db1 Fixed coding standards.
Still missing fix the file name, but I'll leave it for 3.3
2017-10-25 20:40:44 -02:00
Claudio Sanches 9f81791e17 Merge pull request #17358 from woocommerce/fix/17337-bases
Adjust how permalinks are retrieved and saved
2017-10-25 20:20:41 -02:00
Claudio Sanches 2a4c16977c Merge pull request #17331 from woocommerce/fix/17275-alt
Adjust item limiting discount code to work with multiple coupons
2017-10-25 20:19:13 -02:00
Claudio Sanches faa614ffa7 Merge branch 'master' into fix/17308-remove-item-reloads-unsaved-items 2017-10-25 19:47:54 -02:00
claudiulodro 6cc5d5290c Update to latest selectWoo 2017-10-25 13:51:37 -07:00
Rodrigo Primo fb70ae3fea Coding standards fixes 2017-10-25 17:53:17 -02:00
Claudiu Lodromanean a396a6c83e Merge pull request #17372 from woocommerce/fix/17369
Add cache invalidation for wc_get_product_terms
2017-10-25 10:30:44 -07:00
Claudiu Lodromanean 5892777c62 Merge pull request #17371 from woocommerce/fix/17367
Prevent notice on settings page when accessing invalid tab
2017-10-25 10:25:12 -07:00
Mike Jolley e882c8e864 Merge pull request #17373 from woocommerce/fix/17334-product-downloads-shortcode
Allow shortcodes & relative download urls for product imports
2017-10-25 17:36:23 +01:00
Mike Jolley 206ffcdcb3 Merge pull request #17376 from woocommerce/fix/products-api-schema
[REST API] Fixed date_on_sale_to_gmt description on products endpoint
2017-10-25 17:33:20 +01:00
Claudio Sanches e7508c2c54 [REST API] Fixed date_on_sale_to_gmt description on products endpoint 2017-10-25 14:06:50 -02:00
Claudio Sanches c17fbf53b4 Fixed coding standards 2017-10-25 14:06:13 -02:00
Gerhard Potgieter 8e837adc50 Allow for shortcode and relative download urls to be imported. Closes #17334 2017-10-25 14:54:02 +02:00
Mike Jolley a467d35acd Add cache invalidation for wc_get_product_terms
Closes #17369
2017-10-25 13:27:18 +01:00
Mike Jolley 9d2a493cea Prevent notice on settings page when accessing invalid tab
Closes #17367
2017-10-25 12:51:19 +01:00
James Allan c0e3ac8ce6 fix coupon discount calculations for thirdparty coupon types 2017-10-25 16:33:59 +10:00
claudiulodro e6a9a5f79b Fix date query meta unset checking 2017-10-24 13:07:21 -07:00
Mike Jolley 1a08afeab2 Don't apply remainder logic when discount amount is changed via a filter
Closes #17330
2017-10-24 18:07:23 +01:00
Mike Jolley 8ca76e84cd Add test for #17330 2017-10-24 17:53:51 +01:00
Claudiu Lodromanean f8552ebbad Merge pull request #17352 from woocommerce/fix/17324
Setup locale before generating placeholders
2017-10-24 09:01:20 -07:00
Mike Jolley e68f087659 When no permalinks are set, set the defaults and avoid switching locales 2017-10-24 16:29:04 +01:00
Mike Jolley 79ef09d293 Setup locale before generating placeholders
Closes #17324
2017-10-24 14:06:21 +01:00
Gerhard Potgieter 054c4a1100 Merge pull request #17203 from hisman/fix/17043
Show theme overrides that are done through the wc_get_template filter in WooCommerce > Status
2017-10-24 06:02:48 -07:00
Gerhard Potgieter ec6379a6ec Merge pull request #17291 from michaelrimbach/patch-1
Format PL (Poland) Postal Code
2017-10-24 05:13:13 -07:00
Gerhard Potgieter 998ac25691 Merge pull request #17273 from woocommerce/fix/eu-vat-calc
Fix issue when customer is VAT exempt and prices include tax
2017-10-24 04:00:03 -07:00
Cesar Rodas 32da25c4f1 Improved "is_internal_meta_key"
Improved is_internal_meta_key to check if the meta_key has a setter or a getter before returning TRUE and calling doing_it_wrong
2017-10-23 22:22:31 -03:00
Farhad Sakhaei 5062831b50 spelling
spelling
2017-10-23 13:44:44 +03:30
Mike Jolley 6223ffb684 Adjust item limiting logic to work with multiple coupons
Fixes #17275
2017-10-22 09:13:12 -07:00
Mike Jolley 1278c84c11 Revert "WIP"
This reverts commit 2255066c0f.
2017-10-22 07:13:46 -07:00
Mike Jolley 2255066c0f WIP 2017-10-22 07:13:31 -07:00
Mike Jolley f90c7bfc26 Form row wide for email
Remove arbitrary widths. Closes #17288
2017-10-20 16:15:48 -07:00
Gerhard Potgieter ec1a70ad14 When deleting an order item and there are changes to other items, first save those before deleting. 2017-10-20 11:51:16 -07:00
Claudio Sanches cb5122cc07 Removed legacy WordPress REST API files 2017-10-20 15:52:57 -02:00
Claudio Sanches 7d6d98dca0 Merge pull request #17314 from woocommerce/fix/17285
Let wp_signon handle email to username
2017-10-20 15:40:02 -02:00
Gerhard Potgieter 7ab0b25ba5 Only set to relevance when the orderby is set to menu_order 2017-10-20 10:33:21 -07:00
Gerhard Potgieter 5d9efb7885 Set orderby to relevance when searching for products. Closes #17300 2017-10-20 10:28:23 -07:00
Gerhard Potgieter f9cff6e3f8 PHPCS Fixes. @claudiosanches Would you mind reviewing these as it is quite a lot of changes. 2017-10-20 10:24:56 -07:00
Mike Jolley 72c10bdd33 Remove email to login handling code 2017-10-20 09:21:07 -07:00
Mike Jolley 4844abc326 add woocommerce_cross_sells_order
Filter to control sort direction.
2017-10-20 09:11:00 -07:00
Michael Rimbach 6183d0973d Format PL (Poland) Postal Code
Add "PL" formatting to wc_format_postcode function. An example pl postal code is 24-100
2017-10-19 17:16:36 +02:00
Mike Jolley f27c8a226f Fix issue when customer is VAT exempt and prices include tax
Ref: https://github.com/woocommerce/woocommerce-eu-vat-number/issues/82

In this scenario, base taxes need to be removed from the item price.
2017-10-18 09:31:35 -07:00
Claudiu Lodromanean 07e6a72234 Merge pull request #17259 from woocommerce/fix/17239
Added an update_prices_from_children routine and fixed sync_prices
2017-10-18 08:33:16 -07:00
Claudiu Lodromanean 9fd391b414 Merge pull request #17263 from woocommerce/fix/17219
Zoom and flexslider fixes
2017-10-18 08:29:01 -07:00
Mike Jolley b0c9efbdc2 Merge pull request #17267 from Umangvaghela/fix-17264
fix 17264 issue
2017-10-18 08:25:50 -07:00
Paul Dechov 85af075566 Check for proper currency when getting WCS live rates carrier in setup wizard (#17240) 2017-10-18 11:09:33 -04:00
Umangvaghela 1b7b3f214e fix issue 2017-10-18 15:11:59 +05:30
Mike Jolley 516ea83353 Revert flexslider to 2.6.1 with RTL support
Fixes #17219
2017-10-17 17:05:38 -07:00
Mike Jolley 29e175901f Added an update_prices_from_children routine and fixed sync_prices 2017-10-17 10:06:49 -07:00
Claudio Sanches 2b3f524d35 Merge pull request #17256 from woocommerce/fix/major-update-checks
Moved major update check into get_untested_plugins.
2017-10-17 10:03:23 -07:00
Claudio Sanches c739c80817 [REST API] Fixed variations 'visible' description in schema
Fixes #17249
2017-10-17 14:22:56 -02:00
Claudio Sanches 4bec8f9df5 Fixed coding standards 2017-10-17 14:22:30 -02:00
Mike Jolley 120d5b0768 Moved major update check into get_untested_plugins.
Prevents results returning when already on the major.
2017-10-17 08:27:55 -07:00
Herre Groen 1bde5aa37f Add error logging to status update failes to prevent silent swallowing of errors. 2017-10-17 14:23:54 +02:00
Claudio Sanches 46c15b235a Merge pull request #17245 from woocommerce/fix/17216
Modal should only display for major updates
2017-10-16 22:33:00 -07:00
Claudio Sanches 1f7a038bcd Merge pull request #17242 from woocommerce/fix/17232
Fix meta data clone for products
2017-10-16 22:32:20 -07:00
Claudio Sanches ececd63c93 Merge pull request #17247 from woocommerce/fix/17221
Filter out invalid tax classes
2017-10-16 22:31:49 -07:00
Mike Jolley 0e7cb9940c Filter out invalid tax classes
Closes #17221
2017-10-16 22:05:48 -07:00
Mike Jolley 47a609edb7 Modal should only display for major updates
Fixes #17216
2017-10-16 21:50:44 -07:00
Mike Jolley 3d55a45bfa Only change nocacheheaders when on a cart/checkout page 2017-10-16 21:29:23 -07:00
Mike Jolley fecf950a98 Merge pull request #17237 from woocommerce/fix/17235
Coupon user limit check fix
2017-10-16 21:15:15 -07:00
Mike Jolley 344456c115 Merge pull request #17234 from woocommerce/fix/17216
Scroll untested plugins list if it's too big
2017-10-16 21:08:07 -07:00
Mike Jolley 39443d23e5 Fix meta data clone for products 2017-10-16 21:05:29 -07:00
Dan Wyman 4c16aeac6d Coupon user limit check fix
Fixes a where clause problem. Fixes #17235 .
2017-10-16 18:40:46 +01:00
claudiulodro 4ebac67545 Scroll plugins list if it's too big 2017-10-16 09:10:20 -07:00
Mike Jolley 7419168e65 More cleanup and new fallback option for addresses 2017-10-16 08:12:07 -07:00
Umangvaghela 10fe92cfc1 Fix-minor-changes 2017-10-16 16:33:12 +05:30
Claudio Sanches f9fdbd19e0 Apply Webhooks CRUD and fixed coding standards in html-webhooks-edit.php 2017-10-13 18:01:18 -03:00
Mike Jolley a087f5fa63 Merge pull request #17205 from woocommerce/fix/invoice-subject
Remove # before order number to match 3.1
2017-10-13 19:38:55 +01:00
Mike Jolley 7b67d2d9a9 Remove # before order number to match 3.1 2017-10-13 19:37:03 +01:00
Will Gorham fc8b3266c9 Fix deprecated functions in cart shortcode 2017-10-13 14:22:09 -04:00
Mike Jolley a2e580f59e Merge pull request #17201 from woocommerce/fix/17200
Restore blogname placeholder, but do not list in admin
2017-10-13 19:15:50 +01:00
Mike Jolley 1865528486 Merge pull request #17197 from woocommerce/fix/17125
Use edit context when updating prices in the API
2017-10-13 18:54:58 +01:00
Hisman 78c15569a7 Show theme overrides that are done through the wc_get_template filter in WooCommerce > Status
Fixes #17043

Call the wc_get_template filter on each template and show the file if it exists.
2017-10-14 00:07:38 +07:00
Mike Jolley 6647b35585 Restore blogname placeholder, but do not list in admin
Closes #17200
2017-10-13 17:42:12 +01:00
Mike Jolley 93a6f68408 Merge pull request #17193 from woocommerce/fix/legacy-fees-api
Fix/legacy fees api
2017-10-13 17:36:43 +01:00
Mike Jolley fbc6850fb9 Merge pull request #17198 from JeroenSormani/fee-tax-class-slugs
Allow tax_class slugs when adding a fee
2017-10-13 17:25:46 +01:00
JeroenSormani f244b178d3 Allow tax_class slugs when adding a fee 2017-10-13 18:06:23 +02:00
Mike Jolley 840da4f0c8 Use edit context when updating prices in the API
Fixes #17125
2017-10-13 16:37:38 +01:00
Gerhard Potgieter e4c961c3ba Merge pull request #17194 from woocommerce/update/email-tweaks
Email template and admin tweaks
2017-10-13 17:10:08 +02:00
Mike Jolley c1b83df5f6 Merge pull request #17174 from woocommerce/improve/17172
Add extra lines back in admin order summary
2017-10-13 15:24:51 +01:00
Mike Jolley c2c213fe05 Include date in customer emails again 2017-10-13 15:09:21 +01:00
Mike Jolley 7df8f6bec6 Resend new order notification option
@kloon Stole your code.

Ref: #17186
2017-10-13 14:54:12 +01:00
Mike Jolley ddf8abf474 Merge pull request #17189 from franticpsyx/add-missing-break-in-legacy-cart
[3.2] Add missing break in WC_Legacy_Cart class
2017-10-13 14:41:47 +01:00
Mike Jolley d694483735 Fix tax display issue for discounts 2017-10-13 14:36:35 +01:00
Mike Jolley 98eeafcc29 Hide shipping/discount rows when not needed and match email wording. 2017-10-13 14:01:20 +01:00
Mike Jolley 803b31a18c Switched to property_exists and moved deprecation notice to avoid errors and setting fees unnecessarily. 2017-10-13 13:46:49 +01:00
Mike Jolley 8fa6116ef6 Hide cat-parent class when category will show no children due to depth setting
Closes #17184
2017-10-13 12:50:49 +01:00
Manos Psychogyiopoulos 3562f7156a Add missing break in WC_Legacy_Cart class 2017-10-13 14:17:13 +03:00
Gerhard Potgieter feffde2a73 Merge pull request #17167 from woocommerce/tweak/services-text-in-wizard
Tweak/services text in wizard
2017-10-13 11:32:51 +02:00
Gerhard Potgieter 0146c7d240 Merge pull request #17164 from woocommerce/fix/17088
Fix image matching queries
2017-10-13 11:30:34 +02:00
claudiulodro b5e02ea6f6 Add extra lines back in admin order summary 2017-10-12 14:01:11 -07:00
Mike Jolley 8fa3ddde86 Tweaked intro text further about live rates 2017-10-12 18:29:23 +01:00
Claudiu Lodromanean 0f9bd218ed Merge pull request #17160 from woocommerce/fix/17138
Use city and postcode count to determine sort order
2017-10-12 09:27:30 -07:00
Mike Jolley a447221213 wc_setup_wcs_tout is not used. 2017-10-12 17:19:47 +01:00
Mike Jolley a1f4cc0464 Show what powers taxes and link, just like storefront 2017-10-12 17:19:17 +01:00
Claudiu Lodromanean cd0eb65852 Merge pull request #17162 from woocommerce/fix/17150
Fixed discount logic to also look at parent categories when validatiing coupons
2017-10-12 09:19:14 -07:00
Mike Jolley 9198d636c5 This installs jetpack/services - be clear 2017-10-12 17:18:37 +01:00
Mike Jolley 806f80c8d2 Be explicit about what powers live rates 2017-10-12 17:18:15 +01:00
Claudiu Lodromanean a63c822d2d Merge pull request #17161 from woocommerce/fix/17158
Remove rounding in wc_remove_number_precision
2017-10-12 08:48:32 -07:00
Claudiu Lodromanean fb763a6deb Merge pull request #17155 from woocommerce/fix/selectWoo-dependency
wc-admin-order-meta-boxes as a selectwoo dependency
2017-10-12 08:38:36 -07:00
Mike Jolley b72268172a Fix image matching queries 2017-10-12 16:32:40 +01:00
Mike Jolley 4379a47cd5 Fixed discount logic to also look at parent categories when validatiing coupons
Fixes #17150
2017-10-12 15:40:58 +01:00
Mike Jolley 88ea1eaf7b Remove rounding in wc_remove_number_precision
Remove the rounding when removing precision so the cart can handle it.

For taxes, this means it can round down.

Fixes #17158

Tests are passing.
2017-10-12 15:16:48 +01:00
Mike Jolley 878e4816fb Use city and postcode count to determine sort order 2017-10-12 14:04:10 +01:00
Mike Jolley 2db0d1d4d6 Merge pull request #17151 from woocommerce/fix/shipping-rate-save
Fix tax rate save when only changing shipping checkbox
2017-10-12 12:33:46 +01:00
Mike Jolley cffcaaf773 wc-admin-order-meta-boxes as a selectwoo dependency 2017-10-12 12:32:36 +01:00
Mike Jolley 6aca58324a Merge pull request #17152 from woocommerce/fix/lazy-load-embeds
Load videos when the help tab is opened, not before.
2017-10-12 12:28:00 +01:00
Mike Jolley 47d69dad2d Load videos when the help tab is opened, not before.
Closes #17145
2017-10-12 12:18:37 +01:00
Mike Jolley 5a22c7fa97 Fix tax rate save when only changing shipping checkbox 2017-10-12 11:30:41 +01:00
Mike Jolley 0908bc0b13 phpcs 2017-10-12 11:26:55 +01:00
Mike Jolley 4f3393fc2f Tax calculations should use `unfiltered` context for tax class
This fixes variations which have a ‘parent’ tax class. It should
inherit from the parent.

Closes #17147
2017-10-12 10:12:20 +01:00
mehul0810 024eec53f8 Added Text Domain 2017-10-12 08:28:45 +05:30
mehul0810 3e2cf907eb Modified message key 2017-10-12 08:27:41 +05:30
Claudio Sanches 19fed02c50 Always 'post' on API since there is no more Trash for webhooks 2017-10-11 18:15:07 -03:00
Claudio Sanches 4c26dfa4be Fixed coding standards in includes/admin/settings/class-wc-settings-api.php 2017-10-11 18:14:50 -03:00
Mike Jolley a6059ea759 Remove menu-ordering sorting 2017-10-11 21:36:13 +01:00
Chris Schrijver dee7a8c8d4 If no tax rate is defined for a specific country it still shows "incl. VAT" at the checkout / cart when tax display is set to "As single total". This will solved that 2017-10-11 17:58:43 +02:00
grosssmutttr 1ccec7d156 class-wc-widget-layered-nav.php - Crawling Budget
Additional optimization to save up crawling budget.
Added $link = str_replace('%2C', ',', $link); on line 513

https://mydomain.com/produkt-kategorie/my-category/?filter_filter-color=orange,black

If you add another filter it encodes the existing commas:
https://mydomain.com/produkt-kategorie/my-category/?filter_filter-color=orange%2Cblack&filter_manufacturer=adidas&filter_cut=men.children

So sometimes you have "," as seperator and sometimes you have encoded "%2C".

After implementing this pull-request the seperator stays ",":
https://mydomain.com/produkt-kategorie/my-category/?filter_filter-farbe=orange,black&filter_manufacturer=adidas&filter_cut=men.children

This pull request belongs to the optimization https://github.com/woocommerce/woocommerce/pull/17134 to save up crawling budget,
2017-10-11 14:47:00 +02:00
Mike Jolley 12d93803ee Merge pull request #17121 from woocommerce/update/wizard-payments-copy
Update payment step copy for Stripe, and fixes margins/spacing
2017-10-11 10:17:57 +01:00
grosssmutttr d9f0bd5e92 Keep link structure - prevent duplicate content
Added asort($current_filter) so the urls always look the same and there are not millions of urls possibilities when adding multiple filters.

Current url example:
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=yellow,brown,blue,red
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=yellow,blue,red,brown
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=blue,yellow,red,brown
...

With asort you only have this url:
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=blue,brown,red,yellow

So it is independent on the sequence a user adds a filter
2017-10-11 08:33:46 +02:00
Claudio Sanches bd68764682 Apply Webhook CRUD to WC_Admin_Webhooks 2017-10-10 17:15:37 -03:00
Claudio Sanches 714178996c Remove duplicated function 2017-10-10 16:16:16 -03:00
Claudio Sanches 368d958be4 Merge branch 'master' into feature/webhook-crud 2017-10-10 16:13:37 -03:00
Claudio Sanches c00fce3f94 Merge pull request #16490 from woocommerce/feature/16445
Webhooks CRUD and Data Store
2017-10-10 16:10:31 -03:00
Marcin Bot 17e4f2a609 Merge pull request #17127 from woocommerce/fix/17122-setup-required-shipping-fields
Setup wizard - made the shipping cost fields required
2017-10-10 18:50:20 +02:00
Marcin Bot 01578d55c9 Wrapped the class name in esc_attr 2017-10-10 17:49:04 +01:00
Marcin Bot eaf8a09e82 Setup wizard - made the shipping cost fields required 2017-10-10 16:59:08 +01:00
Claudio Sanches b775074900 Fixed includes/wc-webhook-functions.php and removed debug 2017-10-10 12:59:04 -03:00
Mike Jolley 31367a72b8 Merge pull request #17123 from woocommerce/update/wizard-extras-copy
Setup wizard: add “powered by” to automated taxes description.
2017-10-10 16:39:45 +01:00
Clifford 1474350f0f Correct docblock @return
From incorrect `string` to correct `array`
2017-10-10 10:31:16 -05:00
Jeff Stieler 24599524ba Setup wizard: add “powered by” to automated taxes description. 2017-10-10 09:24:13 -06:00
Mike Jolley 6b357bcfdc Updates the payment step copy and fixes margins 2017-10-10 15:40:03 +01:00
mehul0810 48e7575b10 Alignment Fix 2017-10-10 18:44:33 +05:30
mehul0810 aaa092159b Added using CRUD 2017-10-10 18:44:12 +05:30
Mike Jolley d4965e9df4 Merge pull request #17112 from woocommerce/fix/product-variations-tax-classes
Add 'parent' to the list of valid tax classes for product variations
2017-10-10 12:32:29 +01:00
mehul0810 0a4307ce40 Modified confirmation popup message 2017-10-10 16:52:37 +05:30
Jack 24efd36126 set query_vars (#17105)
* query_vars is set

* add changes
2017-10-10 12:14:35 +01:00
Jeff Stieler 974f402017 Fix duplicate plugin install from wizard. (#17114)
* Setup wizard: avoid duplicate plugin installs.
* Setup wizard: use background flag to determine if Jetpack is being installed.
* Setup wizard: use wc_set_time_limit() instead of set_time_limit() to avoid potential warnings/errors.
2017-10-09 16:45:33 -06:00
Claudio Sanches b62b954f19 Small change to test PHPCS into Travis CI 2017-10-09 17:32:53 -03:00
Claudio Sanches 87cf8f4809 Merge pull request #17106 from woocommerce/fix/activate-step-when-returning-from-wpcom
Setup wizard: activate step shouldn't be hidden after a successful WPCOM connection.
2017-10-09 16:59:53 -03:00
Rodrigo Primo fa0e5569f8 Add 'parent' to the list of valid tax classes for product variations
Commit d9f9e74bd added a check to `WC_Product::set_tax_class()` to only accept valid tax classes, but this created a bug for product variations as this type of product has an extra tax class called 'parent'.

This commit fixes this problem by adding a new method to `WC_Product` that returns a list of valid tax classes. `WC_Product_Variation` then override this method, returning another list including the tax class 'parent'.

Fixes #17024
2017-10-09 16:20:03 -03:00
Rodrigo Primo d769ef24f2 Coding standards fixes 2017-10-09 16:19:24 -03:00
Mike Jolley 6d7522d864 Merge pull request #17075 from woocommerce/fix/phpunit-excluded-files
Updated tests exclusion list
2017-10-09 19:46:34 +01:00
Claudio Sanches 7ce5d9e1c6 Merge pull request #17109 from woocommerce/fix/17085-2
Translate "No matches found" message in filter widget
2017-10-09 15:39:51 -03:00
claudiulodro f1dac6f3ac Use esc_js instead of addslashes 2017-10-09 11:37:09 -07:00
Mike Jolley fae130d038 Allow display_name to be searchable - this will commonly be full name
Closes #17104
2017-10-09 19:20:22 +01:00
claudiulodro 97d7ae7df8 Missing semicolon 2017-10-09 11:16:24 -07:00
claudiulodro 2ccd44afa7 Translate "no matches" message 2017-10-09 11:10:32 -07:00
Jeff Stieler c5f097f319 Setup wizard: check for activate-step-specific GET parameters before hiding the step.
This was a bit overzealous, and broke successful connection flows from the wizard. (Introduced in 97faa49fc4)
2017-10-09 08:55:30 -06:00
Mike Jolley c16b950aa9 Merge pull request #17103 from woocommerce/fix/is_checkout_conditional
Add WOOCOMMERCE_CHECKOUT check to is_checkout
2017-10-09 13:18:09 +01:00
mehul0810 9d5da174b7 Message Text changed 2017-10-09 16:17:00 +05:30
mehul0810 914e31affb Ask for confirmation popup only if sales is produced for a product 2017-10-09 16:16:22 +05:30
Gerhard Potgieter 2080858dd4 Also check the woocommerce_checkout conditional, ensure ajax conditional checks keeps working. Closes #17094 2017-10-09 12:39:47 +02:00
Mike Jolley 74fb3821e2 Merge pull request #17096 from woocommerce/add/17092-jetpack-tos-accept-flag
Setup wizard: set a flag when Jetpack is opted into.
2017-10-09 11:39:32 +01:00
Gerhard Potgieter a815c62289 PHPCS fixes 2017-10-09 12:39:27 +02:00
Jeff Stieler 000295c0bf Setup wizard: remove the “activate” step if Jetpack is already connected. (#17099)
* Setup wizard: remove the “activate” step if Jetpack is already connected.

* phpcs
2017-10-09 11:35:17 +01:00
Claudiu Lodromanean 2b49125b46 Enable clearing for attribute filter widget (#17093)
* Enable clearing for attribute filter widget

* Multiselect variant doesnt need clear button

* Make code less ugly
2017-10-09 11:21:21 +01:00
mehul0810 1c9a5dbae8 Removed Comma 2017-10-08 15:35:14 +05:30
mehul0810 284c107b1a Add Support for confirmation popup to Delete Permanently link under Trash status. 2017-10-08 15:33:53 +05:30
mehul0810 6e6af2285c Added Message for Product permanent deletion 2017-10-08 15:28:23 +05:30
Jeff Stieler 4c66520989 Setup wizard: set a flag when Jetpack is opted into.
This is to be picked up by the WooCommerce Services extension.
2017-10-06 20:40:25 -06:00
Konstantin Kovshenin 70a72693c3 Helper: Fix automatic subscription activation
Fixes a bug where automatic subscription activation upon plugin
activation does not trigger due to the subscription being unlimited.
2017-10-06 17:12:55 +03:00
grosssmutttr 52beb782c6 Update class-wc-widget-layered-nav.php - Avoid duplicate content
Added rel="nofollow" to the filters to avoid duplicate content.
2017-10-05 19:55:10 +02:00
Claudio Sanches 31f42ba907 Move includes/class-wc-legacy-api.php to includes/legacy/class-wc-legacy-api.php 2017-10-05 14:02:30 -03:00
Claudio Sanches 18a47d79b1 Merge branch 'master' into add/formatting-unit-tests 2017-10-05 12:18:29 -03:00
Claudio Sanches 8cd754d8b6 Fixed coding standards 2017-10-05 11:08:37 -03:00
Mike Jolley 77e245fa68 Merge pull request #17067 from woocommerce/fix/mexican-state-update
Update only state fields when updating Mexican States
2017-10-05 12:53:35 +01:00
Valerie K b4088c5d91 Wizard: Handle Jetpack install, activate, and connection errors (#16983)
* Wizard: Remove extra query arg in next step URL

Remove the activate_error query arg from
the URL for the next step.

* Wizard: Remove temp queued Jetpack install option

This is done so that the option does not remain
when going through the wizard again, or when going
back to previous pages.

It prevents an infinite loop from happening when
waiting for the Jetpack install and activation
to finish on the activate step.

* Wizard: Install and activate Jetpack if needed

Add function to install & activate Jetpack as needed.
Props to @jeffstieler for the idea, and the implementation/code:
https://github.com/Automattic/woocommerce-services/pull/1031#discussion_r122505316
https://github.com/Automattic/jetpack/blob/master/3rd-party/woocommerce-services.php#L101

Add a list of errors and a function to get the correct error message.

After clicking the connect Jetpack button, make sure that
Jetpack is installed and activated.

On error, redirect to the activate page with a query arg.

* Wizard: Show Jetpack error message if it exists

Always check for an error message when displaying
the activate step. If the error
message exists, display it at the top of the page.

* Remove redundant "if" so the $title in the Activate step is always a valid string

* Tweaked the "Server is on a private network" Jetpack activation error message.
2017-10-05 12:51:49 +01:00
Gerhard Potgieter a8e3862bf2 Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066 2017-10-05 13:49:10 +02:00
Gerhard Potgieter 71fce64f54 PHPCS fixes. 2017-10-05 13:48:26 +02:00
Gerhard Potgieter 9ad6a41e7c Revert "Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066"
This reverts commit 2474396eb6.
2017-10-05 13:46:45 +02:00
Gerhard Potgieter 2474396eb6 Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066
This also fixes a bunch of PHPCS issues as it seems the new rules is very strict and you must fix the whole file before commiting any of your own changes.
2017-10-05 11:32:30 +02:00
Valerie K 61caed9cb8 Wizard: Add Stripe Email (#17029)
* Wizard: Add Stripe email input, show previously entered payment settings, only save settings for enabled gateways
2017-10-04 13:37:59 -06:00
Jeff Stieler b72ad3f2cc Setup wizard: fix logic error when detecting existing shipping zones. (#16995)
* Setup wizard: fix logic error when detecting existing shipping zones.
* Hide the shipping zones sections on the Shipping step if there are already shipping zones configured in the store.
2017-10-04 11:48:06 -06:00
Filipe Seabra 0dad12537b Version was bumped 2017-10-04 12:54:00 -03:00
Claudio Sanches 8b0400c348 Merge pull request #17060 from woocommerce/fix/17044
Ensure query_vars is set. Closes #17044
2017-10-04 11:52:12 -03:00
Claudio Sanches b25e08e1cc Merge pull request #17058 from woocommerce/fix/17047-alt
Fix meta data returns in API using JsonSerializable
2017-10-04 11:48:46 -03:00
Mike Jolley d72f6ae22c Ensure query_vars is set. Closes #17044 2017-10-04 15:37:43 +01:00
Mike Jolley 7e06a30eea Merge pull request #17042 from victorfreitas/fix_invalid_term
Fix bug when parent term is invalid
2017-10-04 14:55:12 +01:00
Mike Jolley 38434e3288 Merge pull request #17052 from shivapoudel/fix/footer-text
Fix - Admin footer text
2017-10-04 14:44:46 +01:00
Mike Jolley f4e3498d4e Handle JSON encoding for API 2017-10-04 14:12:53 +01:00
Mike Jolley 240a321dd0 Revert get_meta_data changes and return array of WC_Meta_Data objects 2017-10-04 14:12:43 +01:00
James Koster e26302b1ff Nothing to be translated any more! 2017-10-04 13:11:44 +01:00
James Koster 7c05dde430 Remove "Powered by WooCommerce" credit in default email footer text setting. closes #17053 2017-10-04 12:40:18 +01:00
Shiva Poudel 7cd968c69b Fix - Admin footer text 2017-10-04 15:33:22 +05:45
Mike Jolley 47d50a70ea Merge pull request #16969 from stiletagegmbh/master
added actions and filters to modify tax calculation for shipping taxes and fee taxes #16938
2017-10-04 10:30:47 +01:00
lars ac24a56ff3 #16938 rename filter for clarity 2017-10-04 10:56:56 +02:00
Claudio Sanches e6710258d2 Merge pull request #17037 from victorfreitas/master
Save postmeta attachment image reference on import of products via AP rest.
2017-10-03 19:32:27 -03:00
victorfreitas 9dcfe4883a Fix error when invalid parent term 2017-10-03 17:59:58 -03:00
Filipe Seabra 872fed68dc Added to new actions in content-widget-product.php so plugins can easily and specifacally do sth within product widgets. There's no issue/reference, sorry. 2017-10-03 17:52:36 -03:00
Jeff Stieler c850bb92da Merge pull request #17028 from woocommerce/minor-wizard-style-updates
Small style adjusts to onboarding
2017-10-03 13:27:59 -06:00
Valerie 60e9258913 Wizard: Update option for types of product sold 2017-10-03 17:38:08 +02:00
Valerie 3ca5ded150 Wizard: Reset live rates options on save 2017-10-03 17:30:00 +02:00
Valerie 450236c8d9 Wizard: Update store setup text 2017-10-03 17:30:00 +02:00
Valerie 9da7925288 Wizard: Fix paragraph bottom margin
Avoid too little bottom margin when the paragraph
is the last paragraph on the page, but not the last element.

Avoid too much bottom margin when there were nonce fields
after the last paragraph on the page.
2017-10-03 17:29:22 +02:00
victorfreitas e40ae14d2e Improving the code comment 2017-10-03 12:28:05 -03:00
Valerie 9a2ab72cd6 Wizard: Style tracking option 2017-10-03 17:26:32 +02:00
victorfreitas c72c2f06b8 Save postmeta attachment image reference on import of products via API rest. 2017-10-03 10:17:09 -03:00
Ville Viklund ae17ccd65f Fix typo 2017-10-03 15:34:44 +03:00
Lane Goldberg fb8bac5957 make hidden country/state readonly
make hidden country / state fields read only. fixes #17026
2017-10-02 15:24:37 -04:00
Claudiu Lodromanean d3d782c85c Merge pull request #17017 from woocommerce/fix/17003
Handle WC_Meta_Data in get_data() and API
2017-10-02 09:19:45 -07:00