Merge pull request #1903 from coopcycle/print-multiple

Try to fix multiple printer tickets
coopcycle · Oct 23, 2024 · 011ef73 · 011ef73
2 parents 4f8e6ed + 6084f68
commit 011ef73
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/src/navigation/restaurant/Order.js b/src/navigation/restaurant/Order.js
@@ -19,6 +19,7 @@ import { isMultiVendor } from '../../utils/order';
 import {
   selectIsPrinterConnected,
   selectPrinter,
+  selectIsPrinting,
 } from '../../redux/Restaurant/selectors';
 import { DatadogLogger } from '../../Datadog';
 
@@ -66,6 +67,7 @@ class OrderScreen extends Component {
               });
               this.props.printOrder(order);
             }}
+            disablePrintButton={ this.props.isPrinting }
           />
           <OrderNotes order={order} />
           <OrderItems order={order} />
@@ -124,6 +126,7 @@ function mapStateToProps(state, ownProps) {
     order: ownProps.route.params?.order,
     isPrinterConnected: selectIsPrinterConnected(state),
     printer: selectPrinter(state),
+    isPrinting: selectIsPrinting(state),
   };
 }
 

diff --git a/src/navigation/restaurant/components/OrderButtons.js b/src/navigation/restaurant/components/OrderButtons.js
@@ -8,7 +8,7 @@ import FontAwesome from 'react-native-vector-icons/FontAwesome';
 
 const phoneNumberUtil = PhoneNumberUtil.getInstance();
 
-const Comp = ({ order, isPrinterConnected, onPrinterClick, printOrder }) => {
+const Comp = ({ order, isPrinterConnected, onPrinterClick, printOrder, disablePrintButton }) => {
   const { t } = useTranslation();
 
   let phoneNumber;
@@ -25,7 +25,8 @@ const Comp = ({ order, isPrinterConnected, onPrinterClick, printOrder }) => {
         {isPrinterConnected && (
           <Button
             endIcon={<Icon as={FontAwesome} name="print" size="sm" />}
-            onPress={printOrder}>
+            onPress={printOrder}
+            isDisabled={disablePrintButton}>
             {t('RESTAURANT_ORDER_PRINT')}
           </Button>
         )}

diff --git a/src/navigation/restaurant/components/OrderHeading.js b/src/navigation/restaurant/components/OrderHeading.js
@@ -31,6 +31,7 @@ const OrderHeading = ({
   isPrinterConnected,
   onPrinterClick,
   printOrder,
+  disablePrintButton,
 }) => {
   const { t } = useTranslation();
 
@@ -89,6 +90,7 @@ const OrderHeading = ({
           isPrinterConnected={isPrinterConnected}
           onPrinterClick={onPrinterClick}
           printOrder={printOrder}
+          disablePrintButton={disablePrintButton}
         />
       </View>
     </View>

diff --git a/src/redux/Restaurant/reducers.js b/src/redux/Restaurant/reducers.js
@@ -567,7 +567,10 @@ export default (state = initialState, action = {}) => {
       const printTask = state.ordersToPrint[orderId];
 
       if (!printTask) {
-        return state;
+        return {
+          ...state,
+          printingOrderId: null,
+        };
       }
 
       if (printTask.copiesToPrint > 1) {
@@ -603,7 +606,10 @@ export default (state = initialState, action = {}) => {
       const printTask = state.ordersToPrint[orderId];
 
       if (!printTask) {
-        return state;
+        return {
+          ...state,
+          printingOrderId: null,
+        };
       }
 
       return {

diff --git a/src/redux/Restaurant/selectors.js b/src/redux/Restaurant/selectors.js
@@ -244,3 +244,8 @@ export const selectIsActionable = createSelector(
     );
   },
 );
+
+export const selectIsPrinting = createSelector(
+  state => state.restaurant.printingOrderId,
+  (printingOrderId) => printingOrderId !== null
+);