Merge branch 'main' of https://github.com/inikoo/maya

inikoo · Sep 3, 2024 · 3c9cce9 · 3c9cce9
2 parents 184f071 + 2b1903d
commit 3c9cce9
Show file tree

Hide file tree

Showing 37 changed files with 1,278 additions and 908 deletions.
diff --git a/android/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/android/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0xd80pw33uiiTkHuyDw9Fm20A3Q= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0xd80pw33uiiTkHuyDw9Fm20A3Q=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3iGXc6SjOBAu_YZa7TgKKwfoL44= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3iGXc6SjOBAu_YZa7TgKKwfoL44=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3rT+Qtr46eoiTHNfcQC7TAdq4YA= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3rT+Qtr46eoiTHNfcQC7TAdq4YA=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6cIUQ_vO3oqIhvciKjKp0S1267o= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6cIUQ_vO3oqIhvciKjKp0S1267o=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BGmtvwIEMp3VKF7qAtuPwLHzN1k= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BGmtvwIEMp3VKF7qAtuPwLHzN1k=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Dev5+jvZ4Xu6aMFFo2ej3qnBLsQ= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Dev5+jvZ4Xu6aMFFo2ej3qnBLsQ=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Eq7ijQQyr9dB7PsrTrf0cIWB0K4= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Eq7ijQQyr9dB7PsrTrf0cIWB0K4=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KmsIqGLEqUBkMIzQJP5CkHv_rkM= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KmsIqGLEqUBkMIzQJP5CkHv_rkM=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OHlnylGqyWFanrGjoAjiwcDO4uY= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OHlnylGqyWFanrGjoAjiwcDO4uY=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QeRx3glreS4Dmee80Sfppu3LYYs= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QeRx3glreS4Dmee80Sfppu3LYYs=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TuOppEy+G1yLRzh2YA_k3JpwQKk= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TuOppEy+G1yLRzh2YA_k3JpwQKk=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y1_ya6Mqya9ok3Lcg+f4HorckEw= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y1_ya6Mqya9ok3Lcg+f4HorckEw=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YbdocMk1GCnH7_5Svg3IX_lr60k= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YbdocMk1GCnH7_5Svg3IX_lr60k=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZMMGsRjYnTIgABQFktoyO9+XFtk= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZMMGsRjYnTIgABQFktoyO9+XFtk=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_Lk58xk7E6Fm2AINg+bqwcFd1s8= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_Lk58xk7E6Fm2AINg+bqwcFd1s8=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cZMvN8qLI_cYSmx0CQS6p0zDQ6k= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cZMvN8qLI_cYSmx0CQS6p0zDQ6k=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/evA0bBWDQUdYzTwnPXrTCZ202as= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/evA0bBWDQUdYzTwnPXrTCZ202as=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/l7ThUBEhJgLj2PTeB2SKn73d658= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/l7ThUBEhJgLj2PTeB2SKn73d658=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rLMuu5Yx6S_4kkWISXdAM4MlG5Q= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rLMuu5Yx6S_4kkWISXdAM4MlG5Q=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnq2mYvjrjVtCoVncorBKsT9+70= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnq2mYvjrjVtCoVncorBKsT9+70=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sGbcKdvAp2+bp69xvx8s_WueTPU= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sGbcKdvAp2+bp69xvx8s_WueTPU=
diff --git a/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xxPau90hcJ_wxONH9eI4zW8WJO0= b/...build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xxPau90hcJ_wxONH9eI4zW8WJO0=
diff --git a/...app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/...app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
diff --git a/android/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/android/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
diff --git a/...p/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/...p/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
diff --git a/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,19 +1,19 @@
-#Mon Aug 19 10:25:54 SGT 2024
-path.4=4/classes.dex
-path.3=14/classes.dex
-path.2=0/classes.dex
-path.1=0/classes.dex
-path.5=classes2.dex
-path.0=classes.dex
-base.4=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
-base.3=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\14\\classes.dex
-base.2=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
-base.1=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\0\\classes.dex
-base.0=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
-renamed.3=classes4.dex
-renamed.2=classes3.dex
-renamed.1=classes2.dex
-renamed.0=classes.dex
-renamed.5=classes6.dex
-renamed.4=classes5.dex
-base.5=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex
+#Tue Aug 20 14:51:05 SGT 2024
+path.4=4/classes.dex
+path.3=14/classes.dex
+path.2=0/classes.dex
+path.1=0/classes.dex
+path.5=classes2.dex
+path.0=classes.dex
+base.4=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
+base.3=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\14\\classes.dex
+base.2=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
+base.1=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\0\\classes.dex
+base.0=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+renamed.3=classes4.dex
+renamed.2=classes3.dex
+renamed.1=classes2.dex
+renamed.0=classes.dex
+renamed.5=classes6.dex
+renamed.4=classes5.dex
+base.5=C\:\\Users\\62852\\Project\\maya2\\Maya\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes2.dex
diff --git a/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
diff --git a/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
diff --git a/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
diff --git a/android/app/build/intermediates/source_set_path_map/debug/file-map.txt b/android/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -51,11 +51,14 @@ com.maya.app-packaged_res-49 C:\Users\62852\Project\maya2\Maya\node_modules\@rea
 com.maya.app-packaged_res-50 C:\Users\62852\Project\maya2\Maya\node_modules\@react-native-firebase\messaging\android\build\intermediates\packaged_res\debug
 com.maya.app-packaged_res-51 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-camera\android\build\intermediates\packaged_res\generalDebug
 com.maya.app-packaged_res-52 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-device-info\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-53 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-gesture-handler\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-54 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-get-random-values\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-55 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-image-picker\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-56 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-linear-gradient\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-57 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-safe-area-context\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-58 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-screens\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-59 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-svg\android\build\intermediates\packaged_res\debug
-com.maya.app-packaged_res-60 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-vector-icons\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-53 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-fs\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-54 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-gesture-handler\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-55 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-get-random-values\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-56 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-image-picker\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-57 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-linear-gradient\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-58 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-pager-view\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-59 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-reanimated\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-60 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-safe-area-context\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-61 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-screens\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-62 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-svg\android\build\intermediates\packaged_res\debug
+com.maya.app-packaged_res-63 C:\Users\62852\Project\maya2\Maya\node_modules\react-native-vector-icons\android\build\intermediates\packaged_res\debug
diff --git a/android/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin b/android/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin
diff --git a/android/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin b/android/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin
diff --git a/android/app/build/outputs/apk/debug/app-debug.apk b/android/app/build/outputs/apk/debug/app-debug.apk
diff --git a/src/Screens/Fullfilment/Return/PalletReturns.tsx b/src/Screens/Fullfilment/Return/PalletReturns.tsx
@@ -16,6 +16,7 @@ const Returns = (props) => {
   const oraganisation = useSelector(state => state.organisationReducer);
   const warehouse = useSelector(state => state.warehouseReducer);
 
+
   const Item = (record) => {
     return (
       <TouchableOpacity