Skip to content

Commit 02b162e

Browse files
swqat117swqat117
committed
user
1 parent 51c3221 commit 02b162e

File tree

2 files changed

+44
-53
lines changed

2 files changed

+44
-53
lines changed

‎routes/user.js‎

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -613,38 +613,7 @@ router.post('/book_slot', verifyToken, (req, res, next) => {
613613
}).catch(error=>{
614614
console.log(error.response.data)
615615
})
616-
617-
// axios.get(process.env.PHP_SERVER+'/textlocal/slot_booked_man.php?booking_id='+booking_id+'&phone='+venue_phone+'&venue_name='+venue_name+'&user_name='+req.username+'&user_phone='+phone+'&date='+datetime+'&venue_type='+values[0].venue_type+'&sport_name='+values[0].sport_name+'&venue_area='+venue_area+'&amount='+total_amount+'&name='+total_amount)
618-
// .then(response => {
619-
// console.log(response.data,'passed')
620-
// }).catch(error=>{
621-
// console.log(error.response.data)
622-
// })
623-
624-
625-
626-
//Send Mail
627-
// let mailBody = {
628-
// name:values[0].name,
629-
// date:moment(values[0].booking_date).format("dddd, MMM Do YYYY"),
630-
// day:moment(values[0].booking_date).format("Do"),
631-
// venue:values[0].venue,
632-
// area:values[0].area,
633-
// venue_type:values[0].venue_type,
634-
// booking_id:values[0].booking_id,
635-
// slot_time:datetime,
636-
// quantity:1,
637-
// total_amount:total_amount,
638-
// booking_amount:values[0].booking_amount,
639-
// directions:directions,
640-
// sport_name:sport_name,
641-
// }
642-
function thousands_separators(num)
643-
{
644-
let num_parts = num.toString().split(".");
645-
num_parts[0] = num_parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
646-
return num_parts.join(".");
647-
}
616+
648617
let mailBody = {
649618
name:values[0].name,
650619
date:moment(values[0].booking_date).format("dddd, MMM Do YYYY"),
@@ -662,7 +631,6 @@ router.post('/book_slot', verifyToken, (req, res, next) => {
662631
venue_discount:indianRupeeComma(Math.round(result[0].commission)),
663632
coupon_amount:indianRupeeComma(Math.round(result[0].coupon_amount)),
664633
venue_name:venue.venue.name
665-
666634
}
667635

668636
let to_mail = `${values[0].email}, rajasekar@turftown.in,support@turftown.in`
@@ -1081,8 +1049,9 @@ function isEmpty (object){
10811049
// })
10821050
router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
10831051
Booking.findOne({booking_id:req.params.id}).then(booking=>{
1084-
Venue.findById({_id:booking.venue_id}).then(venue=>{
1085-
Admin.findById({venue:{$in:[booking.venue_id]}}).then(admins=>{
1052+
User.findById({_id:req.userId}).then(user=>{
1053+
Venue.findById({_id:booking.venue_id}).then(venue=>{
1054+
Admin.find({venue:{$in:[booking.venue_id]}}).then(admins=>{
10861055
if(booking.booking_type === "app" && req.body.refund_status){
10871056
axios.post('https://'+rzp_key+'@api.razorpay.com/v1/payments/'+booking.transaction_id+'/refund')
10881057
.then(response => {
@@ -1108,7 +1077,7 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
11081077
console.log(error.response)
11091078
})
11101079
let obj = {
1111-
name:req.username,
1080+
name:user.name,
11121081
venue_manager_name:venue.venue.name,
11131082
date:date,
11141083
phone:venue.venue.contact,
@@ -1121,7 +1090,7 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
11211090
}
11221091

11231092
ejs.renderFile('views/event_manager/venue_cancel.ejs',obj).then(html=>{
1124-
let to_emails = `${req.username}, rajasekar@turftown.in`
1093+
let to_emails = `${user.email}, rajasekar@turftown.in`
11251094
mail("support@turftown.in", to_emails,booking_id+" has been cancelled","Slot Cancellation",html,response=>{
11261095
if(response){
11271096
res.send({status:"success"})
@@ -1132,7 +1101,8 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
11321101
}).catch(next)
11331102
let manager_mail = ''
11341103
admins.map((admin,index)=>{manager_mail+=(admin.length-1) === index ?admin.email :admin.email + ','})
1135-
ejs.renderFile('views/event_manager/venue_cancel_manager.ejs',obj).then(html=>{
1104+
console.log(manager_mail);
1105+
ejs.renderFile('views/event_manager/venue_cancel_manager.ejs',obj).then(html=>{
11361106
//let to_emails = `${req.body.email}, rajasekar@turftown.in`
11371107
mail("support@turftown.in", manager_mail,booking_id+" has been cancelled","Slot Cancellation",html,response=>{
11381108
if(response){
@@ -1174,6 +1144,7 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
11741144
let date = moment(booking[0].booking_date).format("MMMM Do YYYY")
11751145
let start_time = Object.values(booking).reduce((total,value)=>{return total<value.start_time?total:value.start_time},booking[0].start_time)
11761146
let end_time = Object.values(booking).reduce((total,value)=>{return total>value.end_time?total:value.end_time},booking[0].end_time)
1147+
let time = moment(start_time).parseZone().utc("-5:30").format("hh:mma") + "-" + moment(end_time).parseZone().utc("-5:30").format("hh:mma")
11771148
let datetime = date + " " + moment(start_time).format("hh:mma") + "-" + moment(end_time).format("hh:mma")
11781149

11791150
//Send SMS
@@ -1182,20 +1153,25 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
11821153
}).catch(error=>{
11831154
console.log(error.response)
11841155
})
1185-
1186-
let obj = {
1187-
name:req.name,
1188-
date:date,
1189-
time:datetime,
1190-
booking_id:booking_id,
1191-
venue_type:venue_type,
1192-
venue_name:venue_name,
1193-
venue_location:venue_area,
1194-
booking_status:`Advance of Rs ${booking_amount} has been cancelled`
1156+
console.log(user);
1157+
let obj = {
1158+
name:user.name,
1159+
venue_manager_name:venue.venue.name,
1160+
date:date,
1161+
phone:venue.venue.contact,
1162+
time:time,
1163+
user_phone:user.phone,
1164+
booking_id:booking_id,
1165+
venue_type:venue_type,
1166+
venue_name:venue_name,
1167+
venue_location:venue_area,
1168+
booking_status:`Advance of Rs ${booking_amount} has been charged as cancellation fee`
11951169
}
11961170

1171+
console.log(obj);
1172+
console.log("userdetails",user.email)
11971173
ejs.renderFile('views/event_manager/venue_cancel.ejs',obj).then(html=>{
1198-
let to_emails = `${req.username}, rajasekar@turftown.in`
1174+
let to_emails = `${user.email}, rajasekar@turftown.in`
11991175

12001176
mail("support@turftown.in", to_emails,booking_id+" has been cancelled","Slot Cancellation",html,response=>{
12011177
if(response){
@@ -1205,6 +1181,20 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
12051181
}
12061182
})
12071183
}).catch(next)
1184+
1185+
let manager_mail = ''
1186+
admins.map((admin,index)=>{manager_mail+=(admin.length-1) === index ?admin.email :admin.email + ','})
1187+
console.log(manager_mail);
1188+
ejs.renderFile('views/event_manager/venue_cancel_manager.ejs',obj).then(html=>{
1189+
//let to_emails = `${req.body.email}, rajasekar@turftown.in`
1190+
mail("support@turftown.in", manager_mail,booking_id+" has been cancelled","Slot Cancellation",html,response=>{
1191+
if(response){
1192+
res.send({status:"success"})
1193+
}else{
1194+
res.send({status:"failed"})
1195+
}
1196+
})
1197+
}).catch(next)
12081198

12091199
//Activity Log
12101200
let activity_log = {
@@ -1226,8 +1216,10 @@ router.post('/cancel_booking/:id', verifyToken, (req, res, next) => {
12261216

12271217
}).catch(next)
12281218
}).catch(next)
1219+
}).catch(next)
12291220
})
12301221

1222+
12311223
router.post('/booking_history_from_app_event_bookings', verifyToken, (req, res, next) => {
12321224
EventBooking.find({booking_status:{$in:["booked","completed","cancelled"]}, created_at:{$gte:req.body.fromdate, $lte:req.body.todate},booking_type:"app"}).lean().populate('event_id').then(booking=>{
12331225
// console.log("veeee",result)
@@ -1263,7 +1255,6 @@ router.post('/cancel_manager_booking/:id', verifyToken, (req, res, next) => {
12631255
let manager_phone = "91"+venue.venue.contact
12641256

12651257
//Send SMS
1266-
console.log(booking);
12671258
axios.get(process.env.PHP_SERVER+'/textlocal/cancel_slot.php?booking_id='+booking_id+'&phone='+phone+'&manager_phone='+manager_phone+'&venue_name='+venue_name+'&date='+datetime+'&venue_type='+booking[0].venue_type+'&sport_name='+booking[0].sport_name+'&venue_area='+venue_area).then(response => {
12681259
console.log(response.data)
12691260
}).catch(error=>{

‎views/event_manager/venue_cancel_manager.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,15 @@
281281
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 20px; padding-left: 15px; padding-top: 10px; padding-bottom: 10px; font-family: Tahoma, Verdana, sans-serif"><![endif]-->
282282
<div style="color:#555555;font-family:'Roboto', Tahoma, Verdana, Segoe, sans-serif;line-height:1.8;padding-top:10px;padding-right:20px;padding-bottom:10px;padding-left:15px;">
283283
<div style="font-family: 'Roboto', Tahoma, Verdana, Segoe, sans-serif; font-size: 12px; line-height: 1.8; color: #555555; mso-line-height-alt: 22px;">
284-
<p style="line-height: 1.8; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; word-break: break-word; font-size: 14px; mso-line-height-alt: 25px; margin: 0;"><span style="font-size: 14px;">Your Turf Town booking scheduled for </span><span style="font-size: 14px;"><%= date %></span></p>
285-
<p style="line-height: 1.8; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; word-break: break-word; font-size: 14px; mso-line-height-alt: 25px; margin: 0;"><span style="font-size: 14px;">from <%= time %> has been cancelled by the Venue.</span></p>
284+
<p style="line-height: 1.8; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; word-break: break-word; font-size: 14px; mso-line-height-alt: 25px; margin: 0;"><span style="font-size: 14px;">Turf Town booking scheduled for </span><span style="font-size: 14px;"><%= date %></span></p>
285+
<p style="line-height: 1.8; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; word-break: break-word; font-size: 14px; mso-line-height-alt: 25px; margin: 0;"><span style="font-size: 14px;">from <%= time %> has been cancelled by the User.</span></p>
286286
</div>
287287
</div>
288288
<!--[if mso]></td></tr></table><![endif]-->
289289
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 15px; padding-left: 15px; padding-top: 0px; padding-bottom: 15px; font-family: Tahoma, Verdana, sans-serif"><![endif]-->
290290
<div style="color:#555555;font-family:'Roboto', Tahoma, Verdana, Segoe, sans-serif;line-height:1.2;padding-top:0px;padding-right:15px;padding-bottom:15px;padding-left:15px;">
291291
<div style="font-family: 'Roboto', Tahoma, Verdana, Segoe, sans-serif; font-size: 12px; line-height: 1.2; color: #555555; mso-line-height-alt: 14px;">
292-
<p style="font-size: 14px; line-height: 1.2; word-break: break-word; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; mso-line-height-alt: 17px; margin: 0;"><em>Please contact the venue for more details ( +91 <%= phone %> )</em></p>
292+
<p style="font-size: 14px; line-height: 1.2; word-break: break-word; font-family: Roboto, Tahoma, Verdana, Segoe, sans-serif; mso-line-height-alt: 17px; margin: 0;"><em>Please contact the user (<%= name %>) for more details ( +91 <%= user_phone %> )</em></p>
293293
</div>
294294
</div>
295295
<!--[if mso]></td></tr></table><![endif]-->

0 commit comments

Comments
 (0)