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

travis fixed

Browse Source
This commit is contained in:
Daniel Camargo 2014-07-04 17:41:05 -03:00
parent 1a2317e993
commit ef908f7fed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/library/Cockpit/Admin.php
View File

@ -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 );
}
}

4
include/library/Crunchbutton/Admin.php
View File

@ -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 );

2
travis/Tests/SettlementTest.php
View File

@ -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 );