ordering-ui-admin-external 1.25.0 → 1.26.0

package/_modules/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "Alert", {
     return _Shared.Alert;
   }
 });
+Object.defineProperty(exports, "AllInOne", {
+  enumerable: true,
+  get: function get() {
+    return _Orders.AllInOne;
+  }
+});
 Object.defineProperty(exports, "AnalyticsAvailableTimes", {
   enumerable: true,
   get: function get() {

package/_modules/utils/index.js

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getIconCard = exports.getHours = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
+exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _FaCcMastercard = _interopRequireDefault(require("@meronex/icons/fa/FaCcMastercard"));
 var _FaCcVisa = _interopRequireDefault(require("@meronex/icons/fa/FaCcVisa"));
 var _FaCreditCard = _interopRequireDefault(require("@meronex/icons/fa/FaCreditCard"));
 var _moment = _interopRequireDefault(require("moment"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
+var _currency = require("../config/currency.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -170,9 +171,26 @@ var bytesConverter = function bytesConverter(bytes) {
 };
 
 /**
- * List of fields with correct order
+ * Function to get language settins by language code
+ * @param {string} code // language code
+ * @param {any} locales // language settings
  */
 exports.bytesConverter = bytesConverter;
+var getLocale = function getLocale(code, locales) {
+  var locale = locales === null || locales === void 0 ? void 0 : locales[code];
+  if (code === 'es-419-1' || code === 'es-419-2') locale = locales === null || locales === void 0 ? void 0 : locales.es;
+  if (code === 'zh-CN') locale = locales === null || locales === void 0 ? void 0 : locales.zhCN;
+  if (code === 'ar') locale = locales === null || locales === void 0 ? void 0 : locales.arSA;
+  if (code === 'kn') locale = locales === null || locales === void 0 ? void 0 : locales.ta;
+  if (code === 'km') locale = locales === null || locales === void 0 ? void 0 : locales.th;
+  if (!locale) return locales === null || locales === void 0 ? void 0 : locales.enUS;
+  return locale;
+};
+
+/**
+ * List of fields with correct order
+ */
+exports.getLocale = getLocale;
 var fieldsToSort = ['name', 'middle_name', 'lastname', 'second_lastname', 'email'];
 
 /**
@@ -816,4 +834,9 @@ var stringToSlug = function stringToSlug(str) {
 
   return str;
 };
-exports.stringToSlug = stringToSlug;
+exports.stringToSlug = stringToSlug;
+var getCurrenySymbol = function getCurrenySymbol(code) {
+  var _CURRENCY$code$symbol, _CURRENCY$code;
+  return (_CURRENCY$code$symbol = _currency.CURRENCY === null || _currency.CURRENCY === void 0 ? void 0 : (_CURRENCY$code = _currency.CURRENCY[code]) === null || _CURRENCY$code === void 0 ? void 0 : _CURRENCY$code.symbol) !== null && _CURRENCY$code$symbol !== void 0 ? _CURRENCY$code$symbol : code;
+};
+exports.getCurrenySymbol = getCurrenySymbol;

package/index-template.js

@@ -283,6 +283,11 @@ import dinerWare from './template/assets/images/pos/diner-ware.png'
 import digitalDining from './template/assets/images/pos/digital-dining.png'
 import foodTec from './template/assets/images/pos/food-tec.png'
 
+// preview
+import marketplace from './template/assets/images/preview/marketplace.png'
+import franchise from './template/assets/images/preview/franchise.png'
+import singleStore from './template/assets/images/preview/single-store.png'
+
 import { AutologinParams } from './template/components/AutologinParams'
 
 if (!(window?.location?.hostname === 'localhost')) {
@@ -613,6 +618,11 @@ theme.images = {
   tutorials: {
     businessTutorial1: businessTutorial1,
     businessTutorial2: businessTutorial2
+  },
+  preview: {
+    marketplace,
+    franchise,
+    singleStore
   }
 }
 theme.sounds = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.25.0",
+    "ordering-components-admin-external": "1.26.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",
@@ -95,6 +95,7 @@
     "react-datepicker": "^3.7.0",
     "react-helmet": "^6.1.0",
     "react-hook-form": "^6.11.3",
+    "react-hubspot-form": "^1.3.7",
     "react-loading-skeleton": "^2.1.1",
     "react-numeric-input": "^2.2.3",
     "react-otp-input": "^2.4.0",

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

@@ -7,6 +7,8 @@ import 'react-date-range/dist/theme/default.css'
 import { Calendar4 } from 'react-bootstrap-icons'
 import { Button } from '../../../styles'
 import { AnalyticsCalendarContainer } from './styles'
+import * as locales from 'react-date-range/dist/locale'
+import { getLocale } from '../../../utils'
 
 export const AnalyticsCalendar = (props) => {
   const {
@@ -15,7 +17,8 @@ export const AnalyticsCalendar = (props) => {
     leftAlign
   } = props
 
-  const [, t] = useLanguage()
+  const [state, t] = useLanguage()
+
   const [dateRange, setDateRange] = useState([
     {
       startDate: null,
@@ -85,9 +88,12 @@ export const AnalyticsCalendar = (props) => {
           <AnalyticsCalendarContainer className='ordering-calendar' ref={calendarRef} leftAlign={leftAlign}>
             <DateRange
               editableDateInputs
+              locale={getLocale(state?.language?.code, locales)}
               onChange={item => handleChangeDates(item)}
               moveRangeOnFirstSelection={false}
               ranges={dateRange}
+              startDatePlaceholder={t('EARLY', 'Early')}
+              endDatePlaceholder={t('CONTINUOUS', 'Continuous')}
             />
           </AnalyticsCalendarContainer>
         )

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

@@ -22,7 +22,6 @@ export const SectionContainer = styled.div`
 export const ButtonsContainer = styled.div`
   display: flex;
   align-items: center;
-  justify-content: flex-end;
   padding: 20px;
   position: sticky;
   z-index: 100;

package/src/components/Delivery/DriversGroupAddForm/AdvancedLogisticsForm/index.js

@@ -0,0 +1,113 @@
+import React, { useState } from 'react'
+import { useLanguage } from 'ordering-components-admin-external'
+import { Circle, RecordCircleFill } from 'react-bootstrap-icons'
+import { DriversGroupOrders } from '../../DriversGroupOrders'
+import { DriversGroupAutoassign } from '../../DriversGroupAutoassign'
+import { DriversMarkAsBusy } from '../../DriversMarkAsBusy'
+import { Checkbox } from '../../../../styles'
+
+import {
+  LogisticsContainer,
+  OrderStatusWrapper,
+  RadioButton,
+  SubSectionContainer,
+  CheckboxContainer,
+  HeaderWrapper
+} from './styles'
+
+export const AdvancedLogisticsForm = (props) => {
+  const {
+    driversGroupState,
+    changesState,
+    handleChangesState
+  } = props
+
+  const [, t] = useLanguage()
+  const [useAdvanced, setUseAdvanced] = useState(false)
+
+  const handleLogistic = (checked) => {
+    setUseAdvanced(checked)
+    if (checked) return
+    const changes = {
+      autoassign_amount_drivers: 0,
+      orders_group_max_orders: 0
+    }
+    handleChangesState(changes)
+  }
+
+  return (
+    <LogisticsContainer>
+      <HeaderWrapper>
+        <h2>{t('ADVANCED_LOGISTICS', 'Advanced logistics')}</h2>
+        <CheckboxContainer>
+          <Checkbox
+            checked={useAdvanced}
+            onChange={e => handleLogistic(e.target.checked)}
+          />
+          <p>{t('USE_ADVANCED_LOGISTIC', 'Use advanced logistic')}</p>
+        </CheckboxContainer>
+      </HeaderWrapper>
+      {useAdvanced && (
+        <>
+          <OrderStatusWrapper
+            onClick={() => handleChangesState({ orders_group_start_in_status: 7 })}
+          >
+            <RadioButton
+              active={
+                (changesState?.orders_group_start_in_status && changesState?.orders_group_start_in_status === 7) ||
+                (typeof changesState?.orders_group_start_in_status === 'undefined' && driversGroupState.driversGroup?.orders_group_start_in_status === 7)
+              }
+            >
+              {
+                ((changesState?.orders_group_start_in_status && changesState?.orders_group_start_in_status === 7) ||
+                  (typeof changesState?.orders_group_start_in_status === 'undefined' && driversGroupState.driversGroup?.orders_group_start_in_status === 7)
+                )
+                  ? (
+                    <RecordCircleFill />
+                  ) : (
+                    <Circle />
+                  )
+              }
+            </RadioButton>
+            <span>{t('ACCEPT_BY_BUSINESS', 'Accepted by Business.')}</span>
+          </OrderStatusWrapper>
+          <OrderStatusWrapper
+            onClick={() => handleChangesState({ orders_group_start_in_status: 4 })}
+          >
+            <RadioButton
+              active={
+                (changesState?.orders_group_start_in_status && changesState?.orders_group_start_in_status === 4) ||
+                (typeof changesState?.orders_group_start_in_status === 'undefined' && driversGroupState.driversGroup?.orders_group_start_in_status === 4)
+              }
+            >
+              {
+                ((changesState?.orders_group_start_in_status && changesState?.orders_group_start_in_status === 4) ||
+                  (typeof changesState?.orders_group_start_in_status === 'undefined' && driversGroupState.driversGroup?.orders_group_start_in_status === 4)
+                )
+                  ? (
+                    <RecordCircleFill />
+                  ) : (
+                    <Circle />
+                  )
+              }
+            </RadioButton>
+            <span>{t('PREPARATION_COMPLETED', 'Preparation Completed')}</span>
+          </OrderStatusWrapper>
+          {(changesState?.type === 0) && (
+            <SubSectionContainer>
+              <DriversGroupOrders {...props} />
+            </SubSectionContainer>
+          )}
+          <SubSectionContainer>
+            <DriversGroupAutoassign {...props} />
+          </SubSectionContainer>
+          {changesState?.type === 0 && (
+            <SubSectionContainer>
+              <DriversMarkAsBusy {...props} />
+            </SubSectionContainer>
+          )}
+        </>
+      )}
+    </LogisticsContainer>
+  )
+}

package/src/components/Delivery/DriversGroupAddForm/AdvancedLogisticsForm/styles.js

@@ -0,0 +1,72 @@
+import styled, { css } from 'styled-components'
+
+export const LogisticsContainer = styled.div``
+
+export const OrderStatusWrapper = styled.div`
+  padding: 15px 0;
+  border-bottom: 1px solid ${props => props.theme.colors.borderColor};
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+
+  > span {
+    font-size: 14px;
+    ${props => props.theme?.rtl ? css`
+      margin-right: 15px;
+    ` : css`
+      margin-left: 15px;
+    `}
+  }
+`
+
+export const RadioButton = styled.div`
+  svg {
+    font-size: 16px;
+    color: ${props => props.theme.colors.secundaryLight};
+  }
+
+  ${({ active }) => active && css`
+    svg {
+      color: ${props => props.theme.colors.primary};
+    }
+  `}
+`
+export const SubSectionContainer = styled.div`
+  margin: 45px 0;
+  > div {
+    padding: 0;
+    h1 {
+      font-weight: 600;
+      font-size: 14px;
+      line-height: 21px;
+    }
+  }
+`
+export const CheckboxContainer = styled.div`
+  display: flex;
+  align-items: center;
+  margin: 0 0 29px 0;
+
+  p {
+    font-size: 14px;
+    margin: 0px;
+    ${props => props.theme?.rtl ? css`
+      padding-right: 10px;
+    ` : css`
+      padding-left: 10px;
+    `}
+  }
+`
+export const HeaderWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+
+  h2 {
+    ${props => props.theme?.rtl ? css`
+      padding-left: 16px;
+    ` : css`
+    padding-right: 16px;
+    `}
+  }
+`

package/src/components/Delivery/DriversGroupAddForm/BusinessesForm/index.js

@@ -0,0 +1,87 @@
+import React, { useEffect, useState } from 'react'
+import { useLanguage } from 'ordering-components-admin-external'
+
+import { Checkbox, Button } from '../../../../styles'
+import { SearchBar } from '../../../Shared'
+
+import {
+  Container,
+  SearchBarWrapper,
+  ButtonGroup,
+  BusinessesContainer,
+  BusinessWrapper,
+  WrapperImage,
+  Image
+} from './styles'
+
+export const BusinessesForm = (props) => {
+  const {
+    businesses,
+    handleSelectBusiness,
+    actionState,
+    handleSelectAllBusiness,
+    selectedBusinessIds
+  } = props
+
+  const [, t] = useLanguage()
+  const [searchValue, setSearchValue] = useState(null)
+  const [filteredBusinesses, setFilteredBusinesses] = useState([])
+
+  useEffect(() => {
+    let _filteredBusinesses = []
+    if (searchValue) {
+      _filteredBusinesses = businesses.filter(business => business?.name?.toLowerCase().includes(searchValue?.toLowerCase()))
+    } else {
+      _filteredBusinesses = [...businesses]
+    }
+    setFilteredBusinesses(_filteredBusinesses)
+  }, [searchValue])
+
+  return (
+    <Container>
+      <h2>{t('BUSINESSES', 'Businesses')}</h2>
+      <SearchBarWrapper>
+        <SearchBar
+          placeholder={t('SEARCH', 'Search')}
+          isCustomLayout
+          lazyLoad
+          search={searchValue}
+          onSearch={val => setSearchValue(val)}
+        />
+      </SearchBarWrapper>
+      <ButtonGroup>
+        <Button
+          type='button'
+          color='secundaryDark'
+          onClick={() => handleSelectAllBusiness(true)}
+        >
+          {t('SELECT_ALL', 'Select all')}
+        </Button>
+        <Button
+          type='button'
+          color='secundaryDark'
+          onClick={() => handleSelectAllBusiness(false)}
+        >
+          {t('SELECT_NONE', 'Select none')}
+        </Button>
+      </ButtonGroup>
+      <BusinessesContainer>
+        {filteredBusinesses.map(business => (
+          <BusinessWrapper
+            key={business.id}
+            isDisabed={actionState.loading}
+          >
+            <Checkbox
+              checked={selectedBusinessIds.includes(business.id)}
+              onChange={e => handleSelectBusiness(business.id, e.target.checked)}
+            />
+            <WrapperImage>
+              <Image bgimage={business?.logo} alt='logo' />
+            </WrapperImage>
+            <p>{business?.name}</p>
+          </BusinessWrapper>
+        ))}
+      </BusinessesContainer>
+    </Container>
+  )
+}

package/src/components/Delivery/DriversGroupAddForm/BusinessesForm/styles.js

@@ -0,0 +1,87 @@
+import React from 'react'
+import styled, { css } from 'styled-components'
+
+export const Container = styled.div``
+
+export const SearchBarWrapper = styled.div`
+  margin-bottom: 10px;
+`
+
+export const ButtonGroup = styled.div`
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  button:first-child {
+    ${props => props.theme?.rtl ? css`
+      margin-left: 7px;
+    ` : css`
+      margin-right: 7px;
+    `}
+  }
+`
+
+export const BusinessesContainer = styled.div`
+  max-height: 610px;
+  overflow: auto;
+`
+
+export const BusinessWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  padding: 10px 0;
+  border-bottom: 1px solid ${props => props.theme.colors.borderColor};
+
+  p {
+    margin: 0px;
+    font-size: 12px;
+  }
+
+  ${({ isDisabed }) => isDisabed && css`
+    pointer-events: none;
+  `}
+`
+
+export const WrapperImage = styled.div`
+  max-width: 40px;
+  max-height: 40px;
+  height: 40px;
+  width: 40px;
+  ${({ isSkeleton }) => !isSkeleton && css`
+    border: 1px solid #E3E3E3;
+  `}
+  border-radius: 8px;
+
+  svg {
+    width: 100%;
+    height: 100%;
+    padding: 7px;
+    box-sizing: border-box;
+    border-radius: 50%;
+  }
+
+  margin: 0 10px;
+`
+
+const ImageStyled = styled.div`
+  display: flex;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  position: relative;
+  background-repeat: no-repeat, repeat;
+  background-size: cover;
+  object-fit: cover;
+  background-position: center;
+  border-radius: 8px;
+`
+
+export const Image = (props) => {
+  return (
+    <ImageStyled
+      {...props}
+      style={{ backgroundImage: `url(${props.bgimage})` }}
+    >
+      {props.children}
+    </ImageStyled>
+  )
+}

package/src/components/Delivery/DriversGroupAddForm/GeneralForm/index.js

@@ -0,0 +1,104 @@
+import React from 'react'
+import { useLanguage, useSession } from 'ordering-components-admin-external'
+import { useFormContext } from 'react-hook-form'
+import { Input, SecondSelect as DefaultSelect } from '../../../../styles'
+import { DriversGroupDrivers } from '../../DriversGroupDrivers'
+import { DriversGroupCompanies } from '../../DriversGroupCompanies'
+
+import {
+  Container,
+  InputWrapper
+} from './styles'
+
+export const GeneralForm = (props) => {
+  const {
+    driversManagers,
+    changesState,
+    handleChangesState
+  } = props
+
+  const [, t] = useLanguage()
+  const { register } = useFormContext()
+  const [{ user }] = useSession()
+
+  const typeOptions = [
+    { value: 0, content: t('IN_HOUSE_DRIVERS', 'In house drivers') },
+    { value: 1, content: t('DRIVER_COMPANIES', 'Driver companies') }
+  ]
+
+  const driversManagersOptions = driversManagers.map(manager => {
+    return {
+      value: manager.id,
+      content: <div>{manager?.name} {manager?.lastname}</div>
+    }
+  })
+
+  const priorityOptions = [
+    { value: -1, content: t('LOW', 'Low') },
+    { value: 0, content: t('NORMAL', 'Normal') },
+    { value: 1, content: t('HIGH', 'High') },
+    { value: 2, content: t('URGENT', 'Urgent') }
+  ]
+
+  return (
+    <Container>
+      <h2>{t('GENERAL', 'General')}</h2>
+      <InputWrapper>
+        <label>{t('NAME', 'Name')}</label>
+        <Input
+          name='name'
+          defaultValue={changesState?.name ?? ''}
+          onChange={e => handleChangesState({ name: e.target.value })}
+          placeholder={t('NAME', 'Name')}
+          ref={register({
+            required: t(
+              'VALIDATION_ERROR_REQUIRED',
+              'Project is required'
+            ).replace('_attribute_', t('NAME', 'Name'))
+          })}
+          autoComplete='off'
+        />
+      </InputWrapper>
+      {user?.level !== 5 && (
+        <InputWrapper>
+          <label>{t('DRIVER_MANAGER', 'Driver manager')}</label>
+          <DefaultSelect
+            isSecondIcon
+            placeholder={t('SELECT_MANAGER', 'Select driver manager')}
+            options={driversManagersOptions}
+            defaultValue={changesState?.administrator_id}
+            optionInnerMaxHeight='60vh'
+            onChange={val => handleChangesState({ administrator_id: val })}
+          />
+        </InputWrapper>
+      )}
+      <InputWrapper>
+        <label>{t('TYPE', 'Type')}</label>
+        <DefaultSelect
+          isSecondIcon
+          placeholder={t('SELECT_TYPE', 'Select type')}
+          options={typeOptions}
+          defaultValue={changesState?.type}
+          onChange={val => handleChangesState({ type: val })}
+        />
+      </InputWrapper>
+
+      {
+        (changesState?.type === 0)
+          ? <DriversGroupDrivers {...props} />
+          : <DriversGroupCompanies {...props} />
+      }
+
+      <InputWrapper>
+        <label>{t('PRIORITY', 'Priority')}</label>
+        <DefaultSelect
+          isSecondIcon
+          placeholder={t('SELECT_PRIORITY', 'Select priority')}
+          options={priorityOptions}
+          defaultValue={changesState?.priority}
+          onChange={val => handleChangesState({ priority: val })}
+        />
+      </InputWrapper>
+    </Container>
+  )
+}