From 7669b00dcd2bd71cae8cc0f72afa2b919a0e7b5e Mon Sep 17 00:00:00 2001
From: Rafael Ferreira Silva <rafael@rafaelsilva.net>
Date: Wed, 24 Aug 2011 11:06:38 -0300
Subject: [PATCH] Issue #1203372: Implemented the Boleto library.

---
 LICENSE.txt       |  274 +++++++++++++++++++++++++++++++++++
 README.txt        |   56 +++++++
 uc_boleto.info    |    2 +-
 uc_boleto.install |    7 +
 uc_boleto.module  |  412 ++++++++++++++++++++++++++++++++++-------------------
 5 files changed, 606 insertions(+), 145 deletions(-)
 create mode 100644 LICENSE.txt
 create mode 100644 README.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..2c095c8
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,274 @@
+GNU GENERAL PUBLIC LICENSE
+
+              Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+                  Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+           GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+               MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+               NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+          END OF TERMS AND CONDITIONS
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..12b1f6e
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,56 @@
+Ubercart Boleto Payment gateway
+-------------------------------
+
+This modulo provides a Brazilian payment gateway known as Boleto. It's a 44 digit barcoded document accepted by banks for paying bills.
+
+Prerequisites
+-------------
+
+This module is intended to be used with Ubercart, so it rely on it. It also needs you have Ubercart cart and payment modules enabled.
+This module also uses an external library called Boleto available at https://github.com/drupalista-br/Boleto because of that, this module also depends on Libraries module.
+
+Installation
+------------
+
+You must have Ubercart payment and cart modules enabled in order to use Ubercart Boleto.
+
+* Download Ubercart Boleto at your site module's folder (e.g sites/all/modules)
+* Download Libraries modules at your site module's folder
+* Download Boleto library from Github repository and place it on libraries folder (e.g sites/libraries/boleto-lib). Please note your MUST use only the boleto-lib folder, and not the whole Boleto project.
+* Enable both Ubercart Boleto and Libraries through your Drupal modules interface
+
+Configuration
+-------------
+
+Once all modules are enabled you must configure your store payment options to accept Boleto.
+First of all you have to access your store payment configuration form at admin/store/settings/payment/edit/methods
+You must first mark the checkbox for Boleto in Payment Methods defining its weight as you want.
+
+Note that every setting here will affect EVERY boleto your users print.
+
+Then you must configure the Boleto's options. Here is a short description of every field:
+
+* Bank - You must choose wich bank you want to use. Note that the banks available depends on which banks you've downloaded at Boleto's library banks folder.
+* Agency - The bank agency number
+* Client Code - The bank account number
+* Wallet - The wallet your bank specifies to you
+* Our number - A number given by your bank to be used for boleto's emittion
+* Wallet of your number - Some banks use this information. If not, fill it with 0
+* Initial document number - If you already have used a boleto system you must have a sequence number to add here
+* Transaction tax - Some banks may charge every boleto a tax, if it's the case, fill this value in this field
+* Demonstractive - Up to 3 lines of text to be presented at the boleto. This should be a demonstration of what is being paid. This is a free field form.
+* Instructions - Up to 4 lines of text to be presented at the boleto. This should be instructions to your client on how to pay the boleto and etc.
+* Due - Options for payment date. You can use a timespan or a fixed date.
+* Company Info - The company name and id (in Brazil CNPJ). This data will be printed as well on your boleto.
+
+Usage
+-----
+
+Once everything is poperly configured, your users may choose Boleto as a payment method when they buy at your store. At the end, they can go to their order summary and print a boleto at the payment method box.
+There will be a link called "Access / print Boleto" wich will print the boleto itself.
+
+Credits
+-------
+
+The original module was written by Lourenzo Ferreira. The integration with Boleto library was written by Rafael Ferreira Silva (aka rfsbsb).
+The Boleto library is written by Francisco Luz (aka drupalista-br).
diff --git a/uc_boleto.info b/uc_boleto.info
index 77e0228..5b79973 100644
--- a/uc_boleto.info
+++ b/uc_boleto.info
@@ -5,5 +5,5 @@ package = "Ubercart - payment"
 
 dependencies[] = uc_cart
 dependencies[] = uc_payment
-dependencies[] = date_api
+dependencies[] = libraries
 php = 5.0
