Commit Graph

12730 Commits

Author SHA1 Message Date
Mike Jolley 1e65a918d5 Pull meta to apply coupons which do not exist 2017-08-24 17:08:45 +01:00
Mike Jolley 8b4086caf2 Hide link to non-existing coupons 2017-08-24 17:08:34 +01:00
Mike Jolley 487478daa9 Store details about the original coupon 2017-08-24 17:07:49 +01:00
Mike Jolley b84efc1acd is_virtual to track manual coupons 2017-08-24 17:07:39 +01:00
Mike Jolley 8ce583889a Apply filters to carts only, and add is_virtual helper 2017-08-24 17:07:31 +01:00
Claudio Sanches abb9886df1 Merge pull request #16592 from woocommerce/fix/16587
If no title is set when uploading images, use filename
2017-08-24 12:05:48 -03:00
Mike Jolley 220b37d5f2 Show sorting on search results but default to relevance
Closes #16565
2017-08-24 12:58:50 +01:00
Mike Jolley 7a817ee103 Added back missing discount row
Closes #16586
2017-08-24 12:49:49 +01:00
Mike Jolley 8e6085b2c0 If no title is set when uploading images, use filename
Closes #16587
2017-08-24 12:33:53 +01:00
Claudiu Lodromanean 56e1207903 Merge pull request #16583 from woocommerce/update/apply-fees
Improved apply fees
2017-08-23 13:35:18 -07:00
Mike Jolley 25fb505fc4 Debug 2017-08-23 16:42:58 +01:00
Claudio Sanches b46f5c91e4 Merge pull request #16584 from ramiy/patch-1
i18n: Avoid using HTML tags in translation strings
2017-08-23 11:51:28 -03:00
Claudio Sanches 0bf1aa1cb0 Merge pull request #16581 from woocommerce/fix/16577
Imported non-published variations should be private, not draft
2017-08-23 11:47:04 -03:00
Mike Jolley 9d877a3b34 Unused vars 2017-08-23 14:40:34 +01:00
Mike Jolley 2beddc59a7 docblocks 2017-08-23 14:38:00 +01:00
Mike Jolley e0de3643bc ID is unused 2017-08-23 14:28:25 +01:00
Mike Jolley 9483a7ec19 invalid return 2017-08-23 14:27:30 +01:00
Mike Jolley c60859bf3c types 2017-08-23 14:27:10 +01:00
Mike Jolley a7b697b679 type checks 2017-08-23 14:25:41 +01:00
Rami Yushuvaev ff289f3bf4 i18n: Avoid using HTML tags in translation strings
This PR moves the `<code>` HTML tags from the translation strings.

