Merge branch 'develop' into feat/discount-condition-filters-customer-…

…group
medusajs · Oct 11, 2022 · aeb6aaa · aeb6aaa
2 parents f992053 + 19ca18e
commit aeb6aaa
Show file tree

Hide file tree

Showing 189 changed files with 14,243 additions and 9,335 deletions.
diff --git a/.changeset/brown-timers-smash.md b/.changeset/brown-timers-smash.md
diff --git a/.changeset/green-snakes-return.md b/.changeset/green-snakes-return.md
diff --git a/.changeset/honest-donuts-call.md b/.changeset/honest-donuts-call.md
diff --git a/.changeset/lazy-apes-unite.md b/.changeset/lazy-apes-unite.md
diff --git a/.changeset/lucky-worms-turn.md b/.changeset/lucky-worms-turn.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(medusa): Allow to query product types by discount condition id
diff --git a/.changeset/nine-trainers-protect.md b/.changeset/nine-trainers-protect.md
diff --git a/.changeset/polite-flowers-fly.md b/.changeset/polite-flowers-fly.md
diff --git a/.changeset/shaggy-needles-raise.md b/.changeset/shaggy-needles-raise.md
diff --git a/docs/content/add-plugins/algolia.md b/docs/content/add-plugins/algolia.md
@@ -327,7 +327,7 @@ If you run your Gatsby storefront while the Medusa server is running, you should
 
 ![Search bar in the Gatsby storefront](https://i.imgur.com/INtlcIo.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn how to [deploy your Medusa server](../deployments/server/index.mdx).
 - Learn how to [deploy your Gatsby storefront](../deployments/storefront/deploying-gatsby-on-netlify.md).
diff --git a/docs/content/add-plugins/contentful/customize-contentful.md b/docs/content/add-plugins/contentful/customize-contentful.md
@@ -308,7 +308,7 @@ Restart the Gatsby storefront then open a product that you added Rich Text conte
 
 ![Rich Text content you added to the product should be visible at the end of the page](https://i.imgur.com/LGiVMxx.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn how to deploy your Medusa server to [Heroku](../../deployments/server/deploying-on-heroku.mdx), [Qovery](../../deployments/server/deploying-on-qovery.md), or [DigitalOcean](../../deployments/server/deploying-on-digital-ocean.md).
 - Learn [how to deploy your Gatsby storefront to Netlify](../../deployments/storefront/deploying-gatsby-on-netlify.md).
diff --git a/docs/content/add-plugins/contentful/index.md b/docs/content/add-plugins/contentful/index.md
@@ -274,7 +274,7 @@ If you make changes to the data while your Gatsby storefront is running, the cha
 
 :::
 
-## What’s Next :rocket:
+## What’s Next
 
 - Learn [how to customize your Contentful server and storefront](./customize-contentful.md).
 - Learn how to deploy your Medusa server to [Heroku](../../deployments/server/deploying-on-heroku.mdx), [Qovery](../../deployments/server/deploying-on-qovery.md), or [DigitalOcean](../../deployments/server/deploying-on-digital-ocean.md).

diff --git a/docs/content/add-plugins/mailchimp.md b/docs/content/add-plugins/mailchimp.md
@@ -177,7 +177,7 @@ This will result in a subscription form similar to the following:
 
 If you try entering an email and clicking Subscribe, the email will be subscribed to your Mailchimp newsletter successfully.
 
-## What’s Next 🚀
+## What’s Next
 
 - Check out [SendGrid plugin](../add-plugins/sendgrid.mdx) for more Email functionalities.
 - [Learn more about plugins.](../advanced/backend/plugins/overview.md)
diff --git a/docs/content/add-plugins/meilisearch.md b/docs/content/add-plugins/meilisearch.md
@@ -286,7 +286,7 @@ If you run your Gatsby storefront while the Medusa server and the MeiliSearch in
 
 ![Search box in the header of the storefront](https://i.imgur.com/ZkRgF2h.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn how to [deploy your Medusa server](../deployments/server/index.mdx).
 - Learn how to [deploy your Gatsby storefront](./../deployments/storefront/deploying-gatsby-on-netlify.md).
diff --git a/docs/content/add-plugins/minio.md b/docs/content/add-plugins/minio.md
@@ -199,6 +199,6 @@ module.exports = {
 
 Where `127.0.0.1` is the domain of your local MinIO server.
 
-## What’s Next 🚀
+## What’s Next
 
 - Check out [more plugins](https://github.com/medusajs/medusa/tree/master/packages) you can add to your store.
diff --git a/docs/content/add-plugins/paypal.md b/docs/content/add-plugins/paypal.md
@@ -394,6 +394,6 @@ Clicking this button lets you capture the payment for an order. You can also ref
 
 Refunding or Capturing payments is reflected in your PayPal dashboard as well.
 
-## What's Next 🚀
+## What's Next
 
 - Check out [more plugins](https://github.com/medusajs/medusa/tree/master/packages) you can add to your store.
diff --git a/docs/content/add-plugins/s3.md b/docs/content/add-plugins/s3.md
@@ -170,7 +170,7 @@ module.exports = withStoreConfig({
 
 Where `<BUCKET_NAME>` is the name of the S3 bucket you’re using.
 
-## What’s Next 🚀
+## What’s Next
 
 - Check out [more plugins](https://github.com/medusajs/medusa/tree/master/packages) you can add to your store.
 - Learn how to [deploy the Medusa server](../deployments/server/index.mdx).

diff --git a/docs/content/add-plugins/segment.md b/docs/content/add-plugins/segment.md
@@ -185,7 +185,7 @@ After adding the above subscriber, run your server again if it isn’t running a
 
 ![The customer created event is recoreded on the Segment source](https://i.imgur.com/4LD41xE.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn how [services](../advanced/backend/services/create-service.md) and [subscribers](../advanced/backend/subscribers/create-subscriber.md) work.
 - Check out a [full list of events](../advanced/backend/subscribers/events-list.md) in Medusa.

diff --git a/docs/content/add-plugins/sendgrid.mdx b/docs/content/add-plugins/sendgrid.mdx
@@ -3961,7 +3961,7 @@ You can also track analytics related to emails sent from the SendGrid dashboard.
 
 ![SendGrid Analytics](https://i.imgur.com/X01LigH.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn more about how [Notifications work in Medusa](../advanced/backend/notification/overview.md).
 - Install the [Medusa admin](https://github.com/medusajs/admin#-setting-up-admin) for functionalities like Gift Cards creation, swaps, claims, order return requests, and more.
diff --git a/docs/content/add-plugins/slack.md b/docs/content/add-plugins/slack.md
@@ -95,7 +95,7 @@ const plugins = [
 
 That’s all you need to do to integrate Slack into Medusa!
 
-## What's Next :rocket:
+## What's Next
 
 - Install [Medusa's Admin](https://github.com/medusajs/admin) for the full order-management experience.
 - Add a Storefront to your Medusa server using [the Next.js starter](https://docs.medusajs.com/starters/nextjs-medusa-starter) or [the Gatsby starter](https://docs.medusajs.com/starters/gatsby-medusa-starter).
diff --git a/docs/content/add-plugins/spaces.md b/docs/content/add-plugins/spaces.md
@@ -157,7 +157,7 @@ module.exports = withStoreConfig({
 
 Where `<YOUR_SPACE_DOMAIN>` is the domain name for your Space which can be retrieved from the Space URL. For example, `medusa-server.fra1.digitaloceanspaces.com`.
 
-## What’s Next 🚀
+## What’s Next
 
 - Check out [more plugins](https://github.com/medusajs/medusa/tree/master/packages) you can add to your store.
 - Learn how to [deploy the Medusa server on DigitalOcean](../deployments/server/deploying-on-digital-ocean.md).

diff --git a/docs/content/add-plugins/strapi.md b/docs/content/add-plugins/strapi.md
@@ -4,7 +4,7 @@ In this document, you’ll learn how to integrate Strapi with Medusa to add rich
 
 :::info
 
-This plugin is a [community plugin](https://github.com/Deathwish98/medusa-plugin-strapi) and is not managed by the official Medusa team.
+This plugin is a [community plugin](https://github.com/Deathwish98/medusa-plugin-strapi) and is not managed by the official Medusa team. At the moment, it supports v4 of Strapi.
 
 :::
 
@@ -172,7 +172,7 @@ Try updating any products on Strapi by going to Content Manager → Products and
 
 If you try to update products on Medusa either using the [REST APIs](https://docs.medusajs.com/api/admin/#tag/Product/operation/PostProductsProduct) or using [the Medusa Admin](../user-guide/products/manage.mdx), you’ll see that the product is also updated on Strapi.
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn [how to deploy the Medusa server](../deployments/server/index.mdx).
 - Learn [how to create your own plugin](../advanced/backend/plugins/create.md).
diff --git a/docs/content/add-plugins/stripe.md b/docs/content/add-plugins/stripe.md
@@ -356,6 +356,6 @@ Clicking this button allows you to capture the payment for an order. You can als
 
 Refunding or Capturing payments is reflected in your Stripe’s dashboard as well. This gives you access to all of Stripe’s analytical capabilities.
 
-## What’s Next 🚀
+## What’s Next
 
 - Check out [more plugins](https://github.com/medusajs/medusa/tree/master/packages) you can add to your store.
diff --git a/docs/content/add-plugins/twilio-sms.md b/docs/content/add-plugins/twilio-sms.md
@@ -122,7 +122,7 @@ If you’re on a Twilio trial make sure that the phone number you entered on che
 
 ![Twilio Dashboard](https://i.imgur.com/MXtQMiL.png)
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn more about how [Notifications work in Medusa](../advanced/backend/notification/overview.md).
 - Install the [Medusa admin](../admin/quickstart.md) for functionalities like Gift Cards creation, swaps, claims, order return requests, and more.
diff --git a/docs/content/admin/quickstart.md b/docs/content/admin/quickstart.md
@@ -113,7 +113,7 @@ Medusa admin provides a lot of ecommerce features including managing Return Merc
 
 You can learn more about Medusa admin and its features in the [User Guide](../user-guide/index.mdx).
 
-## What’s Next 🚀
+## What’s Next
 
 - Install the [Next.js](../starters/nextjs-medusa-starter.md) or [Gatsby](../starters/gatsby-medusa-starter.md) storefront starters.
 - [Learn how you can use `create-medusa-app` to install all of Medusa’s 3 components.](../usage/create-medusa-app.mdx)
diff --git a/docs/content/advanced/admin/import-products.mdx b/docs/content/advanced/admin/import-products.mdx
@@ -89,7 +89,7 @@ fetch(`<YOUR_SERVER>/admin/uploads`, {
 
 ```bash
 curl --location --request POST '<YOUR_SERVER>/admin/uploads' \
-  --header 'Authorization: Bearer {api_token}' \
+  --header 'Authorization: Bearer <API_TOKEN>' \
   --header 'Content-Type: text/csv' \
   --form 'files=@"<FILE_PATH_1>"'
 ```
@@ -149,7 +149,7 @@ fetch(`<YOUR_SERVER>/admin/batch-jobs`, {
 
 ```bash
 curl --location --request POST '<YOUR_SERVER>/admin/batch-jobs' \
---header 'Authorization: Bearer {api_token}' \
+--header 'Authorization: Bearer <API_TOKEN>' \
 --header 'Content-Type: application/json' \
 --data-raw '{
     "type": "product-import",
@@ -210,7 +210,7 @@ fetch(`<YOUR_SERVER>/admin/batch-jobs/${batchJobId}`)
 
 ```bash
 curl --location --request GET '<YOUR_SERVER>/admin/batch-jobs/<BATCH_JOB_ID>' \
---header 'Authorization: Bearer {api_token}'
+--header 'Authorization: Bearer <API_TOKEN>'
 # <BATCH_JOB_ID> is the ID of the batch job
 ```
 
@@ -271,7 +271,7 @@ fetch(`<YOUR_SERVER>/admin/batch-jobs/${batchJobId}/confirm`, {
 
 ```bash
 curl --location --request POST '<YOUR_SERVER>/admin/batch-jobs/<BATCH_JOB_ID>/confirm' \
---header 'Authorization: Bearer {api_token}'
+--header 'Authorization: Bearer <API_TOKEN>'
 # <BATCH_JOB_ID> is the ID of the batch job
 ```
 
@@ -288,7 +288,7 @@ After confirming the batch job, you can check the status while it is processing
 - If the status is `failed`, it means an error has occurred during the import. You can check the error in `result.errors`.
 - If the status is `completed`, it means the import has finished successfully.
 
-## What’s Next 🚀
+## What’s Next
 
 - Learn more about [Batch Jobs and how they work](../backend/batch-jobs/index.md).
 - Check out the [Batch Jobs API Reference](https://docs.medusajs.com/api/admin/#tag/Batch-Job).