Commit Graph

25449 Commits

Author SHA1 Message Date
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
Claudio Sanches a1fc8485df
Merge pull request #18025 from woocommerce/update-japanese-prefectures-coy
Spelling fix
2017-12-05 15:22:37 -02:00
Marcin Bot 399e2893e1 Updated the Klarna logo 2017-12-05 17:06:35 +00:00
John Coy a9baf47dc9 Spelling fix
Fixed Hokkaido Prefecture
2017-12-05 10:55:36 -06: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 2eeedb2259 Updated the square logo 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 17ef8a68f0 Reverted the minified css files 2017-12-05 16:20:15 +00:00
Marcin Bot 4229e2652a Added a new Square logo 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
Claudio Sanches e60fe9973f
Merge pull request #18018 from woocommerce/update/admin-wording-tweaks
Admin wording tweaks
2017-12-05 13:18:29 -02:00
Jonathan Belcher 9f5ab72467 Build CSS 2017-12-05 10:17:28 -05: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
Caleb Burks 21e798e1a8 Add admin notice when helper plugin is deactivated 2017-12-04 23:57:47 -06:00
Mike Jolley b6f87e70d7 round total to cents 2017-12-04 22:42:39 +00:00
Mike Jolley 077ced6657 tearDown 2017-12-04 22:30:23 +00:00
Mike Jolley 55af8a2ec8 wc_cart_round_discount 2017-12-04 22:10:47 +00:00
claudiulodro d60456cc73 Resolve conflicts and bring up to date with master 2017-12-04 13:56:59 -08:00
Mike Jolley 7da5780c00 Store unrounded, calc rounded. 2017-12-04 21:40:12 +00:00
Mike Jolley c29bb6add3 Split test so comparison works. 2017-12-04 20:38:42 +00:00
Mike Jolley 8e851d834f Rounding and price should match the cart. 2017-12-04 20:38:29 +00:00
Mike Jolley 17095a4011 Totals should be set to store DP setting. 2017-12-04 20:38:14 +00:00
Mike Jolley 277127a400 Round line totals and taxes per line correctly to the store DP setting. 2017-12-04 20:38:00 +00:00