Skip to content

Commit

Permalink
merge with develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@rushikesh2404
rushikesh2404 committed Sep 27, 2023
2 parents 7a0ea2a + 1da88d8 commit c471bd7
Show file tree
Hide file tree
Showing 20 changed files with 288 additions and 178 deletions.
58 changes: 29 additions & 29 deletions cards/MyOrderCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
<div className="card-header pb-1 ">
<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">
<p className="text-uppercase gray myorder_p">
{selectedMultiLangData?.order_placed}
</p>

<p className="gray mb-0 myorder_p">
<p className="gray myorder_p">
{data?.transaction_date?.split("-")?.reverse()?.join("/")}
</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 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">
<p className="gray myorder_p price_font_family">
{data?.currency_symbol} {data?.total}
</p>
)}
</div>
<div className="col-md-2 col-4 order-cards">
<p className="text-uppercase gray mb-0 myorder_p">
<div className="col-md-2 col-4 order-cards" >
<p className="text-uppercase gray myorder_p">
{selectedMultiLangData?.ship_to}
</p>
{data?.addresses?.map((personAddress: any, index: number) => (
Expand Down Expand Up @@ -112,10 +112,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 pb-0" >
<div className="flex-fill">
<h6 className="green text-capitalize bold mb-0 mt-2 order-ptag d-inline-flex">
<div>{selectedMultiLangData?.status} </div>
Expand All @@ -137,45 +137,45 @@ 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">
<p className="text-capitalize black mb-0 myorder_p">
<p className="text-capitalize black myorder_p">
{selectedMultiLangData?.item_code}
</p>
</td>
<td
width="85%"
className="px-0 py-0 pb-0 myorder_width"
>
<p className="text-capitalize black mb-0 myorder_p">
<p className="text-capitalize black myorder_p">
: {detail?.name}
</p>
</td>
</tr>

<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 myorder_p" >
{selectedMultiLangData?.price}
</p>
</td>
<td
width="85%"
className="px-0 py-0 pb-0 myorder_width"
>
<p className="text-capitalize black mb-0 myorder_p">
<p className="text-capitalize black myorder_p">
{detail?.prod_info[1]?.value !== 0 ? (
<p className="mb-0 price_font_family">
<p className=" price_font_family">
{" "}
: {data?.currency_symbol}{" "}
{detail.prod_info[1]?.value}
Expand All @@ -191,15 +191,15 @@ 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">
<p className="text-capitalize black myorder_p">
{selectedMultiLangData?.quantity}
</p>
</td>
<td
width="85%"
className="px-0 py-0 pb-0 myorder_width"
>
<p className="text-capitalize black mb-0 myorder_p">
<p className="text-capitalize black myorder_p">
: {detail?.prod_info[2]?.value}
</p>
</td>
Expand All @@ -216,7 +216,7 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
{selectedMultiLangData?.shipping_method}
</h5>
<div>
<p className="mb-0">
<p className="">
{selectedMultiLangData?.transporter}:{" "}
{data?.shipping_method?.transporter}
</p>
Expand All @@ -232,13 +232,13 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
{data?.shipping_method?.door_delivery === 0 &&
data?.shipping_method?.godown_delivery !== 0 ? (
<>
<p className="mb-0">
<p className="">
{selectedMultiLangData?.godown_delivery_yes}
</p>
{data?.shipping_method?.location === null ? (
""
) : (
<p className="mb-0">
<p className="">
{selectedMultiLangData?.location} :{" "}
{data?.shipping_method?.location}
</p>
Expand All @@ -251,7 +251,7 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
{data?.shipping_method?.remarks === null ? (
""
) : (
<p className="mb-0">
<p className="">
{selectedMultiLangData?.remark} :{" "}
{data?.shipping_method?.remarks}
</p>
Expand Down Expand Up @@ -293,10 +293,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
20 changes: 10 additions & 10 deletions components/DealerLedger/DealerLedger.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const DealerLedger = () => {
<div className="col-lg-8">
<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>
Expand Down Expand Up @@ -127,7 +127,7 @@ const DealerLedger = () => {
<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 Down Expand Up @@ -166,8 +166,8 @@ const DealerLedger = () => {
</div>
</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 @@ -176,11 +176,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 @@ -189,17 +189,17 @@ 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}
>
{selectedMultiLangData?.submit}
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
Loading

0 comments on commit c471bd7

Please sign in to comment.