Commit graph

233 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Dominik Żegleń
c1159861a9
Update schema (#1029)
* Update schema

* Update stories and changelog

* Update messages
2021-03-31 15:11:58 +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
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
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
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
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
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
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
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
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
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
Dawid Tarasiuk
1645e2fdab Implement Oauth2 flow with OpenID 2021-01-28 14:11:00 +01:00
Magdalena Markusik
679b532860 Update messages 2021-01-25 15:16:44 +01:00
Magdalena Markusik
708e381576 Update messages 2021-01-25 15:16:43 +01:00
Magdalena Markusik
93238f8f85 Update messages 2021-01-21 14:02:47 +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
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
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
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
Jakub Majorek
8b0162157a
Merge pull request #926 from mirumee/SALEOR-1017-shipping-rate-description
Shipping zone description
2021-01-07 13:13:00 +01:00
Tomasz Szymanski
e48c025bec ShippingRateInfo component, separate ShippingZoneInfo, cleanups 2021-01-07 11:52:12 +01:00
Marek Choiński
bd63de6224
Saleor 1945 adjust adress management to the designs (#922)
* Fix grid

* Move edit and delte option from buttons to card items menu

* Add phone and update labels

* Remove some maybe()

* Update storybook

* Update locale

* Fix RWD and move messages

* Update locale
2021-01-07 11:17:40 +01:00
Tomasz Szymanski
e24c918a32 Refactor ZIP Codes to postal codes (UI part) 2021-01-05 13:05:54 +01:00
Tomasz Szymanski
f502aff8b2 Add description to shipping zone create, refactor defaultMessages 2021-01-05 12:31:06 +01:00
Tomasz Szymanski
331ab84440 Unmock placeholder 2020-12-30 13:41:37 +01:00