ordering-ui-admin-external 1.43.30 → 1.43.31

package/src/components/Stores/BusinessLogs/styles.js

@@ -0,0 +1,224 @@
+import styled, { css } from 'styled-components'
+
+export const BusinessLogsContainer = styled.div`
+  height: calc(100% - 100px);
+  padding: 20px;
+
+  h1 {
+    font-size: 20px;
+    font-weight: 700;
+    margin-top: 5px;
+  }
+
+  ${({ disabled }) => disabled && css`
+    opacity: 0.7;
+    pointer-events: none;
+  `}
+`
+
+export const TableWrapper = styled.div`
+  overflow: auto;
+  height: 100%;
+`
+
+export const SeeChanges = styled.span`
+  color: ${props => props.theme.colors.primary};
+  cursor: pointer;
+  &:hover {
+    text-decoration: underline;
+  }
+`
+
+export const Table = styled.table`
+  width: 100%;
+  min-width: 1000px;
+  color: ${props => props.theme.colors?.headingColor};
+
+  thead {
+    tr {
+      border-bottom: solid 1px ${props => props.theme.colors.disabled};
+      th {
+        padding: 13px 0;
+        font-size: 12px;
+        &:first-child {
+          width: 10%;
+          ${props => props.theme?.rtl ? css`
+            padding-left: 15px;
+          ` : css`
+            padding-right: 15px;
+          `}
+          box-sizing: border-box;
+        }
+        &:nth-child(3) {
+          width: 35%;
+          padding-left: 15px;
+          padding-right: 15px;
+          box-sizing: border-box;
+        }
+        &:nth-child(4) {
+          ${props => props.theme?.rtl ? css`
+            padding-right: 15px;
+          ` : css`
+            padding-left: 15px;
+          `}
+          box-sizing: border-box;
+        }
+      }
+    }
+  }
+
+  > tbody {
+    border-bottom: 1px solid ${props => props.theme.colors.borderColor};
+    td {
+      padding: 13px 0;
+      font-size: 12px;
+      &:first-child {
+        width: 10%;
+        ${props => props.theme?.rtl ? css`
+          padding-left: 15px;
+        ` : css`
+          padding-right: 15px;
+        `}
+        box-sizing: border-box;
+      }
+      &:nth-child(3) {
+        width: 35%;
+      }
+      &:nth-child(4) {
+        ${props => props.theme?.rtl ? css`
+          padding-right: 15px;
+        ` : css`
+          padding-left: 15px;
+        `}
+        box-sizing: border-box;
+      }
+    }
+  }
+`
+
+export const UserInfoContainer = styled.div`
+  p {
+    color: ${props => props.theme.colors.lightGray};
+    margin: 0px;
+    font-size: 12px;
+    &:first-child {
+      color: ${props => props.theme.colors.headingColor};
+      font-weight: 500;
+    }
+  }
+`
+
+export const DateTimeWrapper = styled.div`
+  white-space: nowrap;
+  font-size: 12px;
+  min-height: 36px;
+  display: flex;
+  align-items: center;
+
+  ${props => props.theme?.rtl ? css`
+    padding-left: 15px;
+    margin-left: 15px;
+    border-left: 1px solid ${props => props.theme.colors.borderColor};
+  ` : css`
+    padding-right: 15px;
+    margin-right: 15px;
+    border-right: 1px solid ${props => props.theme.colors.borderColor};
+  `}
+`
+
+export const NoData = styled.div`
+  font-size: 16px;
+`
+export const WrapperPagination = styled.div`
+  display: flex;
+  align-items: center;
+  padding: 20px 0;
+`
+
+export const DataListTable = styled.table`
+  width: 100%;
+  border-right: 1px solid ${props => props.theme.colors.borderColor};
+
+  tbody {
+    border-bottom: none;
+    td {
+      box-sizing: border-box;
+      &:first-child {
+        width: 50% !important;
+        padding-left: 15px;
+        padding-right: 15px;
+        box-sizing: border-box;
+      }
+      &:not(:first-child) {
+        width: initial !important;
+      }
+      white-space: nowrap;
+      padding-top: 10px;
+      padding-bottom: 10px;
+      ${props => props.theme?.rtl ? css`
+        padding-left: 15px;
+      ` : css`
+        padding-right: 15px;
+      `}
+    }
+  }
+`
+
+export const EventTypeContainer = styled.div`
+  white-space: nowrap;
+  font-size: 12px;
+  min-height: 36px;
+  display: flex;
+  align-items: center;
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-left: 15px;
+  margin-right: 10px;
+  border-right: 1px solid ${props => props.theme.colors.borderColor};
+  border-left: 1px solid ${props => props.theme.colors.borderColor};
+  p{
+    margin-bottom: 0px;
+  }
+`
+
+export const SchedulesWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 30px;
+  justify-content: center;
+
+  ${props => props?.border && css`
+    div:first-child {
+    border-right: 1px solid #E9ECEF;
+    padding-right: 30px;
+    `
+  }
+`
+
+export const Schedules = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+`
+
+export const ScheduleDay = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  justify-content: space-between;
+`
+
+export const ScheduleLapses = styled.div`
+  display: flex;
+  flex-direction: column;
+  border-left: 1px solid #E9ECEF;
+  padding-left: 10px;
+
+  p  {
+    margin: 0px;
+  }
+`
+
+export const ScheduleTitle = styled.h2`
+  text-align: center;
+`

package/src/components/Stores/BusinessSummary/index.js

@@ -74,7 +74,7 @@ export const BusinessSummary = (props) => {
     window.open(storeUrl, '_blank')
   }
 
-  const itemsExcluded = !!spoonityConfig ? ['publishing', 'personalization'] : ['publishing', 'spoonity_key', 'personalization']
+  const itemsExcluded = spoonityConfig ? ['publishing', 'personalization', 'logs'] : ['publishing', 'spoonity_key', 'personalization', 'logs']
 
   const businessConfigs = [
     {
@@ -141,13 +141,15 @@ export const BusinessSummary = (props) => {
       key: 'webhooks',
       value: t('WEBHOOKS', 'Webhooks')
     },
-    // {
-    //   key: 'places',
-    //   value: t('PLACES', 'Places')
-    // },
     {
+      key: 'places',
+      value: t('PLACES', 'Places')
+    }, {
       key: 'spoonity_key',
       value: t('SPOONITY_KEY', 'Sponity key')
+    }, {
+      key: 'logs',
+      value: t('LOGS', 'Logs')
     }
   ]
 

package/src/components/Stores/index.js

@@ -17,6 +17,7 @@ import { BusinessImages } from './BusinessImages'
 import { BusinessInformation } from './BusinessInformation'
 import { BusinessInfoSettingList } from './BusinessInfoSettingList'
 import { BusinessLocation } from './BusinessLocation'
+import { BusinessLogs } from './BusinessLogs'
 import { BusinessMenu } from './BusinessMenu'
 import { BusinessNotifications } from './BusinessNotifications'
 import { BusinessOrderingChannels } from './BusinessOrderingChannels'
@@ -135,6 +136,7 @@ export {
   BusinessInformation,
   BusinessInfoSettingList,
   BusinessLocation,
+  BusinessLogs,
   BusinessMenu,
   BusinessNotifications,
   BusinessOrderingChannels,

package/src/components/Users/UserFormDetails/index.js

@@ -6,10 +6,11 @@ import parsePhoneNumber from 'libphonenumber-js'
 import { formatPhoneNumber } from 'react-phone-number-input'
 import { Alert, InputPhoneNumber, RangeCalendar } from '../../Shared'
 import { sortInputFields } from '../../../utils'
-import { Switch, Input, Button } from '../../../styles'
+import { Switch, Input, Button, DefaultSelect } from '../../../styles'
 import { Eye, EyeSlash } from 'react-bootstrap-icons'
 import { UserTypeSelector } from '../UserTypeSelector'
 import { OccupationSelector } from '../OccupationSelector'
+import { timezones } from '../../../config/constants'
 
 import {
   FormInput,
@@ -19,7 +20,8 @@ import {
   WrapperPassword,
   TogglePassword,
   CalendarWrapper,
-  WrapperUserTypeSelector
+  WrapperUserTypeSelector,
+  InputWrapper
 } from './styles'
 
 export const UserFormDetailsUI = (props) => {
@@ -49,6 +51,8 @@ export const UserFormDetailsUI = (props) => {
   const [isValidPhoneNumber, setIsValidPhoneNumber] = useState(null)
   const [userPhoneNumber, setUserPhoneNumber] = useState(null)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
+  const [timezonesOptions, setTimezonesOptions] = useState([])
+  const [timezoneSearchValue, setTimezoneSearchValue] = useState('')
   const [, { setUserCustomer }] = useCustomer()
   const emailInput = useRef(null)
 
@@ -219,6 +223,18 @@ export const UserFormDetailsUI = (props) => {
     })
   }, [formMethods])
 
+  useEffect(() => {
+    const _timezonesOptions = timezones
+      .filter(timezone => timezone.toLocaleLowerCase().includes(timezoneSearchValue.toLocaleLowerCase()))
+      .map(timezone => {
+        return {
+          value: timezone,
+          content: timezone
+        }
+      })
+    setTimezonesOptions(_timezonesOptions)
+  }, [timezoneSearchValue])
+
   return (
     <>
       <FormInput onSubmit={formMethods.handleSubmit(onSubmit)} isCheckout={isCheckout}>
@@ -269,6 +285,20 @@ export const UserFormDetailsUI = (props) => {
                 </React.Fragment>
               )
             )}
+            <InputWrapper isTimezone>
+              <DefaultSelect
+                placeholder={t('SELECT_TIMEZONE', 'Select a timezone')}
+                defaultValue={formState?.changes?.timezone ?? user?.timezone ?? ''}
+                options={timezonesOptions}
+                onChange={val => handleChangeSwtich('timezone', val)}
+                optionInnerMaxHeight='300px'
+                isShowSearchBar
+                searchBarIsCustomLayout
+                searchBarIsNotLazyLoad
+                searchValue={timezoneSearchValue}
+                handleChangeSearch={setTimezoneSearchValue}
+              />
+            </InputWrapper>
             {isProfessional && occupations?.length > 0 && (
               <OccupationSelector
                 occupationId={user?.occupation_id}

package/src/components/Users/UserFormDetails/styles.js

@@ -171,3 +171,29 @@ export const WrapperUserTypeSelector = styled.div`
     color: ${props => props.theme.colors.secundaryContrast};
   }
 `
+export const InputWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  margin-bottom: 20px;
+
+  .select {
+    padding-top: 4px;
+    padding-bottom: 4px;
+    border: none;
+    background-color: ${props => props.theme.colors.secundary};
+    font-size: 14px;
+
+    ${({ isTimezone }) => isTimezone && css`
+      > div:first-child {
+        > div {
+          overflow: hidden;
+        }
+      }
+      .list-wrapper {
+        font-size: 12px;
+        max-height: 220px;
+      }
+    `}
+  }
+`

