Commit graph

2069 commits

Author SHA1 Message Date
Karolina
68eb5309ef
Merge branch 'master' into SALEOR-1738-Tests-for-home-page 2021-02-11 13:53:29 +01:00
Karolina Rakoczy
d738c515c0 install faker 2021-02-11 13:48:24 +01:00
Karolina Rakoczy
27e5d912e4 tests for dashboard 2021-02-11 13:20:00 +01:00
Marcin Gębala
b36160edb1
Update PR template (#975) 2021-02-10 09:50:12 +01:00
Dawid Tarasiuk
db4fc1d8c5
Fix failing login in Firefox browser (#970)
The bug was introduced in OAuth2 implementation (1645e2fd), where the tokenAuthLoading flag from AuthProvider was not used and it did not blocked UI in loading state.
2021-02-03 09:22:04 +01:00
Karolina Rakoczy
fe9f55ee81 created orders and products, missing data-testid 2021-02-02 12:34:10 +01:00
Dominik Żegleń
8ece366660
Show channel picker to all staff members (#969) 2021-02-02 10:38:43 +01:00
Maciej Korycinski
836fc6dce4
Merge pull request #963 from mirumee/SALEOR-1301-oauth-openid-flow
1301 - OAuth2 flow with OpenID
2021-02-02 08:58:50 +01:00
Dawid Tarasiuk
1645e2fdab Implement Oauth2 flow with OpenID 2021-01-28 14:11:00 +01:00
Maciej Korycinski
6477d62409
Add missing error (#965) 2021-01-27 11:42:08 +01:00
Karolina Rakoczy
95be7b5163 order ready to fulfill created 2021-01-27 10:41:55 +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
Magdalena Markusik
0649879873 Trigger deployment 2021-01-26 11:27:33 +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
2e9dcd52dd Update snapshots 2021-01-25 15:16:44 +01:00
Magdalena Markusik
679b532860 Update messages 2021-01-25 15:16:44 +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
708e381576 Update messages 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
Cezary Miącz
b894487c63
Update staging API_URI in PR template and test env workflow (#962) 2021-01-25 14:51:13 +01:00
Jakub Majorek
3eb940839d
Update sentry url prefix (#960) 2021-01-22 15:39:58 +01:00
Jakub Majorek
2d3a859db6
Fix typo in deploy template (#959) 2021-01-22 15:15:22 +01:00
Jakub Majorek
383055a2de
SALEOR-2064 Add generic error tracker with Sentry adapter (#956)
* Add generic error tracker with Sentry extension

* Add Sentry webpack plugin

* Update variable names and README

* Update deploy-staging template

* Update changelog
2021-01-22 15:05:26 +01:00
Jakub Majorek
10131163c1
SALEOR-2036 Drop descriptionJson and contentJson fields (#950)
* Drop descriptionJson and contentJson fields

* Bump EditorJS version

* Update changelog

* Update tests
2021-01-22 12:13:40 +01:00
mmarkusik
e74225b570
Merge pull request #955 from mirumee/super-duper-urgent-return-fixes-again
Return fixes
2021-01-22 11:02:20 +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
93238f8f85 Update messages 2021-01-21 14:02:47 +01:00
Magdalena Markusik
430f80ac58 Add mmissing no return button and logic 2021-01-21 13:56:19 +01:00
Magdalena Markusik
5dd63128b4 Fix timeline event expand icon spacing 2021-01-21 13:55:49 +01:00
Karolina Rakoczy
f9e8090120 Add mutation query 2021-01-21 11:05:54 +01:00
Jakub Majorek
37bb52d087
Fix issues with stocks (#954) 2021-01-21 10:07:16 +01:00
Jakub Majorek
77ed12664d
Fix rare editorjs race condition (#953) 2021-01-21 09:54:53 +01:00
Dawid Tarasiuk
11bddd3d1b
Product reference attributes (#948)
* Update changelog with product reference attributes

* 2068 - Add product reference type to attributes (#949)

* 2069 - Add product reference attribute search implementation (#951)
2021-01-20 17:37:36 +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
Dawid Tarasiuk
b07bb08ade 1863 - Support reference attribute reordering (#946)
* Support reference attribute reordering

* Update attribute handlers tests
2021-01-20 11:50:53 +01:00
Dawid Tarasiuk
4b8c2ea5e7 1427, 1866, 1868 - Implement reference attribute submission (#938)
* Implement reference attribute submitting

* Fix updating reference attributs

* Fix displaying references attribute values names
2021-01-20 11:50:53 +01:00
Dawid Tarasiuk
5303d9f714 1992 - Add attribute references select dialog (#931)
* Add attribute references select dialog

* Add reference attribute support to products and variants

* Fix attribute select dialog selection

* Refactor reference attribute handlers

* Refactor reference attribute handlers

* Refactor searching for reference pages
2021-01-20 11:50:53 +01:00
Dawid Tarasiuk
8b0fe986b2 1425 - Support reference type attribute on attribute details page (#918)
* Support reference type attribute on attribute details page

* Trigger CI

* Prevent changing attribute entity type during attribute update

* Refactor attribute details components
2021-01-20 11:50:53 +01:00
Dawid Tarasiuk
ee05b090b8 1862 - Add references field to attributes section (#923)
* Add references field to attributes section

* Update messagees and test shapshots

* Remove unused style in sortable chips component
2021-01-20 11:50:53 +01:00
Dawid Tarasiuk
55a330040e Update changelog with reference attributes 2021-01-20 11:50:53 +01:00
Karolina Rakoczy
f1d4b11a81 test for elements visibility, TODO - api requests for creating order 2021-01-19 22:17:49 +01:00
Jakub Majorek
18f09812a8
Saleor 2067 - Guard against non-staff users logging in (#947)
* Guard against non-staff users logging in

* Scope channel permissions

* Update changelog

* Update tests
2021-01-18 12:19:04 +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
Tomasz Szymański
167b77e18a
Mark shipping zone description as optional (#942) 2021-01-13 11:49:08 +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
d0be941ade
Saleor 1712 dashboard unable to handle empty channel list (#924)
* Use query hook on home page

* Handle no channel

* Handle no channel on pages

* Add navigate channels

* Move messages

* Refactor

* Update storybook and locale

* Remove comment

* Refactor

* Update storybook

* Fix skip

* Fix undefined channel

* Update storybook
2021-01-13 10:33:38 +01:00
Marek Choiński
3f5cacb8a0
Saleor 1906 user should be able to delete a channel if there are no orders associated with it (#901)
* Update type of channelDetailsFragment

* Add hasOrder recognition

* Update types

* Add delete channel on details page

* Refactor fixtures

* Update locale

* Refactor

* Remove redundant assignment

* Move messages to defineMessages

* Simplify variables

* Create util getChannelsCurrencyChoices

* Add message

* Update locale

* Refactor to mapNodeToChoice
2021-01-12 15:44:11 +01:00
Dawid Tarasiuk
9d55dc920b
Add shipping delivery days (#914)
* Add shipping delivery days

* Update changelog with shipping delivery days

* Update data-test and messages

* Add shipping delivery days to shipping rate create page

* Update shipping test snapshots

* Make max delivery time of shipping optional
2021-01-12 12:33:50 +01:00