Commit graph

546 commits

Author SHA1 Message Date
Wojciech Mista
ee9e55db0f
Fix error when clicked on filter if list is loading (#1661)
* Fix error when clicked on filter if list is loading

* CR Fixes

* Update tests
2021-12-15 11:50:35 +01:00
Dawid Tarasiuk
057940c99a
Fix refunded value calculation in order view (#1601)
* Fix refunded value calculation in order view

* Fix orders price alignment to right

* Update test snapshots
2021-11-29 14:30:23 +02:00
Dawid Tarasiuk
8cb665e091
Fix assign countries dialogs (#1610) 2021-11-23 10:03:07 +01:00
Michał Droń
06f0697438
Fix partially cut checkboxes in channel dialogs (#1560) (#1613)
* wip logic for indeterminate icon

* wip remove unused imports

* fix cutted off checkbox ripples

* refactor & cleanup
2021-11-22 12:57:32 +01:00
Wojciech Mista
31adc671a3
Add permissions to Catalog menu item (#1614) 2021-11-19 14:32:02 +01:00
Wojciech Mista
31046ae356
Change height of channels availability list (#1608) 2021-11-18 13:20:10 +01:00
whiteUnicorn
feef026fd0
Change ExpansionPanel as Accordion (#1279)
* Fix variant creation - remove channels + prices

* Update messages and snapshots

* Change ExpansionPanel as Accordion

* Update snapshots

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-11-10 11:55:27 +01:00
Dawid Tarasiuk
0fb58ea800
Fix overlapped content by sidebar (#1508)
* Fix overlapped content by sidebar

* Update app layout widths

* Update test snapshots

* Update macaw ui

* Update macaw-ui version
2021-11-09 13:17:18 +02:00
Wojciech Mista
2eec208144
Fix channel picker hiding in resend code modal bug (#1479)
* Replace savebar with actionbar

* Bump macaw version to 0.2.5

* Update tests
2021-10-21 13:25:24 +02:00
Karolina Rakoczy
cc7626be42
Duplicate current test for sales to work on variants instead on products (#1491)
* Duplicate current test for sales to work on variants instead on products

* remove unecessery imports

* Update cypress/integration/discounts/salesForVariants.js

Co-authored-by: Ewa Czerniak <ewa.czerniak@saleor.io>

Co-authored-by: Ewa Czerniak <ewa.czerniak@saleor.io>
2021-10-21 12:47:18 +02:00
Karolina Rakoczy
5bee739872
Saleor 4581 tests for products images (#1450)
* tests for images on product list

* image on product details page should be displayed

* test for upload image

* fix collection utils import

* fix creating test data

* update jest
2021-10-14 13:47:41 +03:00
Magdalena Markusik
185a48b421
Add filters and search to gift cards list (#1466)
* Fix filters not handling autocomplete values properly

* Add handling single selection to filter autocomplete field

* Change giftCardsListUrl function name to GiftCardListUrl for consistency

* Update schema

* Add gift card currencies query and update types

* Add validating function for filter number fields

* Add util function for mapping person node to select choice, fix types

* Add gift card list filters and search

* Add handling of gift card list search and filters dialogs in dialogs provider

* Add gift card search bar in gift card list

* Update gift card list queries and types, add filters to gift card list provider

* Fix types

* Fix types

* Fix currency filters in gift card list

* Update messages

* Remove unnecessary usages of maybe

* Change gift card balance filters not to be send to api when currency filter not present

* Update messages
2021-10-13 14:42:20 +03:00
Dawid Tarasiuk
22db86ed65
Add stock reservation settings (#1459)
* Add stock reservation settings

* Update page section header

* Fix test snapshots

* Fix stock reservation inputs

* Update test snapshots

* Trigger CI
2021-10-13 14:35:00 +03:00
Jakub Majorek
8820ed01fe
Fix wrong words and ordering for staff member form (#1424) (#1471)
* fix wrong words and ordering for staff member form

* add messages

* remove line

* apply changes from review

* change to local messages

Co-authored-by: Kamil Pastuszka <33246308+kamilpastuszka@users.noreply.github.com>
2021-10-06 11:45:29 +02:00
Wojciech Mista
bb752d3bad
Fix an issue where adornment can't be clicked in multi-select input fields (#1435)
* WIP

* Make adornment click-through

* Fix adornemnt in single autocomplete select field

* Added stories tests
2021-10-04 09:40:24 +02:00
JanChodorowski
25f7c8e4d8
Preorders (#1426)
* Feed preorder data to product variant forms

* Add end preorder date input and handle date data

* Translate strings, refactor date parsing

* Fix snapshots

* CR response

* CR response

* CR response

* Fix negative threshold, product variant preorder toggle, product variant update, and simple product creation

* Make preorder data optional

* Prevent setting past date as preorder end

* Disable replacing preorder variant in order

* Adjust fulfill view to preorder in variant

* CR response + prevent subbmiting form when endPreorderDate is in the past and display warning

* Add ErrorNoticeBar

* Translate preorder end date in past error message, fix form submissison disabling logic

* Rebase fixes

* Fix preorder form disabling logic, remove isPreorder field

* Fix edge cases aroud preorder inputs

* Update storyshots
2021-10-01 14:41:31 +02:00
Łukasz Szewczyk
6ddb537445
Prevent from mapping over undefined (#1457) 2021-10-01 14:23:01 +02:00
Łukasz Szewczyk
ec230e55c0
Add variants to sale view (#1420)
* Update schema and biuld types for sale per variant

* Create variant search module and generate types for it

* Add listing component for sale view

* Create dialog for variant assignment

* Expand sale page with vairnats

* Add new sale fixtures

* Add transaltions for variants on sale view

* Update snapshot

* Refactor sales dialogs and tables, move styles and ittl to local files

* Rework search dialog. Create item/subitem selectable table for variants, update spapshot

* Adjust table columns width

* Standardize the tables

* Unify messages

* Drop whole variant object in favor of just ids, simplify filtring functions

* Update snapshots

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-09-30 14:51:13 +02:00
Wojciech Mista
04dac84d63
Add margin to notification box (#1436)
* Add margin to notification box

* Code fix
2021-09-28 12:46:34 +02:00
Karolina Rakoczy
2c64a966cc
Saleor 4437 refactor tests (#1389)
* reference type cypress working

* refactor

* remove screenshots

* add reference

* add slash marker

* run tests based on shop version

* fix run tests based on shop version

* fix run tests based on shop version

* change base url to localhost

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix yml

* fix yml

* chage file names

* fix files names

* fix broken imports add checking for errors in grpah responses

* fix broken imports add checking for errors in grpah responses

* update jest

* fix snapshot
2021-09-27 12:04:21 +02:00
Wojciech Mista
b98f069aab
Add page type and attributes permissions handling (#1425)
* WIP add new configuration menu

* Add missing permissions

* Changed filtering to one based on arrays of permissions

* Add hasAnyPermissions and hasAllPermissions functions

* Simplify getConfigMenuItemsPermissions function

* Simplify routing logic
2021-09-24 14:01:54 +02:00
Kamil Pastuszka
d4ffd88752
Display app versions (#1433)
apply changes from review

apply changes from review

use useShop hook for core version
2021-09-23 16:18:38 +02:00
Jakub Majorek
6e102964a1
Fetch shop data after user is authenticated (#1427) 2021-09-21 15:30:41 +02:00
Piotr Grundas
ebe56da583
Add swatch attributes (#1301)
* Initial work

* #

* Base color logic

* Handle file urls

* Improvements, fix snapshots

* Add messages

* Update changelog

* Update storybook

* Improvements

* Messages

* Review corrections

* Bugfixes
2021-09-21 15:16:21 +02:00
Kamil Pastuszka
ffa065d301
fix placeholder text issue for autocomplete component (#1423)
with new logic

improve logic

update snapshot
2021-09-20 16:28:44 +02:00
Magdalena Markusik
705df796d2
Add gift card expired status (#1412)
* Add gift card expiry status to gift card details provider WIP

* Add gift card expiry handling in gift card update page header

* Add gift card expiry handling to gift card update details tag section & refactor

* Add gift card expiry handling to gift card update details expiry date section

* Add gift card expiry handling to gift card update metadata fields, add disabled prop to metadata cards

* Add comment

* Add gift card expiry handling to gift card list & refactor

* Change back some parts because of change of requirements

* Extract messages

* Remove comments, fix wrong expiry label being displayed in gift card list
2021-09-20 15:41:18 +02:00
Dominik Żegleń
ffe44be733
Fix back button on manage channels at product details (#1380) (#1417)
* Simplify "changed" logic

* Improve code composition

* Test base state and setters

* Add more tests

* Fix changed logic

* Rename hasChanged output

* Move channel data outside hook

* Move some logic to utils

* Save data in dialog and pass to view

* Split hooks

* Fix react warnings

* Fix story

* Alias type

* Fix stories

* Remove rebase artifact

* Reset state after closing modal

* Capitalize type name
2021-09-17 18:02:44 +02:00
Kamil Pastuszka
4fcc3eec5e
Add Demo Banner (#1416) 2021-09-17 10:09:45 +02:00
Magdalena Markusik
aaa0a9f309
Feature - Gift Cards (#1366)
* Add deletion to gift cards (#1298)

* Add gift cards section to menu and add empty list component

* Update messages

* Change styling of app wide page header to match design

* Add gift cards list table wip

* Update prop name for status chip component to make it more consistent with other components

* Replace old trash icon with new one

* Add Size type based on action dialog sizes to be used app wide

* Add delete icon button

* Add new sizes option to status chip component

* Add / update gift cards list components

* Add bulk actions type

* Work on gift cards list WIP

* Small refactor

* Fix styling of gift cards table

* Remove temp files

* Remove unnecessary type

* Add gift cards section to menu and add empty list component

* Update schema and types

* Add link to gift card update page to gift cards list and add route to gift cards index

* Extract order page title with status chip into a separate generic component and use it in order page title

* wip

* Update money component

* Add gift card details card balance section

* Refactor gift card details

* Add vertical spacer component

* Update schema and types

* Add gift card tag input component along with necessary queries

* Add gift card tag input to gift card update page

* Add gift card update details card expiry section WIP

* Add time period select field WIP

* Post rebase refactor

* Add time period select field to gift card update view

* Update schema, types and gift cards query

* Add getFullName util function and replace existing manual usages

* Add text with select field component

* Add gift card update info card and refactor

* Fixes after review

* Fix import

* Add displaying order link in gift card update

* Refactor

* Connect gift card list to api

* refactor

* Add gift card create dialog

* Fix gift card list styles, change location for gift card list query, minor refactor

* Fix menu structure data for gift cards

* Add channel currencies type to shop

* Refactor text with select field

* Add gift card expiry select component

* Add gift card error type and fragment

* Update global types

* Add default prop to getFormErrors function

* Move gift card details provider to providers dir

* Update global utils with mapSingleValueNodeToChoice function

* Update gift card tag input

* Move and refactor time period field

* Update schema

* move format money function to other money ulities

* Update gift card urls

* Add content or skeleton component

* Add gift card create util for extracting expiry settings input data

* Remove content or skeleton component and move displaying logic to existing skeleton

* Move displaying logic of gift card create dialog to list

* Refactor

* Add hooks for gift card bulk actions and gift card list to be used instead of context directly

* Fix types for text with select field + add parsing for number typed field

* Add initial currency to gift card create form

* Fix gift card create dialog closing animation

* Add gift card update info card

* Refactor gift card update details card

* Add gift card balance dialog

* Move gift card update form providers to providers dir

* Connect gift card update page to api, add necessary contexts etc.

* Refactor

* Refactor

* Add hooks to use instead of gift card contexts directly

* Fix types

* Fix text field target name missing in passed event in text with select field

* Add minimal value option to text with select field, add to gift card inputs

* Fix gift card update balance dialog not changing hasChanged prop after submit

* Refactor

* Add enable / disable section to gift card update

* Refactor

* Refactor

* Fix update balance dialog crashing the app when enetered wrong amount

* Fix gift card list table header styles

* Refactor

* Add metadata to gift card update

* Update messages ids

* Refactor

* Refactor

* Refactor

* Refactor

* Update schema and types, add gift card delete and bulk delete mutations

* Fix url change after gift card delete

* Refactor

* Update messages

* Change gift card list providers order

* Refactor/fix after merge

* Add gift card resend mutation and update types

* Add use dialog form reset hook and make update balance dialog use it, to fix it displaying form errors after modal close and open

* Add gift card resend code dialog

* Add button to open gift card resend code dialog

* Update messages

* Add gift card list bulk enable disable section

* Add refetching gift card list query after bulk activate / deactivate, refactor

* Refactor

* Refactor

* Update messages

* Update schema

* Change gift card update expiry settings

* Refactor

* Add gift card settings view (#1300)

* Add gift card settings view

* Refactor

* Create gift card sttings expiry select

* Update test snapshots

* Update schema

* Update gift card settings page title

* Refactor to match rest of the gift cards flow (#1308)

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>

* Refactor

* Refactor

* Set common error codes in string union

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>

* Add gift card kind to product type (#1307)

* Add gift card kind to product type

* Fix radio label alignment

* Update test snapshots

* Refactor

* Set default kind in product type create

* Change styling of activate / deactivate button in gift card update

* Add week option to time period select field

* Update messages

* Change labels and update messages

* Add auto fulfill non shippable gift cards to order settings

* Fix fixture

* Update messages

* Update snapshots

* Refactor

* Update types

* Add gift card used in order money amount in order payment section

* Remove unnecessary schema changes

* Change types

* Update fixtures and messages

* Refactor

* Add top card to gift card list (#1327)

* Add top card to gift card  list

* Update no gift card products notification messages

* Use alert instead of notification

* Update prodduct and product  type counts

* Return null if none of the conditions pass

* Update messages

* Fix unused product type deletion

* Update types

* Update imports

* Update messages

* Update test snapshots

* Change gift card dialog expiry settings

* Update form of create gift card dialog

* Add activation option to create gift card dialog

* Update event handling

* Update test snapshots

* Use date context provider for moment time

* Update types

* Refactor

* Update messages

* Update snapshots

* Add channel picker to gift card create modal

* Fix styling

* Add channel picker to gift card resend code dialog

* Update schema and types

* Refactor

* Update messages

* Refactor

* Update messages and snapshots

* Fix order gift card money amount (#1371)

* Update messages and snapshots

* Fix order gift card money in payment card when multiple gift cards used

* Fix missing order id check in gift card events in order gift card money used util

* Fix channel selection in gift card create dialog

* Fix order number not showing in gift card update view

* Add gift card settings to gift card create dialog (#1372)

* Fix gift cards number inputs to accept floats

* Fix order number showing as null in gift card update info card

* Fix channel slug adding in gift card create dialog

* Fix gift card list header top card links to display correctly

* Remove unused imports

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2021-09-14 15:57:02 +02:00
Jakub Majorek
d5a36e47fc
Add channel picker product details (#1355)
* Add channel picker product details (#1353)

* Enable channel picker on product details page

* Add channel picker to product details

* Simplify category details page

* Update snapshots and translations

* Update types

* Update testId, bump macaw-ui

* Update snapshots, types and schema
2021-09-03 14:27:34 +02:00
SektorDV
ab0717ef23
Keep multiselect open after making choice (#1345) (#1350) 2021-09-02 09:01:57 +02:00
Kamil Pastuszka
9c1c39a025
add conditional logic (#1351) 2021-09-01 13:25:00 +02:00
Dawid Tarasiuk
08637b27fd
Introduce fulfillment creation API (#1241)
* Display warehouse name for each fulfillment (#1259)

* Hide no-stocks columns in fulfillment view (#1260)

* Hide no-stocks columns in fulfillment view

* Update tests

* Refactor

* Update tests

* Add fulfillment settings card (#1242)

* Add fulfillment setting card

* Make fulfillment approvement naming consistent

* Fix mutation bug

* Update types

* Trigger CI

* Handle fulfillment acceptance on order details page (#1255)

* Handle fulfillment acceptance on order details page

* Make fulfillment approvement naming consistent

* Update fulfillment schema and its usage

* Render history events regarding waiting fulfillments (#1265)

* Add awaiting for approval fulfillment order event

* Fix warehouse name

* Change fulfillment quantity calculation (#1267)

* Change fulfillment quantity calculation

* Fix warehouse name

* Update messages

* Trigger CI

* Refactor

* Fix refactor

* Fix fulfillment for no variant

* Allow creating fulfillments waiting for acceptance (#1248)

* Fix fulfillment page style and typescript classname types perfomance issue

* Allow creating fulfillments waiting for acceptance

* Make fulfillment approvement naming consistent

* Update schema

* Add tooltip to fulfillment savebar

* Update unpaid fulfillment creation restriction

* Update fulfillment cration restriction

* Update test snapshots

* Add possibility to cancel "waiting" fulfillments (#1288)

* Allow to cancel waiting fulfillments

* Add delete button to fulfillment card

* Update test snapshots

* Handle waiting fulfillments on refund page (#1290)

* Handle waiting fulfillments on refund page

* Trigger CI

* Trigger CI

* Calculate quantity to refund on quantityToFulfill

* Update changelog

* Update snapshots

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-08-20 16:36:05 +02:00
Jakub Majorek
ab4c897b2a
Add dashboard extensions (#1292)
* Fix app embed

* initial setup

* Create ButtonWithSelect component

* Use context

* Use dialog

* Handle app-bridge actions

* Code adjustments, bump packages

* Fix tests

* Fix schema formatting

* Send response

* Use latest package versions
2021-08-20 15:58:53 +02:00
SektorDV
a94a611949
Horizontal scroll fix on tables (#1306) (#1313)
* restore horizontal overflows to responsive tables

* regenerate package-lock
2021-08-20 14:16:19 +02:00
SektorDV
c5adcda1e3
Fix dashboard crash when no channels exist (#1311)
* channel value test fix

* update snapshots

* Fix dashboard crashing when no channels exist (#1305)

* add optional chaining to ids

* lint fix

* channel value test fix

* Fix dashboard crashing when no channels exist (#1305)

* add optional chaining to ids

* lint fix

* channel value test fix
2021-08-20 13:14:14 +02:00
Magdalena Markusik
b83a542b88 Refactor 2021-08-20 12:54:23 +02:00
Magdalena Markusik
745b5d49ed Add option for left menu to display subitems based on their own permission, instead of parent permission 2021-08-20 10:55:04 +02:00
mmarkusik
dae95cb410
Add Gift Cards #1 (#1291)
* Add gift cards section to menu and add empty list component

* Update messages

* Change styling of app wide page header to match design

* Add gift cards list table wip

* Update prop name for status chip component to make it more consistent with other components

* Replace old trash icon with new one

* Add Size type based on action dialog sizes to be used app wide

* Add delete icon button

* Add new sizes option to status chip component

* Add / update gift cards list components

* Add bulk actions type

* Work on gift cards list WIP

* Small refactor

* Fix styling of gift cards table

* Remove temp files

* Remove unnecessary type

* Add gift cards section to menu and add empty list component

* Update schema and types

* Add link to gift card update page to gift cards list and add route to gift cards index

* Extract order page title with status chip into a separate generic component and use it in order page title

* wip

* Update money component

* Add gift card details card balance section

* Refactor gift card details

* Add vertical spacer component

* Update schema and types

* Add gift card tag input component along with necessary queries

* Add gift card tag input to gift card update page

* Add gift card update details card expiry section WIP

* Add time period select field WIP

* Post rebase refactor

* Add time period select field to gift card update view

* Fixes after review

* Update schema, types and gift cards query

* Add getFullName util function and replace existing manual usages

* Add text with select field component

* Add gift card update info card and refactor

* Fix import

* Add displaying order link in gift card update

* Refactor

* Connect gift card list to api

* refactor

* Add gift card create dialog

* Fix gift card list styles, change location for gift card list query, minor refactor

* Fix menu structure data for gift cards

* Add channel currencies type to shop

* Refactor text with select field

* Add gift card expiry select component

* Add gift card error type and fragment

* Update global types

* Add default prop to getFormErrors function

* Move gift card details provider to providers dir

* Update global utils with mapSingleValueNodeToChoice function

* Update gift card tag input

* Move and refactor time period field

* Update schema

* move format money function to other money ulities

* Update gift card urls

* Add content or skeleton component

* Add gift card create util for extracting expiry settings input data

* Remove content or skeleton component and move displaying logic to existing skeleton

* Move displaying logic of gift card create dialog to list

* Refactor

* Add hooks for gift card bulk actions and gift card list to be used instead of context directly

* Fix types for text with select field + add parsing for number typed field

* Add initial currency to gift card create form

* Fix gift card create dialog closing animation

* Add gift card update info card

* Refactor gift card update details card

* Add gift card balance dialog

* Move gift card update form providers to providers dir

* Connect gift card update page to api, add necessary contexts etc.

* Refactor

* Refactor

* Add hooks to use instead of gift card contexts directly

* Fix types

* Fix text field target name missing in passed event in text with select field

* Add minimal value option to text with select field, add to gift card inputs

* Fix gift card update balance dialog not changing hasChanged prop after submit

* Refactor

* Fix update balance dialog crashing the app when enetered wrong amount

* Fix gift card list table header styles

* Add enable / disable section to gift card update

* Refactor

* Refactor

* Refactor

* Add metadata to gift card update

* Update messages ids

* Refactor

* Refactor

* Refactor

* Refactor

* Update types after rebase

* Fix types

* Fixes after qa

* Fix tests
2021-08-16 15:44:00 +02:00
SektorDV
82e7b58bbf
Merge pull request #1287 from mirumee/SALEOR-3617-variant-creator-multiselect-fix
variant creator multiselect fix
2021-08-12 12:05:32 +02:00
sektordv
22210564e7 fix for single selects with values selected 2021-08-12 11:00:49 +02:00
sektordv
bb890fa5f0 clear values on blur for attribute selects 2021-08-11 16:38:44 +02:00
SektorDV
2d67891685
Merge branch 'master' into SALEOR-3418/disable-global-channel-picker-outside-home 2021-08-11 13:48:15 +02:00
sektordv
049210b1b6 reapply changes after rebase 2021-08-11 13:44:47 +02:00
sektordv
e5d0ee1179 hide channelselect instead of disabling 2021-08-11 13:40:00 +02:00
SektorDV
e26d6b5a66
Merge pull request #1269 from mirumee/SALEOR-3695-collection-list-adjustments
Add filter bar to collection view
2021-08-11 12:09:21 +02:00
sektordv
11bead49c4 clear values on blur, prevent unnecessary updates 2021-08-11 11:47:01 +02:00
Kamil Pastuszka
8064b357d7
Fixed issue with modals containing invalid/redundant scrolls (#1240)
* fixed conflicts

* added improvements

* added changes

* deleting theme

* Update CHANGELOG.md
2021-08-11 11:03:39 +02:00
sektordv
2e14716a29 split messages between individual views 2021-08-10 19:03:52 +02:00
Dominik Żegleń
6d3e346a19
Improve limit messages (#1274) 2021-08-10 10:59:15 +02:00