Commit graph

470 commits

Author SHA1 Message Date
Karolina Rakoczy
a01a2b5a30
Update tests for creating variants (#1718)
* merge

* add data-test-id to sku input

* remove data-test-id from sku input

* update stories

* remove duplicated attribute
2022-01-04 16:13:15 +01:00
Michał Droń
c6e6aeff50
Disable save in product create & edit when product name is empty (#1551) (#1710)
* disable save in product edit & create when name is empty

* code review refactor

* Fix disabled button

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

* fix incorrect logic

* fix incorrect logic

* fix disable form on product variant

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

Co-authored-by: Magdalena Markusik <magdalena@markusik.com>
2021-12-22 15:09:29 +01:00
Jakub Majorek
6e9b12b04e
Add missing input value, cast values to number (#1692) 2021-12-17 11:16:44 +01:00
Dawid Tarasiuk
0334411294
Disable form change check in variant creation (#1681) 2021-12-16 13:32:27 +02:00
Paweł Kucharski
05cc720b6e
Limit quantity per checkout (#1536)
* Add site settings and variant detail text fields related with limit per checkout

* Add message translations

* Fix review issues pt.1

* Update snapshots

* Apply fixes after review pt.2
2021-12-07 10:43:24 +01:00
Karolina Rakoczy
b7da933bf2
Add tests for preorders- threshold and stocks (#1567)
* tests for preorder, stoks an threshold

* fix tests for ordering products in channel threshold
2021-12-05 16:03:04 +01:00
Dawid Tarasiuk
45c2726910
Fix saving initial variant attributes (#1624) 2021-11-29 14:32:51 +02:00
Karolina Rakoczy
2eb7193ce9
tests for updating products sku (#1555) 2021-11-22 15:59:50 +04:00
Karolina Rakoczy
a311583647
Add tests for creating products without sku (#1550)
* create products without sku

* update stories

* update stories
2021-11-22 15:57:20 +04:00
Dawid Tarasiuk
b50225aaa2
Add sorting products by update at date (#1581)
* Add sorting products by update at date

* Update messages

* Change columns order in product list view

* Display updated date column by default
2021-11-17 14:49:22 +02:00
Michał Droń
c3cc2b03de
Allow to create simple product with no channels (#1552) (#1575) 2021-11-10 13:16:49 +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
Michał Droń
a466676858
Fix pagination state after refresh (#1496) (#1515)
* fix pagination state after refresh

* remove unused imports

* remove unused imports

* add newline

* add generic types to hook parameters
2021-10-25 17:29:27 +02:00
Michał Droń
e879a0c1d5
Disable auto scroll to the top on assign references (#1510) (#1524)
* add resetScroll behavior to navigator hook

* disable scroll to top on modal close

* refactor useNavigator hook

* fix linter issue

* fix no default value of destructured parameter
2021-10-21 10:34:56 +02:00
JanChodorowski
cbeed52a30
[Fix] preorder fixes (#1477)
* Fix creating variant without preorder

* Fix creating simple product in preorder

* Proper stock display for variant in preorder

* Fix ending preorder for simple product

* CR response

* CR response

* Fix global threshold empty input
2021-10-14 14:15:59 +03:00
Jakub Majorek
6d9d353799
Fix sidebar navigation and Products Page overlapping problem (#1382) (#1472)
* fix content overlapping issue

* replace margin value

Co-authored-by: Kamil Pastuszka <33246308+kamilpastuszka@users.noreply.github.com>
2021-10-06 13:11:00 +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
Dawid Tarasiuk
d21e688f7d
Update dashboard to work without SKU (#1440)
* Update dashboard to work without SKU

* Allow variant ID export in products export

* Update messages

* Update test snapshots

* Update schema

* Update order line detials without SKU

* Update test ssnapshots

* Make SKU optional for prodduct without variants
2021-09-30 15:08:22 +02:00
Jakub Majorek
d4ebf69bc7
Remove image white background in dark mode (#1432) (#1446)
Co-authored-by: Kamil Pastuszka <33246308+kamilpastuszka@users.noreply.github.com>
2021-09-28 14:25:00 +02:00
marbin274
a47667a9fb
Add missing rowNumber dependency to update queryVariables (#1256)
* fix: add rowNumber like dependency to update queryVariables

* Add resetPagination hook and refactor

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
2021-09-28 14:24:45 +02:00
Magdalena Markusik
c566539cc1
Add tab selector util for lists and refactor (#1421)
* Add tab selector util for lists, refactor

* Remove unnecessary imports

* Update types

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>

Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2021-09-21 16:06:45 +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
901ab2a505
Fix products table content display (#1422) 2021-09-20 16:28:15 +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
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
Michał Droń
cda3cfa4c0
channel picker hidden on simple products (#1377) (#1381) 2021-09-13 13:25:00 +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
Jakub Majorek
9b2f5e3db2
Enforce category selection in product creator (#1337) (#1354)
Co-authored-by: SektorDV <35644259+SektorDV@users.noreply.github.com>
2021-09-03 13:40:06 +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
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
6b24fa0dc3
Merge pull request #1283 from mirumee/SALEOR-3967-multiple-item-deletion-parseqs-fix
multiple item deletion parseqs fix
2021-08-13 14:18:19 +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
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
0585f61522 disable picker via context 2021-08-11 13:39:18 +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
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
sektordv
72fb6b098d replace stringifyQs imports 2021-08-09 17:27:13 +02:00
Jakub Majorek
8d2021675e
Revert "fix crash when deleting more than 21 vouchers" (#1282) 2021-08-09 14:45:34 +02:00
SektorDV
c57289a424
Merge pull request #1263 from mirumee/SALEOR-3967-multiple-voucher-deletion
fix crash when deleting more than 21 vouchers
2021-08-09 12:07:18 +02:00
sektordv
3233b46aec create generic availability status label component 2021-08-04 16:24:14 +02:00
sektordv
6e66c6d60e update stringifyQs imports 2021-08-04 12:02:05 +02:00
Krzysztof Wolski
79e752cdbf
Fix for errors on changing channel availability (#1264)
* Add array diff util

* Use arrayDiff instead of diff

* Update changelog
2021-07-29 17:22:44 +02:00
Piotr Grundas
6abdc4613a
[SALEOR-3088] Date & DateTime attributes (#1180) 2021-07-29 14:15:14 +02:00
Kamil Pastuszka
db5ad19827
Fixed incorrectly handled image upload errors (#1223)
* fixed incorrectly handled image upload errors

* updated Changelog

* updated defaultMessages.json

* fix for collections and products

* fix for user avatar upload error

* implemented changes after review

* fixed conflict
2021-07-23 14:56:46 +02:00
Dawid Tarasiuk
b024a0fde6
Add variant create options dialog (#1238)
* Add variant create options dialog

* Update e2e tests

* Update option field name

* Refactor

* Use macaw UI in Variant create dialog

* Update messages
2021-07-22 11:56:13 +02:00
Dominik Żegleń
62817568a7
Use MacawUI (#1229)
* Replace withStyleswith useStyles (#1100)

* Replace withStyleswith useStyles

* Update messages

* Use rem as a spacing unit (#1101)

* Use rems as spacing units

* Fix visual bugs

* Update stories

* Use macaw-ui as theme provider (#1108)

* Use macaw ui as a theme provider

* Add react-dom to aliases

* Fix jest module resolution

* Update useTheme hook usage

* Fix test wrapper

* Use macaw from git repo

* Fix CI

* Update stories

* Fix aliasing

* Extract savebar to macaw ui (#1146)

* wip

* Use savebar from macaw

* Use confirm button from macaw

* Improve file structure

* Use sidebar context from macaw

* Update macaw

* Update macaw version

* Remove savebar from storybook

* Update stories

* Use alerts and notifications from macaw (#1166)

* Use alerts from macaw

* Add notifications from macaw

* Update stories

* Pin macaw version

* Encapsulate limit reached in one component

* Remove unused imports

* Use backlinks from macaw (#1183)

* Use backlink from macaw

* Update macaw version

* Use macaw sidebar (#1148)

* Use sidebar from macaw

* Use shipped logo

* Use lowercase

* Update stories

* Use user chip from macaw (#1191)

* Use user chip from macaw

* Use dedicated components for menu items

* Simplify code

* Bump version and fix types (#1210)

* Rename onBack to onClick

* Rename UserChip to UserChipMenu

* Rename IMenuItem to SidebarMenuItem

* Update macaw version

* Fix tables after changes in macaw (#1220)

* Update macaw version

* Update changelog

* Update stories

* Fix after rebase

* Update to macaw 0.2.0

* Lint files

* Update macaw to 0.2.2
2021-07-21 10:59:52 +02:00