ordering-ui-admin-external 1.30.4 → 1.30.6

package/src/components/BusinessIntelligence/ReportsOrderDistance/index.js

@@ -34,6 +34,8 @@ const ReportsOrderDistanceUI = (props) => {
   } = props
 
   const [, t] = useLanguage()
+  const [isOneMoreCountry, setIsOneMoreCountry] = useState(false)
+
   const tableRef = useRef(null)
   const [isBusinessFilter, setIsBusinessFilter] = useState(false)
   const [isBrandFilter, setIsBrandFilter] = useState(false)
@@ -148,18 +150,20 @@ const ReportsOrderDistanceUI = (props) => {
           >
             {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
           </Button>
-          <Button
-            onClick={() => setOpenCountryFilter(true)}
-          >
-            {t('COUNTRY', 'Country')}
-          </Button>
+          {isOneMoreCountry && (
+            <Button
+              onClick={() => setOpenCountryFilter(true)}
+            >
+              {t('COUNTRY', 'Country')}
+            </Button>
+          )}
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <DistancePerBrandWrapper>
         <DistanceTitleBlock active={reportData?.content?.body?.rows?.length > 0}>
@@ -255,6 +259,7 @@ const ReportsOrderDistanceUI = (props) => {
       </Modal>
       <CountryFilter
         {...props}
+        setIsOneMoreCountry={setIsOneMoreCountry}
         openCountryFilter={openCountryFilter}
         setOpenCountryFilter={setOpenCountryFilter}
       />

package/src/components/BusinessIntelligence/ReportsOrderStatus/index.js

@@ -35,6 +35,8 @@ const ReportsOrderStatusUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ parsePrice }] = useUtils()
+  const [isOneMoreCountry, setIsOneMoreCountry] = useState(false)
+
   const [isBusinessFilter, setIsBusinessFilter] = useState(false)
   const [isBrandFilter, setIsBrandFilter] = useState(false)
   const [openCountryFilter, setOpenCountryFilter] = useState(true)
@@ -129,18 +131,20 @@ const ReportsOrderStatusUI = (props) => {
             >
               {t('ORDER_TYPE', 'Order type')} ({filterList?.delivery_types_ids ? filterList?.delivery_types_ids.length : t('ALL', 'All')})
             </Button>
-            <Button
-              onClick={() => setOpenCountryFilter(true)}
-            >
-              {t('COUNTRY', 'Country')}
-            </Button>
+            {isOneMoreCountry && (
+              <Button
+                onClick={() => setOpenCountryFilter(true)}
+              >
+                {t('COUNTRY', 'Country')}
+              </Button>
+            )}
           </BrandBusinessWrapper>
-          <CalendarWrapper>
-            <AnalyticsCalendar
-              handleChangeDate={handleChangeDate}
-              defaultValue={filterList}
-            />
-          </CalendarWrapper>
+            <CalendarWrapper>
+              <AnalyticsCalendar
+                handleChangeDate={handleChangeDate}
+                defaultValue={filterList}
+              />
+            </CalendarWrapper>
         </ButtonActionList>
         <OrderStatusTableWrapper>
           <DistanceTitleBlock active={reportData?.content?.body?.rows?.length > 0}>
@@ -297,6 +301,7 @@ const ReportsOrderStatusUI = (props) => {
         </Modal>
         <CountryFilter
           {...props}
+          setIsOneMoreCountry={setIsOneMoreCountry}
           openCountryFilter={openCountryFilter}
           setOpenCountryFilter={setOpenCountryFilter}
         />

package/src/components/BusinessIntelligence/ReportsOrders/index.js

@@ -35,6 +35,8 @@ const ReportsOrdersUI = (props) => {
   } = props
 
   const [, t] = useLanguage()
+  const [isOneMoreCountry, setIsOneMoreCountry] = useState(false)
+
   const [dataOptions, setDataOptions] = useState(null)
   const [isBusinessFilter, setIsBusinessFilter] = useState(false)
   const [openCountryFilter, setOpenCountryFilter] = useState(true)
@@ -149,18 +151,20 @@ const ReportsOrdersUI = (props) => {
           >
             {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
           </Button>
-          <Button
-            onClick={() => setOpenCountryFilter(true)}
-          >
-            {t('COUNTRY', 'Country')}
-          </Button>
+          {isOneMoreCountry && (
+            <Button
+              onClick={() => setOpenCountryFilter(true)}
+            >
+              {t('COUNTRY', 'Country')}
+            </Button>
+          )}
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <ChartBlockWrapper>
         <ChartTitleBlock active={reportData?.content?.dataset?.dataset?.data?.length > 0}>
@@ -215,6 +219,7 @@ const ReportsOrdersUI = (props) => {
       </Modal>
       <CountryFilter
         {...props}
+        setIsOneMoreCountry={setIsOneMoreCountry}
         openCountryFilter={openCountryFilter}
         setOpenCountryFilter={setOpenCountryFilter}
       />

package/src/components/BusinessIntelligence/ReportsPaymethodSales/index.js

@@ -103,7 +103,7 @@ const ReportsPaymethodSalesUI = (props) => {
   }
 
   const thObj = {
-    REPORT_HEADER_PAYMETHOD: 'Paymethod',
+    REPORT_HEADER_PAYMETHOD: 'Paymethod'
   }
 
   return (
@@ -122,12 +122,12 @@ const ReportsPaymethodSalesUI = (props) => {
             {t('BRAND', 'Brand')} ({filterList?.franchises_id ? filterList?.franchises_id?.length : t('ALL', 'All')})
           </Button>
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <DistancePerBrandWrapper>
         <DistanceTitleBlock active={reportData?.content?.body?.rows?.length > 0}>

package/src/components/BusinessIntelligence/ReportsSaleAndCategory/index.js

@@ -35,6 +35,8 @@ const ReportsSaleAndCategoryUI = (props) => {
   } = props
 
   const [, t] = useLanguage()
+  const [isOneMoreCountry, setIsOneMoreCountry] = useState(false)
+
   const [isBusinessFilter, setIsBusinessFilter] = useState(false)
   const [isBrandFilter, setIsBrandFilter] = useState(false)
   const [openCountryFilter, setOpenCountryFilter] = useState(true)
@@ -172,18 +174,20 @@ const ReportsSaleAndCategoryUI = (props) => {
           >
             {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
           </Button>
-          <Button
-            onClick={() => setOpenCountryFilter(true)}
-          >
-            {t('COUNTRY', 'Country')}
-          </Button>
+          {isOneMoreCountry && (
+            <Button
+              onClick={() => setOpenCountryFilter(true)}
+            >
+              {t('COUNTRY', 'Country')}
+            </Button>
+          )}
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <ChartListWrapper>
         <ChartBlockWrapper>
@@ -250,6 +254,7 @@ const ReportsSaleAndCategoryUI = (props) => {
       </Modal>
       <CountryFilter
         {...props}
+        setIsOneMoreCountry={setIsOneMoreCountry}
         openCountryFilter={openCountryFilter}
         setOpenCountryFilter={setOpenCountryFilter}
       />

package/src/components/BusinessIntelligence/ReportsSales/index.js

@@ -37,6 +37,8 @@ const ReportsSalesUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ parsePrice }] = useUtils()
+  const [isOneMoreCountry, setIsOneMoreCountry] = useState(false)
+
   const [dataOptions, setDataOptions] = useState(null)
   const [isBusinessFilter, setIsBusinessFilter] = useState(false)
   const [isBrandFilter, setIsBrandFilter] = useState(false)
@@ -151,18 +153,20 @@ const ReportsSalesUI = (props) => {
           >
             {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
           </Button>
-          <Button
-            onClick={() => setOpenCountryFilter(true)}
-          >
-            {t('COUNTRY', 'Country')}
-          </Button>
+          {isOneMoreCountry && (
+            <Button
+              onClick={() => setOpenCountryFilter(true)}
+            >
+              {t('COUNTRY', 'Country')}
+            </Button>
+          )}
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <ChartBlockWrapper>
         <ChartTitleBlock active={reportData?.content?.dataset?.dataset?.data?.length > 0}>
@@ -217,6 +221,7 @@ const ReportsSalesUI = (props) => {
       </Modal>
       <CountryFilter
         {...props}
+        setIsOneMoreCountry={setIsOneMoreCountry}
         openCountryFilter={openCountryFilter}
         setOpenCountryFilter={setOpenCountryFilter}
       />

package/src/components/BusinessIntelligence/ReportsTopDrivers/index.js

@@ -84,7 +84,7 @@ const ReportsTopDriversUI = (props) => {
     labels: generateLabels(),
     datasets: [
       {
-        label: t('ORDERS', 'Orders'),
+        label: t('CONTROL_PANEL_ORDERS', 'Orders'),
         data: generateData(),
         fill: true,
         borderColor: '#2C7BE5',
@@ -145,7 +145,6 @@ const ReportsTopDriversUI = (props) => {
             return label
           },
           beforeFooter: (tooltipItem) => {
-            console.log(tooltipItem[0])
             let time = ''
             if (reportData?.content?.dataset?.dataset?.data?.length > 0) {
               reportData?.content?.dataset?.dataset?.data && reportData.content.dataset.dataset.data.forEach(item => {
@@ -176,12 +175,12 @@ const ReportsTopDriversUI = (props) => {
             {t('DRIVER', 'Driver')} ({filterList?.drivers_ids ? filterList?.drivers_ids.length : t('ALL', 'All')})
           </Button>
         </BrandBusinessWrapper>
-        <CalendarWrapper>
-          <AnalyticsCalendar
-            handleChangeDate={handleChangeDate}
-            defaultValue={filterList}
-          />
-        </CalendarWrapper>
+          <CalendarWrapper>
+            <AnalyticsCalendar
+              handleChangeDate={handleChangeDate}
+              defaultValue={filterList}
+            />
+          </CalendarWrapper>
       </ButtonActionList>
       <ChartBlockWrapper>
         <ChartTitleBlock active={reportData?.content?.dataset?.dataset?.data?.length > 0}>

package/src/components/Orders/CreateCustomOrder/CustomOrderDetails/index.js

@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useMemo } from 'react'
 import { useLanguage, useOrder, CustomOrderDetails as CustomOrderDetailsController } from 'ordering-components-admin-external'
 import { SelectCustomer } from '../SelectCustomer'
+import { OrderTypeSelector } from '../OrderTypeSelector'
 import { SelectBusinesses } from '../SelectBusinesses'
 import { Map } from '../Map'
 import { SelectProducts } from '../SelectProducts'
@@ -83,6 +84,7 @@ const CustomOrderDetailsUI = (props) => {
         />
         {customerAddress?.location && (
           <>
+            <OrderTypeSelector />
             <SelectBusinesses
               businessList={businessList}
               selectedBusiness={selectedBusiness}

package/src/components/Orders/CreateCustomOrder/OrderTypeSelector/styles.js

@@ -0,0 +1,35 @@
+import styled from 'styled-components'
+
+export const SelectWrapper = styled.div`
+  margin: 50px 0 30px 0;
+
+  > p {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px;
+    margin-top: 0;
+    margin-bottom: 11px;
+  }
+
+  .select {
+    width: 100%;
+    background: ${props => props.theme.colors.secundary};
+    border: none;
+    font-size: 14px;
+
+    > div:first-child {
+      padding-top: 4px;
+      padding-bottom: 4px;
+    }
+    .list {
+      max-width: 100%;
+    }
+  }
+`
+
+export const Option = styled.div`
+  > span {
+    font-size: 14px;
+    font-weight: 700;
+  }
+`

package/src/components/Orders/CreateCustomOrder/SelectProducts/index.js

@@ -73,7 +73,7 @@ export const SelectProducts = (props) => {
     const el = document.querySelector('.custom-order-content')
     if (el) {
       el.scrollTo({
-        top: 300,
+        top: 350,
         behavior: 'smooth'
       })
     }

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

@@ -131,7 +131,7 @@ const LogisticInformationUI = (props) => {
                   <>
                     {logisticInformation.data.logistic_attempts.map(attempt => (
                       <BubbleConsole key={attempt.id}>
-                        <strong>{t('DRIVER_GROUP', 'Driver group')}</strong>: <strong>{attempt?.driver_group_id}</strong> {t('AT', 'at')} {parseDate(attempt?.created_at, { utc: false })}
+                        <strong>{t('DRIVER_GROUP', 'Driver group')}</strong>: <strong>{attempt?.driver_group_id}</strong> {t('AT', 'at')} {parseDate(attempt?.created_at)}
                       </BubbleConsole>
                     ))}
                   </>

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

@@ -856,7 +856,6 @@ export const OrdersTable = (props) => {
                         )
                       }
                     })}
-                  <td />
                 </tr>
               </OrderTbody>
             ))