ordering-ui-admin-external 1.13.3 → 1.14.0

package/src/index.js

@@ -341,7 +341,7 @@ import {
 } from './components/Users'
 import {
   RewardsPrograms,
-  PointsWallet,
+  Wallet,
   PointsWalletLevels,
   PointsWalletBusinessDetail,
   PointsWalletBusinessList
@@ -749,7 +749,7 @@ export {
   UserFormDetailsUI,
 
   RewardsPrograms,
-  PointsWallet,
+  Wallet,
   PointsWalletLevels,
   PointsWalletBusinessDetail,
   PointsWalletBusinessList,

package/template/assets/images/icons/business-google.svg

@@ -0,0 +1,26 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="32" rx="6.5" fill="white" stroke="#E9ECEF"/>
+<g clip-path="url(#clip0_12441_82412)">
+<path d="M24.484 11.2655H5.95347C5.51318 11.2655 5.15625 11.6384 5.15625 12.0983V26.153C5.15625 26.613 5.51318 26.9859 5.95347 26.9859H24.484C24.9243 26.9859 25.2812 26.613 25.2812 26.153V12.0983C25.2812 11.6384 24.9243 11.2655 24.484 11.2655Z" fill="#4989F5"/>
+<path d="M24.248 11.1475H6.16037C5.60007 11.1475 5.16406 15.6775 5.16406 16.2628L15.0694 26.9859H24.248C24.81 26.9843 25.2653 26.5088 25.2668 25.9216V12.2115C25.2651 11.6245 24.81 11.1491 24.248 11.1475Z" fill="url(#paint0_linear_12441_82412)"/>
+<path d="M9.75 13.8982H15.5V6.01428H10.611L9.75 13.8982Z" fill="#3C4BA6"/>
+<path d="M21.25 13.8982H15.5V6.01428H20.389L21.25 13.8982ZM25.2798 7.50877L25.2869 7.53564C25.2852 7.52616 25.2817 7.51735 25.2798 7.50877Z" fill="#7BABF7"/>
+<path d="M25.2885 7.5354L25.2814 7.50853C25.0991 6.63647 24.3602 6.0146 23.5058 6.01404H20.3906L21.251 13.8982H27.001L25.2885 7.5354Z" fill="#3F51B5"/>
+<path d="M5.71807 7.50879L5.71094 7.53566C5.71267 7.52618 5.71613 7.51737 5.71807 7.50879Z" fill="#7BABF7"/>
+<path d="M5.71354 7.5354L5.72068 7.50853C5.90297 6.63647 6.64182 6.0146 7.49626 6.01404H10.6116L9.75 13.8982H4L5.71354 7.5354Z" fill="#7BABF7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.76238 13.8961C9.76238 15.5539 8.47592 16.8979 6.889 16.8979C5.30209 16.8979 4.01562 15.5539 4.01562 13.8961H9.76238Z" fill="#709BE0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5046 13.8961C15.5046 15.5539 14.2181 16.8979 12.6312 16.8979C11.0443 16.8979 9.75781 15.5539 9.75781 13.8961H15.5046Z" fill="#3C4BA6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.2546 13.8961C21.2546 15.5539 19.9681 16.8979 18.3812 16.8979C16.7943 16.8979 15.5078 15.5539 15.5078 13.8961H21.2546Z" fill="#709BE0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.9968 13.8961C26.9968 15.5539 25.7103 16.8979 24.1234 16.8979C22.5365 16.8979 21.25 15.5539 21.25 13.8961H26.9968Z" fill="#3C4BA6"/>
+<path d="M24.128 22.0286C24.1178 21.8857 24.1009 21.7552 24.0769 21.5885H20.9425C20.9425 22.0465 20.9426 22.5462 20.9408 23.0044H22.7566C22.718 23.2179 22.6395 23.4214 22.5254 23.6031C22.4113 23.7848 22.264 23.9412 22.0919 24.0633C22.0919 24.0633 22.0919 24.0554 22.0906 24.0552C21.8684 24.2076 21.618 24.3097 21.3556 24.3548C21.0926 24.4051 20.823 24.4039 20.5604 24.3512C20.2937 24.2936 20.0413 24.1793 19.8187 24.0154C19.4902 23.772 19.2368 23.4338 19.0896 23.0421C19.0783 23.0116 19.068 22.9809 19.0574 22.9498V22.9464L19.0602 22.9441C18.9173 22.5061 18.9169 22.0311 19.0591 21.5928C19.1592 21.2854 19.324 21.0053 19.5414 20.7731C20.0512 20.2221 20.813 20.0148 21.5154 20.2361C21.7847 20.3223 22.0308 20.4737 22.2337 20.6778L22.8463 20.0378C22.9544 19.9237 23.0666 19.8133 23.1706 19.6954C22.8599 19.3928 22.4953 19.1569 22.0975 19.0013C21.3735 18.727 20.5815 18.7198 19.8531 18.9807C19.8277 18.9897 19.8025 18.9992 19.7774 19.0089C18.9915 19.3176 18.345 19.9229 17.9655 20.7053C17.8315 20.9823 17.7339 21.2768 17.6754 21.5811C17.3284 23.3825 18.3806 25.1557 20.0794 25.6323C20.6347 25.7877 21.2251 25.7838 21.7847 25.651C22.2932 25.5311 22.7634 25.2759 23.1496 24.9101C23.5525 24.5228 23.8413 24.0068 23.9926 23.4588C24.1192 22.9943 24.165 22.51 24.128 22.0286Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_12441_82412" x1="5.16406" y1="19.0665" x2="25.2666" y2="19.0665" gradientUnits="userSpaceOnUse">
+<stop offset="0.03" stop-color="#4079D8"/>
+<stop offset="1" stop-color="#4989F5"/>
+</linearGradient>
+<clipPath id="clip0_12441_82412">
+<rect width="23" height="21" fill="white" transform="translate(4 6)"/>
+</clipPath>
+</defs>
+</svg>

package/template/assets/images/icons/facebook.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12441_82399)">
+<path d="M24.8175 0H7.18254C3.21573 0 0 3.21573 0 7.18254V24.8175C0 28.7843 3.21573 32 7.18254 32H24.8175C28.7843 32 32 28.7843 32 24.8175V7.18254C32 3.21573 28.7843 0 24.8175 0Z" fill="#4C76BE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.6845 10.2972H20.5134V7.49291C20.2252 7.49291 19.926 7.42641 19.6267 7.40424H17.9752C17.1437 7.39949 16.3309 7.65106 15.6475 8.12471C15.269 8.39876 14.9494 8.74599 14.7076 9.14582C14.4658 9.54565 14.3067 9.98995 14.2398 10.4524C14.1773 10.8484 14.1439 11.2485 14.14 11.6495V13.7666H11.4688V16.8812H14.129V24.7177H17.3766V16.8701H20.0257L20.4358 13.7333H17.3544V11.5165C17.4099 10.5965 17.953 10.3194 18.6845 10.2972Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_12441_82399">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/template/assets/images/icons/instagram.svg

@@ -0,0 +1,19 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12441_82404)">
+<path d="M24.8175 0H7.18254C3.21573 0 0 3.21573 0 7.18254V24.8175C0 28.7843 3.21573 32 7.18254 32H24.8175C28.7843 32 32 28.7843 32 24.8175V7.18254C32 3.21573 28.7843 0 24.8175 0Z" fill="url(#paint0_linear_12441_82404)"/>
+<path d="M11.0818 5.54199H21.0576C21.2793 5.65283 21.6118 5.65283 21.8335 5.76368C22.8063 5.92133 23.7158 6.34717 24.4599 6.99333C25.2039 7.63949 25.753 8.48037 26.0455 9.42145C26.2092 9.96377 26.3205 10.5205 26.378 11.0841V20.8381C26.2195 22.0743 25.7631 23.2535 25.0479 24.2742C24.4343 24.9851 23.6651 25.5449 22.8001 25.9102C21.935 26.2754 20.9974 26.4363 20.06 26.3802H11.7469C10.2633 26.4522 8.80465 25.9792 7.64575 25.0501C6.94102 24.4412 6.38488 23.6792 6.01986 22.8224C5.65485 21.9656 5.49062 21.0366 5.53975 20.1066V12.3477C5.52144 11.7912 5.55857 11.2342 5.6506 10.685C5.76252 9.54868 6.22976 8.4765 6.9859 7.62087C7.74203 6.76524 8.74861 6.16969 9.86258 5.91885L11.0818 5.54199ZM7.64575 16.072V20.3948C7.59849 20.9453 7.67213 21.4994 7.86152 22.0184C8.05091 22.5375 8.35147 23.0088 8.74215 23.3995C9.13283 23.7902 9.60419 24.0908 10.1232 24.2801C10.6423 24.4695 11.1964 24.5432 11.7469 24.4959C14.6288 24.6068 17.5107 24.6068 20.3925 24.4959C22.9419 24.4959 24.3828 22.9441 24.4937 20.3948C24.6045 17.5129 24.6045 14.631 24.4937 11.7491C24.5224 11.203 24.436 10.6569 24.24 10.1463C24.0441 9.63576 23.743 9.17207 23.3563 8.78536C22.9696 8.39865 22.5059 8.09756 21.9953 7.90162C21.4847 7.70568 20.9387 7.61926 20.3925 7.64798C17.5107 7.53714 14.6288 7.53714 11.7469 7.64798C11.1964 7.60073 10.6423 7.67437 10.1232 7.86376C9.60419 8.05315 9.13283 8.35371 8.74215 8.74439C8.35147 9.13507 8.05091 9.60643 7.86152 10.1255C7.67213 10.6445 7.59849 11.1986 7.64575 11.7491V16.072Z" fill="white"/>
+<path d="M10.6797 16.1162C10.6826 14.6766 11.2558 13.2969 12.2737 12.2789C13.2916 11.261 14.6714 10.6879 16.1109 10.6849C17.5425 10.7133 18.9075 11.2946 19.92 12.3071C20.9325 13.3196 21.5138 14.6846 21.5422 16.1162C21.5392 17.5557 20.9661 18.9355 19.9482 19.9534C18.9302 20.9713 17.5505 21.5445 16.1109 21.5474C14.6794 21.5191 13.3143 20.9377 12.3018 19.9253C11.2894 18.9128 10.708 17.5478 10.6797 16.1162ZM16.1109 12.6801C15.4377 12.6691 14.7765 12.8595 14.2122 13.2267C13.6478 13.5939 13.206 14.1213 12.9432 14.7412C12.6805 15.3612 12.6089 16.0455 12.7376 16.7064C12.8663 17.3673 13.1894 17.9747 13.6655 18.4508C14.1416 18.9269 14.749 19.25 15.4099 19.3787C16.0708 19.5074 16.7551 19.4357 17.375 19.173C17.995 18.9103 18.5224 18.4685 18.8896 17.9041C19.2568 17.3397 19.4471 16.6786 19.4362 16.0053C19.4362 15.1234 19.0858 14.2776 18.4622 13.654C17.8386 13.0304 16.9928 12.6801 16.1109 12.6801Z" fill="white"/>
+<path d="M20.3289 10.4633C20.3227 10.287 20.3529 10.1113 20.4175 9.9471C20.4822 9.78292 20.5799 9.63381 20.7047 9.50904C20.8295 9.38427 20.9786 9.28652 21.1428 9.22187C21.307 9.15721 21.4827 9.12705 21.659 9.13324C22.0041 9.15658 22.329 9.30421 22.5736 9.54877C22.8181 9.79334 22.9658 10.1183 22.9891 10.4633C22.9891 10.8161 22.849 11.1544 22.5995 11.4039C22.3501 11.6533 22.0118 11.7934 21.659 11.7934C21.3063 11.7934 20.9679 11.6533 20.7185 11.4039C20.4691 11.1544 20.3289 10.8161 20.3289 10.4633Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_12441_82404" x1="-2.03949" y1="33.7735" x2="35.6467" y2="-3.3585" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FED576"/>
+<stop offset="0.26" stop-color="#F47133"/>
+<stop offset="0.61" stop-color="#BC3081"/>
+<stop offset="1" stop-color="#4C63D2"/>
+</linearGradient>
+<clipPath id="clip0_12441_82404">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/template/assets/images/icons/tiktok.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12441_82384)">
+<path d="M24.8175 0H7.18254C3.21573 0 0 3.21573 0 7.18254V24.8175C0 28.7843 3.21573 32 7.18254 32H24.8175C28.7843 32 32 28.7843 32 24.8175V7.18254C32 3.21573 28.7843 0 24.8175 0Z" fill="black"/>
+<path d="M21.2501 9.80486C20.3519 8.77234 19.8814 7.43833 19.9189 6.08017L16.5628 6C16.5628 6 16.5628 6.14159 16.5628 6.33253V19.6406C16.6096 23.8508 9.8826 23.7487 10.4148 19.0949C10.7402 17.2445 12.7509 16.1058 14.5376 16.7495V13.3634C10.6478 12.6936 6.96151 15.7551 7.0003 19.6555C7.34029 28.1143 19.6096 28.1154 19.95 19.6555C19.8644 19.3527 19.9123 13.7158 19.9001 13.2403C21.4262 14.1793 23.2018 14.6487 25 14.5886V11.0915C23.3375 11.0915 22.0689 10.6544 21.2501 9.80486Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_12441_82384">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/template/pages/CustomersList/index.js

