pallet retuen

maya/App.tsx

@@ -108,7 +108,7 @@ function App(): React.JSX.Element {
   if (loginState.isLoading) {
     return (
       <View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
-        <ActivityIndicator size="large" />
+        <ActivityIndicator size="large" color='#4F46E5'/>
       </View>
     );
   }

maya/config/url.js

@@ -23,8 +23,8 @@ export default {
 	//stored items
 	'get-stored-items' :  { url: "maya/org/{}/warehouses/{}/inventory/stored-items" },
 	'get-stored-item' :  { url: "maya/org/{}/warehouses/{}/inventory/stored-items/{}" },
-	"set-stored-item-pick" : { url: "maya/action/pallet-return-item/{}/pick" },
-	"set-stored-item-undo-pick" : { url: "" },
+	"set-stored-item-pick" : { url: "maya/action/pallet-return-item/stored-items/{}/pick" },
+	"set-stored-item-undo-pick" : { url: "maya/action/pallet-return-item/stored-items/{}/undo-pick" },
 
 	//scanner
 	'get-scanner' : { url: "maya/org/{}/warehouses/{}/scanners/{}" },
@@ -45,9 +45,9 @@ export default {
 	'set-pallet-location' : { url: "maya/action/pallet/{}/location/{}/move" },
 	'set-pallet-not-received' : { url: "maya/action/pallet/{}/not-received" },
 	'undo-pallet-not-received' : { url: "maya/action/pallet/{}/undo-not-received" },
-	'set-pallet-picked' : { url : "maya/action/pallet-return-item/{}/pick"},
-	'set-pallet-not-picked' : { url : "maya/action/pallet-return-item/{}/not-picked"},
-	'undo-pallet-picked' :  { url : "maya/action/pallet-return-item/{}/undo-pick"},
+	'set-pallet-picked' : { url : "maya/action/pallet-return-item/pallet/{}/pick"},
+	'set-pallet-not-picked' : { url : "maya/action/pallet-return-item/pallet/{}/not-picked"},
+	'undo-pallet-picked' :  { url : "maya/action/pallet-return-item/pallet/{}/undo-pick"},
 
 
 	//return

maya/src/components/BaseList.jsx

@@ -71,6 +71,7 @@ const BaseList = forwardRef((props, ref) => {
             });
           }
         }
+       /*  setMeta(prevData => ({ ...prevData , last_page : page })) */
         setIsFetching(false);
         setIsLoadingMore(false);
       },
