sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

my commit was clobbered #956

Browse Source
This commit is contained in:
Daniel Camargo 2013-04-02 10:16:46 -03:00
parent 338588c692
commit abf98a4a02
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/assets/js/app.js
View File

@ -886,7 +886,7 @@ Issue 13: Removed the password for while
var lon = results[0].geometry.location.lng();
}
if (!App.restaurant.deliveryHere({ lat: lat, lon: lon})) {
alert( 'Sorry, that address seems invalid to us. \nTry again, or order takeout' );
alert( 'Sorry, that address seems invalid to us. \nPlease make sure you enter a zip code.' );
App.busy.unBusy();
} else {
App.busy.unBusy();
@ -1201,6 +1201,12 @@ App.processConfig = function(json, user) {
};
App.lastTipNormalize = function( lastTip ){
lastTip = parseInt( lastTip );
// it means the last tipped order was using dollar value
if( App.config.user && App.config.user.last_tip_type && App.config.user.last_tip_type == 'number' ){
return 18;
}
// it means the last tipped value is not at the permitted value, return 18 as default.
if( App.tips.indexOf( lastTip ) > 0 ){
lastTip = lastTip;
} else {
@ -1209,6 +1215,7 @@ App.lastTipNormalize = function( lastTip ){
return lastTip;
}
App.detectCardType = function(){
var cardvalue = $( '[name="pay-card-number"]' ).val();
var type = false;