Commit graph

1454 commits

Author SHA1 Message Date
Karolina
746ce8b95f
Saleor 1745 tests for discounts sales (#998)
* test plan for sales - discounts

* create sale

* passing tests for sales

* tests for collections

* remove eslint diable in sales tests

* remove eslint-disable

* move shared selectors

* move shared selectors

* fix indentation in requests

* add formatDate function

* remove moment

* remove moment
2021-03-12 15:57: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
Dawid Tarasiuk
bf9b7c5120
Use sortBy for search products (#997) 2021-03-11 11:40:58 +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
Karolina Rakoczy
b6093e3fc5 resolve conflicts 2021-03-04 13:58:01 +01:00
Karolina
6c5e3d923a
Merge pull request #995 from mirumee/SALEOR-1743-Tests-for-variants
Saleor 1743 tests for variants
2021-03-04 13:36:59 +01:00
Krzysztof Wolski
ad0d723a09
Fix rich text editor bug at page creation (#994) 2021-03-02 11:24:25 +01:00
Karolina Rakoczy
44a6f21128 update stories 2021-03-02 10:29:46 +01:00
Karolina Rakoczy
a8a9a5eb3a tests for collections 2021-03-02 09:38:24 +01:00
Karolina Rakoczy
ad3c1de234 tests for variants 2021-03-01 15:51:46 +01:00
Karolina Rakoczy
00e28061bd tests for variants 2021-03-01 13:50:36 +01:00
Karolina Rakoczy
dfdf43fed5 merge with master 2021-03-01 13:07:05 +01:00
Karolina Rakoczy
4a64dd8d57 tests for variants 2021-03-01 12:54:08 +01:00
Danilo Gačević
0af427e36e
fix: trigger form change when collections are being added to list of product collections (#987)
* fix: trigger form change when collections are being added to list of product collections

* fix: eslint and prettier

Co-authored-by: danilofatcat <danilo.gacevic@fatcatcoders.com>
2021-02-25 14:00:47 +01:00
Tomasz Szymański
c30429f7f4
Implement inclusion feature of postal codes (#983)
* Temporary merged schema and types update

* Update typing for zipCodeRules -> postalCodeRules

* Refactor zipCodes to postalCodes

* Fix new schema webhooks

* Delete postal code unassign dialog

* Query inclusion type from backend

* Clean up schema from old mutations

* Proper new mutations structure, all postal code related changes

* Linter changes

* Fix bug with save not being refreshed after codes are added / deleted / inclusion change

* Tests and translations

* Fix warnings across app, minor variables refactor

* Linting

* Trigger deployment

* CR changes, cleanups and refactors

* Update snapshots

* Resolve bug with radio not shows correct value on page refresh

* Fix price and weight creation of codes

* Reducer

* Revert "Reducer"

This reverts commit 07a3aed9c88332bde7d9be61b6dbc29e34e4edba.
2021-02-23 09:58:25 +01:00
Magdalena Markusik
c7fa1ae79d Update snapshots 2021-02-22 13:38:24 +01:00
Magdalena Markusik
bf5e775cbf Merge with master, resolve conflicts 2021-02-22 13:26:32 +01:00
Karolina Rakoczy
2ea9035e9c 2021-02-19 12:08:10 +01:00
Karolina Rakoczy
5f413d16fc merge with tests for products 2021-02-18 21:08:06 +01:00
Piotr Grundas
35857cf717
Update webhooks (#982)
* Update webhooks

* Update snapshots

* Add messages

Co-authored-by: Marcin Gębala <5421321+maarcingebala@users.noreply.github.com>
2021-02-18 14:50:57 +01:00
Magdalena Markusik
a3ac52f653 Update tests 2021-02-18 14:39:45 +01:00
Dominik Żegleń
afa228fd6d
Fix no channels crash (#984)
* Fix crash caused by not having any channels

* Update changelog
2021-02-18 14:05:39 +01:00
Magdalena Markusik
10a366839b Fixes 2021-02-18 13:59:47 +01:00
Magdalena Markusik
9730e44abe Update everything to handle null values in content and description fields 2021-02-18 13:38:41 +01:00
Karolina Rakoczy
5b05db92fc add get collection request 2021-02-18 10:00:08 +01:00
Karolina Rakoczy
91460bd8b1 add data-test-id 2021-02-17 13:50:57 +01:00
Magdalena Markusik
25f8e29801 Update schema and types 2021-02-17 12:58:09 +01:00
Karolina Rakoczy
c1e9803640 add data-test-id 2021-02-11 16:04:56 +01:00
Karolina
68eb5309ef
Merge branch 'master' into SALEOR-1738-Tests-for-home-page 2021-02-11 13:53:29 +01:00
Karolina Rakoczy
27e5d912e4 tests for dashboard 2021-02-11 13:20:00 +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
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
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
2e9dcd52dd Update snapshots 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
6608ac8122 Add returned products to refund page 2021-01-25 15:16:43 +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
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
Magdalena Markusik
5dd63128b4 Fix timeline event expand icon spacing 2021-01-21 13:55:49 +01:00
Jakub Majorek
37bb52d087
Fix issues with stocks (#954) 2021-01-21 10:07:16 +01:00