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

Merge branch 'develop' into 'devops-production'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!159
This commit is contained in:
ajat sudrajat 2022-02-07 09:20:49 +00:00
commit 8a8e618d32
14 changed files with 91 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/CategoryComponent.js
View File

@ -211,8 +211,8 @@ export const CategoryComponent = observer((props) => {
)} )}
<Modal <Modal
visible={store.category.visibleModalCategory} visible={store.category.visibleModalCategory}
title={idData ? "Edit Category" : "Create a new Category"} title={idData ? "Edit Kategori" : "Buat Kategori Baru"}
okText={idData ? "Edit" : "Create"} okText={idData ? "Edit" : "Buat"}
cancelText="Batal" cancelText="Batal"
onCancel={() => { onCancel={() => {
form.resetFields(); form.resetFields();

20
src/component/ProductComponent.js
View File

@ -283,21 +283,11 @@ export const ProductComponent = observer((props) => {
<div> <div>
{store.ui.mediaQuery.isDesktop && ( {store.ui.mediaQuery.isDesktop && (
<Table <Table
style={ style={{
// store.authentication.userData.role === "Admin" cursor: "pointer",
// ? { textAlign: "center",
{ width: store.ui.mediaQuery.isMobile ? 250 : "",
cursor: "pointer", }}
textAlign: "center",
width: store.ui.mediaQuery.isMobile ? 250 : "",
}
// }
// : {
// textAlign: "center",
// width: store.ui.mediaQuery.isMobile ? 250 : "",
// }
}
columns={columns} columns={columns}
dataSource={ dataSource={
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner"

4
src/component/SubcategoryComponent.js
View File

@ -216,8 +216,8 @@ export const SubcategoryComponent = observer((props) => {
)} )}
<Modal <Modal
visible={store.subcategory.visibleModalSubcategory} visible={store.subcategory.visibleModalSubcategory}
title={idData ? "Edit Sub Category" : "Create a new sub category"} title={idData ? "Edit Sub Kategori" : "Buat Sub Kategori Baru"}
okText={idData ? "Edit" : "Create"} okText={idData ? "Edit" : "Buat"}
cancelText="Batal" cancelText="Batal"
onCancel={() => { onCancel={() => {
form.resetFields(); form.resetFields();

4
src/component/SupplierComponent.js
View File

@ -346,8 +346,8 @@ export const SupplierComponent = observer((props) => {
)} )}
<Modal <Modal
visible={store.supplier.visibleModalSupplier} visible={store.supplier.visibleModalSupplier}
title={idData ? "Edit Supplier" : "Create a new Supplier"} title={idData ? "Edit Supplier" : "Buat Supplier Baru"}
okText={idData ? "Edit" : "Create"} okText={idData ? "Edit" : "Buat"}
cancelText="Batal" cancelText="Batal"
onCancel={() => { onCancel={() => {
form.resetFields(); form.resetFields();

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

@ -506,6 +506,7 @@ export const DesktopLayout = observer(() => {
onVisibleChange={() => setClicked(!clicked)} onVisibleChange={() => setClicked(!clicked)}
> >
{store.authentication.userData.role !== "Admin" && {store.authentication.userData.role !== "Admin" &&
store.authentication.userData.role !== "Customer Service" &&
new Intl.NumberFormat("id-ID", { new Intl.NumberFormat("id-ID", {
style: "currency", style: "currency",
currency: "IDR", currency: "IDR",
@ -564,30 +565,33 @@ export const DesktopLayout = observer(() => {
width: "100%", width: "100%",
}} }}
></div> ></div>
{store.authentication.userData.role !== "Admin" && ( {store.authentication.userData.role !== "Admin" &&
<Card store.authentication.userData.role !== "Customer Service" && (
size="small" <Card
title={ size="small"
<span title={
style={{ <span
fontStyle: "bold", style={{
textAlign: "center", fontStyle: "bold",
}} textAlign: "center",
> }}
Saldo :{" "} >
{new Intl.NumberFormat("id-ID", { Saldo :{" "}
style: "currency", {new Intl.NumberFormat("id-ID", {
currency: "IDR", style: "currency",
}).format(store.authentication.profileData?.wallet || 0)} currency: "IDR",
</span> }).format(
} store.authentication.profileData?.wallet || 0
style={{ )}
marginRight: 10, </span>
width: 210, }
height: 31, style={{
}} marginRight: 10,
></Card> width: 210,
)} height: 31,
}}
></Card>
)}
<Popover <Popover
className={store.ui.mediaQuery.isDesktop ? "shadow" : null} className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
autoAdjustOverflow={true} autoAdjustOverflow={true}

4
src/pages/Membership/DetailUser.js
View File

@ -741,6 +741,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0;
setAction(true); setAction(true);
}} }}
> >
@ -777,6 +778,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem" }} style={{ marginBottom: "1rem" }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0;
setAction(true); setAction(true);
}} }}
> >
@ -858,6 +860,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />
@ -897,6 +900,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem" }} style={{ marginBottom: "1rem" }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />

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

@ -99,7 +99,7 @@ export const Konfirmasi = observer(() => {
render: (text, record) => render: (text, record) =>
record.roles?.name !== "Sales" && record.roles?.name !== "Sales" &&
(record.user_detail?.image_store !== "[]" || (record.user_detail?.image_store !== "[]" ||
record.user_detail?.image_store !== '""') ? ( record.user_detail?.image_store !== '""') ? (
<Button <Button
onClick={async () => { onClick={async () => {
setToko(record); setToko(record);
@ -236,7 +236,10 @@ export const Konfirmasi = observer(() => {
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent <BreadcumbComponent
data={ data={
store.authentication.userData.role === "Admin" ? routeData : dataRoute store.authentication.userData.role === "Admin" ||
store.authentication.userData.role === "Customer Service"
? routeData
: dataRoute
} }
/> />
<Card> <Card>

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

@ -323,7 +323,10 @@ export const Membership = observer(() => {
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent <BreadcumbComponent
data={ data={
store.authentication.userData.role === "Admin" ? routeData : dataRoute store.authentication.userData.role === "Admin" ||
store.authentication.userData.role === "Customer Service"
? routeData
: dataRoute
} }
/> />
<Card> <Card>
@ -334,6 +337,7 @@ export const Membership = observer(() => {
<Button <Button
onClick={() => { onClick={() => {
store.membership.visibleModalFilterMembership = true; store.membership.visibleModalFilterMembership = true;
store.membership.page = 0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />
@ -595,7 +599,7 @@ export const Membership = observer(() => {
</Col> </Col>
<Col span={24}> <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
Type Tipe
</Title> </Title>
<Select <Select
mode={"multiple"} mode={"multiple"}

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

@ -189,10 +189,10 @@ export const MembershipModal = ({
visible={visible} visible={visible}
title={ title={
initialData.isChangePassword initialData.isChangePassword
? "Change Member Password" ? "Ganti Password Anggota"
: initialData.id : initialData.id
? "Edit Member" ? "Edit Anggota"
: "Create a new Membership" : "Buat Anggota Baru"
} }
okText={initialData.id ? "Edit" : "Create"} okText={initialData.id ? "Edit" : "Create"}
cancelText="Batal" cancelText="Batal"

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

@ -35,7 +35,6 @@ import { capitalize } from "lodash";
import { PAYBACK_STATUS } from "../../constants/payback"; import { PAYBACK_STATUS } from "../../constants/payback";
import moment from "moment"; import moment from "moment";
export const Payback = observer(() => { export const Payback = observer(() => {
const { Option } = Select; const { Option } = Select;
const { Title } = Typography; const { Title } = Typography;
@ -274,7 +273,10 @@ export const Payback = observer(() => {
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent <BreadcumbComponent
data={ data={
store.authentication.userData.role === "Admin" ? routeData : dataRoute store.authentication.userData.role === "Admin" ||
store.authentication.userData.role === "Customer Service"
? routeData
: dataRoute
} }
/> />
<Card> <Card>
@ -501,7 +503,7 @@ export const Payback = observer(() => {
label="Dari Tanggal" label="Dari Tanggal"
rules={[{ required: true, message: "Please input Date!" }]} rules={[{ required: true, message: "Please input Date!" }]}
> >
<DatePicker style={{ width: "100%" }}/> <DatePicker style={{ width: "100%" }} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="end_date" name="end_date"

4
src/pages/Payback/PaybackModal.js
View File

@ -98,8 +98,8 @@ export const PaybackModal = ({ initialData }) => {
return ( return (
<Modal <Modal
visible={store.payback.visibleModalPayback} visible={store.payback.visibleModalPayback}
title={"Create a new Created"} title={"Buat Pembayaran Baru"}
okText={"Create"} okText={"Buat"}
cancelText="Batal" cancelText="Batal"
onCancel={handleCancel} onCancel={handleCancel}
onOk={() => { onOk={() => {

9
src/pages/Product/Product.js
View File

@ -183,7 +183,8 @@ export const Product = observer(() => {
<BreadcumbComponent <BreadcumbComponent
data={ data={
store.authentication.userData.role === "Admin" || store.authentication.userData.role === "Admin" ||
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner" ||
store.authentication.userData.role === "Customer Service"
? routeData ? routeData
: dataRoute : dataRoute
} }
@ -195,7 +196,7 @@ export const Product = observer(() => {
<Button <Button
onClick={() => { onClick={() => {
store.product.visibleModalFilterProduct = true; store.product.visibleModalFilterProduct = true;
store.product.page=0 store.product.page = 0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />
@ -249,8 +250,8 @@ export const Product = observer(() => {
<Modal <Modal
visible={visibleModalUpload} visible={visibleModalUpload}
title={"Upload Excel Product"} title={"Upload Excel Produk"}
okText={"Create"} okText={"Buat"}
cancelText="Batal" cancelText="Batal"
onCancel={() => { onCancel={() => {
form.resetFields(); form.resetFields();

44
src/pages/Profile/Profile.js
View File

@ -284,8 +284,8 @@ export const Profile = observer(() => {
try { try {
modalLoader.setLoading(true); modalLoader.setLoading(true);
const response = await store.membership.changePassword(id, data); const response = await store.membership.changePassword(id, data);
console.log(id,"id yang masuk") console.log(id, "id yang masuk");
console.log(data,"data yang masuk") console.log(data, "data yang masuk");
message.success(response?.body?.message || "Berhasil Ganti Password"); message.success(response?.body?.message || "Berhasil Ganti Password");
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
@ -301,7 +301,8 @@ export const Profile = observer(() => {
<BreadcumbComponent <BreadcumbComponent
data={ data={
store.authentication.userData.role === "Admin" || store.authentication.userData.role === "Admin" ||
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner" ||
store.authentication.userData.role === "Customer Service"
? routeData ? routeData
: dataRoute : dataRoute
} }
@ -430,16 +431,11 @@ export const Profile = observer(() => {
{store.authentication.userData.role === "Retail" && ( {store.authentication.userData.role === "Retail" && (
<Button <Button
onClick={() => { onClick={() => {
// setInitialData({ console.log(store.authentication.profileData?.id, "id nya");
// id: store.membership.dataDetail.id, console.log(
// name: store.membership.dataDetail.userDetail.name, store.authentication.profileData?.userDetail.id,
// username: store.membership.dataDetail.username, "id member"
// phone_number: );
// store.membership.dataDetail.userDetail.phone_number,
// roleId: store.membership.dataDetail.roles.id,
// isChangePassword: true,
console.log(store.authentication.profileData?.id,"id nya")
console.log(store.authentication.profileData?.userDetail.id,"id member")
setVisible(true); setVisible(true);
}} }}
> >
@ -455,6 +451,7 @@ export const Profile = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page = 0;
setAction(true); setAction(true);
}} }}
> >
@ -570,6 +567,7 @@ export const Profile = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page = 0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />
@ -583,17 +581,16 @@ export const Profile = observer(() => {
//scroll={{ x: 1500, y: 300 }} //scroll={{ x: 1500, y: 300 }}
dataSource={store.transaction.dataHistoryTransaction} dataSource={store.transaction.dataHistoryTransaction}
pagination={{ pagination={{
pageSize: store.transaction.pageSizeHistoryTransaction, pageSize: store.transaction.pageSize,
total: store.transaction.total_dataHistoryTransaction, total: store.transaction.total_dataHistoryTransaction,
current: store.transaction.pageHistoryTransaction + 1, current: store.transaction.page + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.transaction.pageSizeHistoryTransaction = store.transaction.pageSize = page.pageSize;
page.pageSize; store.transaction.page = pageNumber - 1;
store.transaction.pageHistoryTransaction = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -610,16 +607,15 @@ export const Profile = observer(() => {
onChange: async (page, pageSize) => { onChange: async (page, pageSize) => {
console.log(page, "Page"); console.log(page, "Page");
console.log(pageSize, "Page size"); console.log(pageSize, "Page size");
store.transaction.pageSizeHistoryTransaction = store.transaction.page = pageSize;
pageSize; store.transaction.page = page - 1;
store.transaction.pageHistoryTransaction = page - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.transaction.pageSizeHistoryTransaction, pageSize: store.transaction.pageSize,
total: store.transaction.total_dataHistoryTransaction, total: store.transaction.total_dataHistoryTransaction,
current: store.transaction.pageHistoryTransaction + 1, current: store.transaction.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
style={{ padding: 0 }} style={{ padding: 0 }}
@ -778,7 +774,7 @@ export const Profile = observer(() => {
<Form <Form
form={form} form={form}
layout="vertical" layout="vertical"
initialValues={{ id : store.authentication.profileData?.id }} initialValues={{ id: store.authentication.profileData?.id }}
> >
<Form.Item <Form.Item
name="password" name="password"

4
src/store/transaction.js
View File

@ -133,7 +133,7 @@ export class Transaction {
async getDataHistoryTransaction() { async getDataHistoryTransaction() {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history?page=${this.pageHistoryTransaction}&pageSize=${this.pageSizeHistoryTransaction}&start=${this.filterStart}&end=${this.filterEnd}` `/transaction/history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`
); );
console.log(response); console.log(response);
this.dataHistoryTransaction = response.body.data ?? []; this.dataHistoryTransaction = response.body.data ?? [];
@ -158,7 +158,7 @@ export class Transaction {
async getDataHistoryTopUp(id) { async getDataHistoryTopUp(id) {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` `/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
); );
console.log(response,'get data history') console.log(response,'get data history')
this.dataHistoryTopUp = response.body.data ?? []; this.dataHistoryTopUp = response.body.data ?? [];