Merge branch 'dev' of cosqnet.com:cosqnet/fitlien-services into dev

functions/package-lock.json

@@ -14,6 +14,7 @@
         "firebase-admin": "^12.6.0",
         "firebase-functions": "^6.0.1",
         "form-data": "^4.0.1",
+        "functions": "file:",
         "html-to-text": "^9.0.5",
         "long": "^4.0.0",
         "mailgun.js": "^10.4.0",
@@ -3084,6 +3085,10 @@
       "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "optional": true
     },
+    "node_modules/functions": {
+      "resolved": "",
+      "link": true
+    },
     "node_modules/gaxios": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",

functions/package.json

@@ -21,6 +21,7 @@
     "firebase-admin": "^12.6.0",
     "firebase-functions": "^6.0.1",
     "form-data": "^4.0.1",
+    "functions": "file:",
     "html-to-text": "^9.0.5",
     "long": "^4.0.0",
     "mailgun.js": "^10.4.0",

functions/src/index.ts

@@ -423,8 +423,7 @@ export const createCashfreeOrder = onRequest({
                 customer_phone: customerPhone
               },
               order_meta: {
-                return_url: `https://fitlien.com/payment-bridge?order_id=${orderId}&hash_key=${hashKey}&user_id=${userId}&gym_id=${gymId}&web_host_url=${webHostUrl}`,
-                // notify_url: `https://$filien.web.app/verifyCashfreePayment`
+                return_url: `http://${webHostUrl}/?order_id=${orderId}&hash_key=${hashKey}&user_id=${userId}&gym_id=${gymId}#/payment-status-screen`,
               },
               order_note: productInfo || 'Fitlien Membership'
             },