Commit Graph

865 Commits

Author SHA1 Message Date
olivermrbl
c8b134c488 merges migration files 2021-06-08 08:24:00 +02:00
olivermrbl
1edee26e7b replace order count 2021-06-07 22:22:35 +02:00
olivermrbl
77a84af35c use correct order listing 2021-06-07 21:39:21 +02:00
olivermrbl
48af705478 fix draftorder completed at column 2021-06-07 18:20:18 +02:00
olivermrbl
c0f2d629ab PR Review fixes 2021-06-07 15:23:41 +02:00
olivermrbl
e79b8f6494 add update-line-item on draft orders 2021-06-04 14:33:51 +02:00
olivermrbl
862f8282c4 fix merge conflicts 2021-06-03 11:25:18 +02:00
Sebastian Rindom
024251b5d2 Merge pull request #263 from medusajs/feat/address-control
feat: allow custom address on claims
2021-06-03 10:12:51 +02:00
olivermrbl
d6d7b30a52 chore: bump babel cli 2021-06-02 18:47:20 +02:00
olivermrbl
0516bf7a5f minor test fix 2021-06-02 18:39:22 +02:00
olivermrbl
8333a547aa add retrieve discount by code 2021-06-02 08:09:04 +02:00
Sebastian Rindom
ce2d22428f chore: babel deps 2021-05-31 14:33:44 +02:00
Sebastian Rindom
0050fc7b18 chore: babel deps 2021-05-31 14:23:32 +02:00
Sebastian Rindom
813a1c95a8 fix: babel 2021-05-31 14:08:05 +02:00
Sebastian Rindom
81960d5181 fix: babel 2021-05-31 14:02:50 +02:00
Sebastian Rindom
577da11b98 fix: add optional chaining 2021-05-27 12:43:07 +02:00
Sebastian Rindom
586f4d884c feat: allow custom address on claims 2021-05-27 12:29:11 +02:00
olivermrbl
b560f1197b clean up lock files 2021-05-26 14:43:10 +02:00
olivermrbl
117da8ebd8 clean up 2021-05-26 14:08:43 +02:00
olivermrbl
e3343f74a7 fix merge conflicts from develop 2021-05-25 15:44:26 +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