Commit graph

157 commits

Author SHA1 Message Date
Karolina
f8d5593fc3
Saleor 1741 tests for orders (#1011)
* first test for draft orders

* tests for channels in draft orders

* tests for channels in draft orders

* tests for channels in draft orders

* test for moving draft order to orders

* test for orders

* test for orders

* tests for draft orders

* tests for draft orders

* tests for draft orders

* tests for draft orders

* test for moving draft order

* tests for orders
2021-03-17 11:00:30 +01:00
Karolina
0157914edb
Saleor 1740 tests for draft orders (#1002)
* first test for draft orders

* tests for channels in draft orders

* tests for channels in draft orders

* tests for channels in draft orders

* test for moving draft order to orders

* test for orders

* test for orders

* tests for draft orders

* tests for draft orders

* tests for draft orders

* tests for draft orders

* test for moving draft order
2021-03-15 14:16:02 +01:00
Tomasz Szymański
88f51a1d31
Refactor of postalCodes related components (#999)
* Refactor of postalCodes related components

* CR changes

* Simplify postal codes reducer

* Typing for newState in postal codes reducer
2021-03-12 12:55:14 +01:00
Jakub Majorek
a7736e2bf9
Attach permission variables to all queries (#1000)
* [SALEOR-2190] Attach permission variables to all queries

* Fix TS linter issues

* Update package-lock
2021-03-09 09:44:09 +01:00
mmarkusik
2cd4ea9529
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types

* wip

* Add diiscount modal component

* Refactor action dialog - move buttons to separate component so they can be reused

* Add discount provider to keep logic of discounts separated and wrap proper components

* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc

* UUpdate lots of types, fragments, schema etc

* Update quries and mutations

* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc

* Add order line discount provider + consumer, same for order discount

* Fix ts wip

* Update schema and types

* Update order discount provider

* Add nnetto price to order details fragment and update lots of types

* Adjust fixtures to order details containing net total

* Move both order and order line provider to same dir to make types and utils more accessible

* Update schema to match master

* Update schema and types

* Update order history, add some related components, add events etc.

* Fix types

* Fix schema to match master

* Update messages

* Update changelog

* Retrigger build

* Add stories and update common modal to display floats properly

* Add and update stories and tests

* Add optional displaying of reason in case it's empty

* Make user name label for history events return email if last name and first name are absent

* Update schema, types, and mutations to properly refresh

* Remove unnecessary imports

* Add discounts decorator to draft details page storybook

* Fixs after review

* Update messages

* Small fixes to timeline events

* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette

* Updaste tests, messages

* Fixs after review

* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode

* Add change to changelog

* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null

* Refactor selecting employee name in utils

* Add conditional to extended timeline event when orderline is null
2021-03-05 15:52:02 +01:00
Jakub Majorek
3d8a849301
[SALEOR-2587] Handle null orderLine item (#1001) 2021-03-05 11:02:27 +01:00
mmarkusik
3af7117a1d
Merge pull request #961 from mirumee/super-duper-urgent-return-fixes-again-2
Add returned items card to refund
2021-01-26 14:04:03 +01:00
mmarkusik
9a694071ce
Saleor 2078/create cypress test ids (#958)
* Add first id

* Add more ids

* Add more test ids

* Fix typing

* Remove unnecessary import

* Update snapshots
2021-01-26 11:21:54 +01:00
Magdalena Markusik
f7c7f4e518 Fix marked as paid item not displaying correctly in order history 2021-01-25 15:16:43 +01:00
Magdalena Markusik
94d08dde7d Remove unnecessary import 2021-01-25 15:16:43 +01:00
Magdalena Markusik
6608ac8122 Add returned products to refund page 2021-01-25 15:16:43 +01:00
Magdalena Markusik
d9250a7aea Fix some more types cause there was a typo 2021-01-21 14:26:28 +01:00
Magdalena Markusik
02c2fdf927 Fix some types and tests 2021-01-21 14:21:58 +01:00
Magdalena Markusik
430f80ac58 Add mmissing no return button and logic 2021-01-21 13:56:19 +01:00
mmarkusik
f0f9fe9b85
Feature/order reissue (#910)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Add change to changelog

* Remove console.log

* Update tests

* Extract messages

* Add utils functions for selecting only ulfulfilled order lines

* Add optional value selection for line item

* Update
tests

* Add optional rendering of unfulfilled items card and refactor a bit

* Update displaying of items card title when refunded card

* UUpdate utils, form data etc. not to include refunded items when calculating replaced items amount

* Uppdate return items card not to display replace buttons for refunded items

* Refactor and small fixes after review

* Update extracted messages

* Fix card title when no fullfilemtn id

* wip

* Initially stitch returns page. Update types, add mutation

* remove unnecessary component display names

* Add loading status from form submission & refactor

* Add errors from response

* Add errors from response and refactor

* Remove comments

* Add optional error adding when no data from return create request

* Update messages

* wip

* Update snapshots

* Remove unnecessary console.log

* Add better typing for getParsedLineData function

* Update & refactor card title to match cards both in return and order details

* Add handling of new statuses to order details cards. Also refactor, and devide order fulfillment card into couple of smaller components

* Update messages

* Update schema to match api

* Update types

* Update status label component to match colors with new designs and order details cards

* RUpdate and refactor order fulfillment card components to be reusable. Also add replaced status handling

* Updayte card title component to handle all cases and statuses

* Update oorder unfulfilled items card and order details page, reduce some of the boilerplate

* Fix card title types and adjust returns card to match

* Update messages

* Update snapshots

* RUpdate order fulfillment card with subtitles and buttons for returned status

* Add onRefund to order fulfillment card

* Fix typo and wrong message in card title

* Add missing condition in return form submission utils to decice if to refund products

* Update fulfillment subtitles row and tests

* Update messages

* Change naming and locations of OrderFulfillment and items card components

* Update messages

* U[pdate names of components again to even better ones

* Update messages

* changelog

* Update schema and types so that order history event also includes user first and last name

* Add extended timeline event and event header components. Move some of the logic to utils and add way to display links in the event header.

* FFix types

* Update messages

* Change naming of isOfType -> isTimelineEventOfType and refactor extended timeline event messages selection to be less complicated

* Add ids and update messages

* Add ids and update messages some more

* Update storybook decorator to work with react router context in components and tests

* Refactor after review

* Update messages

* Add rredirecting to draft order

* Add handling draft creation from replacement

* Add related order to order event fragment and update lots and lots of types

* Update extended timeline event to match related order type on order history event

* Update fixtures

* Refactor ExtendedTimelineEvent

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>

* Fix typing

* Update messages

* Fix missing history event for replacement draft created for replaced products

* Update messages

* Handle new statuses for returned and partially returned orders

* Update messages

* update snapshots

* BBump empty line to rebuild ci

* Change status to proper color

* Change replaceable items in return for replace to be auto off instead of on

* Add utils functions and make order details menu not show option to return items when there are returnable items in the order

* Fix replace checkbox showing when previously hidden and clicked set maximal quantities

* Fix return form invalid money values

* Add default values to avoid returning of NaN in utils for return amount and refactor

* Add ggeneral error alerts

* Add eproduct error box component and style. style a lot.

* Fixes

* Fix lint

* Add cannot refund error title + description

* Extract messages

* Refactor after review

* Add better, nicer and fancier imports to product error cell

* Use error color from palette in product error cell

* Fix max refund when 0 for return

* Add ddisable ability to refund products button so it's disabled when 0 products selected

* Add class for order return form data parsing and add condition to not do refund when total captured on order is 0

* Update snapshots

* Add condition for order lines quantity in order products table row

* Fix return amount submit button

* Add change to changelog

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-01-20 17:16:43 +01:00
Tomasz Szymański
0578de63c6
Make sure invoices card is visible only on orders other than unconfirmed (#944)
* Make sure invoices card is visible only on orders other than unconfirmed

* Replace div with React.Fragment

* Use short form of fragment and remove key
2021-01-15 11:10:52 +01:00
Marek Choiński
4a8ebd5b1f
Saleor 1636 add possibility to filter through channels in order view (#929)
* Add possibility to filter through channels in order view

* Update storybook and locale

* Refactor

* Refactor to mapNodetoChoice

* Fix conditional value in array implicit syntax

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-01-13 10:50:54 +01:00
Marek Choiński
912dc5d1f4
Fix warnings (#919) 2020-12-21 13:46:34 +01:00
Marek Choiński
2d8fc85ac3
Saleor 1606 send invoice button not visible (#889)
* Fix send button on invoice card

* Fix highlight border on hover

* Update storybook
2020-12-04 18:29:41 +01:00
mmarkusik
bdb7837ccc
SALEOR-1658 Add fulfill finalize button display logic (#885)
* Add logic for displaying finalize button in order fulfillment

* Update story
2020-12-04 13:54:27 +01:00
Dawid Tarasiuk
eb351b396a
Refunds (#870)
* 1721 - add refunds miscellaneous view (#860)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Update order details view for refunds (#874)

* 1719 - add refund entry to order history (#875)

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

* Submit for refund only lines with non-zero quantity set

* Fix showing refund error

* Fix refund details on order details page (#879)

* Update order details view for refunds (#874)

* 1719 - add refund entry to order history (#875)

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

* Submit for refund only lines with non-zero quantity set

* Fix showing refund error

* Add missing refund amount to order history

* Merge repeated order lines in fulfillment lines

* Update order history events types and test snapshots

* Update changelog with refunds changes
2020-12-01 14:13:05 +01:00
Krzysztof Wolski
07f8f4b0b8
Order confirmation (#840)
* Order confirmed webhook

* Add status chip component and update order details page header

* refactor

* refactor and update types

* Remove rebase leftovers

* Create order settings page

* Add order setting query

* Connct order settings view with api

* Show order settings update error message

* Popup menu routing to order settings

* Fix circular import error with order settings form types

* Update order settings story

* Update order settings messages

* wip

* Add order confirm mutation and types

* Add confirm order feature to order details

* Update global types

* refactor after review

* refactor after review

* update types

* Revert settings menu removal

* Add changelog entry

Co-authored-by: Tomasz Szymanski <lime129@gmail.com>
Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2020-11-30 14:19:57 +01:00
Krzysztof Wolski
6762e7bf3f
[chore] Update dependencies, fix warnings during tests (#845)
* Fix attr name typo

* Use proper string serialization

* Use proper image URL

* Remove unused draft component

* Fix classname for invoice card

* Update deps

* Remove unused testcafe

* Resolve issue with missing intl in one of the stories, bump intl package version

* Update packages

* Update commit hooks

* Bump ts to last pre4.0 version

* Center metadata image

* Unused property

* Bump enzyme

* Revert

* Fix logo on login screen

* Fix console errors on entering translations pages

* Fix styles for invoice card
2020-11-27 17:32:12 +01:00
Karolka
2970e203ee
Add transaction reference input at order page (#837)
* Add transaction reference input at order page

* Add spacer between cards in order details

Co-authored-by: Karolina Kuźniewicz <karolina.kuzniewicz@mirumee.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
2020-11-24 17:02:50 +01:00
Dominik Żegleń
a175fb9497
Add global channel picker (#841)
* Move theme switch to user menu

* Add global channel picker

* Fix picker styles

* Use app channel state

* Improve prop naming to indicate id vs slug

* Disable picker if no reason to pick channel

* Remove settings modal leftovers

* Remove channel settings dialog

* Remove unused props

* Skip channel fetching if user is not authenticated

* Remove channel selection from components

* Update messages

* Fix e2e tests

* Remove channel picker leftover

* Revert ChannelSettingsDialog deletion

* Update snapshots

* Update messages
2020-11-23 10:39:24 +01:00
Dominik Żegleń
6f9060144a
Multichannel (#833)
* add multichannel to configuration view

* create multichannels list view

* create multichannels list view

* add ChannelsCreate view

* update channels in configuration

* add stories

* update default messages

* fix ChannelForm props

* update channels list styles

* update snapshots

* update channel form currency input

* update Channels fragments

* extract messages

* remove tabs from channelsList

* channel details, channel delete modal (#598)

* create Channel details view

* create ChannelDeleteDialog

* add channels delete dialog to channels list

* update messages and types

* fixes after review

* channels availability (#609)

* create Channel details view

* update messages and types

* create ChannelsAvailability component

* create more product channels components

* create channels stories, update fixtures, types

* update product views with channels data

* update schema and snapshots

* update defaultMessages

* update ProductUpdate view

* create ChannelsAvailabilityDropdown component

* add product channels to local storage

* update globalTypes

* Update to new schema and resolve issues

* Update messages

* create deleteChannel mutation

* add channels availability component to product create view

* refactor ProductCreate and ProductUpdate views

* CollectionProducts view cleanup

* add disabled prop to ActionDialog

* use updateChannels mutation in ProductCreate view

* ProductCreate - update submit function

* fixes after review

* update snapshots and messages

Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>

* channels shipping components (#655)

* create PricingCard, OrderValue and OrderWeight components

* create ShippingZoneRatesPage and DeleteShippingRateDialog

* update ChannelsAvailability component

* updates after review

* channels shipping views (#662)

* update ChannelsAvailability component

* updates after review

* create PriceRate views, update types

* create weight rates views

* update shipping views, stories, messages

* update snapshots

* update snapshots

* update useChannels hook

* orders channels components (#698)

* create OrderChannelSectionCard component

* update OrderDetailsPage

* update DraftOrderChannelCard

* update snapshots

* update fixtures

* small change after review, update snapshots

* product pricing (#702)

* update product types

* update Pricing in simple product view

* use productVariantCreate mutation in simple product view

* update snapshots and messages

* handle create variant (#715)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update snapshots and messages

* fix update and create product handlers

* update pricing types

* channels modal - new styles, search input (#717)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update pricing types

* add search input in ChannelsAvailabilityDialog

* update ChannelsAvailabilityDialog in all views

* update snapshots

* fix search input label styles

* update toggleAllChannels function

* update variant creator (#724)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update pricing types

* add search input in ChannelsAvailabilityDialog

* update ChannelsAvailabilityDialog in all views

* update snapshots

* add channelLisitngs to variant creator

* update variant creator price styles

* update product variant creator reducer tests

* update createVariants tests

* update error handling in product variant creator

* add Skip pricing for now option

* use PriceField instead of TextField in ProductVariantCreatorSummary

* create price validation function

* fix errors handling in ProductVariantPrice component

* fixes after review

* Product List - remove publish/unpublish buttons (#727)

* ProductList - remove publish and unpublish buttons

* update messages

* update snapshots, messages

* revert changes in ChannelsAvailabilityDropdown

* products/shipping/discount list settings (#739)

* create ChannelSettingsDialog component

* update snapshots

* ProductList - open settings modal when there is no selected channel

* add settings modal to vouchers list

* add settings dialog to sales list

* add setting modal to shipping list

* update shipping

* update snapshots, messages

* useChannelsSettings - remove selectedChannelSlug

* fix channels update handler in product and shipping view

* messages update in ChannelSettingsDialog

* handle product/discount list when there is no channels

* update onSettingsOpen prop

* collection availability dropdown (#743)

* add availability dropdown to collection products list

* update channelListingProduct fragment name

* update voucher view/components with channels (#746)

* update voucher view/components with channels

* update VoucherSummary, remove defaultCurrency from voucher components

* update snapshots

* move getChannelsVariables func to discounts handlers

* update voucher messages

* sale view/components with channels (#750)

* update sale views with channels

* small fixes in discounts

* order views with channels (#752)

* update draft orders with channels

* add channel activate/deactivate mutations

* remove sort by total in orders list

* add error notification on channel activate/deactivate

* product variants channel select (#755)

* add channels selector to ProductVariants component

* remove selectedChannel from ProductUpdate, update messages and snapshots

* update product fragments

* update translations (#762)

* update translations

* fix translation types

* update messages

* update Availability component (#766)

* update ChannelsAvailability component

* update product fixtures

* update collection and channel fixtures

* ChannelsAvailability - handle errors

* update product handlers

* update ChannelsAvailability styles

* update ProductVariant

* update snapshots

* fix missing things in multichannel  (#785)

* add availability dropdown to discount products list

* fix error handling in shipping components

* update product views and components

* update messages

* update category view/components

* update CategoryProducts styles

* remove defaultCurrency from shipping components

* create ChannelsSelect component

* update channels error handling after review

* another fixes after review

* Add channels to collection views/components (#791)

** update collection components and views

* update create collection view

* update error handling in collection

* remove filter bar from collection list

* update products fragments

* small fix in collection create view

* use collectionFragment in useCatalogSearch

* update defaultMessages and snapshots

* update homepage view/drop defaultCurrency (#801)

* update homepage view

* drop defaultCurrency prop

* fix onChannelChange function in home view

* remove visibility from product list filters

* update export products with channels (#803)

* update ProductExportDialog with channels

* add new channel error code

* remover VISIBLE from product export dialog Financial information

* fix input size in ProductVariantCreatorSummary (#804)

* channels currency code select (#806)

* create select with currency codes

* fix ChannelDeleteDialog

* update defaultMessages, remove unneeded ChannelDetails handlers

* fixes after rebase

* replace channelListing with channelListings

* [multichannel] Update schema]

* Fix product create test

Co-authored-by: AlicjaSzu <alicja.szukuc@gmail.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2020-11-17 17:10:42 +01:00
Dominik Żegleń
d16cf2c6da
Merge branch 'master' into SALEOR-1403-cannot-fulfill-order-when-product-quantity-is-one 2020-11-03 12:15:39 +01:00
dominik-zeglen
6988316fbc Use dedicated type to return error promise 2020-11-02 14:26:02 +01:00
Dominik Żegleń
3b5c2b26c1
Merge pull request #799 from mirumee/feature/1347-savebar-design
Implement new savebar design
2020-11-02 14:20:08 +01:00
dominik-zeglen
a27a029452 Pass promise to reset form state 2020-10-30 16:10:06 +01:00
Grzegorz Derdak
e14b144636 Merge branch 'master' into SALEOR-1403-cannot-fulfill-order-when-product-quantity-is-one 2020-10-30 14:13:02 +01:00
Grzegorz Derdak
cbdda30a3a Update logic based on new API fields 2020-10-30 14:11:10 +01:00
Magdalena Markusik
b5d92f3c44 Refactor 2020-10-29 12:59:48 +01:00
Tomasz Szymański
e4fc4489df
Merge pull request #784 from mirumee/SALEOR-1264-avatax-address-fix
Remove the finalization dialog on draft order complete
2020-10-28 09:57:09 +01:00
dominik-zeglen
a855a95246 Filter out products with no variant 2020-10-27 09:55:06 +01:00
Grzegorz Derdak
9036294491 Changes after code review 2020-10-23 13:21:04 +02:00
Grzegorz Derdak
c9040d9e8b Fix for fulfilling order when product quantity is 1 2020-10-22 11:58:20 +02:00
Tomasz Szymanski
f66be95b57 Remove the finalization dialog 2020-10-20 15:19:58 +02:00
Dawid Tarasiuk
f85ca42d36 Use non negative value change handler for quantity input 2020-10-09 13:15:19 +02:00
Dawid Tarasiuk
8abe279248 Require minimum quantity equals one 2020-10-09 13:09:12 +02:00
Dawid Tarasiuk
484780dcc3 Fix order draft negative quantity 2020-10-09 13:09:11 +02:00
dominik-zeglen
e13086fef3 Fix exploding table layout 2020-09-25 17:00:17 +02:00
dominik-zeglen
b0053e1f92 Fix table horizontal scrolling 2020-09-21 17:19:33 +02:00
Dawid Tarasiuk
75586aae9f Fix double update order addresses and unclosed dialog 2020-09-08 15:52:25 +02:00
dominik-zeglen
453410b43d Add metadata editor to order view 2020-09-04 13:06:00 +02:00
AlicjaSzu
eba4ba2edf
update VisibilityCard component (#679)
* update VisibilityCard component

* add visibleInListings in Product

* update mutations and types with visibleInListings

* update ProductExportDialogInfo with availableForPurchase

* update defaultMessages

* update useDateLocalize hook

* update cypress tests

* update orders with availability info

* revert cypress changes

* update changelog

* update product update handlers

* fix VisibilityCard styles

* create AvailabilityCard component

* update defaultMessages

* update snapshots and messages

* fix ProductCreatePage form data types

* update defaultMessages
2020-09-03 12:25:16 +02:00
dominik-zeglen
0f3b061f18 Add payment authorized event 2020-09-02 11:57:48 +02:00
dominik-zeglen
d720389ba7 Update order history information 2020-09-02 11:43:33 +02:00
dominik-zeglen
8c68903fad Add submit on blur 2020-07-30 14:28:41 +02:00
dominik-zeglen
765953c9a8 Sort keys 2020-07-27 12:23:46 +02:00