djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/product-type-search

Browse source
This commit is contained in:
Marcin Gębala 2019-09-30 14:31:54 +02:00 committed by GitHub
commit a36487e947
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -28,3 +28,4 @@ All notable, unreleased changes to this project will be documented in this file.
- Add testcafe tags to attributes, categories, collections and product types - #178 by @dominik-zeglen - Add testcafe tags to attributes, categories, collections and product types - #178 by @dominik-zeglen
- Fix input error style - #183 by @benekex2 - Fix input error style - #183 by @benekex2
- Fix product type selection - #189 by @dominik-zeglen - Fix product type selection - #189 by @dominik-zeglen
- Fix staff return link - #190 by @dominik-zeglen

2
src/shipping/views/ShippingZoneDetails/ShippingZoneDetailsDialogs.tsx
View file

@ -151,7 +151,7 @@ const ShippingZoneDetailsDialogs: React.StatelessComponent<
name: formData.name, name: formData.name,
price: formData.isFree ? 0 : parseFloat(formData.price), price: formData.isFree ? 0 : parseFloat(formData.price),
shippingZone: id, shippingZone: id,
type: ShippingMethodTypeEnum.PRICE type: params.type
} }
}) })
} }

8
src/staff/views/StaffList/StaffList.tsx
View file

@ -1,4 +1,5 @@
import React from "react"; import React from "react";
import urlJoin from "url-join";
import useListSettings from "@saleor/hooks/useListSettings"; import useListSettings from "@saleor/hooks/useListSettings";
import useNavigator from "@saleor/hooks/useNavigator"; import useNavigator from "@saleor/hooks/useNavigator";
@ -8,10 +9,12 @@ import usePaginator, {
} from "@saleor/hooks/usePaginator"; } from "@saleor/hooks/usePaginator";
import { useIntl } from "react-intl"; import { useIntl } from "react-intl";
import { newPasswordUrl } from "@saleor/auth/urls";
import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog";
import SaveFilterTabDialog, { import SaveFilterTabDialog, {
SaveFilterTabDialogFormData SaveFilterTabDialogFormData
} from "@saleor/components/SaveFilterTabDialog"; } from "@saleor/components/SaveFilterTabDialog";
import { APP_MOUNT_URI } from "@saleor/config";
import { configurationMenuUrl } from "@saleor/configuration"; import { configurationMenuUrl } from "@saleor/configuration";
import { commonMessages } from "@saleor/intl"; import { commonMessages } from "@saleor/intl";
import { getMutationState, maybe } from "@saleor/misc"; import { getMutationState, maybe } from "@saleor/misc";
@ -146,6 +149,11 @@ export const StaffList: React.StatelessComponent<StaffListProps> = ({
permissions: variables.fullAccess permissions: variables.fullAccess
? data.shop.permissions.map(perm => perm.code) ? data.shop.permissions.map(perm => perm.code)
: undefined, : undefined,
redirectUrl: urlJoin(
window.location.origin,
APP_MOUNT_URI === "/" ? "" : APP_MOUNT_URI,
newPasswordUrl().replace(/\?/, "")
),
sendPasswordEmail: true sendPasswordEmail: true
} }
} }