From 1ace0f6cc38b4234755f680ba3ea08cda655652a Mon Sep 17 00:00:00 2001 From: monika8848 Date: Fri, 29 Sep 2023 16:33:05 +0530 Subject: [PATCH 1/3] UI fixes in all pages --- cards/MyOrderCard.tsx | 47 ++++++--- components/CartListing.tsx | 21 ++-- components/Catalog/CatalogListCard.tsx | 13 ++- components/Catalog/CreateCatalog.tsx | 9 +- .../CheckoutPageMaster.tsx | 8 +- .../HandleOrderSection.tsx | 8 +- components/DealerLedger/DealerAccounting.tsx | 4 +- components/DealerLedger/DealerLedger.tsx | 16 ++-- components/DisplayTags/DisplayTagMaster.tsx | 34 +++---- .../HomeTopCategoriesBanner.tsx | 6 +- components/OrderDetails/OrderDetail.tsx | 95 ++++++++++--------- components/OrderSummary/OrderSummary.tsx | 63 ++++++------ components/ProfilePage/ProfileMaster.tsx | 4 +- components/QuickOrder/QuickOrderMaster.tsx | 20 ++-- components/Wishlist/WishlistMaster.tsx | 13 ++- components/myOrder/MyOrderMaster.tsx | 12 +-- components/myOrder/components/PlaceOrder.tsx | 2 +- styles/components/_catalog.scss | 2 +- styles/components/_checkoutCustom.scss | 6 +- styles/globals.scss | 1 + styles/pages/CssLayout-rtl.scss | 10 +- styles/pages/_allpage-wrapper.scss | 80 +++++++++++++++- styles/pages/_categories.scss | 12 +++ 23 files changed, 304 insertions(+), 182 deletions(-) diff --git a/cards/MyOrderCard.tsx b/cards/MyOrderCard.tsx index a4b935f..8d04d1c 100644 --- a/cards/MyOrderCard.tsx +++ b/cards/MyOrderCard.tsx @@ -19,8 +19,8 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => { return ( <>
-
-
+
+

{selectedMultiLangData?.order_placed} @@ -92,8 +92,25 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {

))}
-
-

+

+

+ {selectedMultiLangData?.orders} # {data?.name} +

+
+ + + {/*
+

{selectedMultiLangData?.orders} # {data?.name}

@@ -107,7 +124,7 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
-
+
*/}
{data?.order_details?.map((detail: any) => ( @@ -115,7 +132,7 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => { className="cart_item cart_item-myorder-m card-body order_cartdetails" key={detail?.item_name} > -
+
{selectedMultiLangData?.status}
@@ -126,13 +143,13 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
-
+
product-img
@@ -261,13 +278,13 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => { )} {isDealer ? ( -
-
) : ( <> -
-
-