diff --git a/uc_boleto.install b/uc_boleto.install
index 20941ab..b554425 100644
--- a/uc_boleto.install
+++ b/uc_boleto.install
@@ -1,6 +1,13 @@
 <?php
 
 /**
+ * @file
+ * Installation operations for uc_boleto
+ *
+ *
+ */
+
+/**
  * Implementation of hook_uninstall().
  */
 function uc_boleto_uninstall() {
diff --git a/uc_boleto.module b/uc_boleto.module
index 13f52a0..2833138 100644
--- a/uc_boleto.module
+++ b/uc_boleto.module
@@ -23,8 +23,6 @@ function uc_boleto_menu() {
     'access arguments' => array('access content'),
   );
 
-  
-
   return $items;
 }
 
@@ -37,7 +35,7 @@ function uc_boleto_theme() {
     'boleto_santander' => array(
       'arguments' => array('dadosboleto' => NULL),
       'template' => 'santander',
-      'path' => drupal_get_path('module', 'uc_boleto').'/bancos/',
+      'path' => drupal_get_path('module', 'uc_boleto') .'/banks/',
     ),
   );
 }
@@ -48,17 +46,17 @@ function uc_boleto_theme() {
  */
 function uc_boleto_payment_method() {
   $methods[] = array(
-		'id' => 'boleto',
-		'name' => t('Boleto'),
-		'title' => t('Bank Boleto'),
-		'desc' => t('Pay with Bank Boleto'),
-		'callback' => 'uc_boleto_method_boleto',
-		'weight' => 0,
-		'checkout' => TRUE,
+    'id' => 'boleto',
+    'name' => t('Boleto'),
+    'title' => t('Bank Boleto'),
+    'desc' => t('Pay with Bank Boleto'),
+    'callback' => 'uc_boleto_method_boleto',
+    'weight' => 0,
+    'checkout' => TRUE,
     'no_gateway' => TRUE,
-	);
-	
-	return $methods;
+  );
+
+  return $methods;
 }
 
 /**
@@ -92,142 +90,208 @@ function uc_boleto_token_values($type, $object = NULL) {
 function _uc_boleto_link($order, $text=NULL) {
   $path = 'uc_boleto/'. md5($order->order_id . $order->primary_email);
   if (empty($text)) {
-    $text = url($path, array('absolute' => TRUE)); 
+    $text = url($path, array('absolute' => TRUE));
   }
   return l($text, $path, array('absolute' => TRUE, 'attributes' => array('target' => '_blank')));
 }
 
-
+/*
+  Get all avaible banks provided by boleto-lib
+*/
+function uc_boleto_available_banks() {
+  $path = libraries_get_path('boleto-lib')."/bancos";
+  $banks = array('' => t('- Please choose -'));
+  if (file_exists($path)) {
+    $bancos = scandir($path);
+    foreach ($bancos as $banco) {
+      if ($banco[0] != "." && is_numeric($banco)){
+        $file = $path."/".$banco."/Banco_".$banco.".php";
+        if (file_exists($file)) {
+          $banco_contents = file_get_contents($file);
+          //getting bank name and populate array
+          preg_match("/bank_name[ ]*?=[ ]*?'([a-zA-Z&;. \/]*)';/", $banco_contents, $matches);
+          if (sizeof($matches) > 0) {
+            $banks[$banco] = drupal_html_to_text($matches[1]);
+          }
+        }
+      }
+    }
+  }
+	return $banks;
+}
 
 
 /**
  * Handle Boleto Payment
  */
 function uc_boleto_method_boleto($op, &$arg1) {
-  watchdog('uc_boleto',"$op\n<br/>\n<pre>".print_r(debug_backtrace(),TRUE)."</pre>");
+
   switch ($op) {
-  	case 'cart-details':
-  	  return t('Your order will be complete as soon as you pay the boleto and we receive the payment confirmation from the bank');
-  	  break;
-  	case 'cart-review':
-  	  break;
-  	case 'order-view':
-  	  return "Gerar Boleto General";
-  	  break;
-  	case 'customer-view':
-  	  return _uc_boleto_link($arg1, t('Access / print Boleto'));
-  	  break;
-  	case 'settings': // Return a Form
-  	  
-  	  $form['uc_boleto_bank'] = array(
-  	    '#type' => 'select',
-  	    '#title' => t('Bank'),
-  	    '#multiple' => FALSE,
-  	    '#description' => t('Select the bank you\'ll use for transactions'),
-  	    '#options' => array('' => '--','santander' => 'Santander - Banespa'),
-  	    '#default_value' => variable_get('uc_boleto_bank',-1),
-  	  );
-  	  
-  	  // @todo: allow other banks
-  	  // @todo: allow selection of wallet based on selected bank
-  	  
-  	  
-  	  $form['uc_boleto_branch'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Branch'),
-  	    '#description' => t('Inform the company\'s bank account branch number'),
-  	    '#size' => 10,
-  	    '#maxlength' => 10,
-  	    '#default_value' => variable_get('uc_boleto_branch',''),
-  	  );
-  	  $form['uc_boleto_account_number'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Client Code (PSK)'),
-  	    '#description' => t('Inform the company\'s bank account number'),
-  	    '#size' => 16,
-  	    '#maxlength' => 16,
-  	    '#default_value' => variable_get('uc_boleto_account_number','')
-  	  );
-  	  
-  	  $form['uc_boleto_initial_doc_num'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Initial Document Number'),
-  	    '#description' => t('If account received previous payments, insert the last number here to avoid duplicate numbers'),
-  	    '#size' => 6,
-  	    '#maxlength' => 5,
-  	    '#default_value' => variable_get('uc_boleto_initial_doc_num',0)
-  	  );
-  	  
-  	  $form['uc_boleto_transaction_tax'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Transaction Tax'),
-  	    '#description' => t('How much you pay for each transaction i.e. 2.50'),
-  	    '#size' => 6,
-  	    '#maxlength' => 5,
-  	    '#default_value' => variable_get('uc_boleto_transaction_tax',0)
-  	  );
-  	  
-  	  $form['due'] = array(
-  	    '#type' => 'fieldset',
-  	    '#title' => t('Due'),
-  	    '#description' => t('Due Date Settings'),
-  	    '#collapsible' => FALSE,
-  	    '#collapsed' => FALSE,
-  	  );
-  	  
-  	  $form['due']['uc_boleto_term_days'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Term Days'),
-  	    '#description' => t('How many days after the processing the boleto will be payable. Setting this value as 0 will set the boletos due date to the processing date'),
-  	    '#size' => 40,
-  	    '#maxlength' => 255,
-  	    '#default_value' => variable_get('uc_boleto_term_days',0),
-  	  );
-  	  
-  	  $form['due']['uc_boleto_use_due_date'] = array(
-  	    '#type' => 'checkbox',
-  	    '#title' => t('Use Absolute Due Date'),
-  	    '#default_value' => variable_get('uc_boleto_use_due_date',0),
-  	  );
-  	  
-  	  // @todo: Hide if not in use
-  	  $form['due']['uc_boleto_due_date'] = array(
-  	    '#type' => 'date',
-  	    '#title' => t('Due Date'),
-  	    '#description' => t('Use to set an absolute term for payments. Useful for event subscriptions.'),
-  	    '#default_value' => variable_get('uc_boleto_due_date',array()),
-  	  );
-  	  
-  	  $form['company_info'] = array(
-  	    '#type' => 'fieldset',
-  	    '#title' => t('Company Info'),
-  	    '#collapsible' => FALSE,
-  	    '#collapsed' => FALSE,
-  	  );
-  	  
-  	  $form['company_info']['uc_boleto_company_name'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Company Name'),
-  	    '#description' => t('Full Company Identificator'),
-  	    '#size' => 40,
-  	    '#maxlength' => 255,
-  	    '#default_value' => variable_get('uc_boleto_company_name',''),
-  	  );
-  	  
-  	  $form['company_info']['uc_boleto_company_id'] = array(
-  	    '#type' => 'textfield',
-  	    '#title' => t('Company Document Number'),
-  	    '#description' => t('CNPJ/CPF'),
-  	    '#size' => 40,
-  	    '#maxlength' => 255,
-  	    '#default_value' => variable_get('uc_boleto_company_id',''),
-  	  );
-  	  
-  	  // @todo: Allow configuration of Company Data and Instructions
-  	  
-  	  return $form;
-  	  break;
-  	
+    case 'cart-details':
+      return t('Your order will be complete as soon as you pay the boleto and we receive the payment confirmation from the bank');
+      break;
+    case 'cart-review':
+      break;
+    case 'order-view':
+      return "Gerar Boleto General";
+      break;
+    case 'customer-view':
+      return _uc_boleto_link($arg1, t('Access / print Boleto'));
+      break;
+    case 'settings': // Return a Form
+
+      $form['uc_boleto_bank'] = array(
+        '#type' => 'select',
+        '#title' => t('Bank'),
+        '#multiple' => FALSE,
+        '#description' => t('Select the bank you\'ll use for transactions'),
+        '#options' => uc_boleto_available_banks(),
+        '#default_value' => variable_get('uc_boleto_bank', -1),
+      );
+
+      // @todo: allow other banks
+      // @todo: allow selection of wallet based on selected bank
+
+      $form['uc_boleto_agency'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Agency'),
+        '#description' => t('Inform the company\'s bank agency number. If exists inform the DV separated with a dash. E.g: 1234-5'),
+        '#size' => 16,
+        '#maxlength' => 16,
+        '#default_value' => variable_get('uc_boleto_agency', '')
+      );
+
+      $form['uc_boleto_account_number'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Client Code (PSK)'),
+        '#description' => t('Inform the company\'s bank account number. If exists inform the DV separated with a dash. E.g: 123456-7'),
+        '#size' => 16,
+        '#maxlength' => 16,
+        '#default_value' => variable_get('uc_boleto_account_number', '')
+      );
+
+      $form['uc_boleto_wallet'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Wallet'),
+        '#description' => t('Inform the wallet number. Don\'t forget the leading zero.'),
+        '#size' => 3,
+        '#maxlength' => 3,
+        '#default_value' => variable_get('uc_boleto_wallet', ''),
+      );
+
+      $form['uc_boleto_our_number'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Our Number'),
+        '#description' => t('The number the bank uses to identify you. Don\'t fill up any DV if exists. '),
+        '#size' => 16,
+        '#maxlength' => 16,
+        '#default_value' => variable_get('uc_boleto_our_number', ''),
+      );
+
+      $form['uc_boleto_wallet_our_number'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Wallet of our number'),
+        '#description' => t('If your bank indicate a different wallet for the \'our number\' fill it here.'),
+        '#size' => 3,
+        '#maxlength' => 3,
+        '#default_value' => variable_get('uc_boleto_wallet_our_number', ''),
+      );
+
+      $form['uc_boleto_initial_doc_num'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Initial Document Number'),
+        '#description' => t('If account received previous payments, insert the last number here to avoid duplicate numbers'),
+        '#size' => 6,
+        '#maxlength' => 5,
+        '#default_value' => variable_get('uc_boleto_initial_doc_num', 0)
+      );
+
+      $form['uc_boleto_transaction_tax'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Transaction Tax'),
+        '#description' => t('How much you pay for each transaction i.e. 2.50'),
+        '#size' => 6,
+        '#maxlength' => 5,
+        '#default_value' => variable_get('uc_boleto_transaction_tax', 0)
+      );
+
+      $form['uc_boleto_demonstrative'] = array(
+        '#type' => 'textarea',
+        '#title' => t('Demonstrative'),
+        '#description' => t('Maximum 3 lines of text used to fill the "Demonstrativo" field.'),
+        '#size' => 40,
+        '#maxlength' => 255,
+        '#default_value' => variable_get('uc_boleto_demonstrative', ''),
+      );
+
+      $form['uc_boleto_instructions'] = array(
+        '#type' => 'textarea',
+        '#title' => t('Instructions'),
+        '#description' => t('Maximum 4 lines of text used to fill the "Instruções" field.'),
+        '#size' => 40,
+        '#maxlength' => 255,
+        '#default_value' => variable_get('uc_boleto_demonstrative', ''),
+      );
+
+      $form['due'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Due'),
+        '#description' => t('Due Date Settings'),
+        '#collapsible' => FALSE,
+        '#collapsed' => FALSE,
+      );
+
+      $form['due']['uc_boleto_term_days'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Term Days'),
+        '#description' => t('How many days after the processing the boleto will be payable. Setting this value as 0 will set the boletos due date to the processing date'),
+        '#size' => 40,
+        '#maxlength' => 255,
+        '#default_value' => variable_get('uc_boleto_term_days', 0),
+      );
+
+      $form['due']['uc_boleto_use_due_date'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Use Absolute Due Date'),
+        '#default_value' => variable_get('uc_boleto_use_due_date', 0),
+      );
+
+      // @todo: Hide if not in use
+      $form['due']['uc_boleto_due_date'] = array(
+        '#type' => 'date',
+        '#title' => t('Due Date'),
+        '#description' => t('Use to set an absolute term for payments. Useful for event subscriptions.'),
+        '#default_value' => variable_get('uc_boleto_due_date', array()),
+      );
+
+      $form['company_info'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Company Info'),
+        '#collapsible' => FALSE,
+        '#collapsed' => FALSE,
+      );
+
+      $form['company_info']['uc_boleto_company_name'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Company Name'),
+        '#description' => t('Full Company Identificator'),
+        '#size' => 40,
+        '#maxlength' => 255,
+        '#default_value' => variable_get('uc_boleto_company_name', ''),
+      );
+
+      $form['company_info']['uc_boleto_company_id'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Company Document Number'),
+        '#description' => t('CNPJ/CPF'),
+        '#size' => 40,
+        '#maxlength' => 255,
+        '#default_value' => variable_get('uc_boleto_company_id', ''),
+      );
+
+      return $form;
+      break;
+
   }
 }
 
