aimeos / ai-admin-jqadm

admin/jqadm/src/Admin/JQAdm/Dashboard/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
 	 * @return \Aimeos\Admin\JQAdm\Iface Filter part implementing \Aimeos\Admin\JQAdm\Iface
 	 * @throws \Aimeos\Admin\JQAdm\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** admin/jqadm/dashboard/name
 		 * Class name of the used account favorite client implementation
@@ -65,22 +65,22 @@ 
 		 * @since 2016.01
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/dashboard/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/dashboard/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Dashboard\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JQAdm\\Dashboard\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JQAdm\\Dashboard\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'dashboard' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'dashboard');
 	}
 
 }

admin/jqadm/tests/Admin/JQAdm/Product/StandardTest.php

Spacing +145 added lines, -145 removed lines

@@ -17,21 +17,21 @@ 
 	protected function setUp()
 	{
 		$this->view = \TestHelperJqadm::getView();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $this->view, $request, '127.0.0.1', 'test' );
-		$this->view ->addHelper( 'request', $helper );
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($this->view, $request, '127.0.0.1', 'test');
+		$this->view ->addHelper('request', $helper);
 
 		$this->context = \TestHelperJqadm::getContext();
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Product\Standard( $this->context, $templatePaths );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JQAdm\Product\Standard($this->context, $templatePaths);
+		$this->object->setView($this->view);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
@@ -43,15 +43,15 @@ 
 
 	public function testCreateException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->create();
 	}
@@ -59,15 +59,15 @@ 
 
 	public function testCreateMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->create();
 	}
@@ -75,29 +75,29 @@ 
 
 	public function testCopy()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
 
-		$param = array( 'id' => $manager->findItem( 'CNC' )->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = array('id' => $manager->findItem('CNC')->getId());
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->copy();
 
-		$this->assertContains( 'CNC_copy', $result );
+		$this->assertContains('CNC_copy', $result);
 	}
 
 
 	public function testCopyException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->copy();
 	}
@@ -105,15 +105,15 @@ 
 
 	public function testCopyMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->copy();
 	}
@@ -121,21 +121,21 @@ 
 
 	public function testDelete()
 	{
-		$this->assertNull( $this->object->delete() );
+		$this->assertNull($this->object->delete());
 	}
 
 
 	public function testDeleteException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->delete();
 	}
@@ -143,15 +143,15 @@ 
 
 	public function testDeleteMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->delete();
 	}
@@ -159,29 +159,29 @@ 
 
 	public function testGet()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
 
-		$param = array( 'id' => $manager->findItem( 'CNC' )->getId() );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = array('id' => $manager->findItem('CNC')->getId());
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->get();
 
-		$this->assertContains( 'CNC', $result );
+		$this->assertContains('CNC', $result);
 	}
 
 
 	public function testGetException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->get();
 	}
@@ -189,15 +189,15 @@ 
 
 	public function testGetMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->get();
 	}
@@ -205,24 +205,24 @@ 
 
 	public function testGetViewException()
 	{
-		$object = new \Aimeos\Admin\JQAdm\Product\Standard( $this->context, array() );
+		$object = new \Aimeos\Admin\JQAdm\Product\Standard($this->context, array());
 
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$object->getView();
 	}
 
 
 	public function testSave()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'product/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->context, 'product/type');
 
 		$search = $typeManager->createSearch();
-		$search->setSlice( 0, 1 );
-		$typeItems = $typeManager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$typeItems = $typeManager->searchItems($search);
 
-		if( ( $typeItem = reset( $typeItems ) ) === false ) {
-			throw new \Exception( 'No product type item found' );
+		if (($typeItem = reset($typeItems)) === false) {
+			throw new \Exception('No product type item found');
 		}
 
 
@@ -235,42 +235,42 @@ 
 				'product.datestart' => null,
 				'product.dateend' => null,
 				'config' => array(
-					'key' => array( 0 => 'test key' ),
-					'val' => array( 0 => 'test value' ),
+					'key' => array(0 => 'test key'),
+					'val' => array(0 => 'test value'),
 				),
 			),
 		);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$this->object->save();
 
-		$manager->deleteItem( $manager->findItem( 'test' )->getId() );
+		$manager->deleteItem($manager->findItem('test')->getId());
 	}
 
 
 	public function testSaveException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
 		$name = 'AdminJQAdmStandard';
-		$this->context->getConfig()->set( 'mshop/product/manager/name', $name );
+		$this->context->getConfig()->set('mshop/product/manager/name', $name);
 
