ordering-ui-admin-external 1.7.1 → 1.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/_bundles/{ordering-ui-admin.4e91d784f3b95343e365.js → ordering-ui-admin.bc627e82affd5d083888.js} +2 -2
  2. package/_bundles/{ordering-ui-admin.4e91d784f3b95343e365.js.LICENSE.txt → ordering-ui-admin.bc627e82affd5d083888.js.LICENSE.txt} +0 -0
  3. package/_modules/components/BusinessIntelligence/AnalyticsBusinessFilter/index.js +7 -18
  4. package/_modules/components/BusinessIntelligence/AnalyticsBusinessFilter/styles.js +5 -1
  5. package/_modules/components/BusinessIntelligence/AnalyticsCalendar/index.js +1 -0
  6. package/_modules/components/BusinessIntelligence/AnalyticsDriverOrders/index.js +9 -4
  7. package/_modules/components/BusinessIntelligence/AnalyticsDriverOrders/styles.js +3 -1
  8. package/_modules/components/BusinessIntelligence/AnalyticsDriversFilter/styles.js +6 -2
  9. package/_modules/components/BusinessIntelligence/AnalyticsFilterTimeZone/styles.js +9 -3
  10. package/_modules/components/BusinessIntelligence/AnalyticsOrdersAcceptSpend/styles.js +3 -1
  11. package/_modules/components/BusinessIntelligence/AnalyticsOrdersOrSales/index.js +5 -3
  12. package/_modules/components/BusinessIntelligence/AnalyticsOrdersOrSales/styles.js +3 -1
  13. package/_modules/components/BusinessIntelligence/AnalyticsOrdersStatus/styles.js +3 -1
  14. package/_modules/components/BusinessIntelligence/BusinessAnalytics/index.js +27 -3
  15. package/_modules/components/BusinessIntelligence/BusinessAnalytics/styles.js +6 -4
  16. package/_modules/components/BusinessIntelligence/CountryFilter/index.js +134 -0
  17. package/_modules/components/BusinessIntelligence/CountryFilter/styles.js +30 -0
  18. package/_modules/components/BusinessIntelligence/DriverAnalytics/index.js +27 -3
  19. package/_modules/components/BusinessIntelligence/DriverAnalytics/styles.js +3 -3
  20. package/_modules/components/BusinessIntelligence/InvoiceGeneral/styles.js +5 -1
  21. package/_modules/components/BusinessIntelligence/ReportsAppIdFilter/styles.js +3 -1
  22. package/_modules/components/BusinessIntelligence/ReportsBrandFilter/index.js +7 -18
  23. package/_modules/components/BusinessIntelligence/ReportsBrandFilter/styles.js +5 -1
  24. package/_modules/components/BusinessIntelligence/ReportsBusinessDistance/index.js +25 -4
  25. package/_modules/components/BusinessIntelligence/ReportsBusinessSpend/index.js +22 -1
  26. package/_modules/components/BusinessIntelligence/ReportsDriverDistance/index.js +29 -8
  27. package/_modules/components/BusinessIntelligence/ReportsDriverFilter/styles.js +3 -1
  28. package/_modules/components/BusinessIntelligence/ReportsDriverGroupFilter/styles.js +3 -1
  29. package/_modules/components/BusinessIntelligence/ReportsDriverOrder/index.js +22 -1
  30. package/_modules/components/BusinessIntelligence/ReportsDriverOrderTime/index.js +22 -1
  31. package/_modules/components/BusinessIntelligence/ReportsDriverSpend/index.js +22 -1
  32. package/_modules/components/BusinessIntelligence/ReportsGeneralSales/index.js +22 -1
  33. package/_modules/components/BusinessIntelligence/ReportsHeatMap/index.js +37 -16
  34. package/_modules/components/BusinessIntelligence/ReportsOrderDistance/index.js +25 -4
  35. package/_modules/components/BusinessIntelligence/ReportsOrderStatus/index.js +29 -8
  36. package/_modules/components/BusinessIntelligence/ReportsOrderTypeFilter/styles.js +3 -1
  37. package/_modules/components/BusinessIntelligence/ReportsOrders/index.js +26 -5
  38. package/_modules/components/BusinessIntelligence/ReportsOrders/styles.js +3 -1
  39. package/_modules/components/BusinessIntelligence/ReportsSaleAndCategory/index.js +22 -1
  40. package/_modules/components/BusinessIntelligence/ReportsSales/index.js +22 -1
  41. package/_modules/components/BusinessIntelligence/ReportsSales/styles.js +3 -1
  42. package/_modules/components/BusinessIntelligence/SettingItemUI/styles.js +6 -2
  43. package/_modules/components/CartRecovery/OpenCartList/styles.js +10 -7
  44. package/_modules/components/CartRecovery/OpenCartListing/styles.js +3 -1
  45. package/_modules/components/CartRecovery/RecoveryActionDetail/styles.js +3 -1
  46. package/package.json +2 -2
  47. package/src/components/BusinessIntelligence/AnalyticsBusinessFilter/index.js +7 -17
  48. package/src/components/BusinessIntelligence/AnalyticsBusinessFilter/styles.js +3 -3
  49. package/src/components/BusinessIntelligence/AnalyticsCalendar/index.js +1 -1
  50. package/src/components/BusinessIntelligence/AnalyticsDriverOrders/index.js +11 -3
  51. package/src/components/BusinessIntelligence/AnalyticsDriverOrders/styles.js +1 -1
  52. package/src/components/BusinessIntelligence/AnalyticsDriversFilter/styles.js +2 -2
  53. package/src/components/BusinessIntelligence/AnalyticsFilterTimeZone/styles.js +5 -8
  54. package/src/components/BusinessIntelligence/AnalyticsOrdersAcceptSpend/styles.js +1 -1
  55. package/src/components/BusinessIntelligence/AnalyticsOrdersOrSales/index.js +6 -2
  56. package/src/components/BusinessIntelligence/AnalyticsOrdersOrSales/styles.js +1 -1
  57. package/src/components/BusinessIntelligence/AnalyticsOrdersStatus/styles.js +1 -1
  58. package/src/components/BusinessIntelligence/BusinessAnalytics/index.js +23 -1
  59. package/src/components/BusinessIntelligence/BusinessAnalytics/styles.js +26 -7
  60. package/src/components/BusinessIntelligence/CountryFilter/index.js +128 -0
  61. package/src/components/BusinessIntelligence/CountryFilter/styles.js +65 -0
  62. package/src/components/BusinessIntelligence/DriverAnalytics/index.js +23 -1
  63. package/src/components/BusinessIntelligence/DriverAnalytics/styles.js +14 -7
  64. package/src/components/BusinessIntelligence/InvoiceGeneral/styles.js +2 -2
  65. package/src/components/BusinessIntelligence/ReportsAppIdFilter/styles.js +1 -1
  66. package/src/components/BusinessIntelligence/ReportsBrandFilter/index.js +7 -17
  67. package/src/components/BusinessIntelligence/ReportsBrandFilter/styles.js +3 -3
  68. package/src/components/BusinessIntelligence/ReportsBusinessDistance/index.js +19 -0
  69. package/src/components/BusinessIntelligence/ReportsBusinessSpend/index.js +20 -0
  70. package/src/components/BusinessIntelligence/ReportsDriverDistance/index.js +19 -0
  71. package/src/components/BusinessIntelligence/ReportsDriverFilter/styles.js +1 -1
  72. package/src/components/BusinessIntelligence/ReportsDriverGroupFilter/styles.js +1 -1
  73. package/src/components/BusinessIntelligence/ReportsDriverOrder/index.js +19 -0
  74. package/src/components/BusinessIntelligence/ReportsDriverOrderTime/index.js +19 -0
  75. package/src/components/BusinessIntelligence/ReportsDriverSpend/index.js +19 -0
  76. package/src/components/BusinessIntelligence/ReportsGeneralSales/index.js +19 -1
  77. package/src/components/BusinessIntelligence/ReportsHeatMap/index.js +19 -0
  78. package/src/components/BusinessIntelligence/ReportsOrderDistance/index.js +19 -0
  79. package/src/components/BusinessIntelligence/ReportsOrderStatus/index.js +19 -0
  80. package/src/components/BusinessIntelligence/ReportsOrderTypeFilter/styles.js +1 -1
  81. package/src/components/BusinessIntelligence/ReportsOrders/index.js +22 -3
  82. package/src/components/BusinessIntelligence/ReportsOrders/styles.js +1 -1
  83. package/src/components/BusinessIntelligence/ReportsSaleAndCategory/index.js +19 -0
  84. package/src/components/BusinessIntelligence/ReportsSales/index.js +19 -0
  85. package/src/components/BusinessIntelligence/ReportsSales/styles.js +1 -1
  86. package/src/components/BusinessIntelligence/SettingItemUI/styles.js +2 -2
  87. package/src/components/CartRecovery/OpenCartList/styles.js +1 -1
  88. package/src/components/CartRecovery/OpenCartListing/styles.js +1 -1
  89. package/src/components/CartRecovery/RecoveryActionDetail/styles.js +1 -1
