Refatoração do template base

jefersondaniel · Mar 15, 2015 · 7ad25d2 · 7ad25d2
1 parent 2f97d46
commit 7ad25d2
Show file tree

Hide file tree

Showing 5 changed files with 653 additions and 527 deletions.
diff --git a/src/NovoBoletoPHP/BancoDoBrasil/BoletoBB.php → src/NovoBoletoPHP/BancoDoBrasil/Boleto.php b/src/NovoBoletoPHP/BancoDoBrasil/BoletoBB.php → src/NovoBoletoPHP/BancoDoBrasil/Boleto.php
@@ -1,17 +1,23 @@
 <?php
 namespace NovoBoletoPHP\BancoDoBrasil;
 
-use \NovoBoletoPHP\Base\Boleto;
+use \NovoBoletoPHP\Base\Boleto as BoletoBase;
 use \NovoBoletoPHP\FormatterHelper;
 
-class BoletoBB extends Boleto {
+class Boleto extends BoletoBase {
     public function getTemplate()
     {
         return 'bancos/layout_bb.html';
     }
 
+    public function getLogoBanco() {
+        return 'logobb.jpg';
+    }
+
     protected function filterData(array $dadosboleto)
     {
+        $dadosboleto = parent::filterData($dadosboleto);
+
         $tamanhoNumeroConvenio = strlen($dadosboleto['convenio']);
         $tamanhoNossoNumero = strlen($dadosboleto['nosso_numero']);
 

diff --git a/src/NovoBoletoPHP/Base/Boleto.php b/src/NovoBoletoPHP/Base/Boleto.php
@@ -17,8 +17,9 @@ protected function configure()
 
     }
 
-    protected function filterData(array $dadosboleto)
+    protected function filterData(array $data)
     {
+        $data['logo_banco'] = $this->getLogoBanco();
         return $data;
     }
 
@@ -27,6 +28,10 @@ public function getTemplate()
         return 'layout_base.html';
     }
 
+    public function getLogoBanco() {
+        return 'logobb.jpg';
+    }
+
     public function asHTML()
     {
         return $this->twig->render($this->getTemplate(), $this->data);

diff --git a/src/NovoBoletoPHP/BoletoFactory.php b/src/NovoBoletoPHP/BoletoFactory.php
@@ -31,15 +31,15 @@ public function __construct(array $config = array())
         ));
 
         $this->layouts = array(
-            self::BANCO_DO_BRASIL => '\NovoBoletoPHP\BancoDoBrasil\BoletoBB'
+            self::BANCO_DO_BRASIL => '\NovoBoletoPHP\BancoDoBrasil\Boleto',
         );
 
         $this->configure();
     }
 
     public function configure()
     {
-        $this->twig->addFunction(new \Twig_SimpleFunction('imageUrl', array($this, 'makeImageUrl'), array(
+        $this->twig->addFilter(new \Twig_SimpleFilter('imageUrl', array($this, 'makeImageUrl'), array(
             'is_safe' => array('html')
         )));
         $this->twig->addFilter(new \Twig_SimpleFilter('barcode', array($this, 'barcode'), array(