It also moves the server variables outside of the translation string, because translators can accidentally translate it wrong.
2017-08-23 16:22:52 +03:00
Mike Jolley 714c4c672e unused prop 2017-08-23 14:21:42 +01:00
Mike Jolley be042ee8f3 Set to amount before calc 2017-08-23 12:24:33 +01:00
Mike Jolley 804feb9333 Store fee amount and prevent totals going negative 2017-08-23 12:15:06 +01:00
Mike Jolley d9e455b9c6 Merge branch 'master' into update/apply-fees 2017-08-23 11:26:13 +01:00
Mike Jolley f18a146d0f Prompt to apply fee in admin 2017-08-23 11:22:18 +01:00
Mike Jolley 22813663d7 Merge pull request #16569 from woocommerce/update/fees-api-class
WC_Cart_fees and negative fee calculations
2017-08-23 10:59:19 +01:00
Mike Jolley b3e92869f9 Imported non-published variations should be private, not draft
Fixes #16577
2017-08-23 10:45:18 +01:00
Frédéric Demarle 04b6e80065 Add action woocommerce_product_import_before_import 2017-08-23 09:37:41 +02:00
Claudiu Lodromanean 95130b2403 Merge pull request #16574 from woocommerce/feature/16554
Allow import/export product position (menu_order)
2017-08-22 14:13:52 -07:00
Claudiu Lodromanean bdba4f7636 Merge pull request #16572 from woocommerce/fix/16559
Introduces woocommerce_get_product_id_by_sku filter
2017-08-22 13:31:45 -07:00
Claudio Sanches 7ad0dd55f9 Allow import 'menu_order' 2017-08-22 17:22:39 -03:00
Claudio Sanches 0b3811bd11 Change Position key from 'position' to 'menu_order' 2017-08-22 16:46:09 -03:00
Claudio Sanches af23ad42d7 Included "position" (menu_order) to exported products 2017-08-22 16:33:19 -03:00
Claudio Sanches 02a7f4d5ab Merge pull request #16561 from woocommerce/fix/16557
API v1 should create v1 webhooks
2017-08-22 15:19:16 -03:00
Claudio Sanches 03a189726e Introduces woocommerce_get_product_id_by_sku filter
Closes #16559
2017-08-22 15:04:21 -03:00
Claudiu Lodromanean 6c2a944b74 Merge pull request #16570 from woocommerce/fix/16568
Add product to cart on each iteration for BW compat.
2017-08-22 09:31:21 -07:00
Claudiu Lodromanean 8a9a51643e Merge pull request #16563 from woocommerce/fix/16560
Prevent regular price being lower than the sale price
2017-08-22 09:08:09 -07:00
Mike Jolley 559982fbe7 Unused variable 2017-08-22 17:02:48 +01:00
Mike Jolley 56c0c1e259 remove old set 2017-08-22 16:41:03 +01:00
Mike Jolley a70e9bbf9b Add product to cart on each iteration for BW compat.
Closes #16568
2017-08-22 16:39:51 +01:00
Mike Jolley c41fb8f00c docblock 2017-08-22 16:31:45 +01:00
Mike Jolley 8dbd9b88a7 Admin calc 2017-08-22 16:26:35 +01:00
Mike Jolley 00cb48a5fe Pass through to order 2017-08-22 16:20:23 +01:00
Mike Jolley 367f08d79f Negative fee logic for cart 2017-08-22 16:12:37 +01:00
Mike Jolley 57865204aa Cart fees class and legacy 2017-08-22 15:17:58 +01:00
Mike Jolley 0bad6b3e52 add_db_table_prefix method for 5.2 support 2017-08-22 13:51:50 +01:00
Manos Psychogyiopoulos 1596979d75 Reload order items on add 2017-08-22 15:19:20 +03:00
Mike Jolley 56f2dc6005 Merge pull request #16562 from Umangvaghela/Update-condition
Update condition
2017-08-22 11:45:46 +01:00
Mike Jolley fb2d8cb394 Prevent regular price being lower than the sale price
Closes #16560
2017-08-22 11:43:48 +01:00
Umangvaghela 5794a9cb34 Update condition 2017-08-22 15:23:34 +05:30
Mike Jolley 2a5a47016f API v1 should create v1 webhooks
Fixes #16557
2017-08-22 10:40:35 +01:00
Gregory Karpinsky 73b20bfece Update class-wc-admin-settings.php
Typo: visbility --> visibility
2017-08-21 22:00:23 -04:00
Mike Jolley d68291b3ac Merge pull request #16086 from woocommerce/improvement/versions
Extensions version check.
2017-08-21 18:18:04 +01:00
Mike Jolley 9ee732d68c Text 2017-08-21 18:11:47 +01:00
Claudio Sanches e0e0092f9a Merge pull request #16549 from woocommerce/fix/16547
Handle isset for legacy props, and adjust free shipping logic
2017-08-21 12:38:08 -03:00
Claudio Sanches 37352b60c4 Merge pull request #16546 from woocommerce/fix/16539
Improve email directory writable checking
2017-08-21 12:36:17 -03:00
Claudio Sanches 1cfdaaa108 Merge pull request #16548 from woocommerce/fix/16524
Swap to text input for tax rate %, and format as decimal.
2017-08-21 12:32:53 -03:00
Claudio Sanches 237d5b646a Merge pull request #16544 from woocommerce/fix/16537
If auth cannot occur, don't send request.
2017-08-21 12:31:46 -03:00
Mike Jolley 95fe91e622 Tweak version code 2017-08-21 16:04:06 +01:00
Mike Jolley b20ef5dcac Styling 2017-08-21 15:53:08 +01:00
Mike Jolley 5c271af844 Handle isset for legacy props, and adjust free shipping logic
Closes #16547
2017-08-21 13:01:20 +01:00
Mike Jolley 95cc51ae5c Swap to text input for tax rate %, and format as decimal.
Closes #16524
2017-08-21 12:49:23 +01:00
Mike Jolley 6ee0ef1ee8 Copy update for c6ca8a6024 2017-08-21 12:38:14 +01:00
Mike Jolley 3886987346 Merge pull request #16543 from mihaigrigori/master
\WC_Legacy_Cart::get_cart_for_session must return a value
2017-08-21 11:57:16 +01:00
Mike Jolley c6ca8a6024 Update copy with plugins page link
Closes #16496
2017-08-21 11:53:34 +01:00
Mike Jolley 05dc9d3c0f Improve email directory writable checking
Closes #16539
2017-08-21 11:32:21 +01:00
Mike Jolley bf2ca1f3d3 If auth cannot occur, don't send request.
Fixes #16537
2017-08-21 10:49:00 +01:00
Mihai Grigori f6a6cef1d9 \WC_Legacy_Cart::get_cart_for_session must return a value 2017-08-21 11:58:29 +03:00
rspublishing 9ed2f7544f Updated XAF and XOF denominators 2017-08-20 21:48:18 +02:00
Claudio Sanches 56b8829f46 Merge pull request #16530 from woocommerce/fix/query_names
Rename filters to be unique
2017-08-18 14:33:58 -03:00
claudiulodro 4ed359d336 Rename filters to be unique 2017-08-18 10:25:21 -07:00
Mike Jolley 0dc1754b91 Merge branch 'master' into update/store-owner-newsletter
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-08-18 18:21:55 +01:00
Mike Jolley fcef2c7f71 Copy update 2017-08-18 18:21:23 +01:00
Claudio Sanches b93a95423f Use wc_strtolower() to format coupon code
Improves #16519
2017-08-18 14:11:33 -03:00
Mike Jolley 36f5827bc0 Merge pull request #16351 from pmgarman/feature-system-status-site-size-data
Add “site size” areas to system status report
2017-08-18 17:49:12 +01:00
Claudiu Lodromanean 07d5e2e7ca Merge pull request #16525 from woocommerce/update/tax-class-setter
Only set valid tax classes in product abstract
2017-08-18 09:27:03 -07:00
Mike Jolley db62f4c567 Merge pull request #16526 from JPry/bug/docblocks
Update some docblocks with proper parameters
2017-08-18 17:24:43 +01:00
Claudio Sanches 105388e9b2 Merge pull request #16527 from woocommerce/fix/importer-att
Fix importer fatal error
2017-08-18 13:23:40 -03:00
Mike Jolley 3d002f842f Fix get totals method 2017-08-18 17:18:41 +01:00
Jeremy Pry 2d4b7356df Update some docblocks with proper parameters 2017-08-18 12:18:19 -04:00
claudiulodro 24e9f80f1a wc_get_attribute_taxonomies returns objects 2017-08-18 09:17:04 -07:00
Mike Jolley d9f9e74bd9 Only set valid tax classes in product abstract 2017-08-18 17:06:22 +01:00
Claudiu Lodromanean b0f190fa1d Merge pull request #16517 from woocommerce/integrate-cart-sessions-class
Integrate cart sessions, getters and setters
2017-08-18 08:41:57 -07:00
Mike Jolley 313a797f23 Merge branch 'master' into integrate-cart-sessions-class 2017-08-18 16:37:25 +01:00
Mike Jolley 4567169aa9 Fix remove from cart 2017-08-18 16:37:24 +01:00
Claudiu Lodromanean 4d715d7f54 Merge pull request #16509 from woocommerce/cart-sessions-class
Added WC_Cart_Session class
2017-08-18 08:30:36 -07:00
Claudiu Lodromanean a4d3518a61 Merge pull request #16508 from woocommerce/remove-manual-discounts
Removed manual discounts code
2017-08-18 08:30:07 -07:00
Claudiu Lodromanean 4b23d5c5ba Merge pull request #16523 from woocommerce/fix/16481
Change password label
2017-08-18 08:29:10 -07:00
Claudiu Lodromanean db8ee8d306 Merge pull request #16519 from woocommerce/fix/16497
Format coupon code with mb_strtolower
2017-08-18 08:28:40 -07:00
Mike Jolley 97f9a4037a Change password label 2017-08-18 16:18:49 +01:00
Mike Jolley f957546cc4 Format coupon code with mb_strtolower
Fixes #16497
2017-08-18 15:43:34 +01:00
Mike Jolley 1f692ffb64 Merge pull request #16485 from Korkey128k/master
Wrapped 'Delete selected row(s)' button in condition
2017-08-18 15:38:14 +01:00
Mike Jolley c22fb01903 Merge pull request #16516 from Umangvaghela/issue-16515
update Yoda condition
2017-08-18 15:06:44 +01:00
Mike Jolley 1c8ad67a9e Fix tests and tax merges 2017-08-18 15:05:01 +01:00
Mike Jolley b854c1775c Tests 2017-08-18 13:53:22 +01:00
Mike Jolley 302512e51f Combine taxes correctly 2017-08-18 13:48:53 +01:00
Umangvaghela b994ea69ca update Yoda condition 2017-08-18 17:58:58 +05:30
Mike Jolley a2858245fe Remove call - it's hooked 2017-08-18 12:52:29 +01:00
Mike Jolley d2e3839d99 Use getters and setters in cart class 2017-08-18 12:51:45 +01:00
Mike Jolley a190dc79c3 Legacy getters/setters 2017-08-18 12:24:17 +01:00
Mike Jolley b34b7bf850 Merge pull request #16512 from Umangvaghela/issue-16511
Yoda condition is missing in class-wc-ajax.php
2017-08-18 12:08:06 +01:00
Mike Jolley b9fea8419b getters and setters for totals 2017-08-18 12:05:18 +01:00
Umangvaghela 5e8723b99e Set Yoda condition 2017-08-18 16:26:21 +05:30
Mike Jolley 0c751087f9 Cast to arrays 2017-08-18 11:44:07 +01:00
Mike Jolley aefb9c4705 Moved magic method to legacy 2017-08-18 11:37:22 +01:00
Mike Jolley c0368362ce First pass 2017-08-18 11:29:26 +01:00
Mike Jolley a9a93436fc rename ajax method 2017-08-18 10:59:55 +01:00
Mike Jolley 1d95593131 Localise message 2017-08-18 10:58:11 +01:00
Mike Jolley a55716eed4 WC_Cart_Session 2017-08-18 10:54:41 +01:00
Mike Jolley e99471c0cd Removed manual discounts code 2017-08-18 10:36:10 +01:00
Claudio Sanches 909c3f6c8f Fixed extra "!" and ")" on #16489 2017-08-17 19:05:46 -03:00
Claudio Sanches 3fb17f23e7 Merge pull request #16478 from ramiy/patch-1
i18n: Rewrite the translation string logic
2017-08-17 13:59:37 -03:00
Alex James Bishop d4a02819a7 Add filter to woocommerce_order_again_button to match WC_Form_Handler->order_again
This commit adds the `woocommerce_valid_order_statuses_for_order_again` filter to the conditional check
before displaying the order-again button.

