Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

fix: resend api #18

Merged
merged 1 commit into from
Feb 17, 2021
Merged

fix: resend api #18

merged 1 commit into from
Feb 17, 2021

Conversation

srindom
Copy link
Contributor

@srindom srindom commented Feb 17, 2021

No description provided.

@srindom srindom merged commit 2efd0a6 into feat/sql Feb 17, 2021
srindom added a commit that referenced this pull request Jun 8, 2021
* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
srindom added a commit that referenced this pull request Jun 10, 2021
* Feat/address control (#49)

* fix: allow claim address edit

* fix: allow claim address edit

* Feat/draft orders (#50)

* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>

* hotfix: dropdown width

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
srindom added a commit that referenced this pull request Aug 5, 2021
* Feat/address control (#49)

* fix: allow claim address edit

* fix: allow claim address edit

* Feat/draft orders (#50)

* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>

* hotfix: dropdown width

* diplay notification settings for orders, swaps and claims depending on relation

* added no_notification option to fulfillment, refund, returns and swap

* fixed indentation

* removed icons and only send no_notification flag when different from surrounding structure

* fixed import error

* changes made according with pr

* removed svg elements

* added description to draft order

* replaced | to ||

* refactored to always use same input

* Feat/improve overview of gift cards (#56)

* added order

* supported search for gift cards

* removed linespace

* ensured that if no order exists, the gift card is still rendered

* fix: payment overview should show if gift card was applied to order (#59)

* fix: no billing address and show state and country name in address overview (#60)

* in order details page, under the customer section, the shipping and billing addresses now include the state and display the country name instead of country_code

* fix billing_address never displayed due to wrong conditional clause

* feat: display swap information in a modal (#62)

* add: add checkbox for filtering by disabled discounts (#64)

* feat: enhance product details overview (#63)

* add: product details overview

* fix: info.svg

* fix: adjustments based on seb's comments

* fix: use discountable fix + small refactorings

* refactor: input with tooltip and extract info tooltips in a component

* fix: move discountable to initially hidden fields + filter empty images

* fix: convert empty strings to nulls for measurement fields

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
Co-authored-by: Sebastian M. Nicolajsen <sebastian.m.nicolajsen@gmail.com>
Co-authored-by: Sebastian Mateos Nicolajsen <80953876+sebastiannicolajsen@users.noreply.github.com>
Co-authored-by: Zakaria El Asri <33696020+zakariaelas@users.noreply.github.com>
fPolic pushed a commit that referenced this pull request Mar 1, 2022
* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
fPolic pushed a commit that referenced this pull request Mar 1, 2022
* Feat/address control (#49)

* fix: allow claim address edit

* fix: allow claim address edit

* Feat/draft orders (#50)

* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>

* hotfix: dropdown width

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
fPolic pushed a commit that referenced this pull request Mar 1, 2022
* Feat/address control (#49)

* fix: allow claim address edit

* fix: allow claim address edit

* Feat/draft orders (#50)

* Begins support for sql

* Starts work on tabs

* feat/order-tabs

* Fixes tab styling

* Work on settings

* Adds work on shipping

* hotfix(swap): Check if return status is present

* Finalizes discount

* Adds product work

* Working on prices

* Finalizes product editing

* Fixes prices editor

* Add fixes to order overview

* fix: order details

* Product creation fix

* Fixed tax rate

* fix: returns/fulfillments

* Fixes amount refunded

* fix: swaps

* fix: shipping methods returns/swaps

* Fix prices

* small timeline fix

* fix: uppercase currencies

* Adds order shipping update

* small styling fixes

* fix: gift cards

* Fixes shipping option

* Adds spinner to capture

* Adds tab support

* fix: small fixes

* fix: small fixes

* fix: variant grid prices

* customer fix

* Fix order view

* discount_rule -> rule

* fix

* fix: add cancel order

* fix currency input

* Small fix

* fix: currency input size

* fix: swap

* Fixed prices

* fix product search

* fix: return currency input

* admin price working

* fix: round integers

* fix pagination

* add medusa font logo

* fix: discounts

* adds pagination and search to discounts

* --amend

* hotfix: disable product from discounts

* hotfix: temp remove product searcj

* --amend

* fix merge conflicts

* feat: claims (#17)

* feat: adds product type, collection and tag support

* fix: claims update

* fix: claim shipments

* fix: resend api (#18)

* add initial draftorder work

* hotfix: remove 0 from tags

* add draft order func.

* Fixes address details on order overview

* clean up

* add admin only option to shipping

* Staging (#19)

* fix: resend api

* feat: tracking links

* fixes

* fix: Enables product search

* --amend

* hotfix: retrieve only required product fields

* finalises first round of cosmetic updates

* hotfix: Render collection title

* Finalises first draft of draft orders

* cleanup

* fix register payment endpoint

* add add and delete line item from draft order

* fixes nullish address

* filter out shipping options

* adds spinner to product search

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>

* hotfix: dropdown width

* diplay notification settings for orders, swaps and claims depending on relation

* added no_notification option to fulfillment, refund, returns and swap

* fixed indentation

* removed icons and only send no_notification flag when different from surrounding structure

* fixed import error

* changes made according with pr

* removed svg elements

* added description to draft order

* replaced | to ||

* refactored to always use same input

* Feat/improve overview of gift cards (#56)

* added order

* supported search for gift cards

* removed linespace

* ensured that if no order exists, the gift card is still rendered

* fix: payment overview should show if gift card was applied to order (#59)

* fix: no billing address and show state and country name in address overview (#60)

* in order details page, under the customer section, the shipping and billing addresses now include the state and display the country name instead of country_code

* fix billing_address never displayed due to wrong conditional clause

* feat: display swap information in a modal (#62)

* add: add checkbox for filtering by disabled discounts (#64)

* feat: enhance product details overview (#63)

* add: product details overview

* fix: info.svg

* fix: adjustments based on seb's comments

* fix: use discountable fix + small refactorings

* refactor: input with tooltip and extract info tooltips in a component

* fix: move discountable to initially hidden fields + filter empty images

* fix: convert empty strings to nulls for measurement fields

Co-authored-by: olivermrbl <oliver@mrbltech.com>
Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
Co-authored-by: Sebastian M. Nicolajsen <sebastian.m.nicolajsen@gmail.com>
Co-authored-by: Sebastian Mateos Nicolajsen <80953876+sebastiannicolajsen@users.noreply.github.com>
Co-authored-by: Zakaria El Asri <33696020+zakariaelas@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant