ordering-ui-admin-external 1.41.4 → 1.42.0

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

@@ -100,10 +100,11 @@ export const MessagesUI = (props) => {
   const [load, setLoad] = useState(0)
   const [messageList, setMessageList] = useState([])
   const [isChatDisabled, setIsChatDisabled] = useState(false)
-  const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+  const previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17]
   const chatDisabled = previousStatus.includes(order?.status)
   const [{ configs }] = useConfig()
   const showExternalId = configs?.change_order_id?.value === '1'
+  const hideLogBookMessages = configs?.order_logbook_enabled?.value === '0'
 
   const adminMessageList = [
     { key: 'message_1', text: t('ADMIN_MESSAGE_1', 'admin_message_1') },
@@ -471,7 +472,7 @@ export const MessagesUI = (props) => {
                   <React.Fragment key={message.id}>
                     {history && tabActive === 'order_history' && (
                       <>
-                        {message.type === 0 && (
+                        {message.type === 0 && !hideLogBookMessages && (
                           <MessageConsole key={message.id}>
                             <BubbleConsole>
                               <p
@@ -491,7 +492,7 @@ export const MessagesUI = (props) => {
                             </BubbleConsole>
                           </MessageConsole>
                         )}
-                        {message.type === 1 && (
+                        {message.type === 1 && !hideLogBookMessages && (
                           <MessageConsole key={message.id} style={{ display: `${tabActive === 'order_history' ? 'inline-flex' : 'none'}` }}>
                             {getHistoryComment(message) && (
                               <BubbleConsole>
@@ -514,7 +515,7 @@ export const MessagesUI = (props) => {
                     )}
                     {isChat && (
                       <>
-                        {message.type === 0 && (
+                        {message.type === 0 && !hideLogBookMessages && (
                           <MessageConsole key={message.id}>
                             <BubbleConsole>
                               <p>
@@ -533,7 +534,7 @@ export const MessagesUI = (props) => {
                             </BubbleConsole>
                           </MessageConsole>
                         )}
-                        {message.type === 1 && (
+                        {message.type === 1 && !hideLogBookMessages && (
                           <MessageConsole key={message.id} style={{ display: `${tabActive === 'order_history' ? 'inline-flex' : 'none'}` }}>
                             {getHistoryComment(message) && (
                               <BubbleConsole>

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

@@ -242,10 +242,7 @@ export const OrderBill = (props) => {
               <td>
                 {t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
               </td>
-              <td>{parseFloat(extraValueAdjustment?.value) > 0
-                ? parsePrice(parseFloat(extraValueAdjustment?.value), { currency: getCurrenySymbol(order?.currency) })
-                : `- ${parsePrice(parseFloat(extraValueAdjustment?.value) * -1, { currency: getCurrenySymbol(order?.currency) })}`}
-              </td>
+              <td>{parsePrice(parseFloat(extraValueAdjustment?.value), { currency: getCurrenySymbol(order?.currency) })}</td>
             </tr>
           )}
         </tbody>

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

@@ -3,7 +3,7 @@ import { PlusCircle, Trash3, Funnel } from 'react-bootstrap-icons'
 import MdcFilterOff from '@meronex/icons/mdc/MdcFilterOff'
 import TiWarningOutline from '@meronex/icons/ti/TiWarningOutline'
 import { useLanguage, OrdersFilter as OrdersFilterController } from 'ordering-components-admin-external'
- import { BusinessesSelector } from '../BusinessesSelector'
+import { BusinessesSelector } from '../BusinessesSelector'
 import { DriversGroupTypeSelector } from '../DriversGroupTypeSelector'
 import { DateTypeSelector } from '../DateTypeSelector'
 import { DriverMultiSelector } from '../DriverMultiSelector'
@@ -183,6 +183,38 @@ const OrdersFilterGroupUI = (props) => {
               onChange={handleChangeExternalId}
             />
           </WrapperRow>
+          <WrapperRow>
+            <Input
+              type='text'
+              placeholder={t('CUSTOMER_NAME', 'Customer Name')}
+              autoComplete='off'
+              value={filterValues?.customerName || ''}
+              onChange={(e) => handleChangeChildFilterValue({ customerName: e?.target?.value })}
+            />
+            <Input
+              type='text'
+              placeholder={t('CUSTOMER_LASTNAME', 'Customer Lastname')}
+              autoComplete='off'
+              value={filterValues?.customerLastname || ''}
+              onChange={(e) => handleChangeChildFilterValue({ customerLastname: e?.target?.value })}
+            />
+          </WrapperRow>
+          <WrapperRow>
+            <Input
+              type='text'
+              placeholder={t('CUSTOMER_EMAIL', 'Customer Email')}
+              autoComplete='off'
+              value={filterValues?.customerEmail || ''}
+              onChange={(e) => handleChangeChildFilterValue({ customerEmail: e?.target?.value })}
+            />
+            <Input
+              type='text'
+              placeholder={t('CUSTOMER_CELLPHONE', 'Customer Cellphone')}
+              autoComplete='off'
+              value={filterValues?.customerCellphone || ''}
+              onChange={(e) => handleChangeChildFilterValue({ customerCellphone: e?.target?.value })}
+            />
+          </WrapperRow>
           <WrapperRow>
             <DriversGroupTypeSelector
               driverGroupList={driverGroupList}

package/src/components/Settings/SettingsList/index.js

@@ -267,7 +267,8 @@ export const SettingsListUI = (props) => {
                         <>
                           <FormGroupText className='form-group'>
                             <label>{config?.name}</label>
-                            {config?.description && <Description>{config?.description} {[1312, 1315, 1316].includes(config?.id) && `(${t('MINUTES', 'Minutes')})`}</Description>}                            {config?.value?.split('|')?.filter(value => valuesTypeSix.includes(value?.split(',')[0]))?.map((value, i, hash) => (
+                            {config?.description && <Description>{config?.description} {[1312, 1315, 1316].includes(config?.id) && `(${t('MINUTES', 'Minutes')})`}</Description>}
+                            {config?.value?.split('|')?.filter(value => valuesTypeSix.includes(value?.split(',')[0]))?.map((value, i, hash) => (
                               <React.Fragment key={`${config?.id} ${value}`}>
                                 <Description typeSix>{t(value?.split(',')[0], value?.split(',')[0].replace('_', ' '))}</Description>
                                 <input

package/src/components/SidebarMenu/index.js

@@ -369,18 +369,36 @@ const SidebarMenuUI = (props) => {
       pageName: 'enterprise_promotions',
       url: '/marketing/promotions-enterprise'
     },
-    // {
-    //   id: 2,
-    //   title: t('CAMPAIGN', 'Campaign'),
-    //   pageName: 'campaign',
-    //   url: '/marketing/campaign'
-    // },
     {
-      id: 3,
+      id: 2,
       title: t('AD_BANNERS', 'Ad banners'),
       pageName: 'ad_banners',
       url: '/marketing/ad-banners'
+    },
+    {
+      id: 3,
+      title: t('LOYALTY_AUTOMATION', 'Loyalty automation'),
+      pageName: 'rewards_programs',
+      url: '/loyalty/rewards-programs'
+    },
+    {
+      id: 4,
+      title: t('OPEN_CARTS', 'Open carts'),
+      pageName: 'open_carts',
+      url: '/cart-recovery/open-carts'
+    },
+    {
+      id: 5,
+      title: t('CART_RECOVERY_AUTOMATION', 'Cart recovery automation'),
+      pageName: 'recovery_actions',
+      url: '/cart-recovery/recovery-actions'
     }
+    // {
+    //   id: 6,
+    //   title: t('CAMPAIGN', 'Campaign'),
+    //   pageName: 'campaign',
+    //   url: '/marketing/campaign'
+    // }
   ]
 
   const handleGoToPage = (data) => {
@@ -716,11 +734,16 @@ const SidebarMenuUI = (props) => {
                         active={
                           location.pathname === '/marketing/promotions-enterprise' ||
                           location.pathname === '/marketing/campaign' ||
-                          location.pathname === '/marketing/ad-banners'
+                          location.pathname === '/marketing/ad-banners'||
+                          location.pathname === '/loyalty/rewards-programs' ||
+                          location.pathname === '/loyalty/levels' ||
+                          location.pathname === '/loyalty/reports' ||
+                          location.pathname === '/cart-recovery/open-carts' ||
+                          location.pathname === '/cart-recovery/recovery-actions'
                         }
                       >
                         <GraphUp />
-                        <span>{t('MARKETING', 'Marketing')}</span>
+                        <span>{t('MARKETING_LOYALTY', 'Marketing & Loyalty')}</span>
                       </ContextAwareToggle>
                       <Accordion.Collapse eventKey='8'>
                         <MenuContent>
@@ -738,7 +761,7 @@ const SidebarMenuUI = (props) => {
                     </MenuContainer>
                   )}
 
-                  {sessionState?.user?.level === 0 && (
+                  {/* {sessionState?.user?.level === 0 && (
                     <MenuContainer>
                       <ContextAwareToggle
                         eventKey='9'
@@ -793,7 +816,7 @@ const SidebarMenuUI = (props) => {
                         </MenuContent>
                       </Accordion.Collapse>
                     </MenuContainer>
-                  )}
+                  )} */}
                   {sessionState?.user?.level === 0 && (
                     <MenuContainer>
                       <span>{t('SALES_CHANNELS_AND_PRODUCTS', 'Sales channels and products')}</span>