diff --git a/app/bus.routes.js b/app/bus.routes.js index ac046c1..b0fdf90 100644 --- a/app/bus.routes.js +++ b/app/bus.routes.js @@ -11,10 +11,10 @@ onTrace=function(token,error){ }; -onMessage=function(token,content){ +onMessage=function(title,content){ var msg=JSON.stringify(content,null,2); bus.emit( "sendmail", - "info@karibou.io","[kariboo-subscribe] : "+content.email, + "info@karibou.io",title, {content:msg}, "simple"); }; diff --git a/controllers/api.js b/controllers/api.js index 495fa63..fe9fa2a 100644 --- a/controllers/api.js +++ b/controllers/api.js @@ -66,7 +66,7 @@ exports.message = function(req, res) { if(origins.indexOf(req.params.key)==-1){ // return res.send(401,"invalid token") } - bus.emit('system.message',req.params.key,req.body); + bus.emit('system.message',"[kariboo-subscribe] : ",req.body); res.json({}); }; diff --git a/controllers/orders.js b/controllers/orders.js index 4a2154f..8721942 100644 --- a/controllers/orders.js +++ b/controllers/orders.js @@ -316,10 +316,11 @@ exports.create=function(req,res){ transaction.process(card, function(err,result){ if(err){ return order.rollbackProductQuantityAndSave(function(e){ - if(err){ - //FIXME - console.log("-------------------------------pf",err) - console.log("-------------------------------mg",e) + if(e){ + + // + //DANGER on + bus.emit('system.message',"[kariboo-danger] : ",{error:e,order:o.oid,customer:o.email}); } return res.json(400,err.message) }); diff --git a/models/order.js b/models/order.js index 8a448ec..5542703 100644 --- a/models/order.js +++ b/models/order.js @@ -574,8 +574,12 @@ Orders.methods.rollbackProductQuantityAndSave=function(callback){ db.model('Products').update({sku:item.sku},{$inc: {"pricing.stock":item.quantity}}, { safe: true }, cb) },function(err){ if(err){ - callback(err); - throw new Error("rollback: "+(err.message||err)); + + // + //DANGER send email + bus.emit('system.message',"[kariboo-danger] : ",{error:err,order:self.oid,customer:self.email}); + + return callback(err); } // diff --git a/models/users.js b/models/users.js index 97759ca..dd1bd3a 100644 --- a/models/users.js +++ b/models/users.js @@ -648,9 +648,7 @@ UserSchema.statics.addPayment=function(id, payment,callback){ safePayment.expiry=payment.expiry; safePayment.updated=Date.now(); - console.log('1 alias',alias) card.publish({alias:alias},function(err,res){ - console.log('2 publish err',err, res) if(err){ return callback(err.message) }