pyc-website

commit 9319e3f6a417779570f75f52110860f4f927680f
parent 79d1b690d00f7a80d218e1dc051213bb5f6f44bd
Author: Jul <jul@9o.is>
Date:   Sun, 29 Jun 2014 02:28:39 -0400

Twilio working

Diffstat:
M
src/main/scala/inc/pyc/lib/Twilio.scala
 | 
12
++++++------
M
src/main/webapp/templates-hidden/parts/phone-verification-form.html
 | 
4
++--

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/scala/inc/pyc/lib/Twilio.scala b/src/main/scala/inc/pyc/lib/Twilio.scala
@@ -7,7 +7,7 @@ import net.liftweb.util.{Mailer, Props}
 import com.ning.http.client.Response
 import net.liftmodules.mongoauth.MongoAuth
 
-object Twilio {
+object Twilio extends net.liftweb.common.Logger {
 
   lazy val host = :/("api.twilio.com").secure / "2010-04-01" / "Accounts" / sid as_!(sid,token)
   lazy val sid = Props.get("twilio.sid", "")
@@ -16,12 +16,12 @@ object Twilio {
   
   def sms(to: String, body: String)(implicit countrycode: String = "+1"): Boolean = {
     val r: Future[Response] = 
-      Http(host / "SMS" / "Messages.json" << Map("From" -> phone, "To" -> to, "Body" -> body))
+      Http(host / "Messages.json" << Map("From" -> phone, "To" -> to, "Body" -> body))
     
-    val success = r().getStatusCode() == 200
-    
-    if(!success) notifyByEmail(r().getStatusText())
-    success
+    val created = r().getStatusCode() == 201 // CREATED
+        
+    if(!created) notifyByEmail(r().getStatusText())
+    created
   }
   
   /** 
diff --git a/src/main/webapp/templates-hidden/parts/phone-verification-form.html b/src/main/webapp/templates-hidden/parts/phone-verification-form.html
@@ -36,8 +36,8 @@
 				<span data-lift="embed?what=/templates-hidden/parts/alert"></span>
 			</div>
 			
-			<button ng-show="form.postal.$valid && !sentsms" ng-disable="form.phone.$invalid" ng-click="sendsms()" class="btn btn-primary">Send SMS Code</button>
-			<button ng-show="sentsms" ng-click="verifyphone()" class="btn btn-primary">Verify Number</button>
+			<button ng-show="form.postal.$valid && !sentsms" ng-disabled="form.phone.$invalid" ng-click="sendsms()" class="btn btn-primary" disabler ng-model="loading">Send SMS Code</button>
+			<button ng-show="sentsms" ng-disabled="form.smscode.$invalid" ng-click="verifyphone()" class="btn btn-primary" disabler ng-model="loading">Verify Number</button>
 		</footer>
 	</form>
 </div>
 \ No newline at end of file