@@ -15,7 +15,7 @@ export const CustomersList = (props) => {
       'country_phone_code', 'city_id', 'city', 'address', 'addresses',
       'address_notes', 'dropdown_option_id', 'dropdown_option', 'location',
       'zipcode', 'level', 'enabled', 'middle_name', 'second_lastname', 'birthdate', 'drivergroups',
-      'phone_verified', 'email_verified', 'wallets'
+      'phone_verified', 'email_verified', 'wallets', 'orders_count'
     ],
     onUserRedirect: (userId) => {
       if (!userId) {

package/template/pages/Login/index.js

@@ -1,13 +1,19 @@
 import React from 'react'
+import { useHistory, useLocation } from 'react-router-dom'
 import { LoginForm } from '../../../src/components/Login'
 import { HelmetTags } from '../../components/HelmetTags'
 import settings from '../../config.json'
 
 export const Login = (props) => {
+  const location = useLocation()
+  const history = useHistory()
+
   const loginProps = {
     ...props,
     billingUrl: settings?.billing_url,
-    useProjectDomain: settings?.use_project_domain
+    useProjectDomain: settings?.use_project_domain,
+    urlToRedirect: location?.state?.from,
+    handleRedirect: (url) => history.push(url)
   }
   return (
     <>

package/src/components/Loyalty/PointsWallet/index.js

@@ -1,71 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { useLanguage } from 'ordering-components-admin-external'
-import { PointsWalletBusinessDetail } from '../PointsWalletBusinessDetail'
-import { PointsWalletBusinessList } from '../PointsWalletBusinessList'
-
-import {
-  Container,
-  Title,
-  Tabs,
-  Tab
-} from './styles'
-
-export const PointsWallet = (props) => {
-  const {
-    handleParentSidebarMove,
-    pointWallet,
-    handleUpdatePointsWallet
-  } = props
-
-  const [, t] = useLanguage()
-  const [selectedOption, setSelectedOption] = useState('general')
-  const [selectedBusinessList, setSelectedBusinessList] = useState([])
-
-  const walletOptionList = [
-    { key: 'general', name: t('GENERAL', 'General') },
-    { key: 'business', name: t('BUSINESSES', 'Businesses') }
-  ]
-
-  useEffect(() => {
-    if (selectedOption !== 'business') handleParentSidebarMove(0)
-  }, [selectedOption])
-
-  return (
-    <Container>
-      <Title>{t('POINTS_WALLET', 'Points wallet')}</Title>
-      <Tabs>
-        {walletOptionList.map(option => (
-          <Tab
-            key={option.key}
-            active={selectedOption === option.key}
-            onClick={() => setSelectedOption(option.key)}
-          >
-            {option.name}
-          </Tab>
-        ))}
-      </Tabs>
-      <div
-        style={{
-          display: selectedOption === 'general' ? 'block' : 'none'
-        }}
-      >
-        <PointsWalletBusinessDetail
-          walletData={pointWallet}
-          handleUpdatePointsWallet={handleUpdatePointsWallet}
-          selectedBusinessList={selectedBusinessList}
-        />
-      </div>
-      <div
-        style={{
-          display: selectedOption === 'business' ? 'block' : 'none'
-        }}
-      >
-        <PointsWalletBusinessList
-          {...props}
-          setSelectedBusinessList={setSelectedBusinessList}
-          isCloseBusinessDetails={selectedOption !== 'business'}
-        />
-      </div>
-    </Container>
-  )
-}