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

Drop deprecated fields (#1071)

Browse source 
* 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>
This commit is contained in:
Jakub Majorek 2021-04-26 09:49:55 +02:00 committed by GitHub
parent d48c0087e0
commit a83a245654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
101 changed files with 1356 additions and 1251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@ All notable, unreleased changes to this project will be documented in this file.
- rich text field updates, - rich text field updates,
- multiselect empty chip upon creation of a product/variant, - multiselect empty chip upon creation of a product/variant,
- useFormset.setItemValue wrong updates, - useFormset.setItemValue wrong updates,
- Drop deprecated fields - #1071 by @jwm0
# 2.11.1 # 2.11.1

8
cypress/apiRequests/HomePage.js
View file

@ -8,9 +8,9 @@ export function getSalesForChannel(channelSlug, period) {
}`; }`;
return cy.sendRequestWithQuery(query); return cy.sendRequestWithQuery(query);
} }
export function getOrdersForChannel(channelSlug, created) { export function getOrdersForChannel(channelSlug, { gte, lte }) {
const query = `query{ const query = `query{
orders(created: ${created}, channel:"${channelSlug}"){ orders(filter: { created: { gte: "${gte}", lte: "${lte}" } }, channel:"${channelSlug}"){
totalCount totalCount
} }
}`; }`;
@ -18,7 +18,7 @@ export function getOrdersForChannel(channelSlug, created) {
} }
export function getOrdersWithStatus(status, channelSlug) { export function getOrdersWithStatus(status, channelSlug) {
const query = `query{ const query = `query{
orders(status: ${status}, channel:"${channelSlug}"){ orders(filter: { status: ${status} }, channel:"${channelSlug}"){
totalCount totalCount
} }
}`; }`;
@ -26,7 +26,7 @@ export function getOrdersWithStatus(status, channelSlug) {
} }
export function getProductsOutOfStock(channelSlug) { export function getProductsOutOfStock(channelSlug) {
const query = `query{ const query = `query{
products(stockAvailability: OUT_OF_STOCK, channel:"${channelSlug}"){ products(filter: { stockAvailability: OUT_OF_STOCK, channel:"${channelSlug}" }){
totalCount totalCount
} }
}`; }`;

9
cypress/integration/products/productsList/sortingProducts.js
View file

@ -10,13 +10,18 @@ describe("Sorting products", () => {
cy.clearSessionData() cy.clearSessionData()
.loginUserViaRequest() .loginUserViaRequest()
.visit(urlList.products); .visit(urlList.products);
cy.get(SHARED_ELEMENTS.header).should("be.visible");
if (sortBy !== "name") { if (sortBy !== "name") {
cy.get(PRODUCTS_LIST.tableHeaders[sortBy]).click(); cy.get(PRODUCTS_LIST.tableHeaders[sortBy]).click();
cy.get(SHARED_ELEMENTS.progressBar).should("not.exist"); cy.get(SHARED_ELEMENTS.progressBar).should("not.exist");
} }
expectProductsSortedBy(sortBy); expectProductsSortedBy(sortBy);
cy.get(PRODUCTS_LIST.tableHeaders[sortBy]).click(); cy.addAliasToGraphRequest("ProductList")
cy.get(SHARED_ELEMENTS.progressBar).should("not.exist"); .get(PRODUCTS_LIST.tableHeaders[sortBy])
.click()
.get(SHARED_ELEMENTS.progressBar)
.should("not.exist")
.wait("@ProductList");
expectProductsSortedBy(sortBy, false); expectProductsSortedBy(sortBy, false);
}); });
}); });

5
cypress/utils/homePageUtils.js
View file

