Commit Graph

829 Commits

Author SHA1 Message Date
Sebastian Rindom
586f4d884c feat: allow custom address on claims 2021-05-27 12:29:11 +02:00
Sebastian Rindom
fd26f3716d Merge remote-tracking branch 'origin/master' into develop 2021-05-06 14:17:35 +02:00
Sebastian Rindom
177dee2ac4 chore(release): Publish
- @medusajs/medusa-cli@1.1.8
 - medusa-fulfillment-webshipper@1.1.13
2021-05-05 18:22:24 +02:00
Sebastian Rindom
db9b385f1b chore: npmignore 2021-05-05 18:21:21 +02:00
Sebastian Rindom
94bc6862fc Merge pull request #246 from medusajs/hotfix/webshipper-coo
hotfix(webshipper): specify which countries have CoO attached
2021-05-05 18:19:41 +02:00
Sebastian Rindom
61e1a7d7f1 hotfix(webshipper): adds option to specify which countries have CoO attached 2021-05-05 17:23:26 +02:00
Sebastian Rindom
95bcf34eff chore(release): Publish
- medusa-payment-paypal@1.0.13
 - medusa-plugin-restock-notification@0.0.7
 - @medusajs/medusa@1.1.23
2021-04-29 15:54:54 +02:00
Sebastian Rindom
9364feda18 Merge branch 'hotfix/paypal' into develop 2021-04-29 15:50:55 +02:00
Sebastian Rindom
21eebd3678 Merge pull request #245 from medusajs/hotfix/paypal
hotfix(paypal): correct payment retrieval on refunds
2021-04-29 15:50:24 +02:00
olivermrbl
23b9066159 Merge branch 'hotfix/claim-return-shipping' into develop 2021-04-29 15:47:32 +02:00
Oliver Windall Juhl
bf4e8d8ff8 hotfix: Claim return shipping (#244) 2021-04-29 15:46:56 +02:00
Sebastian Rindom
cf34f8e404 hotfix(paypal): correct payment retrieval on refunds 2021-04-29 15:37:27 +02:00
olivermrbl
cb0fb757a0 hotfix: Claim return shipping 2021-04-28 16:45:48 +02:00
Sebastian Rindom
7cd9fd487e chore(release): Publish
- babel-preset-medusa-package@1.1.3
 - @medusajs/medusa-cli@1.1.7
 - medusa-core-utils@1.1.9
 - medusa-dev-cli@0.0.8
 - medusa-file-spaces@1.1.12
 - medusa-fulfillment-manual@1.1.9
 - medusa-fulfillment-webshipper@1.1.12
 - medusa-interfaces@1.1.10
 - medusa-payment-adyen@1.1.12
 - medusa-payment-klarna@1.1.13
 - medusa-payment-paypal@1.0.12
 - medusa-payment-stripe@1.1.12
 - medusa-plugin-add-ons@1.1.12
 - medusa-plugin-brightpearl@1.1.15
 - medusa-plugin-contentful@1.1.13
 - medusa-plugin-discount-generator@1.1.3
 - medusa-plugin-economic@1.1.12
 - medusa-plugin-ip-lookup@1.1.3
 - medusa-plugin-mailchimp@1.1.12
 - medusa-plugin-permissions@1.1.12
 - medusa-plugin-restock-notification@0.0.6
 - medusa-plugin-segment@1.1.15
 - medusa-plugin-sendgrid@1.1.13
 - medusa-plugin-slack-notification@1.1.12
 - medusa-plugin-twilio-sms@1.1.12
 - medusa-plugin-wishlist@1.1.12
 - medusa-test-utils@1.1.12
 - @medusajs/medusa@1.1.22
2021-04-28 12:26:41 +02:00
Sebastian Rindom
d474ceaee1 Merge remote-tracking branch 'origin/hotfix/bp-stock-sync' into develop 2021-04-28 12:25:12 +02:00
Sebastian Rindom
b3a3a6271d Merge pull request #243 from medusajs/hotfix/bp-stock-sync
fix: better inventory sync
2021-04-28 12:24:32 +02:00
Sebastian Rindom
9eaf02762f fix: better inventory sync 2021-04-28 11:42:40 +02:00
Sebastian Rindom
6ea6ff1c1a Merge remote-tracking branch 'origin/master' into develop 2021-04-28 10:40:28 +02:00
Oliver Windall Juhl
fb0613d3cb fix(medusa): Add free shipping functionality (#241) 2021-04-27 15:14:18 +02:00
Oliver Windall Juhl
7343a4e841 release: next (#239)
* hotfix(medusa-plugin-brightpearl): Use order id in sales order endpoint

* feat(medusa-plugin-sendgrid): adds localization option (#238)

* chore(deps): bump y18n from 4.0.0 to 4.0.1 in /packages/medusa-cli (#226)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump y18n from 4.0.0 to 4.0.3 in /packages/medusa (#235)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump y18n from 4.0.0 to 4.0.1 in /e2e/prod-project (#225)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump y18n in /packages/medusa-core-utils (#224)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(medusa): Swaps on swaps (#229)

Co-authored-by: Sebastian Rindom <skrindom@gmail.com>

* chore: version bumps

* chore: version bumps

* chore(release): Publish

 - babel-preset-medusa-package@1.1.1
 - @medusajs/medusa-cli@1.1.5
 - medusa-core-utils@1.1.7
 - medusa-dev-cli@0.0.6
 - medusa-file-spaces@1.1.10
 - medusa-fulfillment-manual@1.1.7
 - medusa-fulfillment-webshipper@1.1.10
 - medusa-interfaces@1.1.8
 - medusa-payment-adyen@1.1.10
 - medusa-payment-klarna@1.1.11
 - medusa-payment-paypal@1.0.10
 - medusa-payment-stripe@1.1.10
 - medusa-plugin-add-ons@1.1.10
 - medusa-plugin-brightpearl@1.1.13
 - medusa-plugin-contentful@1.1.11
 - medusa-plugin-discount-generator@1.1.1
 - medusa-plugin-economic@1.1.10
 - medusa-plugin-ip-lookup@1.1.1
 - medusa-plugin-mailchimp@1.1.10
 - medusa-plugin-permissions@1.1.10
 - medusa-plugin-restock-notification@0.0.4
 - medusa-plugin-segment@1.1.13
 - medusa-plugin-sendgrid@1.1.11
 - medusa-plugin-slack-notification@1.1.10
 - medusa-plugin-twilio-sms@1.1.10
 - medusa-plugin-wishlist@1.1.10
 - medusa-test-utils@1.1.10
 - @medusajs/medusa@1.1.20

* chore(release): Publish

 - babel-preset-medusa-package@1.1.2
 - @medusajs/medusa-cli@1.1.6
 - medusa-core-utils@1.1.8
 - medusa-dev-cli@0.0.7
 - medusa-file-spaces@1.1.11
 - medusa-fulfillment-manual@1.1.8
 - medusa-fulfillment-webshipper@1.1.11
 - medusa-interfaces@1.1.9
 - medusa-payment-adyen@1.1.11
 - medusa-payment-klarna@1.1.12
 - medusa-payment-paypal@1.0.11
 - medusa-payment-stripe@1.1.11
 - medusa-plugin-add-ons@1.1.11
 - medusa-plugin-brightpearl@1.1.14
 - medusa-plugin-contentful@1.1.12
 - medusa-plugin-discount-generator@1.1.2
 - medusa-plugin-economic@1.1.11
 - medusa-plugin-ip-lookup@1.1.2
 - medusa-plugin-mailchimp@1.1.11
 - medusa-plugin-permissions@1.1.11
 - medusa-plugin-restock-notification@0.0.5
 - medusa-plugin-segment@1.1.14
 - medusa-plugin-sendgrid@1.1.12
 - medusa-plugin-slack-notification@1.1.11
 - medusa-plugin-twilio-sms@1.1.11
 - medusa-plugin-wishlist@1.1.11
 - medusa-test-utils@1.1.11
 - @medusajs/medusa@1.1.21

Co-authored-by: Sebastian Rindom <skrindom@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 16:40:49 +02:00
olivermrbl
348d1c4997 chore(release): Publish
- babel-preset-medusa-package@1.1.2
 - @medusajs/medusa-cli@1.1.6
 - medusa-core-utils@1.1.8
 - medusa-dev-cli@0.0.7
 - medusa-file-spaces@1.1.11
 - medusa-fulfillment-manual@1.1.8
 - medusa-fulfillment-webshipper@1.1.11
 - medusa-interfaces@1.1.9
 - medusa-payment-adyen@1.1.11
 - medusa-payment-klarna@1.1.12
 - medusa-payment-paypal@1.0.11
 - medusa-payment-stripe@1.1.11
 - medusa-plugin-add-ons@1.1.11
 - medusa-plugin-brightpearl@1.1.14
 - medusa-plugin-contentful@1.1.12
 - medusa-plugin-discount-generator@1.1.2
 - medusa-plugin-economic@1.1.11
 - medusa-plugin-ip-lookup@1.1.2
 - medusa-plugin-mailchimp@1.1.11
 - medusa-plugin-permissions@1.1.11
 - medusa-plugin-restock-notification@0.0.5
 - medusa-plugin-segment@1.1.14
 - medusa-plugin-sendgrid@1.1.12
 - medusa-plugin-slack-notification@1.1.11
 - medusa-plugin-twilio-sms@1.1.11
 - medusa-plugin-wishlist@1.1.11
 - medusa-test-utils@1.1.11
 - @medusajs/medusa@1.1.21
2021-04-20 12:59:39 +02:00
olivermrbl
66f5d9d33e chore(release): Publish
- babel-preset-medusa-package@1.1.1
 - @medusajs/medusa-cli@1.1.5
 - medusa-core-utils@1.1.7
 - medusa-dev-cli@0.0.6
 - medusa-file-spaces@1.1.10
 - medusa-fulfillment-manual@1.1.7
 - medusa-fulfillment-webshipper@1.1.10
 - medusa-interfaces@1.1.8
 - medusa-payment-adyen@1.1.10
 - medusa-payment-klarna@1.1.11
 - medusa-payment-paypal@1.0.10
 - medusa-payment-stripe@1.1.10
 - medusa-plugin-add-ons@1.1.10
 - medusa-plugin-brightpearl@1.1.13
 - medusa-plugin-contentful@1.1.11
 - medusa-plugin-discount-generator@1.1.1
 - medusa-plugin-economic@1.1.10
 - medusa-plugin-ip-lookup@1.1.1
 - medusa-plugin-mailchimp@1.1.10
 - medusa-plugin-permissions@1.1.10
 - medusa-plugin-restock-notification@0.0.4
 - medusa-plugin-segment@1.1.13
 - medusa-plugin-sendgrid@1.1.11
 - medusa-plugin-slack-notification@1.1.10
 - medusa-plugin-twilio-sms@1.1.10
 - medusa-plugin-wishlist@1.1.10
 - medusa-test-utils@1.1.10
 - @medusajs/medusa@1.1.20
2021-04-20 12:58:36 +02:00
olivermrbl
b1bd2dfeb4 chore: version bumps 2021-04-20 11:13:59 +02:00
olivermrbl
982da259ed chore: version bumps 2021-04-20 11:10:45 +02:00
olivermrbl
4ce77d5229 Merge branch 'master' into develop 2021-04-20 10:57:56 +02:00
Oliver Windall Juhl
f8f1f57fa1 feat(medusa): Swaps on swaps (#229)
Co-authored-by: Sebastian Rindom <skrindom@gmail.com>
2021-04-20 10:55:15 +02:00
dependabot[bot]
2f3e3fde80 chore(deps): bump y18n in /packages/medusa-core-utils (#224)
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 10:43:18 +02:00
dependabot[bot]
9cc03087aa chore(deps): bump y18n from 4.0.0 to 4.0.1 in /e2e/prod-project (#225)
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 10:42:51 +02:00
dependabot[bot]
e4617ff93e chore(deps): bump y18n from 4.0.0 to 4.0.3 in /packages/medusa (#235)
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 10:42:25 +02:00
dependabot[bot]
27a99c6d7b chore(deps): bump y18n from 4.0.0 to 4.0.1 in /packages/medusa-cli (#226)
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 10:41:59 +02:00
Sebastian Rindom
a81ea1c20a feat(medusa-plugin-sendgrid): adds localization option (#238) 2021-04-20 10:40:51 +02:00
Sebastian Rindom
96451ffa1a Merge branch 'hotfix/bp-currency-typo' into develop 2021-04-16 15:58:39 +02:00
Sebastian Rindom
6b51c06c22 Merge pull request #237 from medusajs/hotfix/bp-currency-typo
hotfix(brightpearl): currencyCode -> currency_code
2021-04-16 15:57:54 +02:00
Sebastian Rindom
bed0d5da99 hotfix(brightpearl): currencyCode -> currency_code 2021-04-15 09:53:26 +02:00
olivermrbl
3f884e8b3f chore(release): Publish
- medusa-plugin-brightpearl@1.1.13
2021-04-14 12:33:49 +02:00
Oliver Windall Juhl
345b0e6305 hotfix(medusa-plugin-brightpearl): Use order id in sales order endpoint (#236) 2021-04-14 12:33:09 +02:00
olivermrbl
4e025e3501 hotfix(medusa-plugin-brightpearl): Use order id in sales order endpoint 2021-04-14 11:37:11 +02:00
Sebastian Rindom
249b666529 chore(release): Publish
- medusa-core-utils@1.1.6
 - medusa-file-spaces@1.1.9
 - medusa-fulfillment-manual@1.1.6
 - medusa-fulfillment-webshipper@1.1.9
 - medusa-interfaces@1.1.7
 - medusa-payment-adyen@1.1.9
 - medusa-payment-klarna@1.1.10
 - medusa-payment-paypal@1.0.9
 - medusa-payment-stripe@1.1.9
 - medusa-plugin-add-ons@1.1.9
 - medusa-plugin-brightpearl@1.1.12
 - medusa-plugin-contentful@1.1.10
 - medusa-plugin-economic@1.1.9
 - medusa-plugin-mailchimp@1.1.9
 - medusa-plugin-permissions@1.1.9
 - medusa-plugin-restock-notification@0.0.3
 - medusa-plugin-segment@1.1.12
 - medusa-plugin-sendgrid@1.1.10
 - medusa-plugin-slack-notification@1.1.9
 - medusa-plugin-twilio-sms@1.1.9
 - medusa-plugin-wishlist@1.1.9
 - medusa-test-utils@1.1.9
 - @medusajs/medusa@1.1.19
2021-04-13 12:39:08 +02:00
Sebastian Rindom
d243b55ccf fix: integration tests 2021-04-13 12:28:31 +02:00
Sebastian Rindom
2982a8e682 fix: merge develop 2021-04-13 12:16:40 +02:00
Sebastian Rindom
a468c451e8 fix: merge develop 2021-04-13 12:13:32 +02:00
Sebastian Rindom
e9ff9f47ae Merge remote-tracking branch 'origin/master' into develop 2021-04-13 12:10:27 +02:00
Sebastian Rindom
0e51dbdfed chore(release): Publish
- medusa-dev-cli@0.0.5
 - medusa-file-spaces@1.1.8
 - medusa-fulfillment-webshipper@1.1.8
 - medusa-payment-adyen@1.1.8
 - medusa-payment-klarna@1.1.9
 - medusa-payment-paypal@1.0.8
 - medusa-payment-stripe@1.1.8
 - medusa-plugin-add-ons@1.1.8
 - medusa-plugin-brightpearl@1.1.11
 - medusa-plugin-contentful@1.1.9
 - medusa-plugin-economic@1.1.8
 - medusa-plugin-mailchimp@1.1.8
 - medusa-plugin-permissions@1.1.8
 - medusa-plugin-restock-notification@0.0.2
 - medusa-plugin-segment@1.1.11
 - medusa-plugin-sendgrid@1.1.9
 - medusa-plugin-slack-notification@1.1.8
 - medusa-plugin-twilio-sms@1.1.8
 - medusa-plugin-wishlist@1.1.8
 - medusa-test-utils@1.1.8
 - @medusajs/medusa@1.1.18
2021-04-13 12:08:57 +02:00
Sebastian Rindom
26e7f20306 fix: normalize thumbanils 2021-04-12 22:37:12 +02:00
Sebastian Rindom
37ab52b195 fix: typo 2021-04-12 10:07:49 +02:00
Sebastian Rindom
e105d4edde fix: bp swaps 2021-04-12 09:57:35 +02:00
Sebastian Rindom
237ed51307 fix: restock 2021-04-09 19:31:56 +02:00
Sebastian Rindom
7897610620 fix: merge 2021-04-09 10:10:56 +02:00
Sebastian Rindom
6c21cc7136 Merge pull request #234 from medusajs/fix/webshipper-coo
feat(webshipper): adds support for certificate of origin
2021-04-09 10:09:41 +02:00
Sebastian Rindom
bb9f93de45 Merge pull request #231 from medusajs/fix/segment-track-swaps
fix(segment): track swaps
2021-04-09 10:09:25 +02:00