@@ -236,13 +300,73 @@ function uc_boleto_method_boleto($op, &$arg1) {
  * Generate the boleto
  */
 function uc_boleto_view($hash) {
-  $order_id = db_result(db_query("SELECT order_id FROM {uc_orders} WHERE MD5( CONCAT(order_id, primary_email) ) = '%s'",$hash));
+  $order_id = db_result(db_query(
+    "SELECT order_id FROM {uc_orders} WHERE MD5( CONCAT(order_id, primary_email) ) = '%s'", $hash
+  ));
   $order = uc_order_load($order_id);
   if (empty($order)) return drupal_not_found();
-  $bank = variable_get('uc_boleto_bank',FALSE);
-  module_load_include('inc','uc_boleto',"bancos/$bank");
-  $boleto = new BoletoSantander($order);
-  print theme('boleto_santander', $boleto->data);
-  kpr($order);
+  $bank = variable_get('uc_boleto_bank', FALSE);
+
+	if ($path = libraries_get_path('boleto-lib')) {
+
+	  $agency_pieces = explode('-',variable_get('uc_boleto_agency', ''));
+	  $account_pieces = explode('-',variable_get('uc_boleto_account_number', ''));
+
+    $due_date = date("d/m/Y", time() + (variable_get('uc_boleto_term_days', 0) * 86400));
+    if (variable_get('uc_boleto_use_due_date', 0)) {
+      $date = variable_get('uc_boleto_due_date', NULL);
+      if (!empty($date)) {
+        $due_date = $date['day']."/".$date['month']."/".$date['year'];
+      }
+    }
+
+    $store_address = explode("<br />",uc_store_address());
+    $demonstrative = explode("\n",variable_get('uc_boleto_demonstrative', 0));
+    $instructions = explode("\n",variable_get('uc_boleto_instructions', 0));
+
+		$myArguments = array(
+       'library_location'       => base_path().$path,
+	     'bank_code'              => $bank,
+	     'agencia'                => $agency_pieces[0],
+	     'agencia_dv'             => $agency_pieces[1],
+	     'conta'                  => $account_pieces[0],
+	     'conta_dv'               => $account_pieces[1],
+	     'valor_boleto'           => $order->order_total,
+	     'numero_documento'       => variable_get('uc_boleto_initial_doc_num', 0)+$order->id,
+	     'endereco'               => $store_address[1]." ".$store_address[2],
+	     'cidade_uf'              => $store_address[3]." ".$store_address[4],
+	     'merchant_logo'          => 'images/logo.jpg',
+	     'carteira'               => variable_get('uc_boleto_wallet', 0),
+	     'carteira_nosso_numero'  => variable_get('uc_boleto_wallet_our_number', 0),
+	     'nosso_numero'           => variable_get('uc_boleto_our_number', 0),
+	     'cpf_cnpj'               => variable_get('uc_boleto_company_id', 0),
+	     'data_vencimento'        => $due_date,
+	     'cedente'                => variable_get('uc_boleto_company_name', 0),
+	     'sacado'                 => $order->billing_first_name." ".$order->billing_last_name,
+	     'endereco1'              => $order->billing_street1,
+	     'endereco2'              => $order->billing_street2,
+	     'demonstrativo1'         => $demonstrative[0],
+	     'demonstrativo2'         => $demonstrative[1],
+	     'demonstrativo3'         => $demonstrative[2],
+	     'instrucoes1'            => $instructions[0],
+	     'instrucoes2'            => $instructions[1],
+	     'instrucoes3'            => $instructions[2],
+	     'instrucoes4'            => $instructions[3],
+	   );
+
+
+		//Include boleto class file
+		include_once($path.'/Boleto.class.php');
+
+		//instantiate an object and send the array of arguments through
+		$myBoleto = new Boleto($myArguments);
+
+		//if you wanna print out the html then call
+		$myBoleto->output();
+
+	}else{
+     drupal_get_error('You must install boleto-lib to use this module.');
+  }
+
   exit();
 }
-- 
1.7.0.4