-		$mock = $this->getMockBuilder( '\Aimeos\MShop\Product\Manager\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'createItem' ) )
+		$mock = $this->getMockBuilder('\Aimeos\MShop\Product\Manager\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('createItem'))
 			->getMock();
 
-		$mock->expects( $this->exactly( 2 ) )->method( 'createItem' )
-			->will( $this->throwException( new \Exception() ) );
+		$mock->expects($this->exactly(2))->method('createItem')
+			->will($this->throwException(new \Exception()));
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock);
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -278,25 +278,25 @@ 
 
 	public function testSaveMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
 		$name = 'AdminJQAdmStandard';
-		$this->context->getConfig()->set( 'mshop/product/manager/name', $name );
+		$this->context->getConfig()->set('mshop/product/manager/name', $name);
 
-		$mock = $this->getMockBuilder( '\Aimeos\MShop\Product\Manager\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'createItem' ) )
+		$mock = $this->getMockBuilder('\Aimeos\MShop\Product\Manager\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('createItem'))
 			->getMock();
 
-		$mock->expects( $this->exactly( 2 ) )->method( 'createItem' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$mock->expects($this->exactly(2))->method('createItem')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock);
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -304,25 +304,25 @@ 
 
 	public function testSaveJQAdmException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
 		$name = 'AdminJQAdmStandard';
-		$this->context->getConfig()->set( 'mshop/product/manager/name', $name );
+		$this->context->getConfig()->set('mshop/product/manager/name', $name);
 
-		$mock = $this->getMockBuilder( '\Aimeos\MShop\Product\Manager\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'createItem' ) )
+		$mock = $this->getMockBuilder('\Aimeos\MShop\Product\Manager\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('createItem'))
 			->getMock();
 
-		$mock->expects( $this->exactly( 2 ) )->method( 'createItem' )
-			->will( $this->throwException( new \Aimeos\Admin\JQAdm\Exception() ) );
+		$mock->expects($this->exactly(2))->method('createItem')
+			->will($this->throwException(new \Aimeos\Admin\JQAdm\Exception()));
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Product\\Manager\\' . $name, $mock);
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -333,32 +333,32 @@ 
 		$param = array(
 			'site' => 'unittest', 'lang' => 'de',
 			'filter' => array(
-				'key' => array( 0 => 'product.code' ),
-				'op' => array( 0 => '==' ),
-				'val' => array( 0 => 'CNE' ),
+				'key' => array(0 => 'product.code'),
+				'op' => array(0 => '=='),
+				'val' => array(0 => 'CNE'),
 			),
-			'sort' => array( 'product.label', '-product.id' ),
+			'sort' => array('product.label', '-product.id'),
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->search();
 
-		$this->assertContains( '>CNE<', $result );
+		$this->assertContains('>CNE<', $result);
 	}
 
 
 	public function testSearchException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -366,15 +366,15 @@ 
 
 	public function testSearchMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Product\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Product\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -382,48 +382,48 @@ 
 
 	public function testGetSubClient()
 	{
-		$result = $this->object->getSubClient( 'image' );
-		$this->assertInstanceOf( '\Aimeos\Admin\JQAdm\Iface', $result );
+		$result = $this->object->getSubClient('image');
+		$this->assertInstanceOf('\Aimeos\Admin\JQAdm\Iface', $result);
 	}
 
 
 	public function testGetSubClientEmpty()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
-		$this->object->getSubClient( '' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
+		$this->object->getSubClient('');
 	}
 
 
 	public function testGetSubClientInvalid()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
-		$this->object->getSubClient( 'invalid' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
+		$this->object->getSubClient('invalid');
 	}
 
 
 	public function testGetSubClientDecorators()
 	{
-		$this->context->getConfig()->set( 'admin/jqadm/product/image/decorators/global', array( 'Cache' ) );
+		$this->context->getConfig()->set('admin/jqadm/product/image/decorators/global', array('Cache'));
 
-		$result = $this->object->getSubClient( 'image' );
-		$this->assertInstanceOf( '\Aimeos\Admin\JQAdm\Iface', $result );
+		$result = $this->object->getSubClient('image');
+		$this->assertInstanceOf('\Aimeos\Admin\JQAdm\Iface', $result);
 	}
 
 
 	public function testGetSubClientDecoratorInvalid()
 	{
-		$this->context->getConfig()->set( 'admin/jqadm/product/image/decorators/global', array( 'Invalid' ) );
+		$this->context->getConfig()->set('admin/jqadm/product/image/decorators/global', array('Invalid'));
 
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
-		$this->object->getSubClient( 'image' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
+		$this->object->getSubClient('image');
 	}
 
 
 	protected function getViewNoRender()
 	{
-		return $this->getMockBuilder( '\Aimeos\MW\View\Standard' )
-			->setConstructorArgs( array( array() ) )
-			->setMethods( array( 'render', 'config' ) )
+		return $this->getMockBuilder('\Aimeos\MW\View\Standard')
+			->setConstructorArgs(array(array()))
+			->setMethods(array('render', 'config'))
 			->getMock();
 	}
 }

admin/jqadm/tests/Admin/JQAdm/Dashboard/StandardTest.php

Spacing +29 added lines, -29 removed lines

@@ -19,55 +19,55 @@ 
 	protected function setUp()
 	{
 		$this->view = \TestHelperJqadm::getView();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $this->view, $request, '127.0.0.1', 'test' );
-		$this->view ->addHelper( 'request', $helper );
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($this->view, $request, '127.0.0.1', 'test');
+		$this->view ->addHelper('request', $helper);
 
 		$this->context = \TestHelperJqadm::getContext();
 		$templatePaths = \TestHelperJqadm::getTemplatePaths();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Dashboard\Standard( $this->context, $templatePaths );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JQAdm\Dashboard\Standard($this->context, $templatePaths);
+		$this->object->setView($this->view);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCreate()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$this->object->create();
 	}
 
 
 	public function testCopy()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$this->object->copy();
 	}
 
 
 	public function testDelete()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$this->object->delete();
 	}
 
 
 	public function testGet()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$this->object->get();
 	}
 
 
 	public function testSave()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$this->object->save();
 	}
 
