Commit graph

1561 commits

Author SHA1 Message Date
Dawid Tarasiuk
bddfa2c4af
SALEOR-1888-1889 - Fix voucher and sales sorting errors (#1063)
* Fix voucher and sales sorting errors

* Update changelog

* Fix channel slug argument in sorting
2021-04-19 16:03:51 +02:00
Jakub Majorek
e5df1b2dbf
Add shipping method description (#1058)
* Add shipping method description - WIP

* Wire up logic

* Handle more editorjs issues

* Fix minor issues

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2021-04-16 14:33:14 +02:00
Karolina
d5233b3131
Saleor 2893 fix failing cypress tests (#1064)
* fix tests

* fix tests

* fix tests
2021-04-16 13:36:24 +02:00
mmarkusik
8fe66a3bde
Add channel shipping zones (#1015)
* Add naked input option to SingleAutocompleteSelectField and update it's stories

* Add new icons - chevron up, down & trash

* Add deletable item component and stories

* Add card add items footer component to be used in warehouses and product stocks assign

* Update schema and types

* Add shipping zones card components

* Update channel details page form to also include shipping zones

* Update makeTopLevelSearch hook files directory and add getSearchFetchMoreProps function to avoid extracting it manually every time

* Update channels types & fragments

* Move getDefaultNotifierSuccessErrorData function to useNotifier utils, update dir etc., also make order discount provider use it from the new dir

* Add shippinh zone to channel update and create and add shipping zone search

* Update messages

* Fix types

* Fix lint, types etc

* Small refactor from review and quick fix styles of shipping zones card

* Refactor a bit and update snapshots

* Refactor a bit and update snapshots

* Addd / refactor channels availability components

* Add useChannelsWithProductVariants hook with utils and types

* Add / refactor more channels availability components

* Move avatar from table cell avatar to separate component for it to be usable outside of tables

* Add channels with variants logic to product create and update pages & views

* Refactor components to use updated channels availability components

* Remove unnecessary comments

* Update storybook

* Update types

* Update messages

* Fix prices for variants / simple product not uodating properly

* Post merge cleanup, update schema, types, etc.

* Change shipping zone details warehouses card into settings card and add ability to assign channels to shipping zone

* Update types

* Update snapshots

* Fix selecting / deselecting all channels in channels with variants modal

* Fixes after review, some types changes etc.

* Update snapshots

* Small types fixes

* Make price rates views use parent shipping method channels instead of all

* Make price rates views use parent shipping method channels instead of all

* Update types

* Fix bugs

* Fixes after review

* Fix channels availability data submission

* Fix lint

* Fix variant pricing card showing not related channels

* Fixes after review

* Fix types

* Hide unaviable variants in add products to draft order dialog

* Fix channels with variants availability modal showing confirm button as enabled when it shouldn't

* Fix types

* Update semi checked icon to match old designs

* Update types

* Update channels icon in channels with variants availability

* Fix product cypress test after product channels mutation changed

* Fix trash and chevron down colors in dark mode

* Fix shipping zones card footer not updating query after click away

* Fix types in schema, add condition not to display shipping zones select in channel details if all zones have already been selected

* Fix products adding in order draft dialog

* Fix simple productupdate

* Update snapshots after merge with master

* Update messages

* Fix product api request for cypress

* Add missing test id

* Fix selecting if product is simple -> form being submitted with empty data sometimes

* Update snapshots, messages and add fix for invalid date at product update

* Remove unnecessary imports

* Fix failing test in saleor 2552 (#1061)

* fix

* fix

* fix

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
Co-authored-by: Karolina <rakoczy.karolina@gmail.com>
2021-04-14 15:44:25 +02:00
Dominik Żegleń
07bc522af1
Prevent endless limit refetching (#1059)
* Fix endless limit refresh loop

* Improve naming
2021-04-14 13:09:13 +02:00
Zachary Keeping
9362ea53b0
Fix "secret" typo (#993) 2021-04-14 09:39:34 +02:00
Dominik Żegleń
a3abb9c476
Handle Cloud limits (#1053)
* Handle limit reached error

* Update changelog

* Move notifications to higher layer

* Handle limits top-level

* Remove unused imports

* Add alert component

* Fetch limits from API

* Display limits in staff list

* Fix disabled text button color

* Display limits in products pages

* Display limits in channel list

* Display limits in warehouse list

* Display limits in order list

* Add stories for limits

* Move alert to corresponding section

* Update schema

* Update changelog

* Fetch only needed limitations

* Fix types

* Fix story

* Display limits in variant creator

* Improve type consistency

* Update snapshots

* Update limit counter after object deletion

* Fix copy

* Improve code readability

* Lint files

* Fix dark mode alerts

* Improve contrast

* Fix sku limit in product variant list

* Update stories

* Update messages

* Extract messages
2021-04-13 11:59:16 +02:00
Jakub Majorek
20fbc19739
Update schema (#1057) 2021-04-12 17:23:37 +02:00
Karolina
2173e241b5
Saleor 2692 tests for filtering products (#1055)
* test for filtering products

* tests for filters

* change filter input selector

* change filter input selector

* change filter input selector

* add data-test-id
2021-04-12 17:22:12 +02:00
Dominik Żegleń
06266575b2
Add multiline field plugins (#974)
* Update schema

* Add multiline field to plugins

* Update changelog

* Update stories

* Update stories

* -Trigger CI
2021-04-09 13:17:34 +02:00
Piotr Grundas
a3fd4bb6c2
Add rich text attribute input (#1023)
* Clean structure, add text input, add story

* Improvements

* Update tests, changelog

* Extract messages

* Improvements

* Generate messages, update snapshots

* Switch to rich text

* Handle transitions

* Update translations
2021-04-09 09:51:49 +02:00
Jakub Majorek
80cb7c0404
Optimize product list view queries (#1016)
* Skip unused queries on product list

* Further optimize queries

* Fix product type details search on product create page

* Fix test fixtures

* Update query for product type details in product create page

* Update cypress test for product list

* Update package.lock

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2021-04-08 18:14:15 +02:00
Tomasz Szymanski
af4368e853 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-04-06 14:03:01 +02:00
Karolina
588175df30
Saleor 1737 tests for shipping methods (#1013)
* remove classes in shipping & products utils

* remove classes

* add tests plans

* add const

* tests for shipping methods

* test for shipping

* test for shipping

* tests for shipping

* install eslint-plugin-chai-friendly

* update stories

* add missing imports
2021-04-02 13:01:38 +02:00
Tomasz Szymanski
cca95a77b0 Get rid of maybes 2021-04-02 06:28:28 +02:00
Tomasz Szymanski
fc3abed23d Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-04-02 06:20:26 +02:00
Karolina
114476d615
Saleor 2696 tests for product create (#1026)
* test for product create

* tests for creating product

* create new expect product info utils file
2021-04-01 14:33:36 +02:00
Jakub Majorek
f400f1ae89 Fix DOM nesting 2021-04-01 14:31:23 +02:00
Dominik Żegleń
c1159861a9
Update schema (#1029)
* Update schema

* Update stories and changelog

* Update messages
2021-03-31 15:11:58 +02:00
Maciej Korycinski
6fdfcfe943
Fix failing translations (#1035) 2021-03-31 14:15:05 +02:00
Tomasz Szymanski
e5fdef53df Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-31 12:38:10 +02:00
Jakub Majorek
5416c9f865
Ignore EditorJS errors (#1036)
* Ignore EditorJS error

* Update messages
2021-03-30 16:31:38 +02:00
dominik-zeglen
5a81878367 Remove mailing settings 2021-03-30 14:50:09 +02:00
Tomasz Szymanski
779d93cfa3 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-30 14:15:29 +02:00
Damian W
94ceead89d Merge branch 'master' of github.com:mirumee/saleor-dashboard into update-collection-error-types 2021-03-30 11:41:26 +02:00
Damian W
eaa3976721 update snapshots 2021-03-30 11:40:56 +02:00
Dominik Żegleń
416d7d87f6
Improve theming (#1020)
* Remove unused code

* Move theme to separate directory

* Separate types

* Separate shadows

* Separate shadows

* Rename types

* Modularize code

* Do not pollute prototypes

* Fix missing import

* Aliast mui styles

* Import theming internally

* Fix types

* Fix override type
2021-03-30 09:40:18 +02:00
Damian W
3e0794cb61 Update error type on CollectionBulkDelete 2021-03-29 12:28:59 +02:00
Karolina
9d01f5b24e
Saleor 2686 tests for navigation (#1022)
* tests for home page

* test for navigation

* tests for navigation

* tests for navigation

* tests for navigation

* tests for navigation
2021-03-26 10:33:35 +01:00
Tomasz Szymanski
d44f293e2d Handle insufficient stock error 2021-03-24 14:00:50 +01:00
Tomasz Szymanski
8a7126f7a7 Fix tests and translations 2021-03-24 09:29:51 +01:00
Tomasz Szymanski
6dcaffe40c Refactor order page to separated components 2021-03-23 18:13:39 +01:00
Magdalena Markusik
c8cfb2b2b2 Add discounts providers to unconfirmed order 2021-03-23 13:16:28 +01:00
Karolina
0da6012bc4
Saleor 1746 tests for vouchers (#1014)
* tests for vouchers

* test for vouchers

* test for vouchers

* add getDefaultAddress
2021-03-23 11:15:39 +01:00
Tomasz Szymanski
743e122029 Temporary changes for unconfirmed discounts 2021-03-23 10:19:11 +01:00
Tomasz Szymanski
b4a7c9f471 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-23 08:52:27 +01:00
Tomasz Szymanski
755fed7cc7 Fix missing email event 2021-03-22 12:34:28 +01:00
Tomasz Szymanski
e637b77fb4 Missing emails event 2021-03-22 12:16:48 +01:00
Jakub Majorek
7bc4bc6696
Define node requirements, ts cleanup (#1008)
* Define node requirements, ts cleanup

* Update snapshot

* fix tests
2021-03-19 13:06:17 +01:00
Grzegorz Derdak
429e7b9d83
Add ability to upload video URL to product gallery (#972)
* Create a dropdown and modal for uploading Video URLs

* Add ability to upload video URL to product gallery

* Add support for other video providers, minor UI tweaks

* Extract translations

* Style changes

* Adjust dashboard to fetch media oembed data

* Update codebase to match the schema

* Changes after code review

* Update schema.graphql and fixtures

* Update defaultMessages.json

* Fix failing jest tests

* Update schema and types
2021-03-17 14:07:48 +01:00
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
Tomasz Szymanski
17e01508a6 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-16 11:11:47 +01:00
Piotr Grundas
824f1cdb9e
Add product variant events (#1006)
* Add product variant events to apps panel

* Update snapshots

* Update changelog

* Bump translations
2021-03-16 10:03:11 +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
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
Tomasz Szymanski
5d63968a6f Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-03 09:35:09 +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
Tomasz Szymanski
c561b0a7f7 Fix bug with tax calculation after shipping method update 2021-02-12 09:31:11 +01:00
Tomasz Szymanski
4160fb685c Display proper prices of selected channel in products add dialog 2021-02-12 09:01:51 +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
Tomasz Szymanski
b3fe252f20 CR changes 2021-02-08 14:30:06 +01:00
Tomasz Szymanski
49124e2014 Drop maybe in favor of optional operator 2021-02-08 11:28:48 +01:00
Tomasz Szymanski
dd3a000562 Fix invalid order history event 2021-02-08 10:07:52 +01:00
Tomasz Szymanski
2c2d07be0c CR changes, switch net to gross prices 2021-02-05 13:46:15 +01:00
Tomasz Szymanski
cfb5bb5168 Forbid confirmation of order that has not products inside 2021-02-03 13:19:26 +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
Tomasz Szymanski
beee789294 Hide metadata on unconfirmed order 2021-02-02 12:12:00 +01:00
Tomasz Szymanski
4f3fea10ff Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-02-02 11:52:10 +01:00
Tomasz Szymanski
c7562ebb72 Linter, translations 2021-02-02 11:49:46 +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
Tomasz Szymanski
4cf8c95347 Unconfirmed order view contents 2021-01-29 14:14:31 +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
Tomasz Szymanski
b0de18797e Refactor mutations of draftOrderLines[CRUD] to orderLines[CRUD] 2021-01-27 10:49:35 +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