Commit Graph

3052 Commits

Author SHA1 Message Date
Claudio Sanches 4bc139fef9 Fixed conflicts 2017-05-26 19:09:57 -03:00
Claudio Sanches 4d66bc9e45 Merge branch 'feature/product-csv-import-export' into refactor/fix-importer-and-improve-unit-tests 2017-05-26 19:07:46 -03:00
Claudio Sanches fe67ca0aff Fixed images mapping key 2017-05-26 18:58:35 -03:00
Claudio Sanches 780ce1a4e6 Fixed deprecated `set_stock` notice 2017-05-26 18:42:07 -03:00
Claudio Sanches d2c3bf362f Normalize column names 2017-05-26 18:01:15 -03:00
claudiulodro 9b925d28ec Grouped product child support 2017-05-26 13:30:17 -07:00
claudiulodro d362d47995 Get external products working 2017-05-26 11:26:55 -07:00
Peter 05516dbea5 New action for display order fee custom data
We need to display custom data in fee lines, similarly to woocommerce_after_order_itemmeta action in shipping line items.
2017-05-26 10:05:26 +02:00
Konstantin Kovshenin dda05889eb Helper: Avoid an undefined warning in the main template 2017-05-25 23:44:29 +03:00
claudiulodro df06d6f942 Merge remote-tracking branch 'origin/feature/product-csv-import-export' into HEAD 2017-05-25 12:41:26 -07:00
claudiulodro 6d098b9c21 Clean up and some tests 2017-05-25 08:41:11 -07:00
Mike Jolley 42c3c9e593 Remove extra full stop 2017-05-25 12:36:12 +01:00
Anwer AR c4fcddca73 Back to attributes link on attributes edit page (#15088)
* see #15059 The issue was about editing product attributes. Added back to attributes link.

* Updates admin_url to esc_url

* Added admin_url again wrapping inside esc_url

The function works without admin_url in my previous commit. but i have added admin_url again to make sure it points to correct location.

* Correctted typo of esc function and removed icon

correction of spell mistake and removal of &larr due to translation and RTL concerns. though WP and WC itself using &larr on some places.
2017-05-25 11:15:57 +01:00
Dixita Dusara fe4a4a7e83 Update issue Undefined index warning when saving variations with stock management disabled #15242 (#15271)
* Issue Undefined index warning when saving variations with stock management disabled #15242

* updated issue as per your suggestion for index warning when saving variations with stock management disabled #15242
2017-05-25 10:58:32 +01:00
Mike Jolley 28d355948f docblock 2017-05-24 19:11:16 +01:00
Konstantin Kovshenin 8b5c5c0bd6 Helper: Add better update URLs to theme subscriptions 2017-05-24 18:15:07 +03:00
Konstantin Kovshenin f912f39364 Helper: Add better update URLs to plugin subscriptions 2017-05-24 18:11:37 +03:00
Konstantin Kovshenin 353eac70ca Helper: Remove some legacy updater notices 2017-05-24 18:10:31 +03:00
roykho c837827992
Fix undefined global variable notice 2017-05-24 07:21:20 -07:00
Claudio Sanches 5f28c733cc Merge pull request #15234 from woocommerce/update/14630
Update serializejson to 2.8.1
2017-05-24 09:21:10 -03:00
Konstantin Kovshenin e8afe57593 Helper: Add contextual nags about available extension updates 2017-05-24 14:59:48 +03:00
Claudio Sanches da7d5786d3 Merge branch 'feature/product-csv-import-export' into feature/product-parser-match-exporter 2017-05-24 08:56:27 -03:00
Claudio Sanches b08c75fb83 Added handler for default attributes and improved how deal with product attributes 2017-05-24 08:14:10 -03:00
Konstantin Kovshenin a1b3d2834b Helper: Fix duplicate product output 2017-05-24 13:04:52 +03:00
Claudio Sanches cd4a9ccf6a Fixed mapping sample display of 0 and false 2017-05-24 03:57:36 -03:00
Claudio Sanches c08d3a356e Added support "Attribute %d Visible" 2017-05-24 03:42:38 -03:00
Claudio Sanches b10f3a3be9 Fixed coding standards 2017-05-24 03:26:17 -03:00
Claudio Sanches 43a26ea851 Properly map items when CSV match WooCommerce exporter format 2017-05-23 21:38:27 -03:00
Mike Jolley c5d7dfba6c Feedback 2017-05-23 19:46:46 +01:00
Mike Jolley c16acc6b51 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-05-23 19:00:24 +01:00
Mike Jolley d3666738d8 Merge branch 'pr/15069' 2017-05-23 18:56:58 +01:00
Mike Jolley 00e5189a05 Merge pull request #15070 from rasmusbe/phpdoc-missing-return-throws
Phpdoc: Add missing return and throws
2017-05-23 18:50:58 +01:00
Mike Jolley 15f47e00a2 Merge branch 'master' into feature/13088
# 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-05-23 16:35:17 +01:00
Mike Jolley db012b3a12 Merge pull request #15011 from woocommerce/fix/14999
Add abspath checks
2017-05-23 15:57:35 +01:00
Mike Jolley 2d479e0580 Update serializejson to 2.8.1
Closes #14630
2017-05-23 15:27:53 +01:00
Mike Jolley b1a5b23629 Done screen handling and form tweaks 2017-05-23 15:05:32 +01:00
Mike Jolley f09f7eb84e Merge pull request #15150 from woocommerce/fix/15118
Add handles so drag and drop does not break edit on mobile
2017-05-23 10:20:08 +01:00
Claudio Sanches ac304473c7 Allow external URL and button text for external products 2017-05-22 20:18:39 -03:00
claudiulodro cb297ad1b0 Add skip existing option 2017-05-19 10:58:31 -07:00
Mike Jolley 754e991220 Redirect if there is no mapping data 2017-05-19 15:06:36 +01:00
Mike Jolley cde32be82d Done step and styling 2017-05-19 13:25:03 +01:00
Mike Jolley 1617c62f47 Export text tweaks 2017-05-19 12:03:34 +01:00
Claudio Sanches 74b4ba8a94 Improved sanitization in product CSV importer and handle special columns 2017-05-18 21:18:47 -03:00
Claudiu Lodromanean a13668f201 Merge branch 'feature/product-csv-import-export' into feature/background-processing 2017-05-18 10:11:34 -07:00
claudiulodro 9d52ef9f61 Performance tweak 2017-05-18 10:05:31 -07:00
claudiulodro 83908bc735 Move file functions to abstract class 2017-05-18 09:59:40 -07:00
claudiulodro b2e8d31262 Clean up 2017-05-18 09:49:58 -07:00
Mike Jolley 89ece25a32 Fix stock/backorder notice when stock management is disabled
Fixes #15145
2017-05-18 15:28:38 +01:00
Mike Jolley c3c966b5fd Add handles so drag and drop does not break edit on mobile
Fixes #15118
2017-05-18 15:22:12 +01:00
Claudio Sanches 36fa838678 Allow extend auto mapping options 2017-05-17 21:10:26 -03:00
Claudio Sanches df63ea9b5a Handle special column names
Handle columns names like "Attribute 1 Name" and "Meta: _foo_bar".
2017-05-17 20:59:36 -03:00
claudiulodro 2ab0fdfe78 Styling 2017-05-17 14:55:20 -07:00
claudiulodro fa1446bc86 Clean up 2017-05-17 14:43:03 -07:00
claudiulodro 17083dafae Initial background importer implementation 2017-05-17 14:34:49 -07:00
Claudio Sanches d3ec48f378 Match regular fields between exporter and importer 2017-05-17 17:55:28 -03:00
Claudio Sanches ce6741e117 Fixed error display and incorrect use of WP_Error 2017-05-17 14:57:03 -03:00
Claudio Sanches 215a9fa0c1 Fixed warning about empty callback name 2017-05-17 14:43:48 -03:00
Mike Jolley 956b1a6181 Adds storefront/theme step to the setup wizard
Also includes a background install to get Storefront installed and
activated on demand.

To test, use a default theme and go to wp-admin/index.php?page=wc-setup
The theme step will be after payments!
2017-05-17 17:42:18 +01:00
claudiulodro adc8f4eacb Use correct method name 2017-05-17 09:15:49 -07:00
claudiulodro d6ef3ca855 Docblock tweak and remove unused query var 2017-05-17 08:51:45 -07:00
Mike Jolley a6537ff269 export styling 2017-05-17 14:22:41 +01:00
Mike Jolley d67fb8fb83 New style import controller
Closes #15107
2017-05-17 14:16:38 +01:00
Mike Jolley bf2979f68d Revert change - export directory contains logic only, not admin 2017-05-17 11:50:55 +01:00
Mike Jolley 8a48c7d388 Made exporter and importer screens, classes and directories consistent
Once merged, @claudiosanches @claudiulodro, we should work on
https://github.com/woocommerce/woocommerce/tree/feature/product-csv-impo
rt-export branch going forward and get this merged into it.
2017-05-17 11:24:27 +01:00
Mike Jolley 3d5f1c1fe6 Merge branch 'feature/product-csv-import-export' into feature/csv-importer 2017-05-17 10:36:39 +01:00
Kelly Dwan 3cb3a1b085 Style & escaping fixes, based on review feedback 2017-05-16 14:01:14 -04:00
Mike Jolley 5939939244 Wizard and blank state 2017-05-16 15:36:56 +01:00
Mike Jolley 7293025c92 Import page placeholder 2017-05-16 15:21:35 +01:00
Mike Jolley 2ba6613abe Hide export menu item 2017-05-16 15:21:29 +01:00
Mike Jolley 74e2f61f0c Import and export buttons 2017-05-16 15:06:22 +01:00
Mike Jolley 6949ee162e Reduce visual noise 2017-05-16 15:05:11 +01:00
Claudio Sanches 020e61927b Created abstract product class 2017-05-16 01:02:46 -03:00
Claudio Sanches cc05ed77d2 Properly display the importer results 2017-05-15 20:41:19 -03:00
Claudio Sanches 121f8f6315 Abstract the product importer 2017-05-15 19:49:53 -03:00
Kelly Dwan ce06a92e57 Profiles: Add get_user_meta helper, which can fall back on core user fields when applicable, such as first_name, last_name, and email for billing fields. 2017-05-15 17:10:31 -04:00
Kelly Dwan faea811a92 Customer profile: Add a “Copy from billing” button to shipping user meta fields 2017-05-15 17:09:02 -04:00
Claudiu Lodromanean 05132f724c Merge pull request #15067 from woocommerce/fix/15047
$post global is not required in meta box callback
2017-05-15 10:35:07 -07:00
Rasmus Bengtsson 185934fad9 Fix phpdoc to include params and correct types 2017-05-15 13:50:52 +02:00
Mike Jolley 31651e41cb Merge pull request #15063 from rasmusbe/unused-vars
Remove unused local variables
2017-05-15 12:45:54 +01:00
Rasmus Bengtsson 4f00d7e5e3 PHPDoc: Add missing return statement 2017-05-15 13:37:59 +02:00
Mike Jolley 7c63c21eaf $post global is not required in meta box callback
Fixes #15047
2017-05-15 12:29:11 +01:00
Rasmus Bengtsson 6a7fc8650f Remove unused local variables 2017-05-15 12:06:52 +02:00
Rasmus Bengtsson 51fd482206 Remove duplicate entries from defined arrays 2017-05-15 10:48:02 +02:00
Mike Jolley e777b4d557 Merge branch 'feature/product-csv-import-export' into feature/csv-exporter 2017-05-12 21:03:20 +01:00
Mike Jolley 523d9d27cd Styling 2017-05-12 20:40:54 +01:00
Mike Jolley ed32dd558d Nonces and further tidyup 2017-05-12 20:15:08 +01:00
Mike Jolley 5e9f908df7 Merge pull request #15051 from reescott/fixlogtable
Fix #14967 by adding log_id as the secondary sorting column to log list.
2017-05-12 19:47:18 +01:00
Scott Rees b7b75c83f7 Fix #14967 by adding log_id as the secondary sorting column to log list. 2017-05-12 10:22:31 -07:00
claudiulodro 824d8898a2 Fix unit tests 2017-05-12 08:44:02 -07:00
Mike Jolley a35df1394c Delay final step 2017-05-12 15:26:53 +01:00
Mike Jolley 0bf749aeac Move js into script file 2017-05-12 15:03:00 +01:00
Mike Jolley 8fe0f03a95 Type exporting 2017-05-12 14:48:30 +01:00
Claudio Sanches ed09b4e350 Updated to sanitize data in parse_data method 2017-05-11 11:49:45 -03:00
Claudio Sanches 9a25f09c7b Included $item to woocommerce_csv_product_import_mapping_options filter 2017-05-10 18:57:57 -03:00
Claudio Sanches 0ec70e6b92 Allow import as meta 2017-05-10 18:56:29 -03:00
Mike Jolley 4cacceeede Variation handling 2017-05-10 22:16:53 +01:00
Claudio Sanches 6f34cdd9cf Skip mapping screen if all fields match CSV default fields 2017-05-10 17:56:00 -03:00
Claudio Sanches 244fb00a27 Initial mapping screen 2017-05-10 17:15:28 -03:00
Mike Jolley 825dcda917 Selective export 2017-05-10 20:48:56 +01:00
Mike Jolley 523cf5d4ed Protect against missing order in admin assets
Closes #15000
2017-05-10 19:26:30 +01:00
Mike Jolley bc4d36fd3f Add abspath checks
Closes #14999
2017-05-10 19:03:19 +01:00
Mike Jolley fd3bf05017 Working prototype exporter for products 2017-05-10 17:22:08 +01:00
claudiulodro 2cf4fcf8d1 formatting 2017-05-08 13:28:55 -07:00
claudiulodro d4ca99342e Line up items and some tweaks 2017-05-08 12:01:55 -07:00
claudiulodro 88d013bdd5 phpcs recommendations 2017-05-08 11:34:50 -07:00
claudiulodro a1580624f1 Couple tweaks 2017-05-08 11:30:56 -07:00
claudiulodro 5a963f74c2 Clean p 2017-05-04 14:27:40 -07:00
claudiulodro b907aa74f6 Finish parser and unit test 2017-05-04 14:20:59 -07:00
claudiulodro d642212205 More parser progress 2017-05-03 14:53:31 -07:00
claudiulodro 1f10995d80 Parser progress 2017-05-03 14:30:50 -07:00
Claudio Sanches 6f126d7c60 Merge pull request #14853 from woocommerce/fix/14818
Improve "Save Order" button to reproduce WordPress post/page behavior
2017-05-03 17:36:22 -03:00
Claudio Sanches 63552c9757 Fixed conflict between global attributes and custom attributes.
Check if is a custom attribute before trying to get an ID from a global attribute.
2017-05-03 16:30:50 -03:00
Claudio Sanches 67258ec8da Improve "Save Order" button to reproduce WordPress post/page behavior
Display "Create" when order is in "auto-draft" status and then display only "Update" after.

Closes #14818
2017-05-03 15:06:06 -03:00
Konstantin Kovshenin dc2360711f Helper: Toggle subscription on plugin activation/deactivation
When a user activates or deactivates an extension, attempt to find
a valid subscription for that extensioni, and activate/deactivate it
to spare the user an extra step.
2017-05-03 14:37:36 +03:00
Konstantin Kovshenin 39218ea323 Helper: Remove everything related to woocommerce.dev 2017-05-03 13:45:43 +03:00
Konstantin Kovshenin 564327cac3 Helper: Use strict comparison when checking response code from update-check 2017-05-03 13:34:55 +03:00
Konstantin Kovshenin ca93452354 Helper: Fix some missing docblocks 2017-05-03 13:33:39 +03:00
claudiulodro f2af2d4e7c Data reader 2017-05-02 15:06:54 -07:00
claudiulodro 7531d0a022 Importer admin screen 2017-05-01 14:30:45 -07:00
Claudio Sanches e46cb8813d Fixed undefined customer_user when remove users from order in admin 2017-04-28 13:13:18 -03:00
Mike Jolley d744dce594 get_settings for shipping and checkout need to support sections for the API
Fixes #14769
2017-04-28 14:37:44 +01:00
Mike Jolley d14a679e70 Merge pull request #14697 from bekarice/tweak/confirm-log-deletion
Confirm before deleting log files
2017-04-28 12:57:48 +01:00
claudiulodro 027e7b1f94 Add restored webhook 2017-04-27 11:44:57 -07:00
Mike Jolley ca0c3e0bb8 Merge pull request #14064 from rafsuntaskin/develop
added bulk variation update for stock status, resolves #14046
2017-04-27 17:37:59 +01:00
Mike Jolley 891e55e1cf Merge pull request #14721 from woocommerce/fix/14670
Avoid escaped quote chars in strings
2017-04-27 15:34:27 +01:00
Mike Jolley aacb01d1e7 Merge branch 'pr/13503'
# Conflicts:
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
Mike Jolley 3403e39740 Add icons and fix links 2017-04-27 12:23:16 +01:00
Mike Jolley bbffbd6a9f Merge branch 'master' into maybe_blank_keys_webhooks 2017-04-27 12:11:27 +01:00
Mike Jolley a5018f5531 Merge pull request #13409 from diggy/patch-1
filter recent reviews dashboard widget query
2017-04-27 11:41:36 +01:00
Mike Jolley cf35375260 Merge branch 'pr/13712' 2017-04-27 11:39:44 +01:00
Mike Jolley 7e056adbae Revise menu titles to match wp admin 2017-04-27 11:39:34 +01:00
Mike Jolley 57229d4b20 Merge pull request #14589 from woocommerce/add/shipping-zone-setup-in-wizard
Automatic Shipping Zone Creation In Setup Wizard
2017-04-27 11:28:23 +01:00
Konstantin Kovshenin 48a44eb7e5 Helper: Add some missing docblocks 2017-04-26 18:50:38 +03:00
Konstantin Kovshenin c440994883 Helper: Don't use assignment in helper disconnect check 2017-04-26 18:39:26 +03:00
Konstantin Kovshenin ed734f350d Helper: Use date_i18n() instead of date() 2017-04-26 18:38:24 +03:00
Konstantin Kovshenin eacffb823a Helper: Add l10n functions to all strings 2017-04-26 18:36:20 +03:00
Konstantin Kovshenin 2e55b3076d Helper: Yoda condition in _http_request_host_is_external 2017-04-26 18:33:17 +03:00
Konstantin Kovshenin 5e892f9081 Helper: Strict equality check on slugs in `plugin_information` calls 2017-04-26 16:04:46 +03:00
Konstantin Kovshenin b4ba43f551 Helper: Use `wp_safe_remote_request` for external calls.
Also whitelists woocommerce.dev as an external URL if
WP_DEBUG is turned on.
2017-04-26 15:57:56 +03:00
Mike Jolley 801f5e1eb1 Avoid escaped quote chars in strings
Closes #14670
2017-04-26 13:51:53 +01:00
avinapatel 824f13924e Made the buyer phone number clickable in the in the order backend. 2017-04-26 17:48:56 +05:30
Mike Jolley 63e8221e2c Add required placeholder for meta fields
Closes #14700
2017-04-26 11:35:34 +01:00
Beka Rice f65b817fcf Code review tweaks 2017-04-25 21:45:42 -04:00
Beka Rice c552362b73 Confirm before deleting log files 2017-04-25 17:10:47 -04:00
Jeff Stieler 142bb9b24a Add “free shipping” method to the automatically created zone (via setup wizard). 2017-04-21 08:46:03 -06:00
Konstantin Kovshenin 9fe91c7a2e Helper: Fix some phpcs issues 2017-04-21 15:35:27 +03:00
Konstantin Kovshenin e8b9bc8f98 Helper: First pass at merging the Helper plugin into WooCommerce
* Connect a site to a WooCommerce.com account
* List available product subscriptions
* Activate/deactivate subscriptions and extensions
* Serve updates for active subscriptions
2017-04-21 15:05:44 +03:00
Jeff Stieler d844709db5 Only create a shipping zone from the wizard on the first run. 2017-04-20 23:26:37 -06:00
Jeff Stieler f2f803d007 Create a shipping zone containing the store’s country when enabling shipping calculation from the setup wizard. 2017-04-20 23:02:59 -06:00
Claudio Sanches accf956632 Merge pull request #14500 from woocommerce/fix/14494
Removed the non-functional order total input and combine the recalculation buttons into one working button.
2017-04-20 00:43:22 -03:00