Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging
This commit is contained in:
commit
758911d3a0
|
|
@ -167,7 +167,8 @@ export const DetailUser = observer(() => {
|
|||
const handleSubmitExport = async () => {
|
||||
const date = formExport.getFieldsValue();
|
||||
const dataDate ={
|
||||
dateStart: moment(date.tanggal_export).format("YYYY-MM-DD")
|
||||
dateStart: moment(date.start_date).format("YYYY-MM-DD"),
|
||||
dateEnd: moment(date.end_date).format("YYYY-MM-DD")
|
||||
}
|
||||
modalLoader.setLoading(true);
|
||||
try {
|
||||
|
|
@ -207,7 +208,7 @@ export const DetailUser = observer(() => {
|
|||
render: (text, record) => {
|
||||
return (
|
||||
<Text>
|
||||
{format(parseISO(record.transaction_date), "dd MMMM yyyy")}
|
||||
{moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy")}
|
||||
</Text>
|
||||
);
|
||||
},
|
||||
|
|
@ -828,8 +829,8 @@ export const DetailUser = observer(() => {
|
|||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = pageNumber - 1;
|
||||
store.transaction.pageSizeHistoryTopUp = page.pageSize;
|
||||
store.transaction.pageHistoryTopUp = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
|
|
@ -855,15 +856,15 @@ export const DetailUser = observer(() => {
|
|||
position={"top"}
|
||||
pagination={{
|
||||
onChange: async (page, pageSize) => {
|
||||
store.transaction.pageSize = pageSize;
|
||||
store.transaction.page = page - 1;
|
||||
store.transaction.pageSizeHistoryTopUp = pageSize;
|
||||
store.transaction.pageHistoryTopUp = page - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
},
|
||||
pageSize: store.transaction.pageSize,
|
||||
total: store.transaction.total_data,
|
||||
current: store.transaction.page + 1,
|
||||
pageSize: store.transaction.pageSizeHistoryTopUp,
|
||||
total: store.transaction.total_dataHistoryTopUp,
|
||||
current: store.transaction.pageHistoryTopUp + 1,
|
||||
style: { marginBottom: "1rem", marginRight: "1rem" },
|
||||
}}
|
||||
dataSource={store.transaction.dataHistoryTopUp}
|
||||
|
|
@ -899,10 +900,7 @@ export const DetailUser = observer(() => {
|
|||
<br />
|
||||
<small>
|
||||
Transaction Date :{" "}
|
||||
{format(
|
||||
parseISO(item.transaction_date),
|
||||
"dd-MM-yyyy hh:mm:ss"
|
||||
)}
|
||||
{moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy hh:mm:ss")}
|
||||
</small>{" "}
|
||||
<br />
|
||||
</p>
|
||||
|
|
@ -1149,8 +1147,15 @@ export const DetailUser = observer(() => {
|
|||
<Col span={24}>
|
||||
<Form layout="vertical" name="filter" form={formExport}>
|
||||
<Form.Item
|
||||
name="tanggal_export"
|
||||
label="Tanggal"
|
||||
name="start_date"
|
||||
label="Dari"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="end_date"
|
||||
label="Sampai"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ export const Profile = observer(() => {
|
|||
render: (text, record) => {
|
||||
return (
|
||||
<Text>
|
||||
{format(parseISO(record.transaction_date), "dd MMMM yyyy HH:mm:ss")}
|
||||
{moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy HH:mm:ss")}
|
||||
</Text>
|
||||
);
|
||||
},
|
||||
|
|
@ -389,7 +389,8 @@ export const Profile = observer(() => {
|
|||
const handleSubmitExport = async () => {
|
||||
const date = formExport.getFieldsValue();
|
||||
const dataDate ={
|
||||
dateStart: moment(date.tanggal_export).format("YYYY-MM-DD")
|
||||
dateStart: moment(date.start_date).format("YYYY-MM-DD"),
|
||||
dateEnd: moment(date.end_date).format("YYYY-MM-DD")
|
||||
}
|
||||
modalLoader.setLoading(true);
|
||||
try {
|
||||
|
|
@ -600,16 +601,16 @@ export const Profile = observer(() => {
|
|||
dataSource={store.transaction.dataHistoryTopUpProfile}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.transaction.pageSize,
|
||||
pageSize: store.transaction.pageSizeHistoryTopUpProfile,
|
||||
total: store.transaction.total_dataHistoryTopUpProfile,
|
||||
current: store.transaction.page + 1,
|
||||
current: store.transaction.pageHistoryTopUpProfile + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = pageNumber - 1;
|
||||
store.transaction.pageSizeHistoryTopUpProfile = page.pageSize;
|
||||
store.transaction.pageHistoryTopUpProfile = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await store.transaction.getDataHistoryTopUpProfile(
|
||||
store.authentication.profileData?.id
|
||||
|
|
@ -628,17 +629,17 @@ export const Profile = observer(() => {
|
|||
onChange: async (page, pageSize) => {
|
||||
console.log(page, "Page");
|
||||
console.log(pageSize, "Page size");
|
||||
store.transaction.pageSize = pageSize;
|
||||
store.transaction.page = page - 1;
|
||||
store.transaction.pageSizeHistoryTopUpProfile = pageSize;
|
||||
store.transaction.pageHistoryTopUpProfile = page - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await store.transaction.getDataHistoryTopUpProfile(
|
||||
store.authentication.profileData?.id
|
||||
);
|
||||
modalLoader.setLoading(false);
|
||||
},
|
||||
pageSize: store.transaction.pageSize,
|
||||
pageSize: store.transaction.pageSizeHistoryTopUpProfile,
|
||||
total: store.transaction.total_dataHistoryTopUpProfile,
|
||||
current: store.transaction.page + 1,
|
||||
current: store.transaction.pageHistoryTopUpProfile + 1,
|
||||
style: { marginBottom: "1rem", marginRight: "1rem" },
|
||||
}}
|
||||
style={{ padding: 0 }}
|
||||
|
|
@ -677,10 +678,7 @@ export const Profile = observer(() => {
|
|||
<br />
|
||||
<small>
|
||||
Transaction Date :{" "}
|
||||
{format(
|
||||
parseISO(item.transaction_date),
|
||||
"dd-MM-yyyy"
|
||||
)}
|
||||
{moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy")}
|
||||
</small>{" "}
|
||||
<br />
|
||||
</p>
|
||||
|
|
@ -853,16 +851,16 @@ export const Profile = observer(() => {
|
|||
dataSource={store.transaction.dataHistorybillProfile}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.transaction.pageSize,
|
||||
pageSize: store.transaction.pageSizeHistorybillProfile,
|
||||
total: store.transaction.total_dataHistorybillProfile,
|
||||
current: store.transaction.page + 1,
|
||||
current: store.transaction.pageHistorybillProfile + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = pageNumber - 1;
|
||||
store.transaction.pageSizeHistorybillProfile = page.pageSize;
|
||||
store.transaction.pageHistorybillProfile = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await store.transaction.getDataHistoryCheckBill();
|
||||
modalLoader.setLoading(false);
|
||||
|
|
@ -879,15 +877,15 @@ export const Profile = observer(() => {
|
|||
onChange: async (page, pageSize) => {
|
||||
console.log(page, "Page");
|
||||
console.log(pageSize, "Page size");
|
||||
store.transaction.pageSize = pageSize;
|
||||
store.transaction.page = page - 1;
|
||||
store.transaction.pageSizeHistorybillProfile = pageSize;
|
||||
store.transaction.pageHistorybillProfile = page - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await store.transaction.getDataHistoryCheckBill();
|
||||
modalLoader.setLoading(false);
|
||||
},
|
||||
pageSize: store.transaction.pageSize,
|
||||
pageSize: store.transaction.pageSizeHistorybillProfile,
|
||||
total: store.transaction.total_dataHistorybillProfile,
|
||||
current: store.transaction.page + 1,
|
||||
current: store.transaction.pageHistorybillProfile + 1,
|
||||
style: { marginBottom: "1rem", marginRight: "1rem" },
|
||||
}}
|
||||
style={{ padding: 0 }}
|
||||
|
|
@ -926,10 +924,7 @@ export const Profile = observer(() => {
|
|||
<br />
|
||||
<small>
|
||||
Transaction Date :{" "}
|
||||
{format(
|
||||
parseISO(item.transaction_date),
|
||||
"dd-MM-yyyy"
|
||||
)}
|
||||
{ moment(new Date (item.created_at).toISOString().slice(0, -1)).format("MM-DD-YYYY dd-MM-yyyy") }
|
||||
</small>{" "}
|
||||
<br />
|
||||
</p>
|
||||
|
|
@ -1038,8 +1033,16 @@ export const Profile = observer(() => {
|
|||
<Col span={24}>
|
||||
<Form layout="vertical" name="filter" form={formExport}>
|
||||
<Form.Item
|
||||
name="tanggal_export"
|
||||
label="Tanggal"
|
||||
name="start_date"
|
||||
label="Dari"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
name="end_date"
|
||||
label="Sampai"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
|
|
|
|||
|
|
@ -46,9 +46,13 @@ export class Transaction {
|
|||
dataHistoryTopUp = [];
|
||||
total_dataHistoryTopUp = 0;
|
||||
|
||||
pageHistorybillProfile = 0;
|
||||
pageSizeHistorybillProfile = 10;
|
||||
dataHistorybillProfile = [];
|
||||
total_dataHistorybillProfile = 0;
|
||||
|
||||
pageHistoryTopUpProfile = 0;
|
||||
pageSizeHistoryTopUpProfile = 10;
|
||||
dataHistoryTopUpProfile = [];
|
||||
total_dataHistoryTopUpProfile = 0;
|
||||
|
||||
|
|
@ -141,12 +145,12 @@ export class Transaction {
|
|||
|
||||
async getDataHistoryCheckBill() {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/transaction/check-bill-history`
|
||||
);
|
||||
// const response = await http.get(
|
||||
// `/transaction/check-bill-history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`
|
||||
// `/transaction/check-bill-history`
|
||||
// );
|
||||
const response = await http.get(
|
||||
`/transaction/check-bill-history?page=${this.pageHistorybillProfile}&pageSize=${this.pageSizeHistorybillProfile}`
|
||||
);
|
||||
console.log("bill", response);
|
||||
this.dataHistorybillProfile = response.body.data ?? [];
|
||||
this.total_dataHistorybillProfile = response?.body?.count ?? 0;
|
||||
|
|
@ -183,7 +187,7 @@ export class Transaction {
|
|||
async getDataHistoryTopUp(id) {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
|
||||
`/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
|
||||
);
|
||||
console.log(response, 'get data history')
|
||||
this.dataHistoryTopUp = response.body.data ?? [];
|
||||
|
|
@ -196,7 +200,7 @@ export class Transaction {
|
|||
async getDataHistoryTopUpProfile(id) {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
|
||||
`/transaction/history-deposit-profile?page=${this.pageHistoryTopUpProfile}&pageSize=${this.pageSizeHistoryTopUpProfile}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
|
||||
);
|
||||
console.log(response, 'get data history Profile')
|
||||
this.dataHistoryTopUpProfile = response.body.data ?? [];
|
||||
|
|
@ -285,7 +289,7 @@ export class Transaction {
|
|||
}).then((response) => {
|
||||
var fileDownload = require('react-file-download');
|
||||
message.success("Success export");
|
||||
fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart}.xlsx`);
|
||||
fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart} - ${date.dateEnd}.xlsx`);
|
||||
return fileDownload;
|
||||
}).catch(function (error) {
|
||||
message.error("No data to export");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user