From 3fc579218e4470458528a152918c11ecfe432826 Mon Sep 17 00:00:00 2001 From: pawan-dot <71133473+pawan-dot@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:12:19 +0530 Subject: [PATCH] temple --- package.json | 3 +- src/_nav.js | 10 + src/index.js | 3 +- src/routes.js | 9 +- src/views/Temples/AddTemple.js | 407 ++++++++++++++++++ src/views/Temples/EditTemple.js | 423 +++++++++++++++++++ src/views/Temples/OverLayButton.js | 29 ++ src/views/Temples/Temples.js | 351 +++++++++++++++ src/views/configuration/Address.js | 1 + src/views/configuration/Logo.js | 25 +- src/views/configuration/cities/AddCity.js | 16 +- src/views/configuration/cities/Cities.js | 2 +- src/views/configuration/cities/EditCity.js | 7 +- src/views/configuration/states/AddState.js | 6 +- src/views/configuration/states/EditStates.js | 6 +- src/views/configuration/states/States.js | 6 +- 16 files changed, 1265 insertions(+), 39 deletions(-) create mode 100644 src/views/Temples/AddTemple.js create mode 100644 src/views/Temples/EditTemple.js create mode 100644 src/views/Temples/OverLayButton.js create mode 100644 src/views/Temples/Temples.js diff --git a/package.json b/package.json index ab6c116..eedbba6 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,10 @@ "prop-types": "^15.7.2", "react": "18.2", "react-app-polyfill": "^2.0.0", + "react-bootstrap": "^2.7.0", "react-date-picker": "^8.4.0", "react-datepicker": "^4.8.0", - "react-dom": "^17.0.2", + "react-dom": "^18.0.0", "react-paginate": "^8.1.3", "react-redux": "^7.2.6", "react-router-dom": "^6.7.0", diff --git a/src/_nav.js b/src/_nav.js index 04cbe08..69db563 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -13,12 +13,16 @@ import { cilFilterSquare, cilMedicalCross, cilMoney, + cilMugTea, cilNewspaper, cilNotes, cilPencil, cilPuzzle, + cilSitemap, cilSpeedometer, cilStar, + cilTablet, + cilTennisBall, cilUser, @@ -35,6 +39,12 @@ const _nav = [ }, + { + component: CNavItem, + name: 'Temples', + icon: , + to: '/temples', + }, { component: CNavItem, diff --git a/src/index.js b/src/index.js index 0cc7962..62a8094 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,8 @@ import store from './store' import axios from 'axios' const setupAxios = () => { - axios.defaults.baseURL = 'http://localhost:5000' + axios.defaults.baseURL = 'https://atpapi.checkapp.one' + //axios.defaults.baseURL = 'http://localhost:5000' axios.defaults.headers = { 'Cache-Control': 'no-cache,no-store', 'Pragma': 'no-cache', diff --git a/src/routes.js b/src/routes.js index 0cea1a3..fa3f33a 100644 --- a/src/routes.js +++ b/src/routes.js @@ -22,6 +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' const routes = [ @@ -29,7 +33,10 @@ const routes = [ { path: '/change_password', name: 'Change Password', element: Change_Password }, { path: '/profile/edit', name: 'Edit Profile', element: EditProfile }, // { path: '/profile', name: 'Profile', element: Profile }, - + //Temple + { path: '/temples', name: 'Temples', element: Temples }, + { path: '/temple/add', name: 'Add Temple', element: AddTemple }, + { path: '/temple/edit/:id', name: 'Edit Temples', element: EditTemple }, //dashboard diff --git a/src/views/Temples/AddTemple.js b/src/views/Temples/AddTemple.js new file mode 100644 index 0000000..491ffa3 --- /dev/null +++ b/src/views/Temples/AddTemple.js @@ -0,0 +1,407 @@ + + + +import React, { useEffect, useState } from 'react' +import Button from '@material-ui/core/Button' +import { Link, useNavigate } from 'react-router-dom' +import swal from 'sweetalert' +import axios from 'axios' +import { isAutheticated } from 'src/auth' +// import { WebsiteURL } from '../WebsiteURL' + +const AddTemple = () => { + const [WebsiteURL, setWebsiteURL] = useState('https://reinventuniforms.in/') + const token = isAutheticated() + const navigate = useNavigate() + const [data, setData] = useState({ + image: '', + imageURL: '', + name: '', + address_line_1: '', + address_line_2: '', + city: '', + state_name: '', + short_url: '', + // pan: '', + // business_name: '', + // gstin: '', + // option: '', + }) + + const [cities, setCities] = useState([]) + + const [loading, setLoading] = useState(false) + const [limiter, setLimiter] = useState({ + name: 100, + nameHas: 100, + }) + + const getRequired = () => { + axios + .get(`/api/city`, { + headers: { + 'Access-Control-Allow-Origin': '*', + Authorization: `Bearer ${token}`, + }, + }) + .then((res) => { + setCities([...res.data.data]) + }) + .catch((err) => { }) + } + + useEffect(() => { + getRequired() + }, []) + + const handleChange = (e) => { + if (e.target.id === 'name') { + if (e.target.value.length === limiter[e.target.id] + 1) return + setLimiter((prev) => ({ + ...prev, + [e.target.id + 'Has']: prev[e.target.id] - e.target.value.length, + })) + setData((prev) => ({ ...prev, short_url: e.target.value.toLowerCase().replace(/\s+/g, '-') })) + } + if (e.target.id === 'city') { + const city = cities.filter((m) => e.target.value === m?._id) + setData((prev) => ({ ...prev, state_name: city[0]?.state?.state_name || '' })) + } + if (e.target.id === 'image') { + if ( + e.target.files[0]?.type === 'image/jpeg' || + e.target.files[0]?.type === 'image/png' || + e.target.files[0]?.type === 'image/jpg' + ) { + setData((prev) => ({ + ...prev, + imageURL: URL.createObjectURL(e.target.files[0]), + image: e.target.files[0], + })) + return + } else { + swal({ + title: 'Warning', + text: 'Upload jpg, jpeg, png only.', + icon: 'error', + button: 'Close', + dangerMode: true, + }) + setData((prev) => ({ + ...prev, + imageURL: '', + image: '', + })) + e.target.value = null + return + } + } + setData((prev) => ({ ...prev, [e.target.id]: e.target.value })) + } + + const handleSubmit = () => { + if ( + data.name.trim() === '' || + // data.pan.trim() === '' || + // data.business_name.trim() === '' || + // data.gstin.trim() === '' || + // data.option.trim() === '' || + data.address_line_1.trim() === '' || + data.address_line_2.trim() === '' || + data.city === '' || + data.short_url === '' || + data.state_name === '' || + data.imageURL.trim() === '' + ) { + swal({ + title: 'Warning', + text: 'Fill all mandatory fields', + icon: 'error', + button: 'Close', + dangerMode: true, + }) + return + } + setLoading(true) + const formData = new FormData() + formData.set('name', data.name) + // formData.set('pan', data.pan) + // formData.set('business_name', data.business_name) + // formData.set('gstin', data.gstin) + // formData.set('option', data.option) + formData.set('address_line_1', data.address_line_1) + formData.set('address_line_2', data.address_line_2) + formData.set('city', data.city) + formData.set('state_name', data.state_name) + formData.set('url', WebsiteURL + data.short_url + '/login') + formData.set('short_url', data.short_url) + formData.append('image', data.image) + axios + .post(`/api/temple`, formData, { + headers: { + Authorization: `Bearer ${token}`, + 'Content-Type': 'multipart/formdata', + 'Access-Control-Allow-Origin': '*', + }, + }) + .then((res) => { + swal({ + title: 'Added', + text: 'Temple added successfully!', + icon: 'success', + button: 'Return', + }) + setLoading(false) + navigate('/temples', { replace: true }) + }) + .catch((err) => { + setLoading(false) + const message = err.response?.data?.message || 'Something went wrong!' + swal({ + title: 'Warning', + text: message, + icon: 'error', + button: 'Retry', + dangerMode: true, + }) + }) + } + + return ( +
+
+
+
+
+ Add Temple +
+
+

+
+ +
+ + + + +
+
+
+
+
+
+
+
+
+ + handleChange(e)} + /> +

Remaining characters : {limiter.nameHas}

+
+ {/*
+ + handleChange(e)} + /> +
*/} +
+ + handleChange(e)} + /> +
+
+ + handleChange(e)} + /> +
+ {/*
+ + handleChange(e)} + /> +
*/} + {/*
+ + handleChange(e)} + /> +
*/} +
+ + +
+
+ + +
+
+
+
+
+
+
+
+ +
+ + {WebsiteURL} + + handleChange(e)} + /> +
+
+ {/*
+ + +
*/} +
+ + handleChange(e)} + /> +

