PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'devops-staging'

Browse Source 
Bug Fixing Membership

See merge request empatnusabangsa/ppob/ppob-frontend!100
This commit is contained in:
ajat sudrajat 2022-01-28 06:57:56 +00:00
commit dbd77fae4e
3 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/Membership/Konfirmasi.js
View File

@ -97,7 +97,9 @@ export const Konfirmasi = observer(() => {
{ {
title: "Foto Toko", title: "Foto Toko",
render: (text, record) => render: (text, record) =>
record.roles?.name !== "Sales" && record.user_detail?.image_store !== "[]" && record.user_detail?.image_store !== "\"\""? ( record.roles?.name !== "Sales" &&
record.user_detail?.image_store !== "[]" &&
record.user_detail?.image_store !== '""' ? (
<Button <Button
onClick={async () => { onClick={async () => {
setToko(record); setToko(record);
@ -457,13 +459,13 @@ export const Konfirmasi = observer(() => {
</Card> </Card>
))} ))}
</Row> </Row>
) : ) : (
<Image <Image
src={`${appConfig.apiUrl}/config/image/${identitas.user_detail?.image_identity}`} src={`${appConfig.apiUrl}/config/image/${identitas.user_detail?.image_identity}`}
alt="No image" alt="No image"
preview={false} preview={false}
/> />
} )}
</Modal> </Modal>
</div> </div>
); );

32
src/pages/Membership/MembershipModal.js
View File

@ -319,7 +319,13 @@ export const MembershipModal = ({
}} }}
/> />
</Form.Item> </Form.Item>
<Form.Item label="Upload Identity Image" name="image_identity"> <Form.Item
label="Upload identity image"
name="image_identity"
rules={[
{ required: true, message: "Please insert image identity" },
]}
>
<div> <div>
<Upload <Upload
listType="picture-card" listType="picture-card"
@ -399,7 +405,13 @@ export const MembershipModal = ({
}} }}
/> />
</Form.Item> </Form.Item>
<Form.Item label="Upload Identity Image" name="image_identity"> <Form.Item
label="Upload identity image"
name="image_identity"
rules={[
{ required: true, message: "Please insert image identity" },
]}
>
<div> <div>
<Upload <Upload
listType="picture-card" listType="picture-card"
@ -482,7 +494,13 @@ export const MembershipModal = ({
}} }}
/> />
</Form.Item> </Form.Item>
<Form.Item label="Upload Identity Image" name="image_identity"> <Form.Item
label="Upload identity image"
name="image_identity"
rules={[
{ required: true, message: "Please insert image identity" },
]}
>
<div> <div>
<Upload <Upload
listType="picture-card" listType="picture-card"
@ -525,7 +543,13 @@ export const MembershipModal = ({
</h5> </h5>
</div> </div>
</Form.Item> </Form.Item>
<Form.Item label="Upload Store Image" name="image_store"> <Form.Item
label="Upload foto toko tampak samping kanan,kiri dan depan"
name="image_store"
rules={[
{ required: true, message: "Please insert image store" },
]}
>
<div> <div>
<Upload <Upload
listType="picture-card" listType="picture-card"

13
src/pages/Payback/PaybackCreated.js
View File

@ -25,7 +25,6 @@ import { appConfig } from "../../config/app";
import { PAYBACK_STATUS } from "../../constants/payback"; import { PAYBACK_STATUS } from "../../constants/payback";
import moment from "moment"; import moment from "moment";
export const PaybackCreated = observer(() => { export const PaybackCreated = observer(() => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const store = useStore(); const store = useStore();
@ -125,7 +124,7 @@ export const PaybackCreated = observer(() => {
const dataRoute = [ const dataRoute = [
{ {
route: LINKS.PAYBACK_CREATED, route: LINKS.PAYBACK_CREATED,
name: "Buat Pembayaran" name: "Buat Pembayaran",
}, },
]; ];
@ -147,14 +146,12 @@ export const PaybackCreated = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
console.log(data); console.log(data);
const awal = (store.payback.filterStart = moment(data.start_date).format( store.payback.filterStart = moment(data.start_date).format(
"YYYY-MM-DD 00:00:00" "YYYY-MM-DD 00:00:00"
)); );
const akhir = (store.payback.filterEnd = moment(data.end_date).format( store.payback.filterEnd = moment(data.end_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
)); );
console.log(awal);
console.log(akhir);
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.payback.getDataCreated(); await store.payback.getDataCreated();
modalLoader.setLoading(false); modalLoader.setLoading(false);