fix: user RB.memberRate to show weekly rate

Author: maxceem

src/constants/workPeriods.js

@@ -19,13 +19,12 @@ export const REQUIRED_FIELDS = [
   "projectId",
   "startDate",
   "endDate",
-  "customerRate",
+  "memberRate",
   "workPeriods.id",
   "workPeriods.projectId",
   "workPeriods.userHandle",
   "workPeriods.startDate",
   "workPeriods.endDate",
-  "workPeriods.customerRate",
   "workPeriods.paymentStatus",
   "workPeriods.daysWorked",
 ];

src/constants/workPeriods/apiSortBy.js

@@ -1,6 +1,6 @@
 export const USER_HANDLE = "workPeriods.userHandle";
 export const START_DATE = "startDate";
 export const END_DATE = "endDate";
-export const WEEKLY_RATE = "workPeriods.customerRate";
+export const WEEKLY_RATE = "memberRate";
 export const PAYMENT_STATUS = "workPeriods.paymentStatus";
 export const WORKING_DAYS = "workPeriods.daysWorked";

src/routes/WorkPeriods/components/PeriodItem/index.jsx

@@ -4,6 +4,7 @@ import Checkbox from "components/Checkbox";
 import IntegerField from "components/IntegerField";
 import PaymentStatus from "../PaymentStatus";
 import { formatUserHandleLink } from "utils/formatters";
+import _ from "lodash";
 import styles from "./styles.module.scss";
 
 /**
@@ -55,7 +56,7 @@ const PeriodItem = ({ isSelected, item, onToggle, onWorkingDaysChange }) => {
       <td className={styles.teamName}>{item.projectId}</td>
       <td className={styles.startDate}>{item.startDate}</td>
       <td className={styles.endDate}>{item.endDate}</td>
-      <td>{currencyFormatter.format(item.weeklyRate)}</td>
+      <td>{_.isNumber(item.weeklyRate) ? currencyFormatter.format(item.weeklyRate) : '-'}</td>
       <td>
         <PaymentStatus status={item.paymentStatus} />
       </td>

src/utils/workPeriods.js

@@ -20,7 +20,7 @@ export function normalizePeriodItems(items) {
         ? moment(item.startDate).format(DATE_FORMAT_UI)
         : "",
       endDate: item.endDate ? moment(item.endDate).format(DATE_FORMAT_UI) : "",
-      weeklyRate: +workPeriod.customerRate || 0,
+      weeklyRate: item.memberRate,
       paymentStatus: paymentStatus
         ? API_PAYMENT_STATUS_MAP[paymentStatus] || paymentStatus.toUpperCase()
         : PAYMENT_STATUS.UNDEFINED,