ordering-ui-admin-external 1.43.55 → 1.43.57

package/src/components/Delivery/DriversAdvancedLogs/styles.js

@@ -0,0 +1,186 @@
+import styled, { css } from 'styled-components'
+
+export const DriversAdvacedLogsContainer = styled.div`
+  height: calc(100% - 180px);
+  ${({ 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(2) {
+          width: 10%;
+          padding-left: 15px;
+          padding-right: 15px;
+        }
+        &:nth-child(3) {
+          width: 15%;
+          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(2) {
+        width: 10%;
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+      &:nth-child(3) {
+        width: 15%;
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+      &: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;
+  }
+`

package/src/components/Delivery/UserDetails/index.js

@@ -13,6 +13,7 @@ import { UserMetaFields } from '../../Users'
 import { DriversLogs } from '../DriversLogs'
 import { DriversGroupLogsUI } from '../DriversGroupLogs'
 import { DriverGroupSetting } from '../DriverGroupSetting'
+import { DriversAdvancedLogs } from '../DriversAdvancedLogs'
 import { ArrowsAngleContract, ArrowsAngleExpand, ThreeDots } from 'react-bootstrap-icons'
 import { Switch, Button, IconButton } from '../../../styles'
 import { ActionsForm } from '../UserFormDetails/styles'
@@ -207,6 +208,12 @@ export const UserDetailsUI = (props) => {
               UIComponent={DriversGroupLogsUI}
             />
           )}
+          {currentMenuSelected === 'advanced_logs' && (
+            <DriversAdvancedLogs
+              userId={userState.user?.id}
+              UIComponent={DriversGroupLogsUI}
+            />
+          )}
           {currentMenuSelected === 'orders' && (
             <OrdersManager
               isSelectedOrders

package/src/components/Delivery/UserDetailsMenu/index.js

@@ -21,6 +21,7 @@ export const UserDetailsMenu = (props) => {
     { key: 'saved_places', content: t('SAVED_PLACES', 'Saved places') },
     { key: 'schedule', content: t('SCHEDULE', 'Schedule') },
     { key: 'logs', content: t('LOGS', 'Logs') },
+    { key: 'advanced_logs', content: t('ADVANCED_LOGS', 'Advanced logs') },
     { key: 'push_tokens', content: t('PUSH_TOKENS', 'Push tokens') }
     // { key: 'metafields', content: t('METAFIELDS', 'Metafields') },
     // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }

package/src/components/Delivery/index.js

@@ -17,6 +17,7 @@ import { DriversGroupBusinesses } from './DriversGroupBusinesses'
 import { DriversGroupPaymethods } from './DriversGroupPaymethods'
 import { DriversGroupLogistics } from './DriversGroupLogistics'
 import { DriversGroupLogs } from './DriversGroupLogs'
+import { DriversAdvancedLogs } from './DriversAdvancedLogs'
 import { DriversGroupCompanies } from './DriversGroupCompanies'
 import { DriversGroupDrivers } from './DriversGroupDrivers'
 import { DriversGroupOrders } from './DriversGroupOrders'
@@ -46,6 +47,7 @@ export {
   DriversGroupPaymethods,
   DriversGroupLogistics,
   DriversGroupLogs,
+  DriversAdvancedLogs,
   DriversGroupCompanies,
   DriversGroupDrivers,
   DriversGroupOrders,

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

@@ -1,5 +1,5 @@
 import React, { forwardRef } from 'react'
-import { verifyDecimals } from '../../../utils'
+import { getCurrenySymbol, verifyDecimals } from '../../../utils'
 import { useUtils, useLanguage, useConfig } from 'ordering-components-admin-external'
 import { PrintContainer, PrintTextContainer, ProductComments, ProdcutCommentsContainer, Products, InfoContainer, InsideInfo2, InsideInfo, PrintProductsContainer, PrintProducts } from './styles'
 
@@ -50,8 +50,8 @@ export const OrderToPrintTicket = forwardRef((props, ref) => {
 
   const getSuboptions = (suboptions) => {
     const array = []
-    suboptions?.length > 0 &&
-      suboptions?.map((suboption) => {
+    suboptions && suboptions.length > 0 &&
+      suboptions.map((suboption) => {
         const string = `${getFormattedSubOptionName(suboption)}`
         array.push(string)
       })
@@ -59,11 +59,22 @@ export const OrderToPrintTicket = forwardRef((props, ref) => {
     return array.join('')
   }
 
+  const getIncludedTaxes = (isDeliveryFee) => {
+    if (!order?.taxes) return 0
+    if (order?.taxes?.length === 0) {
+      return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
+    } else {
+      return order?.taxes.reduce((taxIncluded, tax) => {
+        return taxIncluded + (((!isDeliveryFee && tax.type === 1 && tax.target === 'product') || (isDeliveryFee && tax.type === 1 && tax.target === 'delivery_fee')) ? tax.summary?.tax : 0)
+      }, 0)
+    }
+  }
+
   const getOptions = (options, productComment = '') => {
     const array = []
 
-    options?.length &&
-    options?.map((option) => {
+    options && options.length &&
+    options.map((option) => {
       const string =
         `${option.name} ${getSuboptions(option.suboptions)}`
       array.push(string)
@@ -175,9 +186,9 @@ export const OrderToPrintTicket = forwardRef((props, ref) => {
         </InsideInfo>
         <InsideInfo2>
           {parsePrice(
-          order?.tax_type === 1
-            ? order?.summary?.subtotal + order?.summary?.tax ?? 0
-            : order?.summary?.subtotal ?? 0
+            order?.tax_type === 1
+              ? order?.summary?.subtotal + order?.summary?.tax ?? 0
+              : order?.summary?.subtotal ?? 0
           )}
         </InsideInfo2>
       </InfoContainer>
@@ -213,7 +224,7 @@ export const OrderToPrintTicket = forwardRef((props, ref) => {
             {t('DELIVERY_FEE', 'Delivery Fee')}
           </InsideInfo>
           <InsideInfo2>
-            {parsePrice(order?.summary?.delivery_price)}
+            {parsePrice(order?.summary?.delivery_price + getIncludedTaxes(true), { currency: getCurrenySymbol(order?.currency) })}
           </InsideInfo2>
         </InfoContainer>
       )}
@@ -249,3 +260,5 @@ export const OrderToPrintTicket = forwardRef((props, ref) => {
     </PrintContainer>
   )
 })
+
+OrderToPrintTicket.displayName = 'OrderToPrintTicket'

package/src/index.js

@@ -135,6 +135,7 @@ import {
   DriversGroupPaymethods,
   DriversGroupLogistics,
   DriversGroupLogs,
+  DriversAdvancedLogs,
   DriversGroupCompanies,
   DriversGroupDrivers,
   DriversGroupOrders,
@@ -557,6 +558,7 @@ export {
   DriversGroupPaymethods,
   DriversGroupLogistics,
   DriversGroupLogs,
+  DriversAdvancedLogs,
   DriversGroupCompanies,
   DriversGroupDrivers,
   DriversGroupOrders,