ordering-ui-admin-external 1.12.0 → 1.12.2

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

@@ -91,6 +91,9 @@ var OrdersTable = function OrdersTable(props) {
   }, {
     value: 'orderNumber',
     content: t('INVOICE_ORDER_NO', 'Order No.')
+  }, {
+    value: 'cartGroupId',
+    content: t('GROUP_ORDER', 'Group Order')
   }, {
     value: 'dateTime',
     content: t('DATE_TIME', 'Date and time')
@@ -459,7 +462,7 @@ var OrdersTable = function OrdersTable(props) {
       alt: "six dots"
     }), /*#__PURE__*/_react.default.createElement("span", null, (_allowColumns$column6 = allowColumns[column]) === null || _allowColumns$column6 === void 0 ? void 0 : _allowColumns$column6.title)));
   })))), orderList.loading || !allowColumns ? _toConsumableArray(Array(10).keys()).map(function (i) {
-    var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$total;
+    var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$cartGro, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$total;
     return /*#__PURE__*/_react.default.createElement(_styles.OrderTbody, {
       key: i
     }, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$slaBar2 = allowColumns.slaBar) === null || _allowColumns$slaBar2 === void 0 ? void 0 : _allowColumns$slaBar2.visable) && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.Timestatus, null)), /*#__PURE__*/_react.default.createElement("td", {
@@ -476,7 +479,15 @@ var OrdersTable = function OrdersTable(props) {
       width: 100
     })), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$dateTim3 = allowColumns.dateTime) === null || _allowColumns$dateTim3 === void 0 ? void 0 : _allowColumns$dateTim3.visable) && /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
       width: 120
-    })))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$status = allowColumns.status) === null || _allowColumns$status === void 0 ? void 0 : _allowColumns$status.visable) && !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
+    })))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$cartGro = allowColumns.cartGroupId) === null || _allowColumns$cartGro === void 0 ? void 0 : _allowColumns$cartGro.visable) && /*#__PURE__*/_react.default.createElement("td", {
+      className: "statusInfo"
+    }, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, /*#__PURE__*/_react.default.createElement("div", {
+      className: "info"
+    }, /*#__PURE__*/_react.default.createElement("p", {
+      className: "bold"
+    }, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+      width: 100
+    }))))), (allowColumns === null || allowColumns === void 0 ? void 0 : (_allowColumns$status = allowColumns.status) === null || _allowColumns$status === void 0 ? void 0 : _allowColumns$status.visable) && !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
       className: "statusInfo"
     }, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "info"
@@ -625,6 +636,14 @@ var OrdersTable = function OrdersTable(props) {
           className: "bold"
         }, (_getOrderStatus = getOrderStatus(order.status)) === null || _getOrderStatus === void 0 ? void 0 : _getOrderStatus.value)));
       }
+      if (column === 'cartGroupId') {
+        return /*#__PURE__*/_react.default.createElement("td", {
+          className: "orderGroupId",
+          key: "cart_group_id".concat(i, "-").concat(index)
+        }, /*#__PURE__*/_react.default.createElement(_styles.StatusInfo, null, (order === null || order === void 0 ? void 0 : order.cart_group_id) && /*#__PURE__*/_react.default.createElement("p", {
+          className: "bold"
+        }, t('No', 'No'), ". ", order === null || order === void 0 ? void 0 : order.cart_group_id)));
+      }
       if (column === 'business') {
         var _order$business, _theme$images, _theme$images$dummies, _order$business2, _order$business3, _order$business3$city;
         return /*#__PURE__*/_react.default.createElement("td", {
@@ -735,7 +754,7 @@ var OrdersTable = function OrdersTable(props) {
           utc: false
         }))));
       }
