From ef908f7fed23be5dab66fadefadb60ff7cbb302f Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Fri, 4 Jul 2014 17:41:05 -0300
Subject: [PATCH] travis fixed

---
 include/library/Cockpit/Admin.php      | 4 ----
 include/library/Crunchbutton/Admin.php | 4 ++++
 travis/Tests/SettlementTest.php        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/library/Cockpit/Admin.php b/include/library/Cockpit/Admin.php
index 94b0769ff..53136cfa4 100644
--- a/include/library/Cockpit/Admin.php
+++ b/include/library/Cockpit/Admin.php
@@ -24,8 +24,4 @@ class Cockpit_Admin extends Crunchbutton_Admin {
 		return false;
 	}
 
-	public function payment_type(){
-		return Crunchbutton_Admin_Payment_Type::byAdmin( $this->id_admin );
-	}
-
 }
\ No newline at end of file
diff --git a/include/library/Crunchbutton/Admin.php b/include/library/Crunchbutton/Admin.php
index 172c1b874..67c27bd6b 100644
--- a/include/library/Crunchbutton/Admin.php
+++ b/include/library/Crunchbutton/Admin.php
@@ -17,6 +17,10 @@ class Crunchbutton_Admin extends Cana_Table {
 		];
 	}
 
+	public function payment_type(){
+		return Crunchbutton_Admin_Payment_Type::byAdmin( $this->id_admin );
+	}
+
 	public function validateLogin( $login, $increment = 0 ){
 		$test = $login . ( $increment > 0 ? $increment : '' );
 		$admin = Crunchbutton_Admin::login( $test, true );
diff --git a/travis/Tests/SettlementTest.php b/travis/Tests/SettlementTest.php
index 0df7dc6f7..4b032b078 100644
--- a/travis/Tests/SettlementTest.php
+++ b/travis/Tests/SettlementTest.php
@@ -49,7 +49,7 @@ class SettlementTest extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testDriversMath() {
-		$calc = $this->settlement->driversProcessOrders( $this->driver_orders );
+		$calc = $this->settlement->driversProcess( $this->driver_orders );
 		$calc = $calc[ 0 ];
 		$this->assertEquals( $calc[ 'subtotal' ], 29.91 );
 		$this->assertEquals( $calc[ 'tax' ], 2.25 );