From ba5f9d1826a6725b25bfde7d149302e1804452be Mon Sep 17 00:00:00 2001 From: pawan-dot <71133473+pawan-dot@users.noreply.github.com> Date: Thu, 9 Feb 2023 18:05:02 +0530 Subject: [PATCH] franchisee edit --- src/_nav.js | 2 +- src/routes.js | 18 +- src/views/Products/AddProduct.js | 2 +- .../{EditTemple.js => AddFranchisee.js} | 229 +++++--- .../{AddTemple.js => EditFranchisee.js} | 239 ++++++-- .../Temples/{Temples.js => Franchisees.js} | 46 +- src/views/orders/AddOrder.js | 10 +- src/views/orders/EditOrder.js | 21 +- src/views/orders/NewOrders.js | 5 +- src/views/orders/ViewOrders.js | 543 ++++++++++++++++++ 10 files changed, 949 insertions(+), 166 deletions(-) rename src/views/Temples/{EditTemple.js => AddFranchisee.js} (79%) rename src/views/Temples/{AddTemple.js => EditFranchisee.js} (66%) rename src/views/Temples/{Temples.js => Franchisees.js} (93%) create mode 100644 src/views/orders/ViewOrders.js diff --git a/src/_nav.js b/src/_nav.js index 64bc615..22aec88 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -52,7 +52,7 @@ const _nav = [ component: CNavItem, name: 'Franchisee', icon: , - to: '/temples', + to: '/franchisees', }, { component: CNavGroup, diff --git a/src/routes.js b/src/routes.js index 9abfda9..e243285 100644 --- a/src/routes.js +++ b/src/routes.js @@ -22,10 +22,10 @@ import Socialmedia from './views/configuration/Socialmedia.js' import Address from './views/configuration/Address.js' import Logo from './views/configuration/Logo.js' import Login from './views/pages/login/Login' -//temple -import Temples from './views/Temples/Temples' -import AddTemple from './views/Temples/AddTemple' -import EditTemple from './views/Temples/EditTemple' +//Franchisees +import Franchisees from './views/Temples/Franchisees' +import AddFranchisee from './views/Temples/AddFranchisee' +import EditFranchisee from './views/Temples/EditFranchisee' import Products from './views/Products/Products' //product import AddProduct from './views/Products/AddProduct' @@ -46,6 +46,8 @@ import Tax from './views/configuration/tax/Tax' import Addtax from './views/configuration/tax/Addtax' import Edittax from './views/configuration/tax/Edittax' import EditOrder from './views/orders/EditOrder' +import ViewOrders from './views/orders/ViewOrders' + const routes = [ { path: '/', exact: true, name: 'Home' }, @@ -65,7 +67,7 @@ const routes = [ { path: '/orders/new', name: 'New Orders', element: NewOrders }, { path: '/order/add', name: 'add Order', element: AddOrder }, { path: '/orders/edit/:id', name: 'Edit Order', element: EditOrder }, - //{ path: '/orders/view/:id', name: 'Edit Order', element: EditOrder }, + { path: '/orders/view/:id', name: 'View Order', element: ViewOrders }, // { path: '/orders/processing', name: 'Processing Orders', element: ProcessingOrders }, // { path: '/orders/dispatched', name: 'Dispatched Orders', element: DispatchedOrders }, @@ -76,9 +78,9 @@ const routes = [ //Temple - { path: '/temples', name: 'Temples', element: Temples }, - { path: '/temple/add', name: 'Add Temple', element: AddTemple }, - { path: '/temple/edit/:id', name: 'Edit Temples', element: EditTemple }, + { path: '/franchisees', name: 'Franchisees', element: Franchisees }, + { path: '/franchisee/add', name: 'Add Franchisee', element: AddFranchisee }, + { path: '/franchisee/edit/:id', name: 'Edit Franchisee', element: EditFranchisee }, //dashboard diff --git a/src/views/Products/AddProduct.js b/src/views/Products/AddProduct.js index 98f0b75..a2e658b 100644 --- a/src/views/Products/AddProduct.js +++ b/src/views/Products/AddProduct.js @@ -440,7 +440,7 @@ const AddProduct = () => { handleChange(e)} /> - */} + {errors.emailError && ( +

{errors.emailError}

+ )} + +
- {/*
- - handleChange(e)} - /> -
-
- - handleChange(e)} - /> -
*/} +
+
+ + handleChange(e)} + /> + {/* {data.pin_Code ? <> + {8 - data.pin_Code.length} characters left + : <> + } */} +
-
+
@@ -413,6 +460,7 @@ const EditTemple = () => { />
+
+
+
-
+
@@ -242,6 +361,22 @@ const AddTemple = () => { />

Remaining characters : {limiter.nameHas}

+
+ + handleChange(e)} + /> + {errors.emailError && ( +

{errors.emailError}

+ )} +
- + {/*
+ + handleChange(e)} + /> +
+
+ + handleChange(e)} + /> +
*/}
+
+ + handleChange(e)} + /> + {/* {data.pin_Code ? <> + {8 - data.pin_Code.length} characters left + : <> + } */} +
-
+
@@ -355,7 +532,6 @@ const AddTemple = () => { />
-
-
{ ) } -export default AddTemple +export default EditFranchisee diff --git a/src/views/Temples/Temples.js b/src/views/Temples/Franchisees.js similarity index 93% rename from src/views/Temples/Temples.js rename to src/views/Temples/Franchisees.js index d187f0c..515a84f 100644 --- a/src/views/Temples/Temples.js +++ b/src/views/Temples/Franchisees.js @@ -8,15 +8,15 @@ import swal from 'sweetalert' import OverLayButton from './OverLayButton.js' import { isAutheticated } from 'src/auth.js' -const Temples = () => { +const Franchisees = () => { const token = isAutheticated() const [loading, setLoading] = useState(true) const [success, setSuccess] = useState(true) - const [TemplesData, setTemplesData] = useState([]) + const [FranchiseesData, setFranchiseesData] = useState([]) const [currentPage, setCurrentPage] = useState(1) const [itemPerPage, setItemPerPage] = useState(10) - const [showData, setShowData] = useState(TemplesData) + const [showData, setShowData] = useState(FranchiseesData) const handleShowEntries = (e) => { setCurrentPage(1) @@ -25,11 +25,11 @@ const Temples = () => { const getCategories = () => { axios - .get(`/api/temple`, { + .get(`/api/franchisee`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, }) .then((res) => { - setTemplesData(res.data.data) + setFranchiseesData(res.data.data) setLoading(false) }) .catch((err) => { @@ -46,10 +46,10 @@ const Temples = () => { const loadData = () => { const indexOfLastPost = currentPage * itemPerPage const indexOfFirstPost = indexOfLastPost - itemPerPage - setShowData(TemplesData.slice(indexOfFirstPost, indexOfLastPost)) + setShowData(FranchiseesData.slice(indexOfFirstPost, indexOfLastPost)) } loadData() - }, [currentPage, itemPerPage, TemplesData]) + }, [currentPage, itemPerPage, FranchiseesData]) const handleDelete = (id) => { swal({ @@ -59,7 +59,7 @@ const Temples = () => { }).then((value) => { if (value === true) { axios - .delete(`/api/temple/${id}`, { + .delete(`/api/franchisee/${id}`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}`, @@ -100,7 +100,7 @@ const Temples = () => {
- + - +
@@ -301,7 +301,7 @@ const Temples = () => { {!( (currentPage + 1) * itemPerPage - itemPerPage > - TemplesData.length - 1 + FranchiseesData.length - 1 ) && (
  • { className={ !( (currentPage + 1) * itemPerPage - itemPerPage > - TemplesData.length - 1 + FranchiseesData.length - 1 ) ? 'paginate_button page-item next' : 'paginate_button page-item next disabled' @@ -348,4 +348,4 @@ const Temples = () => { ) } -export default Temples +export default Franchisees diff --git a/src/views/orders/AddOrder.js b/src/views/orders/AddOrder.js index e2a544a..f6b217d 100644 --- a/src/views/orders/AddOrder.js +++ b/src/views/orders/AddOrder.js @@ -79,7 +79,7 @@ function AddOrder() { function getFranchiseeDetails() { setLoading(true) axios - .get(`/api/temple`, { + .get(`/api/franchisee`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, }) .then((res) => { @@ -119,7 +119,7 @@ function AddOrder() { console.log(getFranchiseeID.current.value) axios - .get(`/api/Temple/arrayspopulate/${getFranchiseeID.current.value}`, { + .get(`/api/franchisee/arrayspopulate/${getFranchiseeID.current.value}`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}`, @@ -445,8 +445,12 @@ function AddOrder() { Contact No. : {shipingInfo?.contact_Number}

    - contact Person Name. : {shipingInfo?.contact_Person_Name} + Contact Person Name : {shipingInfo?.contact_Person_Name}

    +

    + Price Lable : {shipingInfo?.price_Lable} +

    + diff --git a/src/views/orders/EditOrder.js b/src/views/orders/EditOrder.js index 8727453..c407c4c 100644 --- a/src/views/orders/EditOrder.js +++ b/src/views/orders/EditOrder.js @@ -38,6 +38,7 @@ function EditOrder() { const [productDetails, setProductDetails] = useState() const [loading, setLoading] = useState(true) + const [orderId, setOrderId] = useState(null) const [orderStatus, setOrderStatus] = useState('') // const [data, setData] = useState({ // product_Name: '', @@ -52,8 +53,7 @@ function EditOrder() { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, }) if (res.data) { - // console.log(res.data?.order?.shippingInfo) - + setOrderId(res.data?.order?.order_id) let options = { Franchisee: res.data?.order?.shippingInfo?.Franchisee?._id, name: res.data?.order?.shippingInfo?.name, @@ -117,7 +117,7 @@ function EditOrder() { function getFranchiseeDetails() { setLoading(true) axios - .get(`/api/temple`, { + .get(`/api/franchisee`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, }) .then((res) => { @@ -157,7 +157,7 @@ function EditOrder() { console.log(getFranchiseeID.current.value) axios - .get(`/api/Temple/arrayspopulate/${getFranchiseeID.current.value}`, { + .get(`/api/franchisee/arrayspopulate/${getFranchiseeID.current.value}`, { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}`, @@ -212,6 +212,7 @@ function EditOrder() { headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, }) .then((res) => { + setLoading(false) const productAllkey = Object.keys(res?.data?.product); const productAllValue = Object.values(res?.data?.product); @@ -393,8 +394,11 @@ function EditOrder() { justify-content-between " > +
    - Edit Order +

    Edit Order

    + {orderId && Order ID : {orderId} } +
    */} + + + +
    + +
  • + +
    +
    + {loading ? ( +
    +
    + Loading... +
    +
    + ) : ( + +
    +
    +
    +
    +
    +
    Order Status: {orderDetails?.orderStatus}
    + + {/*
    + + +
    */} + + +
    + + + { + orderDetails?.shipingInfo !== null && +
    +
    +
    + {orderDetails?.shippingInfo?.name} +
    +
    +
    {orderDetails?.shippingInfo?.name}
    + + Address. : {orderDetails?.shippingInfo?.address} + +

    + Contact No. : {orderDetails?.shippingInfo?.contact_Number} +

    +

    + Contact Person Name : {orderDetails?.shippingInfo?.contact_Person_Name} +

    +

    + Price Lable : {orderDetails?.shippingInfo?.Franchisee?.price_Lable} +

    + +

    + City : {orderDetails?.shippingInfo?.city} +

    +

    + State : {orderDetails?.shippingInfo?.state} +

    + + + + + + + +
    +
    +
    + +
    + } +
    + +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    + + +
    +
    + + {orderDetails?.shipingInfo !== null &&
    +
    + {/*
    + +
    + + + +
    + +
    */} + +
    +
    Products : {orderDetails?.orderItems?.length}
    + + { + orderDetails?.orderItems && orderDetails?.orderItems.map((productDetails, i) => +
    +
    +
    + {productDetails?.name} +
    +
    +
    {productDetails?.name}
    +
    +
    + + +
    + Quantity: {productDetails?.quantity} + +
    + +

    + Price With Tax: ₹{productDetails?.price_With_Tax} +

    +
    +
    +

    + Price: ₹{productDetails?.price} +

    + + + + +
    +
    +
    +
    +
    + +
    + ) + } +
    + + Shipping Charge: ₹{orderDetails?.shipping_charge} + +
    + Total Order Value: ₹{orderDetails?.total_amount} +
    +
    +
    +
    + + } + + + + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Order Placed On : + {orderDetails?.createdAt + ? new Date(orderDetails?.createdAt).toLocaleString('en-IN', { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }) + : new Date(productData?.placed_on).toLocaleString('en-IN', { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + })} +
    Processing Started : + {productData?.status_timeline?.processing + ? new Date(productData?.status_timeline?.processing).toLocaleString( + 'en-IN', + { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }, + ) + : '-'} +
    Dispatched On : + {productData?.status_timeline?.dispatched + ? new Date(productData?.status_timeline?.dispatched).toLocaleString( + 'en-IN', + { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }, + ) + : '-'} +
    Delivered On : + {productData?.status_timeline?.delivered + ? new Date(productData?.status_timeline?.delivered).toLocaleString( + 'en-IN', + { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }, + ) + : '-'} +
    Cancelled On : + {productData?.status_timeline?.cancelled + ? new Date(productData?.status_timeline?.cancelled).toLocaleString( + 'en-IN', + { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }, + ) + : '-'} +
    Returned On : + {productData?.status_timeline?.returned + ? new Date(productData?.status_timeline?.returned).toLocaleString( + 'en-IN', + { + month: 'short', + day: 'numeric', + year: 'numeric', + hour: '2-digit', + minute: 'numeric', + hour12: true, + }, + ) + : '-'} +
    +
    +
    + + + + + + +
    +
    )} +
    + + +
    + {/* */} +
    + + ) +} + +export default ViewOrders