@@ -76,21 +76,21 @@ 
 	{
 		$result = $this->object->search();
 
-		$this->assertContains( '<div class="dashboard">', $result );
+		$this->assertContains('<div class="dashboard">', $result);
 	}
 
 
 	public function testSearchException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Dashboard\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Dashboard\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -98,15 +98,15 @@ 
 
 	public function testSearchMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Dashboard\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Dashboard\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -114,16 +114,16 @@ 
 
 	public function testGetSubClient()
 	{
-		$result = $this->object->getSubClient( 'order' );
-		$this->assertInstanceOf( '\Aimeos\Admin\JQAdm\Iface', $result );
+		$result = $this->object->getSubClient('order');
+		$this->assertInstanceOf('\Aimeos\Admin\JQAdm\Iface', $result);
 	}
 
 
 	protected function getViewNoRender()
 	{
-		return $this->getMockBuilder( '\Aimeos\MW\View\Standard' )
-			->setConstructorArgs( array( array() ) )
-			->setMethods( array( 'render', 'config' ) )
+		return $this->getMockBuilder('\Aimeos\MW\View\Standard')
+			->setConstructorArgs(array(array()))
+			->setMethods(array('render', 'config'))
 			->getMock();
 	}
 }

admin/jqadm/src/Admin/JQAdm/Dashboard/Order/Standard.php

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
 	 * @category Developer
 	 */
 	private $subPartPath = 'admin/jqadm/dashboard/order/standard/subparts';
-	private $subPartNames = array( 'latest', 'paymentstatus' );
+	private $subPartNames = array('latest', 'paymentstatus');
 
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	public function copy()
 	{
-		throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be copied' );
+		throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be copied');
 	}
 
 
@@ -76,7 +76,7 @@ 
 	 */
 	public function create()
 	{
-		throw new \Aimeos\Admin\JQAdm\Exception( 'New resources can not be created' );
+		throw new \Aimeos\Admin\JQAdm\Exception('New resources can not be created');
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 */
 	public function delete()
 	{
-		throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be deleted' );
+		throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be deleted');
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 */
 	public function get()
 	{
-		throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be retrieved' );
+		throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be retrieved');
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function save()
 	{
-		throw new \Aimeos\Admin\JQAdm\Exception( 'The resource can not be modified' );
+		throw new \Aimeos\Admin\JQAdm\Exception('The resource can not be modified');
 	}
 
 
@@ -123,14 +123,14 @@ 
 		$view = $this->getView();
 		$view->orderBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->orderBody .= $client->search();
 		}
 
 		$tplconf = 'admin/jqadm/dashboard/order/template-list';
 		$default = 'dashboard/list-order-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -141,7 +141,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/dashboard/order/decorators/excludes
 		 * Excludes decorators added by the "common" option from the dashboard JQAdm client
@@ -216,7 +216,7 @@ 
 		 * @see admin/jqadm/dashboard/order/decorators/excludes
 		 * @see admin/jqadm/dashboard/order/decorators/global
 		 */
-		return $this->createSubClient( 'dashboard/order/' . $type, $name );
+		return $this->createSubClient('dashboard/order/' . $type, $name);
 	}
 
 
@@ -227,6 +227,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }

