asyavee/medusa-store
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/discount-usage

Browse Source
This commit is contained in:
olivermrbl committed 2021-04-07 12:22:09 +02:00
2 parents 01f184b9b0 88c02fd203
commit 993766e5a1
56 files changed
+772 -160
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/medusa-core-utils/CHANGELOG.md
+11
View File
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.3...medusa-core-utils@1.1.4) (2021-03-30)
### Bug Fixes
* don't divide zero decimal currencies ([cfab2d4](https://github.com/medusajs/medusa/commit/cfab2d408a296a938266d0989b1de67d060b2ed5))
## [1.1.3](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.2...medusa-core-utils@1.1.3) (2021-03-17) ## [1.1.3](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.2...medusa-core-utils@1.1.3) (2021-03-17)
**Note:** Version bump only for package medusa-core-utils **Note:** Version bump only for package medusa-core-utils
packages/medusa-core-utils/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-core-utils", "name": "medusa-core-utils",
"version": "1.1.3", "version": "1.1.4",
"description": "Core utils for Medusa", "description": "Core utils for Medusa",
"main": "dist/index.js", "main": "dist/index.js",
"repository": { "repository": {
packages/medusa-core-utils/src/humanize-amount.js
+13
View File
@@ -0,0 +1,13 @@
import zeroDecimalCurrencies from "./zero-decimal-currencies"
const humanizeAmount = (amount, currency) => {
let divisor = 100
if (zeroDecimalCurrencies.includes(currency.toLowerCase())) {
divisor = 1
}
return amount / divisor
}
export default humanizeAmount
packages/medusa-core-utils/src/index.js
+2
View File
@@ -5,3 +5,5 @@ export { default as MedusaError } from "./errors"
export { default as getConfigFile } from "./get-config-file" export { default as getConfigFile } from "./get-config-file"
export { default as createRequireFromPath } from "./create-require-from-path" export { default as createRequireFromPath } from "./create-require-from-path"
export { default as compareObjectsByProp } from "./compare-objects" export { default as compareObjectsByProp } from "./compare-objects"
export { default as zeroDecimalCurrencies } from "./zero-decimal-currencies"
export { default as humanizeAmount } from "./humanize-amount"
packages/medusa-core-utils/src/zero-decimal-currencies.js
+20
View File
@@ -0,0 +1,20 @@
const zeroDecimalCurrencies = [
"bif",
"clp",
"djf",
"gnf",
"jpy",
"kmf",
"krw",
"mga",
"pyg",
"rwf",
"ugx",
"vnd",
"vuv",
"xaf",
"xof",
"xpf",
]
export default zeroDecimalCurrencies
packages/medusa-file-spaces/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-file-spaces@1.1.6...medusa-file-spaces@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-file-spaces
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-file-spaces@1.1.5...medusa-file-spaces@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-file-spaces@1.1.5...medusa-file-spaces@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-file-spaces **Note:** Version bump only for package medusa-file-spaces
packages/medusa-file-spaces/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-file-spaces", "name": "medusa-file-spaces",
"version": "1.1.6", "version": "1.1.7",
"description": "Digital Ocean Spaces file connector for Medusa", "description": "Digital Ocean Spaces file connector for Medusa",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -40,8 +40,8 @@
"aws-sdk": "^2.710.0", "aws-sdk": "^2.710.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"stripe": "^8.50.0" "stripe": "^8.50.0"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-fulfillment-manual/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.3...medusa-fulfillment-manual@1.1.4) (2021-03-30)
**Note:** Version bump only for package medusa-fulfillment-manual
## [1.1.3](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.2...medusa-fulfillment-manual@1.1.3) (2021-03-17) ## [1.1.3](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.2...medusa-fulfillment-manual@1.1.3) (2021-03-17)
**Note:** Version bump only for package medusa-fulfillment-manual **Note:** Version bump only for package medusa-fulfillment-manual
packages/medusa-fulfillment-manual/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-fulfillment-manual", "name": "medusa-fulfillment-manual",
"version": "1.1.3", "version": "1.1.4",
"description": "A manual fulfillment provider for Medusa", "description": "A manual fulfillment provider for Medusa",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -36,7 +36,7 @@
"@babel/plugin-transform-instanceof": "^7.8.3", "@babel/plugin-transform-instanceof": "^7.8.3",
"@babel/runtime": "^7.7.6", "@babel/runtime": "^7.7.6",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3" "medusa-core-utils": "^1.1.4"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-fulfillment-webshipper/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.6...medusa-fulfillment-webshipper@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-fulfillment-webshipper
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.5...medusa-fulfillment-webshipper@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.5...medusa-fulfillment-webshipper@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-fulfillment-webshipper **Note:** Version bump only for package medusa-fulfillment-webshipper
packages/medusa-fulfillment-webshipper/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-fulfillment-webshipper", "name": "medusa-fulfillment-webshipper",
"version": "1.1.6", "version": "1.1.7",
"description": "Webshipper Fulfillment provider for Medusa", "description": "Webshipper Fulfillment provider for Medusa",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -36,7 +36,7 @@
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3" "medusa-core-utils": "^1.1.4"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-interfaces/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.5](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.4...medusa-interfaces@1.1.5) (2021-03-30)
**Note:** Version bump only for package medusa-interfaces
## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.3...medusa-interfaces@1.1.4) (2021-03-17) ## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.3...medusa-interfaces@1.1.4) (2021-03-17)
**Note:** Version bump only for package medusa-interfaces **Note:** Version bump only for package medusa-interfaces
packages/medusa-interfaces/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-interfaces", "name": "medusa-interfaces",
"version": "1.1.4", "version": "1.1.5",
"description": "Core interfaces for Medusa", "description": "Core interfaces for Medusa",
"main": "dist/index.js", "main": "dist/index.js",
"repository": { "repository": {
@@ -35,7 +35,7 @@
"typeorm": "0.x" "typeorm": "0.x"
}, },
"dependencies": { "dependencies": {
"medusa-core-utils": "^1.1.3" "medusa-core-utils": "^1.1.4"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-payment-adyen/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.6...medusa-payment-adyen@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-payment-adyen
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.5...medusa-payment-adyen@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.5...medusa-payment-adyen@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-payment-adyen **Note:** Version bump only for package medusa-payment-adyen
packages/medusa-payment-adyen/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-payment-adyen", "name": "medusa-payment-adyen",
"version": "1.1.6", "version": "1.1.7",
"description": "Adyen Payment provider for Medusa Commerce", "description": "Adyen Payment provider for Medusa Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -24,7 +24,7 @@
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"jest": "^25.5.2", "jest": "^25.5.2",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"scripts": { "scripts": {
"build": "babel src -d .", "build": "babel src -d .",
@@ -42,7 +42,7 @@
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3" "medusa-core-utils": "^1.1.4"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-payment-klarna/CHANGELOG.md
+11
View File
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.8) (2021-03-30)
### Bug Fixes
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.7...medusa-payment-klarna@1.1.8) (2021-03-23) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.7...medusa-payment-klarna@1.1.8) (2021-03-23)
packages/medusa-payment-klarna/package.json
+3 -3
View File
@@ -40,8 +40,8 @@
"axios": "^0.21.0", "axios": "^0.21.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
} }
packages/medusa-payment-paypal/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.0.7](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.6...medusa-payment-paypal@1.0.7) (2021-03-30)
**Note:** Version bump only for package medusa-payment-paypal
## [1.0.6](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.5...medusa-payment-paypal@1.0.6) (2021-03-17) ## [1.0.6](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.5...medusa-payment-paypal@1.0.6) (2021-03-17)
**Note:** Version bump only for package medusa-payment-paypal **Note:** Version bump only for package medusa-payment-paypal
packages/medusa-payment-paypal/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-payment-paypal", "name": "medusa-payment-paypal",
"version": "1.0.6", "version": "1.0.7",
"description": "Paypal Payment provider for Meduas Commerce", "description": "Paypal Payment provider for Meduas Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -26,7 +26,7 @@
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"jest": "^25.5.2", "jest": "^25.5.2",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"scripts": { "scripts": {
"build": "babel src -d . --ignore **/__tests__", "build": "babel src -d . --ignore **/__tests__",
@@ -41,7 +41,7 @@
"@paypal/checkout-server-sdk": "^1.0.2", "@paypal/checkout-server-sdk": "^1.0.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3" "medusa-core-utils": "^1.1.4"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-payment-stripe/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-payment-stripe@1.1.6...medusa-payment-stripe@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-payment-stripe
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-payment-stripe@1.1.5...medusa-payment-stripe@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-payment-stripe@1.1.5...medusa-payment-stripe@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-payment-stripe **Note:** Version bump only for package medusa-payment-stripe
packages/medusa-payment-stripe/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-payment-stripe", "name": "medusa-payment-stripe",
"version": "1.1.6", "version": "1.1.7",
"description": "Stripe Payment provider for Meduas Commerce", "description": "Stripe Payment provider for Meduas Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -26,7 +26,7 @@
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"jest": "^25.5.2", "jest": "^25.5.2",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"scripts": { "scripts": {
"build": "babel src -d . --ignore **/__tests__", "build": "babel src -d . --ignore **/__tests__",
@@ -40,7 +40,7 @@
"dependencies": { "dependencies": {
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"stripe": "^8.50.0" "stripe": "^8.50.0"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-add-ons/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.6...medusa-plugin-add-ons@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-add-ons
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.5...medusa-plugin-add-ons@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.5...medusa-plugin-add-ons@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-add-ons **Note:** Version bump only for package medusa-plugin-add-ons
packages/medusa-plugin-add-ons/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-add-ons", "name": "medusa-plugin-add-ons",
"version": "1.1.6", "version": "1.1.7",
"description": "Add-on plugin for Medusa Commerce", "description": "Add-on plugin for Medusa Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -25,7 +25,7 @@
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"jest": "^25.5.2", "jest": "^25.5.2",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"scripts": { "scripts": {
"build": "babel src -d . --ignore **/__tests__", "build": "babel src -d . --ignore **/__tests__",
@@ -37,7 +37,7 @@
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"redis": "^3.0.2" "redis": "^3.0.2"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-brightpearl/CHANGELOG.md
+24
View File
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.10](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.9...medusa-plugin-brightpearl@1.1.10) (2021-04-01)
### Bug Fixes
* don't divide zero decimal currencies ([cfab2d4](https://github.com/medusajs/medusa/commit/cfab2d408a296a938266d0989b1de67d060b2ed5))
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.9...medusa-plugin-brightpearl@1.1.9) (2021-03-30)
### Bug Fixes
* don't divide zero decimal currencies ([cfab2d4](https://github.com/medusajs/medusa/commit/cfab2d408a296a938266d0989b1de67d060b2ed5))
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.8...medusa-plugin-brightpearl@1.1.9) (2021-03-25) ## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.8...medusa-plugin-brightpearl@1.1.9) (2021-03-25)
**Note:** Version bump only for package medusa-plugin-brightpearl **Note:** Version bump only for package medusa-plugin-brightpearl
packages/medusa-plugin-brightpearl/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-brightpearl", "name": "medusa-plugin-brightpearl",
"version": "1.1.9", "version": "1.1.10",
"description": "Brightpearl plugin for Medusa Commerce", "description": "Brightpearl plugin for Medusa Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -27,7 +27,7 @@
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"jest": "^25.5.2", "jest": "^25.5.2",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"prettier": "^2.0.5" "prettier": "^2.0.5"
}, },
"scripts": { "scripts": {
@@ -43,8 +43,8 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"axios-rate-limit": "^1.2.1", "axios-rate-limit": "^1.2.1",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"randomatic": "^3.1.1" "randomatic": "^3.1.1"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
} }
packages/medusa-plugin-brightpearl/src/services/brightpearl.js
+50 -17
View File
@@ -1,4 +1,4 @@
import { MedusaError } from "medusa-core-utils" import { MedusaError, humanizeAmount } from "medusa-core-utils"
import { BaseService } from "medusa-interfaces" import { BaseService } from "medusa-interfaces"
import Brightpearl from "../utils/brightpearl" import Brightpearl from "../utils/brightpearl"
@@ -299,10 +299,12 @@ class BrightpearlService extends BaseService {
taxCode: region.tax_code, taxCode: region.tax_code,
net: this.bpnum_( net: this.bpnum_(
fromRefund.amount, fromRefund.amount,
fromOrder.currency_code,
10000 / (100 + fromOrder.tax_rate) 10000 / (100 + fromOrder.tax_rate)
), ),
tax: this.bpnum_( tax: this.bpnum_(
fromRefund.amount * (1 - 100 / (100 + fromOrder.tax_rate)) fromRefund.amount * (1 - 100 / (100 + fromOrder.tax_rate)),
fromOrder.currency_code
), ),
nominalCode: accountingCode, nominalCode: accountingCode,
}, },
@@ -320,7 +322,7 @@ class BrightpearlService extends BaseService {
paymentMethodCode: this.options.payment_method_code || "1220", paymentMethodCode: this.options.payment_method_code || "1220",
orderId: creditId, orderId: creditId,
currencyIsoCode: fromOrder.currency_code.toUpperCase(), currencyIsoCode: fromOrder.currency_code.toUpperCase(),
amountPaid: this.bpnum_(fromRefund.amount), amountPaid: this.bpnum_(fromRefund.amount, fromOrder.currency_code),
paymentDate: new Date(), paymentDate: new Date(),
paymentType, paymentType,
} }
@@ -389,8 +391,15 @@ class BrightpearlService extends BaseService {
name: "Difference", name: "Difference",
quantity: 1, quantity: 1,
taxCode: region.tax_code, taxCode: region.tax_code,
net: this.bpnum_(difference, 10000 / (100 + fromOrder.tax_rate)), net: this.bpnum_(
tax: this.bpnum_(difference * (1 - 100 / (100 + fromOrder.tax_rate))), difference,
fromOrder.currency_code,
10000 / (100 + fromOrder.tax_rate)
),
tax: this.bpnum_(
difference * (1 - 100 / (100 + fromOrder.tax_rate)),
fromOrder.currency_code
),
nominalCode: this.options.sales_account_code || "4000", nominalCode: this.options.sales_account_code || "4000",
}) })
} }
@@ -406,7 +415,10 @@ class BrightpearlService extends BaseService {
paymentMethodCode: this.options.payment_method_code || "1220", paymentMethodCode: this.options.payment_method_code || "1220",
orderId: creditId, orderId: creditId,
currencyIsoCode: fromOrder.currency_code.toUpperCase(), currencyIsoCode: fromOrder.currency_code.toUpperCase(),
amountPaid: this.bpnum_(fromReturn.refund_amount), amountPaid: this.bpnum_(
fromReturn.refund_amount,
fromOrder.currencyCode
),
paymentDate: new Date(), paymentDate: new Date(),
paymentType, paymentType,
} }
@@ -649,10 +661,12 @@ class BrightpearlService extends BaseService {
name: `#${fromOrder.display_id}: Claim ${fromClaim.id}`, name: `#${fromOrder.display_id}: Claim ${fromClaim.id}`,
net: this.bpnum_( net: this.bpnum_(
fromClaim.refund_amount, fromClaim.refund_amount,
fromOrder.currency_code,
10000 / (100 + fromOrder.tax_rate) 10000 / (100 + fromOrder.tax_rate)
), ),
tax: this.bpnum_( tax: this.bpnum_(
fromClaim.refund_amount * (1 - 100 / (100 + fromOrder.tax_rate)) fromClaim.refund_amount * (1 - 100 / (100 + fromOrder.tax_rate)),
fromOrder.currency_code
), ),
taxCode: region.tax_code, taxCode: region.tax_code,
nominalCode: this.options.sales_account_code || `4000`, nominalCode: this.options.sales_account_code || `4000`,
@@ -672,7 +686,10 @@ class BrightpearlService extends BaseService {
paymentMethodCode: this.options.payment_method_code || "1220", paymentMethodCode: this.options.payment_method_code || "1220",
orderId: creditId, orderId: creditId,
currencyIsoCode: fromOrder.currency_code.toUpperCase(), currencyIsoCode: fromOrder.currency_code.toUpperCase(),
amountPaid: this.bpnum_(fromClaim.refund_amount), amountPaid: this.bpnum_(
fromClaim.refund_amount,
fromOrder.currency_code
),
paymentDate: new Date(), paymentDate: new Date(),
paymentType, paymentType,
} }
@@ -784,7 +801,7 @@ class BrightpearlService extends BaseService {
orderId: soId, orderId: soId,
paymentDate: new Date(), paymentDate: new Date(),
currencyIsoCode: fromOrder.currency_code.toUpperCase(), currencyIsoCode: fromOrder.currency_code.toUpperCase(),
amountPaid: this.bpnum_(fromOrder.total), amountPaid: this.bpnum_(fromOrder.total, fromOrder.currency_code),
paymentType, paymentType,
} }
@@ -820,9 +837,13 @@ class BrightpearlService extends BaseService {
} }
if (config.include_price) { if (config.include_price) {
row.net = this.bpnum_(item.unit_price * item.quantity - ld.amount) row.net = this.bpnum_(
item.unit_price * item.quantity - ld.amount,
fromOrder.currency_code
)
row.tax = this.bpnum_( row.tax = this.bpnum_(
item.unit_price * item.quantity - ld.amount, item.unit_price * item.quantity - ld.amount,
fromOrder.currency_code,
fromOrder.tax_rate fromOrder.tax_rate
) )
} else if (config.is_claim) { } else if (config.is_claim) {
@@ -830,7 +851,11 @@ class BrightpearlService extends BaseService {
bpProduct.productId, bpProduct.productId,
this.options.cost_price_list || `1` this.options.cost_price_list || `1`
) )
row.tax = this.bpnum_(row.net * 100, fromOrder.tax_rate) row.tax = this.bpnum_(
row.net * 100,
fromOrder.currency_code,
fromOrder.tax_rate
)
} }
row.quantity = item.quantity row.quantity = item.quantity
@@ -856,8 +881,12 @@ class BrightpearlService extends BaseService {
if (gcTotal) { if (gcTotal) {
lines.push({ lines.push({
name: `Gift Card`, name: `Gift Card`,
net: this.bpnum_(-1 * gcTotal), net: this.bpnum_(-1 * gcTotal, fromOrder.currency_code),
tax: this.bpnum_(-1 * gcTotal, fromOrder.tax_rate), tax: this.bpnum_(
-1 * gcTotal,
fromOrder.currency_code,
fromOrder.tax_rate
),
quantity: 1, quantity: 1,
taxCode: region.tax_code, taxCode: region.tax_code,
nominalCode: this.options.gift_card_account_code || "4000", nominalCode: this.options.gift_card_account_code || "4000",
@@ -872,8 +901,12 @@ class BrightpearlService extends BaseService {
lines.push({ lines.push({
name: `Shipping: ${shippingMethods.map((m) => m.name).join(" + ")}`, name: `Shipping: ${shippingMethods.map((m) => m.name).join(" + ")}`,
quantity: 1, quantity: 1,
net: this.bpnum_(shippingTotal), net: this.bpnum_(shippingTotal, fromOrder.currency_code),
tax: this.bpnum_(shippingTotal, fromOrder.tax_rate), tax: this.bpnum_(
shippingTotal,
fromOrder.currency_code,
fromOrder.tax_rate
),
taxCode: region.tax_code, taxCode: region.tax_code,
nominalCode: this.options.shipping_account_code || "4040", nominalCode: this.options.shipping_account_code || "4040",
}) })
@@ -1112,8 +1145,8 @@ class BrightpearlService extends BaseService {
) )
} }
bpnum_(number, taxRate = 100) { bpnum_(number, currency, taxRate = 100) {
const bpNumber = number / 100 const bpNumber = humanizeAmount(number, currency)
return this.bpround_(bpNumber * (taxRate / 100)) return this.bpround_(bpNumber * (taxRate / 100))
} }
} }
packages/medusa-plugin-contentful/CHANGELOG.md
+22
View File
@@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.8) (2021-03-30)
### Bug Fixes
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.7...medusa-plugin-contentful@1.1.8) (2021-03-26)
### Bug Fixes
* update all contentful ([806918a](https://github.com/medusajs/medusa/commit/806918a10e42fde60240dcc785d8e175dc8507b5))
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.6...medusa-plugin-contentful@1.1.7) (2021-03-17) ## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.6...medusa-plugin-contentful@1.1.7) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-contentful **Note:** Version bump only for package medusa-plugin-contentful
packages/medusa-plugin-contentful/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-contentful", "name": "medusa-plugin-contentful",
"version": "1.1.7", "version": "1.1.8",
"description": "Contentful plugin for Medusa Commerce", "description": "Contentful plugin for Medusa Commerce",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -39,9 +39,9 @@
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"contentful-management": "^5.27.1", "contentful-management": "^5.27.1",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"redis": "^3.0.2" "redis": "^3.0.2"
}, },
"gitHead": "739b7b3cc5ff31aa7a15637db2000e645c7597b1" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
} }
packages/medusa-plugin-contentful/src/services/contentful.js
+8 -3
View File
@@ -449,9 +449,14 @@ class ContentfulService extends BaseService {
"options", "options",
] ]
const found = variant.fields.find((f) => updateFields.includes(f)) // Update came directly from product variant service so only act on a couple
if (!found) { // of fields. When the update comes from the product we want to ensure
return // references are set up correctly so we run through everything.
if (variant.fields) {
const found = variant.fields.find((f) => updateFields.includes(f))
if (!found) {
return
}
} }
try { try {
packages/medusa-plugin-economic/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.6...medusa-plugin-economic@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-economic
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.5...medusa-plugin-economic@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.5...medusa-plugin-economic@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-economic **Note:** Version bump only for package medusa-plugin-economic
packages/medusa-plugin-economic/package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-economic", "name": "medusa-plugin-economic",
"version": "1.1.6", "version": "1.1.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
packages/medusa-plugin-economic/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-economic", "name": "medusa-plugin-economic",
"version": "1.1.6", "version": "1.1.7",
"description": "E-conomic financial reporting", "description": "E-conomic financial reporting",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"moment": "^2.27.0" "moment": "^2.27.0"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-mailchimp/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.6...medusa-plugin-mailchimp@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-mailchimp
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.5...medusa-plugin-mailchimp@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.5...medusa-plugin-mailchimp@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-mailchimp **Note:** Version bump only for package medusa-plugin-mailchimp
packages/medusa-plugin-mailchimp/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-mailchimp", "name": "medusa-plugin-mailchimp",
"version": "1.1.6", "version": "1.1.7",
"description": "Mailchimp newsletter subscriptions", "description": "Mailchimp newsletter subscriptions",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -40,8 +40,8 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.17.1", "express": "^4.17.1",
"mailchimp-api-v3": "^1.14.0", "mailchimp-api-v3": "^1.14.0",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-plugin-permissions/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.6...medusa-plugin-permissions@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-permissions
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.5...medusa-plugin-permissions@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.5...medusa-plugin-permissions@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-permissions **Note:** Version bump only for package medusa-plugin-permissions
packages/medusa-plugin-permissions/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-permissions", "name": "medusa-plugin-permissions",
"version": "1.1.6", "version": "1.1.7",
"description": "Role permission for Medusa core", "description": "Role permission for Medusa core",
"main": "dist/index.js", "main": "dist/index.js",
"repository": { "repository": {
@@ -32,8 +32,8 @@
"medusa-interfaces": "1.x" "medusa-interfaces": "1.x"
}, },
"dependencies": { "dependencies": {
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"mongoose": "^5.8.0" "mongoose": "^5.8.0"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-segment/CHANGELOG.md
+24
View File
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.10](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.9...medusa-plugin-segment@1.1.10) (2021-04-02)
### Bug Fixes
* adds exchange rates api key ([8eec38a](https://github.com/medusajs/medusa/commit/8eec38af7164fe60106b8dac33ae9acfeb2b0f2e))
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.8...medusa-plugin-segment@1.1.9) (2021-03-30)
### Bug Fixes
* adds tests for segment ([1b00f96](https://github.com/medusajs/medusa/commit/1b00f967dea3dc3aa65fafbe1334492fba5c33c2))
* don't divide zero decimal currencies ([3258955](https://github.com/medusajs/medusa/commit/3258955b462f91fc6f4d807c5cc9b5ad11d6bbdf))
* don't divide zero decimal currencies ([cfab2d4](https://github.com/medusajs/medusa/commit/cfab2d408a296a938266d0989b1de67d060b2ed5))
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.7...medusa-plugin-segment@1.1.8) (2021-03-17) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.7...medusa-plugin-segment@1.1.8) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-segment **Note:** Version bump only for package medusa-plugin-segment
packages/medusa-plugin-segment/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-segment", "name": "medusa-plugin-segment",
"version": "1.1.8", "version": "1.1.10",
"description": "Segment Analytics", "description": "Segment Analytics",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"gitHead": "0c294b7b3acbc1b873aab7e90a8e596bdac48899" "gitHead": "0c294b7b3acbc1b873aab7e90a8e596bdac48899"
} }
packages/medusa-plugin-segment/src/services/__tests__/segment.js
+188
View File
@@ -0,0 +1,188 @@
import SegmentService from "../segment"
jest.mock("analytics-node")
const orderFactory = (config = {}) => {
return {
id: "12355",
display_id: "1234",
cart_id: "cart_13",
region_id: "reg_123",
items: [
{
title: "Test",
variant: {
product_id: "prod_123",
sku: "TEST",
},
unit_price: 1100,
quantity: 2,
},
],
shipping_methods: [
{
name: "standard",
price: 12399,
},
],
payments: [
{
id: "123",
},
],
tax_rate: 23.1,
currency_code: "DKK",
discounts: [],
shipping_address: {
first_name: "Test",
last_name: "Testson",
address_1: "Test",
address_2: "TEst",
postal_code: "1234",
country_code: "DK",
phone: "12345678",
},
email: "test@example.com",
subtotal: 2200,
total: 12399,
tax_total: 0,
shipping_total: 12399,
discount_total: 0,
gift_card_total: 0,
...config,
}
}
describe("SegmentService", () => {
const ProductService = {
retrieve: () =>
Promise.resolve({
collection: { title: "Collection" },
type: { value: "Type" },
subtitle: "Subtitle",
}),
}
const TotalsService = {
getLineItemRefund: (_, item) => {
return item.unit_price
},
}
describe("buildOrder", () => {
const segmentService = new SegmentService(
{
productService: ProductService,
totalsService: TotalsService,
},
{ account: "test" }
)
segmentService.getReportingValue = async (_, v) => {
const num = v
return Promise.resolve(Number(Math.round(num + "e2") + "e-2"))
}
it("successfully builds sales order", async () => {
jest.clearAllMocks()
const order = orderFactory()
const segmentOrder = await segmentService.buildOrder(order)
expect(segmentOrder).toEqual({
checkout_id: "cart_13",
coupon: undefined,
currency: "DKK",
discount: 0,
email: "test@example.com",
order_id: "12355",
payment_provider: "",
products: [
{
category: "Collection",
name: "Test",
price: 4.47,
product_id: "prod_123",
quantity: 2,
reporting_revenue: 8.94,
sku: "",
subtitle: "Subtitle",
type: "Type",
variant: "TEST",
},
],
region_id: "reg_123",
reporting_discount: 0,
reporting_revenue: 123.99,
reporting_shipping: 123.99,
reporting_subtotal: 22,
reporting_tax: 0,
reporting_total: 123.99,
revenue: 123.99,
shipping: 123.99,
shipping_city: undefined,
shipping_country: "DK",
shipping_methods: [
{
name: "standard",
price: 12399,
},
],
subtotal: 22,
tax: 0,
total: 123.99,
})
})
it("successfully builds order with zero decimal currency", async () => {
jest.clearAllMocks()
const order = orderFactory({ currency_code: "krw" })
const segmentOrder = await segmentService.buildOrder(order)
expect(segmentOrder).toEqual({
checkout_id: "cart_13",
coupon: undefined,
currency: "KRW",
discount: 0,
email: "test@example.com",
order_id: "12355",
payment_provider: "",
products: [
{
category: "Collection",
name: "Test",
price: 446.79,
product_id: "prod_123",
quantity: 2,
reporting_revenue: 893.58,
sku: "",
subtitle: "Subtitle",
type: "Type",
variant: "TEST",
},
],
region_id: "reg_123",
reporting_discount: 0,
reporting_revenue: 12399,
reporting_shipping: 12399,
reporting_subtotal: 2200,
reporting_tax: 0,
reporting_total: 12399,
revenue: 12399,
shipping: 12399,
shipping_city: undefined,
shipping_country: "DK",
shipping_methods: [
{
name: "standard",
price: 12399,
},
],
subtotal: 2200,
tax: 0,
total: 12399,
})
})
})
})
packages/medusa-plugin-segment/src/services/segment.js
+19 -10
View File
@@ -1,6 +1,7 @@
import Analytics from "analytics-node" import Analytics from "analytics-node"
import axios from "axios" import axios from "axios"
import { BaseService } from "medusa-interfaces" import { BaseService } from "medusa-interfaces"
import { humanizeAmount } from "medusa-core-utils"
class SegmentService extends BaseService { class SegmentService extends BaseService {
/** /**
@@ -43,26 +44,28 @@ class SegmentService extends BaseService {
"EUR" "EUR"
if (fromCurrency === toCurrency) { if (fromCurrency === toCurrency) {
return this.totalsService_.rounded(value) return this.rounded_(value)
} }
const exchangeRate = await axios const exchangeRate = await axios
.get( .get(
`https://api.exchangeratesapi.io/${date}?symbols=${fromCurrency}&base=${toCurrency}` `https://api.exchangeratesapi.io/${date}?symbols=${fromCurrency}&base=${toCurrency}&access_key=${this.options_.exchange_rates_api_key}`
) )
.then(({ data }) => { .then(({ data }) => {
return data.rates[fromCurrency] return data.rates[fromCurrency]
}) })
return this.totalsService_.rounded(value / exchangeRate) return this.rounded_(value / exchangeRate)
} }
async buildOrder(order) { async buildOrder(order) {
const subtotal = order.subtotal / 100 const curr = order.currency_code
const total = order.total / 100
const tax = order.tax_total / 100 const subtotal = humanizeAmount(order.subtotal, curr)
const discount = order.discount_total / 100 const total = humanizeAmount(order.total, curr)
const shipping = order.shipping_total / 100 const tax = humanizeAmount(order.tax_total, curr)
const discount = humanizeAmount(order.discount_total, curr)
const shipping = humanizeAmount(order.shipping_total, curr)
const revenue = total - tax const revenue = total - tax
let coupon let coupon
@@ -119,7 +122,7 @@ class SegmentService extends BaseService {
const revenue = await this.getReportingValue( const revenue = await this.getReportingValue(
order.currency_code, order.currency_code,
lineTotal / 100 humanizeAmount(lineTotal, curr)
) )
let sku = "" let sku = ""
@@ -141,7 +144,9 @@ class SegmentService extends BaseService {
return { return {
name, name,
variant, variant,
price: lineTotal / 100 / item.quantity, price: this.rounded_(
humanizeAmount(lineTotal, curr) / item.quantity
),
reporting_revenue: revenue, reporting_revenue: revenue,
product_id: item.variant.product_id, product_id: item.variant.product_id,
category: product.collection?.title, category: product.collection?.title,
@@ -156,6 +161,10 @@ class SegmentService extends BaseService {
return orderData return orderData
} }
rounded_(v) {
return Number(Math.round(v + "e2") + "e-2")
}
} }
export default SegmentService export default SegmentService
packages/medusa-plugin-sendgrid/CHANGELOG.md
+12
View File
@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.7...medusa-plugin-sendgrid@1.1.8) (2021-03-30)
### Bug Fixes
* format numbers correctly in sendgrid ([7682980](https://github.com/medusajs/medusa/commit/7682980c58f1a01f0c510b1d4feae3a62892040c))
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.6...medusa-plugin-sendgrid@1.1.7) (2021-03-17) ## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.6...medusa-plugin-sendgrid@1.1.7) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-sendgrid **Note:** Version bump only for package medusa-plugin-sendgrid
packages/medusa-plugin-sendgrid/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-sendgrid", "name": "medusa-plugin-sendgrid",
"version": "1.1.7", "version": "1.1.8",
"description": "SendGrid transactional emails", "description": "SendGrid transactional emails",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -39,8 +39,8 @@
"@sendgrid/mail": "^7.1.1", "@sendgrid/mail": "^7.1.1",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
} }
packages/medusa-plugin-sendgrid/src/services/sendgrid.js
+67 -23
View File
@@ -1,6 +1,8 @@
import { NotificationService } from "medusa-interfaces"
import SendGrid from "@sendgrid/mail" import SendGrid from "@sendgrid/mail"
import { NotificationService } from "medusa-interfaces"
import { humanizeAmount, zeroDecimalCurrencies } from "medusa-core-utils"
class SendGridService extends NotificationService { class SendGridService extends NotificationService {
static identifier = "sendgrid" static identifier = "sendgrid"
@@ -361,18 +363,24 @@ class SendGridService extends NotificationService {
date: order.created_at.toDateString(), date: order.created_at.toDateString(),
items, items,
discounts, discounts,
subtotal: `${this.humanPrice_(subtotal * (1 + taxRate))} ${currencyCode}`, subtotal: `${this.humanPrice_(
gift_card_total: `${this.humanPrice_( subtotal * (1 + taxRate),
gift_card_total * (1 + taxRate) currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
tax_total: `${this.humanPrice_(tax_total)} ${currencyCode}`, gift_card_total: `${this.humanPrice_(
gift_card_total * (1 + taxRate),
currencyCode
)} ${currencyCode}`,
tax_total: `${this.humanPrice_(tax_total, currencyCode)} ${currencyCode}`,
discount_total: `${this.humanPrice_( discount_total: `${this.humanPrice_(
discount_total * (1 + taxRate) discount_total * (1 + taxRate),
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
shipping_total: `${this.humanPrice_( shipping_total: `${this.humanPrice_(
shipping_total * (1 + taxRate) shipping_total * (1 + taxRate),
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
total: `${this.humanPrice_(total)} ${currencyCode}`, total: `${this.humanPrice_(total, currencyCode)} ${currencyCode}`,
} }
} }
@@ -450,15 +458,23 @@ class SendGridService extends NotificationService {
has_shipping: !!returnRequest.shipping_method, has_shipping: !!returnRequest.shipping_method,
email: order.email, email: order.email,
items: this.processItems_(returnItems, taxRate, currencyCode), items: this.processItems_(returnItems, taxRate, currencyCode),
subtotal: `${this.humanPrice_(item_subtotal)} ${currencyCode}`, subtotal: `${this.humanPrice_(
shipping_total: `${this.humanPrice_(shippingTotal)} ${currencyCode}`, item_subtotal,
currencyCode
)} ${currencyCode}`,
shipping_total: `${this.humanPrice_(
shippingTotal,
currencyCode
)} ${currencyCode}`,
refund_amount: `${this.humanPrice_( refund_amount: `${this.humanPrice_(
returnRequest.refund_amount returnRequest.refund_amount,
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
return_request: { return_request: {
...returnRequest, ...returnRequest,
refund_amount: `${this.humanPrice_( refund_amount: `${this.humanPrice_(
returnRequest.refund_amount returnRequest.refund_amount,
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
}, },
order, order,
@@ -539,9 +555,18 @@ class SendGridService extends NotificationService {
email: order.email, email: order.email,
items: this.processItems_(swap.additional_items, taxRate, currencyCode), items: this.processItems_(swap.additional_items, taxRate, currencyCode),
return_items: returnItems, return_items: returnItems,
return_total: `${this.humanPrice_(returnTotal)} ${currencyCode}`, return_total: `${this.humanPrice_(
refund_amount: `${this.humanPrice_(refundAmount)} ${currencyCode}`, returnTotal,
additional_total: `${this.humanPrice_(additionalTotal)} ${currencyCode}`, currencyCode
)} ${currencyCode}`,
refund_amount: `${this.humanPrice_(
refundAmount,
currencyCode
)} ${currencyCode}`,
additional_total: `${this.humanPrice_(
additionalTotal,
currencyCode
)} ${currencyCode}`,
} }
} }
@@ -602,12 +627,25 @@ class SendGridService extends NotificationService {
date: swap.updated_at.toDateString(), date: swap.updated_at.toDateString(),
email: order.email, email: order.email,
tax_amount: `${this.humanPrice_( tax_amount: `${this.humanPrice_(
swap.difference_due * taxRate swap.difference_due * taxRate,
currencyCode
)} ${currencyCode}`,
paid_total: `${this.humanPrice_(
swap.difference_due,
currencyCode
)} ${currencyCode}`,
return_total: `${this.humanPrice_(
returnTotal,
currencyCode
)} ${currencyCode}`,
refund_amount: `${this.humanPrice_(
refundAmount,
currencyCode
)} ${currencyCode}`,
additional_total: `${this.humanPrice_(
additionalTotal,
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
paid_total: `${this.humanPrice_(swap.difference_due)} ${currencyCode}`,
return_total: `${this.humanPrice_(returnTotal)} ${currencyCode}`,
refund_amount: `${this.humanPrice_(refundAmount)} ${currencyCode}`,
additional_total: `${this.humanPrice_(additionalTotal)} ${currencyCode}`,
fulfillment: shipment, fulfillment: shipment,
tracking_links: shipment.tracking_links, tracking_links: shipment.tracking_links,
tracking_number: shipment.tracking_numbers.join(", "), tracking_number: shipment.tracking_numbers.join(", "),
@@ -647,14 +685,20 @@ class SendGridService extends NotificationService {
...i, ...i,
thumbnail: this.normalizeThumbUrl_(i.thumbnail), thumbnail: this.normalizeThumbUrl_(i.thumbnail),
price: `${this.humanPrice_( price: `${this.humanPrice_(
i.unit_price * (1 + taxRate) i.unit_price * (1 + taxRate),
currencyCode
)} ${currencyCode}`, )} ${currencyCode}`,
} }
}) })
} }
humanPrice_(amount) { humanPrice_(amount, currency) {
return amount ? (amount / 100).toFixed(2) : "0.00" if (!amount) {
return "0.00"
}
const normalized = humanizeAmount(amount, currency)
return normalized.toFixed(zeroDecimalCurrencies.includes(currency.toLowerCase()) ? 0 : 2)
} }
normalizeThumbUrl_(url) { normalizeThumbUrl_(url) {
packages/medusa-plugin-slack-notification/CHANGELOG.md
+12
View File
@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.6...medusa-plugin-slack-notification@1.1.7) (2021-03-30)
### Bug Fixes
* **slack:** show discount code flag ([b5bf650](https://github.com/medusajs/medusa/commit/b5bf650ec26182be6324bc56e7f6efd744a7131e))
* zero decimal amounts in slack + gc total ([c6a5dff](https://github.com/medusajs/medusa/commit/c6a5dffa7bd8f627310d1f90364492084051dd47))
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.5...medusa-plugin-slack-notification@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.5...medusa-plugin-slack-notification@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-slack-notification **Note:** Version bump only for package medusa-plugin-slack-notification
packages/medusa-plugin-slack-notification/package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-economic", "name": "medusa-plugin-economic",
"version": "1.1.6", "version": "1.1.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
packages/medusa-plugin-slack-notification/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-slack-notification", "name": "medusa-plugin-slack-notification",
"version": "1.1.6", "version": "1.1.7",
"description": "Slack notifications", "description": "Slack notifications",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"moment": "^2.27.0" "moment": "^2.27.0"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-slack-notification/src/services/slack.js
+44 -23
View File
@@ -1,10 +1,13 @@
import axios from "axios" import axios from "axios"
import { zeroDecimalCurrencies, humanizeAmount } from "medusa-core-utils"
import { BaseService } from "medusa-interfaces" import { BaseService } from "medusa-interfaces"
class SlackService extends BaseService { class SlackService extends BaseService {
/** /**
* @param {Object} options - options defined in `medusa-config.js` * @param {Object} options - options defined in `medusa-config.js`
* { * {
* show_discount_code: If set to true the discount code used will be
* displayed in the order channel.
* slack_url: "https://hooks.slack.com/services/...", * slack_url: "https://hooks.slack.com/services/...",
* admin_orders_url: "https:..../orders" * admin_orders_url: "https:..../orders"
* } * }
@@ -58,6 +61,14 @@ class SlackService extends BaseService {
const currencyCode = order.currency_code.toUpperCase() const currencyCode = order.currency_code.toUpperCase()
const taxRate = order.tax_rate / 100 const taxRate = order.tax_rate / 100
const getDisplayAmount = (amount) => {
const humanAmount = humanizeAmount(amount, currencyCode)
if (zeroDecimalCurrencies.includes(currencyCode.toLowerCase())) {
return humanAmount
}
return humanAmount.toFixed(2)
}
let blocks = [ let blocks = [
{ {
type: "section", type: "section",
@@ -83,32 +94,46 @@ class SlackService extends BaseService {
type: "section", type: "section",
text: { text: {
type: "mrkdwn", type: "mrkdwn",
text: `*Subtotal*\t${(subtotal / 100).toFixed( text: `*Subtotal*\t${getDisplayAmount(
2 subtotal
)} ${currencyCode}\n*Shipping*\t${(shipping_total / 100).toFixed( )} ${currencyCode}\n*Shipping*\t${getDisplayAmount(
2 shipping_total
)} ${currencyCode}\n*Discount Total*\t${( )} ${currencyCode}\n*Discount Total*\t${getDisplayAmount(
discount_total / 100 discount_total
).toFixed(2)} ${currencyCode}\n*Tax*\t${(tax_total / 100).toFixed( )} ${currencyCode}\n*Tax*\t${getDisplayAmount(
2 tax_total
)} ${currencyCode}\n*Total*\t${(total / 100).toFixed( )} ${currencyCode}\n*Total*\t${getDisplayAmount(
2 total
)} ${currencyCode}`, )} ${currencyCode}`,
}, },
}, },
] ]
order.discounts.forEach((d) => { if (order.gift_card_total) {
blocks.push({ blocks.push({
type: "section", type: "section",
text: { text: {
type: "mrkdwn", type: "mrkdwn",
text: `*Promo Code*\t${d.code} ${d.rule.value}${ text: `*Gift Card Total*\t${getDisplayAmount(
d.rule.type === "percentage" ? "%" : ` ${currencyCode}` order.gift_card_total
}`, )} ${currencyCode}`,
}, },
}) })
}) }
if (this.options_.show_discount_code) {
order.discounts.forEach((d) => {
blocks.push({
type: "section",
text: {
type: "mrkdwn",
text: `*Promo Code*\t${d.code} ${d.rule.value}${
d.rule.type === "percentage" ? "%" : ` ${currencyCode}`
}`,
},
})
})
}
blocks.push({ blocks.push({
type: "divider", type: "divider",
@@ -119,19 +144,15 @@ class SlackService extends BaseService {
type: "section", type: "section",
text: { text: {
type: "mrkdwn", type: "mrkdwn",
text: `*${lineItem.title}*\n${lineItem.quantity} x ${( text: `*${lineItem.title}*\n${lineItem.quantity} x ${getDisplayAmount(
(lineItem.unit_price / 100) * lineItem.unit_price * (1 + taxRate)
(1 + taxRate) )} ${currencyCode}`,
).toFixed(2)} ${currencyCode}`,
}, },
} }
if (lineItem.thumbnail) { if (lineItem.thumbnail) {
let url = lineItem.thumbnail let url = lineItem.thumbnail
if ( if (lineItem.thumbnail.startsWith("//")) {
!lineItem.thumbnail.startsWith("http:") &&
!lineItem.thumbnail.startsWith("https:")
) {
url = `https:${lineItem.thumbnail}` url = `https:${lineItem.thumbnail}`
} }
packages/medusa-plugin-twilio-sms/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.6...medusa-plugin-twilio-sms@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-twilio-sms
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.5...medusa-plugin-twilio-sms@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.5...medusa-plugin-twilio-sms@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-twilio-sms **Note:** Version bump only for package medusa-plugin-twilio-sms
packages/medusa-plugin-twilio-sms/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-twilio-sms", "name": "medusa-plugin-twilio-sms",
"version": "1.1.6", "version": "1.1.7",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -35,8 +35,8 @@
"dependencies": { "dependencies": {
"@babel/plugin-transform-classes": "^7.9.5", "@babel/plugin-transform-classes": "^7.9.5",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"twilio": "^3.49.1" "twilio": "^3.49.1"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa-plugin-wishlist/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.6...medusa-plugin-wishlist@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-plugin-wishlist
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.5...medusa-plugin-wishlist@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.5...medusa-plugin-wishlist@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-plugin-wishlist **Note:** Version bump only for package medusa-plugin-wishlist
packages/medusa-plugin-wishlist/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-plugin-wishlist", "name": "medusa-plugin-wishlist",
"version": "1.1.6", "version": "1.1.7",
"description": "Provides /customers/:id/wishlist to add items to a customr's wishlist", "description": "Provides /customers/:id/wishlist to add items to a customr's wishlist",
"main": "index.js", "main": "index.js",
"repository": { "repository": {
@@ -37,8 +37,8 @@
"dependencies": { "dependencies": {
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6" "medusa-test-utils": "^1.1.7"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
} }
packages/medusa-test-utils/CHANGELOG.md
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.7](https://github.com/medusajs/medusa/compare/medusa-test-utils@1.1.6...medusa-test-utils@1.1.7) (2021-03-30)
**Note:** Version bump only for package medusa-test-utils
## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-test-utils@1.1.5...medusa-test-utils@1.1.6) (2021-03-17) ## [1.1.6](https://github.com/medusajs/medusa/compare/medusa-test-utils@1.1.5...medusa-test-utils@1.1.6) (2021-03-17)
**Note:** Version bump only for package medusa-test-utils **Note:** Version bump only for package medusa-test-utils
packages/medusa-test-utils/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "medusa-test-utils", "name": "medusa-test-utils",
"version": "1.1.6", "version": "1.1.7",
"description": "Test utils for Medusa", "description": "Test utils for Medusa",
"main": "dist/index.js", "main": "dist/index.js",
"repository": { "repository": {
@@ -29,7 +29,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/plugin-transform-classes": "^7.9.5", "@babel/plugin-transform-classes": "^7.9.5",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"randomatic": "^3.1.1" "randomatic": "^3.1.1"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
packages/medusa/CHANGELOG.md
+41
View File
@@ -3,6 +3,47 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.17](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.17) (2021-03-30)
### Bug Fixes
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.16](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.16) (2021-03-30)
### Bug Fixes
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.15](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.15) (2021-03-30)
### Bug Fixes
* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
## [1.1.16](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.15...@medusajs/medusa@1.1.16) (2021-03-26)
**Note:** Version bump only for package @medusajs/medusa
## [1.1.15](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.14...@medusajs/medusa@1.1.15) (2021-03-18) ## [1.1.15](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.14...@medusajs/medusa@1.1.15) (2021-03-18)
**Note:** Version bump only for package @medusajs/medusa **Note:** Version bump only for package @medusajs/medusa
packages/medusa/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "@medusajs/medusa", "name": "@medusajs/medusa",
"version": "1.1.15", "version": "1.1.17",
"description": "E-commerce for JAMstack", "description": "E-commerce for JAMstack",
"main": "dist/index.js", "main": "dist/index.js",
"repository": { "repository": {
@@ -67,8 +67,8 @@
"joi": "^17.3.0", "joi": "^17.3.0",
"joi-objectid": "^3.0.1", "joi-objectid": "^3.0.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"medusa-core-utils": "^1.1.3", "medusa-core-utils": "^1.1.4",
"medusa-test-utils": "^1.1.6", "medusa-test-utils": "^1.1.7",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"multer": "^1.4.2", "multer": "^1.4.2",
"passport": "^0.4.0", "passport": "^0.4.0",
@@ -86,5 +86,5 @@
"uuid": "^8.3.1", "uuid": "^8.3.1",
"winston": "^3.2.1" "winston": "^3.2.1"
}, },
"gitHead": "8c87f25f766154368b0f15424028550966f7d3d6" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
} }
packages/medusa/src/services/claim-item.js
+26 -18
View File
@@ -83,27 +83,35 @@ class ClaimItemService extends BaseService {
) )
} }
const claimTagRepo = manager.getCustomRepository(this.claimTagRepository_) let tagsToAdd = []
const tagsToAdd = await Promise.all( if (tags && tags.length) {
tags.map(async t => { const claimTagRepo = manager.getCustomRepository(
const normalized = t.trim().toLowerCase() this.claimTagRepository_
const existing = await claimTagRepo.findOne({ )
where: { value: normalized }, tagsToAdd = await Promise.all(
tags.map(async t => {
const normalized = t.trim().toLowerCase()
const existing = await claimTagRepo.findOne({
where: { value: normalized },
})
if (existing) {
return existing
}
return claimTagRepo.create({ value: normalized })
}) })
if (existing) { )
return existing }
}
return claimTagRepo.create({ value: normalized }) let imagesToAdd = []
if (images && images.length) {
const claimImgRepo = manager.getCustomRepository(
this.claimImageRepository_
)
imagesToAdd = images.map(url => {
return claimImgRepo.create({ url })
}) })
) }
const claimImgRepo = manager.getCustomRepository(
this.claimImageRepository_
)
const imagesToAdd = images.map(url => {
return claimImgRepo.create({ url })
})
const created = ciRepo.create({ const created = ciRepo.create({
...rest, ...rest,