Commit graph

259 commits

Author SHA1 Message Date
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
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
Karolina Rakoczy
ad3c1de234 tests for variants 2021-03-01 15:51:46 +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
Karolina Rakoczy
5f413d16fc merge with tests for products 2021-02-18 21:08:06 +01:00
Karolina Rakoczy
91460bd8b1 add data-test-id 2021-02-17 13:50:57 +01:00
Dominik Żegleń
8ece366660
Show channel picker to all staff members (#969) 2021-02-02 10:38:43 +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
Jakub Majorek
37bb52d087
Fix issues with stocks (#954) 2021-01-21 10:07:16 +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
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
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
Marek Choiński
a9b3c6c53c
Fix display stock for simple products (#937) 2021-01-08 15:27:12 +01:00
Dawid Tarasiuk
d5ae972b0e
Fix not updated file attribute field on delete (#911) 2020-12-17 10:25:16 +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ń
2765dc1324
Use product pricing instead of discounted price (#847)
* Use product pricing instead of discountedPrice

* Fix input width

* Update snapshots

* Fix reading price range of null pricing

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2020-11-23 14:04:24 +01:00
Dominik Żegleń
a175fb9497
Add global channel picker (#841)
* Move theme switch to user menu

* Add global channel picker

* Fix picker styles

* Use app channel state

* Improve prop naming to indicate id vs slug

* Disable picker if no reason to pick channel

* Remove settings modal leftovers

* Remove channel settings dialog

* Remove unused props

* Skip channel fetching if user is not authenticated

* Remove channel selection from components

* Update messages

* Fix e2e tests

* Remove channel picker leftover

* Revert ChannelSettingsDialog deletion

* Update snapshots

* Update messages
2020-11-23 10:39:24 +01:00
Karolka
e2e5f7f7a5
Add rating input at Create/Edit Product page (#828)
* Add rating input at Create/Edit Product page

* Fix cypress tests

Co-authored-by: Karolina Kuźniewicz <karolina.kuzniewicz@mirumee.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
2020-11-19 18:07:42 +01:00
Dominik Żegleń
6f9060144a
Multichannel (#833)
* add multichannel to configuration view

* create multichannels list view

* create multichannels list view

* add ChannelsCreate view

* update channels in configuration

* add stories

* update default messages

* fix ChannelForm props

* update channels list styles

* update snapshots

* update channel form currency input

* update Channels fragments

* extract messages

* remove tabs from channelsList

* channel details, channel delete modal (#598)

* create Channel details view

* create ChannelDeleteDialog

* add channels delete dialog to channels list

* update messages and types

* fixes after review

* channels availability (#609)

* create Channel details view

* update messages and types

* create ChannelsAvailability component

* create more product channels components

* create channels stories, update fixtures, types

* update product views with channels data

* update schema and snapshots

* update defaultMessages

* update ProductUpdate view

* create ChannelsAvailabilityDropdown component

* add product channels to local storage

* update globalTypes

* Update to new schema and resolve issues

* Update messages

* create deleteChannel mutation

* add channels availability component to product create view

* refactor ProductCreate and ProductUpdate views

* CollectionProducts view cleanup

* add disabled prop to ActionDialog

* use updateChannels mutation in ProductCreate view

* ProductCreate - update submit function

* fixes after review

* update snapshots and messages

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

* channels shipping components (#655)

* create PricingCard, OrderValue and OrderWeight components

* create ShippingZoneRatesPage and DeleteShippingRateDialog

* update ChannelsAvailability component

* updates after review

* channels shipping views (#662)

* update ChannelsAvailability component

* updates after review

* create PriceRate views, update types

* create weight rates views

* update shipping views, stories, messages

* update snapshots

* update snapshots

* update useChannels hook

* orders channels components (#698)

* create OrderChannelSectionCard component

* update OrderDetailsPage

* update DraftOrderChannelCard

* update snapshots

* update fixtures

* small change after review, update snapshots

* product pricing (#702)

* update product types

* update Pricing in simple product view

* use productVariantCreate mutation in simple product view

* update snapshots and messages

* handle create variant (#715)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update snapshots and messages

* fix update and create product handlers

* update pricing types

* channels modal - new styles, search input (#717)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update pricing types

* add search input in ChannelsAvailabilityDialog

* update ChannelsAvailabilityDialog in all views

* update snapshots

* fix search input label styles

* update toggleAllChannels function

* update variant creator (#724)

* update product types

* update Pricing in simple product view

* handle product create and update errors

* update pricing types

* add search input in ChannelsAvailabilityDialog

* update ChannelsAvailabilityDialog in all views

* update snapshots

* add channelLisitngs to variant creator

* update variant creator price styles

* update product variant creator reducer tests

* update createVariants tests

* update error handling in product variant creator

* add Skip pricing for now option

* use PriceField instead of TextField in ProductVariantCreatorSummary

* create price validation function

* fix errors handling in ProductVariantPrice component

* fixes after review

* Product List - remove publish/unpublish buttons (#727)

* ProductList - remove publish and unpublish buttons

* update messages

* update snapshots, messages

* revert changes in ChannelsAvailabilityDropdown

* products/shipping/discount list settings (#739)

* create ChannelSettingsDialog component

* update snapshots

* ProductList - open settings modal when there is no selected channel

* add settings modal to vouchers list

* add settings dialog to sales list

* add setting modal to shipping list

* update shipping

* update snapshots, messages

* useChannelsSettings - remove selectedChannelSlug

* fix channels update handler in product and shipping view

* messages update in ChannelSettingsDialog

* handle product/discount list when there is no channels

* update onSettingsOpen prop

* collection availability dropdown (#743)

* add availability dropdown to collection products list

* update channelListingProduct fragment name

* update voucher view/components with channels (#746)

* update voucher view/components with channels

* update VoucherSummary, remove defaultCurrency from voucher components

* update snapshots

* move getChannelsVariables func to discounts handlers

* update voucher messages

* sale view/components with channels (#750)

* update sale views with channels

* small fixes in discounts

* order views with channels (#752)

* update draft orders with channels

* add channel activate/deactivate mutations

* remove sort by total in orders list

* add error notification on channel activate/deactivate

* product variants channel select (#755)

* add channels selector to ProductVariants component

* remove selectedChannel from ProductUpdate, update messages and snapshots

* update product fragments

* update translations (#762)

* update translations

* fix translation types

* update messages

* update Availability component (#766)

* update ChannelsAvailability component

* update product fixtures

* update collection and channel fixtures

* ChannelsAvailability - handle errors

* update product handlers

* update ChannelsAvailability styles

* update ProductVariant

* update snapshots

* fix missing things in multichannel  (#785)

* add availability dropdown to discount products list

* fix error handling in shipping components

* update product views and components

* update messages

* update category view/components

* update CategoryProducts styles

* remove defaultCurrency from shipping components

* create ChannelsSelect component

* update channels error handling after review

* another fixes after review

* Add channels to collection views/components (#791)

** update collection components and views

* update create collection view

* update error handling in collection

* remove filter bar from collection list

* update products fragments

* small fix in collection create view

* use collectionFragment in useCatalogSearch

* update defaultMessages and snapshots

* update homepage view/drop defaultCurrency (#801)

* update homepage view

* drop defaultCurrency prop

* fix onChannelChange function in home view

* remove visibility from product list filters

* update export products with channels (#803)

* update ProductExportDialog with channels

* add new channel error code

* remover VISIBLE from product export dialog Financial information

* fix input size in ProductVariantCreatorSummary (#804)

* channels currency code select (#806)

* create select with currency codes

* fix ChannelDeleteDialog

* update defaultMessages, remove unneeded ChannelDetails handlers

* fixes after rebase

* replace channelListing with channelListings

* [multichannel] Update schema]

* Fix product create test

Co-authored-by: AlicjaSzu <alicja.szukuc@gmail.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2020-11-17 17:10:42 +01:00
dominik-zeglen
7c90ec1c72 Fix types 2020-11-04 13:59:26 +01:00
dominik-zeglen
28cc74c954 Add rich text editor to product pages 2020-11-04 13:58:38 +01:00
dominik-zeglen
437df6fe9a wip 2020-11-04 13:58:36 +01:00
dominik-zeglen
88bd52763c Add ability to save data 2020-11-04 13:58:34 +01:00
dominik-zeglen
6988316fbc Use dedicated type to return error promise 2020-11-02 14:26:02 +01:00
dominik-zeglen
63f042a91b Improve typing 2020-10-30 16:10:02 +01:00
dominik-zeglen
a34d22de8f Fix undefined and null objects handling 2020-10-30 16:10:00 +01:00
dominik-zeglen
16d9d28033 Fix types 2020-10-30 16:09:59 +01:00
dominik-zeglen
37541c24e1 Extract variant update form outside page 2020-10-30 16:09:58 +01:00
dominik-zeglen
78bb07e948 Extarct variant create form component 2020-10-30 16:09:56 +01:00
dominik-zeglen
2830dd7b55 Add ability to reset change state after success 2020-10-30 16:09:55 +01:00
dominik-zeglen
2abe680093 Fix change trigger 2020-10-30 16:09:35 +01:00
dominik-zeglen
374a072bf7 Extract product update form to separate component 2020-10-30 16:09:34 +01:00
dominik-zeglen
d192bcac34 Add custom form component to product create 2020-10-30 16:07:46 +01:00
Magdalena Markusik
9f3ae6e4ae fix adding warehouses to products 2020-10-27 16:02:46 +01:00
Magdalena Markusik
2bc7d88227 fix 2020-10-19 12:59:43 +02:00
Magdalena Markusik
374aab6603 fix 2020-10-19 12:28:43 +02:00
Magdalena Markusik
e472bea95f fix 2020-10-19 11:19:07 +02:00
Dominik Żegleń
2d59e4e0df
Merge pull request #769 from mirumee/fix/redundant-code-and-custom-attribute-value
Fix custom attribute value
2020-10-16 10:35:04 +02:00
Dominik Żegleń
32de699216
Merge pull request #764 from mirumee/fix/price-errors-1244
Do not allow negative values and display errors
2020-10-16 10:12:47 +02:00
dominik-zeglen
33c52788b1 Remove unused component state 2020-10-15 13:56:22 +02:00
dominik-zeglen
787a5f95c8 Fix custom attribute value 2020-10-15 13:24:15 +02:00
Dawid Tarasiuk
bf450de822 Handle case when there is no default variant selected 2020-10-13 18:36:45 +02:00
Krzysztof Wolski
10c44d3ac5 Update translation contextCo-authored-by: Patryk Zawadzki <81205+patrys@users.noreply.github.com> 2020-10-13 18:10:55 +02:00
Krzysztof Wolski
db1c33d1fe Add default variant indicator for variant nav 2020-10-13 18:10:12 +02:00
Marcin Gębala
1334729b3c
Merge pull request #761 from mirumee/fix/variant-attribute-no-value-1242
Fix overlapping input placeholder
2020-10-13 17:13:40 +02:00
Marcin Gębala
5cc005da96
Merge pull request #759 from mirumee/fix/variant-table-header-1319
Fix delete icon placement
2020-10-13 17:13:24 +02:00
dominik-zeglen
7d397606f0 Disable set as default if variant is default 2020-10-13 15:43:10 +02:00
Dominik Żegleń
fca8d7ab28
Merge pull request #737 from mirumee/fix/handle-attribute-errors
Fix handle attribute errors
2020-10-13 15:14:26 +02:00