admin/jqadm/templates/common/page-default.php

Spacing +39 added lines, -39 removed lines

@@ -8,19 +8,19 @@ 
 $enc = $this->encoder();
 
 $target = $this->request()->getTarget();
-$cntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', array() );
+$cntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', array());
 
-$jsonTarget = $this->config( 'admin/jsonadm/url/options/target' );
-$jsonCntl = $this->config( 'admin/jsonadm/url/options/controller', 'Jsonadm' );
-$jsonAction = $this->config( 'admin/jsonadm/url/options/action', 'options' );
-$jsonConfig = $this->config( 'admin/jsonadm/url/options/config', array() );
+$jsonTarget = $this->config('admin/jsonadm/url/options/target');
+$jsonCntl = $this->config('admin/jsonadm/url/options/controller', 'Jsonadm');
+$jsonAction = $this->config('admin/jsonadm/url/options/action', 'options');
+$jsonConfig = $this->config('admin/jsonadm/url/options/config', array());
 
-$extTarget = $this->config( 'admin/extjs/url/target' );
-$extCntl = $this->config( 'admin/extjs/url/controller', 'Extadm' );
-$extAction = $this->config( 'admin/extjs/url/action', 'index' );
-$extConfig = $this->config( 'admin/extjs/url/config', array() );
+$extTarget = $this->config('admin/extjs/url/target');
+$extCntl = $this->config('admin/extjs/url/controller', 'Extadm');
+$extAction = $this->config('admin/extjs/url/action', 'index');
+$extConfig = $this->config('admin/extjs/url/config', array());
 
 /** admin/jqadm/resources
  * List of available resource clients in the JQAdm interface
@@ -32,18 +32,18 @@ 
  * @since 2016.07
  * @category Developer
  */
-$resourceList = $this->config( 'admin/jqadm/resources', array( 'dashboard', 'product' ) );
+$resourceList = $this->config('admin/jqadm/resources', array('dashboard', 'product'));
 
-$site = $this->param( 'site' );
-$extParams = array( 'site' => $site, 'lang' => $this->param( 'lang' ) );
+$site = $this->param('site');
+$extParams = array('site' => $site, 'lang' => $this->param('lang'));
 
-$params = $this->get( 'pageParams', array() );
-$params['resource'] = $this->param( 'resource', 'dashboard' );
-$params['site'] = $this->param( 'site', 'default' );
-$params['id'] = $this->param( 'id', '' );
+$params = $this->get('pageParams', array());
+$params['resource'] = $this->param('resource', 'dashboard');
+$params['site'] = $this->param('site', 'default');
+$params['id'] = $this->param('id', '');
 
 ?>
-<div class="aimeos" data-url="<?php echo $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, array( 'site' => $site, 'resource' => '', 'id' => '' ), array(), $jsonConfig ) ); ?>">
+<div class="aimeos" data-url="<?php echo $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, array('site' => $site, 'resource' => '', 'id' => ''), array(), $jsonConfig)); ?>">
 
 	<nav class="navbar navbar-full">
 		<a class="navbar-brand" href="https://aimeos.org/update/?type={type}&version={version}">
@@ -55,10 +55,10 @@ 
 		<div class="collapse navbar-toggleable-xs" id="collapse-navbar">
 			<ul class="nav navbar-nav">
 
-<?php if( $this->access( 'admin' ) ) : ?>
+<?php if ($this->access('admin')) : ?>
 				<li class="nav-item mode active">
-					<a class="nav-link" href="<?php echo $enc->attr( $this->url( $extTarget, $extCntl, $extAction, $extParams, array(), $extConfig ) ); ?>">
-						<?php echo $enc->html( $this->translate( 'admin', 'Expert mode' ) ); ?>
+					<a class="nav-link" href="<?php echo $enc->attr($this->url($extTarget, $extCntl, $extAction, $extParams, array(), $extConfig)); ?>">
+						<?php echo $enc->html($this->translate('admin', 'Expert mode')); ?>
 					</a>
 				</li>
 <?php endif; ?>
