list: display only cash_on_delivery; (restaurant) order details: disp…

…lay all payment methods; (courier) task details: display only cash_on delivery; #1576 #1575
coopcycle · Oct 18, 2024 · 1eb89a8 · 1eb89a8
1 parent 4f8e6ed
commit 1eb89a8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 35 deletions.
diff --git a/src/components/PaymentMethodInfo.js b/src/components/PaymentMethodInfo.js
@@ -34,15 +34,27 @@ export const loadDescriptionTranslationKey = paymentMethod =>
 export const isKnownPaymentMethod = paymentMethod =>
  Object.prototype.hasOwnProperty.call(paymentMethods, paymentMethod);
 
-export const PaymentMethodInfo = ({ fullDetail, paymentMethod }) => {
- const { t } = useTranslation();
-
+export const isDisplayPaymentMethodInList = paymentMethod => {
  if (!isKnownPaymentMethod(paymentMethod)) {
+ return false;
+ }
+
+ return paymentMethod === 'CASH_ON_DELIVERY';
+};
+
+export const PaymentMethodInList = ({ paymentMethod }) => {
+ if (!isDisplayPaymentMethodInList(paymentMethod)) {
  return null;
  }
 
- if (!fullDetail) {
- return <Icon as={Foundation} name={loadIconKey(paymentMethod)} />;
+ return <Icon as={Foundation} name={loadIconKey(paymentMethod)} />;
+}
+
+export const PaymentMethodInOrderDetails = ({ paymentMethod }) => {
+ const { t } = useTranslation();
+
+ if (!isKnownPaymentMethod(paymentMethod)) {
+ return null;
  }
 
  return (

diff --git a/src/components/TaskListItem.js b/src/components/TaskListItem.js
@@ -23,7 +23,7 @@ import {
  taskTypeIconName,
 } from '../navigation/task/styles/common';
 import { greenColor, redColor, yellowColor } from '../styles/common';
-import { PaymentMethodInfo } from './PaymentMethodInfo';
+import { PaymentMethodInList } from './PaymentMethodInfo';
 import TaskTitle from './TaskTitle';
 
 const styles = StyleSheet.create({
@@ -270,8 +270,7 @@ class TaskListItem extends Component {
  <Icon mr="2" as={FontAwesome} name="comments" size="xs" />
  ) : null}
  {task.metadata && task.metadata.payment_method && (
- <PaymentMethodInfo
- fullDetail={false}
+ <PaymentMethodInList
  paymentMethod={task.metadata.payment_method}
  />
  )}

diff --git a/src/navigation/restaurant/components/OrderHeading.js b/src/navigation/restaurant/components/OrderHeading.js
@@ -7,7 +7,7 @@ import FontAwesome from 'react-native-vector-icons/FontAwesome';
 
 import material from '../../../../native-base-theme/variables/material';
 import OrderFulfillmentMethodIcon from '../../../components/OrderFulfillmentMethodIcon';
-import { PaymentMethodInfo } from '../../../components/PaymentMethodInfo';
+import { PaymentMethodInOrderDetails } from '../../../components/PaymentMethodInfo';
 import { resolveFulfillmentMethod } from '../../../utils/order';
 import OrderButtons from './OrderButtons';
 
@@ -79,10 +79,7 @@ const OrderHeading = ({
  </Text>
  </View>
  </View>
- <PaymentMethodInfo
- fullDetail={true}
- paymentMethod={order.paymentMethod}
- />
+ <PaymentMethodInOrderDetails paymentMethod={order.paymentMethod} />
  <View style={{ marginBottom: 15 }}>
  <OrderButtons
  order={order}

diff --git a/src/navigation/restaurant/components/OrderListItem.js b/src/navigation/restaurant/components/OrderListItem.js
@@ -13,7 +13,7 @@ import Ionicons from 'react-native-vector-icons/Ionicons';
 import { useDispatch, useSelector } from 'react-redux';
 import OrderNumber from '../../../components/OrderNumber';
 import OrderFulfillmentMethodIcon from '../../../components/OrderFulfillmentMethodIcon';
-import { PaymentMethodInfo } from '../../../components/PaymentMethodInfo';
+import { PaymentMethodInList } from '../../../components/PaymentMethodInfo';
 import {
  selectAutoAcceptOrdersEnabled,
  selectIsActionable,
@@ -127,10 +127,7 @@ export default function OrderListItem({ order, onItemClick }) {
  <OrderNumber order={order} />
  </View>
  <OrderFulfillmentMethodIcon order={order} small />
- <PaymentMethodInfo
- fullDetail={false}
- paymentMethod={order.paymentMethod}
- />
+ <PaymentMethodInList paymentMethod={order.paymentMethod} />
  {order.notes ? (
  <Icon as={FontAwesome} name="comments" size="xs" />
  ) : null}

diff --git a/src/navigation/task/components/Details.js b/src/navigation/task/components/Details.js
@@ -12,7 +12,7 @@ import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
 
 import ItemSeparator from '../../../components/ItemSeparator';
 import {
- isKnownPaymentMethod,
+ isDisplayPaymentMethodInList,
  loadDescriptionTranslationKey,
  loadIconKey,
 } from '../../../components/PaymentMethodInfo';
@@ -91,10 +91,7 @@ const Details = ({ task, t }) => {
  });
  }
 
- if (
- task.metadata &&
- task.metadata.has_loopeat_returns
- ) {
+ if (task.metadata && task.metadata.has_loopeat_returns) {
  items.push({
  iconName: 'recycle',
  iconType: FontAwesome5,
@@ -109,6 +106,18 @@ const Details = ({ task, t }) => {
  });
  }
 
+ if (
+ task.metadata &&
+ task.metadata.payment_method &&
+ isDisplayPaymentMethodInList(task.metadata.payment_method)
+ ) {
+ items.push({
+ iconName: loadIconKey(task.metadata.payment_method),
+ iconType: Foundation,
+ text: t(loadDescriptionTranslationKey(task.metadata.payment_method)),
+ });
+ }
+
  if (task.comments) {
  items.push({
  iconName: 'chatbubbles',
@@ -164,18 +173,6 @@ const Details = ({ task, t }) => {
  });
  }
 
- if (
- task.metadata &&
- task.metadata.payment_method &&
- isKnownPaymentMethod(task.metadata.payment_method)
- ) {
- items.push({
- iconName: loadIconKey(task.metadata.payment_method),
- iconType: Foundation,
- text: t(loadDescriptionTranslationKey(task.metadata.payment_method)),
- });
- }
-
  return (
  <FlatList
  data={items}