Merge branch 'develop' into 'devops-production'

Develop

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

src/pages/Membership/DetailUser.js

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

src/pages/Membership/Konfirmasi.js

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

src/pages/Membership/Membership.js

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

src/pages/Membership/MembershipModal.js

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