@@ -66,13 +66,13 @@ 
 				<li class="nav-item resource">
 					<div class="btn-group">
 						<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<?php echo $enc->attr( $this->translate( 'admin', $this->param( 'resource' ) ) ); ?>
+							<?php echo $enc->attr($this->translate('admin', $this->param('resource'))); ?>
 						</button>
 						<div class="dropdown-menu">
-<?php foreach( $resourceList as $code ) : ?>
+<?php foreach ($resourceList as $code) : ?>
 							<a class="dropdown-item"
-								href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'resource' => $code ) + $params, array(), $config ) ); ?>">
-								<?php echo $enc->html( $this->translate( 'admin', $code ) ); ?>
+								href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('resource' => $code) + $params, array(), $config)); ?>">
+								<?php echo $enc->html($this->translate('admin', $code)); ?>
 							</a>
 <?php endforeach; ?>
 						</div>
@@ -82,31 +82,31 @@ 
 				<li class="nav-item language">
 					<div class="btn-group">
 						<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<?php echo $enc->attr( $this->param( 'lang', $this->translate( 'admin', 'Language' ) ) ); ?>
+							<?php echo $enc->attr($this->param('lang', $this->translate('admin', 'Language'))); ?>
 						</button>
 						<div class="dropdown-menu">
-<?php foreach( $this->get( 'languagesList', array() ) as $langid ) : ?>
+<?php foreach ($this->get('languagesList', array()) as $langid) : ?>
 							<a class="dropdown-item"
-								href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'lang' => $langid ) + $params, array(), $config ) ); ?>">
-								<?php echo $enc->html( $langid ); ?>
+								href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('lang' => $langid) + $params, array(), $config)); ?>">
+								<?php echo $enc->html($langid); ?>
 							</a>
 <?php endforeach; ?>
 						</div>
 					</div>
 				</li>
 
-<?php if( $this->access( 'admin' ) ) : ?>
-<?php	$sites = $this->get( 'sitesList', array() ); ?>
+<?php if ($this->access('admin')) : ?>
+<?php	$sites = $this->get('sitesList', array()); ?>
 				<li class="nav-item site">
 					<div class="btn-group">
 						<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<?php echo $enc->attr( $this->value( $sites, $site, $this->translate( 'admin', 'Site' ) ) ); ?>
+							<?php echo $enc->attr($this->value($sites, $site, $this->translate('admin', 'Site'))); ?>
 						</button>
 						<div class="dropdown-menu">
-<?php	foreach( $sites as $code => $label ) : ?>
+<?php	foreach ($sites as $code => $label) : ?>
 							<a class="dropdown-item"
-								href="<?php echo $enc->attr( $this->url( $target, $cntl, $action, array( 'site' => $code ) + $params, array(), $config ) ); ?>">
-								<?php echo $enc->html( $label ); ?>
+								href="<?php echo $enc->attr($this->url($target, $cntl, $action, array('site' => $code) + $params, array(), $config)); ?>">
+								<?php echo $enc->html($label); ?>
 							</a>
 <?php	endforeach; ?>
 						</div>
@@ -121,12 +121,12 @@ 
 
 	<div class="container">
 
-<?php echo $this->partial( $this->config( 'admin/jqadm/partial/error', 'common/partials/error-default.php' ), array( 'errors' => $this->get( 'errors', array() ) ) ); ?>
+<?php echo $this->partial($this->config('admin/jqadm/partial/error', 'common/partials/error-default.php'), array('errors' => $this->get('errors', array()))); ?>
 
-<?php echo $this->block()->get( 'jqadm_content' ); ?>
+<?php echo $this->block()->get('jqadm_content'); ?>
 
 	</div>
 
-<?php echo $this->partial( $this->config( 'admin/jqadm/partial/confirm', 'common/partials/confirm-default.php' ) ); ?>
+<?php echo $this->partial($this->config('admin/jqadm/partial/confirm', 'common/partials/confirm-default.php')); ?>
 
 </div>

admin/jqadm/templates/dashboard/item-order-latest-default.php

Spacing +23 added lines, -23 removed lines

@@ -5,53 +5,53 @@ 
  * @copyright Aimeos (aimeos.org), 2015
  */
 
-$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat )
+$price = function(array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat)
 {
-	if( isset( $orders[$item->getBaseId()] ) )
+	if (isset($orders[$item->getBaseId()]))
 	{
 		$price = $orders[$item->getBaseId()]->getPrice();
-		return sprintf( $priceFormat, $price->getValue(), $price->getCurrencyId() );
+		return sprintf($priceFormat, $price->getValue(), $price->getCurrencyId());
 	}
 };
 
