Merge branch 'develop' into 'devops-staging'

Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!129

src/component/ProductComponent.js

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

src/pages/Membership/DetailUser.js

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

src/pages/Transaction/Product.js

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

src/pages/Transaction/Transaction.js

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