Commit Graph

43 Commits

Author SHA1 Message Date
Sebastian Rindom
f83a0c12c0 fix: dependencies 2021-06-08 18:11:53 +02:00
Sebastian Rindom
10113d0657 test: adds integration test for shipping-option-requirements 2021-06-08 17:21:42 +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
olivermrbl
0516bf7a5f minor test fix 2021-06-02 18:39:22 +02:00
Sebastian Rindom
586f4d884c feat: allow custom address on claims 2021-05-27 12:29:11 +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
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
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
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
Sebastian Rindom
d243b55ccf fix: integration tests 2021-04-13 12:28:31 +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
olivermrbl
7872d37c04 fix merge conflicts 2021-03-17 14:50:07 +01:00
Sebastian Rindom
a26b12a536 fix: expose statusses on order 2021-03-17 14:35:53 +01:00
olivermrbl
c513813bb6 fix(medusa): Add usage_count + usage_limit to discount 2021-03-17 08:42:14 +01:00
Sebastian Rindom
192237b335 Return Reason (#205)
* feat: add return reasons

* feat: add return reasons

* feat: adds return reason entity

* fix: endpoint tag

* fix: endpoint tag

* fix: do not require label

* fix: PR
2021-03-16 13:57:33 +01:00
Sebastian Rindom
7c7f86e8e8 fix: allows shipping option filters in return (#202)
* fix: allows shipping option filters in return

* fix: test

* chore: update fixtures

* docs: update openapi
2021-03-12 14:23:03 +01:00
Sebastian Rindom
dd7b306333 feat(medusa): cart context (#201)
- Adds a context field to Cart
- context is automatically populated with ip + user agent
- context can be updated via POST /store/cart/:id or set when creating via POST /store/cart
2021-03-12 11:48:51 +01:00
Oliver Windall Juhl
a031f1f338 fix(medusa): Upsert product images (#200) 2021-03-12 10:09:01 +01:00
olivermrbl
83a7d7ec5a fix pr review 2021-03-11 11:38:16 +01:00
olivermrbl
d55c24e28c Merge branch 'develop' into feat/draft-orders 2021-03-11 08:35:41 +01:00
Sebastian Rindom
252db5ef7e feat(medusa): storefront return (#194)
* feat: adds endpoint to lookup an order by its display_id and email

* feat: adds storefront returns

* fix: pr comments
2021-03-10 17:42:39 +01:00
Sebastian Rindom
d9c17b5122 Merge branch 'hotfix/gift-card-creation' into develop 2021-03-08 16:14:22 +01:00
Sebastian Rindom
521d306b71 fix: adds integration test to create endpoint 2021-03-08 15:44:37 +01:00
Sebastian Rindom
0b172b6d77 Allow Gift Card balance lookup in the Storefront API (#193)
* feat: enable balance lookup for gift-cards
2021-03-08 13:26:30 +01:00
Oliver Windall Juhl
dd0491f521 feat(medusa): Add support for filtering with gt, lt, gte and lte (#190)
- Add support for filtering with lt, gt, lte, gte in the following format: created_at[gt]=01-26-1997
- Add middleware for cleaning request queries
- Add order query validation
- Temp. disables tags in claim integration tests
2021-03-01 11:32:17 +01:00
olivermrbl
97b19ccbdd fix merge conflicts 2021-02-27 10:22:33 +01:00
Oliver Windall Juhl
22be418ec1 fix(medusa): Add querying func. on customer retrievals (#181) 2021-02-23 13:40:49 +01:00
olivermrbl
b65edfce06 PR review modifications 2021-02-19 17:42:18 +01:00
olivermrbl
c31e1ea691 fixed merge conflicts 2021-02-19 08:47:24 +01:00
Sebastian Rindom
99ad43bf47 feat(medusa): tracking links (#177)
* fix: creates tracking links on fulfillments

* fix: typo
2021-02-18 16:59:19 +01:00
olivermrbl
3ac71e4a4c draft order func. complete 2021-02-18 15:46:40 +01:00
olivermrbl
c4164e4b66 add payment link func. 2021-02-18 13:22:55 +01:00
olivermrbl
283f8fbe54 fix merge conflicts 2021-02-17 17:24:34 +01:00
olivermrbl
362c5c6055 adds endpoints for draft orders 2021-02-16 16:53:55 +01:00
Oliver Windall Juhl
c4d1203155 feat(medusa): Product category, type and tags 2021-02-12 08:42:19 +01:00
Oliver Windall Juhl
81df78384c hotfix(medusa): Get cart with session (#165) 2021-02-04 14:51:04 +01:00
Sebastian Rindom
690d339667 feat(medusa,brightpearl,segment,webshipper): claims (#163)
* chore: create tests

* chore: models

* fix: passing initial tests

* test: adds integration test

* test: clean up integration implementation

* fix: claims

* fix: brightpearl + webshipper

* tests: passing

* fix: update claim items

* fix: adds gitignore

* fix: pr comments

* fix: single migration

* fix(medusa-plugin-segment): adds item claimed event to segment
2021-02-03 09:49:12 +01:00