Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(dashboard, order, medusa, types, js-sdk): Request return e2e flow #7848

Merged
merged 92 commits into from
Jul 24, 2024
Merged

feat(dashboard, order, medusa, types, js-sdk): Request return e2e flow #7848

merged 92 commits into from
Jul 24, 2024

Commits on Jun 26, 2024

  1. wip: return

    @fPolic
    fPolic committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    cf354b7 View commit details
    Browse the repository at this point in the history

  2. wip: add items screen and functionality

    @fPolic
    fPolic committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    ac10b05 View commit details
    Browse the repository at this point in the history

  3. feat: fields

    @fPolic
    fPolic committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    975266f View commit details
    Browse the repository at this point in the history

  4. feat: calculations

    @fPolic
    fPolic committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    eb707da View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. fix: computing return quantity

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d5168e3 View commit details
    Browse the repository at this point in the history

  2. chore: comment

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    42701e3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    6373fdd View commit details
    Browse the repository at this point in the history

  4. fix: filter return options by location id

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    190d175 View commit details
    Browse the repository at this point in the history

  5. feat: editing of shipping price

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    2b0fd42 View commit details
    Browse the repository at this point in the history

  6. feat: post data, types, client methods and hook

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    dff393c View commit details
    Browse the repository at this point in the history

  7. fix: route

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    33eba05 View commit details
    Browse the repository at this point in the history

  8. fix: returns routes registration

    @fPolic
    fPolic committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c2ba30e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    4161b02 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    c51b145 View commit details
    Browse the repository at this point in the history

  2. fix: negative zero

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    50a3936 View commit details
    Browse the repository at this point in the history

  3. fix: issue with zod validation and endpoint registration

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1e6b829 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1f216d2 View commit details
    Browse the repository at this point in the history

  5. fix: update refundable calculation

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5f0f864 View commit details
    Browse the repository at this point in the history

  6. feat: listing return reasons

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    94732b4 View commit details
    Browse the repository at this point in the history

  7. fix: running migrations for orders module

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d081e4c View commit details
    Browse the repository at this point in the history

  8. fix: use shipped quantity to determine returnable quantity

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    82ac21a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/admin-next/dashboard/src/components/modals/route-focus-modal/route-focus-modal.tsx
    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a85bb7a View commit details
    Browse the repository at this point in the history

  10. fix: resolve conflicts, use new stacked modal

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    696e7a0 View commit details
    Browse the repository at this point in the history

  11. fix: link error

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    bc26ab9 View commit details
    Browse the repository at this point in the history

  12. feat: inventory management

    @fPolic
    fPolic committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b987dd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    f0cf7bd View commit details
    Browse the repository at this point in the history

  2. fix: disable row selection if quantity requirements aren't met

    @fPolic
    fPolic committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    7f48c5e View commit details
    Browse the repository at this point in the history

  3. fix: defaults, closing modal after create

    @fPolic
    fPolic committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    75e08b7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    8e628ea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feat/rma-create-return

    @olivermrbl
    olivermrbl authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    3961315 View commit details
    Browse the repository at this point in the history

  6. fix: optional reason id

    @fPolic
    fPolic committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ce46656 View commit details
    Browse the repository at this point in the history

  7. feat: placeholder stripes

    @fPolic
    fPolic committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    8575237 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
#	packages/core/js-sdk/src/admin/order.ts
#	packages/medusa/src/api/admin/returns/validators.ts
    @fPolic
    fPolic committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ef31633 View commit details
    Browse the repository at this point in the history

  2. fix: filter out fulfillment created for returns

    @fPolic
    fPolic committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    2508a87 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/admin-next/dashboard/src/hooks/api/orders.tsx
