Commit Graph

23494 Commits

Author SHA1 Message Date
Mike Jolley 2def474421 Order calc 2017-08-09 16:19:10 +01:00
Mike Jolley f0a9050241 HTML 2017-08-09 16:17:30 +01:00
Mike Jolley f480c98d11 Data stores 2017-08-09 16:17:02 +01:00
Mike Jolley d0cd8b3022 WC_Order_Item_Discount 2017-08-09 16:16:44 +01:00
Mike Jolley 722ac5ad78 Load order items 2017-08-09 16:16:36 +01:00
Mike Jolley f95a1e4231 Ajax trigger for button 2017-08-09 14:55:53 +01:00
Mike Jolley 6c0750e2e9 Discount lines and button 2017-08-09 14:55:42 +01:00
Mike Jolley d40edfe9a6 add_order_discount ajax method 2017-08-09 14:54:30 +01:00
Mike Jolley 858d3842ea Move method so it's available in admin 2017-08-09 14:54:05 +01:00
Mike Jolley 73350e5418 Fake round half down in PHP 5,2
Fixes unit tests.
2017-08-09 11:59:50 +01:00
Mike Jolley 30a85e9f8d Merge branch 'pr/16036' 2017-08-09 10:11:20 +01:00
Mike Jolley c1544e443a Version and escape 2017-08-09 10:11:07 +01:00
Mike Jolley 140771e759 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
2017-08-09 10:08:06 +01:00
Mike Jolley 8af2ce8a20 Merge pull request #16379 from EmilEriksen/master
Store status_transition in a local variable and reset it before firing hooks in order to avoid infinite loops
2017-08-09 10:01:24 +01:00
Claudiu Lodromanean 87fdfac19b Merge pull request #16383 from woocommerce/versions-detect-extensions
Styling and unknown plugin detection
2017-08-08 10:33:46 -07:00
claudiulodro e89bef3d52 Update tests to handle related plugins 2017-08-08 10:31:06 -07:00
Mike Jolley 86a225a8d9 Newsletter signup 2017-08-08 18:00:47 +01:00
Mike Jolley 5443f44fcc Improve location step 2017-08-08 17:32:21 +01:00
Mike Jolley c486cea531 copy fix 2017-08-08 17:21:01 +01:00
Mike Jolley e82ca1c1a6 Styling and unknown plugin detection 2017-08-08 17:12:50 +01:00
Mike Jolley 6e59b540e1 Merge pull request #16382 from woocommerce/improve/16165
Allow define customer ID in wc_get_account_formatted_address()
2017-08-08 16:17:26 +01:00
Claudio Sanches d8af7cdeec Merge pull request #16380 from woocommerce/fix/16316
Fix filename image handling
2017-08-08 12:11:17 -03:00
Claudio Sanches 56f654eb4c Allow define customer ID in wc_get_account_formatted_address()
This should help 3rd party integrations, like custom emails or invoices.

Releated to #16165
2017-08-08 12:08:06 -03:00
Mike Jolley a661feccba Merge pull request #16162 from woocommerce/feature/discounts-class
Cart Total and Discounts classes
2017-08-08 15:58:32 +01:00
Mike Jolley e9c3ebebdc Merge branch 'master' into feature/discounts-class
# Conflicts:
#	includes/abstracts/abstract-wc-data.php
#	woocommerce.php
2017-08-08 15:49:59 +01:00
Claudiu Lodromanean 591dbd5a82 Merge pull request #16303 from woocommerce/feature/discount-cart-integration
Integrate WC_Cart_Totals with Cart
2017-08-08 07:34:36 -07:00
Mike Jolley fe143df02c Merge branch 'pr/14751' 2017-08-08 15:30:00 +01:00
Mike Jolley 3778918a0a Merge branch 'master' into pr/14751
# Conflicts:
#	includes/class-wc-structured-data.php
2017-08-08 15:28:31 +01:00
Mike Jolley 396faa19d7 phpcs 2017-08-08 15:25:32 +01:00
Mike Jolley 90f0a835b1 Fix filename image handling 2017-08-08 15:00:03 +01:00
Mike Jolley 93f93e3d5e Merge branch 'pr/16191' 2017-08-08 13:20:28 +01:00
Mike Jolley 866f1cd818 Merge branch 'master' into pr/16191
# Conflicts:
#	includes/wc-account-functions.php
2017-08-08 13:20:17 +01:00
Mike Jolley 81e3ce63b7 Merge branch 'pr/16164' 2017-08-08 13:12:45 +01:00
Mike Jolley a97d3470db Merge branch 'master' into pr/16164
# Conflicts:
#	includes/class-wc-cache-helper.php
2017-08-08 13:12:37 +01:00
Mike Jolley 73eb086696 Merge branch 'pr/16165' 2017-08-08 13:10:16 +01:00
Mike Jolley 2f6aaa85bb Avoid using meta directly 2017-08-08 13:04:27 +01:00
Mike Jolley 63d82cea71 Merge branch 'pr/16108' 2017-08-08 12:44:50 +01:00
Mike Jolley 735a277e52 initial state 2017-08-08 12:44:36 +01:00
Mike Jolley 19d0841b70 Merge pull request #16340 from grey-rsi/wc-emails-filters
Add filters to make possible send emails in language different from d…
2017-08-08 11:53:36 +01:00
Mike Jolley 202498298e Merge pull request #16374 from woocommerce/fix/12273-4
Product attributes helper functions implementation
2017-08-08 11:51:38 +01:00
Emil Kjær Eriksen ee830d19b4 Store status_transition in a local variable and reset it before firing hooks 2017-08-08 12:47:16 +02:00
Mike Jolley a4b81c2a22 Merge pull request #16252 from helgatheviking/issues-16221-settings-save-order
Move settings init/save to load-$settings hook. Closes #16221
2017-08-08 11:40:17 +01:00
Mike Jolley 38d9499c76 Merge branch '12273-3' 2017-08-08 11:07:43 +01:00
Mike Jolley 684a2b22ed typo 2017-08-08 11:07:36 +01:00
Mike Jolley e7ff4186eb remove include 2017-08-08 10:52:54 +01:00
Mike Jolley ceb191e73e The world is not ready for WC_Cart_Item 2017-08-08 10:52:31 +01:00
Mike Jolley 6dc67ee133 phpcs 2017-08-08 10:51:35 +01:00
Mike Jolley ce93599b5c Test correction 2017-08-08 09:30:11 +01:00
Mike Jolley 81806617d7 Fix total and rounding logic for tests 2017-08-08 09:24:26 +01:00
Mike Jolley f7c4cf82d8 Fix subtotal unit tests 2017-08-08 09:24:03 +01:00