@@ -5,13 +5,13 @@ export const ReportsBrandFilterContainer = styled.div``
5
5
  export const BrandFilterOption = styled.div`
6
6
  display: flex;
7
7
  align-items: center;
8
- border-bottom: 1px solid #E9ECEF;
8
+ border-bottom: 1px solid ${props => props.theme.colors.borderColor};
9
9
  padding: 10px 0;
10
10
  cursor: pointer;
11
11
 
12
12
  svg {
13
- font-size: 24px;
14
- color: #B1BCCC;
13
+ font-size: 18px;
14
+ color: ${props => props.theme.colors.secundaryLight};
15
15
 
16
16
  &.fill {
17
17
  color: ${props => props.theme.colors.primary};
@@ -9,6 +9,7 @@ import { Modal } from '../../Shared'
9
9
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
10
10
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
11
11
  import { ReportsBarChart } from '../ReportsBarChart'
12
+ import { CountryFilter } from '../CountryFilter'
12
13
  import {
13
14
  ReportsDistanceContainer,
14
15
  Title,
@@ -39,6 +40,7 @@ const ReportsBusinessDistanceUI = (props) => {
39
40
  const tableRef = useRef(null)
40
41
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
41
42
  const [isBrandFilter, setIsBrandFilter] = useState(false)
43
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
42
44
  const [chartData, setChartData] = useState(null)
43
45
  const [{ parseNumber }] = useUtils()
44
46
 
@@ -150,6 +152,11 @@ const ReportsBusinessDistanceUI = (props) => {
150
152
  >
151
153
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
152
154
  </Button>
155
+ <Button
156
+ onClick={() => setOpenCountryFilter(true)}
157
+ >
158
+ {t('COUNTRY', 'Country')}
159
+ </Button>
153
160
  </BrandBusinessWrapper>
154
161
  <CalendarWrapper>
155
162
  <AnalyticsCalendar
@@ -269,6 +276,18 @@ const ReportsBusinessDistanceUI = (props) => {
269
276
  {...props} onClose={() => setIsBrandFilter(false)}
270
277
  />
271
278
  </Modal>
279
+ <Modal
280
+ width='450px'
281
+ height='650px'
282
+ padding='25px'
283
+ open={openCountryFilter}
284
+ onClose={() => setOpenCountryFilter(false)}
285
+ >
286
+ <CountryFilter
287
+ {...props}
288
+ onClose={() => setOpenCountryFilter(false)}
289
+ />
290
+ </Modal>
272
291
  </ReportsDistanceContainer>
273
292
  )
274
293
  }
@@ -11,6 +11,7 @@ import { AnalyticsCalendar } from '../AnalyticsCalendar'
11
11
  import { Modal } from '../../Shared'
12
12
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
13
13
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
14
+ import { CountryFilter } from '../CountryFilter'
14
15
  import {
15
16
  ReportsBusinessSpendContainer,
16
17
  Title,
@@ -37,6 +38,8 @@ const ReportsBusinessSpendUI = (props) => {
37
38
  const [, t] = useLanguage()
38
39
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
39
40
  const [isBrandFilter, setIsBrandFilter] = useState(false)
41
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
42
+
40
43
  const [{ parsePrice }] = useUtils()
41
44
 
42
45
  const tableRef = useRef(null)
@@ -116,6 +119,11 @@ const ReportsBusinessSpendUI = (props) => {
116
119
  >
117
120
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
118
121
  </Button>
122
+ <Button
123
+ onClick={() => setOpenCountryFilter(true)}
124
+ >
125
+ {t('COUNTRY', 'Country')}
126
+ </Button>
119
127
  </BrandBusinessWrapper>
120
128
  <CalendarWrapper>
121
129
  <AnalyticsCalendar
@@ -214,6 +222,18 @@ const ReportsBusinessSpendUI = (props) => {
214
222
  {...props} onClose={() => setIsBrandFilter(false)}
215
223
  />
216
224
  </Modal>
225
+ <Modal
226
+ width='450px'
227
+ height='650px'
228
+ padding='25px'
229
+ open={openCountryFilter}
230
+ onClose={() => setOpenCountryFilter(false)}
231
+ >
232
+ <CountryFilter
233
+ {...props}
234
+ onClose={() => setOpenCountryFilter(false)}
235
+ />
236
+ </Modal>
217
237
  </ReportsBusinessSpendContainer>
218
238
  )
219
239
  }
@@ -8,6 +8,7 @@ import { Alert, Modal } from '../../Shared'
8
8
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
9
9
  import { ReportsDriverFilter } from '../ReportsDriverFilter'
10
10
  import { ReportsDriverGroupFilter } from '../ReportsDriverGroupFilter'
11
+ import { CountryFilter } from '../CountryFilter'
11
12
  import {
12
13
  DriverDistanceContainer,
13
14
  Title,
@@ -35,6 +36,7 @@ const ReportsDriverDistanceUI = (props) => {
35
36
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
36
37
  const [isDriverFilter, setIsDriverFilter] = useState(false)
37
38
  const [isDriverGroupFilter, setIsDriverGroupFilter] = useState(false)
39
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
38
40
  const [alertState, setAlertState] = useState({ open: false, content: [] })
39
41
  const [availableDriverIds, setAvailableDriverIds] = useState(null)
40
42
  const [{ parseNumber }] = useUtils()
@@ -126,6 +128,11 @@ const ReportsDriverDistanceUI = (props) => {
126
128
  >
127
129
  {t('DRIVER', 'DRIVER')} ({filterList?.drivers_ids ? filterList?.drivers_ids.length : t('ALL', 'All')})
128
130
  </Button>
131
+ <Button
132
+ onClick={() => setOpenCountryFilter(true)}
133
+ >
134
+ {t('COUNTRY', 'Country')}
135
+ </Button>
129
136
  </BrandBusinessWrapper>
130
137
  <CalendarWrapper>
131
138
  <AnalyticsCalendar
@@ -235,6 +242,18 @@ const ReportsDriverDistanceUI = (props) => {
235
242
  setAvailableDriverIds={setAvailableDriverIds}
236
243
  />
237
244
  </Modal>
245
+ <Modal
246
+ width='450px'
247
+ height='650px'
248
+ padding='25px'
249
+ open={openCountryFilter}
250
+ onClose={() => setOpenCountryFilter(false)}
251
+ >
252
+ <CountryFilter
253
+ {...props}
254
+ onClose={() => setOpenCountryFilter(false)}
255
+ />
256
+ </Modal>
238
257
  </DriverDistanceContainer>
239
258
  <Alert
240
259
  title={t('DRIVER_SCHEDULE', 'Driver schedule')}
@@ -11,7 +11,7 @@ export const BusinessFilterOption = styled.div`
11
11
 
