Skip to content

C
CmsPetrolPay
Commit a18e4537 by tdgiang
Options

update build

parent 03e4f965
Showing with 92 additions and 70 deletions
src/app/views/landingpage/package/Create.js
......@@ -37,24 +37,35 @@ const SimpleForm = (props) => {
const handleSubmit = async (event) => {
const newValue = trimObject(state)
props.showLoading()
const res = await createPackage({
...newValue,
status: 1,
outstand: 1,
func_id_add: listChecked,
price: newValue.price != '' ? null : newValue.price,
})
props.hideLoading()
if (res.data.code == 200) {
history.push('/package')
if (
isNumeric(newValue.price) ||
newValue.price == '' ||
!newValue.price
) {
props.showLoading()
const res = await createPackage({
...newValue,
status: 1,
outstand: 1,
func_id_add: listChecked,
price: newValue.price != '' ? newValue.price : null,
})
props.hideLoading()
if (res.data.code == 200) {
toast.success('Thêm mới gói thành công!', {
history.push('/package')
if (res.data.code == 200) {
toast.success('Thêm mới gói thành công!', {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
toast.warn('Đơn giá không đúng định dạng', {
theme: 'colored',
})
}
......@@ -136,8 +147,6 @@ const SimpleForm = (props) => {
type="text"
name="price"
value={toPriceVndInput(price) || ''}
validators={['isNumber']}
errorMessages={['Trường này phải nhập số ']}
/>
</Grid>
<Grid row container item xs={12} sm={12}>
......
src/app/views/landingpage/package/Update.js
......@@ -61,22 +61,33 @@ const SimpleForm = (props) => {
const handleSubmit = async (event) => {
const newValue = trimObject(state)
props.showLoading()
const res = await updatePackage({
...newValue,
func_id_add: listChecked,
price: newValue.price != '' ? null : newValue.price,
})
props.hideLoading()
if (res.data.code == 200) {
history.push('/package')
if (
isNumeric(newValue.price) ||
newValue.price == '' ||
!newValue.price
) {
props.showLoading()
const res = await updatePackage({
...newValue,
func_id_add: listChecked,
price: newValue.price != '' ? newValue.price : null,
})
props.hideLoading()
if (res.data.code == 200) {
toast.success('Cập nhật gói thành công!', {
history.push('/package')
if (res.data.code == 200) {
toast.success('Cập nhật gói thành công!', {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
toast.warn('Đơn giá không đúng định dạng', {
theme: 'colored',
})
}
......@@ -157,8 +168,6 @@ const SimpleForm = (props) => {
type="text"
name="price"
value={toPriceVndInput(price) || ''}
validators={['isNumber']}
errorMessages={['Trường này phải nhập số ']}
/>
</Grid>
<Grid row container item xs={12} sm={12}>
......
src/app/views/landingpage/priceProduct/Create.js
......@@ -57,21 +57,32 @@ const SimpleForm = (props) => {
const history = useHistory()
const handleSubmit = async (event) => {
const newValue = trimObject(state)
props.showLoading()
const res = await createPriceProduct({
...newValue,
status: 1,
})
props.hideLoading()
if (res.data.code == 200) {
history.push('/price-product')
if (
isNumeric(newValue.price) ||
newValue.price == '' ||
!newValue.price
) {
props.showLoading()
const res = await createPriceProduct({
...newValue,
status: 1,
price: newValue.price != '' ? newValue.price : null,
})
props.hideLoading()
if (res.data.code == 200) {
toast.success('Tạo sản phẩm thành công!', {
history.push('/price-product')
if (res.data.code == 200) {
toast.success('Tạo sản phẩm thành công!', {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
toast.warn('Đơn giá không đúng định dạng', {
theme: 'colored',
})
}
......@@ -158,15 +169,11 @@ const SimpleForm = (props) => {
<TextValidator
variant="outlined"
className="mb-4 w-full"
label="Đơn giá *"
label="Đơn giá"
onChange={handleChange}
name="price"
type="text"
value={toPriceVndInput(price) || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid xs={6} sm={6} item>
......
src/app/views/landingpage/priceProduct/Index.js
......@@ -66,13 +66,13 @@ const ToolNotificate = (props) => {
if (isInit) {
setPageIndex(0)
res = await getListPriceProduct({
func_name: searchDebount,
cons_name: searchDebount,
page_no: 0,
page_size: pageSize,
})
} else {
res = await getListPriceProduct({
func_name: searchDebount,
cons_name: searchDebount,
page_no: pageIndex + 1,
page_size: pageSize,
})
......
src/app/views/landingpage/priceProduct/Update.js
......@@ -14,7 +14,7 @@ import { showLoading, hideLoading } from 'app/redux/actions/loadingAction'
import { toast } from 'react-toastify'
import { Breadcrumb, SimpleCard } from 'app/components'
import { Link, useHistory, useLocation } from 'react-router-dom'
import { trimObject, toPriceVndInput } from 'app/config/Function'
import { trimObject, toPriceVndInput, isNumeric } from 'app/config/Function'
import { connect } from 'react-redux'
import localStorageService from 'app/services/localStorageService'
import { useTranslation } from 'react-i18next'
......@@ -77,19 +77,30 @@ const SimpleForm = (props) => {
const handleSubmit = async (event) => {
const newValue = trimObject(state)
props.showLoading()
const res = await updatePriceProduct({
...newValue,
})
props.hideLoading()
if (res.data.code == 200) {
history.push('/price-product')
if (
isNumeric(newValue.price) ||
newValue.price == '' ||
!newValue.price
) {
const res = await updatePriceProduct({
...newValue,
price: newValue.price != '' ? newValue.price : null,
})
props.hideLoading()
if (res.data.code == 200) {
toast.success('Cập nhật sản phẩm thành công!', {
history.push('/price-product')
if (res.data.code == 200) {
toast.success('Cập nhật sản phẩm thành công!', {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
} else {
toast.error(t(res.data.error), {
toast.warn('Đơn giá không đúng định dạng', {
theme: 'colored',
})
}
......@@ -159,7 +170,7 @@ const SimpleForm = (props) => {
<TextValidator
variant="outlined"
className="mb-4 w-full"
label="Đơn vị tính *"
label="Đơn vị tính"
onChange={handleChange}
type="text"
name="unit"
......@@ -175,15 +186,11 @@ const SimpleForm = (props) => {
<TextValidator
variant="outlined"
className="mb-4 w-full"
label="Đơn giá *"
label="Đơn giá"
onChange={handleChange}
name="price"
type="text"
value={toPriceVndInput(price) || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
{type_caculator && (
......
src/app/views/landingpage/register/View.js
......@@ -75,16 +75,6 @@ function CustomerView(props) {
}}
/>
</Grid>
{checkRole(user, '/package-function/create') ? (
<Link to="/package-function/create">
<Button
variant="contained"
className={'bg-light-primary'}
>
<span className={'text-primary'}>Thêm mới</span>
</Button>
</Link>
) : null}
</Grid>
<Table
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment