Commit Graph

21535 Commits

Author SHA1 Message Date
And Finally fa76121b41 Merge branch 'trunk' into update/marketplace-1 2021-08-19 10:29:37 +01:00
Maria Górska-Piszek f8164bd6db Add missing doc parameter. 2021-08-18 16:08:35 +02:00
Maria Górska-Piszek e17691d871 Restore and deprecate the helper nav file. 2021-08-18 15:57:22 +02:00
And Finally c9fc4e721b Fixing linter errors.
- Added Doc comment for parameter "$submenu_file".
- Removed space between `empty` and opening parenthesis.
2021-08-17 18:19:00 +01:00
And Finally af9e2b1777 Addressing feedback.
- Using `$search` variable instead of `$_GET['search']` to minimise `phpcs:ignore` comments.
- Using correct escaping functions.
2021-08-17 18:12:05 +01:00
jonathansadowski ccda6730c8
Merge pull request #30517 from woocommerce/revert/30418
Revert "Fix: the same set of related products is always displayed"
2021-08-17 10:11:12 -05:00
Roy Ho a33f053598
Merge pull request #30514 from woocommerce/remove/wctracker-admin_user_agent
Remove tracking of admin User-Agent
2021-08-17 15:27:14 +01:00
roykho 64b99d56f4
Revert "Fix: the same set of related products is always displayed"
This reverts commit 8095482f69.
2021-08-17 06:43:13 -07:00
And Finally 2888176944 Addressing feedback.
- Deleted `stylelint-disable` comments.
- Changed hook for `update_menu_highlight` from `parent_file` to `submenu_file`, so we don't need to access `$submenu_file` global.
2021-08-17 12:54:23 +01:00
roykho 35685a4cf5 Ensure countries that have no states hides states field closes #28944 2021-08-17 14:50:48 +05:30
Claudio Sanches 4e6f24b024
Merge pull request #30483 from woocommerce/add/location_in_country
Add base location's state and postcode for tracking
2021-08-16 17:38:54 -03:00
mmmaia 804092507d Remove Tracking of Admin User-Agent 2021-08-16 16:01:15 -03:00
And Finally 57f949bcf7 Added mobile style section menu to marketplace. 2021-08-13 13:54:37 +01:00
And Finally 5a1ef16774 Merge branch 'update/marketplace-1' into update/marketplace-mobile-fixes
# Conflicts:
#	assets/css/admin.scss
2021-08-13 12:59:23 +01:00
And Finally 0f7daf46da Addressing PHPCS issues. 2021-08-13 11:43:32 +01:00
Maria Górska-Piszek 24548f2e3d Fix linter errors. 2021-08-13 12:13:50 +02:00
Maria Górska-Piszek 1691cb6b08 Initial dropdown menu styling. 2021-08-13 11:29:12 +02:00
And Finally 98893585d8 Small style tweaks.
- Added top margin to `.addons-button` to ensure there's a gap above it when promos are squished to a narrower width.
- Changed wording and style of `Search results for` label at the top of extensions search results, to conform to new design.
2021-08-13 09:34:21 +01:00
And Finally b38bd0eeb9
Merge pull request #30488 from woocommerce/update/marketplace-page-load-track
Update/marketplace page load track
2021-08-13 08:59:26 +01:00
barryhughes bea7fb3121 Cast quantities to floats, not ints, as the test suite documents cases for fractional quantities. 2021-08-12 16:56:17 -07:00
barryhughes d6fda6768a Improve type safety (avoid trying to multiply a string by an int). 2021-08-12 16:27:05 -07:00
And Finally 1eb27f40b6
Merge branch 'update/marketplace-1' into update/restyle-tab-bar 2021-08-12 16:51:15 +01:00
And Finally 40833661eb Updated `track_extensions_page` to record new Tracks event `wcadmin_subscriptions_view` if the user views the My Subscriptions page. 2021-08-12 14:50:55 +01:00
And Finally aa211dfc05 Fixing PHPCS issue - added parameter comment. 2021-08-12 09:17:21 +01:00
And Finally 8c5912e0be Fixing PHPCS issue - added return parameter comment. 2021-08-12 09:00:14 +01:00
Menaka S 2b79832553 Add base location's state and postcode for tracking 2021-08-12 07:06:27 +05:30
And Finally 7f805eeeed Fixing PHPCS issue - return parameter comment. 2021-08-11 18:25:19 +01:00
And Finally 1a4f061710 Removed `wrap` class from `.wc-addons-wrap` div on Marketplace page, as we now have a way of forcing the notices to appear at a particular place. Removing styles associated with the previous classes. 2021-08-11 18:15:26 +01:00
And Finally af7c5a4e1d Simplifying styling of notices on Marketplace and My Subscriptions pages.
- Added `.wp-header-end` div on Marketplace page, so WordPress will insert `admin_notices` there.
- Added top margin on notice on My Subscriptions page to keep it clear of Help tab.
2021-08-11 17:42:11 +01:00
Maria Górska-Piszek 13ccf2eb87 Rebase with feature branch. 2021-08-11 16:13:49 +02:00
And Finally 584b0a0a61 Layout tweaks. Changed new page classes to kebab case to avoid future stylelint selector warnings. Styling notices when they appear above the purple header. 2021-08-11 11:58:36 +01:00
Maria Górska-Piszek 662af41359
Merge pull request #30410 from woocommerce/update/styling-product-cards
Add product card styling.
2021-08-11 12:30:34 +02:00
And Finally 8553519657 Layout tweaks. Addressing positioning and styling of systems notices like the regenerating thumbnails notice, which should appear above the purple header. Changed `wc_addons_wrap` class to kebab case to address stylelint issue with class selector. 2021-08-11 10:15:06 +01:00
And Finally 4b60d518e2 Added filter to `WC_Admin` which adds special classes `woocommerce_page_wc-subscriptions` and `woocommerce_page_wc-marketplace` to the new split pages. 2021-08-11 10:13:08 +01:00
And Finally 608f4ef44e Merge branch 'trunk' into update/marketplace-1
# Conflicts:
#	tests/e2e/core-tests/specs/merchant/wp-admin-extensions-connect-wccom.test.js
2021-08-10 16:02:18 +01:00
jonathansadowski 7ef09ba1be
Merge pull request #30423 from woocommerce/fix/29630
Fix variations menu order not applying correctly when manually set cl…
2021-08-09 14:32:21 -05:00
Roy Ho 81febc4a57
Update includes/admin/meta-boxes/class-wc-meta-box-product-data.php
Co-authored-by: jonathansadowski <jonathansadowski@users.noreply.github.com>
2021-08-09 17:53:17 +01:00
Claudio Sanches 0284679b70
Merge pull request #30176 from woocommerce/fix/payment-token-default-status-false
Fix payment token default status can't be disabled
2021-08-09 13:05:40 -03:00
And Finally 0ceaf93b35 Addressing PHPCS errors.
- Deleted precision indentation on lines 72 and 80.
- Deleted unnecessary `echo` from before `esc_html_e` cals.
2021-08-09 17:02:58 +01:00
And Finally a44d9c9827 CSS and layout tweaks.
- Changed `wc_addons_wrap` to `wc-addons-wrap` to adhere to stylelint class rule.
- Removed `max-width` from `wc-addons-wrap` – we need the purple header to stretch to full width. Added new `wc-subscriptions-wrap` class to give the `max-width` to the My Subscriptions page.
- Changed width of product cards to use `calc`, so that any trailing odd-numbered card has the same width as the others.
- Fixed some stylelint issues. Moved style blocks to address `no-descending-specificity` warnings. Remove quotes from URLs and font names that don't need them.
- Gave `#screen-meta-links` absolute position on the marketplace page, so it overlays the full-width purple header.
2021-08-09 16:48:57 +01:00
Roy Ho be200f5047
Merge pull request #30443 from woocommerce/fix/26975
Fix: product attribute permalinks not working for non-ASCII characters
2021-08-09 15:32:44 +01:00
And Finally 1ec1f25d26 Merge branch 'update/marketplace-1' into update/styling-product-cards 2021-08-09 15:00:51 +01:00
Roy Ho cc106854b4
Merge pull request #30448 from alexmigf/master
New hook for product external options
2021-08-06 16:28:34 +01:00
Maria Górska-Piszek 1d9e481953 Update document title for My Subscriptions. 2021-08-06 14:22:42 +02:00
And Finally 55235909aa Correcting escaping in the subscriptions list in `html-main.php` – `esc_html` was escaping a `strong` tag in the renewal message. 2021-08-06 12:44:39 +01:00
Maria Górska-Piszek d02ede8389 Update Marketplace and My Subscriptions page titles. 2021-08-06 13:26:22 +02:00
Maria Górska-Piszek 379960e8c1 Merge branch 'update/split-extensions-pages' of github.com:woocommerce/woocommerce into update/split-extensions-pages 2021-08-06 13:24:14 +02:00
Néstor Soriano c11739e7ed
Merge pull request #30256 from YordanSoares/issue-30255-fix-payment-method-title-for-the-option-other
Fix the payment method title for the option "Other"
2021-08-06 12:41:55 +02:00
Nestor Soriano 6c28cd00a6
Fix: product attribute permalinks not working for non-ascii characters
Product attribute lists permalinks ("/attribute/term") were not working
for attribute names containing non-ascii characters. That's because
when the attribute taxonomy was registered the url rewrite rules were
created using the sanitized version of the attribute name, which
implies converting these characters into the urlencoded version.

The fix consists of applying "urldecode" to the sanitized attribute
name before using it to create the rewrite rule. The sanitization
needs to be kept for compatibility purposes, since it also replaces
latin characters with accents into the non-accent versions
(this conversion won't be affected by "urldecode")
2021-08-06 11:45:49 +02:00
Vedanshu Jain 08e202ac0f
Merge pull request #30325 from woocommerce/add/wc-customer-data-type-prop-30272
Specify the `$object_type` property for the `WC_Customer` class
2021-08-05 22:05:29 +05:30