-{/if}
-
diff --git a/v1.6.x/mercadopago/views/templates/admin/requirements.tpl b/v1.6.x/mercadopago/views/templates/admin/requirements.tpl
deleted file mode 100644
index e69de29..0000000
diff --git a/v1.6.x/mercadopago/views/templates/admin/settings.tpl b/v1.6.x/mercadopago/views/templates/admin/settings.tpl
new file mode 100644
index 0000000..0fd304c
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/admin/settings.tpl
@@ -0,0 +1,640 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
-
\ No newline at end of file
diff --git a/v1.6.x/mercadopago/views/templates/front/error.tpl b/v1.6.x/mercadopago/views/templates/front/error.tpl
new file mode 100644
index 0000000..09ea8a1
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/front/error.tpl
@@ -0,0 +1,148 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
+
+
diff --git a/v1.6.x/mercadopago/views/templates/front/error_admin.tpl b/v1.6.x/mercadopago/views/templates/front/error_admin.tpl
new file mode 100644
index 0000000..e692d2a
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/front/error_admin.tpl
@@ -0,0 +1,53 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
+
+
\ No newline at end of file
diff --git a/v1.6.x/mercadopago/views/templates/front/iframe.tpl b/v1.6.x/mercadopago/views/templates/front/iframe.tpl
deleted file mode 100755
index 62c223f..0000000
--- a/v1.6.x/mercadopago/views/templates/front/iframe.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{extends file='page.tpl'}
-
-{block name="content"}
-
-
-
-{/block}
diff --git a/v1.6.x/mercadopago/views/templates/front/index.php b/v1.6.x/mercadopago/views/templates/front/index.php
index 729abf5..0df7996 100644
--- a/v1.6.x/mercadopago/views/templates/front/index.php
+++ b/v1.6.x/mercadopago/views/templates/front/index.php
@@ -1,11 +1,35 @@
+* @copyright 2007-2014 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
-header('Location: ../');
+header("Location: ../");
exit;
diff --git a/v1.6.x/mercadopago/views/templates/front/payment_form.tpl b/v1.6.x/mercadopago/views/templates/front/payment_form.tpl
deleted file mode 100755
index bc6359a..0000000
--- a/v1.6.x/mercadopago/views/templates/front/payment_form.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-* @author PrestaShop SA
-* @copyright 2007-2015 PrestaShop SA
-* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*}
-
-
diff --git a/v1.6.x/mercadopago/views/templates/hook/boleto_payment_return.tpl b/v1.6.x/mercadopago/views/templates/hook/boleto_payment_return.tpl
new file mode 100644
index 0000000..abcab25
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/boleto_payment_return.tpl
@@ -0,0 +1,52 @@
+{** * 2007-2015 PrestaShop * * NOTICE OF LICENSE * * This source file is
+subject to the Open Software License (OSL 3.0) * that is bundled with
+this package in the file LICENSE.txt. * It is also available through the
+world-wide-web at this URL: * http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to *
+obtain it through the world-wide-web, please send an email * to
+license@prestashop.com so we can send you a copy immediately. * *
+DISCLAIMER * * Do not edit or add to this file if you wish to upgrade
+PrestaShop to newer * versions in the future. If you wish to customize
+PrestaShop for your * needs please refer to http://www.prestashop.com
+for more information. * * @author MercadoPago * @copyright Copyright
+(c) MercadoPago [http://www.mercadopago.com] * @license
+http://opensource.org/licenses/osl-3.0.php Open Software License (OSL
+3.0) * International Registered Trademark & Property of MercadoPago *}
+
+
+
+ {l s='Thank you for your purchase! We are awaiting the payment.' mod='mercadopago'}
+
+
+ {l s='Payment Id (MercadoPago): ' mod='mercadopago'}
+ {$payment_id|escape:'htmlall':'UTF-8'}
+
+
+
+
+ {if $boleto_url != null}
+
+
+ {/if}
+
+
+
+
+
\ No newline at end of file
diff --git a/v1.6.x/mercadopago/views/templates/hook/checkout.tpl b/v1.6.x/mercadopago/views/templates/hook/checkout.tpl
new file mode 100644
index 0000000..fce533e
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/checkout.tpl
@@ -0,0 +1,1714 @@
+{** * 2007-2015 PrestaShop * * NOTICE OF LICENSE * * This source file is
+subject to the Open Software License (OSL 3.0) * that is bundled with
+this package in the file LICENSE.txt. * It is also available through the
+world-wide-web at this URL: * http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to *
+obtain it through the world-wide-web, please send an email * to
+license@prestashop.com so we can send you a copy immediately. * *
+DISCLAIMER * * Do not edit or add to this file if you wish to upgrade
+PrestaShop to newer * versions in the future. If you wish to customize
+PrestaShop for your * needs please refer to http://www.prestashop.com
+for more information. * * @author MercadoPago * @copyright Copyright
+(c) MercadoPago [http://www.mercadopago.com] * @license
+http://opensource.org/licenses/osl-3.0.php Open Software License (OSL
+3.0) * International Registered Trademark & Property of MercadoPago *}
+
+
{l s='Save' mod='mercadopago'} {$percent|escape:'htmlall':'UTF-8'}% {l s='discount payment by Mercado Pago with credit card in cash.' mod='mercadopago'}
{l s='Save' mod='mercadopago'} {$percent|escape:'htmlall':'UTF-8'}% {l s='discount payment by Mercado Pago with ticket and credit card in cash.' mod='mercadopago'}
+
+
+
+
+
+
+
+
+
+
+
+{if $creditcard_active == 'true' && $public_key != ''}
+
+{/if}
diff --git a/v1.6.x/mercadopago/views/templates/hook/creditcard_payment_return.tpl b/v1.6.x/mercadopago/views/templates/hook/creditcard_payment_return.tpl
new file mode 100644
index 0000000..f1ccd4b
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/creditcard_payment_return.tpl
@@ -0,0 +1,82 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
+
+
+
+ {if $status_detail eq 'accredited'}
+ {l s='Thank for your purchase!' mod='mercadopago'}
+ {l s='Your payment was accredited.' mod='mercadopago'}
+
+
+
+
+ {elseif $status_detail eq 'pending_review_manual' || $status_detail eq 'pending_review'}
+ {l s='We are processing the payment. In less than 2 business days we will tell you by e-mail if it is accredited or if we need more information.' mod='mercadopago'}
+ {elseif $status_detail eq 'pending_contingency'}
+ {l s='We are processing the payment. In less than an hour we will send you by e-mail the result.' mod='mercadopago'}
+ {elseif status_detail eq 'expired'}
+ {l s='Payment expired.' mod='mercadopago'}
+ {/if}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/v1.6.x/mercadopago/views/templates/hook/display.tpl b/v1.6.x/mercadopago/views/templates/hook/display.tpl
new file mode 100644
index 0000000..137dd47
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/display.tpl
@@ -0,0 +1,41 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
+
+{if isset($mensagem) && !empty($mensagem)}
+
+
+
+{/if}
+
diff --git a/v1.6.x/mercadopago/views/templates/hook/displayStatusOrder.tpl b/v1.6.x/mercadopago/views/templates/hook/displayStatusOrder.tpl
deleted file mode 100644
index 2907b5e..0000000
--- a/v1.6.x/mercadopago/views/templates/hook/displayStatusOrder.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
- {if $payment_status == "approved"}
-
-
- {l s='Thank you, your payment has been approved.' mod='mercadopago'}
-
- {/if}
- {if $payment_status == "in_process"}
-
-
- {l s='Thank you, your payment is being processed.' mod='mercadopago'}
-
- {/if}
- {if $payment_status == "rejected"}
-
-
- {l s='Sorry, your payment was declined.' mod='mercadopago'}
-
-
- {l s='Thank you, your payment has been approved.' mod='mercadopago'}
-
- {/if}
- {if $payment_status == "pending"}
-
-
- {l s='Thank you, we are waiting for your payment.' mod='mercadopago'}
-
- {/if}
- {if $payment_status == "rejected"}
-
-
- {l s='Sorry, your payment was declined.' mod='mercadopago'}
-
- {/if}
-
-
-
-
diff --git a/v1.6.x/mercadopago/views/templates/hook/display_admin_order.tpl b/v1.6.x/mercadopago/views/templates/hook/display_admin_order.tpl
new file mode 100644
index 0000000..c2961b0
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/display_admin_order.tpl
@@ -0,0 +1,223 @@
+{**
+ * 2007-2015 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author henriqueleite
+ * @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of MercadoPago
+ *}
+
+
+
+
+
+
+
+
+
+
+
+
+ Please waiting...
+
+
+
+
+
+
+ {if $statusOrder == "Pendente"}
+
+ {/if}
+
+ {if $pos_active == "true"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+
+{if isset($status)}
+
+
+
+ MercadoEnvios - {l s='Track your delivery' mod='mercadopago'}
+
+{/if}
+
+
+
+
+
diff --git a/v1.6.x/mercadopago/views/templates/hook/header.tpl b/v1.6.x/mercadopago/views/templates/hook/header.tpl
new file mode 100644
index 0000000..435fe39
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/header.tpl
@@ -0,0 +1,24 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author MercadoPago
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
diff --git a/v1.6.x/mercadopago/views/templates/hook/index.php b/v1.6.x/mercadopago/views/templates/hook/index.php
index 729abf5..0df7996 100644
--- a/v1.6.x/mercadopago/views/templates/hook/index.php
+++ b/v1.6.x/mercadopago/views/templates/hook/index.php
@@ -1,11 +1,35 @@
+* @copyright 2007-2014 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
-header('Location: ../');
+header("Location: ../");
exit;
diff --git a/v1.6.x/mercadopago/views/templates/hook/payment_return_creditcard.tpl b/v1.6.x/mercadopago/views/templates/hook/payment_return_creditcard.tpl
deleted file mode 100644
index aefae8b..0000000
--- a/v1.6.x/mercadopago/views/templates/hook/payment_return_creditcard.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{extends file='page.tpl'}
-
-{block name="content"}
-
-
-
-
-
- Compra realizada com sucesso via Mercado Pago - Cartão de crédito
-
-
- O pagamento foi recusado. Por favor tentes novamente.
-
- {/if}
-
diff --git a/v1.6.x/mercadopago/views/templates/hook/print_details_order.tpl b/v1.6.x/mercadopago/views/templates/hook/print_details_order.tpl
new file mode 100644
index 0000000..3e712cb
--- /dev/null
+++ b/v1.6.x/mercadopago/views/templates/hook/print_details_order.tpl
@@ -0,0 +1,74 @@
+{**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author henriqueleite
+* @copyright Copyright (c) MercadoPago [http://www.mercadopago.com]
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of MercadoPago
+*}
+
+{if isset($boleto_url)}
+
+
+
+
+
+
+
+
{l s='Before printing check the expiration date.' mod='mercadopago'}