@ -1,4 +1,5 @@
import * as homePage from "../apiRequests/HomePage"; import * as homePage from "../apiRequests/HomePage";
import { getDatePeriod } from "./misc";
export function getOrdersReadyToFulfill(channelSlug) { export function getOrdersReadyToFulfill(channelSlug) {
return homePage return homePage
@ -21,7 +22,9 @@ export function getSalesAmount(channelSlug) {
.its("body.data.ordersTotal.gross.amount"); .its("body.data.ordersTotal.gross.amount");
} }
export function getTodaysOrders(channelSlug) { export function getTodaysOrders(channelSlug) {
const today = getDatePeriod(1);
return homePage return homePage
.getOrdersForChannel(channelSlug, "TODAY") .getOrdersForChannel(channelSlug, today)
.its("body.data.orders.totalCount"); .its("body.data.orders.totalCount");
} }

16
cypress/utils/misc.js Normal file
View file

@ -0,0 +1,16 @@
import moment from "moment-timezone";
export function getDatePeriod(days) {
if (days < 1) {
return {};
}
const end = moment().startOf("day");
const start = end.subtract(days - 1);
const format = "YYYY-MM-DD";
return {
gte: start.format(format),
lte: end.format(format)
};
}

18
cypress/utils/products/productsListUtils.js
View file

@ -14,10 +14,16 @@ export function getDisplayedColumnArray(columnName) {
.then(() => productsList); .then(() => productsList);
} }
export function expectProductsSortedBy(columnName, inAscOrder = true) { export function expectProductsSortedBy(columnName, inAscOrder = true) {
getDisplayedColumnArray(columnName).then(productsArray => { let sortedProductsArray;
let sortedProductsArray = productsArray.slice(); let productsArray;
getDisplayedColumnArray(columnName)
.then(productsArrayResp => {
productsArray = productsArrayResp;
sortedProductsArray = productsArray.slice();
if (columnName !== "price") { if (columnName !== "price") {
sortedProductsArray.sort(); sortedProductsArray = sortedProductsArray.sort((a, b) =>
a.localeCompare(b, undefined, { ignorePunctuation: true })
);
if (!inAscOrder) { if (!inAscOrder) {
sortedProductsArray.reverse(); sortedProductsArray.reverse();
} }
@ -27,7 +33,11 @@ export function expectProductsSortedBy(columnName, inAscOrder = true) {
inAscOrder inAscOrder
); );
} }
expect(productsArray).to.be.deep.eq(sortedProductsArray); })
.then(() => {
expect(
JSON.stringify(productsArray) === JSON.stringify(sortedProductsArray)
).to.be.eq(true);
}); });
} }
function getSortedPriceColumn(productsArray, inAscOrder) { function getSortedPriceColumn(productsArray, inAscOrder) {

52
locale/defaultMessages.json
View file

@ -484,14 +484,14 @@
"context": "dialog header", "context": "dialog header",
"string": "Activate App" "string": "Activate App"
}, },
"src_dot_apps_dot_components_dot_AppActivateDialog_dot_2449960665": {
"context": "activate app",
"string": "Are you sure you want to activate this app? Activating will start gathering events."
},
"src_dot_apps_dot_components_dot_AppActivateDialog_dot_3356885734": { "src_dot_apps_dot_components_dot_AppActivateDialog_dot_3356885734": {
"context": "activate app", "context": "activate app",
"string": "Are you sure you want to activate {name}? Activating will start gathering events." "string": "Are you sure you want to activate {name}? Activating will start gathering events."
}, },
"src_dot_apps_dot_components_dot_AppActivateDialog_dot_3761045983": {
"context": "activate app",
"string": "Are you sure you want to activate this app? Activating will start gathering events"
},
"src_dot_apps_dot_components_dot_AppActivateDialog_dot_3865193889": { "src_dot_apps_dot_components_dot_AppActivateDialog_dot_3865193889": {
"context": "button label", "context": "button label",
"string": "Activate" "string": "Activate"
@ -504,12 +504,20 @@
"context": "dialog header", "context": "dialog header",
"string": "Dectivate App" "string": "Dectivate App"
}, },
"src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_2955925498": { "src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_deactivateApp": {
"context": "deactivate app", "context": "deactivate app",
"string": "Are you sure you want to disable this app? Your data will be kept until you reactivate the app. You will be still billed for the app." "string": "Are you sure you want to disable this app? Your data will be kept until you reactivate the app. You will be still billed for the app."
}, },
"src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_329373780": { "src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_deactivateLocalApp": {
"context": "deactivate app", "context": "deactivate local app",
"string": "Are you sure you want to disable this app? Your data will be kept until you reactivate the app."
},
"src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_deactivateLocalNamedApp": {
"context": "deactivate local named app",
"string": "Are you sure you want to disable {name}? Your data will be kept until you reactivate the app."
},
"src_dot_apps_dot_components_dot_AppDeactivateDialog_dot_deactivateNamedApp": {
"context": "deactivate named app",
"string": "Are you sure you want to disable {name}? Your data will be kept until you reactivate the app. You will be still billed for the app." "string": "Are you sure you want to disable {name}? Your data will be kept until you reactivate the app. You will be still billed for the app."
}, },
"src_dot_apps_dot_components_dot_AppDeleteDialog_dot_1347203024": { "src_dot_apps_dot_components_dot_AppDeleteDialog_dot_1347203024": {
@ -656,10 +664,6 @@
"context": "header", "context": "header",
"string": "Create New App" "string": "Create New App"
}, },
"src_dot_apps_dot_components_dot_CustomAppCreatePage_dot_570656367": {
"context": "checkbox label",
"string": "App is active"
},
"src_dot_apps_dot_components_dot_CustomAppDefaultToken_dot_1336855942": { "src_dot_apps_dot_components_dot_CustomAppDefaultToken_dot_1336855942": {
"string": "Generated Token" "string": "Generated Token"
}, },
@ -681,13 +685,17 @@
"context": "checkbox label", "context": "checkbox label",
"string": "Grant this app full access to the store" "string": "Grant this app full access to the store"
}, },
"src_dot_apps_dot_components_dot_CustomAppDetailsPage_dot_1782042241": {
"context": "link",
"string": "Deactivate"
},
"src_dot_apps_dot_components_dot_CustomAppDetailsPage_dot_3076071936": { "src_dot_apps_dot_components_dot_CustomAppDetailsPage_dot_3076071936": {
"context": "card description", "context": "card description",
"string": "Expand or restrict app permissions to access certain part of Saleor system." "string": "Expand or restrict app permissions to access certain part of Saleor system."
}, },
"src_dot_apps_dot_components_dot_CustomAppDetailsPage_dot_570656367": { "src_dot_apps_dot_components_dot_CustomAppDetailsPage_dot_3865193889": {
"context": "checkbox label", "context": "link",
"string": "App is active" "string": "Activate"
}, },
"src_dot_apps_dot_components_dot_CustomAppInformation_dot_2860466085": { "src_dot_apps_dot_components_dot_CustomAppInformation_dot_2860466085": {
"context": "header", "context": "header",
@ -827,6 +835,14 @@
"context": "window title", "context": "window title",
"string": "Create App" "string": "Create App"
}, },
"src_dot_apps_dot_views_dot_CustomAppDetails_dot_2021043385": {
"context": "snackbar text",
"string": "App activated"
},
"src_dot_apps_dot_views_dot_CustomAppDetails_dot_3791371350": {
"context": "snackbar text",
"string": "App deactivated"
},
"src_dot_attributes": { "src_dot_attributes": {
"context": "attributes section name", "context": "attributes section name",
"string": "Attributes" "string": "Attributes"
@ -3877,6 +3893,10 @@
"context": "vat included in order price", "context": "vat included in order price",
"string": "VAT included" "string": "VAT included"
}, },
"src_dot_orders_dot_components_dot_OrderPayment_dot_1934027242": {
"context": "voucher type order discount",
"string": "Voucher"
},
"src_dot_orders_dot_components_dot_OrderPayment_dot_2183023165": { "src_dot_orders_dot_components_dot_OrderPayment_dot_2183023165": {
"context": "ordered products", "context": "ordered products",
"string": "{quantity} items" "string": "{quantity} items"
@ -3885,6 +3905,10 @@
"context": "order payment", "context": "order payment",
"string": "Captured amount" "string": "Captured amount"
}, },
"src_dot_orders_dot_components_dot_OrderPayment_dot_2392156856": {
"context": "staff added type order discount",
"string": "Staff added"
},
"src_dot_orders_dot_components_dot_OrderPayment_dot_2444197639": { "src_dot_orders_dot_components_dot_OrderPayment_dot_2444197639": {
"context": "void payment, button", "context": "void payment, button",
"string": "Void" "string": "Void"

16
recordings/User_3768991250/will-be-logged-in-if-has-valid-credentials_3587751314/recording.har
View file

@ -8,11 +8,11 @@
}, },
"entries": [ "entries": [
{ {
"_id": "a2b8a02f624e52cd2b73a831f65d9a52", "_id": "4062f0ffdf1fab89a50cd1b667a889ef",
"_order": 0, "_order": 0,
"cache": {}, "cache": {},
"request": { "request": {
"bodySize": 598, "bodySize": 583,
"cookies": [], "cookies": [],
"headers": [ "headers": [
{ {
@ -28,7 +28,7 @@
{ {
"_fromType": "array", "_fromType": "array",
"name": "content-length", "name": "content-length",
"value": "598" "value": "583"
}, },
{ {
"_fromType": "array", "_fromType": "array",
@ -50,13 +50,13 @@
"value": "localhost:8000" "value": "localhost:8000"
} }
], ],
"headersSize": 254, "headersSize": 281,
"httpVersion": "HTTP/1.1", "httpVersion": "HTTP/1.1",
"method": "POST", "method": "POST",
"postData": { "postData": {
"mimeType": "application/json", "mimeType": "application/json",
"params": [], "params": [],
"text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"admin@example.com\",\"password\":\"admin\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors: accountErrors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]" "text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"admin@example.com\",\"password\":\"admin\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]"
}, },
"queryString": [], "queryString": [],
"url": "http://localhost:8000/graphql/" "url": "http://localhost:8000/graphql/"
@ -113,8 +113,8 @@
"status": 200, "status": 200,
"statusText": "OK" "statusText": "OK"
}, },
"startedDateTime": "2021-01-14T13:55:44.094Z", "startedDateTime": "2021-04-22T11:07:20.652Z",
"time": 392, "time": 758,
"timings": { "timings": {
"blocked": -1, "blocked": -1,
"connect": -1, "connect": -1,
@ -122,7 +122,7 @@
"receive": 0, "receive": 0,
"send": 0, "send": 0,
"ssl": -1, "ssl": -1,
"wait": 392 "wait": 758
} }
} }
], ],

18
recordings/User_3768991250/will-not-be-logged-in-if-doesn-t-have-valid-credentials_3719199657/recording.har
View file

@ -8,11 +8,11 @@
}, },
"entries": [ "entries": [
{ {
"_id": "d94d7821dc951e48c410d691d7eccdef", "_id": "6fed086670e88883223acb33bab4ff31",
"_order": 0, "_order": 0,
"cache": {}, "cache": {},
"request": { "request": {
"bodySize": 614, "bodySize": 599,
"cookies": [], "cookies": [],
"headers": [ "headers": [
{ {
@ -28,7 +28,7 @@
{ {
"_fromType": "array", "_fromType": "array",
"name": "content-length", "name": "content-length",
"value": "614" "value": "599"
}, },
{ {
"_fromType": "array", "_fromType": "array",
@ -50,13 +50,13 @@
"value": "localhost:8000" "value": "localhost:8000"
} }
], ],
"headersSize": 254, "headersSize": 281,
"httpVersion": "HTTP/1.1", "httpVersion": "HTTP/1.1",
"method": "POST", "method": "POST",
"postData": { "postData": {
"mimeType": "application/json", "mimeType": "application/json",
"params": [], "params": [],
"text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"admin@example.com\",\"password\":\"NotAValidPassword123!\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors: accountErrors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]" "text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"admin@example.com\",\"password\":\"NotAValidPassword123!\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]"
}, },
"queryString": [], "queryString": [],
"url": "http://localhost:8000/graphql/" "url": "http://localhost:8000/graphql/"
@ -66,7 +66,7 @@
"content": { "content": {
"mimeType": "application/json", "mimeType": "application/json",
"size": 214, "size": 214,
"text": "[{\"data\": {\"tokenCreate\": {\"errors\": [{\"field\": \"email\", \"message\": \"Please, enter valid credentials\", \"__typename\": \"AccountError\"}], \"csrfToken\": null, \"token\": null, \"user\": null, \"__typename\": \"CreateToken\"}}}]" "text": "[{\"data\": {\"tokenCreate\": {\"errors\": [{\"field\": \"email\", \"message\": \"Please, enter valid credentials\", \"__typename\": \"Error\"}], \"csrfToken\": null, \"token\": null, \"user\": null, \"__typename\": \"CreateToken\"}}}]"
}, },
"cookies": [], "cookies": [],
"headers": [ "headers": [
@ -101,8 +101,8 @@
"status": 200, "status": 200,
"statusText": "OK" "statusText": "OK"
}, },
"startedDateTime": "2021-01-14T13:55:44.521Z", "startedDateTime": "2021-04-22T11:09:20.963Z",
"time": 1183, "time": 555,
"timings": { "timings": {
"blocked": -1, "blocked": -1,
"connect": -1, "connect": -1,
@ -110,7 +110,7 @@
"receive": 0, "receive": 0,
"send": 0, "send": 0,
"ssl": -1, "ssl": -1,
"wait": 1183 "wait": 555
} }
} }
], ],

16
recordings/User_3768991250/will-not-be-logged-in-if-is-non-staff_2544500193/recording.har
View file

@ -8,11 +8,11 @@
}, },
"entries": [ "entries": [
{ {
"_id": "0b09ec35ecae5b17a2ccda062b1d6ef5", "_id": "8948f5cbe2259e56b6dd03f068fbfa4d",
"_order": 0, "_order": 0,
"cache": {}, "cache": {},
"request": { "request": {
"bodySize": 602, "bodySize": 587,
"cookies": [], "cookies": [],
"headers": [ "headers": [
{ {
@ -28,7 +28,7 @@
{ {
"_fromType": "array", "_fromType": "array",
"name": "content-length", "name": "content-length",
"value": "602" "value": "587"
}, },
{ {
"_fromType": "array", "_fromType": "array",
@ -50,13 +50,13 @@
"value": "localhost:8000" "value": "localhost:8000"
} }
], ],
"headersSize": 254, "headersSize": 281,
"httpVersion": "HTTP/1.1", "httpVersion": "HTTP/1.1",
"method": "POST", "method": "POST",
"postData": { "postData": {
"mimeType": "application/json", "mimeType": "application/json",
"params": [], "params": [],
"text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"client@example.com\",\"password\":\"password\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors: accountErrors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]" "text": "[{\"operationName\":\"TokenAuth\",\"variables\":{\"email\":\"client@example.com\",\"password\":\"password\"},\"query\":\"fragment User on User {\\n id\\n email\\n firstName\\n lastName\\n isStaff\\n userPermissions {\\n code\\n name\\n __typename\\n }\\n avatar {\\n url\\n __typename\\n }\\n __typename\\n}\\n\\nmutation TokenAuth($email: String!, $password: String!) {\\n tokenCreate(email: $email, password: $password) {\\n errors {\\n field\\n message\\n __typename\\n }\\n csrfToken\\n token\\n user {\\n ...User\\n __typename\\n }\\n __typename\\n }\\n}\\n\"}]"
}, },
"queryString": [], "queryString": [],
"url": "http://localhost:8000/graphql/" "url": "http://localhost:8000/graphql/"
@ -113,8 +113,8 @@
"status": 200, "status": 200,
"statusText": "OK" "statusText": "OK"
}, },
"startedDateTime": "2021-01-19T14:28:37.164Z", "startedDateTime": "2021-04-22T11:09:21.540Z",
"time": 468, "time": 382,
"timings": { "timings": {
"blocked": -1, "blocked": -1,
"connect": -1, "connect": -1,
@ -122,7 +122,7 @@
"receive": 0, "receive": 0,
"send": 0, "send": 0,
"ssl": -1, "ssl": -1,
"wait": 468 "wait": 382
} }
} }
], ],

1055
schema.graphql
View file

File diff suppressed because it is too large Load diff

2
src/apps/components/AppActivateDialog/AppActivateDialog.tsx
View file

@ -41,7 +41,7 @@ const AppActivateDialog: React.FC<AppActivateDialogProps> = ({
<DialogContentText> <DialogContentText>
{["", null].includes(name) ? ( {["", null].includes(name) ? (
<FormattedMessage <FormattedMessage
defaultMessage="Are you sure you want to activate this app? Activating will start gathering events" defaultMessage="Are you sure you want to activate this app? Activating will start gathering events."
description="activate app" description="activate app"
/> />
) : ( ) : (

12
src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx
View file

@ -5,10 +5,13 @@ import { getStringOrPlaceholder } from "@saleor/misc";
import React from "react"; import React from "react";
import { FormattedMessage, useIntl } from "react-intl"; import { FormattedMessage, useIntl } from "react-intl";
import msgs from "./messages";
export interface AppDeactivateDialogProps { export interface AppDeactivateDialogProps {
confirmButtonState: ConfirmButtonTransitionState; confirmButtonState: ConfirmButtonTransitionState;
open: boolean; open: boolean;
name: string; name: string;
thirdParty?: boolean;
onClose: () => void; onClose: () => void;
onConfirm: () => void; onConfirm: () => void;
} }
@ -17,6 +20,7 @@ const AppDeactivateDialog: React.FC<AppDeactivateDialogProps> = ({
confirmButtonState, confirmButtonState,
open, open,
name, name,
thirdParty = true,
onClose, onClose,
onConfirm onConfirm
}) => { }) => {
@ -41,13 +45,13 @@ const AppDeactivateDialog: React.FC<AppDeactivateDialogProps> = ({
<DialogContentText> <DialogContentText>
{["", null].includes(name) ? ( {["", null].includes(name) ? (
<FormattedMessage <FormattedMessage
defaultMessage="Are you sure you want to disable this app? Your data will be kept until you reactivate the app. You will be still billed for the app." {...(thirdParty ? msgs.deactivateApp : msgs.deactivateLocalApp)}
description="deactivate app"
/> />
) : ( ) : (
<FormattedMessage <FormattedMessage
defaultMessage="Are you sure you want to disable {name}? Your data will be kept until you reactivate the app. You will be still billed for the app." {...(thirdParty
description="deactivate app" ? msgs.deactivateNamedApp
: msgs.deactivateLocalNamedApp)}
values={{ values={{
name: <strong>{getStringOrPlaceholder(name)}</strong> name: <strong>{getStringOrPlaceholder(name)}</strong>
}} }}

24
src/apps/components/AppDeactivateDialog/messages.ts Normal file
View file

@ -0,0 +1,24 @@
import { defineMessages } from "react-intl";
export default defineMessages({
deactivateApp: {
defaultMessage:
"Are you sure you want to disable this app? Your data will be kept until you reactivate the app. You will be still billed for the app.",
description: "deactivate app"
},
deactivateNamedApp: {
defaultMessage:
"Are you sure you want to disable {name}? Your data will be kept until you reactivate the app. You will be still billed for the app.",
description: "deactivate named app"
},
deactivateLocalApp: {
defaultMessage:
"Are you sure you want to disable this app? Your data will be kept until you reactivate the app.",
description: "deactivate local app"
},
deactivateLocalNamedApp: {
defaultMessage:
"Are you sure you want to disable {name}? Your data will be kept until you reactivate the app.",
description: "deactivate local named app"
}
});

14
src/apps/components/CustomAppCreatePage/CustomAppCreatePage.tsx
View file

@ -1,7 +1,5 @@
import AccountPermissions from "@saleor/components/AccountPermissions"; import AccountPermissions from "@saleor/components/AccountPermissions";
import AppHeader from "@saleor/components/AppHeader"; import AppHeader from "@saleor/components/AppHeader";
import AppStatus from "@saleor/components/AppStatus";
import CardSpacer from "@saleor/components/CardSpacer";
import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
import Container from "@saleor/components/Container"; import Container from "@saleor/components/Container";
import Form from "@saleor/components/Form"; import Form from "@saleor/components/Form";
@ -21,7 +19,6 @@ import CustomAppInformation from "../CustomAppInformation";
export interface CustomAppCreatePageFormData { export interface CustomAppCreatePageFormData {
hasFullAccess: boolean; hasFullAccess: boolean;
isActive: boolean;
name: string; name: string;
permissions: PermissionEnum[]; permissions: PermissionEnum[];
} }
@ -47,7 +44,6 @@ const CustomAppCreatePage: React.FC<CustomAppCreatePageProps> = props => {
const initialForm: CustomAppCreatePageFormData = { const initialForm: CustomAppCreatePageFormData = {
hasFullAccess: false, hasFullAccess: false,
isActive: false,
name: "", name: "",
permissions: [] permissions: []
}; };
@ -94,16 +90,6 @@ const CustomAppCreatePage: React.FC<CustomAppCreatePageProps> = props => {
description: "card description" description: "card description"
})} })}
/> />
<CardSpacer />
<AppStatus
data={data}
disabled={disabled}
label={intl.formatMessage({
defaultMessage: "App is active",
description: "checkbox label"
})}
onChange={change}
/>
</Grid> </Grid>
<SaveButtonBar <SaveButtonBar
disabled={disabled || !hasChanged} disabled={disabled || !hasChanged}

46
src/apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx
View file

@ -1,6 +1,6 @@
import Button from "@material-ui/core/Button";
import AccountPermissions from "@saleor/components/AccountPermissions"; import AccountPermissions from "@saleor/components/AccountPermissions";
import AppHeader from "@saleor/components/AppHeader"; import AppHeader from "@saleor/components/AppHeader";
import AppStatus from "@saleor/components/AppStatus";
import CardSpacer from "@saleor/components/CardSpacer"; import CardSpacer from "@saleor/components/CardSpacer";
import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
import Container from "@saleor/components/Container"; import Container from "@saleor/components/Container";
@ -17,8 +17,10 @@ import { getFormErrors } from "@saleor/utils/errors";
import getAppErrorMessage from "@saleor/utils/errors/app"; import getAppErrorMessage from "@saleor/utils/errors/app";
import WebhooksList from "@saleor/webhooks/components/WebhooksList"; import WebhooksList from "@saleor/webhooks/components/WebhooksList";
import React from "react"; import React from "react";
import { useIntl } from "react-intl"; import { FormattedMessage, useIntl } from "react-intl";
import activateIcon from "../../../../assets/images/activate-icon.svg";
import { useStyles } from "../../styles";
import { AppUpdate_appUpdate_app } from "../../types/AppUpdate"; import { AppUpdate_appUpdate_app } from "../../types/AppUpdate";
import CustomAppDefaultToken from "../CustomAppDefaultToken"; import CustomAppDefaultToken from "../CustomAppDefaultToken";
import CustomAppInformation from "../CustomAppInformation"; import CustomAppInformation from "../CustomAppInformation";
@ -47,6 +49,8 @@ export interface CustomAppDetailsPageProps {
onWebhookCreate: () => void; onWebhookCreate: () => void;
onWebhookRemove: (id: string) => void; onWebhookRemove: (id: string) => void;
navigateToWebhookDetails: (id: string) => () => void; navigateToWebhookDetails: (id: string) => () => void;
onAppActivateOpen: () => void;
onAppDeactivateOpen: () => void;
} }
const CustomAppDetailsPage: React.FC<CustomAppDetailsPageProps> = props => { const CustomAppDetailsPage: React.FC<CustomAppDetailsPageProps> = props => {
@ -66,9 +70,12 @@ const CustomAppDetailsPage: React.FC<CustomAppDetailsPageProps> = props => {
onTokenDelete, onTokenDelete,
onSubmit, onSubmit,
onWebhookCreate, onWebhookCreate,
onWebhookRemove onWebhookRemove,
onAppActivateOpen,
onAppDeactivateOpen
} = props; } = props;
const intl = useIntl(); const intl = useIntl();
const classes = useStyles({});
const webhooks = app?.webhooks; const webhooks = app?.webhooks;
@ -94,7 +101,28 @@ const CustomAppDetailsPage: React.FC<CustomAppDetailsPageProps> = props => {
<AppHeader onBack={onBack}> <AppHeader onBack={onBack}>
{intl.formatMessage(sectionNames.apps)} {intl.formatMessage(sectionNames.apps)}
</AppHeader> </AppHeader>
<PageHeader title={app?.name} /> <PageHeader title={app?.name}>
<Button
variant="text"
color="primary"
className={classes.activateButton}
disableFocusRipple
onClick={data.isActive ? onAppDeactivateOpen : onAppActivateOpen}
>
<img src={activateIcon} alt="" />
{data?.isActive ? (
<FormattedMessage
defaultMessage="Deactivate"
description="link"
/>
) : (
<FormattedMessage
defaultMessage="Activate"
description="link"
/>
)}
</Button>
</PageHeader>
<Grid> <Grid>
<div> <div>
{token && ( {token && (
@ -146,16 +174,6 @@ const CustomAppDetailsPage: React.FC<CustomAppDetailsPageProps> = props => {
description: "card description" description: "card description"
})} })}
/> />
<CardSpacer />
<AppStatus
data={data}
disabled={disabled}
label={intl.formatMessage({
defaultMessage: "App is active",
description: "checkbox label"
})}
onChange={change}
/>
</div> </div>
</Grid> </Grid>
<SaveButtonBar <SaveButtonBar

62
src/apps/mutations.ts
View file

@ -38,7 +38,7 @@ export const appCreateMutation = gql`
app { app {
...AppFragment ...AppFragment
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -54,7 +54,7 @@ export const appDeleteMutation = gql`
app { app {
...AppFragment ...AppFragment
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -71,7 +71,7 @@ export const appDeleteFailedInstallationMutation = gql`
appName appName
message message
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -99,7 +99,7 @@ export const appFetchMutation = gql`
name name
} }
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -116,7 +116,7 @@ export const appInstallMutation = gql`
appName appName
manifestUrl manifestUrl
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -133,29 +133,7 @@ export const appRetryInstallMutation = gql`
appName appName
manifestUrl manifestUrl
} }
errors: appErrors { errors {
...AppErrorFragment
}
}
}
`;
export const appActivateMutation = gql`
${appErrorFragment}
mutation AppActivate($id: ID!) {
appActivate(id: $id) {
errors: appErrors {
...AppErrorFragment
}
}
}
`;
export const appDeactivateMutation = gql`
${appErrorFragment}
mutation AppDeactivate($id: ID!) {
appDeactivate(id: $id) {
errors: appErrors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -175,7 +153,7 @@ export const appUpdateMutation = gql`
name name
} }
} }
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
message message
permissions permissions
@ -194,7 +172,7 @@ export const appTokenCreateMutation = gql`
id id
} }
authToken authToken
errors: appErrors { errors {
...AppErrorFragment ...AppErrorFragment
} }
} }
@ -210,7 +188,29 @@ export const appTokenDeleteMutation = gql`
authToken authToken
id id
} }
errors: appErrors { errors {
...AppErrorFragment
}
}
}
`;
export const appActivateMutation = gql`
${appErrorFragment}
mutation AppActivate($id: ID!) {
appActivate(id: $id) {
errors {
...AppErrorFragment
}
}
}
`;
export const appDeactivateMutation = gql`
${appErrorFragment}
mutation AppDeactivate($id: ID!) {
appDeactivate(id: $id) {
errors {
...AppErrorFragment ...AppErrorFragment
} }
} }

5
src/apps/styles.ts
View file

@ -198,6 +198,11 @@ export const useStyles = makeStyles(
flex: 1, flex: 1,
fontWeight: 500, fontWeight: 500,
lineHeight: 1 lineHeight: 1
},
activateButton: {
"& img": {
marginRight: theme.spacing(1)
}
} }
}), }),
{ name: "AppList" } { name: "AppList" }

4
src/apps/urls.ts
View file

@ -27,7 +27,9 @@ export enum AppListUrlSortField {
export type CustomAppUrlDialog = export type CustomAppUrlDialog =
| "create-token" | "create-token"
| "remove-webhook" | "remove-webhook"
| "remove-token"; | "remove-token"
| "app-activate"
| "app-deactivate";
export type CustomAppUrlQueryParams = Dialog<CustomAppUrlDialog> & SingleAction; export type CustomAppUrlQueryParams = Dialog<CustomAppUrlDialog> & SingleAction;
export const appsSection = "/apps/"; export const appsSection = "/apps/";

1
src/apps/views/CustomAppCreate/CustomAppCreate.tsx
View file

@ -45,7 +45,6 @@ export const CustomAppCreate: React.FC<CustomAppCreateProps> = ({
createApp({ createApp({
variables: { variables: {
input: { input: {
isActive: data.isActive,
name: data.name, name: data.name,
permissions: data.hasFullAccess permissions: data.hasFullAccess
? shop.permissions.map(permission => permission.code) ? shop.permissions.map(permission => permission.code)

76
src/apps/views/CustomAppDetails/CustomAppDetails.tsx
View file

@ -1,3 +1,5 @@
import AppActivateDialog from "@saleor/apps/components/AppActivateDialog";
import AppDeactivateDialog from "@saleor/apps/components/AppDeactivateDialog";
import TokenCreateDialog from "@saleor/apps/components/TokenCreateDialog"; import TokenCreateDialog from "@saleor/apps/components/TokenCreateDialog";
import TokenDeleteDialog from "@saleor/apps/components/TokenDeleteDialog"; import TokenDeleteDialog from "@saleor/apps/components/TokenDeleteDialog";
import NotFoundPage from "@saleor/components/NotFoundPage"; import NotFoundPage from "@saleor/components/NotFoundPage";
@ -8,6 +10,7 @@ import useNotifier from "@saleor/hooks/useNotifier";
import useShop from "@saleor/hooks/useShop"; import useShop from "@saleor/hooks/useShop";
import { commonMessages } from "@saleor/intl"; import { commonMessages } from "@saleor/intl";
import { getStringOrPlaceholder } from "@saleor/misc"; import { getStringOrPlaceholder } from "@saleor/misc";
import getAppErrorMessage from "@saleor/utils/errors/app";
import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
import WebhookDeleteDialog from "@saleor/webhooks/components/WebhookDeleteDialog"; import WebhookDeleteDialog from "@saleor/webhooks/components/WebhookDeleteDialog";
import { useWebhookDeleteMutation } from "@saleor/webhooks/mutations"; import { useWebhookDeleteMutation } from "@saleor/webhooks/mutations";
@ -20,6 +23,8 @@ import CustomAppDetailsPage, {
CustomAppDetailsPageFormData CustomAppDetailsPageFormData
} from "../../components/CustomAppDetailsPage"; } from "../../components/CustomAppDetailsPage";
import { import {
useAppActivateMutation,
useAppDeactivateMutation,
useAppTokenCreateMutation, useAppTokenCreateMutation,
useAppTokenDeleteMutation, useAppTokenDeleteMutation,
useAppUpdateMutation useAppUpdateMutation
@ -64,6 +69,52 @@ export const CustomAppDetails: React.FC<OrderListProps> = ({
displayLoader: true, displayLoader: true,
variables: { id } variables: { id }
}); });
const [activateApp, activateAppResult] = useAppActivateMutation({
onCompleted: data => {
const errors = data?.appActivate?.errors;
if (errors?.length === 0) {
notify({
status: "success",
text: intl.formatMessage({
defaultMessage: "App activated",
description: "snackbar text"
})
});
refetch();
closeModal();
} else {
errors.forEach(error =>
notify({
status: "error",
text: getAppErrorMessage(error, intl)
})
);
}
}
});
const [deactivateApp, deactivateAppResult] = useAppDeactivateMutation({
onCompleted: data => {
const errors = data?.appDeactivate?.errors;
if (errors.length === 0) {
notify({
status: "success",
text: intl.formatMessage({
defaultMessage: "App deactivated",
description: "snackbar text"
})
});
refetch();
closeModal();
} else {
errors.forEach(error =>
notify({
status: "error",
text: getAppErrorMessage(error, intl)
})
);
}
}
});
const onWebhookDelete = (data: WebhookDelete) => { const onWebhookDelete = (data: WebhookDelete) => {
if (data.webhookDelete.errors.length === 0) { if (data.webhookDelete.errors.length === 0) {
@ -135,7 +186,6 @@ export const CustomAppDetails: React.FC<OrderListProps> = ({
variables: { variables: {
id, id,
input: { input: {
isActive: data.isActive,
name: data.name, name: data.name,
permissions: data.hasFullAccess permissions: data.hasFullAccess
? shop.permissions.map(permission => permission.code) ? shop.permissions.map(permission => permission.code)
@ -164,6 +214,13 @@ export const CustomAppDetails: React.FC<OrderListProps> = ({
} }
}); });
const handleActivateConfirm = () => {
activateApp({ variables: { id } });
};
const handleDeactivateConfirm = () => {
deactivateApp({ variables: { id } });
};
const currentToken = data?.app?.tokens?.find(token => token.id === params.id); const currentToken = data?.app?.tokens?.find(token => token.id === params.id);
return ( return (
@ -191,6 +248,8 @@ export const CustomAppDetails: React.FC<OrderListProps> = ({
id id
}) })
} }
onAppActivateOpen={() => openModal("app-activate")}
onAppDeactivateOpen={() => openModal("app-deactivate")}
permissions={shop?.permissions} permissions={shop?.permissions}
app={data?.app} app={data?.app}
saveButtonBarState={updateAppOpts.status} saveButtonBarState={updateAppOpts.status}
@ -222,6 +281,21 @@ export const CustomAppDetails: React.FC<OrderListProps> = ({
onConfirm={handleRemoveWebhookConfirm} onConfirm={handleRemoveWebhookConfirm}
open={params.action === "remove-webhook"} open={params.action === "remove-webhook"}
/> />
<AppActivateDialog
confirmButtonState={activateAppResult.status}
name={data?.app.name}
onClose={closeModal}
onConfirm={handleActivateConfirm}
open={params.action === "app-activate"}
/>
<AppDeactivateDialog
confirmButtonState={deactivateAppResult.status}
name={data?.app.name}
onClose={closeModal}
onConfirm={handleDeactivateConfirm}
thirdParty={false}
open={params.action === "app-deactivate"}
/>
</> </>
); );
}; };

16
src/attributes/mutations.ts
View file

@ -40,7 +40,7 @@ const attributeBulkDelete = gql`
${attributeErrorFragment} ${attributeErrorFragment}
mutation AttributeBulkDelete($ids: [ID!]!) { mutation AttributeBulkDelete($ids: [ID!]!) {
attributeBulkDelete(ids: $ids) { attributeBulkDelete(ids: $ids) {
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -55,7 +55,7 @@ const attributeDelete = gql`
${attributeErrorFragment} ${attributeErrorFragment}
mutation AttributeDelete($id: ID!) { mutation AttributeDelete($id: ID!) {
attributeDelete(id: $id) { attributeDelete(id: $id) {
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -74,7 +74,7 @@ export const attributeUpdateMutation = gql`
attribute { attribute {
...AttributeDetailsFragment ...AttributeDetailsFragment
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -93,7 +93,7 @@ const attributeValueDelete = gql`
attribute { attribute {
...AttributeDetailsFragment ...AttributeDetailsFragment
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -112,7 +112,7 @@ export const attributeValueUpdateMutation = gql`
attribute { attribute {
...AttributeDetailsFragment ...AttributeDetailsFragment
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -131,7 +131,7 @@ export const attributeValueCreateMutation = gql`
attribute { attribute {
...AttributeDetailsFragment ...AttributeDetailsFragment
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -150,7 +150,7 @@ export const attributeCreateMutation = gql`
attribute { attribute {
...AttributeDetailsFragment ...AttributeDetailsFragment
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }
@ -171,7 +171,7 @@ const attributeValueReorderMutation = gql`
id id
} }
} }
errors: attributeErrors { errors {
...AttributeErrorFragment ...AttributeErrorFragment
} }
} }

2
src/attributes/utils/data.ts
View file

@ -110,7 +110,7 @@ export const mergeFileUploadErrors = (
uploadFilesResult: Array<MutationFetchResult<FileUpload>> uploadFilesResult: Array<MutationFetchResult<FileUpload>>
): UploadErrorFragment[] => ): UploadErrorFragment[] =>
uploadFilesResult.reduce((errors, uploadFileResult) => { uploadFilesResult.reduce((errors, uploadFileResult) => {
const uploadErrors = uploadFileResult?.data?.fileUpload?.uploadErrors; const uploadErrors = uploadFileResult?.data?.fileUpload?.errors;
if (uploadErrors) { if (uploadErrors) {
return [...errors, ...uploadErrors]; return [...errors, ...uploadErrors];
} }

10
src/auth/mutations.ts
View file

@ -13,7 +13,7 @@ export const tokenAuthMutation = gql`
${fragmentUser} ${fragmentUser}
mutation TokenAuth($email: String!, $password: String!) { mutation TokenAuth($email: String!, $password: String!) {
tokenCreate(email: $email, password: $password) { tokenCreate(email: $email, password: $password) {
errors: accountErrors { errors {
field field
message message
} }
@ -50,7 +50,7 @@ export const requestPasswordReset = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation RequestPasswordReset($email: String!, $redirectUrl: String!) { mutation RequestPasswordReset($email: String!, $redirectUrl: String!) {
requestPasswordReset(email: $email, redirectUrl: $redirectUrl) { requestPasswordReset(email: $email, redirectUrl: $redirectUrl) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }
@ -66,7 +66,7 @@ export const setPassword = gql`
${fragmentUser} ${fragmentUser}
mutation SetPassword($email: String!, $password: String!, $token: String!) { mutation SetPassword($email: String!, $password: String!, $token: String!) {
setPassword(email: $email, password: $password, token: $token) { setPassword(email: $email, password: $password, token: $token) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
csrfToken csrfToken
@ -88,7 +88,7 @@ export const externalAuthenticationUrlMutation = gql`
mutation ExternalAuthenticationUrl($pluginId: String!, $input: JSONString!) { mutation ExternalAuthenticationUrl($pluginId: String!, $input: JSONString!) {
externalAuthenticationUrl(pluginId: $pluginId, input: $input) { externalAuthenticationUrl(pluginId: $pluginId, input: $input) {
authenticationData authenticationData
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }
@ -105,7 +105,7 @@ export const externalObtainAccessTokensMutation = gql`
user { user {
...User ...User
} }
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }

8
src/categories/mutations.ts
View file

@ -24,7 +24,7 @@ export const categoryDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation CategoryDelete($id: ID!) { mutation CategoryDelete($id: ID!) {
categoryDelete(id: $id) { categoryDelete(id: $id) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }
@ -43,7 +43,7 @@ export const categoryCreateMutation = gql`
category { category {
...CategoryDetailsFragment ...CategoryDetailsFragment
} }
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }
@ -62,7 +62,7 @@ export const categoryUpdateMutation = gql`
category { category {
...CategoryDetailsFragment ...CategoryDetailsFragment
} }
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }
@ -77,7 +77,7 @@ export const categoryBulkDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation CategoryBulkDelete($ids: [ID]!) { mutation CategoryBulkDelete($ids: [ID]!) {
categoryBulkDelete(ids: $ids) { categoryBulkDelete(ids: $ids) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }

10
src/channels/mutations.ts
View file

@ -25,7 +25,7 @@ export const channelCreateMutation = gql`
channel { channel {
...ChannelDetailsFragment ...ChannelDetailsFragment
} }
errors: channelErrors { errors {
...ChannelErrorFragment ...ChannelErrorFragment
} }
} }
@ -40,7 +40,7 @@ export const channelUpdateMutation = gql`
channel { channel {
...ChannelDetailsFragment ...ChannelDetailsFragment
} }
errors: channelErrors { errors {
...ChannelErrorFragment ...ChannelErrorFragment
} }
} }
@ -51,7 +51,7 @@ export const channelDeleteMutation = gql`
${channelErrorFragment} ${channelErrorFragment}
mutation ChannelDelete($id: ID!, $input: ChannelDeleteInput) { mutation ChannelDelete($id: ID!, $input: ChannelDeleteInput) {
channelDelete(id: $id, input: $input) { channelDelete(id: $id, input: $input) {
errors: channelErrors { errors {
...ChannelErrorFragment ...ChannelErrorFragment
} }
} }
@ -66,7 +66,7 @@ export const channelActivateMutation = gql`
channel { channel {
...ChannelDetailsFragment ...ChannelDetailsFragment
} }
errors: channelErrors { errors {
...ChannelErrorFragment ...ChannelErrorFragment
} }
} }
@ -81,7 +81,7 @@ export const channelDeactivateMutation = gql`
channel { channel {
...ChannelDetailsFragment ...ChannelDetailsFragment
} }
errors: channelErrors { errors {
...ChannelErrorFragment ...ChannelErrorFragment
} }
} }

14
src/collections/mutations.ts
View file

@ -46,7 +46,7 @@ const collectionUpdate = gql`
collection { collection {
...CollectionDetailsFragment ...CollectionDetailsFragment
} }
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -85,7 +85,7 @@ const assignCollectionProduct = gql`
} }
} }
} }
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -104,7 +104,7 @@ const createCollection = gql`
collection { collection {
...CollectionDetailsFragment ...CollectionDetailsFragment
} }
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -119,7 +119,7 @@ const removeCollection = gql`
${collectionsErrorFragment} ${collectionsErrorFragment}
mutation RemoveCollection($id: ID!) { mutation RemoveCollection($id: ID!) {
collectionDelete(id: $id) { collectionDelete(id: $id) {
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -168,7 +168,7 @@ const unassignCollectionProduct = gql`
} }
} }
} }
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -183,7 +183,7 @@ const collectionBulkDelete = gql`
${collectionsErrorFragment} ${collectionsErrorFragment}
mutation CollectionBulkDelete($ids: [ID]!) { mutation CollectionBulkDelete($ids: [ID]!) {
collectionBulkDelete(ids: $ids) { collectionBulkDelete(ids: $ids) {
errors: collectionErrors { errors {
...CollectionErrorFragment ...CollectionErrorFragment
} }
} }
@ -201,7 +201,7 @@ const collectionChannelListingUpdate = gql`
$input: CollectionChannelListingUpdateInput! $input: CollectionChannelListingUpdateInput!
) { ) {
collectionChannelListingUpdate(id: $id, input: $input) { collectionChannelListingUpdate(id: $id, input: $input) {
errors: collectionChannelListingErrors { errors {
...CollectionChannelListingErrorFragment ...CollectionChannelListingErrorFragment
} }
} }

16
src/customers/mutations.ts
View file

@ -45,7 +45,7 @@ const updateCustomer = gql`
${customerDetailsFragment} ${customerDetailsFragment}
mutation UpdateCustomer($id: ID!, $input: CustomerInput!) { mutation UpdateCustomer($id: ID!, $input: CustomerInput!) {
customerUpdate(id: $id, input: $input) { customerUpdate(id: $id, input: $input) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -63,7 +63,7 @@ const createCustomer = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation CreateCustomer($input: UserCreateInput!) { mutation CreateCustomer($input: UserCreateInput!) {
customerCreate(input: $input) { customerCreate(input: $input) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -81,7 +81,7 @@ const removeCustomer = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation RemoveCustomer($id: ID!) { mutation RemoveCustomer($id: ID!) {
customerDelete(id: $id) { customerDelete(id: $id) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }
@ -101,7 +101,7 @@ const setCustomerDefaultAddress = gql`
$type: AddressTypeEnum! $type: AddressTypeEnum!
) { ) {
addressSetDefault(addressId: $addressId, userId: $userId, type: $type) { addressSetDefault(addressId: $addressId, userId: $userId, type: $type) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -121,7 +121,7 @@ const createCustomerAddress = gql`
${fragmentAddress} ${fragmentAddress}
mutation CreateCustomerAddress($id: ID!, $input: AddressInput!) { mutation CreateCustomerAddress($id: ID!, $input: AddressInput!) {
addressCreate(userId: $id, input: $input) { addressCreate(userId: $id, input: $input) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
address { address {
@ -143,7 +143,7 @@ const updateCustomerAddress = gql`
${fragmentAddress} ${fragmentAddress}
mutation UpdateCustomerAddress($id: ID!, $input: AddressInput!) { mutation UpdateCustomerAddress($id: ID!, $input: AddressInput!) {
addressUpdate(id: $id, input: $input) { addressUpdate(id: $id, input: $input) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
address { address {
@ -162,7 +162,7 @@ const removeCustomerAddress = gql`
${customerAddressesFragment} ${customerAddressesFragment}
mutation RemoveCustomerAddress($id: ID!) { mutation RemoveCustomerAddress($id: ID!) {
addressDelete(id: $id) { addressDelete(id: $id) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -180,7 +180,7 @@ export const bulkRemoveCustomers = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation BulkRemoveCustomers($ids: [ID]!) { mutation BulkRemoveCustomers($ids: [ID]!) {
customerBulkDelete(ids: $ids) { customerBulkDelete(ids: $ids) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }

24
src/discounts/mutations.ts
View file

@ -53,7 +53,7 @@ const saleUpdate = gql`
${saleFragment} ${saleFragment}
mutation SaleUpdate($input: SaleInput!, $id: ID!) { mutation SaleUpdate($input: SaleInput!, $id: ID!) {
saleUpdate(id: $id, input: $input) { saleUpdate(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
sale { sale {
@ -78,7 +78,7 @@ const saleCataloguesAdd = gql`
$last: Int $last: Int
) { ) {
saleCataloguesAdd(id: $id, input: $input) { saleCataloguesAdd(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
sale { sale {
@ -104,7 +104,7 @@ const saleCataloguesRemove = gql`
$last: Int $last: Int
) { ) {
saleCataloguesRemove(id: $id, input: $input) { saleCataloguesRemove(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
sale { sale {
@ -123,7 +123,7 @@ const saleCreate = gql`
${saleFragment} ${saleFragment}
mutation SaleCreate($input: SaleInput!) { mutation SaleCreate($input: SaleInput!) {
saleCreate(input: $input) { saleCreate(input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
sale { sale {
@ -140,7 +140,7 @@ const saleDelete = gql`
${discountErrorFragment} ${discountErrorFragment}
mutation SaleDelete($id: ID!) { mutation SaleDelete($id: ID!) {
saleDelete(id: $id) { saleDelete(id: $id) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
} }
@ -173,7 +173,7 @@ const saleChannelListingUpdate = gql`
$input: SaleChannelListingInput! $input: SaleChannelListingInput!
) { ) {
saleChannelListingUpdate(id: $id, input: $input) { saleChannelListingUpdate(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
sale { sale {
@ -195,7 +195,7 @@ const voucherChannelListingUpdate = gql`
$input: VoucherChannelListingInput! $input: VoucherChannelListingInput!
) { ) {
voucherChannelListingUpdate(id: $id, input: $input) { voucherChannelListingUpdate(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
voucher { voucher {
@ -214,7 +214,7 @@ const voucherUpdate = gql`
${voucherFragment} ${voucherFragment}
mutation VoucherUpdate($input: VoucherInput!, $id: ID!) { mutation VoucherUpdate($input: VoucherInput!, $id: ID!) {
voucherUpdate(id: $id, input: $input) { voucherUpdate(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
voucher { voucher {
@ -240,7 +240,7 @@ const voucherCataloguesAdd = gql`
$last: Int $last: Int
) { ) {
voucherCataloguesAdd(id: $id, input: $input) { voucherCataloguesAdd(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
voucher { voucher {
@ -266,7 +266,7 @@ const voucherCataloguesRemove = gql`
$last: Int $last: Int
) { ) {
voucherCataloguesRemove(id: $id, input: $input) { voucherCataloguesRemove(id: $id, input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
voucher { voucher {
@ -285,7 +285,7 @@ const voucherCreate = gql`
${voucherFragment} ${voucherFragment}
mutation VoucherCreate($input: VoucherInput!) { mutation VoucherCreate($input: VoucherInput!) {
voucherCreate(input: $input) { voucherCreate(input: $input) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
voucher { voucher {
@ -303,7 +303,7 @@ const voucherDelete = gql`
${discountErrorFragment} ${discountErrorFragment}
mutation VoucherDelete($id: ID!) { mutation VoucherDelete($id: ID!) {
voucherDelete(id: $id) { voucherDelete(id: $id) {
errors: discountErrors { errors {
...DiscountErrorFragment ...DiscountErrorFragment
} }
} }

2
src/discounts/types/SaleBulkDelete.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface SaleBulkDelete_saleBulkDelete_errors { export interface SaleBulkDelete_saleBulkDelete_errors {
__typename: "Error"; __typename: "DiscountError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/discounts/types/VoucherBulkDelete.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface VoucherBulkDelete_voucherBulkDelete_errors { export interface VoucherBulkDelete_voucherBulkDelete_errors {
__typename: "Error"; __typename: "DiscountError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/files/mutations.ts
View file

@ -13,7 +13,7 @@ const fileUploadMutation = gql`
uploadedFile { uploadedFile {
...FileFragment ...FileFragment
} }
uploadErrors { errors {
...UploadErrorFragment ...UploadErrorFragment
} }
} }

4
src/files/types/FileUpload.ts
View file

@ -15,7 +15,7 @@ export interface FileUpload_fileUpload_uploadedFile {
contentType: string | null; contentType: string | null;
} }
export interface FileUpload_fileUpload_uploadErrors { export interface FileUpload_fileUpload_errors {
__typename: "UploadError"; __typename: "UploadError";
code: UploadErrorCode; code: UploadErrorCode;
field: string | null; field: string | null;
@ -24,7 +24,7 @@ export interface FileUpload_fileUpload_uploadErrors {
export interface FileUpload_fileUpload { export interface FileUpload_fileUpload {
__typename: "FileUpload"; __typename: "FileUpload";
uploadedFile: FileUpload_fileUpload_uploadedFile | null; uploadedFile: FileUpload_fileUpload_uploadedFile | null;
uploadErrors: FileUpload_fileUpload_uploadErrors[]; errors: FileUpload_fileUpload_errors[];
} }
export interface FileUpload { export interface FileUpload {

3
src/fragments/orders.ts
View file

@ -261,9 +261,6 @@ export const fragmentOrderDetails = gql`
...Money ...Money
} }
} }
discount {
...Money
}
invoices { invoices {
...InvoiceFragment ...InvoiceFragment
} }

7
src/fragments/types/OrderDetailsFragment.ts
View file

@ -450,12 +450,6 @@ export interface OrderDetailsFragment_availableShippingMethods {
price: OrderDetailsFragment_availableShippingMethods_price | null; price: OrderDetailsFragment_availableShippingMethods_price | null;
} }
export interface OrderDetailsFragment_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDetailsFragment_invoices { export interface OrderDetailsFragment_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -504,7 +498,6 @@ export interface OrderDetailsFragment {
user: OrderDetailsFragment_user | null; user: OrderDetailsFragment_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDetailsFragment_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDetailsFragment_availableShippingMethods | null)[] | null;
discount: OrderDetailsFragment_discount | null;
invoices: (OrderDetailsFragment_invoices | null)[] | null; invoices: (OrderDetailsFragment_invoices | null)[] | null;
channel: OrderDetailsFragment_channel; channel: OrderDetailsFragment_channel;
isPaid: boolean; isPaid: boolean;

18
src/home/queries.ts
View file

@ -6,6 +6,7 @@ import { Home, HomeVariables } from "./types/Home";
const home = gql` const home = gql`
query Home( query Home(
$channel: String! $channel: String!
$datePeriod: DateRangeInput!
$PERMISSION_MANAGE_PRODUCTS: Boolean! $PERMISSION_MANAGE_PRODUCTS: Boolean!
$PERMISSION_MANAGE_ORDERS: Boolean! $PERMISSION_MANAGE_ORDERS: Boolean!
) { ) {
@ -16,21 +17,24 @@ const home = gql`
currency currency
} }
} }
ordersToday: orders(created: TODAY, channel: $channel) ordersToday: orders(filter: { created: $datePeriod }, channel: $channel)
@include(if: $PERMISSION_MANAGE_ORDERS) { @include(if: $PERMISSION_MANAGE_ORDERS) {
totalCount totalCount
} }
ordersToFulfill: orders(status: READY_TO_FULFILL, channel: $channel) ordersToFulfill: orders(
@include(if: $PERMISSION_MANAGE_ORDERS) { filter: { status: READY_TO_FULFILL }
channel: $channel
) @include(if: $PERMISSION_MANAGE_ORDERS) {
totalCount totalCount
} }
ordersToCapture: orders(status: READY_TO_CAPTURE, channel: $channel) ordersToCapture: orders(
@include(if: $PERMISSION_MANAGE_ORDERS) { filter: { status: READY_TO_CAPTURE }
channel: $channel
) @include(if: $PERMISSION_MANAGE_ORDERS) {
totalCount totalCount
} }
productsOutOfStock: products( productsOutOfStock: products(
stockAvailability: OUT_OF_STOCK filter: { stockAvailability: OUT_OF_STOCK, channel: $channel }
channel: $channel
) { ) {
totalCount totalCount
} }

3
src/home/types/Home.ts
View file

@ -3,7 +3,7 @@
// @generated // @generated
// This file was automatically generated and should not be edited. // This file was automatically generated and should not be edited.
import { OrderEventsEmailsEnum, OrderEventsEnum } from "./../../types/globalTypes"; import { DateRangeInput, OrderEventsEmailsEnum, OrderEventsEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
// GraphQL query operation: Home // GraphQL query operation: Home
@ -137,6 +137,7 @@ export interface Home {
export interface HomeVariables { export interface HomeVariables {
channel: string; channel: string;
datePeriod: DateRangeInput;
PERMISSION_MANAGE_PRODUCTS: boolean; PERMISSION_MANAGE_PRODUCTS: boolean;
PERMISSION_MANAGE_ORDERS: boolean; PERMISSION_MANAGE_ORDERS: boolean;
} }

4
src/home/views/index.tsx
View file

@ -4,7 +4,7 @@ import useNavigator from "@saleor/hooks/useNavigator";
import useUser from "@saleor/hooks/useUser"; import useUser from "@saleor/hooks/useUser";
import React from "react"; import React from "react";
import { getUserName } from "../../misc"; import { getDatePeriod, getUserName } from "../../misc";
import { orderListUrl } from "../../orders/urls"; import { orderListUrl } from "../../orders/urls";
import { productListUrl, productVariantEditUrl } from "../../products/urls"; import { productListUrl, productVariantEditUrl } from "../../products/urls";
import { OrderStatusFilter, StockAvailability } from "../../types/globalTypes"; import { OrderStatusFilter, StockAvailability } from "../../types/globalTypes";
@ -21,7 +21,7 @@ const HomeSection = () => {
const { data } = useHomePage({ const { data } = useHomePage({
displayLoader: true, displayLoader: true,
skip: noChannel, skip: noChannel,
variables: { channel: channel?.slug } variables: { channel: channel?.slug, datePeriod: getDatePeriod(1) }
}); });
return ( return (

16
src/misc.ts
View file

@ -15,6 +15,7 @@ import {
import { import {
AddressInput, AddressInput,
CountryCode, CountryCode,
DateRangeInput,
OrderStatus, OrderStatus,
PaymentChargeStatusEnum PaymentChargeStatusEnum
} from "./types/globalTypes"; } from "./types/globalTypes";
@ -421,3 +422,18 @@ export function transformFormToAddress<T>(
export function getStringOrPlaceholder(s: string | undefined): string { export function getStringOrPlaceholder(s: string | undefined): string {
return s || "..."; return s || "...";
} }
export const getDatePeriod = (days: number): DateRangeInput => {
if (days < 1) {
return {};
}
const end = moment().startOf("day");
const start = end.subtract(days - 1);
const format = "YYYY-MM-DD";
return {
gte: start.format(format),
lte: end.format(format)
};
};

16
src/navigation/mutations.ts
View file

@ -26,7 +26,7 @@ const menuCreate = gql`
${menuErrorFragment} ${menuErrorFragment}
mutation MenuCreate($input: MenuCreateInput!) { mutation MenuCreate($input: MenuCreateInput!) {
menuCreate(input: $input) { menuCreate(input: $input) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
menu { menu {
@ -44,7 +44,7 @@ const menuBulkDelete = gql`
${menuErrorFragment} ${menuErrorFragment}
mutation MenuBulkDelete($ids: [ID]!) { mutation MenuBulkDelete($ids: [ID]!) {
menuBulkDelete(ids: $ids) { menuBulkDelete(ids: $ids) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
} }
@ -59,7 +59,7 @@ const menuDelete = gql`
${menuErrorFragment} ${menuErrorFragment}
mutation MenuDelete($id: ID!) { mutation MenuDelete($id: ID!) {
menuDelete(id: $id) { menuDelete(id: $id) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
} }
@ -75,7 +75,7 @@ const menuItemCreate = gql`
${menuItemNestedFragment} ${menuItemNestedFragment}
mutation MenuItemCreate($input: MenuItemCreateInput!) { mutation MenuItemCreate($input: MenuItemCreateInput!) {
menuItemCreate(input: $input) { menuItemCreate(input: $input) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
menuItem { menuItem {
@ -103,19 +103,19 @@ const menuUpdate = gql`
$removeIds: [ID]! $removeIds: [ID]!
) { ) {
menuUpdate(id: $id, input: { name: $name }) { menuUpdate(id: $id, input: { name: $name }) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
} }
menuItemMove(menu: $id, moves: $moves) { menuItemMove(menu: $id, moves: $moves) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
} }
menuItemBulkDelete(ids: $removeIds) { menuItemBulkDelete(ids: $removeIds) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
} }
@ -131,7 +131,7 @@ const menuItemUpdate = gql`
${menuItemFragment} ${menuItemFragment}
mutation MenuItemUpdate($id: ID!, $input: MenuItemInput!) { mutation MenuItemUpdate($id: ID!, $input: MenuItemInput!) {
menuItemUpdate(id: $id, input: $input) { menuItemUpdate(id: $id, input: $input) {
errors: menuErrors { errors {
...MenuErrorFragment ...MenuErrorFragment
} }
menuItem { menuItem {

26
src/orders/components/OrderPayment/OrderPayment.tsx
View file

@ -12,7 +12,11 @@ import React from "react";
import { FormattedMessage, useIntl } from "react-intl"; import { FormattedMessage, useIntl } from "react-intl";
import { maybe, transformPaymentStatus } from "../../../misc"; import { maybe, transformPaymentStatus } from "../../../misc";
import { OrderAction, OrderStatus } from "../../../types/globalTypes"; import {
OrderAction,
OrderDiscountType,
OrderStatus
} from "../../../types/globalTypes";
import { OrderDetails_order } from "../../types/OrderDetails"; import { OrderDetails_order } from "../../types/OrderDetails";
const useStyles = makeStyles( const useStyles = makeStyles(
@ -163,7 +167,7 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
)} )}
</td> </td>
</tr> </tr>
{order?.discount?.amount > 0 && ( {order?.discounts?.map(discount => (
<tr> <tr>
<td> <td>
<FormattedMessage <FormattedMessage
@ -171,12 +175,24 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
description="order discount" description="order discount"
/> />
</td> </td>
<td /> <td>
{discount.type === OrderDiscountType.MANUAL ? (
<FormattedMessage
defaultMessage="Staff added"
description="staff added type order discount"
/>
) : (
<FormattedMessage
defaultMessage="Voucher"
description="voucher type order discount"
/>
)}
</td>
<td className={classes.textRight}> <td className={classes.textRight}>
-<Money money={order.discount} /> -<Money money={discount.amount} />
</td> </td>
</tr> </tr>
)} ))}
<tr className={classes.totalRow}> <tr className={classes.totalRow}>
<td> <td>
<FormattedMessage <FormattedMessage

3
src/orders/fixtures.ts
View file

@ -822,7 +822,6 @@ export const order = (placeholder: string): OrderDetails_order => ({
}, },
created: "2018-09-11T09:37:28.185874+00:00", created: "2018-09-11T09:37:28.185874+00:00",
customerNote: "Lorem ipsum dolor sit amet", customerNote: "Lorem ipsum dolor sit amet",
discount: null,
discounts: [], discounts: [],
events: [ events: [
{ {
@ -1380,9 +1379,7 @@ export const draftOrder = (placeholder: string): OrderDetails_order => ({
}, },
created: "2018-09-20T23:23:39.811428+00:00", created: "2018-09-20T23:23:39.811428+00:00",
customerNote: "Lorem ipsum dolor sit", customerNote: "Lorem ipsum dolor sit",
discount: null,
discounts: [], discounts: [],
events: [], events: [],
fulfillments: [], fulfillments: [],
id: "T3JkZXI6MjQ=", id: "T3JkZXI6MjQ=",

60
src/orders/mutations.ts
View file

@ -113,7 +113,7 @@ const orderCancelMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderCancel($id: ID!) { mutation OrderCancel($id: ID!) {
orderCancel(id: $id) { orderCancel(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -133,7 +133,7 @@ const orderDiscountAddMutation = gql`
${fragmentOrderDetails} ${fragmentOrderDetails}
mutation OrderDiscountAdd($input: OrderDiscountCommonInput!, $orderId: ID!) { mutation OrderDiscountAdd($input: OrderDiscountCommonInput!, $orderId: ID!) {
orderDiscountAdd(input: $input, orderId: $orderId) { orderDiscountAdd(input: $input, orderId: $orderId) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -153,7 +153,7 @@ const orderDiscountDeleteMutation = gql`
${fragmentOrderDetails} ${fragmentOrderDetails}
mutation OrderDiscountDelete($discountId: ID!) { mutation OrderDiscountDelete($discountId: ID!) {
orderDiscountDelete(discountId: $discountId) { orderDiscountDelete(discountId: $discountId) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -173,7 +173,7 @@ const orderLineDiscountRemoveMutation = gql`
${fragmentOrderDetails} ${fragmentOrderDetails}
mutation OrderLineDiscountRemove($orderLineId: ID!) { mutation OrderLineDiscountRemove($orderLineId: ID!) {
orderLineDiscountRemove(orderLineId: $orderLineId) { orderLineDiscountRemove(orderLineId: $orderLineId) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -196,7 +196,7 @@ const orderLineDiscountUpdateMutation = gql`
$orderLineId: ID! $orderLineId: ID!
) { ) {
orderLineDiscountUpdate(input: $input, orderLineId: $orderLineId) { orderLineDiscountUpdate(input: $input, orderLineId: $orderLineId) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -219,7 +219,7 @@ const orderDiscountUpdateMutation = gql`
$discountId: ID! $discountId: ID!
) { ) {
orderDiscountUpdate(input: $input, discountId: $discountId) { orderDiscountUpdate(input: $input, discountId: $discountId) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -241,7 +241,7 @@ const orderDraftCancelMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderDraftCancel($id: ID!) { mutation OrderDraftCancel($id: ID!) {
draftOrderDelete(id: $id) { draftOrderDelete(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -259,7 +259,7 @@ const orderDraftBulkCancelMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderDraftBulkCancel($ids: [ID]!) { mutation OrderDraftBulkCancel($ids: [ID]!) {
draftOrderBulkDelete(ids: $ids) { draftOrderBulkDelete(ids: $ids) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
} }
@ -271,7 +271,7 @@ export const orderConfirmMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderConfirm($id: ID!) { mutation OrderConfirm($id: ID!) {
orderConfirm(id: $id) { orderConfirm(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -296,7 +296,7 @@ const orderDraftFinalizeMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderDraftFinalize($id: ID!) { mutation OrderDraftFinalize($id: ID!) {
draftOrderComplete(id: $id) { draftOrderComplete(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -313,7 +313,7 @@ const orderReturnCreateMutation = gql`
$input: OrderReturnProductsInput! $input: OrderReturnProductsInput!
) { ) {
orderFulfillmentReturnProducts(input: $input, order: $id) { orderFulfillmentReturnProducts(input: $input, order: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -341,7 +341,7 @@ const orderRefundMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderRefund($id: ID!, $amount: PositiveDecimal!) { mutation OrderRefund($id: ID!, $amount: PositiveDecimal!) {
orderRefund(id: $id, amount: $amount) { orderRefund(id: $id, amount: $amount) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -365,7 +365,7 @@ const orderFulfillmentRefundProductsMutation = gql`
$order: ID! $order: ID!
) { ) {
orderFulfillmentRefundProducts(input: $input, order: $order) { orderFulfillmentRefundProducts(input: $input, order: $order) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
fulfillment { fulfillment {
@ -387,7 +387,7 @@ const orderVoidMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderVoid($id: ID!) { mutation OrderVoid($id: ID!) {
orderVoid(id: $id) { orderVoid(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -406,7 +406,7 @@ const orderMarkAsPaidMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderMarkAsPaid($id: ID!, $transactionReference: String) { mutation OrderMarkAsPaid($id: ID!, $transactionReference: String) {
orderMarkAsPaid(id: $id, transactionReference: $transactionReference) { orderMarkAsPaid(id: $id, transactionReference: $transactionReference) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -425,7 +425,7 @@ const orderCaptureMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderCapture($id: ID!, $amount: PositiveDecimal!) { mutation OrderCapture($id: ID!, $amount: PositiveDecimal!) {
orderCapture(id: $id, amount: $amount) { orderCapture(id: $id, amount: $amount) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -447,7 +447,7 @@ const orderFulfillmentUpdateTrackingMutation = gql`
$input: FulfillmentUpdateTrackingInput! $input: FulfillmentUpdateTrackingInput!
) { ) {
orderFulfillmentUpdateTracking(id: $id, input: $input) { orderFulfillmentUpdateTracking(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -466,7 +466,7 @@ const orderFulfillmentCancelMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderFulfillmentCancel($id: ID!, $input: FulfillmentCancelInput!) { mutation OrderFulfillmentCancel($id: ID!, $input: FulfillmentCancelInput!) {
orderFulfillmentCancel(id: $id, input: $input) { orderFulfillmentCancel(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -485,7 +485,7 @@ const orderAddNoteMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderAddNote($order: ID!, $input: OrderAddNoteInput!) { mutation OrderAddNote($order: ID!, $input: OrderAddNoteInput!) {
orderAddNote(order: $order, input: $input) { orderAddNote(order: $order, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -507,7 +507,7 @@ const orderUpdateMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderUpdate($id: ID!, $input: OrderUpdateInput!) { mutation OrderUpdate($id: ID!, $input: OrderUpdateInput!) {
orderUpdate(id: $id, input: $input) { orderUpdate(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -526,7 +526,7 @@ const orderDraftUpdateMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderDraftUpdate($id: ID!, $input: DraftOrderInput!) { mutation OrderDraftUpdate($id: ID!, $input: DraftOrderInput!) {
draftOrderUpdate(id: $id, input: $input) { draftOrderUpdate(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -548,7 +548,7 @@ const orderShippingMethodUpdateMutation = gql`
$input: OrderUpdateShippingInput! $input: OrderUpdateShippingInput!
) { ) {
orderUpdateShipping(order: $id, input: $input) { orderUpdateShipping(order: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -596,7 +596,7 @@ const orderDraftCreateMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderDraftCreate($input: DraftOrderCreateInput!) { mutation OrderDraftCreate($input: DraftOrderCreateInput!) {
draftOrderCreate(input: $input) { draftOrderCreate(input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -615,7 +615,7 @@ const orderLineDeleteMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderLineDelete($id: ID!) { mutation OrderLineDelete($id: ID!) {
orderLineDelete(id: $id) { orderLineDelete(id: $id) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -634,7 +634,7 @@ const orderLinesAddMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderLinesAdd($id: ID!, $input: [OrderLineCreateInput]!) { mutation OrderLinesAdd($id: ID!, $input: [OrderLineCreateInput]!) {
orderLinesCreate(id: $id, input: $input) { orderLinesCreate(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -653,7 +653,7 @@ const orderLineUpdateMutation = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation OrderLineUpdate($id: ID!, $input: OrderLineInput!) { mutation OrderLineUpdate($id: ID!, $input: OrderLineInput!) {
orderLineUpdate(id: $id, input: $input) { orderLineUpdate(id: $id, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
@ -672,7 +672,7 @@ const fulfillOrder = gql`
${orderErrorFragment} ${orderErrorFragment}
mutation FulfillOrder($orderId: ID!, $input: OrderFulfillInput!) { mutation FulfillOrder($orderId: ID!, $input: OrderFulfillInput!) {
orderFulfill(order: $orderId, input: $input) { orderFulfill(order: $orderId, input: $input) {
errors: orderErrors { errors {
...OrderErrorFragment ...OrderErrorFragment
warehouse warehouse
orderLine orderLine
@ -693,7 +693,7 @@ const invoiceRequestMutation = gql`
${invoiceFragment} ${invoiceFragment}
mutation InvoiceRequest($orderId: ID!) { mutation InvoiceRequest($orderId: ID!) {
invoiceRequest(orderId: $orderId) { invoiceRequest(orderId: $orderId) {
errors: invoiceErrors { errors {
...InvoiceErrorFragment ...InvoiceErrorFragment
} }
invoice { invoice {
@ -718,7 +718,7 @@ const invoiceEmailSendMutation = gql`
${invoiceFragment} ${invoiceFragment}
mutation InvoiceEmailSend($id: ID!) { mutation InvoiceEmailSend($id: ID!) {
invoiceSendNotification(id: $id) { invoiceSendNotification(id: $id) {
errors: invoiceErrors { errors {
...InvoiceErrorFragment ...InvoiceErrorFragment
} }
invoice { invoice {
@ -737,7 +737,7 @@ const orderSettingsUpdateMutation = gql`
${orderSettingsErrorFragment} ${orderSettingsErrorFragment}
mutation OrderSettingsUpdate($input: OrderSettingsUpdateInput!) { mutation OrderSettingsUpdate($input: OrderSettingsUpdateInput!) {
orderSettingsUpdate(input: $input) { orderSettingsUpdate(input: $input) {
errors: orderSettingsErrors { errors {
...OrderSettingsErrorFragment ...OrderSettingsErrorFragment
} }
orderSettings { orderSettings {

7
src/orders/types/FulfillOrder.ts
View file

@ -458,12 +458,6 @@ export interface FulfillOrder_orderFulfill_order_availableShippingMethods {
price: FulfillOrder_orderFulfill_order_availableShippingMethods_price | null; price: FulfillOrder_orderFulfill_order_availableShippingMethods_price | null;
} }
export interface FulfillOrder_orderFulfill_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface FulfillOrder_orderFulfill_order_invoices { export interface FulfillOrder_orderFulfill_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -512,7 +506,6 @@ export interface FulfillOrder_orderFulfill_order {
user: FulfillOrder_orderFulfill_order_user | null; user: FulfillOrder_orderFulfill_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (FulfillOrder_orderFulfill_order_availableShippingMethods | null)[] | null; availableShippingMethods: (FulfillOrder_orderFulfill_order_availableShippingMethods | null)[] | null;
discount: FulfillOrder_orderFulfill_order_discount | null;
invoices: (FulfillOrder_orderFulfill_order_invoices | null)[] | null; invoices: (FulfillOrder_orderFulfill_order_invoices | null)[] | null;
channel: FulfillOrder_orderFulfill_order_channel; channel: FulfillOrder_orderFulfill_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderCancel.ts
View file

@ -456,12 +456,6 @@ export interface OrderCancel_orderCancel_order_availableShippingMethods {
price: OrderCancel_orderCancel_order_availableShippingMethods_price | null; price: OrderCancel_orderCancel_order_availableShippingMethods_price | null;
} }
export interface OrderCancel_orderCancel_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderCancel_orderCancel_order_invoices { export interface OrderCancel_orderCancel_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderCancel_orderCancel_order {
user: OrderCancel_orderCancel_order_user | null; user: OrderCancel_orderCancel_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderCancel_orderCancel_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderCancel_orderCancel_order_availableShippingMethods | null)[] | null;
discount: OrderCancel_orderCancel_order_discount | null;
invoices: (OrderCancel_orderCancel_order_invoices | null)[] | null; invoices: (OrderCancel_orderCancel_order_invoices | null)[] | null;
channel: OrderCancel_orderCancel_order_channel; channel: OrderCancel_orderCancel_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderCapture.ts
View file

@ -456,12 +456,6 @@ export interface OrderCapture_orderCapture_order_availableShippingMethods {
price: OrderCapture_orderCapture_order_availableShippingMethods_price | null; price: OrderCapture_orderCapture_order_availableShippingMethods_price | null;
} }
export interface OrderCapture_orderCapture_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderCapture_orderCapture_order_invoices { export interface OrderCapture_orderCapture_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderCapture_orderCapture_order {
user: OrderCapture_orderCapture_order_user | null; user: OrderCapture_orderCapture_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderCapture_orderCapture_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderCapture_orderCapture_order_availableShippingMethods | null)[] | null;
discount: OrderCapture_orderCapture_order_discount | null;
invoices: (OrderCapture_orderCapture_order_invoices | null)[] | null; invoices: (OrderCapture_orderCapture_order_invoices | null)[] | null;
channel: OrderCapture_orderCapture_order_channel; channel: OrderCapture_orderCapture_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderConfirm.ts
View file

@ -456,12 +456,6 @@ export interface OrderConfirm_orderConfirm_order_availableShippingMethods {
price: OrderConfirm_orderConfirm_order_availableShippingMethods_price | null; price: OrderConfirm_orderConfirm_order_availableShippingMethods_price | null;
} }
export interface OrderConfirm_orderConfirm_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderConfirm_orderConfirm_order_invoices { export interface OrderConfirm_orderConfirm_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderConfirm_orderConfirm_order {
user: OrderConfirm_orderConfirm_order_user | null; user: OrderConfirm_orderConfirm_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderConfirm_orderConfirm_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderConfirm_orderConfirm_order_availableShippingMethods | null)[] | null;
discount: OrderConfirm_orderConfirm_order_discount | null;
invoices: (OrderConfirm_orderConfirm_order_invoices | null)[] | null; invoices: (OrderConfirm_orderConfirm_order_invoices | null)[] | null;
channel: OrderConfirm_orderConfirm_order_channel; channel: OrderConfirm_orderConfirm_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDetails.ts
View file

@ -450,12 +450,6 @@ export interface OrderDetails_order_availableShippingMethods {
price: OrderDetails_order_availableShippingMethods_price | null; price: OrderDetails_order_availableShippingMethods_price | null;
} }
export interface OrderDetails_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDetails_order_invoices { export interface OrderDetails_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -504,7 +498,6 @@ export interface OrderDetails_order {
user: OrderDetails_order_user | null; user: OrderDetails_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDetails_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDetails_order_availableShippingMethods | null)[] | null;
discount: OrderDetails_order_discount | null;
invoices: (OrderDetails_order_invoices | null)[] | null; invoices: (OrderDetails_order_invoices | null)[] | null;
channel: OrderDetails_order_channel; channel: OrderDetails_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDiscountAdd.ts
View file

@ -456,12 +456,6 @@ export interface OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethod
price: OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods_price | null; price: OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods_price | null;
} }
export interface OrderDiscountAdd_orderDiscountAdd_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDiscountAdd_orderDiscountAdd_order_invoices { export interface OrderDiscountAdd_orderDiscountAdd_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDiscountAdd_orderDiscountAdd_order {
user: OrderDiscountAdd_orderDiscountAdd_order_user | null; user: OrderDiscountAdd_orderDiscountAdd_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods | null)[] | null;
discount: OrderDiscountAdd_orderDiscountAdd_order_discount | null;
invoices: (OrderDiscountAdd_orderDiscountAdd_order_invoices | null)[] | null; invoices: (OrderDiscountAdd_orderDiscountAdd_order_invoices | null)[] | null;
channel: OrderDiscountAdd_orderDiscountAdd_order_channel; channel: OrderDiscountAdd_orderDiscountAdd_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDiscountDelete.ts
View file

@ -456,12 +456,6 @@ export interface OrderDiscountDelete_orderDiscountDelete_order_availableShipping
price: OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods_price | null; price: OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods_price | null;
} }
export interface OrderDiscountDelete_orderDiscountDelete_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDiscountDelete_orderDiscountDelete_order_invoices { export interface OrderDiscountDelete_orderDiscountDelete_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDiscountDelete_orderDiscountDelete_order {
user: OrderDiscountDelete_orderDiscountDelete_order_user | null; user: OrderDiscountDelete_orderDiscountDelete_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods | null)[] | null;
discount: OrderDiscountDelete_orderDiscountDelete_order_discount | null;
invoices: (OrderDiscountDelete_orderDiscountDelete_order_invoices | null)[] | null; invoices: (OrderDiscountDelete_orderDiscountDelete_order_invoices | null)[] | null;
channel: OrderDiscountDelete_orderDiscountDelete_order_channel; channel: OrderDiscountDelete_orderDiscountDelete_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDiscountUpdate.ts
View file

@ -456,12 +456,6 @@ export interface OrderDiscountUpdate_orderDiscountUpdate_order_availableShipping
price: OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods_price | null; price: OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods_price | null;
} }
export interface OrderDiscountUpdate_orderDiscountUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDiscountUpdate_orderDiscountUpdate_order_invoices { export interface OrderDiscountUpdate_orderDiscountUpdate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDiscountUpdate_orderDiscountUpdate_order {
user: OrderDiscountUpdate_orderDiscountUpdate_order_user | null; user: OrderDiscountUpdate_orderDiscountUpdate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods | null)[] | null;
discount: OrderDiscountUpdate_orderDiscountUpdate_order_discount | null;
invoices: (OrderDiscountUpdate_orderDiscountUpdate_order_invoices | null)[] | null; invoices: (OrderDiscountUpdate_orderDiscountUpdate_order_invoices | null)[] | null;
channel: OrderDiscountUpdate_orderDiscountUpdate_order_channel; channel: OrderDiscountUpdate_orderDiscountUpdate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDraftCancel.ts
View file

@ -456,12 +456,6 @@ export interface OrderDraftCancel_draftOrderDelete_order_availableShippingMethod
price: OrderDraftCancel_draftOrderDelete_order_availableShippingMethods_price | null; price: OrderDraftCancel_draftOrderDelete_order_availableShippingMethods_price | null;
} }
export interface OrderDraftCancel_draftOrderDelete_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDraftCancel_draftOrderDelete_order_invoices { export interface OrderDraftCancel_draftOrderDelete_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDraftCancel_draftOrderDelete_order {
user: OrderDraftCancel_draftOrderDelete_order_user | null; user: OrderDraftCancel_draftOrderDelete_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDraftCancel_draftOrderDelete_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDraftCancel_draftOrderDelete_order_availableShippingMethods | null)[] | null;
discount: OrderDraftCancel_draftOrderDelete_order_discount | null;
invoices: (OrderDraftCancel_draftOrderDelete_order_invoices | null)[] | null; invoices: (OrderDraftCancel_draftOrderDelete_order_invoices | null)[] | null;
channel: OrderDraftCancel_draftOrderDelete_order_channel; channel: OrderDraftCancel_draftOrderDelete_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDraftFinalize.ts
View file

@ -456,12 +456,6 @@ export interface OrderDraftFinalize_draftOrderComplete_order_availableShippingMe
price: OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods_price | null; price: OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods_price | null;
} }
export interface OrderDraftFinalize_draftOrderComplete_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDraftFinalize_draftOrderComplete_order_invoices { export interface OrderDraftFinalize_draftOrderComplete_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDraftFinalize_draftOrderComplete_order {
user: OrderDraftFinalize_draftOrderComplete_order_user | null; user: OrderDraftFinalize_draftOrderComplete_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods | null)[] | null;
discount: OrderDraftFinalize_draftOrderComplete_order_discount | null;
invoices: (OrderDraftFinalize_draftOrderComplete_order_invoices | null)[] | null; invoices: (OrderDraftFinalize_draftOrderComplete_order_invoices | null)[] | null;
channel: OrderDraftFinalize_draftOrderComplete_order_channel; channel: OrderDraftFinalize_draftOrderComplete_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderDraftUpdate.ts
View file

@ -456,12 +456,6 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethod
price: OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods_price | null; price: OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods_price | null;
} }
export interface OrderDraftUpdate_draftOrderUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderDraftUpdate_draftOrderUpdate_order_invoices { export interface OrderDraftUpdate_draftOrderUpdate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderDraftUpdate_draftOrderUpdate_order {
user: OrderDraftUpdate_draftOrderUpdate_order_user | null; user: OrderDraftUpdate_draftOrderUpdate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods | null)[] | null;
discount: OrderDraftUpdate_draftOrderUpdate_order_discount | null;
invoices: (OrderDraftUpdate_draftOrderUpdate_order_invoices | null)[] | null; invoices: (OrderDraftUpdate_draftOrderUpdate_order_invoices | null)[] | null;
channel: OrderDraftUpdate_draftOrderUpdate_order_channel; channel: OrderDraftUpdate_draftOrderUpdate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderFulfillmentCancel.ts
View file

@ -456,12 +456,6 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_availableSh
price: OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods_price | null; price: OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods_price | null;
} }
export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices { export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order {
user: OrderFulfillmentCancel_orderFulfillmentCancel_order_user | null; user: OrderFulfillmentCancel_orderFulfillmentCancel_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods | null)[] | null;
discount: OrderFulfillmentCancel_orderFulfillmentCancel_order_discount | null;
invoices: (OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices | null)[] | null; invoices: (OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices | null)[] | null;
channel: OrderFulfillmentCancel_orderFulfillmentCancel_order_channel; channel: OrderFulfillmentCancel_orderFulfillmentCancel_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderFulfillmentRefundProducts.ts
View file

@ -551,12 +551,6 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o
price: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods_price | null; price: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods_price | null;
} }
export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices { export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -605,7 +599,6 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o
user: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_user | null; user: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods | null)[] | null;
discount: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_discount | null;
invoices: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices | null)[] | null; invoices: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices | null)[] | null;
channel: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_channel; channel: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderFulfillmentUpdateTracking.ts
View file

@ -456,12 +456,6 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o
price: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods_price | null; price: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods_price | null;
} }
export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices { export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o
user: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_user | null; user: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods | null)[] | null;
discount: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_discount | null;
invoices: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices | null)[] | null; invoices: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices | null)[] | null;
channel: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_channel; channel: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderLineDelete.ts
View file

@ -456,12 +456,6 @@ export interface OrderLineDelete_orderLineDelete_order_availableShippingMethods
price: OrderLineDelete_orderLineDelete_order_availableShippingMethods_price | null; price: OrderLineDelete_orderLineDelete_order_availableShippingMethods_price | null;
} }
export interface OrderLineDelete_orderLineDelete_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderLineDelete_orderLineDelete_order_invoices { export interface OrderLineDelete_orderLineDelete_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderLineDelete_orderLineDelete_order {
user: OrderLineDelete_orderLineDelete_order_user | null; user: OrderLineDelete_orderLineDelete_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderLineDelete_orderLineDelete_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderLineDelete_orderLineDelete_order_availableShippingMethods | null)[] | null;
discount: OrderLineDelete_orderLineDelete_order_discount | null;
invoices: (OrderLineDelete_orderLineDelete_order_invoices | null)[] | null; invoices: (OrderLineDelete_orderLineDelete_order_invoices | null)[] | null;
channel: OrderLineDelete_orderLineDelete_order_channel; channel: OrderLineDelete_orderLineDelete_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderLineDiscountRemove.ts
View file

@ -456,12 +456,6 @@ export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_available
price: OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods_price | null; price: OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods_price | null;
} }
export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices { export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderLineDiscountRemove_orderLineDiscountRemove_order {
user: OrderLineDiscountRemove_orderLineDiscountRemove_order_user | null; user: OrderLineDiscountRemove_orderLineDiscountRemove_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods | null)[] | null;
discount: OrderLineDiscountRemove_orderLineDiscountRemove_order_discount | null;
invoices: (OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices | null)[] | null; invoices: (OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices | null)[] | null;
channel: OrderLineDiscountRemove_orderLineDiscountRemove_order_channel; channel: OrderLineDiscountRemove_orderLineDiscountRemove_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderLineDiscountUpdate.ts
View file

@ -456,12 +456,6 @@ export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_available
price: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods_price | null; price: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods_price | null;
} }
export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices { export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order {
user: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_user | null; user: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods | null)[] | null;
discount: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_discount | null;
invoices: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices | null)[] | null; invoices: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices | null)[] | null;
channel: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_channel; channel: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderLineUpdate.ts
View file

@ -456,12 +456,6 @@ export interface OrderLineUpdate_orderLineUpdate_order_availableShippingMethods
price: OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price | null; price: OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price | null;
} }
export interface OrderLineUpdate_orderLineUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderLineUpdate_orderLineUpdate_order_invoices { export interface OrderLineUpdate_orderLineUpdate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderLineUpdate_orderLineUpdate_order {
user: OrderLineUpdate_orderLineUpdate_order_user | null; user: OrderLineUpdate_orderLineUpdate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderLineUpdate_orderLineUpdate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderLineUpdate_orderLineUpdate_order_availableShippingMethods | null)[] | null;
discount: OrderLineUpdate_orderLineUpdate_order_discount | null;
invoices: (OrderLineUpdate_orderLineUpdate_order_invoices | null)[] | null; invoices: (OrderLineUpdate_orderLineUpdate_order_invoices | null)[] | null;
channel: OrderLineUpdate_orderLineUpdate_order_channel; channel: OrderLineUpdate_orderLineUpdate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderLinesAdd.ts
View file

@ -456,12 +456,6 @@ export interface OrderLinesAdd_orderLinesCreate_order_availableShippingMethods {
price: OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price | null; price: OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price | null;
} }
export interface OrderLinesAdd_orderLinesCreate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderLinesAdd_orderLinesCreate_order_invoices { export interface OrderLinesAdd_orderLinesCreate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderLinesAdd_orderLinesCreate_order {
user: OrderLinesAdd_orderLinesCreate_order_user | null; user: OrderLinesAdd_orderLinesCreate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderLinesAdd_orderLinesCreate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderLinesAdd_orderLinesCreate_order_availableShippingMethods | null)[] | null;
discount: OrderLinesAdd_orderLinesCreate_order_discount | null;
invoices: (OrderLinesAdd_orderLinesCreate_order_invoices | null)[] | null; invoices: (OrderLinesAdd_orderLinesCreate_order_invoices | null)[] | null;
channel: OrderLinesAdd_orderLinesCreate_order_channel; channel: OrderLinesAdd_orderLinesCreate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderMarkAsPaid.ts
View file

@ -456,12 +456,6 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods
price: OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods_price | null; price: OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods_price | null;
} }
export interface OrderMarkAsPaid_orderMarkAsPaid_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderMarkAsPaid_orderMarkAsPaid_order_invoices { export interface OrderMarkAsPaid_orderMarkAsPaid_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order {
user: OrderMarkAsPaid_orderMarkAsPaid_order_user | null; user: OrderMarkAsPaid_orderMarkAsPaid_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods | null)[] | null;
discount: OrderMarkAsPaid_orderMarkAsPaid_order_discount | null;
invoices: (OrderMarkAsPaid_orderMarkAsPaid_order_invoices | null)[] | null; invoices: (OrderMarkAsPaid_orderMarkAsPaid_order_invoices | null)[] | null;
channel: OrderMarkAsPaid_orderMarkAsPaid_order_channel; channel: OrderMarkAsPaid_orderMarkAsPaid_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderRefund.ts
View file

@ -456,12 +456,6 @@ export interface OrderRefund_orderRefund_order_availableShippingMethods {
price: OrderRefund_orderRefund_order_availableShippingMethods_price | null; price: OrderRefund_orderRefund_order_availableShippingMethods_price | null;
} }
export interface OrderRefund_orderRefund_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderRefund_orderRefund_order_invoices { export interface OrderRefund_orderRefund_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderRefund_orderRefund_order {
user: OrderRefund_orderRefund_order_user | null; user: OrderRefund_orderRefund_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderRefund_orderRefund_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderRefund_orderRefund_order_availableShippingMethods | null)[] | null;
discount: OrderRefund_orderRefund_order_discount | null;
invoices: (OrderRefund_orderRefund_order_invoices | null)[] | null; invoices: (OrderRefund_orderRefund_order_invoices | null)[] | null;
channel: OrderRefund_orderRefund_order_channel; channel: OrderRefund_orderRefund_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderShippingMethodUpdate.ts
View file

@ -464,12 +464,6 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order_user {
email: string; email: string;
} }
export interface OrderShippingMethodUpdate_orderUpdateShipping_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderShippingMethodUpdate_orderUpdateShipping_order_invoices { export interface OrderShippingMethodUpdate_orderUpdateShipping_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -518,7 +512,6 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order {
undiscountedTotal: OrderShippingMethodUpdate_orderUpdateShipping_order_undiscountedTotal; undiscountedTotal: OrderShippingMethodUpdate_orderUpdateShipping_order_undiscountedTotal;
user: OrderShippingMethodUpdate_orderUpdateShipping_order_user | null; user: OrderShippingMethodUpdate_orderUpdateShipping_order_user | null;
userEmail: string | null; userEmail: string | null;
discount: OrderShippingMethodUpdate_orderUpdateShipping_order_discount | null;
invoices: (OrderShippingMethodUpdate_orderUpdateShipping_order_invoices | null)[] | null; invoices: (OrderShippingMethodUpdate_orderUpdateShipping_order_invoices | null)[] | null;
channel: OrderShippingMethodUpdate_orderUpdateShipping_order_channel; channel: OrderShippingMethodUpdate_orderUpdateShipping_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderUpdate.ts
View file

@ -456,12 +456,6 @@ export interface OrderUpdate_orderUpdate_order_availableShippingMethods {
price: OrderUpdate_orderUpdate_order_availableShippingMethods_price | null; price: OrderUpdate_orderUpdate_order_availableShippingMethods_price | null;
} }
export interface OrderUpdate_orderUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_invoices { export interface OrderUpdate_orderUpdate_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderUpdate_orderUpdate_order {
user: OrderUpdate_orderUpdate_order_user | null; user: OrderUpdate_orderUpdate_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderUpdate_orderUpdate_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderUpdate_orderUpdate_order_availableShippingMethods | null)[] | null;
discount: OrderUpdate_orderUpdate_order_discount | null;
invoices: (OrderUpdate_orderUpdate_order_invoices | null)[] | null; invoices: (OrderUpdate_orderUpdate_order_invoices | null)[] | null;
channel: OrderUpdate_orderUpdate_order_channel; channel: OrderUpdate_orderUpdate_order_channel;
isPaid: boolean; isPaid: boolean;

7
src/orders/types/OrderVoid.ts
View file

@ -456,12 +456,6 @@ export interface OrderVoid_orderVoid_order_availableShippingMethods {
price: OrderVoid_orderVoid_order_availableShippingMethods_price | null; price: OrderVoid_orderVoid_order_availableShippingMethods_price | null;
} }
export interface OrderVoid_orderVoid_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderVoid_orderVoid_order_invoices { export interface OrderVoid_orderVoid_order_invoices {
__typename: "Invoice"; __typename: "Invoice";
id: string; id: string;
@ -510,7 +504,6 @@ export interface OrderVoid_orderVoid_order {
user: OrderVoid_orderVoid_order_user | null; user: OrderVoid_orderVoid_order_user | null;
userEmail: string | null; userEmail: string | null;
availableShippingMethods: (OrderVoid_orderVoid_order_availableShippingMethods | null)[] | null; availableShippingMethods: (OrderVoid_orderVoid_order_availableShippingMethods | null)[] | null;
discount: OrderVoid_orderVoid_order_discount | null;
invoices: (OrderVoid_orderVoid_order_invoices | null)[] | null; invoices: (OrderVoid_orderVoid_order_invoices | null)[] | null;
channel: OrderVoid_orderVoid_order_channel; channel: OrderVoid_orderVoid_order_channel;
isPaid: boolean; isPaid: boolean;

14
src/pageTypes/mutations.ts
View file

@ -37,7 +37,7 @@ export const pageTypeUpdateMutation = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation PageTypeUpdate($id: ID!, $input: PageTypeUpdateInput!) { mutation PageTypeUpdate($id: ID!, $input: PageTypeUpdateInput!) {
pageTypeUpdate(id: $id, input: $input) { pageTypeUpdate(id: $id, input: $input) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
pageType { pageType {
@ -56,7 +56,7 @@ export const pageTypeCreateMutation = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation PageTypeCreate($input: PageTypeCreateInput!) { mutation PageTypeCreate($input: PageTypeCreateInput!) {
pageTypeCreate(input: $input) { pageTypeCreate(input: $input) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
pageType { pageType {
@ -75,7 +75,7 @@ export const assignPageAttributeMutation = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation AssignPageAttribute($id: ID!, $ids: [ID!]!) { mutation AssignPageAttribute($id: ID!, $ids: [ID!]!) {
pageAttributeAssign(pageTypeId: $id, attributeIds: $ids) { pageAttributeAssign(pageTypeId: $id, attributeIds: $ids) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
pageType { pageType {
@ -94,7 +94,7 @@ export const unassignPageAttributeMutation = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation UnassignPageAttribute($id: ID!, $ids: [ID!]!) { mutation UnassignPageAttribute($id: ID!, $ids: [ID!]!) {
pageAttributeUnassign(pageTypeId: $id, attributeIds: $ids) { pageAttributeUnassign(pageTypeId: $id, attributeIds: $ids) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
pageType { pageType {
@ -111,7 +111,7 @@ export const useUnassignPageAttributeMutation = makeMutation<
export const pageTypeDeleteMutation = gql` export const pageTypeDeleteMutation = gql`
mutation PageTypeDelete($id: ID!) { mutation PageTypeDelete($id: ID!) {
pageTypeDelete(id: $id) { pageTypeDelete(id: $id) {
errors: pageErrors { errors {
field field
message message
} }
@ -129,7 +129,7 @@ export const usePageTypeDeleteMutation = makeMutation<
export const pageTypeBulkDeleteMutation = gql` export const pageTypeBulkDeleteMutation = gql`
mutation PageTypeBulkDelete($ids: [ID!]!) { mutation PageTypeBulkDelete($ids: [ID!]!) {
pageTypeBulkDelete(ids: $ids) { pageTypeBulkDelete(ids: $ids) {
errors: pageErrors { errors {
field field
message message
} }
@ -146,7 +146,7 @@ export const pageTypeAttributeReorder = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation PageTypeAttributeReorder($move: ReorderInput!, $pageTypeId: ID!) { mutation PageTypeAttributeReorder($move: ReorderInput!, $pageTypeId: ID!) {
pageTypeReorderAttributes(moves: [$move], pageTypeId: $pageTypeId) { pageTypeReorderAttributes(moves: [$move], pageTypeId: $pageTypeId) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
pageType { pageType {

6
src/pages/mutations.ts
View file

@ -24,7 +24,7 @@ const pageCreate = gql`
${pageErrorWithAttributesFragment} ${pageErrorWithAttributesFragment}
mutation PageCreate($input: PageCreateInput!) { mutation PageCreate($input: PageCreateInput!) {
pageCreate(input: $input) { pageCreate(input: $input) {
errors: pageErrors { errors {
...PageErrorWithAttributesFragment ...PageErrorWithAttributesFragment
message message
} }
@ -43,7 +43,7 @@ const pageUpdate = gql`
${pageErrorWithAttributesFragment} ${pageErrorWithAttributesFragment}
mutation PageUpdate($id: ID!, $input: PageInput!) { mutation PageUpdate($id: ID!, $input: PageInput!) {
pageUpdate(id: $id, input: $input) { pageUpdate(id: $id, input: $input) {
errors: pageErrors { errors {
...PageErrorWithAttributesFragment ...PageErrorWithAttributesFragment
} }
page { page {
@ -61,7 +61,7 @@ const pageRemove = gql`
${pageErrorFragment} ${pageErrorFragment}
mutation PageRemove($id: ID!) { mutation PageRemove($id: ID!) {
pageDelete(id: $id) { pageDelete(id: $id) {
errors: pageErrors { errors {
...PageErrorFragment ...PageErrorFragment
} }
} }

2
src/pages/types/PageBulkPublish.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface PageBulkPublish_pageBulkPublish_errors { export interface PageBulkPublish_pageBulkPublish_errors {
__typename: "Error"; __typename: "PageError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/pages/types/PageBulkRemove.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface PageBulkRemove_pageBulkDelete_errors { export interface PageBulkRemove_pageBulkDelete_errors {
__typename: "Error"; __typename: "PageError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

6
src/permissionGroups/mutations.ts
View file

@ -20,7 +20,7 @@ export const permissionGroupDelete = gql`
${permissionGroupErrorFragment} ${permissionGroupErrorFragment}
mutation PermissionGroupDelete($id: ID!) { mutation PermissionGroupDelete($id: ID!) {
permissionGroupDelete(id: $id) { permissionGroupDelete(id: $id) {
errors: permissionGroupErrors { errors {
...PermissionGroupErrorFragment ...PermissionGroupErrorFragment
} }
} }
@ -37,7 +37,7 @@ export const permissionGroupCreate = gql`
mutation PermissionGroupCreate($input: PermissionGroupCreateInput!) { mutation PermissionGroupCreate($input: PermissionGroupCreateInput!) {
permissionGroupCreate(input: $input) { permissionGroupCreate(input: $input) {
errors: permissionGroupErrors { errors {
...PermissionGroupErrorFragment ...PermissionGroupErrorFragment
} }
group { group {
@ -61,7 +61,7 @@ export const permissionGroupUpdate = gql`
$input: PermissionGroupUpdateInput! $input: PermissionGroupUpdateInput!
) { ) {
permissionGroupUpdate(id: $id, input: $input) { permissionGroupUpdate(id: $id, input: $input) {
errors: permissionGroupErrors { errors {
...PermissionGroupErrorFragment ...PermissionGroupErrorFragment
} }
group { group {

2
src/plugins/mutations.ts
View file

@ -10,7 +10,7 @@ const pluginUpdate = gql`
${pluginErrorFragment} ${pluginErrorFragment}
mutation PluginUpdate($id: ID!, $input: PluginUpdateInput!) { mutation PluginUpdate($id: ID!, $input: PluginUpdateInput!) {
pluginUpdate(id: $id, input: $input) { pluginUpdate(id: $id, input: $input) {
errors: pluginsErrors { errors {
...PluginErrorFragment ...PluginErrorFragment
} }
plugin { plugin {

4
src/productTypes/mutations.ts
View file

@ -91,7 +91,7 @@ export const assignProductAttributeMutation = gql`
$operations: [ProductAttributeAssignInput!]! $operations: [ProductAttributeAssignInput!]!
) { ) {
productAttributeAssign(productTypeId: $id, operations: $operations) { productAttributeAssign(productTypeId: $id, operations: $operations) {
errors: productErrors { errors {
field field
message message
} }
@ -110,7 +110,7 @@ export const unassignProductAttributeMutation = gql`
${productTypeDetailsFragment} ${productTypeDetailsFragment}
mutation UnassignProductAttribute($id: ID!, $ids: [ID]!) { mutation UnassignProductAttribute($id: ID!, $ids: [ID]!) {
productAttributeUnassign(productTypeId: $id, attributeIds: $ids) { productAttributeUnassign(productTypeId: $id, attributeIds: $ids) {
errors: productErrors { errors {
field field
message message
} }

2
src/productTypes/types/ProductTypeAttributeReorder.ts
View file

@ -10,7 +10,7 @@ import { ReorderInput, ProductAttributeType, AttributeTypeEnum, WeightUnitsEnum
// ==================================================== // ====================================================
export interface ProductTypeAttributeReorder_productTypeReorderAttributes_errors { export interface ProductTypeAttributeReorder_productTypeReorderAttributes_errors {
__typename: "Error"; __typename: "ProductError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/productTypes/types/ProductTypeBulkDelete.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface ProductTypeBulkDelete_productTypeBulkDelete_errors { export interface ProductTypeBulkDelete_productTypeBulkDelete_errors {
__typename: "Error"; __typename: "ProductError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/productTypes/types/ProductTypeCreate.ts
View file

@ -10,7 +10,7 @@ import { ProductTypeInput, AttributeTypeEnum, WeightUnitsEnum } from "./../../ty
// ==================================================== // ====================================================
export interface ProductTypeCreate_productTypeCreate_errors { export interface ProductTypeCreate_productTypeCreate_errors {
__typename: "Error"; __typename: "ProductError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/productTypes/types/ProductTypeDelete.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface ProductTypeDelete_productTypeDelete_errors { export interface ProductTypeDelete_productTypeDelete_errors {
__typename: "Error"; __typename: "ProductError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/productTypes/types/ProductTypeUpdate.ts
View file

@ -10,7 +10,7 @@ import { ProductTypeInput, AttributeTypeEnum, WeightUnitsEnum } from "./../../ty
// ==================================================== // ====================================================
export interface ProductTypeUpdate_productTypeUpdate_errors { export interface ProductTypeUpdate_productTypeUpdate_errors {
__typename: "Error"; __typename: "ProductError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

3
src/products/components/ProductList/ProductList.tsx
View file

@ -313,11 +313,10 @@ export const ProductList: React.FC<ProductListProps> = props => {
<TableCellAvatar <TableCellAvatar
className={classes.colName} className={classes.colName}
thumbnail={maybe(() => product.thumbnail.url)} thumbnail={maybe(() => product.thumbnail.url)}
data-test="name"
> >
{product?.productType ? ( {product?.productType ? (
<div className={classes.colNameWrapper}> <div className={classes.colNameWrapper}>
<span>{product.name}</span> <span data-test="name">{product.name}</span>
{product?.productType && ( {product?.productType && (
<Typography variant="caption"> <Typography variant="caption">
{product.productType.hasVariants ? ( {product.productType.hasVariants ? (

56
src/products/mutations.ts
View file

@ -96,7 +96,7 @@ export const productMediaCreateMutation = gql`
mediaUrl: $mediaUrl mediaUrl: $mediaUrl
} }
) { ) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -114,7 +114,7 @@ export const productDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation ProductDelete($id: ID!) { mutation ProductDelete($id: ID!) {
productDelete(id: $id) { productDelete(id: $id) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -132,7 +132,7 @@ export const productMediaReorder = gql`
${productErrorFragment} ${productErrorFragment}
mutation ProductMediaReorder($productId: ID!, $mediaIds: [ID]!) { mutation ProductMediaReorder($productId: ID!, $mediaIds: [ID]!) {
productMediaReorder(productId: $productId, mediaIds: $mediaIds) { productMediaReorder(productId: $productId, mediaIds: $mediaIds) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -157,7 +157,7 @@ const productVariantSetDefault = gql`
${productFragmentDetails} ${productFragmentDetails}
mutation ProductVariantSetDefault($productId: ID!, $variantId: ID!) { mutation ProductVariantSetDefault($productId: ID!, $variantId: ID!) {
productVariantSetDefault(productId: $productId, variantId: $variantId) { productVariantSetDefault(productId: $productId, variantId: $variantId) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -177,7 +177,7 @@ export const productUpdateMutation = gql`
${productFragmentDetails} ${productFragmentDetails}
mutation ProductUpdate($id: ID!, $input: ProductInput!) { mutation ProductUpdate($id: ID!, $input: ProductInput!) {
productUpdate(id: $id, input: $input) { productUpdate(id: $id, input: $input) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
product { product {
@ -207,7 +207,7 @@ export const simpleProductUpdateMutation = gql`
$updateStocks: [StockInput!]! $updateStocks: [StockInput!]!
) { ) {
productUpdate(id: $id, input: $input) { productUpdate(id: $id, input: $input) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
product { product {
@ -215,7 +215,7 @@ export const simpleProductUpdateMutation = gql`
} }
} }
productVariantUpdate(id: $productVariantId, input: $productVariantInput) { productVariantUpdate(id: $productVariantId, input: $productVariantInput) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
productVariant { productVariant {
@ -226,7 +226,7 @@ export const simpleProductUpdateMutation = gql`
stocks: $addStocks stocks: $addStocks
variantId: $productVariantId variantId: $productVariantId
) { ) {
errors: bulkStockErrors { errors {
...BulkStockErrorFragment ...BulkStockErrorFragment
} }
productVariant { productVariant {
@ -237,7 +237,7 @@ export const simpleProductUpdateMutation = gql`
warehouseIds: $deleteStocks warehouseIds: $deleteStocks
variantId: $productVariantId variantId: $productVariantId
) { ) {
errors: stockErrors { errors {
...StockErrorFragment ...StockErrorFragment
} }
productVariant { productVariant {
@ -248,7 +248,7 @@ export const simpleProductUpdateMutation = gql`
stocks: $updateStocks stocks: $updateStocks
variantId: $productVariantId variantId: $productVariantId
) { ) {
errors: bulkStockErrors { errors {
...BulkStockErrorFragment ...BulkStockErrorFragment
} }
productVariant { productVariant {
@ -267,7 +267,7 @@ export const productCreateMutation = gql`
${productFragmentDetails} ${productFragmentDetails}
mutation ProductCreate($input: ProductCreateInput!) { mutation ProductCreate($input: ProductCreateInput!) {
productCreate(input: $input) { productCreate(input: $input) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
product { product {
@ -285,7 +285,7 @@ export const variantDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation VariantDelete($id: ID!) { mutation VariantDelete($id: ID!) {
productVariantDelete(id: $id) { productVariantDelete(id: $id) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
productVariant { productVariant {
@ -322,7 +322,7 @@ export const variantUpdateMutation = gql`
weight: $weight weight: $weight
} }
) { ) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
productVariant { productVariant {
@ -330,7 +330,7 @@ export const variantUpdateMutation = gql`
} }
} }
productVariantStocksUpdate(stocks: $stocks, variantId: $id) { productVariantStocksUpdate(stocks: $stocks, variantId: $id) {
errors: bulkStockErrors { errors {
...BulkStockErrorFragment ...BulkStockErrorFragment
} }
productVariant { productVariant {
@ -338,7 +338,7 @@ export const variantUpdateMutation = gql`
} }
} }
productVariantStocksCreate(stocks: $addStocks, variantId: $id) { productVariantStocksCreate(stocks: $addStocks, variantId: $id) {
errors: bulkStockErrors { errors {
...BulkStockErrorFragment ...BulkStockErrorFragment
} }
productVariant { productVariant {
@ -349,7 +349,7 @@ export const variantUpdateMutation = gql`
} }
} }
productVariantStocksDelete(warehouseIds: $removeStocks, variantId: $id) { productVariantStocksDelete(warehouseIds: $removeStocks, variantId: $id) {
errors: stockErrors { errors {
code code
field field
} }
@ -372,7 +372,7 @@ export const variantCreateMutation = gql`
${productErrorWithAttributesFragment} ${productErrorWithAttributesFragment}
mutation VariantCreate($input: ProductVariantCreateInput!) { mutation VariantCreate($input: ProductVariantCreateInput!) {
productVariantCreate(input: $input) { productVariantCreate(input: $input) {
errors: productErrors { errors {
...ProductErrorWithAttributesFragment ...ProductErrorWithAttributesFragment
} }
productVariant { productVariant {
@ -390,7 +390,7 @@ export const productMediaDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation ProductMediaDelete($id: ID!) { mutation ProductMediaDelete($id: ID!) {
productMediaDelete(id: $id) { productMediaDelete(id: $id) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -412,7 +412,7 @@ export const productMediaUpdateMutation = gql`
${productFragmentDetails} ${productFragmentDetails}
mutation ProductMediaUpdate($id: ID!, $alt: String!) { mutation ProductMediaUpdate($id: ID!, $alt: String!) {
productMediaUpdate(id: $id, input: { alt: $alt }) { productMediaUpdate(id: $id, input: { alt: $alt }) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -431,7 +431,7 @@ export const variantMediaAssignMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation VariantMediaAssign($variantId: ID!, $mediaId: ID!) { mutation VariantMediaAssign($variantId: ID!, $mediaId: ID!) {
variantMediaAssign(variantId: $variantId, mediaId: $mediaId) { variantMediaAssign(variantId: $variantId, mediaId: $mediaId) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
productVariant { productVariant {
@ -450,7 +450,7 @@ export const variantMediaUnassignMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation VariantMediaUnassign($variantId: ID!, $mediaId: ID!) { mutation VariantMediaUnassign($variantId: ID!, $mediaId: ID!) {
variantMediaUnassign(variantId: $variantId, mediaId: $mediaId) { variantMediaUnassign(variantId: $variantId, mediaId: $mediaId) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
productVariant { productVariant {
@ -468,7 +468,7 @@ export const productBulkDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation productBulkDelete($ids: [ID!]!) { mutation productBulkDelete($ids: [ID!]!) {
productBulkDelete(ids: $ids) { productBulkDelete(ids: $ids) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }
@ -486,7 +486,7 @@ export const ProductVariantBulkCreateMutation = gql`
$inputs: [ProductVariantBulkCreateInput]! $inputs: [ProductVariantBulkCreateInput]!
) { ) {
productVariantBulkCreate(product: $id, variants: $inputs) { productVariantBulkCreate(product: $id, variants: $inputs) {
errors: bulkProductErrors { errors {
...BulkProductErrorFragment ...BulkProductErrorFragment
} }
} }
@ -501,7 +501,7 @@ export const ProductVariantBulkDeleteMutation = gql`
${productErrorFragment} ${productErrorFragment}
mutation ProductVariantBulkDelete($ids: [ID!]!) { mutation ProductVariantBulkDelete($ids: [ID!]!) {
productVariantBulkDelete(ids: $ids) { productVariantBulkDelete(ids: $ids) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
} }
@ -520,7 +520,7 @@ export const productExportMutation = gql`
exportFile { exportFile {
...ExportFileFragment ...ExportFileFragment
} }
errors: exportErrors { errors {
...ExportErrorFragment ...ExportErrorFragment
} }
} }
@ -542,7 +542,7 @@ export const ProductChannelListingUpdateMutation = gql`
product { product {
...Product ...Product
} }
errors: productChannelListingErrors { errors {
...ProductChannelListingErrorFragment ...ProductChannelListingErrorFragment
} }
} }
@ -554,7 +554,7 @@ const productVariantReorder = gql`
${productFragmentDetails} ${productFragmentDetails}
mutation ProductVariantReorder($move: ReorderInput!, $productId: ID!) { mutation ProductVariantReorder($move: ReorderInput!, $productId: ID!) {
productVariantReorder(moves: [$move], productId: $productId) { productVariantReorder(moves: [$move], productId: $productId) {
errors: productErrors { errors {
...ProductErrorFragment ...ProductErrorFragment
} }
product { product {
@ -583,7 +583,7 @@ export const ProductVariantChannelListingUpdateMutation = gql`
variant { variant {
...ProductVariant ...ProductVariant
} }
errors: productChannelListingErrors { errors {
...ProductChannelListingErrorFragment ...ProductChannelListingErrorFragment
} }
} }

22
src/shipping/mutations.ts
View file

@ -63,7 +63,7 @@ const deleteShippingZone = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation DeleteShippingZone($id: ID!) { mutation DeleteShippingZone($id: ID!) {
shippingZoneDelete(id: $id) { shippingZoneDelete(id: $id) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
} }
@ -78,7 +78,7 @@ const bulkDeleteShippingZone = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation BulkDeleteShippingZone($ids: [ID]!) { mutation BulkDeleteShippingZone($ids: [ID]!) {
shippingZoneBulkDelete(ids: $ids) { shippingZoneBulkDelete(ids: $ids) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
} }
@ -112,7 +112,7 @@ const createShippingZone = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation CreateShippingZone($input: ShippingZoneCreateInput!) { mutation CreateShippingZone($input: ShippingZoneCreateInput!) {
shippingZoneCreate(input: $input) { shippingZoneCreate(input: $input) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
shippingZone { shippingZone {
@ -136,7 +136,7 @@ const updateShippingZone = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation UpdateShippingZone($id: ID!, $input: ShippingZoneUpdateInput!) { mutation UpdateShippingZone($id: ID!, $input: ShippingZoneUpdateInput!) {
shippingZoneUpdate(id: $id, input: $input) { shippingZoneUpdate(id: $id, input: $input) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
shippingZone { shippingZone {
@ -160,7 +160,7 @@ const updateShippingRate = gql`
${shippingMethodFragment} ${shippingMethodFragment}
mutation UpdateShippingRate($id: ID!, $input: ShippingPriceInput!) { mutation UpdateShippingRate($id: ID!, $input: ShippingPriceInput!) {
shippingPriceUpdate(id: $id, input: $input) { shippingPriceUpdate(id: $id, input: $input) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
shippingMethod { shippingMethod {
@ -180,7 +180,7 @@ const createShippingRate = gql`
${shippingZoneDetailsFragment} ${shippingZoneDetailsFragment}
mutation CreateShippingRate($input: ShippingPriceInput!) { mutation CreateShippingRate($input: ShippingPriceInput!) {
shippingPriceCreate(input: $input) { shippingPriceCreate(input: $input) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
shippingZone { shippingZone {
@ -202,7 +202,7 @@ const deleteShippingRate = gql`
${shippingZoneDetailsFragment} ${shippingZoneDetailsFragment}
mutation DeleteShippingRate($id: ID!) { mutation DeleteShippingRate($id: ID!) {
shippingPriceDelete(id: $id) { shippingPriceDelete(id: $id) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
shippingZone { shippingZone {
@ -220,7 +220,7 @@ const bulkDeleteShippingRate = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation BulkDeleteShippingRate($ids: [ID]!) { mutation BulkDeleteShippingRate($ids: [ID]!) {
shippingPriceBulkDelete(ids: $ids) { shippingPriceBulkDelete(ids: $ids) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
} }
@ -242,7 +242,7 @@ export const shippingMethodChannelListingUpdate = gql`
shippingMethod { shippingMethod {
...ShippingMethodFragment ...ShippingMethodFragment
} }
errors: shippingErrors { errors {
...ShippingChannelsErrorFragment ...ShippingChannelsErrorFragment
} }
} }
@ -261,7 +261,7 @@ export const shippingPriceExcludeProducts = gql`
$input: ShippingPriceExcludeProductsInput! $input: ShippingPriceExcludeProductsInput!
) { ) {
shippingPriceExcludeProducts(id: $id, input: $input) { shippingPriceExcludeProducts(id: $id, input: $input) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
} }
@ -277,7 +277,7 @@ export const shippingPriceRemoveProductsFromExclude = gql`
${shippingErrorFragment} ${shippingErrorFragment}
mutation ShippingPriceRemoveProductFromExclude($id: ID!, $products: [ID]!) { mutation ShippingPriceRemoveProductFromExclude($id: ID!, $products: [ID]!) {
shippingPriceRemoveProductFromExclude(id: $id, products: $products) { shippingPriceRemoveProductFromExclude(id: $id, products: $products) {
errors: shippingErrors { errors {
...ShippingErrorFragment ...ShippingErrorFragment
} }
} }

2
src/shipping/types/UpdateDefaultWeightUnit.ts
View file

@ -10,7 +10,7 @@ import { WeightUnitsEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
export interface UpdateDefaultWeightUnit_shopSettingsUpdate_errors { export interface UpdateDefaultWeightUnit_shopSettingsUpdate_errors {
__typename: "Error"; __typename: "ShopError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

6
src/siteSettings/mutations.ts
View file

@ -19,7 +19,7 @@ const shopSettingsUpdate = gql`
$addressInput: AddressInput $addressInput: AddressInput
) { ) {
shopSettingsUpdate(input: $shopSettingsInput) { shopSettingsUpdate(input: $shopSettingsInput) {
errors: shopErrors { errors {
...ShopErrorFragment ...ShopErrorFragment
} }
shop { shop {
@ -27,7 +27,7 @@ const shopSettingsUpdate = gql`
} }
} }
shopDomainUpdate(input: $shopDomainInput) { shopDomainUpdate(input: $shopDomainInput) {
errors: shopErrors { errors {
...ShopErrorFragment ...ShopErrorFragment
} }
shop { shop {
@ -38,7 +38,7 @@ const shopSettingsUpdate = gql`
} }
} }
shopAddressUpdate(input: $addressInput) { shopAddressUpdate(input: $addressInput) {
errors: shopErrors { errors {
...ShopErrorFragment ...ShopErrorFragment
} }
shop { shop {

12
src/staff/mutations.ts
View file

@ -34,7 +34,7 @@ const staffMemberAddMutation = gql`
${staffMemberDetailsFragment} ${staffMemberDetailsFragment}
mutation StaffMemberAdd($input: StaffCreateInput!) { mutation StaffMemberAdd($input: StaffCreateInput!) {
staffCreate(input: $input) { staffCreate(input: $input) {
errors: staffErrors { errors {
...StaffErrorFragment ...StaffErrorFragment
} }
user { user {
@ -53,7 +53,7 @@ const staffMemberUpdateMutation = gql`
${staffMemberDetailsFragment} ${staffMemberDetailsFragment}
mutation StaffMemberUpdate($id: ID!, $input: StaffUpdateInput!) { mutation StaffMemberUpdate($id: ID!, $input: StaffUpdateInput!) {
staffUpdate(id: $id, input: $input) { staffUpdate(id: $id, input: $input) {
errors: staffErrors { errors {
...StaffErrorFragment ...StaffErrorFragment
} }
user { user {
@ -71,7 +71,7 @@ const staffMemberDeleteMutation = gql`
${staffErrorFragment} ${staffErrorFragment}
mutation StaffMemberDelete($id: ID!) { mutation StaffMemberDelete($id: ID!) {
staffDelete(id: $id) { staffDelete(id: $id) {
errors: staffErrors { errors {
...StaffErrorFragment ...StaffErrorFragment
} }
} }
@ -86,7 +86,7 @@ const staffAvatarUpdateMutation = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation StaffAvatarUpdate($image: Upload!) { mutation StaffAvatarUpdate($image: Upload!) {
userAvatarUpdate(image: $image) { userAvatarUpdate(image: $image) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -107,7 +107,7 @@ const staffAvatarDeleteMutation = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation StaffAvatarDelete { mutation StaffAvatarDelete {
userAvatarDelete { userAvatarDelete {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
user { user {
@ -128,7 +128,7 @@ const changeStaffPassword = gql`
${accountErrorFragment} ${accountErrorFragment}
mutation ChangeStaffPassword($newPassword: String!, $oldPassword: String!) { mutation ChangeStaffPassword($newPassword: String!, $oldPassword: String!) {
passwordChange(newPassword: $newPassword, oldPassword: $oldPassword) { passwordChange(newPassword: $newPassword, oldPassword: $oldPassword) {
errors: accountErrors { errors {
...AccountErrorFragment ...AccountErrorFragment
} }
} }

501
src/storybook/__snapshots__/Stories.test.ts.snap
View file

File diff suppressed because it is too large Load diff

2
src/taxes/types/FetchTaxes.ts
View file

@ -8,7 +8,7 @@
// ==================================================== // ====================================================
export interface FetchTaxes_shopFetchTaxRates_errors { export interface FetchTaxes_shopFetchTaxRates_errors {
__typename: "Error"; __typename: "ShopError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/taxes/types/UpdateTaxSettings.ts
View file

@ -10,7 +10,7 @@ import { ShopSettingsInput } from "./../../types/globalTypes";
// ==================================================== // ====================================================
export interface UpdateTaxSettings_shopSettingsUpdate_errors { export interface UpdateTaxSettings_shopSettingsUpdate_errors {
__typename: "Error"; __typename: "ShopError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateAttributeTranslations.ts
View file

@ -10,7 +10,7 @@ import { NameTranslationInput, LanguageCodeEnum } from "./../../types/globalType
// ==================================================== // ====================================================
export interface UpdateAttributeTranslations_attributeTranslate_errors { export interface UpdateAttributeTranslations_attributeTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateAttributeValueTranslations.ts
View file

@ -10,7 +10,7 @@ import { AttributeValueTranslationInput, LanguageCodeEnum } from "./../../types/
// ==================================================== // ====================================================
export interface UpdateAttributeValueTranslations_attributeValueTranslate_errors { export interface UpdateAttributeValueTranslations_attributeValueTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateCategoryTranslations.ts
View file

@ -10,7 +10,7 @@ import { TranslationInput, LanguageCodeEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
export interface UpdateCategoryTranslations_categoryTranslate_errors { export interface UpdateCategoryTranslations_categoryTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateCollectionTranslations.ts
View file

@ -10,7 +10,7 @@ import { TranslationInput, LanguageCodeEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
export interface UpdateCollectionTranslations_collectionTranslate_errors { export interface UpdateCollectionTranslations_collectionTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdatePageTranslations.ts
View file

@ -10,7 +10,7 @@ import { PageTranslationInput, LanguageCodeEnum } from "./../../types/globalType
// ==================================================== // ====================================================
export interface UpdatePageTranslations_pageTranslate_errors { export interface UpdatePageTranslations_pageTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateProductTranslations.ts
View file

@ -10,7 +10,7 @@ import { TranslationInput, LanguageCodeEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
export interface UpdateProductTranslations_productTranslate_errors { export interface UpdateProductTranslations_productTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateSaleTranslations.ts
View file

@ -10,7 +10,7 @@ import { NameTranslationInput, LanguageCodeEnum } from "./../../types/globalType
// ==================================================== // ====================================================
export interface UpdateSaleTranslations_saleTranslate_errors { export interface UpdateSaleTranslations_saleTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateShippingMethodTranslations.ts
View file

@ -10,7 +10,7 @@ import { ShippingPriceTranslationInput, LanguageCodeEnum } from "./../../types/g
// ==================================================== // ====================================================
export interface UpdateShippingMethodTranslations_shippingPriceTranslate_errors { export interface UpdateShippingMethodTranslations_shippingPriceTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

2
src/translations/types/UpdateVoucherTranslations.ts
View file

@ -10,7 +10,7 @@ import { NameTranslationInput, LanguageCodeEnum } from "./../../types/globalType
// ==================================================== // ====================================================
export interface UpdateVoucherTranslations_voucherTranslate_errors { export interface UpdateVoucherTranslations_voucherTranslate_errors {
__typename: "Error"; __typename: "TranslationError";
field: string | null; field: string | null;
message: string | null; message: string | null;
} }

3
src/types/globalTypes.ts
View file

@ -1049,7 +1049,6 @@ export interface AppFilterInput {
export interface AppInput { export interface AppInput {
name?: string | null; name?: string | null;
isActive?: boolean | null;
permissions?: (PermissionEnum | null)[] | null; permissions?: (PermissionEnum | null)[] | null;
} }
@ -1104,7 +1103,6 @@ export interface AttributeFilterInput {
export interface AttributeInput { export interface AttributeInput {
slug: string; slug: string;
value?: string | null;
values?: (string | null)[] | null; values?: (string | null)[] | null;
} }
@ -1623,7 +1621,6 @@ export interface ProductFilterInput {
hasCategory?: boolean | null; hasCategory?: boolean | null;
attributes?: (AttributeInput | null)[] | null; attributes?: (AttributeInput | null)[] | null;
stockAvailability?: StockAvailability | null; stockAvailability?: StockAvailability | null;
productType?: string | null;
stocks?: ProductStockFilterInput | null; stocks?: ProductStockFilterInput | null;
search?: string | null; search?: string | null;
metadata?: (MetadataInput | null)[] | null; metadata?: (MetadataInput | null)[] | null;

8
src/utils/metadata/updateMetadata.ts
View file

@ -21,12 +21,12 @@ const updateMetadata = gql`
$keysToDelete: [String!]! $keysToDelete: [String!]!
) { ) {
updateMetadata(id: $id, input: $input) { updateMetadata(id: $id, input: $input) {
errors: metadataErrors { errors {
...MetadataErrorFragment ...MetadataErrorFragment
} }
} }
deleteMetadata(id: $id, keys: $keysToDelete) { deleteMetadata(id: $id, keys: $keysToDelete) {
errors: metadataErrors { errors {
...MetadataErrorFragment ...MetadataErrorFragment
} }
item { item {
@ -52,12 +52,12 @@ const updatePrivateMetadata = gql`
$keysToDelete: [String!]! $keysToDelete: [String!]!
) { ) {
updatePrivateMetadata(id: $id, input: $input) { updatePrivateMetadata(id: $id, input: $input) {
errors: metadataErrors { errors {
...MetadataErrorFragment ...MetadataErrorFragment
} }
} }
deletePrivateMetadata(id: $id, keys: $keysToDelete) { deletePrivateMetadata(id: $id, keys: $keysToDelete) {
errors: metadataErrors { errors {
...MetadataErrorFragment ...MetadataErrorFragment
} }
item { item {

6
src/warehouses/mutations.ts
View file

@ -20,7 +20,7 @@ const deleteWarehouse = gql`
${warehouseErrorFragment} ${warehouseErrorFragment}
mutation WarehouseDelete($id: ID!) { mutation WarehouseDelete($id: ID!) {
deleteWarehouse(id: $id) { deleteWarehouse(id: $id) {
errors: warehouseErrors { errors {
...WarehouseErrorFragment ...WarehouseErrorFragment
} }
} }
@ -36,7 +36,7 @@ const createWarehouse = gql`
${warehouseErrorFragment} ${warehouseErrorFragment}
mutation WarehouseCreate($input: WarehouseCreateInput!) { mutation WarehouseCreate($input: WarehouseCreateInput!) {
createWarehouse(input: $input) { createWarehouse(input: $input) {
errors: warehouseErrors { errors {
...WarehouseErrorFragment ...WarehouseErrorFragment
} }
warehouse { warehouse {
@ -55,7 +55,7 @@ const updateWarehouse = gql`
${warehouseErrorFragment} ${warehouseErrorFragment}
mutation WarehouseUpdate($id: ID!, $input: WarehouseUpdateInput!) { mutation WarehouseUpdate($id: ID!, $input: WarehouseUpdateInput!) {
updateWarehouse(id: $id, input: $input) { updateWarehouse(id: $id, input: $input) {
errors: warehouseErrors { errors {
...WarehouseErrorFragment ...WarehouseErrorFragment
} }
warehouse { warehouse {

Some files were not shown because too many files have changed in this diff Show more