-
{_('Payment Method')}
+
+
{_('Payment Method')}
+
{paymentMethodName}
-
{_('Billing Address')}
+
+
{_('Billing Address')}
+
diff --git a/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss b/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
index 35da7faa7..53b422db5 100644
--- a/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
+++ b/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
@@ -62,7 +62,7 @@
box-sizing: border-box;
margin-bottom: 1rem;
padding: 8px;
- border-radius: 1px;
+ border-radius: 5px;
display: -ms-flexbox;
display: flex;
-ms-flex-pack: justify;
@@ -85,7 +85,8 @@
background: #3498db;
}
.Toastify__toast--success {
- background: #07bc0c;
+ background: var(--success);
+ color: #fff
}
.Toastify__toast--warning {
background: #f1c40f;
diff --git a/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss b/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
index 864e055ba..4c23225f7 100644
--- a/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
+++ b/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
@@ -63,7 +63,7 @@
box-sizing: border-box;
margin-bottom: 1rem;
padding: 8px;
- border-radius: 1px;
+ border-radius: 5px;
display: -ms-flexbox;
display: flex;
-ms-flex-pack: justify;
@@ -86,7 +86,8 @@
background: #3498db;
}
.Toastify__toast--success {
- background: #07bc0c;
+ background: var(--success);
+ color: #fff
}
.Toastify__toast--warning {
background: #f1c40f;
diff --git a/packages/evershop/src/modules/oms/pages/admin/orderEdit/Customer.jsx b/packages/evershop/src/modules/oms/pages/admin/orderEdit/Customer.jsx
index 286749983..f0fc12b57 100644
--- a/packages/evershop/src/modules/oms/pages/admin/orderEdit/Customer.jsx
+++ b/packages/evershop/src/modules/oms/pages/admin/orderEdit/Customer.jsx
@@ -1,8 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Card } from '@components/admin/cms/Card';
+import { AddressSummary } from '@components/common/customer/address/AddressSummary';
-export default function OrderInfo({
+export default function Customer({
order: {
shippingAddress,
billingAddress,
@@ -35,44 +36,16 @@ export default function OrderInfo({
-
- {shippingAddress.fullName}
-
-
- {shippingAddress.address1}
-
-
- {`${shippingAddress.postcode}, ${shippingAddress.city}`}
-
-
- {`${shippingAddress.province.name}, ${shippingAddress.country.name}`}
-
-
- {shippingAddress.telephone}
-
+
-
- {billingAddress.fullName}
-
-
- {billingAddress.address1}
-
-
- {`${billingAddress.postcode}, ${billingAddress.city}`}
-
-
- {`${billingAddress.province.name}, ${billingAddress.country.name}`}
-
-
- {billingAddress.telephone}
-
+
);
}
-OrderInfo.propTypes = {
+Customer.propTypes = {
order: PropTypes.shape({
customerFullName: PropTypes.string.isRequired,
customerEmail: PropTypes.string.isRequired,
@@ -124,6 +97,8 @@ export const query = `
shippingAddress {
fullName
city
+ address1
+ address2
postcode
telephone
province {
@@ -138,6 +113,8 @@ export const query = `
billingAddress {
fullName
city
+ address1
+ address2
postcode
telephone
province {