diff --git a/client/extensions/woocommerce/app/order/index.js b/client/extensions/woocommerce/app/order/index.js index a9e3b66e3ff225..a52c1cc67b9b91 100644 --- a/client/extensions/woocommerce/app/order/index.js +++ b/client/extensions/woocommerce/app/order/index.js @@ -16,7 +16,7 @@ import ActionHeader from 'woocommerce/components/action-header'; import Button from 'components/button'; import { clearOrderEdits, editOrder } from 'woocommerce/state/ui/orders/actions'; import { fetchNotes } from 'woocommerce/state/sites/orders/notes/actions'; -import { fetchOrder } from 'woocommerce/state/sites/orders/actions'; +import { fetchOrder, updateOrder } from 'woocommerce/state/sites/orders/actions'; import { getSelectedSiteWithFallback } from 'woocommerce/state/sites/selectors'; import { getLink } from 'woocommerce/lib/nav-utils'; import { @@ -30,7 +30,7 @@ import Main from 'components/main'; import OrderCustomer from './order-customer'; import OrderDetails from './order-details'; import OrderActivityLog from './order-activity-log'; -import { updateOrder } from 'woocommerce/state/sites/orders/actions'; +import { ProtectFormGuard } from 'lib/protect-form'; class Order extends Component { componentDidMount() { @@ -136,6 +136,7 @@ class Order extends Component {
+ { isEditing && } diff --git a/client/extensions/woocommerce/app/order/order-customer/index.js b/client/extensions/woocommerce/app/order/order-customer/index.js index 79f30b79ff77f7..18da3189db290c 100644 --- a/client/extensions/woocommerce/app/order/order-customer/index.js +++ b/client/extensions/woocommerce/app/order/order-customer/index.js @@ -17,6 +17,7 @@ import Card from 'components/card'; import CustomerAddressDialog from './dialog'; import { editOrder } from 'woocommerce/state/ui/orders/actions'; import { isCurrentlyEditingOrder, getOrderWithEdits } from 'woocommerce/state/ui/orders/selectors'; +import { isOrderFinished } from 'woocommerce/lib/order-status'; import getAddressViewFormat from 'woocommerce/lib/get-address-view-format'; import { getOrder } from 'woocommerce/state/sites/orders/selectors'; import { getSelectedSiteId } from 'state/ui/selectors'; @@ -85,6 +86,7 @@ class OrderCustomerInfo extends Component { } const { billing, shipping } = order; + const isEditable = isEditing && ! isOrderFinished( order.status ); return (
@@ -94,7 +96,7 @@ class OrderCustomerInfo extends Component {

{ translate( 'Billing Details' ) } - { isEditing ? ( + { isEditable ? (