Commit Graph
329 Commits
Author SHA1 Message Date
Oliver Windall Juhl bf4e8d8ff8 hotfix: Claim return shipping (#244) 2021-04-29 15:46:56 +02:00
Oliver Windall Juhldependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Sebastian Rindom
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 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
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 8fc6b26cb8 pr review fixes 2021-03-17 10:32:11 +01:00
olivermrbl fa2c6f9beb fix merge conflicts 2021-03-17 08:52:00 +01:00
olivermrbl de7245b574 --amend 2021-03-17 08:50:15 +01:00
Sebastian Rindom 3c3d6a0d8f fix 2021-03-17 08:43:49 +01:00
olivermrbl c513813bb6 fix(medusa): Add usage_count + usage_limit to discount 2021-03-17 08:42:14 +01:00
Sebastian Rindom 29693bb666 Merge remote-tracking branch 'origin/develop' into release/next 2021-03-17 08:34:56 +01:00
Sebastian Rindom 227cdb6222 fix: contentful sync (#206) 2021-03-17 08:34:38 +01:00
Sebastian Rindom 49f1d0f67a fix: merge 2021-03-16 22:39:29 +01:00
Sebastian Rindom 31d5bb017d fix: merge 2021-03-16 22:27:09 +01:00
Sebastian Rindom 3d0dff58c4 docs: fixture improvements + small fixes (#204)
* fix: deref arrays

* docs: clean up

* fix: update license
2021-03-16 18:15:41 +01:00
Sebastian Rindom b18beb5a84 Merge remote-tracking branch 'origin/develop' into release/next 2021-03-16 13:58:18 +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 3fbf38ffc9 fix(medusa): expose items.refundable 2021-03-15 13:45:20 +01:00
Sebastian Rindom 6ad2b0e6e9 fix: merge api 2021-03-15 08:28:53 +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
Sebastian Rindom ffac0d3a3d fix: add region to gift-cards 2021-03-11 16:18:33 +01:00
Sebastian Rindom ca74226d4a docs: add new endpoints 2021-03-11 08:39:44 +01:00
Sebastian Rindom 833da81cc2 hotfix(brightpearl): rounding errors + failing customer test (#199) 2021-03-11 08:23:53 +01:00
Sebastian Rindom 0601b34765 chore: merge 2021-03-11 08:21:37 +01:00
Sebastian Rindom d02b804ed3 hotfix(brightpearl): rounding errors + failing customer test 2021-03-11 08:10:19 +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 8edb32c742 docs: oas (#197)
Adds OpenAPI specification of Storefront and Admin APIs.
Updates docs project.
2021-03-10 11:51:54 +01:00
Sebastian Rindom d9c17b5122 Merge branch 'hotfix/gift-card-creation' into develop 2021-03-08 16:14:22 +01:00
Sebastian Rindom 975de99ee7 hotfix: gift card creation (#196)
* fix: enable gift-card creation without order_id

* fix: adds integration test to create endpoint
2021-03-08 15:58:59 +01:00
Sebastian Rindom 521d306b71 fix: adds integration test to create endpoint 2021-03-08 15:44:37 +01:00
Sebastian Rindom 1263d24ca3 fix: enable gift-card creation without order_id (#195) 2021-03-08 15:31:39 +01:00
Sebastian Rindom 9ce935a779 fix: enable gift-card creation without order_id 2021-03-08 13:58:01 +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
olivermrbl 85e2148f9e Merge branch 'hotfix/product-filtering' into develop 2021-03-03 13:35:45 +01:00
olivermrbl 11a910e45d Merge branch 'hotfix/cart-retrieve' into develop 2021-03-03 13:35:25 +01:00