Commit graph

61 commits

Author SHA1 Message Date
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
dbaed5478a
App adjustments (#1385)
* Use shop domain as backendHost, guard domain changes on cloud instances

* Update messages and snapshots

* Remove unused prop
2021-09-13 16:14:04 +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
6e66c6d60e update stringifyQs imports 2021-08-04 12:02:05 +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
Dawid Tarasiuk
8d45454f84
Update address form autofill (#1209)
* Update address form autofill

* Update test snapshots

* Fix autocomplete bugs

* Set autocomplete to none to fix chrome greedy behaviour
2021-07-12 09:59:56 +02:00
Dominik Żegleń
935a6f4542
Reduce bundle size (#1103)
* Add analysis tools

* Use deep imports to reduce bundle size

* Remove tslint config

* Remove unused packages

* Remove lodash-es references

* Use root level mui imports

* Remove mui from restricted imports
2021-05-14 10:15:15 +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
dominik-zeglen
5a81878367 Remove mailing settings 2021-03-30 14:50:09 +02:00
Damian W
94ceead89d Merge branch 'master' of github.com:mirumee/saleor-dashboard into update-collection-error-types 2021-03-30 11:41:26 +02:00
Dominik Żegleń
416d7d87f6
Improve theming (#1020)
* Remove unused code

* Move theme to separate directory

* Separate types

* Separate shadows

* Separate shadows

* Rename types

* Modularize code

* Do not pollute prototypes

* Fix missing import

* Aliast mui styles

* Import theming internally

* Fix types

* Fix override type
2021-03-30 09:40:18 +02:00
Damian W
3e0794cb61 Update error type on CollectionBulkDelete 2021-03-29 12:28:59 +02:00
Marcin Gębala
71b4b329d8
Drop authorization keys section (#913)
* Drop authorization keys section

* Update translations

* Update snapshots

Co-authored-by: dominik-zeglen <flesz3@o2.pl>
2020-12-21 13:50:04 +01:00
dominik-zeglen
6988316fbc Use dedicated type to return error promise 2020-11-02 14:26:02 +01:00
dominik-zeglen
a13d9dc547 Flatten error list 2020-10-30 16:10:08 +01:00
dominik-zeglen
a27a029452 Pass promise to reset form state 2020-10-30 16:10:06 +01:00
Magdalena Markusik
cb977c4516 add type url to email field in site settings 2020-09-24 15:56:44 +02:00
Magdalena Markusik
c2039f751e add autocomplete off to email field in site settings 2020-09-24 15:38:21 +02:00
Magdalena Markusik
edb03e81b0 Disable autocomplete for plugin auth key field and site settings auth fields 2020-09-23 10:19:18 +02:00
dominik-zeglen
eddec1a5c2 Move fragments to avoid circular imports 2020-07-07 12:14:12 +02:00
AlicjaSzu
1887769055 add status to notifications 2020-07-06 10:46:14 +02:00
Dawid Tarasiuk
65e5539173 Remove basePrice from schema 2020-06-10 15:39:10 +02:00
Krzysztof Wolski
a82de30309
Add circleci config and enhance our linters (#519)
* Add circleci config

* Season linting config

* Apply code style
2020-05-14 11:30:32 +02:00
dominik-zeglen
74ea099824 Make company address shared component 2020-04-28 16:28:37 +02:00
dominik-zeglen
b2987cddac Fix type errors 2020-03-24 13:54:14 +01:00
dominik-zeglen
63ff52349d Use error formatting in site settings view 2020-03-24 13:54:10 +01:00
dominik-zeglen
4c27d69229 Fix form errors 2020-03-03 14:33:35 +01:00
dominik-zeglen
c4863ece60 Do not store errors in form component 2020-02-24 15:14:48 +01:00
Marcin Gębala
97abf33fd2
Merge pull request #297 from mirumee/ref/move-mutation-state-to-mutation
Move mutation state to mutation objects
2019-12-16 14:33:03 +01:00
Dominik Żegleń
8422900c03
Merge pull request #287 from mirumee/fix/company_address_empty_country
Fix case when country is not selected by user in site settings company address
2019-12-10 11:49:50 +01:00
dominik-zeglen
bf0bad5a5e Rename state to status prop 2019-12-06 18:17:44 +01:00
dominik-zeglen
6b62f5cc40 Do not use getMutationState explicitly 2019-12-06 18:11:46 +01:00
Tomasz Szymański
4b11d29de1
Change validation of store information data 2019-12-06 15:19:09 +01:00
dominik-zeglen
96176924f9 Add missing style names 2019-12-03 16:28:40 +01:00
Tomasz Szymański
0374a0218b
fix case when country is not selected by user in site settings company address 2019-12-03 15:27:10 +01:00
dominik-zeglen
421da92cb3 Use eslint instead of tslint 2019-12-02 16:33:58 +01:00
dominik-zeglen
564aab26f7 Debounce order search 2019-11-21 18:47:06 +01:00
Krzysztof Bialoglowicz
9911f2b278 Use responsive table component 2019-11-19 13:41:36 +01:00
dominik-zeglen
d71324ced2 Add ability to paginate through subcategories 2019-11-12 14:21:13 +01:00
dominik-zeglen
4b574c5d6c Fix messages 2019-11-07 14:40:28 +01:00
dominik-zeglen
74d6794679 Update @material-ui to v4 2019-11-07 14:29:07 +01:00
dominik-zeglen
d84ba84e91 Update @material-ui 2019-11-07 14:22:40 +01:00
dominik-zeglen
33e956ea57 Use FC instead of deprecated StatelessComponent 2019-11-07 12:34:54 +01:00
Marcin Gębala
ad18fc727c
Merge branch 'master' into fix/minor-bugs 2019-10-25 14:28:44 +02:00
dominik-zeglen
3dea64d9d7 Use CountryCode 2019-10-25 14:18:52 +02:00
dominik-zeglen
9cb5c4cb7b Add ability to remove company address 2019-10-24 15:17:37 +02:00
dominik-zeglen
3c60782a1b Update copy 2019-10-24 15:17:37 +02:00
dominik-zeglen
589df18030 Update fixtures 2019-10-24 15:12:32 +02:00