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

Commit

Permalink
Develop (#65)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
6 people authored and fPolic committed Mar 1, 2022
1 parent dc90dbc commit 97e651d
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6768,6 +6768,13 @@ copy-to-clipboard@^3.3.1:
dependencies:
toggle-selection "^1.0.6"

copy-to-clipboard@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
dependencies:
toggle-selection "^1.0.6"

copyfiles@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.3.0.tgz"
Expand Down Expand Up @@ -8773,6 +8780,13 @@ file-selector@^0.2.2:
dependencies:
tslib "^2.0.3"

file-selector@^0.2.2:
version "0.2.4"
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
dependencies:
tslib "^2.0.3"

file-system-cache@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
Expand Down Expand Up @@ -17056,6 +17070,11 @@ tslib@^2.0.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

tslib@^2.0.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

tslib@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz"
Expand Down

0 comments on commit 97e651d

Please sign in to comment.