12
12
  svg {
13
13
  font-size: 24px;
14
- color: #B1BCCC;
14
+ color: ${props => props.theme.colors.secundaryLight};
15
15
 
16
16
  &.fill {
17
17
  color: ${props => props.theme.colors.primary};
@@ -11,7 +11,7 @@ export const DriverGroupOption = styled.div`
11
11
 
12
12
  svg {
13
13
  font-size: 24px;
14
- color: #B1BCCC;
14
+ color: ${props => props.theme.colors.secundaryLight};
15
15
 
16
16
  &.fill {
17
17
  color: ${props => props.theme.colors.primary};
@@ -7,6 +7,7 @@ import { AnalyticsCalendar } from '../AnalyticsCalendar'
7
7
  import { Modal } from '../../Shared'
8
8
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
9
9
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
10
+ import { CountryFilter } from '../CountryFilter'
10
11
  import {
11
12
  ReportsBusinessSpendContainer,
12
13
  Title,
@@ -34,6 +35,7 @@ const ReportsDriverOrderUI = (props) => {
34
35
  const [{ parsePrice }] = useUtils()
35
36
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
36
37
  const [isBrandFilter, setIsBrandFilter] = useState(false)
38
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
37
39
 
38
40
  const tableRef = useRef(null)
39
41
 
@@ -100,6 +102,11 @@ const ReportsDriverOrderUI = (props) => {
100
102
  >
101
103
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
102
104
  </Button>
105
+ <Button
106
+ onClick={() => setOpenCountryFilter(true)}
107
+ >
108
+ {t('COUNTRY', 'Country')}
109
+ </Button>
103
110
  </BrandBusinessWrapper>
104
111
  <CalendarWrapper>
105
112
  <AnalyticsCalendar
@@ -198,6 +205,18 @@ const ReportsDriverOrderUI = (props) => {
198
205
  onClose={() => setIsBrandFilter(false)}
199
206
  />
200
207
  </Modal>
208
+ <Modal
209
+ width='450px'
210
+ height='650px'
211
+ padding='25px'
212
+ open={openCountryFilter}
213
+ onClose={() => setOpenCountryFilter(false)}
214
+ >
215
+ <CountryFilter
216
+ {...props}
217
+ onClose={() => setOpenCountryFilter(false)}
218
+ />
219
+ </Modal>
201
220
  </ReportsBusinessSpendContainer>
202
221
  )
203
222
  }
@@ -7,6 +7,7 @@ import { AnalyticsCalendar } from '../AnalyticsCalendar'
7
7
  import { Modal } from '../../Shared'
8
8
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
9
9
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
10
+ import { CountryFilter } from '../CountryFilter'
10
11
  import {
11
12
  ReportsBusinessSpendContainer,
12
13
  Title,
@@ -34,6 +35,7 @@ const ReportsDriverOrderTimeUI = (props) => {
34
35
  const [, t] = useLanguage()
35
36
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
36
37
  const [isBrandFilter, setIsBrandFilter] = useState(false)
38
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
37
39
  // const [isOrderTypeFilter, setIsOrderTypeFilter] = useState(false)
38
40
 
39
41
  const tableRef = useRef(null)
@@ -118,6 +120,11 @@ const ReportsDriverOrderTimeUI = (props) => {
118
120
  >
119
121
  {t('ORDER_TYPE', 'Order type')} ({filterList?.delivery_types_ids ? filterList?.delivery_types_ids.length : t('ALL', 'All')})
120
122
  </Button> */}
123
+ <Button
124
+ onClick={() => setOpenCountryFilter(true)}
125
+ >
126
+ {t('COUNTRY', 'Country')}
127
+ </Button>
121
128
  </BrandBusinessWrapper>
122
129
  <CalendarWrapper>
123
130
  <AnalyticsCalendar
@@ -222,6 +229,18 @@ const ReportsDriverOrderTimeUI = (props) => {
222
229
  onClose={() => setIsOrderTypeFilter(false)}
223
230
  />
224
231
  </Modal> */}
232
+ <Modal
233
+ width='450px'
234
+ height='650px'
235
+ padding='25px'
236
+ open={openCountryFilter}
237
+ onClose={() => setOpenCountryFilter(false)}
238
+ >
239
+ <CountryFilter
240
+ {...props}
241
+ onClose={() => setOpenCountryFilter(false)}
242
+ />
243
+ </Modal>
225
244
  </ReportsBusinessSpendContainer>
226
245
  )
227
246
  }
@@ -7,6 +7,7 @@ import { AnalyticsCalendar } from '../AnalyticsCalendar'
7
7
  import { Modal } from '../../Shared'
8
8
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
9
9
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
10
+ import { CountryFilter } from '../CountryFilter'
10
11
  import {
11
12
  ReportsBusinessSpendContainer,
12
13
  Title,
@@ -34,6 +35,7 @@ const ReportsDriverSpendUI = (props) => {
34
35
  const [{ parsePrice }] = useUtils()
35
36
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
36
37
  const [isBrandFilter, setIsBrandFilter] = useState(false)
38
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
37
39
 
38
40
  const tableRef = useRef(null)
39
41
 
@@ -112,6 +114,11 @@ const ReportsDriverSpendUI = (props) => {
112
114
  >
113
115
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
114
116
  </Button>
117
+ <Button
118
+ onClick={() => setOpenCountryFilter(true)}
119
+ >
120
+ {t('COUNTRY', 'Country')}
121
+ </Button>
115
122
  </BrandBusinessWrapper>
116
123
  <CalendarWrapper>
117
124
  <AnalyticsCalendar
@@ -210,6 +217,18 @@ const ReportsDriverSpendUI = (props) => {
210
217
  {...props} onClose={() => setIsBrandFilter(false)}
211
218
  />
212
219
  </Modal>
220
+ <Modal
221
+ width='450px'
222
+ height='650px'
223
+ padding='25px'
224
+ open={openCountryFilter}
225
+ onClose={() => setOpenCountryFilter(false)}
226
+ >
227
+ <CountryFilter
228
+ {...props}
229
+ onClose={() => setOpenCountryFilter(false)}
230
+ />
231
+ </Modal>
213
232
  </ReportsBusinessSpendContainer>
214
233
  )
215
234
  }
@@ -12,7 +12,7 @@ import { Download } from 'react-bootstrap-icons'
12
12
  import Skeleton from 'react-loading-skeleton'
13
13
  import { Button } from '../../../styles'
14
14
  import { Modal } from '../../Shared'
15
-
15
+ import { CountryFilter } from '../CountryFilter'
16
16
  import {
17
17
  ReportsBusinessSpendContainer,
18
18
  DistancePerBrandWrapper,
@@ -41,6 +41,7 @@ const ReportsGeneralSalesUI = (props) => {
41
41
  const [isDriverGroupFilter, setIsDriverGroupFilter] = useState(false)
42
42
  const [isBrandFilter, setIsBrandFilter] = useState(false)
43
43
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
44
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
44
45
 
45
46
  const tableRef = useRef(null)
46
47
 
@@ -124,6 +125,11 @@ const ReportsGeneralSalesUI = (props) => {
124
125
  >
125
126
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
126
127
  </Button>
128
+ <Button
129
+ onClick={() => setOpenCountryFilter(true)}
130
+ >
131
+ {t('COUNTRY', 'Country')}
132
+ </Button>
127
133
  </BrandBusinessWrapper>
128
134
  <CalendarWrapper>
129
135
  <AnalyticsCalendar
@@ -235,6 +241,18 @@ const ReportsGeneralSalesUI = (props) => {
235
241
  isFranchise
236
242
  />
237
243
  </Modal>
244
+ <Modal
245
+ width='450px'
246
+ height='650px'
247
+ padding='25px'
248
+ open={openCountryFilter}
249
+ onClose={() => setOpenCountryFilter(false)}
250
+ >
251
+ <CountryFilter
252
+ {...props}
253
+ onClose={() => setOpenCountryFilter(false)}
254
+ />
255
+ </Modal>
238
256
  </ReportsBusinessSpendContainer>
239
257
  )
240
258
  }
@@ -9,6 +9,7 @@ import { ReportsDriverFilter } from '../ReportsDriverFilter'
9
9
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
10
10
  import { AnalyticsCalendar } from '../AnalyticsCalendar'
11
11
  import { ReportsDriverGroupFilter } from '../ReportsDriverGroupFilter'
12
+ import { CountryFilter } from '../CountryFilter'
12
13
  import {
13
14
  HeatMapContainer,
14
15
  Title,
@@ -32,6 +33,7 @@ const ReportsHeatMapUI = (props) => {
32
33
  const [{ user }] = useSession()
33
34
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
34
35
  const [isDriverFilter, setIsDriverFilter] = useState(false)
36
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
35
37
  const [isDriverGroupFilter, setIsDriverGroupFilter] = useState(false)
36
38
  const [alertState, setAlertState] = useState({ open: false, content: [] })
37
39
  const [availableDriverIds, setAvailableDriverIds] = useState(null)
@@ -112,6 +114,11 @@ const ReportsHeatMapUI = (props) => {
112
114
  >
113
115
  {t('DRIVER', 'Driver')} ({filterList?.drivers_ids ? filterList?.drivers_ids.length : t('ALL', 'All')})
114
116
  </Button>
117
+ <Button
118
+ onClick={() => setOpenCountryFilter(true)}
119
+ >
120
+ {t('COUNTRY', 'Country')}
121
+ </Button>
115
122
  </BrandBusinessWrapper>
116
123
  <CalendarWrapper>
117
124
  <AnalyticsCalendar
@@ -210,6 +217,18 @@ const ReportsHeatMapUI = (props) => {
210
217
  {...props} onClose={() => setIsBrandFilter(false)}
211
218
  />
212
219
  </Modal>
220
+ <Modal
221
+ width='450px'
222
+ height='650px'
223
+ padding='25px'
224
+ open={openCountryFilter}
225
+ onClose={() => setOpenCountryFilter(false)}
226
+ >
227
+ <CountryFilter
228
+ {...props}
229
+ onClose={() => setOpenCountryFilter(false)}
230
+ />
231
+ </Modal>
213
232
  </HeatMapContainer>
214
233
  <Alert
215
234
  title={t('HEAT_MAP', 'Heat map')}
@@ -9,6 +9,7 @@ import { Modal } from '../../Shared'
9
9
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
10
10
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
11
11
  import { ReportsBarChart } from '../ReportsBarChart'
12
+ import { CountryFilter } from '../CountryFilter'
12
13
  import {
13
14
  ReportsDistanceContainer,
14
15
  Title,
@@ -36,6 +37,7 @@ const ReportsOrderDistanceUI = (props) => {
36
37
  const tableRef = useRef(null)
37
38
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
38
39
  const [isBrandFilter, setIsBrandFilter] = useState(false)
40
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
39
41
  const [chartData, setChartData] = useState(null)
40
42
 
41
43
  const handleChangeDate = (date1, date2) => {
@@ -146,6 +148,11 @@ const ReportsOrderDistanceUI = (props) => {
146
148
  >
147
149
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
148
150
  </Button>
151
+ <Button
152
+ onClick={() => setOpenCountryFilter(true)}
153
+ >
154
+ {t('COUNTRY', 'Country')}
155
+ </Button>
149
156
  </BrandBusinessWrapper>
150
157
  <CalendarWrapper>
151
158
  <AnalyticsCalendar
@@ -246,6 +253,18 @@ const ReportsOrderDistanceUI = (props) => {
246
253
  {...props} onClose={() => setIsBrandFilter(false)}
247
254
  />
248
255
  </Modal>
256
+ <Modal
257
+ width='450px'
258
+ height='650px'
259
+ padding='25px'
260
+ open={openCountryFilter}
261
+ onClose={() => setOpenCountryFilter(false)}
262
+ >
263
+ <CountryFilter
264
+ {...props}
265
+ onClose={() => setOpenCountryFilter(false)}
266
+ />
267
+ </Modal>
249
268
  </ReportsDistanceContainer>
250
269
  )
251
270
  }
@@ -8,6 +8,7 @@ import { Alert, Modal } from '../../Shared'
8
8
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
9
9
  import { ReportsOrderTypeFilter } from '../ReportsOrderTypeFilter'
10
10
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
11
+ import { CountryFilter } from '../CountryFilter'
11
12
  import {
12
13
  OrderStatusContainer,
13
14
  Title,
@@ -36,6 +37,7 @@ const ReportsOrderStatusUI = (props) => {
36
37
  const [{ parsePrice }] = useUtils()
37
38
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
38
39
  const [isBrandFilter, setIsBrandFilter] = useState(false)
40
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
39
41
  const [isOrderTypeFilter, setIsOrderTypeFilter] = useState(false)
40
42
  const [alertState, setAlertState] = useState({ open: false, content: [] })
41
43
 
@@ -127,6 +129,11 @@ const ReportsOrderStatusUI = (props) => {
127
129
  >
128
130
  {t('ORDER_TYPE', 'Order type')} ({filterList?.delivery_types_ids ? filterList?.delivery_types_ids.length : t('ALL', 'All')})
129
131
  </Button>
132
+ <Button
133
+ onClick={() => setOpenCountryFilter(true)}
134
+ >
135
+ {t('COUNTRY', 'Country')}
136
+ </Button>
130
137
  </BrandBusinessWrapper>
131
138
  <CalendarWrapper>
132
139
  <AnalyticsCalendar
@@ -288,6 +295,18 @@ const ReportsOrderStatusUI = (props) => {
288
295
  onClose={() => setIsOrderTypeFilter(false)}
289
296
  />
290
297
  </Modal>
298
+ <Modal
299
+ width='450px'
300
+ height='650px'
301
+ padding='25px'
302
+ open={openCountryFilter}
303
+ onClose={() => setOpenCountryFilter(false)}
304
+ >
305
+ <CountryFilter
306
+ {...props}
307
+ onClose={() => setOpenCountryFilter(false)}
308
+ />
309
+ </Modal>
291
310
  </OrderStatusContainer>
292
311
  <Alert
293
312
  title={t('DRIVER_SCHEDULE', 'Driver schedule')}
@@ -11,7 +11,7 @@ export const OrderTypeFilterOption = styled.div`
11
11
 
12
12
  svg {
13
13
  font-size: 24px;
14
- color: #B1BCCC;
14
+ color: ${props => props.theme.colors.secundaryLight};
15
15
 
16
16
  &.fill {
17
17
  color: ${props => props.theme.colors.primary};
@@ -9,6 +9,10 @@ import {
9
9
  import { Button } from '../../../styles'
10
10
  import Skeleton from 'react-loading-skeleton'
11
11
  import { Download } from 'react-bootstrap-icons'
12
+ import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
13
+ import { ReportsBrandFilter } from '../ReportsBrandFilter'
14
+ import { CountryFilter } from '../CountryFilter'
15
+ import { Modal } from '../../Shared'
12
16
 
13
17
  import {
14
18
  ReportsOrdersContainer,
@@ -22,9 +26,6 @@ import {
22
26
  EmptyContent,
23
27
  ChartFooterContainer
24
28
  } from './styles'
25
- import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
26
- import { ReportsBrandFilter } from '../ReportsBrandFilter'
27
- import { Modal } from '../../Shared'
28
29
 
29
30
  const ReportsOrdersUI = (props) => {
30
31
  const {
@@ -36,6 +37,7 @@ const ReportsOrdersUI = (props) => {
36
37
  const [, t] = useLanguage()
37
38
  const [dataOptions, setDataOptions] = useState(null)
38
39
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
40
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
39
41
  const [isBrandFilter, setIsBrandFilter] = useState(false)
40
42
 
41
43
  const generateData = () => {
@@ -147,6 +149,11 @@ const ReportsOrdersUI = (props) => {
147
149
  >
148
150
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
149
151
  </Button>
152
+ <Button
153
+ onClick={() => setOpenCountryFilter(true)}
154
+ >
155
+ {t('COUNTRY', 'Country')}
156
+ </Button>
150
157
  </BrandBusinessWrapper>
151
158
  <CalendarWrapper>
152
159
  <AnalyticsCalendar
@@ -206,6 +213,18 @@ const ReportsOrdersUI = (props) => {
206
213
  {...props} onClose={() => setIsBrandFilter(false)}
207
214
  />
208
215
  </Modal>
216
+ <Modal
217
+ width='450px'
218
+ height='650px'
219
+ padding='25px'
220
+ open={openCountryFilter}
221
+ onClose={() => setOpenCountryFilter(false)}
222
+ >
223
+ <CountryFilter
224
+ {...props}
225
+ onClose={() => setOpenCountryFilter(false)}
226
+ />
227
+ </Modal>
209
228
  </ReportsOrdersContainer>
210
229
  )
211
230
  }
@@ -126,7 +126,7 @@ export const ChartFooterContainer = styled.div`
126
126
 
127
127
  p {
128
128
  font-size: 14px;
129
- color: #909BA9;
129
+ color: ${props => props.theme.colors.lightGray};
130
130
  margin: 0;
131
131
  }
132
132
  `
@@ -11,6 +11,7 @@ import { Modal } from '../../Shared'
11
11
  import { AnalyticsBusinessFilter } from '../AnalyticsBusinessFilter'
12
12
  import { AnalyticsCalendar } from '../AnalyticsCalendar'
13
13
  import { ReportsBrandFilter } from '../ReportsBrandFilter'
14
+ import { CountryFilter } from '../CountryFilter'
14
15
 
15
16
  import {
16
17
  ReportsContainer,
@@ -36,6 +37,7 @@ const ReportsSaleAndCategoryUI = (props) => {
36
37
  const [, t] = useLanguage()
37
38
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
38
39
  const [isBrandFilter, setIsBrandFilter] = useState(false)
40
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
39
41
 
40
42
  const handleChangeDate = (date1, date2) => {
41
43
  handleChangeFilterList({ ...filterList, from: date1, to: date2 })
@@ -170,6 +172,11 @@ const ReportsSaleAndCategoryUI = (props) => {
170
172
  >
171
173
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
172
174
  </Button>
175
+ <Button
176
+ onClick={() => setOpenCountryFilter(true)}
177
+ >
178
+ {t('COUNTRY', 'Country')}
179
+ </Button>
173
180
  </BrandBusinessWrapper>
174
181
  <CalendarWrapper>
175
182
  <AnalyticsCalendar
@@ -241,6 +248,18 @@ const ReportsSaleAndCategoryUI = (props) => {
241
248
  {...props} onClose={() => setIsBrandFilter(false)}
242
249
  />
243
250
  </Modal>
251
+ <Modal
252
+ width='450px'
253
+ height='650px'
254
+ padding='25px'
255
+ open={openCountryFilter}
256
+ onClose={() => setOpenCountryFilter(false)}
257
+ >
258
+ <CountryFilter
259
+ {...props}
260
+ onClose={() => setOpenCountryFilter(false)}
261
+ />
262
+ </Modal>
244
263
  </ReportsContainer>
245
264
  )
246
265
  }
@@ -10,6 +10,7 @@ import {
10
10
  import { Button } from '../../../styles'
11
11
  import Skeleton from 'react-loading-skeleton'
12
12
  import { Download } from 'react-bootstrap-icons'
13
+ import { CountryFilter } from '../CountryFilter'
13
14
 
14
15
  import {
15
16
  ReportsOrdersContainer,
@@ -39,6 +40,7 @@ const ReportsSalesUI = (props) => {
39
40
  const [dataOptions, setDataOptions] = useState(null)
40
41
  const [isBusinessFilter, setIsBusinessFilter] = useState(false)
41
42
  const [isBrandFilter, setIsBrandFilter] = useState(false)
43
+ const [openCountryFilter, setOpenCountryFilter] = useState(true)
42
44
 
43
45
  const generateData = () => {
44
46
  const list = []
@@ -149,6 +151,11 @@ const ReportsSalesUI = (props) => {
149
151
  >
150
152
  {t('BUSINESS', 'Business')} ({filterList?.businessIds ? filterList?.businessIds.length : t('ALL', 'All')})
151
153
  </Button>
154
+ <Button
155
+ onClick={() => setOpenCountryFilter(true)}
156
+ >
157
+ {t('COUNTRY', 'Country')}
158
+ </Button>
152
159
  </BrandBusinessWrapper>
153
160
  <CalendarWrapper>
154
161
  <AnalyticsCalendar
@@ -208,6 +215,18 @@ const ReportsSalesUI = (props) => {
208
215
  {...props} onClose={() => setIsBrandFilter(false)}
209
216
  />
210
217
  </Modal>
218
+ <Modal
219
+ width='450px'
220
+ height='650px'
221
+ padding='25px'
222
+ open={openCountryFilter}
223
+ onClose={() => setOpenCountryFilter(false)}
224
+ >
225
+ <CountryFilter
226
+ {...props}
227
+ onClose={() => setOpenCountryFilter(false)}
228
+ />
229
+ </Modal>
211
230
  </ReportsOrdersContainer>
212
231
  )
213
232
  }