Upload jpg, jpeg and png only*

+
+
+ Uploaded Image will be shown here +
+
+
+
+
+
+ ) +} + +export default AddTemple diff --git a/src/views/Temples/EditTemple.js b/src/views/Temples/EditTemple.js new file mode 100644 index 0000000..7e1894b --- /dev/null +++ b/src/views/Temples/EditTemple.js @@ -0,0 +1,423 @@ + + +import React, { useEffect, useState } from 'react' +import Button from '@material-ui/core/Button' +import { Link, useNavigate, useParams } from 'react-router-dom' +import swal from 'sweetalert' +import axios from 'axios' +import { isAutheticated } from 'src/auth' + +const EditTemple = () => { + + + const [WebsiteURL, setWebsiteURL] = useState('https://reinventuniforms.in/') + const id = useParams()?.id + const token = isAutheticated() + const navigate = useNavigate() + const [data, setData] = useState({ + image: '', + imageURL: '', + name: '', + address_line_1: '', + address_line_2: '', + city: '', + state_name: '', + short_url: '', + pan: '', + business_name: '', + gstin: '', + option: '', + }) + const [cities, setCities] = useState([]) + const [loading, setLoading] = useState(false) + const [limiter, setLimiter] = useState({ + name: 100, + nameHas: 100, + }) + + const getRequired = async () => { + await axios + .get(`/api/city`, { + headers: { + 'Access-Control-Allow-Origin': '*', + Authorization: `Bearer ${token}`, + }, + }) + .then((res) => { + setCities([...res.data.data]) + }) + .catch((err) => { }) + axios + .get(`/api/Temple/withoutpopulate/${id}`, { + headers: { + 'Access-Control-Allow-Origin': '*', + Authorization: `Bearer ${token}`, + }, + }) + .then((res) => { + setData((prev) => ({ + ...prev, + ...res.data?.data, + city: res.data?.data?.city, + imageURL: res.data?.data?.banner?.url, + })) + setLimiter((prev) => ({ ...prev, nameHas: prev.name - res.data?.data?.name?.length || 0 })) + }) + .catch((err) => { }) + } + + useEffect(() => { + getRequired() + }, []) + + useEffect(() => { + const setStateName = () => { + const city = cities.filter((m) => data.city === m?._id) + setData((prev) => ({ ...prev, state_name: city[0]?.state?.state_name || '' })) + } + setStateName() + }, [data.city]) + + const handleChange = (e) => { + if (e.target.id === 'name') { + if (e.target.value.length === limiter[e.target.id] + 1) return + setLimiter((prev) => ({ + ...prev, + [e.target.id + 'Has']: prev[e.target.id] - e.target.value.length, + })) + // setData((prev) => ({ ...prev, short_url: e.target.value.toLowerCase().replace(/\s+/g, '-') })) + } + if (e.target.id === 'image') { + if ( + e.target.files[0]?.type === 'image/jpeg' || + e.target.files[0]?.type === 'image/png' || + e.target.files[0]?.type === 'image/jpg' + ) { + setData((prev) => ({ + ...prev, + imageURL: URL.createObjectURL(e.target.files[0]), + image: e.target.files[0], + })) + return + } else { + swal({ + title: 'Warning', + text: 'Upload jpg, jpeg, png only.', + icon: 'error', + button: 'Close', + dangerMode: true, + }) + setData((prev) => ({ + ...prev, + imageURL: '', + image: '', + })) + e.target.value = null + return + } + } + setData((prev) => ({ ...prev, [e.target.id]: e.target.value })) + } + + const handleSubmit = () => { + if ( + data.name.trim() === '' || + data.address_line_1.trim() === '' || + data.address_line_2.trim() === '' || + data.city === '' || + data.short_url === '' || + data.state_name === '' + ) { + swal({ + title: 'Warning', + text: 'Fill all mandatory fields', + icon: 'error', + button: 'Close', + dangerMode: true, + }) + return + } + setLoading(true) + const formData = new FormData() + formData.set('name', data.name) + // formData.set('pan', data.pan) + // formData.set('business_name', data.business_name) + // formData.set('gstin', data.gstin) + // formData.set('option', data.option) + formData.set('address_line_1', data.address_line_1) + formData.set('address_line_2', data.address_line_2) + formData.set('city', data.city) + formData.set('state_name', data.state_name) + formData.set('url', WebsiteURL + data.short_url + '/login') + formData.set('short_url', data.short_url) + formData.append('image', data.image) + axios + .patch(`/api/Temple/${id}`, formData, { + headers: { + Authorization: `Bearer ${token}`, + 'Content-Type': 'multipart/formdata', + 'Access-Control-Allow-Origin': '*', + }, + }) + .then((res) => { + swal({ + title: 'Updated', + text: 'Temple updated successfully!', + icon: 'success', + button: 'Return', + }) + setLoading(false) + navigate('/temples', { replace: true }) + }) + .catch((err) => { + setLoading(false) + const message = err.response?.data?.message || 'Something went wrong!' + swal({ + title: 'Warning', + text: message, + icon: 'error', + button: 'Retry', + dangerMode: true, + }) + }) + } + + return ( +
+
+
+
+
+ Edit Temple +
+
+

+
+ +
+ + + + +
+
+
+
+ +
+
+
+
+
+ + handleChange(e)} + /> +

Remaining characters : {limiter.nameHas}

+
+ {/*
+ + handleChange(e)} + /> +
*/} +
+ + handleChange(e)} + /> +
+
+ + handleChange(e)} + /> +
+ {/*
+ + handleChange(e)} + /> +
+
+ + handleChange(e)} + /> +
*/} +
+ + +
+
+ + +
+
+
+
+
+
+
+
+ +
+ + {WebsiteURL} + + handleChange(e)} + /> +
+
+ {/*
+ + +
*/} +
+ + handleChange(e)} + /> +