@@ -142,7 +143,7 @@ const BaseList = forwardRef((props, ref) => {
           // Show Loading Indicator on First Fetch
           <View
             style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
-            <Spinner size="large" />
+            <Spinner size="large" color={"#837FE1"}/>
           </View>
         ) : (
           <FlatList
@@ -161,7 +162,7 @@ const BaseList = forwardRef((props, ref) => {
             ListFooterComponent={
               isLoadingMore ? (
                 <View style={{paddingVertical: 10}}>
-                  <Spinner size="small" />
+                  <Spinner size="small" color={"#837FE1"}/>
                 </View>
               ) : null
             }

maya/src/components/CustomDrawer.jsx

@@ -24,6 +24,7 @@ const CustomDrawer = props => {
       .toUpperCase();
   };
 
+
   return (
     <View className="flex-1">
       <DrawerContentScrollView

maya/src/screens/Area/ShowArea.jsx

@@ -43,7 +43,7 @@ const ShowArea = ({navigation, route}) => {
   if (loading) {
     return (
       <View className="flex-1 items-center justify-center bg-gray-100">
-        <Spinner size="large" />
+        <Spinner size="large" color={"#837FE1"} />
       </View>
     );
   }

maya/src/screens/Delivery/PalletInDeliveries.jsx

@@ -70,7 +70,7 @@ const PalletInDeliveries = ({navigation, route, onChangeState}) => {
             action: 'primary',
             style: {borderTopRightRadius: 0, borderBottomRightRadius: 0},
             onPress: null,
-            text: `To do : 1 / ${data.number_pallets || 0}`,
+            text: `To do : ${data.number_pallets_state_not_received + data.number_pallets_state_booked_in }/ ${data.number_pallets + data.number_boxes + data.number_oversizes || 0}`,
           }}
           button2={{
             size: 'md',
@@ -157,7 +157,7 @@ const GroupItem = ({item: initialItem, navigation}) => {
         setItem(prevItem => ({
           ...prevItem,
           state: response.data.state,
-          state_icon: response.data.status_icon,
+          state_icon: response.data.state_icon,
         }));
 
         Animated.spring(translateX, {

maya/src/screens/Delivery/ShowFulfilmentDelivery.jsx

@@ -1,5 +1,5 @@
 import React, {useState} from 'react';
-import {View, ScrollView, TouchableOpacity} from 'react-native';
+import {View, ScrollView, TouchableOpacity, RefreshControl} from 'react-native';
 import {Card} from '@/src/components/ui/card';
 import {Heading} from '@/src/components/ui/heading';
 import {Center} from '@/src/components/ui/center';
@@ -18,7 +18,7 @@ import {Alert, AlertText} from '@/src/components/ui/alert';
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome';
 import {faChevronDown, faChevronUp,faCheckCircle} from '@/private/fa/pro-light-svg-icons';
 
-const ShowFulfilmentDelivery = ({navigation, route, onChangeState}) => {
+const ShowFulfilmentDelivery = ({navigation, route, onChangeState, handleRefresh}) => {
   const {data} = useDelivery();
   const [isTimelineOpen, setIsTimelineOpen] = useState(false);
   const insets = useSafeAreaInsets();
@@ -55,6 +55,10 @@ const ShowFulfilmentDelivery = ({navigation, route, onChangeState}) => {
       label: 'Customer',
       value: data.customer_name,
     },
+    {
+      label: 'Customer Reference',
+      value: data.customer_reference,
+    },
     {
       label: 'Boxes',
       value: data.number_boxes ? data.number_boxes.toString() : '-',
@@ -82,21 +86,25 @@ const ShowFulfilmentDelivery = ({navigation, route, onChangeState}) => {
       value: data.public_notes,
     },
   ];
-console.log(data)
+
+  console.log(data.number_pallets_state_not_received + data.number_pallets_state_booked_in)
 
   return (
     <ScrollView
       style={globalStyles.container}
-      contentContainerStyle={{paddingBottom: insets.bottom + 120}}>
-      {data.state != "Booked-in" ? (
+      contentContainerStyle={{paddingBottom: insets.bottom + 120}}
+      refreshControl={
+        <RefreshControl  onRefresh={()=>handleRefresh()} />
+      }>
+      {data.state != "booked_in" ? (
         <SetStateButton
           button1={{
             size: 'md',
             variant: 'outline',
             action: 'primary',
             style: {borderTopRightRadius: 0, borderBottomRightRadius: 0},
             onPress: null,
-            text: `To do : 1 / ${data.number_pallets || 0}`,
+            text: `To do : ${data.number_pallets_state_not_received + data.number_pallets_state_booked_in }/ ${data.number_pallets + data.number_boxes + data.number_oversizes || 0}`,
           }}
           button2={{
             size: 'md',

maya/src/screens/DeliveryNote/ShowDeliveryNote.jsx

@@ -59,7 +59,7 @@ const ShowDeliveryNote = ({navigation, route}) => {
   if (loading) {
     return (
       <View className="flex-1 items-center justify-center bg-gray-100">
-        <ActivityIndicator size="large" color="#3b82f6" />
+        <ActivityIndicator size="large" color='#4F46E5'/>
       </View>
     );
   }

maya/src/screens/Location/ShowLocation.jsx

@@ -64,7 +64,7 @@ const ShowLocation = ({navigation, route}) => {
   if (loading) {
     return (
       <View className="flex-1 items-center justify-center bg-gray-100">
-        <ActivityIndicator size="large" color="#3b82f6" />
+        <ActivityIndicator size="large" color='#4F46E5' />
       </View>
     );
   }

maya/src/screens/LoginScreen.jsx

@@ -55,17 +55,16 @@ const LoginScreen = ({navigation}) => {
                 Toast.show({
                   type: ALERT_TYPE.DANGER,
                   title: 'Error',
-                  textBody: err?.detail?.message || 'Failed to fetch data',
+                  textBody: err?.data.message || 'failed from server',
                 });
                 console.error('Profile Retrieval Failed:', err);
               },
             });
           } else {
-            console.error('Login Failed:', userRes);
             Toast.show({
               type: ALERT_TYPE.DANGER,
               title: 'Error',
-              textBody: userRes?.detail?.message || 'Failed to fetch data',
+              textBody: userRes?.data.message || 'failed from server',
             });
             resolve(false);
           }

maya/src/screens/OrgStock/ShowOrgStock.jsx

@@ -52,7 +52,7 @@ const ShowOrgStock = ({navigation, route}) => {
   if (loading) {
     return (
       <View className="flex-1 items-center justify-center bg-gray-100">
-        <ActivityIndicator size="large" color="#3b82f6" />
+        <ActivityIndicator size="large" color='#4F46E5' />
       </View>
     );
   }