-$status = function( $list, $key )
+$status = function($list, $key)
 {
-	return ( isset( $list[$key] ) ? $list[$key] : '' );
+	return (isset($list[$key]) ? $list[$key] : '');
 };
 
 
 $enc = $this->encoder();
-$orders = $this->get( 'orderlatestOrders', array() );
+$orders = $this->get('orderlatestOrders', array());
 /// price format with value (%1$s) and currency (%2$s)
-$priceFormat = $this->translate( 'admin', '%1$s %2$s' );
+$priceFormat = $this->translate('admin', '%1$s %2$s');
 
 $statuslist = array(
-	Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED => $this->translate( 'admin', 'pay:unfinished' ),
-	Aimeos\MShop\Order\Item\Base::PAY_DELETED => $this->translate( 'admin', 'pay:deleted' ),
-	Aimeos\MShop\Order\Item\Base::PAY_CANCELED => $this->translate( 'admin', 'pay:canceled' ),
-	Aimeos\MShop\Order\Item\Base::PAY_REFUSED => $this->translate( 'admin', 'pay:refused' ),
-	Aimeos\MShop\Order\Item\Base::PAY_REFUND => $this->translate( 'admin', 'pay:refund' ),
-	Aimeos\MShop\Order\Item\Base::PAY_PENDING => $this->translate( 'admin', 'pay:pending' ),
-	Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED => $this->translate( 'admin', 'pay:authorized' ),
-	Aimeos\MShop\Order\Item\Base::PAY_RECEIVED => $this->translate( 'admin', 'pay:received' ),
+	Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED => $this->translate('admin', 'pay:unfinished'),
+	Aimeos\MShop\Order\Item\Base::PAY_DELETED => $this->translate('admin', 'pay:deleted'),
+	Aimeos\MShop\Order\Item\Base::PAY_CANCELED => $this->translate('admin', 'pay:canceled'),
+	Aimeos\MShop\Order\Item\Base::PAY_REFUSED => $this->translate('admin', 'pay:refused'),
+	Aimeos\MShop\Order\Item\Base::PAY_REFUND => $this->translate('admin', 'pay:refund'),
+	Aimeos\MShop\Order\Item\Base::PAY_PENDING => $this->translate('admin', 'pay:pending'),
+	Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED => $this->translate('admin', 'pay:authorized'),
+	Aimeos\MShop\Order\Item\Base::PAY_RECEIVED => $this->translate('admin', 'pay:received'),
 );
 
 ?>
 <div class="order-latest card panel">
 	<div id="order-latest-head" class="header card-header">
-		<?php echo $enc->html( $this->translate( 'admin', 'Latest orders' ) ); ?>
+		<?php echo $enc->html($this->translate('admin', 'Latest orders')); ?>
 	</div>
 	<div id="order-latest-data" class="content card-block">
 		<div class="table-responsive">
 			<table class="list-items table table-hover">
 				<tbody>
-		<?php foreach( $this->get( 'orderlatestItems', array() ) as $id => $item ) : ?>
+		<?php foreach ($this->get('orderlatestItems', array()) as $id => $item) : ?>
 					<tr>
-						<td class="order.id"><?php echo $enc->html( $item->getId() ); ?></td>
-						<td class="order.type"><?php echo $enc->html( $item->getType() ); ?></td>
-						<td class="order.datepayment"><?php echo $enc->html( $item->getDatePayment() ); ?></td>
-						<td class="order.statuspayment"><?php echo $enc->html( $status( $statuslist, $item->getPaymentStatus() ) ); ?></td>
-						<td class="order.base.price"><?php echo $enc->html( $price( $orders, $item, $priceFormat ) ); ?></td>
+						<td class="order.id"><?php echo $enc->html($item->getId()); ?></td>
+						<td class="order.type"><?php echo $enc->html($item->getType()); ?></td>
+						<td class="order.datepayment"><?php echo $enc->html($item->getDatePayment()); ?></td>
+						<td class="order.statuspayment"><?php echo $enc->html($status($statuslist, $item->getPaymentStatus())); ?></td>
+						<td class="order.base.price"><?php echo $enc->html($price($orders, $item, $priceFormat)); ?></td>
 					</tr>
 		<?php endforeach; ?>
 				</tbody>
@@ -59,4 +59,4 @@ 
 		</div>
 	</div>
 </div>
-<?php echo $this->get( 'orderlatestBody' ); ?>
+<?php echo $this->get('orderlatestBody'); ?>