Merge pull request #675 from enatega/enatega_appisues

Enatega appisues
enatega · Dec 4, 2024 · 74b0125 · 74b0125
2 parents 6fb2eaa + 0bb0a30
commit 74b0125
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/enatega-multivendor-app/environment.js b/enatega-multivendor-app/environment.js
@@ -29,12 +29,12 @@ const useEnvVars = (env = Updates.channel) => {
   }
 
   return {
-    // GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
-    // WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
-    // SERVER_URL: 'https://enatega-multivendor.up.railway.app/',
-    GRAPHQL_URL: 'http://192.168.0.109:8001/graphql',
-    WS_GRAPHQL_URL: 'ws://192.168.0.109:8001/graphql',
-    SERVER_URL: 'http://192.168.0.109:8001:8001/',
+    GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
+    WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
+    SERVER_URL: 'https://enatega-multivendor.up.railway.app/',
+    // GRAPHQL_URL: 'http://192.168.0.109:8001/graphql',
+    // WS_GRAPHQL_URL: 'ws://192.168.0.109:8001/graphql',
+    // SERVER_URL: 'http://192.168.0.109:8001:8001/',
     IOS_CLIENT_ID_GOOGLE: configuration.iOSClientID,
     ANDROID_CLIENT_ID_GOOGLE: configuration.androidClientID,
     AMPLITUDE_API_KEY: configuration.appAmplitudeApiKey,

diff --git a/enatega-multivendor-app/src/context/User.js b/enatega-multivendor-app/src/context/User.js
@@ -51,7 +51,7 @@ export const UserProvider = props => {
   const [restaurant, setRestaurant] = useState(null)
   const [isPickup, setIsPickup] = useState(false)
   const [instructions, setInstructions] = useState('')
-
+  
   const {
     called: calledProfile,
     loading: loadingProfile,

diff --git a/enatega-multivendor-restaurant/environment.js b/enatega-multivendor-restaurant/environment.js
@@ -20,10 +20,10 @@ const getEnvVars = (env = Updates.releaseChannel) => {
     }
   }
   return {
-      GRAPHQL_URL: 'http://192.168.0.106:8001/graphql',
-      WS_GRAPHQL_URL: 'ws://192.168.0.106:8001/graphql',
-      // GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
-      // WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
+      // GRAPHQL_URL: 'http://192.168.0.109:8001/graphql',
+      // WS_GRAPHQL_URL: 'ws://192.168.0.109:8001/graphql',
+      GRAPHQL_URL: 'https://enatega-multivendor.up.railway.app/graphql',
+      WS_GRAPHQL_URL: 'wss://enatega-multivendor.up.railway.app/graphql',
     SENTRY_DSN: configuration.restaurantAppSentryUrl
     // SENTRY_DSN:
     //   'https://[email protected]/6131933'

diff --git a/enatega-multivendor-restaurant/src/apollo/queries.js b/enatega-multivendor-restaurant/src/apollo/queries.js
@@ -73,6 +73,7 @@ export const orders = `query Orders{
       preparationTime
       acceptedAt
       isRinged
+      instructions
       rider{
         _id
         name

diff --git a/enatega-multivendor-restaurant/src/components/OrderDetails/OrderDetails.js b/enatega-multivendor-restaurant/src/components/OrderDetails/OrderDetails.js
@@ -42,17 +42,43 @@ export default function OrderDetails({ orderData }) {
   )
 }
 function OrderItems({ orderData }) {
+  console.log("OrderData",orderData)
   const { t } = useTranslation()
   const {
+    instructions,
     items,
     orderAmount,
     tipping,
     deliveryCharges,
     taxationAmount
   } = orderData
+  console.log("instructions",instructions)
   const configuration = useContext(Configuration.Context)
   let subTotal = 0
   return (
+    <View>
+        {instructions && instructions.trim() !== "" && (
+        <View style={[styles.cardContainer, { marginTop: 30}]}>
+            <View style={styles.itemRowBar} >
+              <TextDefault
+                H5
+                bold>
+                 Special Order Instructions
+                </TextDefault>
+            </View>
+
+        <View style={styles.itemRow}>
+          <TextDefault
+           H6
+           textColor={colors.fontSecondColor}
+           bold
+           style={styles.itemHeading}>
+           {instructions}
+         </TextDefault>
+       </View>
+
+   </View>
+         )}
     <View style={[styles.cardContainer, { marginTop: 30, marginBottom: 45 }]}>
       {items &&
         items.map((item, index) => {
@@ -135,5 +161,6 @@ function OrderItems({ orderData }) {
         </TextDefault>
       </View>
     </View>
+    </View>
   )
 }
diff --git a/enatega-multivendor-restaurant/src/screens/OrderDetail/OrderDetail.js b/enatega-multivendor-restaurant/src/screens/OrderDetail/OrderDetail.js
@@ -108,6 +108,7 @@ export default function OrderDetail({ navigation, route }) {
                   style={{ width: 25, height: 25 }}
                 />
               </View>
+
               <View style={styles.textContainer}>
                 <TextDefault bolder H4>
                   {activeBar === 2 ? t('prepared') : t('preparing')}