Skip to content

Commit f48bca3

Browse files
kumarguglothkumargugloth
authored
Merge pull request hernansartorio#3 from kumargugloth/develop
Develop
2 parents fcf1978 + d74c276 commit f48bca3

File tree

2 files changed

+68
-35
lines changed

2 files changed

+68
-35
lines changed

‎routes/admin.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -907,11 +907,9 @@ router.post('/create_ad',
907907
verifyToken,
908908
AccessControl('ads', 'create'),
909909
(req, res, next) => {
910-
Ads.find({}).then(ads=>{
911-
let check_position = ads.filter(ad=>ad.position===req.body.position && ad.sport_type === req.body.sport_type && ad.page === req.body.page)
912-
console.log('position ',check_position.length);
913-
if(check_position.length){
914-
console.log('check ',check_position);
910+
Ads.find({status:true}).then(ads=>{
911+
let check_position = ads.filter(ad=>ad.position===req.body.position && ad.sport_type === req.body.sport_type && ad.page === req.body.page )
912+
if(check_position.length > 0){
915913
existing_positions = []
916914
check_position.map(ad=>{
917915
let x = 'position: '+ad.position.toString()+"already exists in page: "+ad.page + 'in sport: '+ad.sport_type

‎routes/user.js‎

Lines changed: 65 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,12 +1659,15 @@ router.post('/booking_history_by_time/:id', verifyToken, (req, res, next) => {
16591659
let x = {}
16601660
let finalBookingList = []
16611661
Object.entries(grouped).map(([i,j])=>{
1662-
j.every((key)=>{
1663-
if(key.booking_status !== "cancelled" && key.booking_status !== "completed"){
1664-
x[i] = j
1665-
finalBookingList = [...j,...finalBookingList]
1666-
}
1667-
})
1662+
const filtered = j.filter((key)=>{
1663+
if(key.booking_status == "booked"){
1664+
return key
1665+
}
1666+
})
1667+
if(filtered.length > 0){
1668+
x[i] = j
1669+
finalBookingList = [...j,...finalBookingList]
1670+
}
16681671
})
16691672
res.send({status:"success", message:"booking history fetched", data:finalBookingList})
16701673
}).catch(next)
@@ -1677,11 +1680,21 @@ router.post('/booking_history_by_time/:id', verifyToken, (req, res, next) => {
16771680
let grouped = _.mapValues(_.groupBy(booking, 'group_id'),clist => clist.map(booking => _.omit(booking, 'multiple_id')));
16781681
let finalBookingList = []
16791682
Object.entries(grouped).map(([i,j])=>{
1680-
j.every((key)=>{
1681-
if(moment().isAfter(key.end_date_range) && key.booking_status === 'completed'){
1682-
finalBookingList = [...j,...finalBookingList]
1683-
}
1683+
const filtered = j.filter((key)=>{
1684+
if(key.booking_status == "completed" && moment().isAfter(key.end_date_range) ){
1685+
return key
1686+
}
16841687
})
1688+
if(filtered.length > 0){
1689+
x[i] = j
1690+
finalBookingList = [...j,...finalBookingList]
1691+
}
1692+
1693+
// j.every((key)=>{
1694+
// if(moment().isAfter(key.end_date_range) && key.booking_status === 'completed'){
1695+
// finalBookingList = [...j,...finalBookingList]
1696+
// }
1697+
// })
16851698
})
16861699
res.send({status:"success", message:"booking history fetched", data:finalBookingList})
16871700
}).catch(next)
@@ -1696,14 +1709,16 @@ router.post('/booking_history_by_time/:id', verifyToken, (req, res, next) => {
16961709
let x = {}
16971710
let finalBookingList = []
16981711
Object.entries(grouped).map(([i,j])=>{
1699-
1700-
j.every((key)=>{
1701-
if(key.booking_status !== "cancelled"){
1702-
x[i] = j
1703-
finalBookingList = [...j,...finalBookingList]
1704-
}
1705-
})
1706-
})
1712+
const filtered = j.filter((key)=>{
1713+
if(key.booking_status !== "cancelled"){
1714+
return key
1715+
}
1716+
})
1717+
if(filtered.length > 0){
1718+
x[i] = j
1719+
finalBookingList = [...j,...finalBookingList]
1720+
}
1721+
})
17071722
res.send({status:"success", message:"booking history fetched", data:finalBookingList, })
17081723
}).catch(next)
17091724
})
@@ -1718,12 +1733,22 @@ router.post('/booking_history_by_time/:id', verifyToken, (req, res, next) => {
17181733
let x = {}
17191734
let finalBookingList = []
17201735
Object.entries(grouped).map(([i,j])=>{
1721-
j.every((key)=>{
1722-
if(key.booking_status !== "cancelled"){
1723-
x[i] = j
1724-
finalBookingList = [...j,...finalBookingList]
1725-
}
1726-
})
1736+
const filtered = j.filter((key)=>{
1737+
if(key.booking_status !== "cancelled"){
1738+
return key
1739+
}
1740+
})
1741+
if(filtered.length > 0){
1742+
x[i] = j
1743+
finalBookingList = [...j,...finalBookingList]
1744+
}
1745+
1746+
// j.every((key)=>{
1747+
// if(key.booking_status !== "cancelled"){
1748+
// x[i] = j
1749+
// finalBookingList = [...j,...finalBookingList]
1750+
// }
1751+
// })
17271752
})
17281753
console.log(finalBookingList,sortedActivities[0].invoice_date);
17291754
res.send({status:"success", message:"booking history fetched", data:finalBookingList ,invoice_date:sortedActivities.length > 0 ? sortedActivities[0].invoice_date : '' })
@@ -1739,12 +1764,22 @@ router.post('/booking_history_by_time/:id', verifyToken, (req, res, next) => {
17391764
let x = {}
17401765
let finalBookingList = []
17411766
Object.entries(grouped).map(([i,j])=>{
1742-
j.every((key)=>{
1743-
if(key.booking_status !== "cancelled"){
1744-
x[i] = j
1745-
finalBookingList = [...j,...finalBookingList]
1746-
}
1747-
})
1767+
1768+
const filtered = j.filter((key)=>{
1769+
if(key.booking_status !== "cancelled"){
1770+
return key
1771+
}
1772+
})
1773+
if(filtered.length > 0){
1774+
x[i] = j
1775+
finalBookingList = [...j,...finalBookingList]
1776+
}
1777+
// j.every((key)=>{
1778+
// if(key.booking_status !== "cancelled"){
1779+
// x[i] = j
1780+
// finalBookingList = [...j,...finalBookingList]
1781+
// }
1782+
// })
17481783
})
17491784
res.send({status:"success", message:"booking history fetched", data:finalBookingList ,invoice_date:sortedActivities.length > 0 ? sortedActivities[0].invoice_date : '' })
17501785
}).catch(next)

0 commit comments

Comments
 (0)