Merge branch 'master' into develop
This commit is contained in:
olivermrbl committed
commit
27184f3878
175 files changed
+2939
-1989
No files matched your search
@@ -1,5 +1,11 @@
|
||||
# Change Log
|
||||
|
||||
## 1.6.3
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#2583](https://github.com/medusajs/medusa/pull/2583) [`699bb1d57`](https://github.com/medusajs/medusa/commit/699bb1d57bfe532a6bcff1aea7a75bc793c135cd) Thanks [@adrien2p](https://github.com/adrien2p)! - Retrieve deleted regions on orders
|
||||
|
||||
## 1.6.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
+14
-48
@@ -14,7 +14,7 @@
|
||||
</h4>
|
||||
|
||||
<p align="center">
|
||||
An open-source composable commerce engine built for developers.
|
||||
An open source composable commerce engine built for developers.
|
||||
</p>
|
||||
<p align="center">
|
||||
<a href="https://github.com/medusajs/medusa/blob/master/LICENSE">
|
||||
@@ -37,34 +37,11 @@ An open-source composable commerce engine built for developers.
|
||||
|
||||
## Getting Started
|
||||
|
||||
You can install Medusa by either following our [Quickstart guide](https://docs.medusajs.com/quickstart/quick-start) or the following steps:
|
||||
|
||||
1. **Install Medusa CLI**
|
||||
|
||||
```bash
|
||||
npm install @medusajs/medusa-cli -g
|
||||
```
|
||||
|
||||
2. **Create a new Medusa project**
|
||||
|
||||
```bash
|
||||
medusa new my-medusa-store --seed
|
||||
```
|
||||
|
||||
3. **Start your Medusa engine**
|
||||
|
||||
```bash
|
||||
cd my-medusa-store
|
||||
medusa develop
|
||||
```
|
||||
Follow our [quickstart guide](https://docs.medusajs.com/quickstart/quick-start) to learn how to set up a Medusa server.
|
||||
|
||||
### Requirements
|
||||
|
||||
- Node v14.0 or higher.
|
||||
- SQLite or PostgreSQL (SQLite is only for getting started; PostgreSQL is recommended)
|
||||
- Redis
|
||||
|
||||
You can check out [this documentation for more details about setting up your environment](https://docs.medusajs.com/tutorial/set-up-your-development-environment).
|
||||
You can check out [this documentation for details about setting up your environment](https://docs.medusajs.com/tutorial/set-up-your-development-environment).
|
||||
|
||||
## What is Medusa
|
||||
|
||||
@@ -74,18 +51,11 @@ You can learn more about [Medusa’s architecture in our documentation](https://
|
||||
|
||||
### Features
|
||||
|
||||
- **Orders, Exchanges, and Returns APIs:** Aside from the standard order management that comes with ecommerce platforms, Medusa also provides an easy and automated way to manage swaps, returns, and claims.
|
||||
- **Products and Collections APIs:** Add products with extensive customization settings and sort them into collections.
|
||||
- **Region API:** Configure and manage multiple regions and currencies all from one platform.
|
||||
- **Plugin API:** Easily integrate fulfillment providers, payment providers, notification services, and many other custom tools and third-party services.
|
||||
- ****PriceList and Promotions APIs:**** Advanced pricing for products with conditions based on its amount in the cart or promotions and discounts.
|
||||
- **Tax API:** Advanced tax configurations specific to multiple regions, with capability of specifying taxes for specific products.
|
||||
|
||||
See more of the [ecommerce features on our documentation](https://docs.medusajs.com/#features).
|
||||
You can learn about all of the ecommerce features that Medusa provides [in our documentation](https://docs.medusajs.com/#features).
|
||||
|
||||
## Roadmap
|
||||
|
||||
Write-ups for all features will be made available in [Github discussions](https://github.com/medusajs/medusa/discussions) prior to starting the implementation process.
|
||||
Write-ups for all features will be made available in [Github discussions](https://github.com/medusajs/medusa/discussions) before starting the implementation process.
|
||||
|
||||
### **2022**
|
||||
|
||||
@@ -97,24 +67,24 @@ Write-ups for all features will be made available in [Github discussions](https
|
||||
- [x] Promotions API
|
||||
- [x] Price Lists API
|
||||
- [x] Price Selection Strategy
|
||||
- [ ] Import / Export API
|
||||
- [ ] Sales Channel API
|
||||
- [x] Import / Export API
|
||||
- [x] Sales Channel API
|
||||
- [ ] Extended Order API (managing placed orders)
|
||||
- [ ] PaymentCollection API (collecting payments separate from carts and draft orders)
|
||||
- [ ] Multi-warehouse API
|
||||
- [ ] Extended Product API (custom fields, publishing control, and more)
|
||||
- [ ] Extended Order API (managing placed orders, improved inventory control, and more)
|
||||
- [ ] Multi-warehouse support
|
||||
- [ ] GraphQL API
|
||||
|
||||
## Plugins
|
||||
|
||||
As a headless and extendible solution, Medusa allows you to integrate third-party services or add custom features into Medusa by installing Plugins.
|
||||
|
||||
Check out [our available plugins](https://github.com/medusajs/medusa/tree/master/packages) that you can install and use instantly on your Medusa server.
|
||||
|
||||
## Contributions
|
||||
|
||||
Medusa is all about the community. Therefore, we would love for you to help us build the most robust and powerful commerce engine on the market.
|
||||
Please check [our contribution guide](https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md) for details about how to contribute to both our codebase and our documentation.
|
||||
|
||||
Whether it is fixing bugs, improving our documentation or simply spreading the word, please feel free to join in. Please check [our contribution guide](https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md) for further details about how to contribute.
|
||||
## Upgrade Guides
|
||||
|
||||
Follow our [upgrade guides](https://docs.medusajs.com/advanced/backend/upgrade-guides/) on the documentation to keep your Medusa project up-to-date.
|
||||
|
||||
## Community & Support
|
||||
|
||||
@@ -127,10 +97,6 @@ Use these channels to be part of the community, ask for help while using Medusa,
|
||||
- [Twitter](https://twitter.com/medusajs)
|
||||
- [LinkedIn](https://www.linkedin.com/company/medusajs)
|
||||
|
||||
## Upgrade Guides
|
||||
|
||||
Follow our [upgrade guides](https://docs.medusajs.com/advanced/backend/upgrade-guides/) on the documentation to keep your Medusa project up-to-date.
|
||||
|
||||
## License
|
||||
|
||||
Licensed under the [MIT License](https://github.com/medusajs/medusa/blob/master/LICENSE)
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@medusajs/medusa",
|
||||
"version": "1.6.2",
|
||||
"version": "1.6.3",
|
||||
"description": "E-commerce for JAMstack",
|
||||
"main": "dist/index.js",
|
||||
"bin": "./cli.js",
|
||||
|
||||
@@ -11,7 +11,7 @@ export class OrderRepository extends Repository<Order> {
|
||||
const entities = await this.find(optionsWithoutRelations)
|
||||
const entitiesIds = entities.map(({ id }) => id)
|
||||
|
||||
const groupedRelations = {}
|
||||
const groupedRelations: { [topLevel: string]: string[] } = {}
|
||||
for (const rel of relations) {
|
||||
const [topLevel] = rel.split(".")
|
||||
if (groupedRelations[topLevel]) {
|
||||
@@ -22,10 +22,11 @@ export class OrderRepository extends Repository<Order> {
|
||||
}
|
||||
|
||||
const entitiesIdsWithRelations = await Promise.all(
|
||||
Object.entries(groupedRelations).map(async ([_, rels]) => {
|
||||
Object.entries(groupedRelations).map(async ([topLevel, rels]) => {
|
||||
return this.findByIds(entitiesIds, {
|
||||
select: ["id"],
|
||||
relations: rels as string[],
|
||||
relations: rels,
|
||||
withDeleted: topLevel === "region",
|
||||
})
|
||||
})
|
||||
).then(flatten)
|
||||
|
||||
Reference in new issue
Block a user