2530 Commits
Author SHA1 Message Date
Sebastian Rindom 0a62590044 fix: avoid error message 2021-06-10 15:35:11 +02:00
Sebastian Rindom 245ccdc477 fix: order order 2021-06-08 21:49:59 +02:00
olivermrbl eb0a4afd79 hotfix: Add shipping method to draft order 2021-06-08 16:55:53 +02:00
Sebastian Rindom 3d16a24a2a Merge branch 'develop' into feat/draft-orders 2021-06-08 15:48:17 +02:00
Sebastian Rindom bd498a6006 Merge pull request #268 from medusajs/feat/cli
Feat/cli
2021-06-08 15:47:08 +02:00
Sebastian Rindom e20ba1e4fa fix: PR 2021-06-08 14:57:12 +02:00
Sebastian Rindom 0f1f51311e chore:ttests 2021-06-08 13:31:05 +02:00
Sebastian Rindom 91511cbdf8 fix: mobile pay support 2021-06-08 10:56:35 +02:00
olivermrbl 71c995ecfb completed_at allow null 2021-06-08 08:31:51 +02:00
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
Sebastian Rindom e59dc3b6c8 fix: test name registration 2021-06-07 15:11:37 +02:00
Sebastian Rindom f4f67a376d fix: common registration name formatter 2021-06-07 14:54:07 +02:00
olivermrbl e79b8f6494 add update-line-item on draft orders 2021-06-04 14:33:51 +02:00
Sebastian Rindom 57a2de64b2 fix: migration dirs 2021-06-03 14:37:07 +02:00
Sebastian Rindom e764d8e465 fix: migration dirs 2021-06-03 14:29:52 +02:00
olivermrbl 862f8282c4 fix merge conflicts 2021-06-03 11:25:18 +02:00
Sebastian Rindom 7887ca90d9 chore: test fix 2021-06-03 10:37:34 +02:00
Sebastian Rindom a9f6c33e66 Merge remote-tracking branch 'origin/develop' into feat/cli 2021-06-03 10:13:22 +02:00
Sebastian Rindom 5136c77401 feat(cli): adds seed script 2021-06-03 10:03:44 +02:00
Sebastian Rindom 42d9a487ff fix: wip 2021-06-02 13:44:25 +02:00
olivermrbl 8333a547aa add retrieve discount by code 2021-06-02 08:09:04 +02:00
Sebastian Rindom b20d5c7150 chore: merge develop 2021-06-01 21:15:20 +02:00
Sebastian Rindom 586f4d884c feat: allow custom address on claims 2021-05-27 12:29:11 +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
olivermrbl 23b9066159 Merge branch 'hotfix/claim-return-shipping' into develop 2021-04-29 15:47:32 +02:00
Sebastian Rindom df5018669c fix: bearer user id login development 2021-04-29 11:09:50 +02:00
olivermrbl cb0fb757a0 hotfix: Claim return shipping 2021-04-28 16:45:48 +02:00
Oliver Windall Juhl fb0613d3cb fix(medusa): Add free shipping functionality (#241) 2021-04-27 15:14:18 +02:00
Sebastian Rindom bbd2f02d54 fix: setup to allow login to Medusa Cloud 2021-04-22 18:44:55 +02:00
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
Oliver Windall JuhlandSebastian Rindom f8f1f57fa1 feat(medusa): Swaps on swaps (#229)
Co-authored-by: Sebastian Rindom <skrindom@gmail.com>
2021-04-20 10:55:15 +02:00
olivermrbl 4e7b4b3a8a Merge branch 'fix/discount-usage' into develop 2021-04-09 09:11:19 +02:00
olivermrbl f08511166a pr comment fix 2021-04-07 12:22:40 +02:00
olivermrbl 993766e5a1 Merge branch 'master' into fix/discount-usage 2021-04-07 12:22:09 +02:00
Sebastian Rindom 69442a1735 fix: adds tests 2021-04-06 18:55:11 +02:00
Sebastian Rindom 9d810971a7 fix: working api 2021-04-06 15:01:13 +02:00
Sebastian Rindom 2b2555004e fix: creates restock functionality 2021-04-06 12:22:19 +02:00
Sebastian Rindom 0a80b098a4 chore: merge develop 2021-04-06 09:38:18 +02:00
olivermrbl 01f184b9b0 small fix 2021-03-29 12:29:35 +02:00
olivermrbl 3b801e7486 fix nullable description 2021-03-29 11:45:30 +02:00
olivermrbl 38521169c0 add integration tests 2021-03-29 10:28:14 +02:00
olivermrbl d9cd52a177 fix(medusa): Move discount usage from rule to discount 2021-03-29 10:15:41 +02:00
Sebastian Rindom e2228990a7 hotfix: create claim item w/o tags/images 2021-03-26 12:48:24 +01:00
Sebastian Rindom 8bd5fa8212 feat: restock service 2021-03-26 12:44:55 +01:00
Oliver Windall Juhl 1aa1760640 hotfix(medusa): Add missing discount field (#213) 2021-03-18 10:07:56 +01:00