ordering-ui-admin-external 1.29.3 → 1.30.1

package/src/components/Stores/BusinessProductsListing/index.js

@@ -222,9 +222,11 @@ const BusinessProductsListingUI = (props) => {
   }
 
   const handleOpenSite = () => {
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${businessState?.business?.slug}`
+      : configs?.site_url?.value
+        ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
+        : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
     window.open(storeUrl, '_blank')
   }
 

package/src/components/Stores/BusinessQRCodeOption/index.js

@@ -60,9 +60,11 @@ export const BusinessQRCodeOption = (props) => {
       })
       return
     }
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${business?.slug}`
+      : configs?.site_url?.value
+        ? `${checkSiteUrl(configs?.site_url?.value)}store/${business?.slug}`
+        : `https://${ordering.project}.tryordering.com/store/${business?.slug}`
     const tsNumber = item?.key !== 'pick_up'
       ? (item?.key === 'eat_in'
         ? `&table_number=${numberRef?.current?.value}`

package/src/components/Stores/BusinessSummary/index.js

@@ -60,9 +60,11 @@ export const BusinessSummary = (props) => {
   }
 
   const handleOpenSite = () => {
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${businessState?.business?.slug}`
+      : configs?.site_url?.value
+        ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
+        : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
     window.open(storeUrl, '_blank')
   }
 

package/src/components/Users/UsersList/index.js

@@ -138,9 +138,10 @@ export const UsersList = (props) => {
                         <Square />
                       )}
                     </CheckBoxWrapper>
-                    {t('USER', 'User')}
+                    {t('ID', 'Id')}
                   </AllCheckWrapper>
                 </th>
+                <th>{t('USER', 'User')}</th>
                 <th>{t('PHONE', 'Phone')}</th>
                 <th>{t('TYPE', 'Type')}</th>
                 <th className='amout-orders '>{t('AMOUNT_OF_ORDERS', 'Amount of orders')}</th>
@@ -156,6 +157,13 @@ export const UsersList = (props) => {
                         <CheckBoxWrapper>
                           <Skeleton width={20} height={20} />
                         </CheckBoxWrapper>
+                        <InfoBlock>
+                          <p><Skeleton width={70} /></p>
+                        </InfoBlock>
+                      </UserMainInfo>
+                    </td>
+                    <td>
+                      <UserMainInfo>
                         <WrapperImage isSkeleton>
                           <Skeleton width={45} height={45} />
                         </WrapperImage>
@@ -201,6 +209,13 @@ export const UsersList = (props) => {
                             <Square />
                           )}
                         </CheckBoxWrapper>
+                        <InfoBlock>
+                          <p className='bold'>{user?.id}</p>
+                        </InfoBlock>
+                      </UserMainInfo>
+                    </td>
+                    <td>
+                      <UserMainInfo>
                         <WrapperImage>
                           {user?.photo ? (
                             <Image bgimage={optimizeImage(user?.photo, 'h_50,c_limit')} />

package/src/components/Users/UsersList/styles.js

@@ -18,15 +18,18 @@ export const UsersTable = styled.table`
     padding: 10px 0;
     font-size: 14px;
     &:first-child {
-      width: 40%;
+      width: 10%;
     }
     &:nth-child(2) {
+      width: 35%;
+    }
+    &:nth-child(3) {
       width: 20%;
     }
 
-    &:nth-child(4),
+    &:nth-child(5),
     
-    &:nth-child(5) {
+    &:nth-child(6) {
       width: 10%;
     }
   }