From 0704be0911d4cab80d7ef1947a29a51dfbf66d30 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 16:29:40 -0200
Subject: [PATCH 1/8] partial #13

---
 .../default/crunchbutton/api/user/index.php   |  24 ++++-
 include/crunchbutton.php                      |   2 +-
 include/library/Crunchbutton/User.php         |   1 +
 include/library/Crunchbutton/User/Auth.php    |  19 +++-
 .../crunchbutton/layout/html.bottom.phtml     |   1 +
 www/assets/css/style.css                      |  49 +++++++--
 www/assets/images/sign-up.png                 | Bin 0 -> 19358 bytes
 www/assets/js/app.js                          | 102 ++++++++++++------
 8 files changed, 152 insertions(+), 46 deletions(-)
 create mode 100644 www/assets/images/sign-up.png

diff --git a/include/controllers/default/crunchbutton/api/user/index.php b/include/controllers/default/crunchbutton/api/user/index.php
index a0236beb2..0d227388c 100644
--- a/include/controllers/default/crunchbutton/api/user/index.php
+++ b/include/controllers/default/crunchbutton/api/user/index.php
@@ -69,13 +69,27 @@ class Controller_api_user extends Crunchbutton_Controller_Rest {
 									echo json_encode(['error' => 'user exists']);
 									exit;
 								}
+								$user = c::user();
+								if (!$user->id_user) {
+									// we dont have a user, and we need to make one
+									$user = new User;
+									$user->active = 1;
+									if( filter_var( $_POST[ 'email' ], FILTER_VALIDATE_EMAIL ) ){
+										$user->email = $_POST[ 'email' ];
+									} else {
+										$user->phone = $_POST[ 'email' ];
+									}
+									$user->name = '';
+									$user->save();
+								}
 								$user_auth = new User_Auth();
-								$user_auth->id_user = c::user()->id_user;
+								$user_auth->id_user = $user->id_user;
 								$user_auth->type = 'local';
 								$user_auth->auth = User_Auth::passwordEncrypt( $params[ 'password' ] );
 								$user_auth->email = $params[ 'email' ];
 								$user_auth->active = 1;
 								$user_auth->save();
+								$user = c::auth()->doAuthByLocalUser( $params );
 								echo c::user()->json();
 								break;
 						}
@@ -102,6 +116,14 @@ class Controller_api_user extends Crunchbutton_Controller_Rest {
 						echo json_encode(['success' => 'code generated', 'code' => $code]);
 						exit;
 					break;
+					case 'get':
+
+							$mail = new Crunchbutton_User_Auth_Reset_Email([
+							'order' => $order,
+							'email' => $mail
+							]);
+							$mail->send();
+					break;
 				}
 			// Validate a reset code
 			case 'code-validate':
diff --git a/include/crunchbutton.php b/include/crunchbutton.php
index 594eaed8d..b689a48e1 100755
--- a/include/crunchbutton.php
+++ b/include/crunchbutton.php
@@ -12,7 +12,7 @@
 
 // keep the directory setup in here so we can change its path later
 
