Commit graph

1735 commits

Author SHA1 Message Date
sektordv
8a1be512bf changed skeleton render condition 2021-06-15 12:51:41 +02:00
sektordv
3812fae7a0 updated pageHeader buttons layout for xs displays 2021-06-15 12:36:20 +02:00
SektorDV
27d09b71e2
Merge pull request #1164 from mirumee/SALEOR-3039/fix-product-variant-media-grid-on-safari
fix grid element height in product variants on safari
2021-06-15 11:47:53 +02:00
Dawid Tarasiuk
88e5db054f
Fix product type translations (#1163)
* Fix product type translations

* Update changelog
2021-06-15 10:10:13 +02:00
SektorDV
b26942f081 removed 100% height on grid elements 2021-06-15 00:07:57 +02:00
Dawid Tarasiuk
c3e720a47e
Saleor 3087 Paginate attribute values in filters (#1152)
* Dynamic fetch attribute values in filter list

* Update filter attributes fixtures

* Change attribute values filter to autocomplete field

* Fix unchecking attribute value filter failure

* Update test snapshots

* Update changelog

* Fix cypress tests

* Add slug node mapping util
2021-06-14 15:31:41 +02:00
Dawid Tarasiuk
99aa6365be
SALEOR-3513 - Fix attribute values input display (#1156)
* Fix attribute values input display with additional search handler

* Update changelog

* Update attribute value search handler
2021-06-14 14:19:23 +02:00
sektordv
2f5236e981 button made inline with the header on mobile 2021-06-14 13:24:46 +02:00
sektordv
a7e5e28ca2 updated test snapshots 2021-06-14 12:28:57 +02:00
sektordv
7cc2c2158d fix for skeleton loader behavior 2021-06-14 12:10:42 +02:00
sektordv
e4936b3868 replaced skeleton with a dash 2021-06-11 15:10:23 +02:00
SektorDV
4f39e75f2d
Merge pull request #1150 from mirumee/SALEOR-2263/image-visibility-in-dark-mode
transparent bg & thicker selection border
2021-06-11 13:15:39 +02:00
Karolina Rakoczy
2c5b0feeb1
Fix tests after changes (#1149)
* fix

* fix
2021-06-10 10:13:31 +02:00
sektordv
0b3916f46b added contrast sidebar logos for dark mode 2021-06-10 09:28:41 +02:00
sektordv
7eb6d548d8 transparent bg & thicker selection border 2021-06-09 17:26:48 +02:00
Marcin Gębala
4e65418c51
Add payment events to webhooks (#1021)
* Add payment events to webhooks

* Add payment permission

* Extract messages

* Update snapshots

* Rename MANAGE_PAYMENTS to HANDLE_PAYMENTS

* Update snapshots
2021-06-08 12:33:21 +02:00
Dawid Tarasiuk
4d4aa3f9de Fix local pagination no of rows change 2021-06-08 10:54:13 +02:00
Dawid Tarasiuk
b78588a131 Implement attribute values pagination for pages (#1137)
* Implement attribute values pagination for pages

* Paginate initial values by const number

* Change onAttributeSelect to onAttributeFocus
2021-06-08 09:51:27 +02:00
Dawid Tarasiuk
d342bdb63b Variant attribute values pagination (#1133)
* Implement attribute values pagination in variant pages

* Implement attribute values pagination in variant creator

* Update variant creator design bugs

* Fix deleting attribute value error

* Refactor attribute value handling in variant creator

* Update after review

* Create local pagination state for attribute values

* Fix autocomplete select field scrolling on fetch more

* Change onAttributeSelect to onAttributeFocus

* Update cypress test function with attribute values pagination
2021-06-08 09:51:27 +02:00
Dawid Tarasiuk
988b191690 Change attribute values to choices (#1129)
* Change attribute values to choices

* Trigger CI
2021-06-08 09:51:26 +02:00
Dawid Tarasiuk
453e4192fe Attribute values pagination in product details (#1125)
* Attribute values pagination in product list filters

* Update product queries and mutations to handle attribute values pagination

* Search for attribute values dynamically on product details page

* Update product attributes mutation payload

* Support attribute values pagination on product create page

* Temporary mock not implemented attribute values pagination in variants and pages

* Trigger CI

* Fix simple product update channel listings

* Add simple local pagination implementation

* Create useLocalPageInfo hook to handle client side pagination

* Allow custom values always for attribute select inputs to prevent bug
2021-06-08 09:51:26 +02:00
Dawid Tarasiuk
f5324cee60 SALEOR-3345 Attribute values pagination on attribute details page (#1116)
* Attribute values pagination on attribute details page

* Update test snapshots

* Update values pagination in attribute create page

* Trigger CI

* Update attribute valus list pagination settings

* Update attribute details queries

* Fetch only attribute values after values update
2021-06-08 09:51:26 +02:00
Dawid Tarasiuk
39e107a7a6 Remove values from attribute list view (#1113) 2021-06-08 09:51:25 +02:00
Karolina Rakoczy
7df850bcb1
Saleor 3391 tests for staff members (#1122)
* invite staff

* staff members

* all tests for staff members

* remove unused import

* update snap

* remove /dashboard/

* uptade test.yml
2021-06-07 13:35:53 +02:00
MahmoudRizk
a473531e8f Fix Category list layout overlapping. 2021-06-05 21:12:37 +02:00
Karolina Rakoczy
dd4519a044
Saleor 3479 tests for permissions groups (#1135)
* test for permission groups

* test for permission groups

* test for permission groups

* test for permission groups

* all tests for permission groups

* all tests for permission groups
2021-06-02 09:59:34 +02:00
mmarkusik
50764b5932
Unify channel ID param in graphql (#1131)
* Update schema & types

* Change channel param to channelId in create order mutation usages

* Update types and plugin update mutation params

* Change usages of channel in graphql mutation params to channelId
2021-06-01 14:25:43 +02:00
mmarkusik
852bc127f6
Fix logo appearing too high on screen when loading login (#1130) 2021-06-01 14:17:44 +02:00
Karolina Rakoczy
0b1d0a3a54
Saleor 3357 tests for orders (#1119)
* add tests for puchase by type

* add expect for isShippingRequired

* tests for adyen

* tests for adyen

* tests for adyen

* tests for adyen

* adyen

* adyen

* adyen

* adyen

* adyen

* warehouses in chcekout

* rm warehouses in chcekout

* adyen payments

* adyen

* tests for orders

* fix shipping

* unskipp

* orders

* add empty lines

* add empty lines and reduce

* add empty lines
2021-05-31 09:50:31 +02:00
Jakub Majorek
5ace78f279
Change rateType from enum to string (#1121)
* Change rateType from enum to string

* Update snapshots

* Fix accidental recurrency caused by race condition

* Handle null type on SEO form

* Trigger deployment

* Fallback to empty string for undefined/null values
2021-05-24 15:50:41 +02:00
Michał Ociepka
fbfe3c8d7c
Add embed plugin to editorjs (#1114)
* SALEOR-3354 add Editor.js embed dependency

* SALEOR-3354 add embed to EditorJS tools

* SALEOR-3354 update change log
2021-05-18 15:21:33 +02:00
Jakub Majorek
1a9b55715f
Use available channels from context (#1115)
* Use available channels from context

* Allow to specify manage channel availability permissions
2021-05-18 12:08:44 +02:00
Karolina Rakoczy
9f71106f32
Saleor 3038 tests for payments by adyen (#1086)
* add tests for puchase by type

* add expect for isShippingRequired

* tests for adyen

* tests for adyen

* tests for adyen

* tests for adyen

* adyen

* adyen

* adyen

* adyen

* adyen

* warehouses in chcekout

* rm warehouses in chcekout

* adyen payments

* adyen
2021-05-16 13:38:53 +02:00
Dominik Żegleń
935a6f4542
Reduce bundle size (#1103)
* Add analysis tools

* Use deep imports to reduce bundle size

* Remove tslint config

* Remove unused packages

* Remove lodash-es references

* Use root level mui imports

* Remove mui from restricted imports
2021-05-14 10:15:15 +02:00
mmarkusik
bd02c1b260
Merge pull request #1110 from mirumee/SALEOR-1995/add-no-category-set-for-product-alert
Add error for co category set for product
2021-05-13 13:37:58 +02:00
Magdalena Markusik
a82d513dec Refactor after review 2021-05-13 12:27:39 +02:00
Magdalena Markusik
467319ebce Add error for co category set for product 2021-05-13 11:23:08 +02:00
Magdalena Markusik
cb2c2315cd Add some conditionals to fix shipping zone details view when permissions are not sufficient 2021-05-12 16:57:33 +02:00
mmarkusik
1945e9065b
Merge pull request #1099 from mirumee/SALEOR-3065/replace-shipping-zones-from-channel-with-separate-mutation
Saleor 3065/replace shipping zones from channel with separate mutation
2021-05-12 16:50:09 +02:00
mmarkusik
f73b283b47
Merge pull request #1102 from mirumee/add-edges-node-map-util
Add edges node map util
2021-05-12 16:49:56 +02:00
Jakub Majorek
db3049301c
Add new readonly plugin configuration field (#1106) 2021-05-12 16:17:53 +02:00
Magdalena Markusik
72bd0b89ce Add fix for paginating shipping zones for channel 2021-05-12 14:33:03 +02:00
Magdalena Markusik
1824e288ed Update schema - shippingzonesfilterinput, types and refactor 2021-05-12 13:26:11 +02:00
Magdalena Markusik
87de4da15d Update snapshots 2021-05-12 12:01:31 +02:00
Magdalena Markusik
def3a381ba Change more usages to map edges to items 2021-05-12 11:15:33 +02:00
mmarkusik
87f5722229
Channel per plugin fixes (#1105)
* Fix plugin update mutation type - channel from required to nullable

* Fix search not working in plugins list
2021-05-12 10:45:23 +02:00
Magdalena Markusik
b731e7cf89 Change more usages to map edges to items 2021-05-12 10:03:11 +02:00
mmarkusik
e373ce3eaa
Merge branch 'master' into add-edges-node-map-util 2021-05-12 09:50:48 +02:00
Magdalena Markusik
244f4ce021 Update snapshots 2021-05-12 09:47:19 +02:00
mmarkusik
19b8d30565
Feature - channels per plugin (#1093)
* Update schema

* Update queries, mutations, and types

* Add render with dividers util function

* Add plugin details channels card component

* Update plugin details to use channels

* Update stories

* Update plugin configuration type across the app, fix some other types, temporarily comment some things out in plugins list so types match"

* Update schema

* Update types

* Update plugins list to show channels and global statuses, add plugin channel status, update status label component

* Add render with dividers util function

* Comment out some stuff for types to match - temporary

* Add useChannelsSearchWithLoadMore util to imitate loading more from backend for channels list with load more

* Change filters logic to be able to display multiple fields in a field section and add it to plugins view

* Add scroll option to plugin availability popup on plugin list

* Fix plugin list page story

* Temporarily comment some stuff out, fix some types

* Add filters errors WIP

* Fix filters not updating list

* Add error handling to plugins list filters and filters in general

* Rename some components according to review

* Move useChannelsSearch and useChannelsSearchWithLoadMore to hooks, change some imports accordingly

* Fix imports

* Move render collection with dividers to a component, fix usages

* Replace channels with load more and search query to base channels query

* Change render with dividers function to take in a component instead of render function

* Update tests

* Extract messages

* Remove unnecessary imports

* Fix filters - autocomplete messing items order sometimes & some fields not working

* Update plugin update mutation variables - change channelId to channel

* fix failing tests

* Add test ids

* fix failing tests

* fix failing tests

* Rename misc.tsx to ts

* Remove usage of render collection with diviers, change it to CollectionWithDividers component

* Remove unnecessary imports

* Update messages ids

* Update snapshots

Co-authored-by: Karolina Rakoczy <rakoczy.karolina@gmail.com>
2021-05-11 15:58:09 +02:00
mmarkusik
bb441ea11a
Add product / page delete warning (#1095)
* Add Delete button component

* Add product / page type delete warning dialog

* Replace old product types delete dialog with new one, add products total count query

* Update schema, types and queries for pages, add use page count query and add warning delete dialog to page types

* Move type delete warning dialog data to proper hooks, refactor

* Remove unused components and stories

* Add plural forms to messages for product / page type delete warning, refactor

* Add type delete warning dialog stories

* Move type delete hooks to proper directiories, fix imports

* Fix imports

* Remove countallproducts query and instead use useproductcountquery

* Remove unnecessary types and imports
2021-05-11 14:26:17 +02:00
Magdalena Markusik
55df3df28d Fix types 2021-05-11 14:16:21 +02:00
Magdalena Markusik
b9d043f16e Fix types in map utils 2021-05-11 14:14:05 +02:00
Magdalena Markusik
a2b9d9d31f Add test ids 2021-05-11 13:37:29 +02:00
Magdalena Markusik
75eefa8a08 Merge branch 'add-edges-node-map-util' of https://github.com/mirumee/saleor-dashboard into add-edges-node-map-util 2021-05-11 13:36:09 +02:00
Magdalena Markusik
00b9db9366 Update snapshots 2021-05-11 13:34:06 +02:00
mmarkusik
4a6290c9e9
Update src/utils/maps.ts
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-05-11 09:50:49 +02:00
Magdalena Markusik
b6c4d2d19c Remove unnecessary imports 2021-05-10 17:29:06 +02:00
Magdalena Markusik
d1ae1559d0 Add mapEdgesToItems util function and replace all usages 2021-05-10 17:25:54 +02:00
Dawid Tarasiuk
4bf40ed410
Fix line on product page (#1098) 2021-05-10 15:05:14 +02:00
Magdalena Markusik
26e537db88 Update schema, types, and replace taking shipping zones straight from channel with channelShippingZones query 2021-05-07 13:20:19 +02:00
Dawid Tarasiuk
5a439176b7
SALEOR 3115 Fix EditorJS inline formatting (#1096)
* Fix EditorJS inline formatting

* Update changelog
2021-05-07 10:06:08 +02:00
Dawid Tarasiuk
8e038dc786
SALEOR-1629 - Fix voucher page bugs (#1031) 2021-05-06 13:43:26 +02:00
Dawid Tarasiuk
0e054cc1e4
Saleor 2798 user addresses selection for draft order (#1082)
* Create user addresses select modal

* Prepare user addresses select modal form

* Add user addresses select modal to order draft details page

* Update draft order validation of adresses in edit modal

* Add Customer Change modal

* Update snapshots and messages

* Indication of address form errors by address type

* Refactor addresses submiting

* Refactor address transform functions

* Add data-testids to addresses change dialog

* Update customer address choice style

* Trigger CI

* Update customer addresses edit flow

* Move styles outside of component files

* Refactor after review

* Refactor after review

* Do not update customer if the same selected

* Handle setting adress after edit customer with no addresses

* Trigger CI
2021-05-06 13:38:15 +02:00
Dawid Tarasiuk
e2a80e4758
Fix sortable chip style (#1091) 2021-05-04 10:45:58 +02:00
Piotr Grundas
2a21609eae
Numeric attributes (#1065)
* Update schema, types

* Add numeric unit control

* Improvements, tests

* Cleanup

* Add messages

* Small fixes

* Add test id's

* Improve useForm, logic

* Use short names

* Review corrections

* Small improvements
2021-04-29 10:58:03 +02:00
Dominik Żegleń
d220914085
Add service worker (#1073)
* Add service worker

* Update messages

* Update changelog

* Remove debug code

* Refactor code and add interval config

* Clear interval

* Reload all pages simultaneously

* Update copy
2021-04-26 12:10:47 +02:00
Jakub Majorek
a83a245654
Drop deprecated fields (#1071)
* Drop deprecated fields

* Update changelog

* Update test recordings

* Fix e2e tests

* Fix product sorting (#1079)

* update stories

Co-authored-by: Karolina Rakoczy <rakoczy.karolina@gmail.com>
2021-04-26 09:49:55 +02:00
Piotr Grundas
d48c0087e0
Rich text, multiselect, useFormset fixes (#1077)
* Rich text field fix

* Fix useFormset setItemValue

* Update changelog
2021-04-23 14:27:31 +02:00
Karolina Rakoczy
6395aa16a3
tests for pagination (#1062)
* tests for pagination

* tests for pagination

* tests for pagination

* tests for pagination

* tests for pagination

* fix test for variants
2021-04-21 15:14:38 +02:00
Dawid Tarasiuk
795f9ccc4b
SALEOR-1903 - Fix custom currency formatting (#1067)
* Fix custom money formatting

* Update changelog

* Fix adding channels to shipping rates

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
2021-04-21 11:03:57 +02:00
Karolina Rakoczy
4013105844
Saleor 2697 tests for updating products (#1060)
* updating products

* updating products

* test for updating
2021-04-21 10:02:48 +02:00
Karolina Rakoczy
b89e3533d6
Saleor 2690 tests for sorting products (#1033)
* tests for sorting

* tests for sorting

* sort products

* sort products

* sort products

* sort products

* tests for sorting

* fix imports

* tests for sorting
2021-04-21 09:51:10 +02:00
mmarkusik
9d6cc99103
Merge pull request #1066 from mirumee/SALEOR-2547/update-adding-draft-order-products-per-channel (#1070)
Update adding draft order products per channel
2021-04-20 16:06:39 +02:00
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
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
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
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
Marek Choiński
a9b3c6c53c
Fix display stock for simple products (#937) 2021-01-08 15:27:12 +01:00
Jakub Majorek
82772f0b08
Merge pull request #935 from mirumee/SALEOR-1756-error-when-trying-to-save-uncomplete-publish-date
Fix bug with uncomplete publish date
2021-01-07 16:29:41 +01:00
Marek Choiński
45feb2e469 Add default value 2021-01-07 15:21:20 +01:00
Tomasz Szymanski
afbdf0a500 Merge branch 'master' of github.com:mirumee/saleor-dashboard into refactor-zip-codes-to-postal-codes 2021-01-07 13:26:06 +01:00