Commit Graph

22955 Commits

Author SHA1 Message Date
Mike Jolley 3a76e4492e todos 2017-07-18 20:48:19 +01:00
Mike Jolley d24faebea8 Split fixed cart from other discounts in class. 2017-07-18 20:42:47 +01:00
Mike Jolley 37fbd96de8 Small tidyup 2017-07-18 18:52:50 +01:00
Mike Jolley 2b9e3aafdd fix endless loop of death 2017-07-18 18:47:05 +01:00
Mike Jolley 6a9e612a83 Some progress on actual discounts 2017-07-18 18:07:46 +01:00
Nick Hoobin 25038f6d0f Add a filter to arguments passed to wc_get_products during prepare_data_to_export() 2017-07-18 10:38:36 -05:00
Claudio Sanches b2757c1be4 Merge pull request #16166 from woocommerce/feature/discounts-class-set-items
Feature/discounts class set items
2017-07-18 11:49:09 -03:00
Mike Jolley 268628c09c Include cart item class 2017-07-18 15:42:54 +01:00
Mike Jolley cc8eb28724 Set items based on cart or an order, with tests 2017-07-18 15:42:46 +01:00
Mike Jolley 7f715e4776 WC_Cart_Item class 2017-07-18 15:42:29 +01:00
Paul Wilde b64d855d96 Introduce `wc_get_account_formatted_address` function which removes a bunch of logic outside of the my-account template file. 2017-07-18 15:18:53 +01:00
Paul Wilde 60bbb41be8 Introduce `wc_get_account_orders_actions` function to reduce the amount of logic inside the account orders template files. 2017-07-18 15:03:26 +01:00
Mike Jolley 91dbdb0c4c Correct value 2017-07-18 14:29:14 +01:00
Mike Jolley efaa606894 Merge branch 'master' into feature/discounts-class 2017-07-18 14:27:20 +01:00
Claudio Sanches 5c67f0c665 Merge pull request #16161 from woocommerce/fix/importer-callbacks
Use class raw data, don't pass it
2017-07-18 10:26:12 -03:00
Mike Jolley dfd7aa78d5 Use class raw data, don't pass it
#16127 caused an issue with fields which don’t require passing args
e.g. esc_url_raw callback. This broke tests.
2017-07-18 14:20:14 +01:00
Mike Jolley 31d535c932 Methods and tests 2017-07-18 14:04:56 +01:00
Mike Jolley 96f0a6e375 DateTime docblocks 2017-07-18 11:46:11 +01:00
Claudio Sanches 8b1b8b6b28 Initial WC_Discounts class 2017-07-18 01:43:31 -03:00
Claudio Sanches 90691e881f Merge pull request #16140 from woocommerce/update/16136
Added `woocommerce_data_store_wp_{$this->meta_type}_read_meta` filter
2017-07-17 19:24:44 -03:00
Mike Jolley 0d7cb826cb Restore transient 2017-07-17 19:36:45 +01:00
Mike Jolley 5642ee0c4d Only check active plugins 2017-07-17 19:35:14 +01:00
Mike Jolley 0b606c8bbe Styling and code tidy 2017-07-17 19:30:21 +01:00
Mike Jolley ece770490f Escape and localise 2017-07-17 18:14:38 +01:00
Mike Jolley 809ff9c31d correct escaping 2017-07-17 18:13:18 +01:00
Mike Jolley 8c17027eb6 Merge branch 'master' into improvement/versions
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-07-17 18:04:28 +01:00
Jaydeep Rami 3522857d23 Fix typo in WooCommerce plugin (#16135)
* Fixed typo

* Fixed more typo

* Fixed more typo

* Fix tyop

* Fix more typo

* Fix more typo

* Fix typo

* Fix typo

* Fix typo

* Fix typo datatime object

* Fix short name of compat

* Fix typo: update short name

* Fix typo "deactive" to "deactivate" and short BW - Compat

* Fix typo "Backwards compat"

* Fix typo 'parameters'

* Fix more typo 'pararmeters'

* Fix typo 'compund'

* FIx typo order

* Fix typo

* Fix typo 'incorrecly'

* Fix typo 'genarate'

* Fix typo 'reletive'

* Fix typo 'Handly'

* Fix typo 'rotatated'

* Fix typo

* Fix typo 'additonal'

* Fix typos
2017-07-17 11:10:52 +01:00
Mike Jolley 3f1144cf06 Merge pull request #16115 from woocommerce/refactor/woocommerce-class
Moving WooCommerce class to a separate file and fixing coding standards
2017-07-17 11:09:45 +01:00
Mike Jolley 62a3554c22 Merge pull request #16114 from woocommerce/fix/rest-api-options
[REST API] Allow OPTIONS requests again
2017-07-17 11:08:48 +01:00
Mike Jolley 0517673cfa Reverse results of wc_array_cartesian so variations are created in a more expected way
Closes #16117
2017-07-17 11:02:47 +01:00
Mike Jolley a2a34cf0be Added `woocommerce_data_store_wp_{$this->meta_type}_read_meta` filter
#16136
2017-07-17 10:34:44 +01:00
terence1990 f93413920b Changed template name to receipt 2017-07-15 17:41:34 +01:00
claudiulodro 35c4c7fbe6 v2 2017-07-14 13:47:29 -07:00
claudiulodro 129763dadf Split up notices 2017-07-14 12:44:16 -07:00
Claudiu Lodromanean 19d844fa53 Merge pull request #16129 from woocommerce/fix/16128
Fixed missing reviews in product_page shortcode with SKU
2017-07-14 10:19:38 -07:00
claudiulodro 8c8684b8aa Move meta query init above sku query 2017-07-14 10:10:37 -07:00
claudiulodro 96bc5e6f95 cleanup 2017-07-14 10:07:18 -07:00
Claudio Sanches e5ebfb6141 Fixed missing reviews for product_page shortcode with SKU
When quering with SKU, WP_Query does not set `is_single` as true and this
makes fail the check inside `comments_template()`.

Closes #16128
2017-07-14 14:06:18 -03:00
claudiulodro b04534bb85 Hook everything up to wc_product_query 2017-07-14 10:01:25 -07:00
claudiulodro f66198c37d Initial working wc_get_products 2017-07-14 09:50:20 -07:00
Claudio Sanches 4d3d377bcf Merge pull request #16127 from woocommerce/fix/16119
Importing products with relative fields and skus
2017-07-14 12:55:11 -03:00
Claudio Sanches 14ff34ef81 Moved constants to main class and applied new description 2017-07-14 12:49:16 -03:00
Claudio Sanches 2e663af024 Merge pull request #16122 from woocommerce/update/16069
Check stock levels before showing payment form
2017-07-14 12:35:26 -03:00
Claudio Sanches 4f7b152b96 Merge pull request #16120 from woocommerce/fix/16118
Cast report data to floats
2017-07-14 12:34:00 -03:00
Mike Jolley f63b2e24df Merge pull request #16125 from websupporter/issue-16124
Switch to coupons internal get_email_restrictions() (solves #16124)
2017-07-14 12:34:43 +01:00
Mike Jolley 2bc7f075f5 Make sure placeholders have or check for SKUS
Fixes #16119
2017-07-14 12:33:14 +01:00
Mike Jolley 02dc61677a Improve cleanup of fails 2017-07-14 11:38:49 +01:00
websupporter 72baa43fe2 switch to coupons internal get_email_restrictions() 2017-07-14 13:37:00 +03:00
Mike Jolley 02917db066 Merge pull request #16116 from woocommerce/fix/15982
Order note helper functions implementation
2017-07-14 10:58:36 +01:00
Mike Jolley 1c6a629d78 Check stock levels before showing payment form 2017-07-14 10:48:43 +01:00