-set_include_path(get_include_path() . PATH_SEPARATOR . '/Users/arzynik/pear/share/pear');
+set_include_path(get_include_path() . PATH_SEPARATOR . '/Users/pererinha/pear/share/pear');
 
 $GLOBALS['config'] = [
 	'dirs' => [
diff --git a/include/library/Crunchbutton/User.php b/include/library/Crunchbutton/User.php
index 33122d47d..807bf179d 100644
--- a/include/library/Crunchbutton/User.php
+++ b/include/library/Crunchbutton/User.php
@@ -50,6 +50,7 @@ class Crunchbutton_User extends Cana_Table {
 	public function exports() {
 		$out = $this->properties();
 		$out[ 'last_tip' ] = Order::lastTip( $this->id_user );
+		$out[ 'facebook' ] = User_Auth::userHasFacebookAuth( $this->id_user );
 		foreach ($this->presets() as $preset) {
 			$out['presets'][$preset->id_restaurant] = $preset->exports();
 		}
diff --git a/include/library/Crunchbutton/User/Auth.php b/include/library/Crunchbutton/User/Auth.php
index b657b40bc..c4b749c12 100644
--- a/include/library/Crunchbutton/User/Auth.php
+++ b/include/library/Crunchbutton/User/Auth.php
@@ -66,14 +66,14 @@ class Crunchbutton_User_Auth extends Cana_Table {
 		}
 		return $auths;
 	}
-	
+
 	public function user() {
 		if (!isset($this->_user)) {
 			return new Crunchbutton_User($this->id_user);
 		}
 		return $this->_user;
 	}
-	
+
 	public function checkEmailExists( $email ){
 		$row = Cana::db()->get('
 			SELECT * 
@@ -89,6 +89,21 @@ class Crunchbutton_User_Auth extends Cana_Table {
 		return false;
 	}
 
+	public function userHasFacebookAuth( $id_user ){
+		$row = Cana::db()->get('
+			SELECT * 
+			FROM user_auth
+			WHERE
+				id_user="' . $id_user . '"
+				AND active=1
+		');
+		if( $row->_items && $row->_items[0] ){
+				$row = $row->_items[0];
+				return  true;
+		}
+		return false;
+	}
+
 	public function validateResetCode( $code ){
 		$query = sprintf(" SELECT * 
 												FROM user_auth
diff --git a/include/views/default/crunchbutton/layout/html.bottom.phtml b/include/views/default/crunchbutton/layout/html.bottom.phtml
index 1423414e0..faaf9237e 100644
--- a/include/views/default/crunchbutton/layout/html.bottom.phtml
+++ b/include/views/default/crunchbutton/layout/html.bottom.phtml
@@ -24,6 +24,7 @@
 				<div class="signin-box-header">
 					<div class="signin-user"></div>
 					<div class="signin-icon"></div>
+					<div class="signup-icon"></div>
 					<!-- <div class="signout-icon"></div> -->
 				</div>
 			</div>
diff --git a/www/assets/css/style.css b/www/assets/css/style.css
index 8936e5d46..82ab4eae1 100644
--- a/www/assets/css/style.css
+++ b/www/assets/css/style.css
@@ -770,19 +770,20 @@ html[xmlns] .clearfix {
 .sign-in-icon{
 	display: none;
 }
-.signout-container{
-	display: block;
-	margin: 10px;
-	text-align: center;
+.order-options{
+	border-top: 1px solid #F5F5F5;
+	margin-top: 10px;
+	padding: 10px;
 }
-	.signout-button{
+	.signout-button, .signup-add-facebook-button{
 		border-radius: 4px;
 		border: 1px solid #cb5921;
 		padding: 6px 10px 6px 12px;
 		color: #fff;
-		display: block !important;
+		float: left;
+		display: block inline !important;
 		width: 60px;
-		margin: 10px auto;
+		margin:0 10px 10px 0;
 		text-decoration: none;
 		text-align: center;
 		text-shadow: 1px 1px 0px rgba(0,0,0,.22);
@@ -795,7 +796,13 @@ html[xmlns] .clearfix {
 		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f57333', endColorstr='#f26926')";
 		background: linear-gradient(#f57333, #f26926);
 	}
+		.signup-add-facebook-button{
+			width: 190px;
+		}
 
+.config-icon-desktop-hide{
+	display: none;
+}
 
 .logo {
 	float: left;
@@ -1424,6 +1431,9 @@ html[xmlns] .clearfix {
 	.config-icon-mobile-hide{
 		display: none;
 	}
+	.config-icon-desktop-hide{
+		display: block;
+	}
 	.config-icon {
 		float: left;
 	}
@@ -1786,11 +1796,16 @@ html[xmlns] .clearfix {
 	float: right;
 	height: 30px;
 	margin: 12px 0 0 10px;
+	width: 215px;
 }
+	.signin-box-header-min{
+		width: 60px;
+	}
 	.signin-icon {
 		background: url(/assets/images/sign-in.png) no-repeat;
 		background-size: contain;
 		cursor: pointer;
+		float: right;
 		display: none;
 		height: 30px;
 		width: 98px;
@@ -1800,17 +1815,37 @@ html[xmlns] .clearfix {
 		background-size: contain;
 		cursor: pointer;
 		display: none;
+		float: right;
 		height: 30px;
 		width: 110px;
 	}
+	.signup-icon {
+		background: url(/assets/images/sign-up.png) no-repeat;
+		background-size: contain;
+		cursor: pointer;
+		float: left;
+		display: none;
+		height: 30px;
+		width: 103px;
+	}
 	.signin-user{
+		background: url(/assets/images/sign-in-icon.png) no-repeat;
+		background-size: contain;
+		cursor: pointer;
+		float: right;
+		display: none;
+		height: 30px;
+		width: 45px;
+		/*
 		color: #FFF;
 		cursor: pointer;
 		display: none;
 		margin-top: 8px;
 		text-align: center;
 		text-shadow: 1px 1px 0px rgba(0,0,0,.22);
+		*/
 	}
+	
 .signup-success-container{
 	display: none;
 }
diff --git a/www/assets/images/sign-up.png b/www/assets/images/sign-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e3958144658397c916af89ce90b2a8656ca2a75
GIT binary patch
literal 19358
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

literal 0
HcmV?d00001

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index 9b724d512..1b5488b81 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -330,12 +330,15 @@ App.page.restaurant = function(id) {
 			App.cart.loadOrder(App.restaurant.preset());
 		}
 
-		if (App.config.user.id_user) {
+		if (App.config.user.presets) {
+			
 			App.drawPay(this);
-			$('.payment-form').hide();
-
-			var dp = $('<div class="delivery-payment-info main-content-readable"></div>')
-				.append('<div class="dp-display-phone dp-display-item"><label>Your phone number:</label> ' + (App.config.user.phone ? App.phone.format(App.config.user.phone) : '<i>no phone # provied</i>') + '</div>');
+			
+			$('.payment-form').hide();	
+			
+			var dp = $('<div class="delivery-payment-info main-content-readable"></div>');
+				
+			dp.append('<div class="dp-display-phone dp-display-item"><label>Your phone number:</label> ' + (App.config.user.phone ? App.phone.format(App.config.user.phone) : '<i>no phone # provided</i>') + '</div>');
 
 			var paying = $(
 					'<div class="dp-display-payment dp-display-item ">' +
@@ -346,11 +349,12 @@ App.page.restaurant = function(id) {
 					'</div>');
 
 			dp.append(paying);
+		
 			if (App.config.user.delivery_type == 'delivery' && App.restaurant.delivery == '1') {
 				dp.append('<div class="dp-display-address dp-display-item"><label>Your food will be delivered to:</label><br />' + (App.config.user.address ? App.config.user.address.replace("\n",'<br />') : '<i>no address provided</i>') + '</div>');
 			} else {
 				dp.append('<div class="dp-display-address dp-display-item"><label>Address:</label> <i>takeout</i></div>');
-			}
+			}	
 
 			dp.append('<div class="dp-display-address dp-display-item"><a href="javascript:;"><i>Change delivery or payment details</i></a></div>');
 
@@ -592,7 +596,7 @@ App.page.order = function(id) {
 			$('.signup-call-to-action').html( 'If you added a password, you can place 1 click orders at crunchbutton.com on your phone too.' + 
 																 				'<a href="javascript:;" class="signup-add-password-button">Add a password now</a>' );
 			$( '.signup-add-password-button' ).live( 'click', function(){
-				App.signup.show();
+				App.signup.show( false );
 			} );
 		});
 	});
@@ -657,17 +661,27 @@ App.page.orders = function() {
 			});
 		}
 
-		var signout = '' +
-								'<div class="signout-container">' + 
-									'<a href="javascript:;" class="signout-button">Sign out</a>' + 
-								'</div>';
-		$( '.main-content-readable' ).append( signout );
+		var options = '' +
+									'<div class="order-options">' + 
+										( ( App.signin.facebook.isLogged || App.config.user.facebook ) ? '' : '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>' ) +
+										'<a href="javascript:;" class="signout-button">Sign out</a>' + 
+										'<div class="divider"></div>'
+									'</div>';
+		
+					
+		$( '.main-content-readable' ).append( options );
 
-		if( !App.signoutBinded ){
+		if( !App.orderOptionsBinded ){
+			
 			$( '.signout-button' ).live( 'click', function(){
 				App.signin.signOut();
 			} );
-			App.signoutBinded = true;
+
+			$( '.signup-add-facebook-button' ).live( 'click', function(){
+				App.signup.show( true );
+			} );
+			
+			App.orderOptionsBinded = true;
 		}
 
 		App.refreshLayout();
@@ -2456,7 +2470,7 @@ App.signin.html = function(){
 					'<input type="text" maxlength="250" name="password-help-email" placeholder="email or phone" tabindex="10" />' +
 					'<div class="divider"></div>' +
 					'<div class="password-help-error"></div>' +
-					'<a href="javascript:;" class="signin-password-help-back">Nevermind</a>' +
+					'<a href="javascript:;" class="signin-password-help-back">Never mind</a>' +
 					'<a href="javascript:;" class="signin-password-help-button">Reset</a>' +
 					'<div class="divider"></div>' +
 				'</form>' +
@@ -2498,7 +2512,7 @@ App.signin.sendForm = function(){
 		data: { 'email' : email, 'password' : password },
 		dataType: 'json',
 		success: function( json ){
-			if( data.error ){
+			if( json.error ){
 				$('.signin-error').fadeIn();
 			} else{
 				App.config.user = json;
@@ -2586,11 +2600,11 @@ App.signin.show = function(){
 	App.signin.passwordHelp.hide();
 	$( '.signin-facebook-message' ).hide();
 	$( '.signin-facebook' ).show();
-	if( App.signin.facebook.isLogged ){
+	/* if( App.signin.facebook.isLogged ){
 		$( '.signin-facebook-container' ).hide();
 	} else {
 		$( '.signin-facebook-container' ).show();
-	}
+	} */
 	setTimeout( function(){
 			/* Shows the shield */
 			App.modal.shield.show();
@@ -2610,21 +2624,23 @@ App.signin.show = function(){
 App.signin.checkUser = function(){
 	// If the user is logged
 	if( App.config.user.id_user ){
-		// If the user is at the order page show the sign-out button
-		/* if( App.currentPage == 'orders' ){
-			$( '.signin-user' ).hide();
-			$( '.signin-icon' ).hide();
-			$( '.signout-icon' ).show();
-		}	else { */
-			$( '.signin-user' ).html( 'Hi, ' + App.config.user.name );
-			$( '.signin-user' ).show();
-			$( '.signin-icon' ).hide();
-			$( '.signout-icon' ).hide();
-		// }
+		// $( '.signin-user' ).html( 'Hi, ' + App.config.user.name );
+		$( '.signin-user' ).show();
+		$( '.signin-icon' ).hide();
+		$( '.signout-icon' ).hide();
+		$( '.signup-icon' ).hide();
+		$( '.signin-box-header' ).addClass( 'signin-box-header-min' );
 	} else {
 		$( '.signin-user' ).hide();
 		$( '.signin-icon' ).show();
+		$( '.signup-icon' ).show();
 		$( '.signout-icon' ).hide();
+		$( '.signin-box-header' ).removeClass( 'signin-box-header-min' );
+	}
+	if( App.currentPage == 'home' ){
+		$( '.config-icon' ).addClass( 'config-icon-desktop-hide' );
+	} else {
+		$( '.config-icon' ).removeClass( 'config-icon-desktop-hide' );
 	}
 }
 
@@ -2835,10 +2851,15 @@ App.signin.passwordHelp.reset.html = function( path ){
 *  Signup's methods
 **************************/
 App.signup = {};
+
 App.signup.init = function(){
 
 	$( '.wrapper' ).append( App.signup.html() );
 
+	$( '.signup-icon' ).live( 'click', function(){
+		App.signup.show( false );
+	} );
+
 	$( '.signup-form-button' ).live( 'click', function(){
 		App.signup.sendForm();
 	} );
@@ -2872,7 +2893,7 @@ App.signup.html = function(){
 					'<div class="signup-facebook">' +
 						'<a href="javascript:;" class="signup-facebook-button">' +
 							'<span class="signup-facebook-icon"></span>' +
-							'<span class="signup-facebook-text">Login with Facebook</span>' +
+							'<span class="signup-facebook-text">Signup with Facebook</span>' +
 							'<div class="divider"></div>' +
 						'</a>' +
 					'</div>' +
@@ -2891,10 +2912,10 @@ App.signup.html = function(){
 	'</div>';
 }
 
-App.signup.show = function(){
+App.signup.show = function( justFacebook ){
 	$( '.signup-facebook' ).show();
 	$( '.signup-facebook-message' ).hide();
-	if( App.signin.facebook.isLogged ){
+	if( App.config.user.facebook ){
 		$( '.signup-facebook-container' ).hide();
 	} else {
 		$( '.signup-facebook-container' ).show();
@@ -2906,6 +2927,11 @@ App.signup.show = function(){
 			$( 'input[name=signup-password]' ).val( '' );
 			$( '.signup-form-options' ).show();
 			$( '.signup-success-container' ).hide();
+			if( justFacebook ){
+				$( '.signup-form' ).hide();
+			} else {
+				$( '.signup-form' ).show();
+			}
 			$( '.signin-error' ).hide();
 			$( '.signup-container' )
 				.dialog( {
@@ -2969,17 +2995,23 @@ App.signup.sendForm = function(){
 		url: url,
 		data: { 'email' : login, 'password' : password },
 		dataType: 'json',
-		success: function( data ){
-			if( data.error ){
-				if( data.error == 'user exists' ){
+		success: function( json ){
+			if( json.error ){
+				if( json.error == 'user exists' ){
 					$('.signup-error').html( 'It seems that the email/phone that is already registered!' );
 				}
 				$('.signup-error').fadeIn();
 			} else{
+				App.config.user = json;
 				$( '.success-phone' ).html( login );
 				$( '.signup-call-to-action' ).hide();
 				$( '.signup-form-options' ).hide();
 				$( '.signup-success-container' ).show();
+				App.signin.checkUser();
+				// If the user is at the restaurant's page - reload it
+				if( App.currentPage == 'restaurant' && App.restaurant.permalink ){
+					App.page.restaurant( App.restaurant.permalink );
+				}
 			}
 		} 
 	} );

From 677f6ed2f794a89783670322e69072fd091b13bd Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 16:58:15 -0200
Subject: [PATCH 2/8] partial #13

---
 .../controllers/default/crunchbutton/api/user/index.php   | 8 --------
 include/library/Cana/Email.php                            | 4 ++--
 include/views/default/crunchbutton/bundle/js.phtml        | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/controllers/default/crunchbutton/api/user/index.php b/include/controllers/default/crunchbutton/api/user/index.php
index 502070e84..f7c1b730d 100644
--- a/include/controllers/default/crunchbutton/api/user/index.php
+++ b/include/controllers/default/crunchbutton/api/user/index.php
@@ -116,14 +116,6 @@ class Controller_api_user extends Crunchbutton_Controller_Rest {
 						echo json_encode(['success' => 'code generated', 'code' => $code]);
 						exit;
 					break;
-					case 'get':
-
-							$mail = new Crunchbutton_User_Auth_Reset_Email([
-							'order' => $order,
-							'email' => '_EMAIL'
-							]);
-							$mail->send();
-					break;
 				}
 			// Validate a reset code
 			case 'code-validate':
diff --git a/include/library/Cana/Email.php b/include/library/Cana/Email.php
index 161e43050..44d9f74a9 100755
--- a/include/library/Cana/Email.php
+++ b/include/library/Cana/Email.php
@@ -10,10 +10,10 @@
 
 
 require_once 'Mail.php';
-// require_once 'Mail/mime.php';
+require_once 'Mail/mime.php';
 require_once 'Mail/sendmail.php';
 require_once 'Mail/RFC822.php';
-// require_once 'Mail/mimePart.php';
+require_once 'Mail/mimePart.php';
 
 class Cana_Email extends Cana_Model {
 
diff --git a/include/views/default/crunchbutton/bundle/js.phtml b/include/views/default/crunchbutton/bundle/js.phtml
index be677b288..61a57b1de 100644
--- a/include/views/default/crunchbutton/bundle/js.phtml
+++ b/include/views/default/crunchbutton/bundle/js.phtml
@@ -32,7 +32,7 @@ $(function() {
 		App.topCommunities[App.topCommunities.length] = {
 			id_community: '<?=$restaurant->community()->permalink?>',
 			name: '<?=$restaurant->community()->name?>',
-			image: '/cache/images/<?//=$restaurant->thumb()->getFileName()?>',
+			image: '/cache/images/<?=$restaurant->thumb()->getFileName()?>',
 			restaurant: '<?=str_replace("'","\'",$restaurant->name)?>'
 		};
 	<? endforeach ; ?>

From 94ab0c985f5751bdbbaf1e4b3d23c7171501feae Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:02:25 -0200
Subject: [PATCH 3/8] partial #13

fixed the js error
---
 www/assets/js/app.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index 3730302a9..5ebf4aafe 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -664,9 +664,13 @@ App.page.orders = function() {
 		}
 
 
+		var facebook = '';
+		if( App.signin.facebook.isLogged || App.config.user.facebook ){
+			facebook = '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>';
+		}
 		var options = '' +
 									'<div class="order-options">' + 
-										( ( App.signin.facebook.isLogged || App.config.user.facebook ) ? '' : '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>' ) +
+										facebook +
 										'<a href="javascript:;" class="signout-button">Sign out</a>' + 
 										'<div class="divider"></div>'
 									'</div>';

From d11f95d3cadf56bab78da2f5754e75f70969b2a2 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:04:09 -0200
Subject: [PATCH 4/8] partial #13

---
 www/assets/js/app.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index 5ebf4aafe..db4a228ef 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -664,30 +664,6 @@ App.page.orders = function() {
 		}
 
 
-		var facebook = '';
-		if( App.signin.facebook.isLogged || App.config.user.facebook ){
-			facebook = '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>';
-		}
-		var options = '' +
-									'<div class="order-options">' + 
-										facebook +
-										'<a href="javascript:;" class="signout-button">Sign out</a>' + 
-										'<div class="divider"></div>'
-									'</div>';
-							
-		$( '.main-content-readable' ).append( options );
-		if( !App.orderOptionsBinded ){
-			
-			$( '.signout-button' ).live( 'click', function(){
-				App.signin.signOut();
-			} );
-
-			$( '.signup-add-facebook-button' ).live( 'click', function(){
-				App.signup.show( true );
-			} );
-			
-			App.orderOptionsBinded = true;
-		}
 
 		App.refreshLayout();
 

From 579099e8e7e518c78e5f23ddcfe424984bad1fa7 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:07:07 -0200
Subject: [PATCH 5/8] partial #13

---
 www/assets/js/app.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index db4a228ef..be292dd33 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -663,7 +663,30 @@ App.page.orders = function() {
 			});
 		}
 
+		var signupFacebook = '';
+		if( App.signin.facebook.isLogged || App.config.user.facebook ){
+			signupFacebook = '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>';
+		}
+		
+		var bottomMenu = '<div class="order-options">' + 
+										signupFacebook +
+										'<a href="javascript:;" class="signout-button">Sign out</a>' + 
+										'<div class="divider"></div>' + 
+									'</div>';
+							
+		$( '.main-content-readable' ).append( bottomMenu );
+		if( !App.bottomMenuBinded ){
+			
+			$( '.signout-button' ).live( 'click', function(){
+				App.signin.signOut();
+			} );
 
+			$( '.signup-add-facebook-button' ).live( 'click', function(){
+				App.signup.show( true );
+			} );
+			
+			App.bottomMenuBinded = true;
+		}
 
 		App.refreshLayout();
 

From 43ebf05a05751cde79dce0086c947bf0aab7136e Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:12:09 -0200
Subject: [PATCH 6/8] partial #13

fixed the facebook button
---
 www/assets/js/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index be292dd33..c4d39a4f1 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -663,15 +663,15 @@ App.page.orders = function() {
 			});
 		}
 
-		var signupFacebook = '';
+		var signupFacebook = '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>';
 		if( App.signin.facebook.isLogged || App.config.user.facebook ){
-			signupFacebook = '<a href="javascript:;" class="signup-add-facebook-button">Connect with Facebook</a>';
+			signupFacebook = '';
 		}
 		
 		var bottomMenu = '<div class="order-options">' + 
 										signupFacebook +
 										'<a href="javascript:;" class="signout-button">Sign out</a>' + 
-										'<div class="divider"></div>' + 
+										'<div class="divider"></div>' +
 									'</div>';
 							
 		$( '.main-content-readable' ).append( bottomMenu );

From 5a0179e8a1fd6a3dc4a597b6646cd4b953b44616 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:21:23 -0200
Subject: [PATCH 7/8] partial #13

Fixed the Auth model.
---
 include/library/Crunchbutton/User/Auth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/library/Crunchbutton/User/Auth.php b/include/library/Crunchbutton/User/Auth.php
index c4b749c12..5dd04ee9b 100644
--- a/include/library/Crunchbutton/User/Auth.php
+++ b/include/library/Crunchbutton/User/Auth.php
@@ -95,6 +95,7 @@ class Crunchbutton_User_Auth extends Cana_Table {
 			FROM user_auth
 			WHERE
 				id_user="' . $id_user . '"
+				AND type = "facebook"
 				AND active=1
 		');
 		if( $row->_items && $row->_items[0] ){

From 8b22049bed7646e8e686a0e52928f8d1b98cf918 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Wed, 6 Feb 2013 17:27:16 -0200
Subject: [PATCH 8/8] partial #13

Fixed the problem with orders's page after the user sign up with facebook.
---
 www/assets/js/app.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index c4d39a4f1..dc2c2acd6 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -2590,6 +2590,9 @@ App.signin.facebook.processStatus = function( session ){
 							if( App.currentPage == 'restaurant' && App.restaurant.permalink ){
 								App.page.restaurant( App.restaurant.permalink );
 							}
+							if( App.currentPage == 'orders' ){
+								App.page.orders()								
+							}
 						}
 					} );
 				}