From 5e9e11a05e191de7c80858d615c70eec6d64ca59 Mon Sep 17 00:00:00 2001
From: The Nguyen <6950941+treoden@users.noreply.github.com>
Date: Sat, 7 Oct 2023 20:56:38 +0700
Subject: [PATCH 1/2] Change toastify success background

---
 .../src/modules/cms/pages/admin/all/Notification.scss        | 5 +++--
 .../src/modules/cms/pages/frontStore/all/Notification.scss   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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;

From c4b766a885e5a18c529b2e7b49e86cb3e724901d Mon Sep 17 00:00:00 2001
From: The Nguyen <6950941+treoden@users.noreply.github.com>
Date: Sat, 7 Oct 2023 20:58:19 +0700
Subject: [PATCH 2/2] Address is displayed incorrectly in orders view in admin
 panel #347

---
 .../customer/address/AddressSummary.jsx       |  2 +-
 .../checkoutSuccess/CustomerInfo.jsx          | 30 +++++++++-----
 .../oms/pages/admin/orderEdit/Customer.jsx    | 41 ++++---------------
 3 files changed, 29 insertions(+), 44 deletions(-)
 rename packages/evershop/src/components/{frontStore => common}/customer/address/AddressSummary.jsx (98%)

diff --git a/packages/evershop/src/components/frontStore/customer/address/AddressSummary.jsx b/packages/evershop/src/components/common/customer/address/AddressSummary.jsx
similarity index 98%
rename from packages/evershop/src/components/frontStore/customer/address/AddressSummary.jsx
rename to packages/evershop/src/components/common/customer/address/AddressSummary.jsx
index 739ceea23..012ce311d 100644
--- a/packages/evershop/src/components/frontStore/customer/address/AddressSummary.jsx
+++ b/packages/evershop/src/components/common/customer/address/AddressSummary.jsx
@@ -8,7 +8,7 @@ export function AddressSummary({ address }) {
   return (
     <Area
       id="addressSummary"
-      className="address-summary"
+      className="address__summary"
       coreComponents={[
         {
           component: {
diff --git a/packages/evershop/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx b/packages/evershop/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx
index 3112f0800..82c3846dd 100644
--- a/packages/evershop/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx
+++ b/packages/evershop/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Button from '@components/common/form/Button';
-import { AddressSummary } from '@components/frontStore/customer/address/AddressSummary';
+import { AddressSummary } from '@components/common/customer/address/AddressSummary';
 import { _ } from '@evershop/evershop/src/lib/locale/translate';
 
 export default function CustomerInfo({
@@ -16,7 +16,7 @@ export default function CustomerInfo({
 }) {
   return (
     <div className="checkout-success-customer-info">
-      <h3 className="thank-you flex justify-start space-x-1">
+      <h3 className="thank-you flex justify-start space-x-2">
         <div className="check flex justify-center self-center text-interactive">
           <svg
             style={{ width: '3rem', height: '3rem' }}
@@ -47,29 +47,37 @@ export default function CustomerInfo({
       </h3>
 
       <div className="customer-info mt-3 mb-2">
-        <div className="heading font-bold mb-2">
-          {_('Customer information')}
-        </div>
         <div className="grid grid-cols-2 gap-3">
-          <div>
+          <div className="grid grid-cols-1 gap-3">
             <div className="mb-2">
-              <div className="mb-075">{_('Contact information')}</div>
+              <div className="mb-075">
+                <h3>{_('Contact information')}</h3>
+              </div>
+              <div className="text-textSubdued">
+                {customerFullName || billingAddress?.fullName}
+              </div>
               <div className="text-textSubdued">{customerEmail}</div>
             </div>
             <div>
-              <div className="mb-075">{_('Shipping Address')}</div>
+              <div className="mb-075">
+                <h3>{_('Shipping Address')}</h3>
+              </div>
               <div className="text-textSubdued">
                 <AddressSummary address={shippingAddress} />
               </div>
             </div>
           </div>
-          <div>
+          <div className="grid grid-cols-1 gap-3">
             <div className="mb-2">
-              <div className="mb-075">{_('Payment Method')}</div>
+              <div className="mb-075">
+                <h3>{_('Payment Method')}</h3>
+              </div>
               <div className="text-textSubdued">{paymentMethodName}</div>
             </div>
             <div>
-              <div className="mb-075">{_('Billing Address')}</div>
+              <div className="mb-075">
+                <h3>{_('Billing Address')}</h3>
+              </div>
               <div className="text-textSubdued">
                 <AddressSummary address={billingAddress} />
               </div>
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({
         </div>
       </Card.Session>
       <Card.Session title="Shipping Address">
-        <div>
-          <span>{shippingAddress.fullName}</span>
-        </div>
-        <div>
-          <span>{shippingAddress.address1}</span>
-        </div>
-        <div>
-          <span>{`${shippingAddress.postcode}, ${shippingAddress.city}`}</span>
-        </div>
-        <div>
-          <span>{`${shippingAddress.province.name}, ${shippingAddress.country.name}`}</span>
-        </div>
-        <div>
-          <span>{shippingAddress.telephone}</span>
-        </div>
+        <AddressSummary address={shippingAddress} />
       </Card.Session>
       <Card.Session title="Billing address">
-        <div>
-          <span>{billingAddress.fullName}</span>
-        </div>
-        <div>
-          <span>{billingAddress.address1}</span>
-        </div>
-        <div>
-          <span>{`${billingAddress.postcode}, ${billingAddress.city}`}</span>
-        </div>
-        <div>
-          <span>{`${billingAddress.province.name}, ${billingAddress.country.name}`}</span>
-        </div>
-        <div>
-          <span>{billingAddress.telephone}</span>
-        </div>
+        <AddressSummary address={billingAddress} />
       </Card.Session>
     </Card>
   );
 }
 
-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 {