ordering-ui-react-native 0.12.11 → 0.12.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/Account/index.tsx

@@ -73,8 +73,8 @@ const AccountUI = (props: AccountParams) => {
         console.log('ImagePicker Error: ', response.errorMessage);
         showToast(ToastType.Error, response.errorMessage);
       } else {
-        if (response.uri) {
-          const url = `data:${response.type};base64,${response.base64}`
+        if (response?.assets) {
+          const url = `data:${response.assets[0].type};base64,${response.assets[0].base64}`
           handleButtonUpdateClick(null, true, url);
         } else {
           showToast(ToastType.Error, t('IMAGE_NOT_FOUND', 'Image not found'));

package/src/config.json

@@ -2,9 +2,9 @@
   "app_id": "react-native-app",
   "notification_app": "orderingapp",
   "app_name": "Ordering",
-  "project": "reactdemo",
+  "project": "jorgev4",
   "api": {
-    "url": "https://apiv4.ordering.co",
+    "url": "https://apiv4-staging.ordering.co",
     "language": "en",
     "version": "v400"
   },

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -75,12 +75,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const showFloatButtonsPickUp: any = {
     8: true,
     3: true,
-    4: true,
     18: true
   };
 
   const showFloatButtonsAcceptOrReject: any = {
     0: true,
+    4: true,
     7: true,
   };
 
@@ -382,7 +382,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           {showFloatButtonsPickUp[order?.status] && (
             <FloatingButton
               disabled={loading}
-              btnText={t('FAILED', 'Failed')}
+              btnText={t('PICKUP_FAILED', 'Pickup failed')}
               isSecondaryBtn={false}
               secondButtonClick={() =>
                 handleChangeOrderStatus && handleChangeOrderStatus(9)
@@ -401,7 +401,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             <>
               <FloatingButton
                 disabled={loading}
-                btnText={t('FAILED', 'Failed')}
+                btnText={t('DELIVERY_FAILED', 'Delivery Failed')}
                 isSecondaryBtn={false}
                 secondButtonClick={() =>
                   handleChangeOrderStatus && handleChangeOrderStatus(11)

package/themes/business/src/components/OrdersOption/index.tsx

@@ -41,10 +41,11 @@ const tabsList: any = {
 };
 
 const tabsListText: any = {
-  1: 'pending',
-  2: 'inProgress',
-  3: 'completed',
-  4: 'cancelled'
+  1: 'logistic_pending',
+  2: 'pending',
+  3: 'inProgress',
+  4: 'completed',
+  5: 'cancelled'
 };
 
 const swipeConfig = {
@@ -86,7 +87,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       type: ''
     }
   }
-
+  console.log('ORDERS', ordersGroup)
   const theme = useTheme();
   const [, t] = useLanguage();
   const [{ parseDate }] = useUtils()
@@ -167,7 +168,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
   const [tagsState, setTags] = useState<any>({ values: [] })
 
-  const tagsList = ordersGroup[currentTabSelected].defaultFilter ?? []
+  const tagsList = ordersGroup[currentTabSelected]?.defaultFilter ?? []
   const currentOrdersGroup = ordersGroup[currentTabSelected]
 
   const isEqual = (array1: any, array2: any) => {
@@ -441,8 +442,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             />
           }
         >
-          {!currentOrdersGroup.error?.length &&
-            currentOrdersGroup.orders?.length > 0 &&
+          {!currentOrdersGroup?.error?.length &&
+            currentOrdersGroup?.orders?.length > 0 &&
           (
             <PreviousOrders
               orders={currentOrdersGroup.orders}
@@ -452,8 +453,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             />
           )}
 
-          {(currentOrdersGroup.loading ||
-            currentOrdersGroup.pagination.total === null) &&
+          {(currentOrdersGroup?.loading ||
+            currentOrdersGroup?.pagination?.total === null) &&
           (
             <>
               <View>
@@ -486,11 +487,11 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             </>
           )}
 
-          {!currentOrdersGroup.error?.length &&
-            !currentOrdersGroup.loading &&
-            currentOrdersGroup.pagination.totalPages &&
-            currentOrdersGroup.pagination.currentPage < currentOrdersGroup.pagination.totalPages &&
-            currentOrdersGroup.orders.length > 0 &&
+          {!currentOrdersGroup?.error?.length &&
+            !currentOrdersGroup?.loading &&
+            currentOrdersGroup?.pagination?.totalPages &&
+            currentOrdersGroup?.pagination?.currentPage < currentOrdersGroup?.pagination?.totalPages &&
+            currentOrdersGroup?.orders?.length > 0 &&
           (
             <OButton
               onClick={handleLoadMore}
@@ -503,13 +504,13 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             />
           )}
 
-          {!currentOrdersGroup.loading &&
-            (currentOrdersGroup.error?.length ||
-            currentOrdersGroup.orders?.length === 0) &&
+          {!currentOrdersGroup?.loading &&
+            (currentOrdersGroup?.error?.length ||
+            currentOrdersGroup?.orders?.length === 0) &&
           (
             <NotFoundSource
               content={
-                !currentOrdersGroup.error?.length
+                !currentOrdersGroup?.error?.length
                   ? t('NO_RESULTS_FOUND', 'Sorry, no results found')
                   : currentOrdersGroup?.error[0]?.message ||
                     currentOrdersGroup?.error[0] ||
@@ -686,24 +687,30 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     tabs: [
       {
         key: 0,
+        text: t('Logistics', 'Logistics'),
+        tags: [0],
+        title: 'Logistics'
+      },
+      {
+        key: 1,
         text: t('PENDING', 'Pending'),
-        tags: props?.orderGroupStatusCustom?.inProgress ?? [0, 13],
+        tags: props?.orderGroupStatusCustom?.pending ?? [0, 13],
         title: 'pending'
       },
       {
-        key: 1,
+        key: 2,
         text: t('IN_PROGRESS', 'In Progress'),
         tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21],
         title: 'inProgress',
       },
       {
-        key: 2,
+        key: 3,
         text: t('COMPLETED', 'Completed'),
         tags: props?.orderGroupStatusCustom?.completed ?? [1, 11, 15],
         title: 'completed',
       },
       {
-        key: 3,
+        key: 4,
         text: t('CANCELLED', 'Cancelled'),
         tags: props?.orderGroupStatusCustom?.cancelled ?? [2, 5, 6, 10, 12, 16, 17],
         title: 'cancelled',