Upload jpg, jpeg and png only*

+
+
+ Uploaded Image will be shown here +
+
+
+
+
+
+ ) +} + +export default EditTemple diff --git a/src/views/Temples/OverLayButton.js b/src/views/Temples/OverLayButton.js new file mode 100644 index 0000000..2a49a68 --- /dev/null +++ b/src/views/Temples/OverLayButton.js @@ -0,0 +1,29 @@ +import React, { useState, useRef } from 'react' +import Button from 'react-bootstrap/Button' +import Overlay from 'react-bootstrap/Overlay' +import Tooltip from 'react-bootstrap/Tooltip' + +function OverLayButton(props) { + const { url } = props?.data || '' + const [show, setShow] = useState(false) + const target = useRef(null) + + return ( + + + + {(props) => ( + + + {url} + + + )} + + + ) +} + +export default OverLayButton diff --git a/src/views/Temples/Temples.js b/src/views/Temples/Temples.js new file mode 100644 index 0000000..c523c33 --- /dev/null +++ b/src/views/Temples/Temples.js @@ -0,0 +1,351 @@ + +import React, { useEffect } from 'react' +import Button from '@material-ui/core/Button' +import { useState } from 'react' +import { Link } from 'react-router-dom' +import axios from 'axios' +import swal from 'sweetalert' +import OverLayButton from './OverLayButton.js' +import { isAutheticated } from 'src/auth.js' + +const Temples = () => { + const token = isAutheticated() + const [loading, setLoading] = useState(true) + const [success, setSuccess] = useState(true) + const [TemplesData, setTemplesData] = useState([]) + + const [currentPage, setCurrentPage] = useState(1) + const [itemPerPage, setItemPerPage] = useState(10) + const [showData, setShowData] = useState(TemplesData) + + const handleShowEntries = (e) => { + setCurrentPage(1) + setItemPerPage(e.target.value) + } + + const getCategories = () => { + axios + .get(`/api/temple`, { + headers: { 'Access-Control-Allow-Origin': '*', Authorization: `Bearer ${token}` }, + }) + .then((res) => { + setTemplesData(res.data.data) + setLoading(false) + }) + .catch((err) => { + console.log(err) + setLoading(false) + }) + } + + useEffect(() => { + getCategories() + }, [success]) + + useEffect(() => { + const loadData = () => { + const indexOfLastPost = currentPage * itemPerPage + const indexOfFirstPost = indexOfLastPost - itemPerPage + setShowData(TemplesData.slice(indexOfFirstPost, indexOfLastPost)) + } + loadData() + }, [currentPage, itemPerPage, TemplesData]) + + const handleDelete = (id) => { + swal({ + title: 'Are you sure?', + icon: 'error', + buttons: { Yes: { text: 'Yes', value: true }, Cancel: { text: 'Cancel', value: 'cancel' } }, + }).then((value) => { + if (value === true) { + axios + .delete(`/api/temple/${id}`, { + headers: { + 'Access-Control-Allow-Origin': '*', + Authorization: `Bearer ${token}`, + }, + }) + .then((res) => { + setSuccess((prev) => !prev) + }) + .catch((err) => { + swal({ + title: 'Warning', + text: 'Something went wrong!', + icon: 'error', + button: 'Retry', + dangerMode: true, + }) + }) + } + }) + } + + return ( +
+
+
+
+
+
+
+ Temples +
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + {!loading && showData.length === 0 && ( + + + + )} + {loading ? ( + + + + ) : ( + showData.map((temple, i) => { + return ( + + + + + + + + ) + }) + )} + +
Temple NameLogoCity Created OnActions
+
No Data Available
+
+ Loading... +
{temple.name} + Test Image + {temple?.city?.city_name} + {new Date(temple.createdAt).toLocaleString('en-IN', { + month: '2-digit', + day: 'numeric', + year: 'numeric', + // hour: 'numeric', + // minute: 'numeric', + // hour12: true, + })} + + + + + + + + + + + +
+
+ +
+
+
+ Showing {currentPage * itemPerPage - itemPerPage + 1} to{' '} + {Math.min(currentPage * itemPerPage, TemplesData.length)} of{' '} + {TemplesData.length} entries +
+
+ +
+
+
    +
  • + setCurrentPage((prev) => prev - 1)} + > + Previous + +
  • + + {!(currentPage - 1 < 1) && ( +
  • + setCurrentPage((prev) => prev - 1)} + > + {currentPage - 1} + +
  • + )} + +
  • + + {currentPage} + +
  • + + {!( + (currentPage + 1) * itemPerPage - itemPerPage > + TemplesData.length - 1 + ) && ( +
  • + { + setCurrentPage((prev) => prev + 1) + }} + > + {currentPage + 1} + +
  • + )} + +
  • + TemplesData.length - 1 + ) + ? 'paginate_button page-item next' + : 'paginate_button page-item next disabled' + } + > + setCurrentPage((prev) => prev + 1)} + > + Next + +
  • +
