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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!50
This commit is contained in:
ilham dwi pratama 2022-01-06 04:33:27 +00:00
commit ee5c097088
8 changed files with 77 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/PartnerComponent.js
View File

@ -421,8 +421,8 @@ export const PartnerComponent = observer((props) => {
message: "Phone number should contain just number",
},
{
pattern: /^[\d]{2,12}$/,
message: "Phone number should be less than 12 character",
pattern: /^[\d]{10,12}$/,
message: "Phone number should be 10 - 12 character",
},
]}
>

6
src/component/SubcategoryComponent.js
View File

@ -251,7 +251,7 @@ export const SubcategoryComponent = observer((props) => {
>
<Input />
</Form.Item>
{!idData && (
{/* {!idData && ( */}
<Form.Item
name="categoryId"
label="Categories"
@ -259,13 +259,13 @@ export const SubcategoryComponent = observer((props) => {
>
<Select placeholder="Select Category" allowClear>
{store.category.data.map((item) => (
<Option value={item.id} key={item.id}>
<Option value={item.id} key={item.id} defaultValue={item.name}>
{item.name}
</Option>
))}
</Select>
</Form.Item>
)}
{/* )} */}
</Form>
</Modal>
</div>

16
src/pages/App/DesktopLayout.js
View File

@ -196,14 +196,6 @@ export const DesktopLayout = observer(() => {
<span>Produk</span>
</Link>
</Menu.Item>
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="category">
<Link to={LINKS.CATEGORY}>
<FileAddOutlined />
<span>Kategori</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="sub-category">
<Link to={LINKS.SUBCATEGORY}>
@ -214,6 +206,14 @@ export const DesktopLayout = observer(() => {
)}
</SubMenu>
)}
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="category">
<Link to={LINKS.CATEGORY}>
<FileAddOutlined />
<span>Kategori</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Supervisor" && (
<Menu.Item key="product">
<Link to={LINKS.PRODUCT}>

28
src/pages/App/MenuList.js
View File

@ -60,12 +60,12 @@ export const MenuList = observer((props) => {
</Menu.Item>
)}
{store.authentication.userData.role === "Admin Partner" && (
<Menu.Item key="home">
<Link to={LINKS.HOME}>
<HomeOutlined />
<span>Beranda</span>
</Link>
</Menu.Item>
<Menu.Item key="home">
<Link to={LINKS.HOME}>
<HomeOutlined />
<span>Beranda</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="membership">
@ -125,14 +125,6 @@ export const MenuList = observer((props) => {
<span>Produk</span>
</Link>
</Menu.Item>
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="category">
<Link to={LINKS.CATEGORY}>
<FileAddOutlined />
<span>Kategori</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="sub-category">
<Link to={LINKS.SUBCATEGORY}>
@ -141,6 +133,14 @@ export const MenuList = observer((props) => {
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Admin" && (
<Menu.Item key="category">
<Link to={LINKS.CATEGORY}>
<FileAddOutlined />
<span>Kategori</span>
</Link>
</Menu.Item>
)}
</SubMenu>
)}
{store.authentication.userData.role === "Admin Partner" && (

2
src/pages/Membership/Membership.js
View File

@ -197,7 +197,7 @@ export const Membership = observer(() => {
},
{
title: "Role",
dataIndex: "roleName",
dataIndex: ["roles","name"],
key: "role",
},
{

7
src/pages/Payback/Payback.js
View File

@ -33,6 +33,7 @@ import { ModalLoaderContext } from "../../utils/modal";
import { appConfig } from "../../config/app";
import { capitalize } from "lodash";
import { PAYBACK_STATUS } from "../../constants/payback";
import moment from "moment";
const { Search } = Input;
const { RangePicker } = DatePicker;
@ -235,13 +236,11 @@ export const Payback = observer(() => {
const data = form.getFieldsValue();
//console.log(data);
store.payback.filterMembership = filterMembership;
store.payback.filterStart = data.start_date;
store.payback.filterEnd = data.end_date;
store.payback.filterStart = data.start_date ? (moment(data.start_date).format('YYYY-MM-DD') + ' 00:00:00') : null;
store.payback.filterEnd = data.end_date ? (moment(data.end_date).format('YYYY-MM-DD') + ' 23:59:59') : null;
modalLoader.setLoading(true);
await store.payback.getDataConfirmation();
modalLoader.setLoading(false);
form.resetFields();
setFilterMembership([]);
store.payback.visibleModalFilterPayback = false;
};

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

@ -26,7 +26,7 @@ import { LINKS } from "../../routes/app";
import { ModalLoaderContext } from "../../utils/modal";
import { appConfig } from "../../config/app";
import { PAYBACK_STATUS } from "../../constants/payback";
import moment from 'moment';
import moment from "moment";
const { Search } = Input;
@ -39,7 +39,6 @@ export const PaybackCreated = observer(() => {
const [initialData, setInitialData] = useState({});
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => {
const init = async () => {
try {
@ -90,12 +89,35 @@ export const PaybackCreated = observer(() => {
dataIndex: "status",
key: "status",
width: "10%",
render: (text) => (
render: (text, record) => (
// <Tag
// color={PAYBACK_STATUS[text] === PAYBACK_STATUS[3] ? "cyan" : "red"}
// style={{ color: "#4F566B" }}
// >
// {PAYBACK_STATUS[text]}
// </Tag>
<Tag
color={PAYBACK_STATUS[text] === PAYBACK_STATUS[3] ? "cyan" : "red"}
style={{ color: "#4F566B" }}
color={
record.status === 0
? "purple"
: record.status === 1
? "blue"
: record.status === 2
? "warning"
: record.status === 3
? "success"
: "red"
}
>
{PAYBACK_STATUS[text]}
{record.status === 0
? "Pending"
: record.status === 1
? "Success"
: record.status === 2
? "Failed"
: record.status === 3
? "Approved"
: "Rejected"}
</Tag>
),
},
@ -133,10 +155,14 @@ export const PaybackCreated = observer(() => {
// 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('YYYY-MM-DD HH:mm:ss');
const akhir=store.payback.filterEnd = moment(data.end_date).format('YYYY-MM-DD HH:mm:ss');
console.log(awal)
console.log(akhir)
const awal = (store.payback.filterStart = moment(data.start_date).format(
"YYYY-MM-DD 00:00:00"
));
const akhir = (store.payback.filterEnd = moment(data.end_date).format(
"YYYY-MM-DD HH:mm:ss"
));
console.log(awal);
console.log(akhir);
modalLoader.setLoading(true);
await store.payback.getDataCreated();
modalLoader.setLoading(false);
@ -189,9 +215,9 @@ export const PaybackCreated = observer(() => {
<Row style={{ marginBottom: 20 }}>
<Col span={12}>
<Button
onClick={() => {
store.payback.visibleModalFilterCreate = true;
}}
onClick={() => {
store.payback.visibleModalFilterCreate = true;
}}
>
<FilterOutlined />
Filter
@ -309,7 +335,7 @@ export const PaybackCreated = observer(() => {
visible={store.payback.visibleModalFilterCreate}
title={"Filter"}
footer={footerLayoutFilter}
onCancel={async() => {
onCancel={async () => {
//form.resetFields();
store.payback.filterStart = null;
store.payback.filterEnd = null;

7
src/store/payback.js
View File

@ -21,6 +21,10 @@ export class Payback {
filterStart = null;
filterEnd = null;
filterStartConfirmation = null;
filterEndConfirmation = null;
//filter created
visibleModalFilterCreate = false;
constructor(ctx) {
@ -33,6 +37,7 @@ export class Payback {
const response = await http.get(
`/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}&start=${this.filterStart}&end=${this.filterEnd}`
);
console.log(response)
this.dataCreated =
response.body.data.map((item, idx) => {
item.key = idx;
@ -48,7 +53,7 @@ export class Payback {
async getDataConfirmation() {
try {
const response = await http.get(
`/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}`
`/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}&start=${this.filterStart}&end=${this.filterEnd}&sender=${this.filterMembership}`
);
console.log(response);
this.dataConfirmation =