-    })));
+    }), /*#__PURE__*/_react.default.createElement("td", null)));
   }))), pagination && /*#__PURE__*/_react.default.createElement(_styles.WrapperPagination, null, /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
     currentPage: pagination.currentPage,
     totalPages: Math.ceil((pagination === null || pagination === void 0 ? void 0 : pagination.total) / pagination.pageSize),

package/_modules/components/SidebarMenu/index.js

@@ -85,12 +85,15 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
     title: t('APPOINTMENTS', 'Appointments'),
     pageName: 'appointments',
     url: '/appointments'
-  }, {
-    id: 5,
-    title: t('GIFT_CARD_MANAGER', 'Gift card manager'),
-    pageName: 'giftCards',
-    url: '/gift-cards'
-  }];
+  }
+  // {
+  //   id: 5,
+  //   title: t('GIFT_CARD_MANAGER', 'Gift card manager'),
+  //   pageName: 'giftCards',
+  //   url: '/gift-cards'
+  // }
+  ];
+
   var loyaltySubMenus = [{
     id: 1,
     title: t('LOYALTY_AUTOMATION', 'Loyalty automation'),
@@ -184,15 +187,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
     title: t('MANAGERS', 'Managers'),
     pageName: 'managers',
     url: '/users/managers'
-  }
-  // {
-  //   id: 3,
-  //   title: t('PROFESSIONALS', 'Professionals'),
-  //   pageName: 'professionals',
-  //   url: '/users/professionals'
-  // }
-  ];
-
+  }, {
+    id: 3,
+    title: t('PROFESSIONALS', 'Professionals'),
+    pageName: 'professionals',
+    url: '/users/professionals'
+  }];
   var buisnessOwnerUsersMenuIncluded = [3];
   var settingsSubMenus = [{
     id: 1,

package/_modules/components/Stores/BusinessProductAddForm/index.js

@@ -79,10 +79,10 @@ var BusinessProductAddFormUI = function BusinessProductAddFormUI(props) {
   var typeList = [{
     value: 'item',
     content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, t('ITEM', 'Item'))
-  }
-  // { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
-  ];
-
+  }, {
+    value: 'service',
+    content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, t('SERVICE', 'Service'))
+  }];
   var durationList = [{
     value: 15,
     content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, "15 ", /*#__PURE__*/_react.default.createElement("span", null, t('MINUTES', 'minutes')))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "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.12.0",
+    "ordering-components-admin-external": "1.12.3",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

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

@@ -79,6 +79,10 @@ export const OrdersTable = (props) => {
       value: 'orderNumber',
       content: t('INVOICE_ORDER_NO', 'Order No.')
     },
+    {
+      value: 'cartGroupId',
+      content: t('GROUP_ORDER', 'Group Order')
+    },
     {
       value: 'dateTime',
       content: t('DATE_TIME', 'Date and time')
@@ -446,6 +450,15 @@ export const OrdersTable = (props) => {
                       </div>
                     </OrderNumberContainer>
                   </td>
+                  {allowColumns?.cartGroupId?.visable && (
+                    <td className='statusInfo'>
+                      <StatusInfo>
+                        <div className='info'>
+                          <p className='bold'><Skeleton width={100} /></p>
+                        </div>
+                      </StatusInfo>
+                    </td>
+                  )}
                   {allowColumns?.status?.visable && !isSelectedOrders && (
                     <td className='statusInfo'>
                       <StatusInfo>
@@ -602,6 +615,17 @@ export const OrdersTable = (props) => {
                           </td>
                         )
                       }
+                      if (column === 'cartGroupId') {
+                        return (
+                          <td className='orderGroupId' key={`cart_group_id${i}-${index}`}>
+                            <StatusInfo>
+                              {order?.cart_group_id && (
+                                <p className='bold'>{t('No', 'No')}. {order?.cart_group_id}</p>
+                              )}
+                            </StatusInfo>
+                          </td>
+                        )
+                      }
                       if (column === 'business') {
                         return (
                           <td className='businessInfo' key={`businessInfo${i}-${index}`}>
@@ -738,6 +762,7 @@ export const OrdersTable = (props) => {
                         )
                       }
                     })}
+                    <td />
                 </tr>
               </OrderTbody>
             ))

package/src/components/SidebarMenu/index.js

@@ -86,13 +86,13 @@ const SidebarMenuUI = (props) => {
       title: t('APPOINTMENTS', 'Appointments'),
       pageName: 'appointments',
       url: '/appointments'
-    },
-    {
-      id: 5,
-      title: t('GIFT_CARD_MANAGER', 'Gift card manager'),
-      pageName: 'giftCards',
-      url: '/gift-cards'
     }
+    // {
+    //   id: 5,
+    //   title: t('GIFT_CARD_MANAGER', 'Gift card manager'),
+    //   pageName: 'giftCards',
+    //   url: '/gift-cards'
+    // }
   ]
 
   const loyaltySubMenus = [
@@ -209,13 +209,13 @@ const SidebarMenuUI = (props) => {
       title: t('MANAGERS', 'Managers'),
       pageName: 'managers',
       url: '/users/managers'
+    },
+    {
+      id: 3,
+      title: t('PROFESSIONALS', 'Professionals'),
+      pageName: 'professionals',
+      url: '/users/professionals'
     }
-    // {
-    //   id: 3,
-    //   title: t('PROFESSIONALS', 'Professionals'),
-    //   pageName: 'professionals',
-    //   url: '/users/professionals'
-    // }
   ]
 
   const buisnessOwnerUsersMenuIncluded = [3]

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

@@ -56,7 +56,7 @@ const BusinessProductAddFormUI = (props) => {
 
   const typeList = [
     { value: 'item', content: <Option>{t('ITEM', 'Item')}</Option> },
-    // { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
+    { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
   ]
 
   const durationList = [