The purpose is to enable consistency when altering the valid order again statuses - in the past a dev would
need to use this filter to let the order through the form handler, and then override the template file for a really
trivial reason just to get the button to display.
2017-08-17 11:31:06 +09:30
Corey Smith a6cf08d8cf Wrapped 'Delete selected row(s)' button in condition 2017-08-16 11:56:30 -05:00
Claudiu Lodromanean 5ff7704db4 Merge pull request #16476 from woocommerce/fix/16455
Fix breadcrumbs for regular categories
2017-08-16 08:49:01 -07:00
Rami Yushuvaev 4ae42313ce i18n: Rewrite the translation string logic
The single translation string `by` is not easy to translate without a context. In this case, using the context function `_x()` is not the best solution.

A better way would be to create two complete translation strings for refund with a user and without a user.
2017-08-16 14:25:38 +03:00
ragulka d73e7e4f9d Prevent unwanted double cart notices (#16460)
* Don't add shipping zone debug message when doing ajax

Prevent an issue where the "Customer matched zone" debug message is shown twice after first selecting a shipping method and then changing a product's quantity in cart and clicking Update cart.

* Don't pass event object to cart.update_cart

Prevent accidentally preserving cart notices when `wc_update_cart` event is triggered on body. If the event object is passed to update_cart() as the first param, it evaluates to true, forcing existing notices to be preserved.

* Pass custom arguments to cart.update_cart()

Instead of simply not passing the event object, pass any custom arguments, so it's possible to do something like: $( body ).trigger( 'wc_update_cart', true ); to still preserve notices if needed.
2017-08-16 11:34:35 +01:00
Mike Jolley 201b3bc056 Merge pull request #16466 from woocommerce/fix/rounding
Fix discounts rounding issues
2017-08-16 11:28:09 +01:00
Mike Jolley 38ab37597c Merge pull request #16467 from ramiy/patch-1
i18n: Simpler translation string with placeholders
2017-08-16 11:26:06 +01:00
Mike Jolley 34ae983cc9 Merge pull request #16470 from ramiy/patch-4
i18n: Simpler translation string with placeholders
2017-08-16 11:25:48 +01:00
Mike Jolley bf84592e87 Merge pull request #16469 from ramiy/patch-3
i18n: Merge two similar translation strings
2017-08-16 11:25:23 +01:00
Mike Jolley 3aee17faeb Fix breadcrumbs for regular categories
Closes #16455
2017-08-16 11:22:22 +01:00
Patrick Garman f19a63e1d7 Merge the DB and DB Table Size tables 2017-08-15 19:52:14 -05:00
Rami Yushuvaev 125ead910a i18n: Simpler translation string with placeholders
One more... replacing function name with `%s` placeholder, this way translators can't misspell the function name.
2017-08-16 00:42:32 +03:00
Rami Yushuvaev 43744e4f27 i18n: Merge two similar translation strings
Replace:

`wp_remote_get() failed. Contact your hosting provider.`
`wp_remote_post() failed. Contact your hosting provider.`

With:

`%s failed. Contact your hosting provider.`

Note:

This also a good practice because the function name is outside of the translation string, this way the translator can't misspell the function name.
2017-08-16 00:32:36 +03:00
Rami Yushuvaev d1f4acc730 i18n: Simpler translation string with placeholders
Replace:

`wc_get_product should not be called before the woocommerce_init action.`

With:

`%1$s should not be called before the %2$s action.`
2017-08-16 00:26:14 +03:00
Rami Yushuvaev 0087536296 i18n: Simpler translation string with placeholders
Replace:

`WC_Logger::log was called with an invalid level "%s".`

With:

`%1$s was called with an invalid level "%2$s".`
2017-08-16 00:22:46 +03:00
claudiulodro 9a47146716 Fix discounts rounding issues 2017-08-15 14:11:25 -07:00
Claudio Sanches 82a6de2e49 Merge pull request #16459 from ramiy/patch-3
i18n: Avoid using HTML tags in translation strings
2017-08-15 14:48:35 -03:00
Claudio Sanches 3a12f7b494 2.1.2 db update functions 2017-08-15 13:01:28 -03:00
Claudio Sanches 339ab41bf1 Remove unfiltered_html capability from Shop Managers 2017-08-15 12:57:12 -03:00
Claudio Sanches 9e8aa83d47 Escape product names on reports 2017-08-15 12:56:35 -03:00
Claudio Sanches 0fec9dbfe7 Merge pull request #16458 from ramiy/patch-2
i18n: Simpler translation string with placeholders
2017-08-15 12:49:31 -03:00
Mike Jolley 129eae141a Fix custom discount amounts not multiplying by qty 2017-08-15 16:25:39 +01:00
Mike Jolley 3c18d5e849 Adjust total discount for ex.tax 2017-08-15 16:25:39 +01:00
Claudio Sanches 7a44c3d700 Merge pull request #16457 from ramiy/patch-1
i18n: Simpler translation string with placeholders
2017-08-15 12:05:32 -03:00
Mike Jolley de35d9ba02 Apply woocommerce_coupon_get_discount_amount without cents
cc @claudiulodro
2017-08-15 15:29:22 +01:00
Claudio Sanches a6017741ad Merge pull request #16456 from woocommerce/update/status-tools
Tool to purge webhook logs
2017-08-15 11:02:27 -03:00
Mike Jolley 835d0ab450 Fix remove tax column
Closes #16443
2017-08-15 14:51:12 +01:00
Rami Yushuvaev 6f7c817b78 i18n: Avoid using HTML tags in translation strings
This PR moves the `<strong>` HTML tags from the translation strings.

Replacing: `Order scheduled for: <strong>%1$s</strong>.`
With: `Order scheduled for: %s.`

We did the same in WordPress core across several releases (4.3 - 4.7). Because it's makes the translation process to RTL language (like Hebrew) much easier.
2017-08-15 15:07:55 +03:00
Rami Yushuvaev 7ce117a0ca i18n: Simpler translation string with placeholders
Replace:

`The provided handler <code>%s</code> does not implement WC_Log_Handler_Interface.`

With:

`The provided handler %1$s does not implement %2$s.`
2017-08-15 14:48:42 +03:00
Rami Yushuvaev 7ad61068e1 i18n: Simpler translation string with placeholders
Replace:

`The class <code>%s</code> provided by woocommerce_logging_class filter must implement <code>WC_Logger_Interface</code>.`

With:

`The class %1$s provided by %2$s filter must implement %3$s.`
2017-08-15 14:39:41 +03:00
Mike Jolley 392ce417bc docblocks 2017-08-15 12:21:12 +01:00
Mike Jolley 3852ce59c8 Tool to purge webhooks 2017-08-15 12:15:17 +01:00
Mike Jolley a44a57b5d9 Improve tools page styling 2017-08-15 12:05:34 +01:00
Mike Jolley f62d505797 Merge pull request #16427 from nyordanov/variation-permalink-infinite-loop
Prevent infinite recursion in WC_Post_Data::variation_post_link()
2017-08-15 10:59:36 +01:00
Mike Jolley 4101e313bb Merge pull request #16392 from woocommerce/feature/admin-apply-discount-15501
[WIP] Admin discounts
2017-08-15 10:07:00 +01:00
Mike Jolley 70248b2fa6 Merge pull request #16419 from woocommerce/fix/1645
Use array_replace in order item apply_changes
2017-08-15 09:59:02 +01:00
claudiulodro 2eb107b0af Add 5.2 fallback 2017-08-14 11:45:54 -07:00
claudiulodro ae80d12d80 Merge master 2017-08-14 11:12:09 -07:00
Claudiu Lodromanean 28c5af4922 Merge pull request #16440 from woocommerce/fix/16422
Adjust coupon user limit logic
2017-08-14 10:24:51 -07:00
Claudiu Lodromanean 1f2891cfd3 Merge pull request #16439 from woocommerce/fix/16432
Switch CLI tools command over to v2 API
2017-08-14 10:04:02 -07:00
Claudiu Lodromanean f0126852a5 Merge pull request #16438 from woocommerce/fix/16405
Add error handling for wp_insert_term
2017-08-14 10:01:22 -07:00
Rami Yushuvaev 17d10b3e9f i18n: Fix some translation strings (#16441)
* i18n: permissions -> permission

* i18n: permissions -> permission
2017-08-14 17:25:08 +01:00
Mike Jolley be11c1089f Fix tests 2017-08-14 16:03:50 +01:00
Mike Jolley 7ddfe0703b Store coupon item taxes 2017-08-14 15:57:51 +01:00
Mike Jolley c74835ec31 Use WP_User_Query 2017-08-14 12:51:04 +01:00
Mike Jolley 40757ddf86 Search given email against all user fields for matches. 2017-08-14 12:28:19 +01:00
Mike Jolley 6f4fd61a4f Do not check if logged in 2017-08-14 12:28:03 +01:00
Mike Jolley 147a7f9419 Switch CLI tools command over to v2 API
Closes #16432
2017-08-14 10:45:44 +01:00
Mike Jolley c63e94d299 Add error handling for wp_insert_term
Fixes #16405
2017-08-14 10:40:00 +01:00
Mike Jolley a7f6d49f16 Merge pull request #16421 from bekarice/fix/shipping-availability-filters
Pass WC_Shipping_Method instance to availability filters
2017-08-13 11:19:42 +01:00
Nikolay Yordanov 96b4467179 Prevent infinite recursion in WC_Post_Data::variation_post_link()
If a variation's parent doesn't exist, WC_Product_Variation::get_parent_id()
will return 0, which causes WC_Post_Data::variation_post_link()
to enter into an infinite recursion trying to get the permalink
of the nonexistent parent
2017-08-12 11:26:32 +01:00
Claudio Sanches 4d87f94622 Merge pull request #16408 from woocommerce/fix/16398
CSV Import; correctly set stock props.
2017-08-11 21:49:20 -03:00
Jeroen Sormani 607cd878e0 Settings parent construct (#16412)
* Miscellaneous cleanup of typos + change some return types for IDE helpers

* Call/use parent::__construct() to add filters for settings output, saving
2017-08-11 21:36:35 -03:00
Claudio Sanches 2ffc09de0d Merge pull request #16411 from woocommerce/fix/16306
Don't subtract negative taxes in net sales report
2017-08-11 21:30:25 -03:00
claudiulodro b99ed2228c No array_replace in WP or PHP 5.2 2017-08-11 14:11:46 -07:00
Beka Rice c54b0ecd9d Pass WC_Shipping_Method instance to availability filters 2017-08-11 16:36:18 -04:00
claudiulodro 837e7e1ed2 Use array_replace in order item apply_changes 2017-08-11 13:24:43 -07:00
claudiulodro a0effafef9 Move discount row in frontend 2017-08-11 11:48:08 -07:00
Claudiu Lodromanean 15179b0e48 Merge pull request #16416 from woocommerce/manual-discounts-on-fees-shipping
Manual discounts on fees and shipping
2017-08-11 11:30:27 -07:00
claudiulodro 46e003d3c6 Remove shipping and discount lines 2017-08-11 11:10:44 -07:00
Mike Jolley b826d02f9b Split tax across items for discounts 2017-08-11 17:53:49 +01:00
Mike Jolley d61a97cb57 Missing abstract methods 2017-08-11 16:17:24 +01:00
Mike Jolley 1545e46fd5 cache clearing 2017-08-11 16:17:13 +01:00
Mike Jolley def5e0cdee get_tax_class_counts_for_items 2017-08-11 16:17:00 +01:00
Mike Jolley 9eece1cb1e Include shipping and fee in total 2017-08-11 16:16:50 +01:00
Mike Jolley e20d886972 calculate_item_discounts for clarity 2017-08-11 16:16:36 +01:00
Mike Jolley 2accbdbd45 Load order after updating items 2017-08-11 16:16:22 +01:00
Mike Jolley 3496e8dca4 Match order of cart discount 2017-08-11 16:16:09 +01:00
Mike Jolley 2c5a5b9409 Discounts should be last 2017-08-11 16:15:53 +01:00
Mike Jolley 56726deb5a Fix recalculate_coupons 2017-08-11 13:52:40 +01:00
Mike Jolley 7620473fa5 Support callback for index 2017-08-11 13:52:28 +01:00
Mike Jolley 5b4e5482dd Don't subtract negative taxes in net sales report
Fixes #16306
2017-08-11 12:38:09 +01:00
Mike Jolley 5587ff6874 Variation data store should remove product_type term on save
Closes #16409
2017-08-11 12:32:12 +01:00
Mike Jolley 0f54e57093 CSV Import; correctly set stock props.
Closes #16398
2017-08-11 11:07:12 +01:00
Mike Jolley e124841cbf Merge pull request #16401 from woocommerce/fix/16378
Use new CRUD actions to trigger Webhooks
2017-08-11 10:35:23 +01:00
Claudio Sanches 3f12fd1b01 Fixed missing hooks in legacy REST API 2017-08-10 18:57:31 -03:00
Claudio Sanches 40cb0e2e95 Trigger only customer.created webhook 2017-08-10 18:57:13 -03:00
Claudiu Lodromanean a5ffbe6e7f Merge pull request #16403 from woocommerce/fix/16195
[Importer] Allow "unfiltered_html" for name, description and short description fields
2017-08-10 13:55:46 -07:00
Claudiu Lodromanean 77bed2396c Merge pull request #16400 from woocommerce/fix/16394
Apply logical sort order to discounts
2017-08-10 13:43:32 -07:00
claudiulodro 3618ef1725 Handle couple todos 2017-08-10 13:37:05 -07:00
claudiulodro 9e70a74857 Styling 2017-08-10 13:29:32 -07:00
Claudio Sanches a01ffdd11d Better variable naming for importer parser methods 2017-08-10 17:23:31 -03:00
Claudio Sanches fe05e09015 Skip title, description and exceprt sanitization and let WP handle it
Should simulate the same behavior from WP admin, so just need to skip
extra sanitization, so WP can handle it while salving with
`wp_insert_post()` and `wp_update_post()` where will check for
`unfiltered_html` capability.

WP core already did something like it, but on REST API: https://core.trac.wordpress.org/ticket/38609

Fixes #16195
2017-08-10 17:17:56 -03:00
claudiulodro 28f0431c56 Coupon usage counts 2017-08-10 11:27:13 -07:00
claudiulodro f1e6fd53bd Prevent double coupons 2017-08-10 11:14:01 -07:00
claudiulodro fa35104486 Coupon amount validation 2017-08-10 11:00:57 -07:00
Claudio Sanches 069cf21c08 Use new CRUD actions to trigger Webhooks
Closes #16378
2017-08-10 13:56:17 -03:00
Mike Jolley 51dffc0853 Apply logical sort order to discounts
Closes #16394
2017-08-10 17:24:27 +01:00
Mike Jolley db87fc68b9 Fix refs 2017-08-10 16:33:21 +01:00
Mike Jolley 87858d1407 recalc on remove/add 2017-08-10 16:32:24 +01:00
Mike Jolley 30c80c6ad5 Fix tax recalc 2017-08-10 16:22:17 +01:00
Mike Jolley 22d6c789ab herpa derpa 2017-08-10 15:57:34 +01:00
Mike Jolley e90fb6d54f fix discount apply and save 2017-08-10 15:33:01 +01:00
Mike Jolley cd8fb23884 Add ability to get local item rather than from DB 2017-08-10 14:38:02 +01:00
Mike Jolley e2599d83c8 Apply methods 2017-08-10 14:22:27 +01:00
Mike Jolley 3dc9f06f6a Remove fixed discounts correctly 2017-08-10 12:06:03 +01:00
Mike Jolley 06381f28bd Edit items rather than recreate 2017-08-10 11:38:09 +01:00
Mike Jolley 2a4a078266 Merge branch 'feature/admin-apply-discount-15501' into feature/coupon-remove 2017-08-10 11:25:21 +01:00
Mike Jolley 1fd1699bcd Ensure isset 2017-08-10 11:25:08 +01:00
claudiulodro a416ebe09b It kind-of works. 2017-08-09 14:55:35 -07:00
Mike Jolley aa82a54f47 Prevent notices 2017-08-09 19:27:19 +01:00
Mike Jolley e429a27ba4 No need for 'off' 2017-08-09 19:12:33 +01:00
Mike Jolley 5874fb8715 Type and sum fix 2017-08-09 19:11:02 +01:00
Mike Jolley c556facd41 Fix percent coupon and display 2017-08-09 19:02:10 +01:00
Mike Jolley f71dc64d35 Manual discounts and negative taxes 2017-08-09 18:53:10 +01:00
claudiulodro 1328e17069 Fix logic 2017-08-09 10:10:46 -07:00
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 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 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
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 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
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 866f1cd818 Merge branch 'master' into pr/16191
# Conflicts:
#	includes/wc-account-functions.php
2017-08-08 13:20:17 +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 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 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 81806617d7 Fix total and rounding logic for tests 2017-08-08 09:24:26 +01:00
Claudio Sanches 1a9b499be8 Apply attribute helper functions to importers and REST API 2017-08-07 22:34:25 -03:00
Claudio Sanches 70e0ab857e Implement attributes functions to admin 2017-08-07 22:34:20 -03:00
Claudio Sanches a3a3d7c242 Initial implementation of product attribute helper functions 2017-08-07 22:33:57 -03:00
Claudio Sanches 2796615054 Flush rewrite rules after delete attributes 2017-08-07 22:30:14 -03:00
Claudio Sanches 6dfcf95b5e Properly update and delete attributes
- Now keep all the original hooks without deprecated anything,
- Update product metadata and terms metadata while changing slugs.
- Delete terms while deleting attributes
2017-08-07 22:29:37 -03:00
Claudio Sanches 29e73d27f4 Introduced woocommerce_attribute_created
And flush rewrite rules when created attribute.
2017-08-07 22:26:46 -03:00
Claudio Sanches dd36ae87d3 Improved wc_create_attribute() inline doc 2017-08-07 22:26:42 -03:00
claudiulodro c8a7ac8940 Unit tests 2017-08-07 14:31:58 -07:00
Claudio Sanches 53ea3c8b96 Merge branch 'master' into fix/16347 2017-08-07 16:36:36 -03:00
Claudiu Lodromanean 0286023878 Merge pull request #16367 from woocommerce/fix/16287
Fix variable stock status setting by using CRUD methods
2017-08-07 11:31:10 -07:00
Claudiu Lodromanean dd094088b0 Merge pull request #16336 from woocommerce/fix/16241
Only return tax classes if product is taxable.
2017-08-07 10:02:02 -07:00
Mike Jolley 7a829036c2 Fix tests 2017-08-07 17:49:46 +01:00
Mike Jolley f20081c33c Merge pull request #16334 from woocommerce/fix/16253
Add precision to price filter
2017-08-07 17:19:44 +01:00
Mike Jolley 299fcc327c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	includes/class-wc-cache-helper.php
2017-08-07 17:11:26 +01:00
Mike Jolley 622b4b35d6 Remove white space 2017-08-07 17:10:36 +01:00
Mike Jolley baa5da8e6e Merge branch 'master' into pr/16301 2017-08-07 17:10:18 +01:00
Claudiu Lodromanean f7ef7588b9 Merge pull request #16360 from woocommerce/fix/16337
nocache headers during form actions
2017-08-07 08:59:34 -07:00
Mike Jolley 8db31eefe2 Fix variable stock status setting by using CRUD methods
Closes #16287
2017-08-07 15:16:38 +01:00
Boro Sitnikovski 9022261f13 Fix cache issue.
From discussion with @mikejolley:

The class is not doing its job of invaliding cache after adding a line item.
At any point (action hook), a 3pd can call `get_items` and it will cache the items for that particular order so any subsequent calls to it will return bad data.
Unless you ADD items, `get_items` will return good data.
So adding items in this case is not invalidating, so that's the bug.

Relates to: https://github.com/woocommerce/woocommerce-bookings/issues/1310
2017-08-07 15:29:17 +02:00
Mike Jolley d46988b6a6 Improve add payment method logic 2017-08-07 12:39:16 +01:00
Mike Jolley 847e4859f8 Include add_payment_method in gateway abstract 2017-08-07 12:38:50 +01:00
Mike Jolley 862f67d98b wc_get_var helper method 2017-08-07 11:02:19 +01:00
Mike Jolley e2839d3c09 Add nocache_headers to early update actions 2017-08-07 11:02:02 +01:00
Mike Jolley af1dce3544 Set nocache constants on all nocache_headers 2017-08-07 11:01:38 +01:00
Boro Sitnikovski d1dc2a4390 Fix fatal error on deleting refunded order 2017-08-07 11:38:10 +02:00
Mike Jolley 2b0a672ba7 Merge pull request #16348 from jamesckemp/patch-6
Add sorting ID and menu orders to sorting action
2017-08-06 20:36:34 +01:00
Patrick Garman 1314158a14 Add “site size” areas to system status report
The size of the site very much impacts the status of the site. This type of information would be extremely helpful when supporting a site.

1) post counts - can reveal high volumes of specific kinds of post types both within WC (orders, products, etc) or outside (revisions, attachments, third party ones, etc)

2) table sizes - a site with a 5MB postmeta table is very different than a site with a 5GB postmeta table, which is different than a site with a 50GB postmeta table, and require different kinds of support and focus.
2017-08-06 01:15:10 -04:00
James Kemp 8ebe8a1720 Add sorting ID and menu orders to sorting action 2017-08-05 12:05:47 +01:00
claudiulodro 48f03b15ed Use correct server variable 2017-08-04 14:27:22 -07:00
claudiulodro c634ac6cf1 Prevent auto updates if dangerous. 2017-08-03 11:42:19 -07:00
Claudiu Lodromanean ab543148ff Merge pull request #16335 from woocommerce/fix/16309
Add shortcode to description output in structured data
2017-08-03 11:09:16 -07:00
sergey.r 62d078edf5 Add filters to make possible send emails in language different from default 2017-08-03 14:58:44 +03:00
Mike Jolley 958bd092ba Add date/time to hover.
Closes #16331
2017-08-03 08:48:17 +02:00
Mike Jolley 6af275da6e Only return tax classes if product is taxable.
Fixes #16241
2017-08-03 08:44:02 +02:00
Mike Jolley 827083c051 Add shortcode to description output in structured data
Closes #16309
2017-08-03 08:28:35 +02:00
Mike Jolley 52b10d8be4 Merge pull request #16313 from opportus/master
Fixes #16010
2017-08-03 08:24:12 +02:00
Mike Jolley d79ebf7a2f Typo in tag text, fixes #16332 2017-08-03 08:19:57 +02:00
Mike Jolley 39af6fbe94 Add precision to price filter
Closes #16253
2017-08-03 08:17:23 +02:00
Mike Jolley cbb8d48f5f Merge pull request #16291 from woocommerce/improvement/13645
Product search helpers.
2017-08-03 08:03:37 +02:00
claudiulodro 338f51df31 Remove duplicate class 2017-08-02 14:59:01 -07:00
claudiulodro 7f614d17d4 Modularize to corral different areas better 2017-08-02 14:57:17 -07:00
claudiulodro 80708255ee Fix inc tax price calculation 2017-08-02 11:07:33 -07:00
claudiulodro 7c0afc1fed Comments 2017-08-01 15:24:15 -07:00
claudiulodro 9b22463c69 Little cleanup 2017-08-01 15:17:35 -07:00
claudiulodro 343b3913a4 Updates screen modal. 2017-08-01 15:04:11 -07:00
claudiulodro 91f1d41842 Clarify logic 2017-08-01 13:21:23 -07:00
claudiulodro 5e8f957f3a Formatting 2017-08-01 12:52:12 -07:00
Claudiu Lodromanean 46090bca0d Merge pull request #16302 from bekarice/fix/deprecation-notice-product-type
Fix PHP deprecation notice
2017-08-01 10:55:48 -07:00
opportus f448c692ca Fixes #16010
Allows single SD item having a `@context`
2017-08-01 14:32:40 +02:00
Mike Jolley 4a0ea16eda Defer re-calc when adding grouped products to cart
Closes #16235
2017-08-01 13:36:46 +02:00
claudiulodro 036d709b19 Use item subtotal for discount item price 2017-07-31 14:44:51 -07:00
Beka Rice e78b4d4d1e Fix PHP deprecation notice 2017-07-31 17:16:08 -04:00
claudiulodro 8fac8fc80b Cleanup 2017-07-31 13:18:39 -07:00
claudiulodro 43cbcd04ef Remove extra calcs and populate item totals 2017-07-31 11:48:34 -07:00
Marian Kadanka 6183a840db Fix product category archives not being cached due to inconsistency
Wordpress function get_queried_object_id() returns conflicting IDs
for pages and product category archives which in current
implementation results in product category archives possibly not
being cached if their tag ID conflicts with Woocommerce's special
page IDs - cart, checkout, etc.

Let's switch to implementation using is_page() to address this.
2017-07-31 20:47:19 +02:00
Claudiu Lodromanean 95ffa441e0 Merge pull request #16290 from woocommerce/feature/15500-1
Soft deprecated WC_Cart->coupon_applied_count
2017-07-31 09:16:33 -07:00
claudiulodro e1fad0d7eb Bring up to date with master 2017-07-28 14:27:19 -07:00
Claudio Sanches 77855f9d07 Soft deprecated WC_Cart->coupon_applied_count 2017-07-28 18:12:56 -03:00
Claudio Sanches b8305f150e Use WC_Cart_Totals to calculate totals 2017-07-28 17:41:46 -03:00
Claudio Sanches de52221004 Fixe fatal error while trying to sum an empty array 2017-07-28 17:38:43 -03:00
claudiulodro d9c2b2cdea Cleanup 2017-07-28 13:38:12 -07:00
claudiulodro 8dc0641149 Remove uneeded parse args 2017-07-28 13:31:53 -07:00
claudiulodro b5e5f035fb Clean up 2017-07-28 13:27:19 -07:00
Will G 3a6a8872f3 Fix script 'async' property typo in WP_Admin_Help 2017-07-28 16:05:06 -04:00
claudiulodro e335724c50 Finalize product query 2017-07-28 11:59:44 -07:00
Mike Jolley 0839f5716b phpcs 2017-07-28 17:49:39 +01:00
Mike Jolley c16df62b54 Fix tests and bootstrap 2017-07-28 17:43:08 +01:00
Mike Jolley 64e04c614a fix variable in calculate_discounts 2017-07-28 16:43:51 +01:00
Mike Jolley 14717d4ebb fix call to apply_coupon_fixed_cart_remainder 2017-07-28 16:33:02 +01:00
Mike Jolley c7cb46a524 Fix array shift usage 2017-07-28 16:31:11 +01:00
Mike Jolley 9170b61a1c fix in cents logic direction. 2017-07-28 16:17:57 +01:00
Mike Jolley e23e55bb27 Methods for getting specific totals and discounts whilst keeping storage in a single array 2017-07-28 15:35:41 +01:00
Mike Jolley 51fbb1aec3 set_items_from_cart 2017-07-28 13:02:39 +01:00
Mike Jolley 9b458f9368 Remove private validation methods from coupon and use discounts class 2017-07-28 12:20:49 +01:00
Mike Jolley 5ed2f147a7 woocommerce_coupon_is_valid 2017-07-28 11:51:57 +01:00
claudiulodro b56b87c97b Good progress on wc_discount and manual discount handling 2017-07-27 14:08:38 -07:00
claudiulodro 3a11e345a6 Fix some things and hook up discount class 2017-07-27 11:08:22 -07:00
claudiulodro 409320482a Get everything working again 2017-07-27 10:37:20 -07:00
claudiulodro 0aa9894bae Merge remote-tracking branch 'origin/feature/discounts-class' into HEAD 2017-07-27 09:32:08 -07:00
Claudiu Lodromanean 74d33bd510 Merge pull request #16275 from woocommerce/feature/discounts-class-totals-refactored
Cart totals class and calculation improvements
2017-07-27 09:01:55 -07:00
Mike Jolley fcfa510445 Fixed totals tests 2017-07-27 16:57:05 +01:00
Mike Jolley decda1edf6 Merge pull request #16168 from webspecnick/add-filter-to-export-product-args
Add a filter to arguments passed to wc_get_products during prepare_data_to_export()
2017-07-27 15:58:39 +01:00
Mike Jolley f47bb39a06 Merge pull request #15479 from woocommerce/add/poc-no-managing-meta-directly
Proof of concept to error when internal meta props are accessed directly
2017-07-27 15:54:24 +01:00
Claudio Sanches fc5f199906 Deprecated WC_Coupon validation methods 2017-07-27 11:46:17 -03:00
Mike Jolley 795d8fa2fd Tests 2017-07-27 15:46:02 +01:00
Mike Jolley ded2be8d28 Legacy filters 2017-07-27 15:31:10 +01:00
Mike Jolley 6054519605 Discount taxes 2017-07-27 13:48:58 +01:00
Mike Jolley 98db84dfdd Passing tests 2017-07-27 11:01:48 +01:00
Mike Jolley c6b8ad598f Precision functions 2017-07-27 10:51:08 +01:00
Mike Jolley 306db69eaf Remove order subclass 2017-07-27 10:49:47 +01:00
Mike Jolley ad2e408a66 Merge pull request #16267 from Valks/patch-1
Fix incorrect access level in class-wc-product-variation.php
2017-07-27 08:31:13 +01:00
claudiulodro cfb04f0ead Boolval wasnt added til php 5.5 2017-07-26 13:48:36 -07:00
claudiulodro d15a2f5f6a Make tax calculation optional 2017-07-26 13:46:50 -07:00
claudiulodro ea0bd7980a Get order totals working 2017-07-26 12:06:05 -07:00
claudiulodro 77838d05bb Fix unknown item variable 2017-07-26 10:25:08 -07:00
Mike Jolley b9b4336c1b Removed some duplicate keys 2017-07-26 16:50:34 +01:00