#	packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx
#	packages/core/js-sdk/src/admin/order.ts
#	packages/core/types/src/http/order/admin.ts
#	packages/medusa/src/api/admin/returns/validators.ts
    @fPolic
    fPolic committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    be45001 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    3712c3b View commit details
    Browse the repository at this point in the history

  3. fix: build

    @fPolic
    fPolic committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    7348f8b View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. feat: add new client and typings

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    fa2c6c6 View commit details
    Browse the repository at this point in the history

  2. fix: remove old client/types stuff, start adding new hooks

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f229f7f View commit details
    Browse the repository at this point in the history

  3. feat: add rest of the hooks

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    424bbf4 View commit details
    Browse the repository at this point in the history

  4. feat: prep hooks, reorg modals

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d663c25 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f6de000 View commit details
    Browse the repository at this point in the history

  6. fix: build

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8ceb90e View commit details
    Browse the repository at this point in the history

  7. feat: new item component, move reason and note

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5a57398 View commit details
    Browse the repository at this point in the history

  8. wip: active return

    @fPolic
    fPolic committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7c61f96 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    555aa24 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2292d45 View commit details
    Browse the repository at this point in the history

  3. wip: update form state when items are added to the return

    @fPolic
    fPolic committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    29e6f5f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1058456 View commit details
    Browse the repository at this point in the history

  5. feat: use order preview endpoint

    @fPolic
    fPolic committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ce65b19 View commit details
    Browse the repository at this point in the history

  6. wip: create shipping method

    @fPolic
    fPolic committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    3587140 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a8c940d View commit details
    Browse the repository at this point in the history

  8. feat: use remove return item endpoint

    @fPolic
    fPolic committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4e06368 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    fa16eab View commit details
    Browse the repository at this point in the history

  2. wip: update quantity

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7892484 View commit details
    Browse the repository at this point in the history

  3. fix: quantity update

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    497f8af View commit details
    Browse the repository at this point in the history

  4. fix: correct item price

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f6540ab View commit details
    Browse the repository at this point in the history

  5. wip: cancel return request, register endpoint, fix params, add client… 

    … and hook
    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a44b4ee View commit details
    Browse the repository at this point in the history

  6. feat: fetch active return

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    41ef167 View commit details
    Browse the repository at this point in the history

  7. feat: connect confirm return endpoint

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    17196b2 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/medusa/src/api/admin/returns/middlewares.ts
    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    00f915b View commit details
    Browse the repository at this point in the history

  9. fix: comment cancel action for now

    @fPolic
    fPolic committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    0e9260e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. feat: update internal note

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    323c623 View commit details
    Browse the repository at this point in the history

  2. feat: return reason setting and updating

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    d43dab6 View commit details
    Browse the repository at this point in the history

  3. fix: actions undefined on remove

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    84e14b3 View commit details
    Browse the repository at this point in the history

  4. fix: deleting old SM, refactor add shipping, update shipping clients

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f66d180 View commit details
    Browse the repository at this point in the history

  5. wip: updating custom price

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    17c6289 View commit details
    Browse the repository at this point in the history

  6. feat: set initial option

    @fPolic
    fPolic committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    6411873 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/medusa/src/api/admin/returns/[id]/cancel/route.ts
#	packages/medusa/src/api/admin/returns/middlewares.ts
    @fPolic
    fPolic committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    0391aa3 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. fix: breaking page when there is no initiated return

    @fPolic
    fPolic committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    2d39f58 View commit details
    Browse the repository at this point in the history

  2. fix: check

    @fPolic
    fPolic committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    72532cd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/core/js-sdk/src/admin/index.ts
    @fPolic
    fPolic committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    4ed3f8e View commit details
    Browse the repository at this point in the history

  4. fix: check return requested quantity on form init

    @fPolic
    fPolic committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    b1334f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    49f8065 View commit details
    Browse the repository at this point in the history

  2. fix: remove TEMP check for hiding fulfillments

    @fPolic
    fPolic committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    42b3b85 View commit details
    Browse the repository at this point in the history

  3. fix: send notification

    @fPolic
    fPolic committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    2895a96 View commit details
    Browse the repository at this point in the history

  4. fix: address review

    @fPolic
    fPolic committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    799dd54 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e1bb856 View commit details
    Browse the repository at this point in the history

  2. fix: display return requested total

    @fPolic
    fPolic committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    4d2bb05 View commit details
    Browse the repository at this point in the history

  3. fix: make note and reason nullables

    @fPolic
    fPolic committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6d9a07a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feat/rma-create-return

    @srindom
    srindom authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    32648b3 View commit details
    Browse the repository at this point in the history

  5. feat: display requested returns in order summary, returns hooks/clients

    @fPolic
    fPolic committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    16e7c06 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into feat/rma-create-return 

    # Conflicts:
#	packages/modules/order/src/migrations/Migration20240604100512.ts
    @fPolic
    fPolic committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    fb2371c View commit details
    Browse the repository at this point in the history

  7. feat: cancel return

    @fPolic
    fPolic committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    ca1e302 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f91e456 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. fix: refactor, cleanup duplicates, cache keys revisit

    @fPolic
    fPolic committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    2366c4a View commit details
    Browse the repository at this point in the history

  2. fix: correct invalidation for canceling

    @fPolic
    fPolic committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    e95b879 View commit details
    Browse the repository at this point in the history

  3. fix: shipping method price calculation

    @fPolic
    fPolic committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    e5029fc View commit details
    Browse the repository at this point in the history

  4. fix: cleanup order summary

    @fPolic
    fPolic committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    79b8e1a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feat/rma-create-return

    @srindom
    srindom authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    2e163aa View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into feat/rma-create-return

    @fPolic
    fPolic authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    fbc34cb View commit details
    Browse the repository at this point in the history

  7. feat: add return info to activity section

    @fPolic
    fPolic committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    b0be548 View commit details
    Browse the repository at this point in the history