Commit Graph

50920 Commits

Author SHA1 Message Date
Maikel David Pérez Gómez dd94bb78ee
Add product variation image (#36133)
* Convert getCheckboxTracks into generic function because of a type mismatch

* Add image to product variation and export types

* Add single image field

* Integrate SingleImageField in variation details section

* Add changelog file

* Add comment suggestions

* Fix set image onFileUploadChange
2022-12-23 10:28:44 -08:00
Luigi Teschio ed6b0c841b
Update WooCommerce Blocks to 9.1.3 (#36125)
* Update WooCommerce Blocks to 9.1.2

* Update WooCommerce Blocks to 9.1.3

* add results of composer update

* use assertNotSame

* Pin sebastian/comparator to 3.0.3

* Revert "add results of composer update"

This reverts commit 1be3a0fcec.

Co-authored-by: Paul Sealock <psealock@gmail.com>
2022-12-24 07:22:29 +13:00
Gan Eng Chin c89b28157d
Merge branch 'feature/34903-multichannel-marketing-frontend/34905-campaigns-card' into feature/34903-multichannel-marketing-frontend/34909-create-campaign-modal
Conflicts:
	plugins/woocommerce-admin/client/marketing/hooks/index.ts
	plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.tsx
	plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/Channels.tsx
	plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/RecommendedChannels.tsx
	plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/useChannels.ts
2022-12-24 02:07:15 +08:00
Gan Eng Chin 1d7b663186
Remove the unneeded "Create new campaign" button for now. 2022-12-24 01:45:59 +08:00
Gan Eng Chin 8e39098256
Show Campaigns card only when there is at least one registered channel. 2022-12-24 01:43:09 +08:00
Gan Eng Chin ee6fa9508e
Merge branch 'feature/34903-multichannel-marketing-frontend/34906-channels-card' into feature/34903-multichannel-marketing-frontend/34905-campaigns-card
Conflicts:
	plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2022-12-24 01:39:57 +08:00
Gan Eng Chin 52dd8845cc
Load registered and recommended channels in MarketingOverviewMultichannel.
The data will be used to conditionally display Campaigns card later.
2022-12-24 01:14:02 +08:00
Gan Eng Chin e950417542
Move useRegisteredChannels and useRecommendedChannels into shared hooks directory. 2022-12-24 00:48:03 +08:00
Gan Eng Chin 7bd32ba638
Remove useChannels and use useRegisteredChannels and useRecommendedChannels directly. 2022-12-24 00:32:23 +08:00
Gan Eng Chin 9e0b71ff1c
Rename CollapsibleRecommendedChannels to RecommendedChannels. 2022-12-23 22:12:16 +08:00
Gan Eng Chin af2f4eb904
CSS for "Add channels" button. 2022-12-23 22:08:50 +08:00
Gan Eng Chin 31b635b888
Code refactor: move CSS code to corresponding SCSS file. 2022-12-23 21:53:42 +08:00
Gan Eng Chin 06a303fc33
Types for useRegisteredChannels. 2022-12-23 21:21:52 +08:00
Gan Eng Chin 4fa4f802e9
Check for empty recommended channels. 2022-12-23 21:19:00 +08:00
Moon 52640de58a
Update country select control regex (#36159)
* Update regex to match country name or " - region "

* Add changelog

* Fix style
2022-12-22 21:30:50 -08:00
Maikel David Pérez Gómez bfa2d4f3a7
Product variation order should be persisted on save (#36109)
* Persist product variation order on product save

* Add batchUpdate to product variations datastore

* Add useVariationOrders hook to manage the ordering logic

* Add local ordering logic to variations field

* Persist variation orders on product save

* Add changelog file

* Add comments suggestions

* Add more comment seggestions
2022-12-22 16:01:51 -03:00
Gan Eng Chin d0de1b5c21
Add border and change padding for recommended channels in create campaign modal. 2022-12-23 02:00:45 +08:00
Joshua T Flowers 4b4fe7c227
Add product variation title to page header (#36085)
* Add method to get product variation title from data

* Conditionally add variation to page header

* Fix CRUD data store id query on selector

* Make getProductVariation calls and data types consistent to prevent multiple calls

* Add changelog entries

* Update product link type to avoid page refresh

* Expose function to truncate title to 32 character limit
2022-12-22 09:23:44 -08:00
github-actions[bot] 80ee44c45d
Update changelog.txt from release 7.2.2 (#36137)
* Prep trunk post release 7.2.2

* Update changelog.txt

Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
Co-authored-by: jonathansadowski <jonathansadowski@users.noreply.github.com>
2022-12-22 10:43:58 -06:00
louwie17 60f2ced82b
Fix no email report on product filter (#35971)
* Make sure order total count uses distinct for order ids

* Add unit test for order count bug

* Add changelog

* Fix lint errors

* Fix lint errors
2022-12-22 10:13:44 -04:00
Fernando Marichal a9986fe75e
Product variations - Set fixed height for card (#36053)
* Add className prop to Sortable

* Add styles

* Add `rows` class

* Add changelogs

* Remove `row-#` class

* Fix min-height

* Set task list item min height

Co-authored-by: Fernando Marichal <contacto@fernandomarichal.com>
Co-authored-by: Joshua T Flowers <joshuatf@gmail.com>
2022-12-22 09:03:07 -03:00
Vedanshu Jain 34ac47969c
Add cherry-pick support for git merge strategy. (#35927)
* Add changelog.

* Add merge strategy support to cherry-picker tool.
2022-12-22 09:26:14 +05:30
github-actions[bot] 9ee2948954
Delete changelog files based on PR 36119 (#36127)
Delete changelog files for 36119

Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
2022-12-21 12:41:22 -06:00
Maikel David Pérez Gómez 1ab7a851cb
Reset variation form if a new variation is given (#36078) 2022-12-21 15:00:35 -03:00
Gan Eng Chin 07894d42e3
Code refactor for Campaigns component, remove unneeded CampaignsCardHeader. 2022-12-22 01:52:24 +08:00
Maikel David Pérez Gómez c7c0322163
Persist active tab on refresh (#36112) 2022-12-21 14:47:13 -03:00
Gan Eng Chin a3c8680789
Use perPage variable instead of duplicated number. 2022-12-22 01:34:46 +08:00
Gan Eng Chin 321145eb2e
Better code clarity with woocommerce-marketing-campaigns-table class name. 2022-12-21 23:12:10 +08:00
Gan Eng Chin 894b77dc96
Code refactor with CreateNewCampaignModal. 2022-12-21 22:56:22 +08:00
Gan Eng Chin 5caffb6c63
Make create campaign button open in new tab depending on createUrl origin. 2022-12-21 21:26:57 +08:00
louwie17 1e815be516
Fix product table dropdown on mobile (#36046)
* Only add top when product row is expanded.

* Add changelog
2022-12-21 04:11:40 -04:00
louwie17 309ed6303f
Make sure attribute term dropdown adheres to sort order setting (#36047)
* Make sure attribute term dropdown adheres to sort order setting of attribute

* Fix spacing

* Fix lint errors
2022-12-21 04:11:12 -04:00
Barry Hughes 679fac1bfa
Re-run the 7.2.1 state migrations when merchants update to 7.2.2. (#36119)
The wc_update_721_* functions were not guaranteed to succeed, because of a hardcoded prefix. We also could not depend on the async migration tasks persisting through to the 7.2.2 update.
2022-12-21 13:00:46 +05:30
Sam Seay 4877e4b36e
Support installing live branches from the manifest (#36072) 2022-12-21 13:58:10 +13:00
github-actions[bot] 400ace67a3
Delete changelog files based on PR 36100 (#36106)
Delete changelog files for 36100

Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
2022-12-21 11:33:02 +13:00
Maikel David Pérez Gómez 60e3adabd9
Add product variation navigation component (#36076)
* Add simple navigation component

* Add useProductVariationNavigation hook to manage navigation logic

* Integrate navigation component and hook in product variation form

* Add changelog file

* Add comment feedbacks
2022-12-20 18:02:25 -03:00
Kathy f2a4eed807
Make quantity selector more specific Only select the primary quantity (#36087)
* Add changelog

* Use the input name when selecting the quantity field.

* Changelog tweak.

Co-authored-by: Barry Hughes <3594411+barryhughes@users.noreply.github.com>
2022-12-20 10:48:19 -08:00
Gan Eng Chin 6b3fbdf16b
Display new campaign types in create campaign modal. 2022-12-21 02:38:56 +08:00
Joshua T Flowers 92496e3578
Add product variation General section (#36081)
* Add product variation general section

* Add changelog entry
2022-12-20 09:03:51 -08:00
jonathansadowski bea954c2e5
Update code-freeze actions to Monday 22 days before release (#36023)
* Update code-freeze actions to Monday 22 days before release

* Fix incorrect params in workflow dispatch
2022-12-20 10:51:41 -06:00
Gan Eng Chin 24d59f7316
Hide the recommended channels section if it is empty. 2022-12-20 22:39:00 +08:00
Barry Hughes 6a1a7d7e15
Replace hardcoded table prefix. (#36100) 2022-12-20 06:08:34 -08:00
Sebastian Volland 843337d248
Fix docblock type annotations for `$meta_value` parameter. (#33853)
Fix docblock type annotations for `meta_value` parameter.
2022-12-20 03:02:17 -08:00
github-actions[bot] 91281446e8
Update changelog.txt from release 7.2.1 (#36090)
Prep trunk post release 7.2.1

Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
2022-12-20 23:21:53 +13:00
github-actions[bot] 4823a284dc
Prepare Packages for Release (#36084)
Automated change: Prep @woocommerce/create-woo-extension for release.

Co-authored-by: psealock <psealock@users.noreply.github.com>
2022-12-20 21:33:51 +13:00
Dekadinious 35f99dba7d
Update documentation for two methods in abstract-wc-order.php (#34385)
* Update abstract-wc-order.php

My attempt to make the documentation clearer for these two methods. It's almost impossible to remember all nuances here, so I constantly find myself testing this. Better to have it in the documentation.

* Changelog.

Co-authored-by: barryhughes <3594411+barryhughes@users.noreply.github.com>
2022-12-19 17:18:57 -08:00
Paul Sealock 378d5f525e
Create Extension: Fix install scripts (#36067)
* Update install scripts

* changelog
2022-12-20 13:53:59 +13:00
Joshua T Flowers 1d251f217c
Extend product variations data store with generate variations actions (#36058)
* Allow extending of CRUD data stores

* Add generate action to product variations data store

* Add controls to storeConfig

* Update readme with additional store config args

* Move key to catch

* Add changelog entry
2022-12-19 12:45:43 -08:00
Gan Eng Chin 17f2072d9f
Display recommended channels in create campaign modal. 2022-12-20 02:37:02 +08:00
Gan Eng Chin 5f50e63a1e
Move useRecommendedChannels to shared hooks directory. 2022-12-20 02:35:37 +08:00