Skip to content

Commit

Permalink
Merge pull request #91 from monika8848/monika-dev
Browse files Browse the repository at this point in the history 
UI changes in thank you page, quick order, my account, dealer ledger, my orders page
  • Loading branch information
@Shadab-khan207
Shadab-khan207 authored Sep 21, 2023
2 parents 64b70b2 + 6dbb47e commit 2e877a1
Show file tree
Hide file tree
Showing 20 changed files with 279 additions and 197 deletions.
40 changes: 20 additions & 20 deletions cards/MyOrderCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
const currency_state_from_redux: any = useSelector(currency_selector_state);
return (
<>
<div key={data.id}>
<div className="card-header pb-1 " >
<div key={data.id} >
<div className="card-header myorder-card-header " >
<div className="row pb-0" >
<div className=" mb-sm-0 col-md-2 col-6 order-div">
<p className="text-uppercase gray mb-0 myorder_p">
Expand All @@ -31,21 +31,21 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</p>
</div>
<div className=" col-md-2 col-6 order-div">
<p className="text-uppercase gray mb-0 myorder_p">
<p className="text-uppercase gray mb-0 myorder_p" >
{" "}
{selectedMultiLangData?.total_price}
</p>
{data?.total === 0 ? (
<p className="border price_request">
{selectedMultiLangData?.price_on_request}
<p className="border price_request" >
{selectedMultiLangData?.price_on_request}
</p>
) : (
<p className="gray mb-0 myorder_p price_font_family">
{data?.currency_symbol} {data?.total}
</p>
)}
</div>
<div className="col-md-2 col-4 order-cards">
<div className="col-md-2 col-4 order-cards" >
<p className="text-uppercase gray mb-0 myorder_p">
{selectedMultiLangData?.ship_to}
</p>
Expand Down Expand Up @@ -111,10 +111,10 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</div>
{data?.order_details?.map((detail: any) => (
<div
className="cart_item card-body order_cartdetails"
key={detail?.item_name}
className="cart_item cart_item-myorder-m card-body order_cartdetails"
key={detail?.item_name}
>
<div className="d-flex mb-0">
<div className="d-flex mb-0 pb-0" >
<div className="flex-fill">
<h6 className="green text-capitalize bold mb-0 mt-2 order-ptag ">
{selectedMultiLangData?.status} : {data?.payment_status}
Expand All @@ -123,9 +123,9 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
<div className="justify-content-end d-none d-sm-block align-items-end"></div>
</div>

<div className="d-flex align-items-center row">
<div className="mb-3 mb-sm-0 col-lg-2 col-md-2 col-4 mt-2">
<div className="product-img cart-image mt-2">
<div className="d-flex align-items-center row" >
<div className="mb-0 mb-sm-0 col-lg-2 col-md-2 col-4 mt-2">
<div className="product-img cart-image mt-2 mb-4">
<img
src={`${CONSTANTS.API_BASE_URL}/${detail?.img !== null ? detail?.img : detail?.brand_img
}`}
Expand All @@ -134,15 +134,15 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
/>
</div>
</div>
<div className="product_item_details col-lg-6 col-md-7 col-8">
<div className="product_item_details col-lg-6 col-md-7 col-8" >
<div className="d-flex orderDetail-card">
<div className="flex-fill">
<div className="flex-fill" >
<Link href="#" legacyBehavior>
<a className="product_item_name bold">
{detail?.item_name}
</a>
</Link>
<table width="100%" className="mt-2 table table-borderless">
<table width="100%" className="mt-1 table table-borderless" >
<tbody>
<tr className="item_options myorder_tr">
<td className="px-0 py-0 pb-0 myorder_td">
Expand All @@ -162,8 +162,8 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {

<tr className="item_options myorder_tr">
<td className="px-0 py-0 pb-0 myorder_td">
<p className="text-capitalize black mb-0 myorder_p">
{selectedMultiLangData?.price}
<p className="text-capitalize black mb-0 myorder_p" >
{selectedMultiLangData?.price}
</p>
</td>
<td
Expand Down Expand Up @@ -290,10 +290,10 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</>
)}
</div>
<div className="row">
<div className="mt-3 col-sm-12"></div>
<div className="row" >
<div className="mt-0 col-sm-12" ></div>
</div>
<hr className="d-block hr_orderdetail" />
<hr className="d-block hr_orderdetail" />
</div>
))}
</div>
Expand Down
8 changes: 4 additions & 4 deletions components/Auth/Loginpage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const Loginpage = () => {
<Form.Group controlId="formName">
<div className="row mt-3">
<div className="col-md-4">
<Form.Label className="login-label">
<Form.Label className="login-label color-black ">
{selectedMultiLangData?.mobile_number} /{" "}
{selectedMultiLangData?.email}:
</Form.Label>
Expand Down Expand Up @@ -214,7 +214,7 @@ const Loginpage = () => {
<Form.Group controlId="formPassword">
<div className="row mt-3">
<div className="col-md-4">
<Form.Label className="login-label">
<Form.Label className="login-label color-black">
{selectedMultiLangData?.password_otp}:
</Form.Label>
</div>
Expand Down Expand Up @@ -267,9 +267,9 @@ const Loginpage = () => {
<div
className={`col-12 text-lg-start register_account`}
>
<div className="register ms-2 account-margin">
<div className="register ms-2 account-margin not-acc-margin">
<span className="not_an_account">
{selectedMultiLangData?.not_an_account}?{" "}
<span className="color-black">{selectedMultiLangData?.not_an_account}?{" "}</span>
<Link className={`linkss`} href="/register">
{selectedMultiLangData?.register}
</Link>
Expand Down
24 changes: 13 additions & 11 deletions components/DealerLedger/DealerAccounting.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,38 @@ const DealerAccounting = ({
}: any) => {
return (
<>
<div className="container mt-5 mb-0 delaer-leader-container">
<div className="container mt-0 mb-0 delaer-leader-container" >
<div className="row justify-content-center">
<h2 className="dealer-heading text-captilize products-name" >Dealer Ledger</h2>
<div className="col-lg-3 card border-dark mx-2 mt-3 px-0 mb-2 products-name" >
<div className="card-header text-center fs-3 products-name">
<div className="page_heading">
<h4 className="dealer-heading text-captilize color-black p-0 m-0" >Dealer Ledger</h4>
</div>
<div className="col-lg-3 card border-dark mx-2 mt-0 px-0 mb-2 color-black" >
<div className="card-header text-center fs-3 color-black">
{selectedMultiLangData?.remaining_credit_balance}
</div>
<h3 className="text-center mt-2 mb-0 products-name">
<h3 className="text-center mt-2 mb-0 color-black">
{dealerLedgerSummary?.remaining_credit_balance}
</h3>

<div className="card-header px-3 fs-3 my-0 mt-2 text-center products-name">
<div className="card-header px-3 fs-3 my-0 mt-2 text-center color-black">
{selectedMultiLangData?.total_credit_amount}
</div>
<h3 className="text-center mt-2 products-name">
<h3 className="text-center mt-2 color-black">
{dealerLedgerSummary?.remaining_credit_balance}
</h3>
</div>
<div className="col-lg-1"></div>
<div className="col-lg-3 card border-info mx-2 px-0 mb-2 mt-3 products-name">
<div className="col-lg-3 card border-info mx-2 px-0 mb-2 mt-0 color-black" >
<div className="card-header fs-3 text-center">
{selectedMultiLangData?.payment_due}
</div>
<h3 className="text-center mt-2 products-name">
<h3 className="text-center mt-2 color-black">
{dealerLedgerSummary?.opening_balance}
</h3>
<div className="card-header fs-3 text-center products-name">
<div className="card-header fs-3 text-center color-black">
{selectedMultiLangData?.due_on}
</div>
<h3 className="text-center mt-2 products-name">
<h3 className="text-center mt-2 color-black">
{dealerLedgerSummary?.payment_due_date
?.split("-")
?.reverse()
Expand Down
46 changes: 23 additions & 23 deletions components/DealerLedger/DealerLedger.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,40 +87,40 @@ const DealerLedger = () => {
dealerLedgerSummary={dealerLedgerSummary}
selectedMultiLangData={selectedMultiLangData}
/>
<div className="row justify-content-center dealer-ledger-container mt-0 pt-0 products-name dealer-account-container" >
<div className="col-lg-8">
<div className="row m-lg-5">
<div className="row justify-content-center dealer-ledger-container mt-0 pt-0 color-black dealer-account-container dealer-account-container-mob " >
<div className="col-lg-8 ml-3" >
<div className="row m-lg-5" >
<div className="col-lg-4 col-6 mt-0 pt-0 mb-0 pb-0">
<div className="fs-3 products-name ">
<div className="fs-3 color-black ">
{selectedMultiLangData?.account_name} :
</div>
</div>
<div className="col-lg-6 col-6">
<div className="fs-3 bold products-name" >
<div className="col-lg-6 col-6" >
<div className="fs-3 bold color-black" >
{dealerLedgerSummary?.party_name}
</div>
</div>
</div>
<div className="row mx-lg-5 mt-0 products-name">
<div className="col-lg-4 col-4 mb-0 pb-0 mt-0 pt-0">
<div className="row mx-lg-5 mt-0 color-black" >
<div className="col-lg-4 col-4 mb-0 pb-0 mt-0 pt-0" >
<input
type="radio"
className="form-check-input products-name"
className="form-check-input color-black"
id="radio1"
name="optradio"
value="option1"
onClick={() => setFieldDisable(false)}
defaultChecked
/>
<label className="form-check-label ms-4 products-name" htmlFor="radio1">
<label className="form-check-label ms-4 color-black" htmlFor="radio1">
{selectedMultiLangData?.month}
</label>
</div>
<div className="col-lg-4 col-6">
<select
className={`${
fieldDisable ? "" : "disabled"
} form-select fs-5 products-name`}
} form-select fs-5 color-black`}
disabled={fieldDisable}
onChange={(e) => setDlSelectedMonth(e.target.value)}
>
Expand All @@ -137,26 +137,26 @@ const DealerLedger = () => {
</select>
</div>
</div>
<div className="row mx-lg-5 my-2 products-name">
<div className="row mx-lg-5 my-2 color-black" >
<div className="col-lg-4 col-4 mt-lg-2">
<input
type="radio"
className="form-check-input products-name"
className="form-check-input color-black"
id="radio2"
name="optradio"
value="option1"
onClick={() => setFieldDisable(true)}
/>
<label
className="form-check-label ms-lg-4 ms-1 text-start products-name"
className="form-check-label ms-lg-4 ms-1 text-start color-black"
htmlFor="radio1"
>
{selectedMultiLangData?.date_range}
</label>
</div>
<div className="col-lg-6 col-12 ">
<div className="row">
<div className="col-lg-6 col-7">
<div className="row" >
<div className="col-lg-5 col-7" >
<input
type="date"
id="FromDate"
Expand All @@ -165,11 +165,11 @@ const DealerLedger = () => {
onChange={(e) => setDlFromDate(e.target.value)}
className={`${
fieldDisable ? "" : "disabled"
} mt-lg-2 px-1 products-name`}
disabled={!fieldDisable}
} mt-lg-2 px-1 color-black `}
disabled={!fieldDisable}
/>
</div>
<div className="col-lg-4 col-5">
<div className="col-lg-4 col-5" >
<input
type="date"
id="toDate"
Expand All @@ -178,20 +178,20 @@ const DealerLedger = () => {
onChange={(e) => setDlToDate(e.target.value)}
className={`${
fieldDisable ? "" : "disabled"
} mt-lg-2 px-1 products-name`}
} mt-lg-2 px-1 color-black dealer-todate-mob`}
disabled={!fieldDisable}
/>
</div>
</div>
</div>
</div>
<div className="row">
<div className="col-lg-8 text-center mb-3">
<div className="col-lg-8 text-center mb-0">
<button
className="btn btn-outline-primary ledger-submit-button rounded-3 mt-5 w-25 products-name"
className="btn btn-outline-primary ledger-submit-button rounded-3 mt-2 w-25 color-black"
onClick={HandleLedgerData}
>
<span className="products-name">{selectedMultiLangData?.submit}</span>
<span className="">{selectedMultiLangData?.submit}</span>
</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/DealerLedger/DealerLedgerTable.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const DealerLedgerTable = ({
};
return (
<>
<div className="table-responsive dealer-ledger-table ">
<div className="table-responsive dealer-ledger-table " >
<table className="table table-bordered ">
<thead className="">
<tr className="table-info">
Expand Down
8 changes: 4 additions & 4 deletions components/OrderDetails/OrderDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ const Index = ({ sales_order_id }: any) => {
{detail?.length > 0 &&
detail !== null &&
detail?.map((data: any) => (
<div className="container products-name" key={data?.name}>
<div className="container color-black" key={data?.name}>
<div className="row"></div>
<div className="row products-name">
<div className="row color-black">
<div className="col-md-6 ">
<div className="page_heading">
<h4 className="p-0 m-0">
Expand All @@ -107,7 +107,7 @@ const Index = ({ sales_order_id }: any) => {
</div>
</div>
</div>
<div className="order_detail_head row products-name pb-2" >
<div className="order_detail_head row color-black pb-2" >
<div className="col-12">
<div className="item_action d-flex ">
<div className="item_action_link me-3 ">
Expand All @@ -123,7 +123,7 @@ const Index = ({ sales_order_id }: any) => {
</div>


<div id="printableArea" className="row products-name" >
<div id="printableArea" className="row color-black" >
<div className="col-lg-12">
<div className="order_card mb-3 card">
<div className="card-body" >
Expand Down
Loading

0 comments on commit 2e877a1

Please sign in to comment.