ordering-ui-admin-external 1.1.1 → 1.3.0

package/src/components/Orders/OrderDetails/index.js

@@ -48,7 +48,8 @@ const OrderDetailsUI = (props) => {
     setIsTourFlag,
     setIsTourOpen,
     actionStatus,
-    handleRefundOrder
+    handleRefundOrder,
+    isServiceOrder
   } = props
 
   const [, t] = useLanguage()
@@ -306,6 +307,7 @@ const OrderDetailsUI = (props) => {
           onClick={(e) => handleChangeTour(e)}
         >
           <OrderDetailsHeader
+            isServiceOrder={isServiceOrder}
             order={order}
             extraOpen={extraOpen}
             actionSidebar={actionSidebar}
@@ -372,6 +374,7 @@ const OrderDetailsUI = (props) => {
           )}
           <div data-tour='tour_driver'>
             <OrderContactInformation
+              isServiceOrder={isServiceOrder}
               order={order}
               extraOpen={extraOpen}
               unreadAlert={unreadAlert}

package/src/components/Orders/OrderDetailsHeader/index.js

@@ -30,7 +30,8 @@ export const OrderDetailsHeader = (props) => {
     currentTourStep,
     showOption,
     openMessage,
-    printRef
+    printRef,
+    isServiceOrder
   } = props
 
   const [, t] = useLanguage()
@@ -55,7 +56,7 @@ export const OrderDetailsHeader = (props) => {
   return (
     <OrderDetailsHeaderContainer>
       <div>
-        <h1>{t('INVOICE_ORDER_NO', 'Order No')} {order?.id}</h1>
+        <h1>{isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No')} {order?.id}</h1>
         <ButtonGroup>
           {user?.level !== 5 && (
             <ButtonLink
@@ -142,30 +143,34 @@ export const OrderDetailsHeader = (props) => {
             <EnDotSingle />
           </>
         )}
-        {order?.delivery_type === 1 && (
-          <span>
-            {t('DELIVERY', 'Delivery')}
-          </span>
-        )}
-        {order?.delivery_type === 2 && (
-          <span>
-            {t('PICKUP', 'Pickup')}
-          </span>
-        )}
-        {order?.delivery_type === 3 && (
-          <span>
-            {t('EAT_IN', 'Eat in')}
-          </span>
-        )}
-        {order?.delivery_type === 4 && (
-          <span>
-            {t('CURBSIDE', 'Curbside')}
-          </span>
-        )}
-        {order?.delivery_type === 5 && (
-          <span>
-            {t('DRIVE_THRU', 'Drive thru')}
-          </span>
+        {!isServiceOrder && (
+          <>
+            {order?.delivery_type === 1 && (
+              <span>
+                {t('DELIVERY', 'Delivery')}
+              </span>
+            )}
+            {order?.delivery_type === 2 && (
+              <span>
+                {t('PICKUP', 'Pickup')}
+              </span>
+            )}
+            {order?.delivery_type === 3 && (
+              <span>
+                {t('EAT_IN', 'Eat in')}
+              </span>
+            )}
+            {order?.delivery_type === 4 && (
+              <span>
+                {t('CURBSIDE', 'Curbside')}
+              </span>
+            )}
+            {order?.delivery_type === 5 && (
+              <span>
+                {t('DRIVE_THRU', 'Drive thru')}
+              </span>
+            )}
+          </>
         )}
       </p>
     </OrderDetailsHeaderContainer>

package/src/components/Orders/OrderDetailsHeader/styles.js

@@ -7,7 +7,7 @@ export const OrderDetailsHeaderContainer = styled.div`
     flex-direction: column-reverse;
     h1 {
       width: 100%;
-      font-size: 24px;
+      font-size: 20px;
       margin: 0px;
       font-weight: 700;
     }

package/src/components/Orders/OrdersFilterGroup/index.js

@@ -8,7 +8,9 @@ import { CitySelector, Modal } from '../../Shared'
 import { OrderStatusTypeSelector } from '../OrderStatusTypeSelector'
 import { DeliveryTypeSelector } from '../DeliveryTypeSelector'
 import { PaymethodTypeSelector } from '../PaymethodTypeSelector'
+import { CountryFilter } from '../CountryFilter'
 import { Button, Input } from '../../../styles'
+import { CurrencyFilter } from '../CurrencyFilter'
 
 import {
   FilterGroupListContainer,
@@ -39,7 +41,9 @@ const OrdersFilterGroupUI = (props) => {
     handleChangePaymethodType,
     handleResetFilterValues,
     handleChangeFilterValues,
-    handleChangeOrderId
+    handleChangeOrderId,
+    handleChangeCountryCode,
+    handleChangeCurrency
   } = props
 
   const [, t] = useLanguage()
@@ -123,6 +127,16 @@ const OrdersFilterGroupUI = (props) => {
             handleChangePaymethodType={handleChangePaymethodType}
           />
         </WrapperRow>
+        <WrapperRow>
+          <CountryFilter
+            filterValues={filterValues}
+            handleChangeCountryCode={handleChangeCountryCode}
+          />
+          <CurrencyFilter
+            filterValues={filterValues}
+            handleChangeCurrency={handleChangeCurrency}
+          />
+        </WrapperRow>
         <ButtonGroup>
           <Button
             color='primary'

package/src/components/Orders/OrdersListing/index.js

@@ -42,7 +42,11 @@ export const OrdersListing = (props) => {
     currentTourStep,
     isTourOpen,
     setIsTourOpen,
-    slaSettingTime
+    slaSettingTime,
+
+    allowColumns,
+    setAllowColumns,
+    handleDrop
   } = props
 
   const theme = useTheme()
@@ -122,6 +126,9 @@ export const OrdersListing = (props) => {
                   setIsTourOpen={setIsTourOpen}
                   slaSettingTime={slaSettingTime}
                   groupStatus={groupStatus}
+                  allowColumns={allowColumns}
+                  setAllowColumns={setAllowColumns}
+                  handleDrop={handleDrop}
                 />
               ) : (
                 <OrdersCards