package/src/index.js

@@ -245,6 +245,7 @@ import {
   BusinessOwners,
   BusinessTypes,
   BusinessLocation,
+  BusinessLogs,
   BusinessImages,
   BusinessVideos,
   SeoOptions,
@@ -674,6 +675,7 @@ export {
   BusinessOwners,
   BusinessTypes,
   BusinessLocation,
+  BusinessLogs,
   BusinessImages,
   BusinessVideos,
   SeoOptions,

package/src/utils/index.js

@@ -354,55 +354,55 @@ export const reviewCommentList = (type) => {
   const reviews = {
     1: {
       1: {
-        title: t('CUSTOMER_QUICK_COMMENT_TITLE_1', "What went wrong?"),
+        title: t('CUSTOMER_QUICK_COMMENT_TITLE_1', 'What went wrong?'),
         list: [
-          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_1_0', "Not handled with care") },
-          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_1_1', "Poor communication") },
-          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_1_2', "COVID-19 issue") },
+          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_1_0', 'Not handled with care') },
+          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_1_1', 'Poor communication') },
+          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_1_2', 'COVID-19 issue') },
           { key: 3, content: t('CUSTOMER_QUICK_COMMENT_1_3', "Didn't follow instructions") },
-          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_1_4', "Rude") },
-          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_1_5', "Not on-time") }
+          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_1_4', 'Rude') },
+          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_1_5', 'Not on-time') }
         ]
       },
       2: {
-        title: t('CUSTOMER_QUICK_COMMENT_TITLE_2', "What went wrong?"),
+        title: t('CUSTOMER_QUICK_COMMENT_TITLE_2', 'What went wrong?'),
         list: [
-          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_2_0', "Not handled with care") },
-          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_2_1', "Poor communication") },
-          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_2_2', "COVID-19 issue") },
+          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_2_0', 'Not handled with care') },
+          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_2_1', 'Poor communication') },
+          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_2_2', 'COVID-19 issue') },
           { key: 3, content: t('CUSTOMER_QUICK_COMMENT_2_3', "Didn't follow instructions") },
-          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_2_4', "Rude") },
-          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_2_5', "Not on-time") }
+          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_2_4', 'Rude') },
+          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_2_5', 'Not on-time') }
         ]
       },
       3: {
-        title: t('CUSTOMER_QUICK_COMMENT_TITLE_3', "What could have been better?"),
+        title: t('CUSTOMER_QUICK_COMMENT_TITLE_3', 'What could have been better?'),
         list: [
-          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_3_0', "Not handled with care") },
-          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_3_1', "Poor communication") },
-          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_3_2', "COVID-19 issue") },
+          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_3_0', 'Not handled with care') },
+          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_3_1', 'Poor communication') },
+          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_3_2', 'COVID-19 issue') },
           { key: 3, content: t('CUSTOMER_QUICK_COMMENT_3_3', "Didn't follow instructions") },
-          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_3_4', "Rude") },
-          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_3_5', "Not on-time") }
+          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_3_4', 'Rude') },
+          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_3_5', 'Not on-time') }
         ]
       },
       4: {
-        title: t('CUSTOMER_QUICK_COMMENT_TITLE_4', " Tell us more"),
+        title: t('CUSTOMER_QUICK_COMMENT_TITLE_4', ' Tell us more'),
         list: [
-          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_4_0', "Not handled with care") },
-          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_4_1', "Poor communication") },
-          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_4_2', "COVID-19 issue") },
+          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_4_0', 'Not handled with care') },
+          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_4_1', 'Poor communication') },
+          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_4_2', 'COVID-19 issue') },
           { key: 3, content: t('CUSTOMER_QUICK_COMMENT_4_3', "Didn't follow instructions") },
-          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_4_4', "Rude") },
-          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_4_5', "Not on-time") }
+          { key: 4, content: t('CUSTOMER_QUICK_COMMENT_4_4', 'Rude') },
+          { key: 5, content: t('CUSTOMER_QUICK_COMMENT_4_5', 'Not on-time') }
         ]
       },
       5: {
-        title: t('CUSTOMER_QUICK_COMMENT_TITLE_5', "What went well?"),
+        title: t('CUSTOMER_QUICK_COMMENT_TITLE_5', 'What went well?'),
         list: [
-          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_5_0', "Good communication") },
-          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_5_1', "Friendly") },
-          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_5_2', "Above and beyond") }
+          { key: 0, content: t('CUSTOMER_QUICK_COMMENT_5_0', 'Good communication') },
+          { key: 1, content: t('CUSTOMER_QUICK_COMMENT_5_1', 'Friendly') },
+          { key: 2, content: t('CUSTOMER_QUICK_COMMENT_5_2', 'Above and beyond') }
         ]
       }
     }
@@ -460,7 +460,7 @@ export const getOrderStatuPickUp = (status) => {
     { key: 16, value: 'Canceled by customer', slug: 'CANCELED_BY_CUSTOMER', percentage: 0 },
     { key: 17, value: 'Not picked by customer', slug: 'NOT_PICKED_BY_CUSTOMER', percentage: 0 },
     { key: 20, value: 'Customer almost arrived to business', slug: 'CUSTOMER_ALMOST_ARRIVED_TO_BUSINESS', percentage: 70 },
-    { key: 21, value: 'Customer arrived to business', slug: 'CUSTOMER_ARRIVED_TO_BUSINESS', percentage: 90 },
+    { key: 21, value: 'Customer arrived to business', slug: 'CUSTOMER_ARRIVED_TO_BUSINESS', percentage: 90 }
   ]
 
   const objectStatus = orderStatus.find((o) => o.key === status)
@@ -676,3 +676,36 @@ export const TwentyFourHours = [
   '22:00',
   '23:00'
 ]
+
+export const getAttributeName = (key) => {
+  const [, t] = useLanguage()
+  const attributes = [
+    { key: 'autoassign_amount_drivers', content: t('AUTO_ASSIGN_GROUP_ORDERS_TO_DRIVERS', 'Auto assign the order of group to this amount of drivers') },
+    { key: 'orders_group_max_orders', content: t('MAX_NUMBER_ORDERS', 'Maximum Number of Orders') },
+    { key: 'autoassign_autoaccept_by_driver', content: t('ORDER_CONFIRMED_ACCEPTED_BY_DRIVER', 'Accepted by Driver') },
+    { key: 'orders_group_max_time_between', content: t('MAX_ORDER_TIME_BETWEEN', 'Maximum time between orders in seconds') },
+    { key: 'orders_group_max_distance_between_pickup', content: t('MAX_DISTANCE_BETWEEN_BUSINESS', 'Maximum distance between businesses in meters') },
+    { key: 'orders_group_max_distance_between_delivery', content: t('MAX_DISTANCE_BETWEEN_DELIVERY', 'Maximum distance between deliveries in meters') },
+    { key: 'orders_group_use_maps_api', content: t('USE_MAPS_API', 'Use maps api') },
+    { key: 'orders_group_max_time_between_pickup', content: t('MAX_DISTANCE_BETWEEN_BUSINESS', 'Maximum distance between businesses in meters') },
+    { key: 'orders_group_max_time_between_delivery', content: t('MAX_DISTANCE_BETWEEN_DELIVERY', 'Maximum distance between deliveries in meters') },
+    { key: 'autoassign_forced_assignment', content: t('AUTO_ASSIGN_FORCED_ASSIGNMENT', 'Forced assignment') },
+    { key: 'autoassign_customer_max_distance_from_business', content: t('MAX_CUSTOMER_DISTANCE_FROM_BUSINESS', 'Max distance between customer and business') },
+    { key: 'autoassign_initial_radius', content: t('INITIAL_RADIUS', 'Initial radius in meters') },
+    { key: 'autoassign_increment_radius', content: t('INCREMENT_RADIUS', 'Radius increase in meters') },
+    { key: 'autoassign_max_radius', content: t('MAX_RADIUS', 'Maximum radius in meters') },
+    { key: 'autoassign_autoreject_time', content: t('AUTO_REJECT_ORDER_GROUP_AFTER', 'Auto reject Orders After') },
+    { key: 'autoassign_max_orders', content: t('MAX_AMOUNT_ORDERS_PER_DRIVER', 'Maximum amount of orders per drivers') },
+    { key: 'autoassign_max_in_pending', content: t('ORDER_PENDING', 'Pending') },
+    { key: 'available', content: t('AVAILABLE', 'Available') },
+    { key: 'enabled', content: t('ENABLED', 'Enabled') },
+    { key: 'last_available_at', content: t('LAST_AVAILABLE_AT', 'Last available at') },
+    { key: 'busy', content: t('BUSY', 'Busy') }
+  ]
+  const found = attributes.find(attribute => attribute.key === key)
+  if (found) {
+    return found.content
+  } else {
+    return key
+  }
+}