+
+
+
+
+
+
+
+
+
+
+ ) +} + +export default Temples diff --git a/src/views/configuration/Address.js b/src/views/configuration/Address.js index 9535cf4..e06dcb5 100644 --- a/src/views/configuration/Address.js +++ b/src/views/configuration/Address.js @@ -6,6 +6,7 @@ import { Link } from 'react-router-dom' import swal from 'sweetalert' import { isAutheticated } from 'src/auth' + function Address() { const token = isAutheticated() const [loading, setLoading] = useState(false) diff --git a/src/views/configuration/Logo.js b/src/views/configuration/Logo.js index f94b75f..362cc1a 100644 --- a/src/views/configuration/Logo.js +++ b/src/views/configuration/Logo.js @@ -31,7 +31,7 @@ function Logo() { configDetails.data.result.map((item) => { setHeaderlogo(item?.logo[0]?.Headerlogo) setFooterlogo(item?.logo[0]?.Footerlogo) - setAdminlogo(item?.logo[0].Adminlogo) + setAdminlogo(item?.logo[0]?.Adminlogo) }) } getConfiguration() @@ -58,17 +58,19 @@ function Logo() { formdata.append('Footerlogo', Footerlogo) formdata.append('Adminlogo', Adminlogo) - let res = await axios.post(`/api/config/logo`, formdata, { + await axios.post(`/api/config/logo`, formdata, { headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'multipart/formdata', 'Access-Control-Allow-Origin': '*', }, - }) - if (res) { + }).then((res) => { setLoading(false) swal('Success!', res.data.message, res.data.status) } + ).catch(error => { + console.log(error) + }) } return ( @@ -93,25 +95,26 @@ function Logo() { htmlFor="basicpill-phoneno-input" className="label-100 mt-3" > - Logo htmlFor Website Header(148 x 48 px) + {/* Logo htmlFor Website Header(148 x 48 px) */}
{ setHeaderlogo(e.target.files[0]) if (e.target.files && e.target.files[0]) { setHeaderlogoUrl({ image: URL.createObjectURL(e.target.files[0]), }) + console.log(setHeaderlogoUrl) } }} - className="form-control input-field col-md-6 d-inline-block" + className="form-control input-field mb-3 col-md-6 d-inline-block" id="basicpill-phoneno-input" /> {display ? ( - header logo - Logo htmlFor Website Footer(148 x 48 px) + {/* Logo htmlFor Website Footer(148 x 48 px) */} {' '} {display ? ( @@ -154,7 +157,7 @@ function Logo() { htmlFor="basicpill-phoneno-input" className="label-100 mt-2 row ms-1" > - Logo htmlFor Admin Header(148 x 48 px) + {/* Logo htmlFor Admin Header(148 x 48 px) */} { const [data, setData] = useState({ city_name: '', state: '', - _id: 'Loading', - createdAt: new Date(), + }) const [loading, setLoading] = useState(false) const [limiter, setLimiter] = useState({ @@ -89,10 +88,11 @@ const AddCity = () => { button: 'Return', }) setLoading(false) - navigate.push('/cities', { replace: true }) + navigate('/cities', { replace: true }) }) .catch((err) => { setLoading(false) + swal({ title: 'Warning', text: 'Something went wrong!', @@ -198,14 +198,8 @@ const AddCity = () => { )}
-
- - -
-
- - -
+ + diff --git a/src/views/configuration/cities/Cities.js b/src/views/configuration/cities/Cities.js index 96ad62d..2451325 100644 --- a/src/views/configuration/cities/Cities.js +++ b/src/views/configuration/cities/Cities.js @@ -152,7 +152,7 @@ const Cities = () => { className="table table-centered table-nowrap" style={{ border: '1px solid' }} > - + City Name State Name diff --git a/src/views/configuration/cities/EditCity.js b/src/views/configuration/cities/EditCity.js index 65cc090..2407ae4 100644 --- a/src/views/configuration/cities/EditCity.js +++ b/src/views/configuration/cities/EditCity.js @@ -15,8 +15,7 @@ const EditCity = () => { const [data, setData] = useState({ city_name: '', state: '', - _id: 'Loading', - createdAt: new Date(), + }) const [loading, setLoading] = useState(false) const [limiter, setLimiter] = useState({ @@ -206,7 +205,7 @@ const EditCity = () => { )} -
+ {/*
@@ -218,7 +217,7 @@ const EditCity = () => { className="form-control" disabled /> -
+ */} diff --git a/src/views/configuration/states/AddState.js b/src/views/configuration/states/AddState.js index d8402c7..5d7ff52 100644 --- a/src/views/configuration/states/AddState.js +++ b/src/views/configuration/states/AddState.js @@ -34,7 +34,7 @@ const AddState = () => { } const handleSubmit = () => { - if (data.state_code.trim() === '' || data.state_name.trim() === '') { + if (data.state_name.trim() === '') { swal({ title: 'Warning', text: 'Fill all mandatory fields', @@ -145,7 +145,7 @@ const AddState = () => { Remaining characters : {limiter.state_nameHas}

-
+ {/*
@@ -160,7 +160,7 @@ const AddState = () => {

Remaining characters : {limiter.state_codeHas}

-
+
*/} diff --git a/src/views/configuration/states/EditStates.js b/src/views/configuration/states/EditStates.js index f21585b..a047bbf 100644 --- a/src/views/configuration/states/EditStates.js +++ b/src/views/configuration/states/EditStates.js @@ -61,7 +61,7 @@ const EditState = () => { } const handleSubmit = () => { - if (data.state_code.trim() === '' || data.state_name.trim() === '') { + if (data.state_name.trim() === '') { swal({ title: 'Warning', text: 'Fill all mandatory fields', @@ -172,7 +172,7 @@ const EditState = () => { Remaining characters : {limiter.state_nameHas}

-
+ {/*
@@ -187,7 +187,7 @@ const EditState = () => {

Remaining characters : {limiter.state_codeHas}

-
+
*/} diff --git a/src/views/configuration/states/States.js b/src/views/configuration/states/States.js index ae2404f..77713eb 100644 --- a/src/views/configuration/states/States.js +++ b/src/views/configuration/states/States.js @@ -152,10 +152,10 @@ const States = () => { className="table table-centered table-nowrap" style={{ border: '1px solid' }} > - + State Name - State Code (GST) + {/* State Code (GST) */} Created On Actions @@ -179,7 +179,7 @@ const States = () => { return ( {city.state_name} - {city.state_code} + {/* {city.state_code} */} {new Date(city.createdAt).toLocaleString('en-IN', { weekday: 'short',