asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,277 Commits 2 Branches 0 Tags
f2c325177187586d600dcdcdc143ee10daffd0e5
Commit Graph

1277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Rindom
f2c3251771 Merge pull request #444 from medusajs/feat/rma-shipping-options 
feat: add rma shipping options
 2021-10-15 20:01:41 +02:00
Sebastian Rindom
fe34ab5976 fix: tests 2021-10-15 20:00:27 +02:00
Sebastian Rindom
690cdd2392 Merge branch 'develop' into feat/rma-shipping-options 2021-10-15 19:55:06 +02:00
Sebastian Rindom
2fb71c24bf Merge pull request #572 from medusajs/fix/tests 
fix: failing integration tests
 2021-10-15 19:54:39 +02:00
Sebastian Rindom
dc7ecc959a fix: add possiblity to unset billing address 2021-10-15 19:24:44 +02:00
Sebastian Rindom
9c72acda40 fix: failing integration tests 2021-10-15 19:14:44 +02:00
Sebastian Rindom
2297a84cb9 fix: merge develop 2021-10-15 18:44:19 +02:00
Sebastian Rindom
75e59ec6d5 fix: allow custom shipping options to bypass option requirements 2021-10-15 16:50:13 +02:00
zakariaelas
569595d0bb fix: include shipping profile and requirement relations when fetching custom shipping options 2021-10-15 15:01:23 +01:00
Vladyslav
1a37b27ca0 Fix packages/medusa/src/services/customer.js eslint errors (#552) 2021-10-15 10:33:45 +02:00
Yyee
38559b5454 fix: make packages/medusa/src/services/notification.js pass eslint (#566) 2021-10-15 09:00:43 +02:00
Sebastian Mateos Nicolajsen
fbd08e0feb feat:swap/claim on claim and claim on swap (#424) 2021-10-14 18:21:38 +02:00
Joshua T
b6efa6f471 fix: make return-reason.js pass eslint (#539) 2021-10-14 18:18:24 +02:00
Ítalo Sousa
f2d97dfb86 fix: make /packages/medusa/src/services/line-item.js pass eslint (#555) 2021-10-14 18:09:18 +02:00
Lucifer
303eb06b2a chore: Make packages/medusa/src/services/shipping-option.js (#540) 2021-10-14 17:25:33 +02:00
Vladyslav
1791acb044 fix: make packages/medusa/src/services/draft-order.js pass eslint (#554) 2021-10-14 17:24:56 +02:00
zakariaelas
f7c765945b fix: jsdoc custom shipping option service 2021-10-14 16:14:20 +01:00
zakariaelas
71d433c335 fix: remove custom shipping options from swapService create method call 2021-10-14 16:10:08 +01:00
zakariaelas
29c5a1f8d2 fix: store cart integration test by removing custom shipping options when creating a swap 2021-10-14 16:03:59 +01:00
Philip Korsholm
ba2de6906a Feat:contentful plugin archive on delete 
* extend plugin with methods for archival in contentful

* add events to services

* rename entities

* eventbusservice to delete

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

* testing

* adjust options

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

* adjust options

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

* Update packages/medusa-plugin-contentful/src/services/contentful.js

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

Co-authored-by: Sebastian Rindom <skrindom@gmail.com>
 2021-10-14 17:00:27 +02:00
zakariaelas
7cdd628997 merge develop and resolve conflicts 2021-10-14 15:44:58 +01:00
zakariaelas
36aeb4fffa fix: remove verbose mode in integration test + fix jsdoc 2021-10-14 14:50:28 +01:00
zakariaelas
dba1d5bb69 fix: adjustments based on seb's feedback 
- remove eager from shipping_option relationship in `models/custom-shipping-options.ts`
- remove custom_shipping_options relation from cart model
 2021-10-14 14:44:36 +01:00
Sebastian Rindom
62fda1043e Merge pull request #559 from medusajs/chore/lint 
chore: add better linting rules
 2021-10-14 10:54:53 +02:00
saurabh042
a1ada93093 chore/lint : Make packages/medusa/src/services/order.js pass linting #515 (#556) 2021-10-14 10:49:57 +02:00
Vladyslav
1e13c831ab fix: make packages/medusa/src/services/discount.js pass eslint (#553) 2021-10-14 10:36:58 +02:00
Rachel
fe599c709e fix: make medusa/src/services/fulfillment.js pass eslint (#557) 
* fix: make /packages/medusa/src/services/gift-card.js pass eslint

* fix: make medusa/src/services/fulfillment.js pass eslint

* chore: restore eslintignore change

* chore: clean up diffs
 2021-10-14 10:31:23 +02:00
Vladyslav
ddeaf57f59 fix: make packages/medusa/src/services/claim.js pass eslint (#551) 2021-10-14 09:52:18 +02:00
Sebastian Rindom
d9608e15e8 fix: autofix 2021-10-13 20:19:09 +02:00
Ajordat
f926e0245c fix: make packages/medusa/src/services/region.js pass eslint (#542) 
* fix: make packages/medusa/src/services/region.js pass eslint

* Fix intendation
 2021-10-13 20:18:21 +02:00
Sergiy Fomin
7565d139d4 PR to make a fix to issue #531 -- previous reverted PR #543 (#548) 
* fixed linting errors on packages/medusa/src/services/user.js #531

fixing merge conflicts

* fix: resolving a few issues as raised in the PR, issue: #531

Co-authored-by: Sergiy Fomin <sergiy.fomin@sourcedgroup.com>
 2021-10-13 20:16:25 +02:00
Sebastian Rindom
ba2d92341d Revert "fixed linting errors on packages/medusa/src/services/user.js #531 (#543)" (#547) 
This reverts commit cf5b405a56.
 2021-10-13 19:50:10 +02:00
Kasper Fabricius Kristensen
fc50aacde2 fix: options relations on GET variant (#532) 2021-10-13 19:46:44 +02:00
Sergiy Fomin
cf5b405a56 fixed linting errors on packages/medusa/src/services/user.js #531 (#543) 
* fixed linting errors on packages/medusa/src/services/user.js #531

* fix: resolving a few issues as raised in the PR, issue: #531

Co-authored-by: Sergiy Fomin <sergiy.fomin@sourcedgroup.com>
 2021-10-13 19:45:50 +02:00
Luke Nguyen
10f1d9df5c fix: Make packages/medusa/src/services/transaction.js pass linting (#534) 2021-10-13 18:07:28 +02:00
Sebastian Rindom
9b0ca6e38c Merge branch 'master' into develop 2021-10-13 17:56:38 +02:00
Sebastian Rindom
7c0700e03f hotfix(medusa-plugin-restock-notification): add delay for event trigger (#544) 
* fix: add delay before triggering email

* fix: non-blocking delay
 2021-10-13 17:56:10 +02:00
Sebastian Rindom
8d7d0e4b05 fix: add prettier rules to eslint 2021-10-13 16:12:11 +02:00
pKorsholm
5ef2a3fbcb feat: Product filtering (#439) 2021-10-13 16:01:59 +02:00
Sebastian Mateos Nicolajsen
c0e947f47a fix: update product images (#494) 2021-10-13 12:05:58 +02:00
Rachel
06ee5df9a0 fix: make /packages/medusa/src/services/gift-card.js pass eslint (#533) 2021-10-13 09:48:41 +02:00
Sebastian Rindom
751d1edd62 fix: update circleci node 2021-10-12 22:34:09 +02:00
Sebastian Rindom
43a2b07866 fix: example 2021-10-12 22:13:52 +02:00
Sebastian Rindom
442d4ff3c9 fix: correct path 2021-10-12 22:10:36 +02:00
Sebastian Rindom
30b6a793f1 chore: add lint-staged + husky 2021-10-12 22:09:46 +02:00
Sebastian Rindom
f02cb638db chore: remove packages/*/.eslintrc|.prettierrc 2021-10-12 21:24:01 +02:00
Sebastian Mateos Nicolajsen
0cf9e416f3 Allow the user to log out (#459) 2021-10-12 11:09:38 +02:00
Sebastian Mateos Nicolajsen
84d4d791ea feat: allow product selection on discounts allocated to a specific item (#395) 2021-10-11 13:46:32 +02:00
Mark
3d891c9b4f Issue #442 Prettier rules not applied to some integration tests files (#445) 2021-10-08 12:11:58 +02:00
Oliver Windall Juhl
a175560efa chore: Update README 2021-10-07 20:34:08 +02:00