|
|
@@ -31,32 +31,35 @@ public class MobileTransactionHandler implements AppManagerFunction {
|
|
|
String type = syntax.get("type");
|
|
|
String version = syntax.get("version");
|
|
|
String language = syntax.get("language");
|
|
|
+ String accttype = "TEMP";
|
|
|
Message msg = Messanger.getMessage(MessageId.SYSTEM_BUSY, msisdn, "<refid>", refid);
|
|
|
- ret = key + ":99:" + refid + ":" + msg.getMessage().toString();
|
|
|
+ ret = key + ":99:" + refid + ":" + msg.getMessage().toString() + ":" + accttype;
|
|
|
+
|
|
|
try {
|
|
|
ValidateMobileTransaction validate = new ValidateMobileTransaction();
|
|
|
McomSubscriber originator = McomSubscriber.getMcomSubscriber(msisdn);
|
|
|
if(!originator.isSubscribed()) {
|
|
|
- ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.UNAUTHORISED_ERROR, originator).getMessage();
|
|
|
+ ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.UNAUTHORISED_ERROR, originator).getMessage() + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}
|
|
|
if(!"ACTIVE".equalsIgnoreCase(originator.getProperty("STATUS"))) {
|
|
|
- ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.INACTIVE_ERROR, originator).getMessage();
|
|
|
+ ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.INACTIVE_ERROR, originator).getMessage() + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}
|
|
|
if("YES".equalsIgnoreCase(originator.getProperty("LOCKED"))) {
|
|
|
- ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.LOCKED_ERROR, originator).getMessage();
|
|
|
+ ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.LOCKED_ERROR, originator).getMessage() + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}
|
|
|
if(!validate.isValidTransaction(type, originator.getProperty(McomSubscriber.PROP_TYPE))) {
|
|
|
- ret = key + ":97:" + refid + ":Vous n'etes pas autorise";
|
|
|
+ ret = key + ":97:" + refid + ":Vous n'etes pas autorise" + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}
|
|
|
if(!validate.isValidVersion(type, originator.getProperty(McomSubscriber.PROP_TYPE),version)) {
|
|
|
- ret = key + ":98:" + refid + ":La version de l'application n'est pas mise a jour. S'il vous plaît aller a playstore et mettre a jour";
|
|
|
+ ret = key + ":98:" + refid + ":La version de l'application n'est pas mise a jour. S'il vous plaît aller a playstore et mettre a jour" + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}
|
|
|
- ret = key + ":0:" + refid + ":Proceder:"+originator.getProperty(McomSubscriber.PROP_TYPE);
|
|
|
+ accttype = originator.getProperty(McomSubscriber.PROP_TYPE);
|
|
|
+ ret = key + ":0:" + refid + ":Proceder" + ":" + accttype;
|
|
|
return new Message(0,0,ret);
|
|
|
}catch (Exception e) {
|
|
|
log.error("MobileHandler : error" + msisdn, e);
|