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

Merge branch 'develop' into 'devops-production'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!130
This commit is contained in:
ajat sudrajat 2022-02-03 12:42:02 +00:00
commit 19964c00bb
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/ProductComponent.js
View File

@ -95,7 +95,7 @@ export const ProductComponent = observer((props) => {
key: "supplier_name", key: "supplier_name",
}, },
{ {
title: "Sub Category", title: "Sub Kategori",
dataIndex: "sub_categories_name", dataIndex: "sub_categories_name",
key: "sub_categories_name", key: "sub_categories_name",
}, },

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

@ -564,8 +564,8 @@ export const DetailUser = observer(() => {
<Col span={12}> <Col span={12}>
<Text> <Text>
{store.authentication.dataProfit.is_active === true {store.authentication.dataProfit.is_active === true
? "Active" ? "Aktif"
: "Inactive"} : "Inaktif"}
</Text> </Text>
</Col> </Col>
{store.authentication.userData.role === "Admin" && {store.authentication.userData.role === "Admin" &&
@ -710,7 +710,7 @@ export const DetailUser = observer(() => {
<Row justify={"center"}> <Row justify={"center"}>
<Col lg={12} xs={12}> <Col lg={12} xs={12}>
<Title strong level={3} style={styleSaldoTitle}> <Title strong level={3} style={styleSaldoTitle}>
Profit Keuntungan
</Title> </Title>
</Col> </Col>
<Col lg={24} xs={12}> <Col lg={24} xs={12}>

4
src/pages/Transaction/Product.js
View File

@ -122,13 +122,13 @@ export const Product = observer(() => {
<div> <div>
<Row> <Row>
<span style={{ fontWeight: "bold", marginBottom: "10px" }}> <span style={{ fontWeight: "bold", marginBottom: "10px" }}>
Sub Category Jenis Produk
</span> </span>
</Row> </Row>
<Row> <Row>
<Col span={24}> <Col span={24}>
<Select <Select
placeholder={"Select Sub Category"} placeholder={"Pilih Kategori"}
allowClear={true} allowClear={true}
onChange={(val) => handleChangeSubcategory(val)} onChange={(val) => handleChangeSubcategory(val)}
style={{ marginBottom: "10px", width: "100%" }} style={{ marginBottom: "10px", width: "100%" }}

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

@ -169,13 +169,13 @@ export const Transaction = observer(() => {
<div> <div>
<Row> <Row>
<span style={{ fontWeight: "bold", marginBottom: "10px" }}> <span style={{ fontWeight: "bold", marginBottom: "10px" }}>
Kategori Jenis Produk
</span> </span>
</Row> </Row>
<Row> <Row>
<Col span={24}> <Col span={24}>
<Select <Select
placeholder={"Pilih Kategori"} placeholder={"Pilih Jenis Produk"}
allowClear={true} allowClear={true}
onChange={(val) => handleChangeTabs(val)} onChange={(val) => handleChangeTabs(val)}
style={{ marginBottom: "10px", width: "100%" }} style={{ marginBottom: "10px", width: "100%" }}
@ -191,13 +191,13 @@ export const Transaction = observer(() => {
<Row> <Row>
<span style={{ fontWeight: "bold", marginBottom: "10px" }}> <span style={{ fontWeight: "bold", marginBottom: "10px" }}>
Sub Kategori Kategori
</span> </span>
</Row> </Row>
<Row> <Row>
<Col span={24}> <Col span={24}>
<Select <Select
placeholder={"Pilih Sub Kategori"} placeholder={"Pilih Kategori"}
allowClear={true} allowClear={true}
onChange={(val) => handleChangeSubcategory(val)} onChange={(val) => handleChangeSubcategory(val)}
style={{ marginBottom: "10px", width: "100%" }} style={{ marginBottom: "10px", width: "100%" }}