few patches and ability to prioritize pickup

fleetbase · Jan 3, 2025 · 61d1504 · 61d1504
1 parent 28492a4
commit 61d1504
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/config/default.js b/config/default.js
@@ -11,6 +11,7 @@ export const DefaultConfig = {
         googlePay: toBoolean(config('STRIPE_ENABLE_GOOGLE_PAY', false)),
     },
     showDriversOnMap: toBoolean(config('MAP_DISPLAY_DRIVERS', false)),
+    prioritizePickup: toBoolean(config('PRIORITIZE_PICKUP', false)),
     styles: {
         StoreHeader: {
             direction: 'column',

diff --git a/src/components/CheckoutPickupSwitch.tsx b/src/components/CheckoutPickupSwitch.tsx
@@ -1,11 +1,17 @@
 import TabSwitch from './TabSwitch';
+import { storefrontConfig } from '../utils';
 
 const CheckoutPickupSwitch = ({ onChange }) => {
+    const prioritizePickup = storefrontConfig('prioritizePickup');
     const receivingOptions = [
         { label: 'Delivery', value: 'delivery' },
         { label: 'Pickup', value: 'pickup' },
     ];
 
+    if (prioritizePickup) {
+        receivingOptions.reverse();
+    }
+
     const handleTabChange = (value) => {
         const isPickup = value === 'pickup';
         if (typeof onChange === 'function') {

diff --git a/src/hooks/use-qpay-checkout.ts b/src/hooks/use-qpay-checkout.ts
@@ -6,7 +6,7 @@ import { getServiceQuote } from '../utils/checkout';
 import { numbersOnly } from '../utils/format';
 import { percentage, calculateTip } from '../utils/math';
 import { getCoordinates } from '../utils/location';
-import { get } from '../utils';
+import { get, storefrontConfig } from '../utils';
 import useStorefront from '../hooks/use-storefront';
 import useCurrentLocation from '../hooks/use-current-location';
 import useStoreLocations from '../hooks/use-store-locations';
@@ -27,7 +27,7 @@ export default function useQPayCheckout({ onOrderComplete }) {
         tip: 0,
         leavingDeliveryTip: false,
         deliveryTip: 0,
-        pickup: 0,
+        pickup: storefrontConfig('prioritizePickup') ? 1 : 0,
     });
     const [invoice, setInvoice] = useState();
     const [checkoutId, setCheckoutId] = useState();

diff --git a/src/hooks/use-stripe-checkout.ts b/src/hooks/use-stripe-checkout.ts
@@ -29,7 +29,7 @@ export default function useStripeCheckout({ onOrderComplete }) {
         tip: 0,
         leavingDeliveryTip: false,
         deliveryTip: 0,
-        pickup: 0,
+        pickup: storefrontConfig('prioritizePickup') ? 1 : 0,
     });
     const [serviceQuote, setServiceQuote] = useState(null);
     const [isLoading, setIsLoading] = useState(false);