Commit Graph

13894 Commits

Author SHA1 Message Date
Boro Sitnikovski b6801d3761 Fix wrong call 2017-12-07 20:16:54 +01:00
Boro Sitnikovski d0f9aaa99a Merge branch 'master' into tweak/decouple-cart-template-methods 2017-12-07 20:16:08 +01:00
Claudiu Lodromanean 1b079f1e43
Merge pull request #18061 from woocommerce/fix/import-export-18047
Fix ID mapping to existing IDs
2017-12-07 09:57:31 -08:00
Jonathan Belcher f4d6b6f68f Merge Commit 2017-12-07 12:10:00 -05:00
Jonathan Belcher 3bb55107e8 Fix placeholder comment 2017-12-07 12:04:25 -05:00
Jonathan Belcher 885f869d40 Merge commit 2017-12-07 12:02:55 -05:00
Jonathan Belcher 937cdbf230 Merge commit 2017-12-07 11:50:42 -05:00
Jonathan Belcher 9695bc4183 Small code review changes 2017-12-07 11:47:33 -05:00
Claudiu Lodromanean 7c06e7d63d
Merge pull request #18008 from woocommerce/update/rounding-17970-17863
Rounding fixes/line item rounding
2017-12-07 08:34:15 -08:00
Claudiu Lodromanean 804c771296
Merge pull request #17683 from woocommerce/feature/unsupported-theme
Unsupported theme enhancements
2017-12-07 08:05:29 -08:00
Mike Jolley 5e51af9d2c Fix white space in order actions 2017-12-07 15:50:27 +00:00
Mike Jolley 36b1753925 Version 2017-12-07 15:41:53 +00:00
Mike Jolley 7a94bf06df Reversion changes 2017-12-07 15:39:10 +00:00
Mike Jolley d7b29bc833 Merge branch 'pr/17993' 2017-12-07 15:33:36 +00:00
Mike Jolley f0c04b019b Rename filter and pass order 2017-12-07 15:33:26 +00:00
Mike Jolley 7e7b79efd0 typo 2017-12-07 15:31:55 +00:00
Mike Jolley 05d6e393ae Merge branch 'pr/18013' 2017-12-07 15:29:59 +00:00
Mike Jolley 54d4012c33 Use timestamp function 2017-12-07 15:24:57 +00:00
Boro Sitnikovski 588c5f3779 Change method name 2017-12-07 15:53:16 +01:00
Mike Jolley 86ff5f5842
Merge pull request #18049 from woocommerce/fix/undefined-var
Fixed undefined variable on WC_Shipping_Zones::get_zone_by
2017-12-07 14:32:21 +00:00
Mike Jolley 03db5c4590
Merge pull request #18048 from woocommerce/fix/17722-2
Allow import and export draft products
2017-12-07 14:29:50 +00:00
Mike Jolley 3de87d3db7 Fix ID mapping to existing IDs
Fixes #18047
2017-12-07 14:12:20 +00:00
Claudio Sanches 3300534963
Merge pull request #18058 from woocommerce/fix/18053
Update docblock for $include_taxes
2017-12-07 11:05:39 -02:00
Mike Jolley acbd4295f9 phpcs 2017-12-07 12:35:13 +00:00
Mike Jolley 91887b918f phpcs 2017-12-07 12:31:30 +00:00
Mike Jolley cadfcfc11f phpcs 2017-12-07 12:21:01 +00:00
Mike Jolley d3cd420c0a Format data of headers 2017-12-07 12:15:39 +00:00
Mike Jolley c3623a9967 Update docblock for $include_taxes
Closes #18053
2017-12-07 11:46:35 +00:00
Marcin Bot d0756a4a36 Fixed the undefined index notice 2017-12-07 11:20:04 +00:00
Jonathan Belcher b42004f7b3 Fix escaping 2017-12-06 16:48:30 -05:00
Claudio Sanches bb575ad07e Fixed @since 2017-12-06 19:12:42 -02:00
Claudio Sanches 390844f73b Fixed coding standards 2017-12-06 19:11:40 -02:00
Claudio Sanches cae02bee36 Fixed undefined variable on WC_Shipping_Zones::get_zone_by 2017-12-06 19:07:00 -02:00
Paul Dechov 1433347eda Remove unused description string for Braintree 2017-12-06 15:36:46 -05:00
Claudio Sanches 0946fd04cf Allow import and export draft products
Closes #17722
2017-12-06 18:32:35 -02:00
Paul Dechov f2cc10922a Add full stops to code comments 2017-12-06 14:53:31 -05:00
Mike Jolley 1f2011e8de Tweak query args 2017-12-06 19:03:14 +00:00
Mike Jolley 119ee7f27c Use new loop functions 2017-12-06 18:10:44 +00:00
Mike Jolley 8bdff47133 Hook in subcats 2017-12-06 18:10:28 +00:00
Mike Jolley 3c36ab0517 Helper functions for loop handling to avoid global usage, and helper for displaying subcats 2017-12-06 18:10:19 +00:00
Mike Jolley e343c99ccb Remove is_shortcode_loop 2017-12-06 18:09:49 +00:00
Jonathan Belcher c43f4c65be Merge Commit 2017-12-06 12:07:27 -05:00
Jonathan Belcher bbaabb5b80 Remove unused function 2017-12-06 12:03:50 -05:00
Jonathan Belcher b5c1025621 Fixes from code review 2017-12-06 12:02:09 -05:00
Mike Jolley 07792a253b Correct variable name 2017-12-06 15:54:40 +00:00
Paul Dechov c75f5f54af Show PPEC instead of Braintree in US, and remove Braintree altogether 2017-12-06 10:02:32 -05:00
Paul Dechov 94da7ffbed Default PPEC to enabled 2017-12-06 10:01:55 -05:00
Paul Dechov 28c4dc0fbe Install WCS if PPEC settings set 2017-12-06 09:19:39 -05:00
Paul Dechov eecd0db0f0 Tweak checkbox label 2017-12-06 09:19:08 -05:00
Paul Dechov 4155f02ec8 Make sure PPEC settings are opened if enabled on load 2017-12-06 09:18:06 -05:00
Marcin Bot 0d12b31a13 Updated the Klarna logo 2017-12-06 14:04:28 +00:00
Mike Jolley 320392fc59 is_visible should ensure product is is not trashed
Closes #18023
2017-12-06 13:47:09 +00:00
Mike Jolley 67a4339ee0
Merge pull request #18031 from woocommerce/fix/admin-product-warnings
Fixed "PHP Warning: printf(): Too few arguments"
2017-12-06 13:32:26 +00:00
Mike Jolley 8dcffa660e Normalise get_query_results names and add new param for pagination 2017-12-06 13:13:43 +00:00
Gerhard Potgieter 6ff40c2821
Merge pull request #18011 from WPprodigy/add-helper-notice
Add admin notice when helper plugin is deactivated
2017-12-06 12:37:34 +02:00
Boro Sitnikovski 4981d68b38 Add filter for script data 2017-12-06 11:03:16 +01:00
Paul Dechov 6500b11db8 Adjust logo widths to match design and approximately equalize prominence 2017-12-05 19:55:43 -05:00
Paul Dechov 9a3b63036f Address 'Undefined index' notice by checking for set param 2017-12-05 14:56:15 -05:00
Paul Dechov 570a2e9512 Add PPEC settings to wizard, to facilitate rerouting via WCS 2017-12-05 14:53:44 -05:00
Jonathan Belcher 38984b03ce
Merge pull request #18026 from woocommerce/add/clear-addons-transients
Clear addons transients on update to 3.3.0
2017-12-05 14:41:21 -05:00
Jonathan Belcher d38a9e2af6
Change order of commands to make DB last 2017-12-05 14:39:37 -05:00
Claudio Sanches 79e6821685 Fixed coding standards 2017-12-05 17:11:33 -02:00
Claudio Sanches 9e93d99056 Fixed "PHP Warning: printf(): Too few arguments" 2017-12-05 16:57:26 -02:00
Claudio Sanches c07d039242 [Importer] Get global attribute ID only when is a global attribute.
Closes #17923
2017-12-05 16:55:56 -02:00
claudiulodro 535d014ef9 Line up arrays 2017-12-05 10:50:17 -08:00
claudiulodro aab65923c1 Refactor for better style 2017-12-05 10:45:08 -08:00
Claudio Sanches a56018b967 Removed webhook custom topic input and included better error messages 2017-12-05 16:07:36 -02:00
Claudiu Lodromanean 9d644e0852
Merge pull request #18012 from woocommerce/fix/18010-merge-persistant-session-carts
Merge session and persistent carts when both exists
2017-12-05 09:49:52 -08:00
Jonathan Belcher 51c66d7f7a
Remove automatic spacing changes made by my editor 2017-12-05 12:27:13 -05:00
Claudiu Lodromanean 87e1cf485d
Merge pull request #18022 from woocommerce/fix/17979
Return packages with no rates so shipping calculator is displayed.
2017-12-05 09:27:00 -08:00
Jonathan Belcher c39a181cb6 Clear addons transients on update to 3.3.0 2017-12-05 12:23:51 -05:00
Marcin Bot 399e2893e1 Updated the Klarna logo 2017-12-05 17:06:35 +00:00
claudiulodro 73bfc1444b Fix weird bracket 2017-12-05 08:42:50 -08:00
claudiulodro 813024c654 line up array 2017-12-05 08:42:04 -08:00
Marcin Bot 10f912a0a9 Split Klarna into two plugins and updated their display logic 2017-12-05 16:38:19 +00:00
claudiulodro fec60ab2ea Fix product shortcode pagination 2017-12-05 08:31:50 -08:00
Marcin Bot d1e4d0fe3c Fixed a <label>'s id 2017-12-05 16:21:36 +00:00
Marcin Bot fbc630114c Fixed the payment gateways link 2017-12-05 16:21:36 +00:00
Marcin Bot 628906a5bc Added Klarna and Square CSS classes 2017-12-05 16:20:15 +00:00
Marcin Bot 6dae7f3451 Fixed an i18n domain 2017-12-05 16:20:15 +00:00
Marcin Bot 8b0e0e3df4 Fixed the copies 2017-12-05 16:20:15 +00:00
Valerie 8c6d069377 Add Square to wizard payment step 2017-12-05 16:20:15 +00:00
Valerie e28341a9a3 Wizard: Ask user if selling in person 2017-12-05 16:20:15 +00:00
Valerie 6d2ca0fd15 Add Klarna to wizard payment step 2017-12-05 16:20:15 +00:00
Jonathan Belcher f05ed543fa Fix css and add search query header 2017-12-05 11:15:09 -05:00
Claudio Sanches 09dd86da1c
Merge pull request #18021 from woocommerce/fix/17974
wc_lostpassword_url should not be used before init
2017-12-05 13:20:25 -02:00
Jonathan Belcher 2c12dcfacd Merge Commit 2017-12-05 10:16:28 -05:00
Jonathan Belcher 66dbcdead6 Update for API changes 2017-12-05 10:06:58 -05:00
Mike Jolley 8f9bd7d0bf Return packages with no rates. 2017-12-05 15:00:07 +00:00
Mike Jolley 79e9464dc3 wc_lostpassword_url should not be used before init
Closes #17974
2017-12-05 14:25:24 +00:00
Mike Jolley 3e00533183 phpcs 2017-12-05 14:02:40 +00:00
Mike Jolley 5a5f179346 translators 2017-12-05 13:41:56 +00:00
Mike Jolley 4e7da70185 Update permalink setting text #17745 2017-12-05 13:40:40 +00:00
Mike Jolley 5a8cdb1ded Update wording for #17968 2017-12-05 13:31:42 +00:00
Mike Jolley 05e7eaae03 get_meta_data return array values
Closes #17997
2017-12-05 13:14:12 +00:00
Mike Jolley d49590d0a3 Fixes to 5.2 rounding function and additional tests 2017-12-05 12:10:23 +00:00
Boro Sitnikovski 145d47c580 Decouple cart templating methods from WC_Cart class 2017-12-05 13:00:21 +01:00
Caleb Burks 6374a13d30 Update a product’s modified_date for stock changes 2017-12-05 00:53:52 -06:00
Gerhard Potgieter 961a70965d PHPCS Fixes 2017-12-05 08:48:35 +02:00
Gerhard Potgieter ccb54faf0b When getting a cart from a session and there are contents as well as contents in the persistant cart, merge the two carts to avoid loosing the persistant cart content. 2017-12-05 08:45:52 +02:00