Claudio Sanches
74cba6f863
Merge branch 'master' into grouped-products-settings-improvement
2017-07-04 16:41:33 -03:00
Claudio Sanches
00237a6de9
Merge pull request #15959 from woocommerce/update/15949
...
Extra error checking in terms page content
2017-07-04 12:25:44 -03:00
Job
f67bf6892e
Coupon help ( #15958 )
...
* Solves #15945
Change description of help tip to be accurate for current coupon system
* update caps use on PR
2017-07-04 12:07:26 +01:00
Caleb Burks
02ffdaf8f5
Remove unnecessary variable
...
Don’t this change any longer. Got rid of a foreach loop that was using it.
2017-07-04 01:44:10 -05:00
Caleb Burks
c7693b201d
Require T&Cs be a different page than checkout
2017-07-04 01:36:34 -05:00
Dale Phurrough
25ec8e4985
fixes woocommerce/woocommerce#15896
2017-06-30 21:20:23 +02:00
Claudiu Lodromanean
3fc26b7e24
Merge pull request #15890 from woocommerce/fix/15870
...
7day should start from midnight, not current time
2017-06-30 09:19:45 -07:00
Claudiu Lodromanean
2aaa0003d4
Merge pull request #15891 from woocommerce/fix/15874
...
Admin status update should be marked as a manual status transition
2017-06-30 09:13:16 -07:00
Mike Jolley
77c938202f
Merge branch 'add/15602-store-street-level-address'
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
2017-06-30 15:00:51 +01:00
Mike Jolley
d6131f3a74
Field styling
2017-06-30 14:59:45 +01:00
Mike Jolley
58593a154d
Admin status update should be marked as a manual status transition
...
Closes #15874
2017-06-30 11:40:52 +01:00
Mike Jolley
472b983498
7day should start from midnight, not current time
...
Fixes #15870
2017-06-30 11:34:07 +01:00
Mike Jolley
277ccf0ad7
Merge pull request #15677 from ughimire/no-std
...
Tweak - Added remove icon on my account page dropdown of account page
2017-06-29 22:55:10 +01:00
Caleb Burks
029c28a462
Fix copy/paste fail
2017-06-27 23:55:14 -05:00
Caleb Burks
290a90c8f8
Add post states for WC pages
2017-06-27 23:38:09 -05:00
Mike Jolley
1265633286
If stock changes between page load and editing, reject stock changes
...
Fixes #15818
2017-06-27 21:22:46 +01:00
Claudio Sanches
b9c76c568b
Prefer "live rates form"
2017-06-27 17:00:48 -03:00
Claudio Sanches
a0425ad1b9
Remove Canada Post duplicated description
...
Duplicated with description from
includes/admin/class-wc-admin-setup-wizard.php:506
2017-06-27 16:57:46 -03:00
Claudio Sanches
fbd92c8105
Merge pull request #15815 from woocommerce/fix/15794
...
Prevent duplicate sections in tax and api endpoints
2017-06-27 13:01:05 -03:00
Claudiu Lodromanean
5bbe82571f
Merge pull request #15814 from woocommerce/fix/15804
...
Fix notice and missing terms in importer
2017-06-27 08:45:52 -07:00
Mike Jolley
33a4e74697
Prevent duplicate sections in tax and api endpoints
2017-06-27 14:58:33 +01:00
Mike Jolley
591cac37d1
Increased batch size
2017-06-27 14:39:18 +01:00
Daniel Hüsken
d6377c9609
will improve #15806
2017-06-27 14:43:51 +02:00
Daniel Hüsken
84881c3e36
Importer fix file type detection on local path
2017-06-27 14:21:05 +02:00
Claudio Sanches
ab9c331a8d
Merge pull request #15785 from woocommerce/fix/15781
...
Importer tweaks and fixes
2017-06-26 16:07:19 -03:00
claudiulodro
ee9c762bdc
Enqueue selectWoo
2017-06-26 11:50:08 -07:00
Claudio Sanches
1fb11d0be7
Merge pull request #15783 from woocommerce/fix/15770
...
After duplicating variations, ensure the duplicated object is current
2017-06-26 13:41:17 -03:00
Mike Jolley
04a27389ef
Clean up failed imports
2017-06-26 14:11:27 +01:00
Mike Jolley
372d7f6077
After duplicating variations, ensure the duplicated object is current
...
Fixes #15770
2017-06-26 12:54:46 +01:00
Mike Jolley
4972e83e51
Merge pull request #15775 from dixitadusara/issue/15772
...
issue solved Pass more params to woocommerce_duplicate_product_exclude_children filter
2017-06-26 12:24:37 +01:00
dixitadusara
f77d2184ca
issue solved Pass more params to woocommerce_duplicate_product_exclude_children filter
2017-06-26 12:34:20 +05:30
Claudio Sanches
783f2318c4
Fixed undefined variable for importer default mapping
2017-06-23 15:33:37 -03:00
Mike Jolley
13d7be2422
Merge pull request #15755 from woocommerce/fix/15754
...
Fix method title escaping in zones
2017-06-23 16:17:54 +01:00
Mike Jolley
1d9148241c
Merge pull request #15751 from woocommerce/feature/helper
...
Helper copy update
2017-06-23 16:17:24 +01:00
Mike Jolley
43dc9ec823
Fix method title escaping in zones
...
Closes #15754
2017-06-23 12:50:32 +01:00
José Marques
22da32bd9c
Helper: removes unnecessary caps in copy
2017-06-23 12:49:05 +01:00
José Marques
f0f6495dc5
Helper: updates conpy and button class on connection screen
2017-06-23 09:29:20 +01:00
Claudio Sanches
25a2ee0ca8
Use default English mapping when English is not the current language
2017-06-22 18:07:12 -03:00
Claudio Sanches
1806590e71
Invert special importer mapping options to allow multiple keys
2017-06-22 18:06:10 -03:00
claudiulodro
7bb5dffc2f
Flip param count and priority
2017-06-22 09:10:52 -07:00
Mike Jolley
d1ad5a92d2
Merge pull request #15721 from woocommerce/feature/helper
...
Helper Bug Fixes
2017-06-22 16:17:56 +01:00
Konstantin Kovshenin
29c000207a
Helper: Escape sites_active and sites_max on subscription output.
2017-06-22 17:17:49 +03:00
Konstantin Kovshenin
45a6c45b8f
Helper: Better code readability for primary/secondary classes.
2017-06-22 16:59:39 +03:00
Konstantin Kovshenin
0786c31d15
Helper: Escape `master_user_email` on output.
2017-06-22 16:49:10 +03:00
Konstantin Kovshenin
0cd10a12ef
Helper: Move subscription sorting into methods for PHP 5.2 compat.
2017-06-22 16:47:07 +03:00
Gerhard Potgieter
b15e576f5b
Use !empty instead of isset for checking master_user_email
2017-06-22 11:10:33 +02:00
Konstantin Kovshenin
4cb1c8f7ce
Helper: Add missing period at the end of a sentence.
2017-06-22 11:28:28 +03:00
Konstantin Kovshenin
74da37890f
Helper: Fix undefined notices on button label and URL.
2017-06-22 11:26:26 +03:00
claudiulodro
fcd5460ec0
Check filetype in CSV upload
2017-06-21 11:50:03 -07:00
Konstantin Kovshenin
5b7070d2ea
Helper: Sort subscriptions by name.
2017-06-21 18:43:19 +03:00
Konstantin Kovshenin
e67babf77a
Helper: Fix download button class for expiring subscriptions.
2017-06-21 18:15:45 +03:00
Gerhard Potgieter
6d3e3fd5e5
Merge branch 'feature/helper' of github.com:woocommerce/woocommerce into feature/helper
2017-06-21 16:58:26 +02:00
Gerhard Potgieter
e08df8d2aa
Adjust messaging and display information for collaborator accounts on woocommerce.com subscription page.
2017-06-21 16:57:16 +02:00
Konstantin Kovshenin
346b446283
Helper: Fix label for maxed out subscriptions.
2017-06-21 17:50:34 +03:00
Konstantin Kovshenin
41ea3f3f43
Helper: Pass a migrate flag if migrating during token exchange
2017-06-21 16:23:57 +03:00
Konstantin Kovshenin
16f2541e9b
Helper: Set helper compat screen slug to woothemes-helper.
...
Previously the helper compat screen used a different slug, but
since updates can be done without refreshing the screen via AJAX
the old menu item doesn't disappear until a full refresh. This fix
allows users to navigate to that same menu item and not get an
error.
2017-06-21 15:28:30 +03:00
Caleb Burks
cfbd56c04a
Remove some settings for grouped products
...
Purchase notes and Cross-sells aren’t needing as you can never add a grouped product to your cart or purchase it.
2017-06-20 21:04:56 -05:00
Caleb Burks
f13c4c3b30
Hide Cross-sells for external products
2017-06-20 20:56:54 -05:00
Mike Jolley
91511bd92a
Merge pull request #15631 from woocommerce/update/13738
...
Create a way to 'resend order details'
2017-06-20 15:09:10 +01:00
Caleb Burks
ae6a5e34f2
Move “Grouped products” setting to the top
2017-06-19 21:59:42 -05:00
Allen Snook
0f311f0cba
Add address, address 2, city and postcode to setup wizard
2017-06-19 12:22:05 -07:00
Allen Snook
61a8d858b5
Update address labels in settings to better match customer address labelling
2017-06-19 11:28:42 -07:00
Mike Jolley
acf0026834
Update description for exclude_sale_items
2017-06-19 11:56:04 +01:00
Umesh Ghimire
3f2742fd6f
Tweak - Add remove icon on Account page my account page dropdown
2017-06-19 12:59:12 +05:45
Claudiu Lodromanean
1b04963f27
Merge pull request #15659 from woocommerce/fix/15642
...
Fix webhook saving and ping only once
2017-06-16 11:01:08 -07:00
Claudiu Lodromanean
fac4114bae
Merge pull request #15654 from woocommerce/fix/15640
...
Add missing nonce to product sales report
2017-06-16 10:43:10 -07:00
Mike Jolley
42ebde73cd
Fix is_webhook_settings_page
2017-06-16 13:58:28 +01:00
Mike Jolley
b4ea8bb94f
clean up comparison operators
2017-06-16 13:53:57 +01:00
Mike Jolley
f8ca27f32e
Add missing nonce to product sales report
...
Fixes #15640
2017-06-16 11:51:00 +01:00
Allen Snook
21d2bee658
Add store street, city and postcode fields to settings > general
2017-06-15 09:56:52 -07:00
Mike Jolley
3c6635a0f6
Remove all emails except for the invoice email
2017-06-15 15:14:10 +01:00
Mike Jolley
b3fcbc56ba
Tweak sent message
2017-06-15 15:13:59 +01:00
Job
8b48accc01
Upsell/up-sell
...
We had a few different usages of up-sells and upsells in the copy -
“Upsells” were used more and also seems to be more correct English so
I’ve updated the “up-sells”
2017-06-15 15:56:01 +02:00
Mike Jolley
75041b6dca
Remove email based actions from order screen
2017-06-15 14:19:05 +01:00
Mike Jolley
8bd7f89f73
Clear placeholder data after import
2017-06-14 16:38:07 +01:00
Mike Jolley
907b986d4f
Tweak wording
2017-06-14 16:37:53 +01:00
Konstantin Kovshenin
247e13e2ca
Helper: Various Improvements ( #15519 )
...
* Helper: Improve messaging and CTAs
* Helper: Update copy on connect flow
* Helper: Improve messaging around plugins without a subscription
* removes toggle from extensions that cannot be activated
* Helper: Add new `WC_Helper_Compat` class for legacy helper compat
This new class removes some of the actions from the legacy helper
(updater) plugin, attempts to migrate an existing legacy connection
to a new one, attempts to deactivate the old helper plugin.
* Helper: Improve messaging around maxed out subscriptions
* Helper: Enable `WC_Tracker` when connected to WooCommerce.com
* Helper: adds styles for manual licence form row and other visual improvements
* Helper: removes disabled toggles
* Helper: adds styles for connection component
* Helper: redesigned connection module
* Helper: rotates the connection module chevron on mouse hover
* Helper: adds some fixes to the key form on mobile and other updates to meet coding standards
* Helper: Only mark action as primary if there's a CTA button.
* Helper: Better handling for woothemes_updater_notice
Remove the updater notice built into extensions and themes, even
if the legacy Helper plugin is deactivated.
* Helper: Navigate existing Helper users to the new place.
Adds a Dashboard menu item and direct users of the old helper
plugin to the new Extensions screen.
* Helper: Do not show the back-compat menu item for new users
* Helper: Avoid notice in API authentication if credentials are missing
* Helper: Hide the back-compat menu item when users see the new screen
Also sets the user_id for the connection if one was not previously set.
2017-06-14 14:12:53 +01:00
Mike Jolley
4a4e201888
Copy tweaks for catalog visibility
...
Ref #15604
2017-06-14 12:07:20 +01:00
Valerie K
66259ebff1
Update WooCommerce Services copy ( #15598 )
...
* Remove excess explanation from wizard shipping step
* Remove distracting link from shipping wizard page
* Update copy on extensions WCS banner
* Update copy on WCS extensions banner for Canada
* Fix extensions WCS banner when read from json
* Add Canada copy on wizard shipping step
* Use strict array comparison in WCS shipping tout
* Add service logos to WCS extension banner
* Use strict array comparison in WCS banner
* Remove related extensions when showing WCS banner
- when store is based in Canada remove Canada Post
extension from shipping page
- when store is based in US remove USPS
extension from shipping page
* Add image alt for logos on WCS banners
* Update WCS banner and wizard content
2017-06-14 11:24:45 +01:00
Mike Jolley
393f1be092
Merge pull request #15580 from woocommerce/refactore/improve-importer-mapping-options
...
Better importer mapping options
2017-06-13 12:15:33 +01:00
Mike Jolley
1a6e477c83
Merge pull request #15579 from woocommerce/fix/importer-delimiter
...
Start handle importer delimiter
2017-06-13 11:57:10 +01:00
Umesh Ghimire
b5cd0a8680
Space after parentheses
2017-06-13 09:52:27 +05:45
Claudio Sanches
e6b5ac83c4
Better importer mapping options
...
- Rearranged fields to make easy to find
- Grouped price fields
- Include context to "Stock" since could means different things depending on the language
2017-06-12 18:08:23 -03:00
Claudio Sanches
2702647f88
Start handle importer delimiter
...
This make able handle the delimiter input passing to mapping screen and to the AJAX importation process.
2017-06-12 17:47:20 -03:00
Umesh Ghimire
71c22cadf1
Fixed - Directory separator issue on windows for product import file fixed.
2017-06-10 08:50:41 +05:45
Mike Jolley
3367047c8e
Update total orders and items
2017-06-09 15:07:31 +01:00
Mike Jolley
4a56c8b92a
Fix indent
2017-06-09 09:36:44 +01:00
nishitlangaliya
9ba5f534ea
Fixed Don't show 'Restock refunded items' ref #14888
2017-06-09 09:06:57 +05:30
Claudio Sanches
8b3d1046e0
Merge pull request #15515 from woocommerce/update/15399
...
Tweak review settings and add global enable option
2017-06-08 15:53:00 -03:00
Mike Jolley
5ee38c54c2
Option to disable reviews globally
2017-06-08 15:26:30 +01:00
Mike Jolley
b4040b1335
Translate quick edit text
2017-06-08 14:24:28 +01:00
Mike Jolley
32aca8cc39
String clarification
2017-06-08 14:08:48 +01:00
Mike Jolley
0d4dc49bd3
Break up verified owner and rating options
2017-06-08 14:06:15 +01:00
Mike Jolley
4ea9ab46a7
Avoid slow substring query
2017-06-08 12:21:55 +01:00
Mike Jolley
75480ab99f
Show notes in order list
2017-06-08 12:17:46 +01:00
Mike Jolley
eddcb16e00
Update copy + css for zones
...
Closes #15031
2017-06-06 13:46:09 +01:00
Mike Jolley
d62aefba74
Merge branch 'master' into fix/15414
...
# Conflicts:
# includes/wc-core-functions.php
2017-06-06 12:55:50 +01:00
Mike Jolley
c77347da48
Merge pull request #15459 from woocommerce/fix/14659
...
Make phone number clickable
2017-06-06 11:52:05 +01:00
Claudio Sanches
6c42f3c16a
Properly sanitization for wc_make_phone_clickable() and fixed coding standards
...
Closes #14659
2017-06-05 16:15:04 -03:00
Claudio Sanches
f65005be41
Merge pull request #14719 from avinapatel/fix-14659
...
Made the buyer phone number clickable in the in the order backend.
2017-06-05 15:47:16 -03:00