Commit graph

233 commits

Author SHA1 Message Date
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
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
Dawid Tarasiuk
1645e2fdab Implement Oauth2 flow with OpenID 2021-01-28 14:11:00 +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
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
55a330040e Update changelog with reference attributes 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
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
Dawid Tarasiuk
1e140853ec
File attributes (#884)
* Update changelog with file attributes

* Add file type attribute

* Update attribute properties form

* Update translation messages with file upload

* Create generic attributes component (#832)

* Create generic Attributes component

* Add story for Attributes component

* Remove deprecated attribute value type field from queries

* Update test snapshots of attributes component

* Add file upload field to atributes (#888)

* Add story for Attributes component

* Update test snapshots of attributes component

* Create file upload field in attributes

* Update upload file input data-test

* Update storybook test snapshots of attributes

* Add dedicated input props to file field

* Run Cypress using custom API

* Add missing error handling in file upload field

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

* Add file attribute upload to page attributes (#894)

* Support upload file attribute for pages

* Update after review

* Add file attribute upload to variant attributes (#892)

* Support upload file attribute for variants

* Update after review

* Refactor attribute values errors merging

* Update after review

* Add file attribute upload to product attributes (#826)

* Support upload file attribute for products

* Update after review

* Refactor attribute values errors merging

* Refactor product attribute value delete handling

* Fix deleting file in file upload field

* Fix delete attribute values errors handling

* Add link to file upload field (#898)

* Update file attributes updates (#899)

* Update file attributes updates

* Refactor file uploads handling

* Move attributes utils to attributes directory

* Fix product channel listing updates

* Clear file field value if file is not passed as prop

* Delete attribute values before update (#908)

* Delete file attributes after file update

* Triggr CI

* Show skeleton in file upload field during loading

Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
2020-12-16 11:53:28 +01:00
Dominik Żegleń
556ea52e8f
Update quantity column in Inventory part of Product Variant view (#904)
* Add allocated quantity column

* Remove unused prop

* Update snapshots and messages

* Update changelog
2020-12-15 10:50:29 +01:00
Dominik Żegleń
e55805a79d
Add zip code exclusion (#877)
* Clean up stories

* Add missing props

* Add zip codes section (#861)

* Add zip code listing

* Add list wrapping

* Update snapshots

* Set up API data

* Fix lgtm warning

* Update snapshots

* Run Actions on all PR

* Checks on PR

* Test envs on PR

* Cleanup action on PR

* Update messages

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

* Add zip code range dialog

* Fix path management

* Use query params to handle modal actions

* Allow zip codes to be assigned to shipping method

* Make params optional

* Fix types

* Add zip code deletion (#871)

* Add zip code range dialog

* Fix path management

* Use query params to handle modal actions

* Allow zip codes to be assigned to shipping method

* Make params optional

* Fix types

* Clean up urls

* Add zip code range delete action

* Update snapshots and messages

* Update testing and changelog

* Update schema

* Simplify code

* Refresh zip code list after assigning them

* Update view after zip code deletion

* Update types and snapshots

* Update snapshots

* Fix error message, checkbox default value (#880)

* Fix error message, checkbox default value

* Update snapshots

* Use price instead of weight variant

* Update schema and types

* Hide exclude/include zip codes section

* Update stories

Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
Co-authored-by: Tomasz Szymański <lime129@gmail.com>
2020-12-01 16:42:25 +01:00
Dawid Tarasiuk
eb351b396a
Refunds (#870)
* 1721 - add refunds miscellaneous view (#860)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Update order details view for refunds (#874)

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

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

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

* Fix showing refund error

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

* Update order details view for refunds (#874)

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

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

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

* Fix showing refund error

* Add missing refund amount to order history

* Merge repeated order lines in fulfillment lines

* Update order history events types and test snapshots

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

* Add status chip component and update order details page header

* refactor

* refactor and update types

* Remove rebase leftovers

* Create order settings page

* Add order setting query

* Connct order settings view with api

* Show order settings update error message

* Popup menu routing to order settings

* Fix circular import error with order settings form types

* Update order settings story

* Update order settings messages

* wip

* Add order confirm mutation and types

* Add confirm order feature to order details

* Update global types

* refactor after review

* refactor after review

* update types

* Revert settings menu removal

* Add changelog entry

Co-authored-by: Tomasz Szymanski <lime129@gmail.com>
Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2020-11-30 14:19:57 +01:00
Marek Choiński
9069b6bc80
Saleor 1680 add shipping methods to translation section (#864)
* Add update shipping method translations query

* Added queries and types for shipping method translation tab

* Fix tab view for shipping method

* Fix query and view for shipping method

* Revert password credentials type any

* Update storybook

* Update locale

* Update CHANGELOG.md
2020-11-27 16:53:48 +01:00
Dawid Tarasiuk
fc02fce701
Page types (#807)
* Create attribute class selector

* Use ProductAttributeType to check if product is simple or with variants

* Allow attribute class selection only during its creation

* Update attribute type selection translations

* Show only product attributes in columns picker on product list view

* Cleanups in Attribute Organization component

* Create Page Types list page

* Create content management section in settings

* Implement page types list view

* Remove unused imports from page type list

* Updatte page type list style

* Remove legacy code from page type list component

* Update PageTypeListPage component

* Create Page Types details page

* Fix page type attribute reordering

* Implement PageType create view

* Implement PageType update view

* gUpdate page type details components

* Fix page type update component

* Update page type components stories

* Update page type errors handling

* Update page type details view

* Create Page Types details page

* Implement PageType create view

* Update product attribute assignment mutations

* Add page types attribute assignment mutations

* Add page types attribute assignment handling

* Temporarily fix page create mutation

* Update page type error messages

* Remove legacy storybook page type stories

* Update attribute assignment dialogs stories

* Update page type details error handling

* Update props for page type components

* Create attribute class selector

* Implement page types list view

* Add page type selector on page create and details views

* Add attributes list to page details views

* Update page types list

* Use attribute errors for attributes muatations

* Save attribute values on page create and update

* Update messages for page view

* Update page attributes fragment

* Use AttributeError in AttributeBulkDelete

* Update page type and its attribute selection

* Handle page types deleting

* Update page types deleting messages

* Handle page types attribute reorder

* Fix PageOrganizeContent component types

* Update graphqql types

* Fix page fixture

* Update messages

* Update test snapshots

* Pass pageTypes to PageForm

* Update changelog with page type addition note

* Update package-lock

* Update test snapshots

* Fix malformed generated type

* Update messages after rebase
2020-11-19 15:42:14 +01:00
Marcin Gębala
1d8f912fc6 Update changelog 2020-11-13 11:39:22 +01:00
Marcin Gębala
38d3386045 Update after release 2020-11-04 12:32:10 +01:00
Dominik Żegleń
d16cf2c6da
Merge branch 'master' into SALEOR-1403-cannot-fulfill-order-when-product-quantity-is-one 2020-11-03 12:15:39 +01:00
Dominik Żegleń
e39f24cc0c
Merge branch 'master' into lush-collection-load-more 2020-10-30 15:38:37 +01:00
dominik-zeglen
ec25e521df Update changelog 2020-10-30 15:01:29 +01:00
Grzegorz Derdak
e14b144636 Merge branch 'master' into SALEOR-1403-cannot-fulfill-order-when-product-quantity-is-one 2020-10-30 14:13:02 +01:00
Grzegorz Derdak
9036294491 Changes after code review 2020-10-23 13:21:04 +02:00
dominik-zeglen
f65ef4d39b Update changelog 2020-10-23 12:28:14 +02:00
Grzegorz Derdak
41a749d5af Update CHANGELOG.md 2020-10-22 12:03:18 +02:00
Magdalena Markusik
f38cb690de update changelog 2020-10-19 13:08:14 +02:00
Dawid Tarasiuk
7e8f5373a1 Update changelog 2020-10-15 15:23:05 +02:00
Krzysztof Wolski
6275f257ac Locale and changelog 2020-10-13 18:10:55 +02:00
Dawid Tarasiuk
0423b24716 Update changelog 2020-10-08 13:51:21 +02:00
Dawid Tarasiuk
46cadf0c48
Merge pull request #713 from mirumee/fix/no-warehouses-in-variant-creator
Add no warehouses info when working with stock quantities
2020-10-08 12:42:10 +02:00
Dawid Tarasiuk
8dcb263cd3 Update product type test snapshot 2020-10-02 12:50:58 +02:00
Dawid Tarasiuk
9d306863f0 Update changelog 2020-09-28 14:46:56 +02:00
Dawid Tarasiuk
4cb5a1114c Update changelog 2020-09-28 14:40:53 +02:00
Marcin Gębala
7e24e4a14f
Merge pull request #720 from mirumee/feat/add-slug-to-seo-form
Add slug field to category, product, collection & page details
2020-09-25 18:44:08 +02:00
Marcin Gębala
55d748e3c6
Merge pull request #731 from mirumee/revert-menu
Revert menu
2020-09-25 18:16:18 +02:00
Magdalena Markusik
8f43226e95 Merge branch 'master' into feat/add-slug-to-seo-form 2020-09-25 17:41:58 +02:00
Dominik Żegleń
b571eef598
Merge pull request #728 from mirumee/add/taxes-per-product
Allow taxes to be configured per product
2020-09-25 17:28:56 +02:00
Marcin Gębala
cf91edaaf9 Revert "Merge pull request #697 from mirumee/ref/sidebar"
This reverts commit b1623eaaf5, reversing
changes made to 14da39ebfa.
2020-09-25 16:45:27 +02:00
mmarkusik
c8e06812e6
Merge branch 'master' into feat/add-slug-to-seo-form 2020-09-25 15:39:05 +02:00
Tomasz Szymański
4cecf238d6
Allow product variant to be set as default (#721)
* Add drag-and-drop to allow variants reordering

* Handle variants reordering

* Allow product variant to be set as default

* Display default variant and perform refresing after set

* Move ProductVariantSetDefault to separate component

* Changes to new schema


Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2020-09-25 14:33:01 +02:00
dominik-zeglen
5b6a420199 Update changelog, stories and messages 2020-09-24 13:49:49 +02:00
Dawid Tarasiuk
c43014e375 Update changelog 2020-09-23 17:59:11 +02:00
mmarkusik
8093876c7b
Merge branch 'master' into feat/add-slug-to-seo-form 2020-09-23 09:39:29 +02:00
mmarkusik
ce77c9df10
Fix strings containing "informations" (#722)
* update

* update changelog

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
2020-09-22 18:04:06 +02:00
mmarkusik
c7124ffc41
Merge branch 'master' into feat/add-slug-to-seo-form 2020-09-22 09:58:33 +02:00
Magdalena Markusik
977fbce34c update changelog 2020-09-21 17:02:17 +02:00
Dominik Żegleń
a78af2b9db
Merge branch 'master' into fix/avatar-change-button 2020-09-21 11:12:56 +02:00
Dawid Tarasiuk
b39183da93 Update changelog 2020-09-21 10:34:33 +02:00
Dawid Tarasiuk
865c9ad3b5 Update changelog 2020-09-18 17:01:36 +02:00