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

Fix rebase errors

Browse source
This commit is contained in:
dominik-zeglen 2020-07-16 12:57:50 +02:00
parent c09fc4ce00
commit c6f36de80d
2 changed files with 17 additions and 541 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
View file

@ -4,14 +4,12 @@ import CardContent from "@material-ui/core/CardContent";
import { makeStyles } from "@material-ui/core/styles";
import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableHead from "@material-ui/core/TableHead";
import TableRow from "@material-ui/core/TableRow";
import Typography from "@material-ui/core/Typography";
import CardTitle from "@saleor/components/CardTitle";
import Date from "@saleor/components/Date";
import ResponsiveTable from "@saleor/components/ResponsiveTable";
import Skeleton from "@saleor/components/Skeleton";
import TableCellHeader from "@saleor/components/TableCellHeader";
import { InvoiceFragment } from "@saleor/fragments/types/InvoiceFragment";
import { buttonMessages } from "@saleor/intl";
import React from "react";
@ -82,27 +80,9 @@ const OrderInvoiceList: React.FC<OrderInvoiceListProps> = props => {
</Typography>
) : (
<ResponsiveTable>
<TableHead>
<TableRow>
<TableCellHeader className={classes.colNumber}>
<FormattedMessage
defaultMessage="Invoice no"
description="invoice number"
/>
</TableCellHeader>
{onInvoiceSend && (
<TableCellHeader className={classes.colAction}>
<FormattedMessage
defaultMessage="Action"
description="action for invoice"
/>
</TableCellHeader>
)}
</TableRow>
</TableHead>
<TableBody>
{generatedInvoices.map(invoice => (
<TableRow key={invoice.id}>
<TableRow key={invoice.id} hover={!!invoice}>
<TableCell
className={
onInvoiceClick

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

@ -9497,47 +9497,11 @@ exports[`Storyshots Orders / OrderInvoiceList with invoices 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -9566,7 +9530,7 @@ exports[`Storyshots Orders / OrderInvoiceList with invoices 1`] = `
</td>
</tr>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -9595,7 +9559,7 @@ exports[`Storyshots Orders / OrderInvoiceList with invoices 1`] = `
</td>
</tr>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -67503,47 +67467,11 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -68765,47 +68693,11 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -70027,47 +69919,11 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -71920,47 +71776,11 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -73182,47 +73002,11 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -74444,47 +74228,11 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -75706,47 +75454,11 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -76968,47 +76680,11 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -78230,47 +77906,11 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -79492,47 +79132,11 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -80754,47 +80358,11 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -82016,47 +81584,11 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"
@ -83278,47 +82810,11 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
<table
class="MuiTable-root-id"
>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colNumber-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Invoice no
</div>
</div>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableCellHeader-root-id OrderInvoiceList-colAction-id"
scope="col"
>
<div
class="TableCellHeader-labelContainer-id"
>
<div
class="TableCellHeader-label-id"
>
Action
</div>
</div>
</th>
</tr>
</thead>
<tbody
class="MuiTableBody-root-id"
>
<tr
class="MuiTableRow-root-id"
class="MuiTableRow-root-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id OrderInvoiceList-colNumberClickable-id"