Bug fixing PPOB
This commit is contained in:
parent
d8df8ee4dd
commit
0a0043464e
|
@ -185,7 +185,7 @@ export const Payback = observer(() => {
|
||||||
const dataRoute = [
|
const dataRoute = [
|
||||||
{
|
{
|
||||||
route: LINKS.PAYBACK,
|
route: LINKS.PAYBACK,
|
||||||
name: "Konfirmasi Pembayaran"
|
name: "Konfirmasi Pembayaran",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -201,15 +201,6 @@ export const Payback = observer(() => {
|
||||||
: message.success(
|
: message.success(
|
||||||
response?.body?.message || `Success ${capitalize(type)} Payback`
|
response?.body?.message || `Success ${capitalize(type)} Payback`
|
||||||
);
|
);
|
||||||
// if (response.body.status !== 201 ) {
|
|
||||||
// message.error(
|
|
||||||
// response?.body?.message || `Failed ${capitalize(type)} Payback`
|
|
||||||
// );
|
|
||||||
// } else {
|
|
||||||
// message.success(
|
|
||||||
// response?.body?.message || `Success ${capitalize(type)} Payback`
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e, "apa errornya");
|
console.error(e, "apa errornya");
|
||||||
message.error(
|
message.error(
|
||||||
|
@ -532,46 +523,6 @@ export const Payback = observer(() => {
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Form>
|
</Form>
|
||||||
</Col>
|
</Col>
|
||||||
{/* <Col span={24}> */}
|
|
||||||
|
|
||||||
{/* <Title level={5} type={"secondary"} strong>
|
|
||||||
Date
|
|
||||||
</Title>
|
|
||||||
<RangePicker style={{ marginBottom: "20px", width: "100%" }} /> */}
|
|
||||||
{/* <Select
|
|
||||||
mode={"multiple"}
|
|
||||||
placeholder="Choose Category"
|
|
||||||
onChange={async (val) => handleFilterCategory(val)}
|
|
||||||
style={{ marginBottom: "20px", width: "100%" }}
|
|
||||||
value={store.product.filterCategory || []}
|
|
||||||
>
|
|
||||||
{store.category.data.map((item) => (
|
|
||||||
<Option value={item.id} key={item.id}>
|
|
||||||
{item.name}
|
|
||||||
</Option>
|
|
||||||
))}
|
|
||||||
</Select> */}
|
|
||||||
{/* </Col> */}
|
|
||||||
{/* <Col span={24}>
|
|
||||||
<Title level={5} type={"secondary"} strong>
|
|
||||||
Filter Sub-Categories
|
|
||||||
</Title>
|
|
||||||
<Select
|
|
||||||
mode={"multiple"}
|
|
||||||
placeholder="Choose Sub-Category"
|
|
||||||
onChange={(val) => {
|
|
||||||
setFilterSubCategories(val);
|
|
||||||
}}
|
|
||||||
style={{ marginBottom: "20px", width: "100%" }}
|
|
||||||
value={filterSubCategories}
|
|
||||||
>
|
|
||||||
{store.product.dataSubCategories.map((item) => (
|
|
||||||
<Option value={item.id} key={item.id}>
|
|
||||||
{item.name}
|
|
||||||
</Option>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
</Col> */}
|
|
||||||
</Row>
|
</Row>
|
||||||
</Modal>
|
</Modal>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -90,12 +90,6 @@ export const PaybackCreated = observer(() => {
|
||||||
key: "status",
|
key: "status",
|
||||||
width: "10%",
|
width: "10%",
|
||||||
render: (text, record) => (
|
render: (text, record) => (
|
||||||
// <Tag
|
|
||||||
// color={PAYBACK_STATUS[text] === PAYBACK_STATUS[3] ? "cyan" : "red"}
|
|
||||||
// style={{ color: "#4F566B" }}
|
|
||||||
// >
|
|
||||||
// {PAYBACK_STATUS[text]}
|
|
||||||
// </Tag>
|
|
||||||
<Tag
|
<Tag
|
||||||
color={
|
color={
|
||||||
record.status === 0
|
record.status === 0
|
||||||
|
@ -159,10 +153,6 @@ export const PaybackCreated = observer(() => {
|
||||||
const handleSubmitFilter = async () => {
|
const handleSubmitFilter = async () => {
|
||||||
const data = form.getFieldsValue();
|
const data = form.getFieldsValue();
|
||||||
console.log(data);
|
console.log(data);
|
||||||
//store.payback.filterMembership = filterMembership;
|
|
||||||
// const awal = format(parseISO(data.start_date), "dd-MM-yyyy")
|
|
||||||
// const akhir = format(parseISO(data.start_date), "dd-MM-yyyy")
|
|
||||||
//const awal= format(startOfDay(date.start_date()), 'yyyy-MM-dd 00:00')
|
|
||||||
const awal = (store.payback.filterStart = moment(data.start_date).format(
|
const awal = (store.payback.filterStart = moment(data.start_date).format(
|
||||||
"YYYY-MM-DD 00:00:00"
|
"YYYY-MM-DD 00:00:00"
|
||||||
));
|
));
|
||||||
|
@ -174,8 +164,6 @@ export const PaybackCreated = observer(() => {
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.payback.getDataCreated();
|
await store.payback.getDataCreated();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
// form.resetFields();
|
|
||||||
// setFilterMembership([]);
|
|
||||||
store.payback.visibleModalFilterCreate = false;
|
store.payback.visibleModalFilterCreate = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -134,16 +134,6 @@ export const ProductDetail = observer(() => {
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
</Col>
|
</Col>
|
||||||
{/* <Col lg={12} xs={24}>
|
|
||||||
<Row justify={"center"}>
|
|
||||||
<Col lg={24} xs={12}>
|
|
||||||
<Title strong level={3} style={styleSaldoTitle}>Saldo</Title>
|
|
||||||
</Col>
|
|
||||||
<Col lg={24} xs={12}>
|
|
||||||
<Text style={styleSaldoContent}>{store.authentication.profileData?.wallet}</Text>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Col> */}
|
|
||||||
</Row>
|
</Row>
|
||||||
<Row>
|
<Row>
|
||||||
<Col span={24}>
|
<Col span={24}>
|
||||||
|
@ -151,13 +141,6 @@ export const ProductDetail = observer(() => {
|
||||||
<Title strong level={3}>
|
<Title strong level={3}>
|
||||||
Product Price History
|
Product Price History
|
||||||
</Title>
|
</Title>
|
||||||
|
|
||||||
{/* <Button style={{marginBottom: '1rem'}} onClick={() => {
|
|
||||||
console.log('clicked filter')
|
|
||||||
}}>
|
|
||||||
<FilterOutlined/>
|
|
||||||
Filter
|
|
||||||
</Button> */}
|
|
||||||
<Table
|
<Table
|
||||||
columns={columns}
|
columns={columns}
|
||||||
dataSource={store.product.dataPriceHistory}
|
dataSource={store.product.dataPriceHistory}
|
||||||
|
|
|
@ -95,8 +95,6 @@ export const Profile = observer(() => {
|
||||||
));
|
));
|
||||||
console.log(awal);
|
console.log(awal);
|
||||||
console.log(akhir);
|
console.log(akhir);
|
||||||
// store.transaction.filterStart = data.start_date;
|
|
||||||
// store.transaction.filterEnd = data.end_date;
|
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.transaction.getDataHistoryTransaction();
|
await store.transaction.getDataHistoryTransaction();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
@ -270,83 +268,7 @@ export const Profile = observer(() => {
|
||||||
{store.authentication.profileData.superior?.username}
|
{store.authentication.profileData.superior?.username}
|
||||||
</Text>
|
</Text>
|
||||||
</Col>
|
</Col>
|
||||||
{/* {store.authentication.userData.role === "Retail" && (
|
|
||||||
<Row>
|
|
||||||
<Col span={12}>
|
|
||||||
<Text strong>Foto Identitas</Text>
|
|
||||||
</Col>
|
|
||||||
<Col span={12}>
|
|
||||||
<Text strong>Foto Toko</Text>
|
|
||||||
</Col>
|
|
||||||
<Col span={12}>
|
|
||||||
<Text>
|
|
||||||
<Image
|
|
||||||
src={
|
|
||||||
store.authentication.dataProfit.profileData
|
|
||||||
?.image_identity
|
|
||||||
? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_identity}`
|
|
||||||
: "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
|
||||||
}
|
|
||||||
style={{ width: "10vw" }}
|
|
||||||
/>
|
|
||||||
</Text>
|
|
||||||
</Col>
|
|
||||||
<Col span={12}>
|
|
||||||
<Text>
|
|
||||||
<Image
|
|
||||||
src={
|
|
||||||
store.authentication.dataProfit.profileData
|
|
||||||
?.image_store
|
|
||||||
? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_store}`
|
|
||||||
: "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
|
||||||
}
|
|
||||||
style={{ width: "10vw" }}
|
|
||||||
/>
|
|
||||||
</Text>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
)} */}
|
|
||||||
{store.authentication.userData.role === "Retail" && (
|
{store.authentication.userData.role === "Retail" && (
|
||||||
// <Row>
|
|
||||||
// <Col span={12}>
|
|
||||||
// <Text strong>Foto Identitas</Text>
|
|
||||||
// </Col>
|
|
||||||
// <Col span={12}></Col>
|
|
||||||
// <Col span={12}>
|
|
||||||
// <Text>
|
|
||||||
// <Image
|
|
||||||
// src={
|
|
||||||
// store.authentication.profileData.userDetail
|
|
||||||
// ?.image_identity
|
|
||||||
// ? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_identity}`
|
|
||||||
// : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
|
||||||
// }
|
|
||||||
// style={{ width: "10vw" }}
|
|
||||||
// />
|
|
||||||
// </Text>
|
|
||||||
// </Col>
|
|
||||||
// <Col span={24}>
|
|
||||||
// <Text strong>Foto Toko</Text>
|
|
||||||
// <Text>
|
|
||||||
// <Row>
|
|
||||||
// {JSON.parse(
|
|
||||||
// store.authentication.profileData.userDetail
|
|
||||||
// ?.image_store
|
|
||||||
// ).map((item) => (
|
|
||||||
// <Image
|
|
||||||
// src={
|
|
||||||
// store.authentication.profileData.userDetail
|
|
||||||
// ?.image_store
|
|
||||||
// ? `${appConfig.apiUrl}/config/image/${item}`
|
|
||||||
// : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
|
||||||
// }
|
|
||||||
// style={{ width: "10vw", marginRight: 15 }}
|
|
||||||
// />
|
|
||||||
// ))}
|
|
||||||
// </Row>
|
|
||||||
// </Text>
|
|
||||||
// </Col>
|
|
||||||
// </Row>
|
|
||||||
<Row>
|
<Row>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<Text strong>Foto Identitas</Text>
|
<Text strong>Foto Identitas</Text>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user