v0.3.0 - Update commit

gerencianet · Aug 30, 2017 · 97bdf3d · 97bdf3d
1 parent 8179a21
commit 97bdf3d
Show file tree

Hide file tree

Showing 30 changed files with 702 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v0.3.0
+- Add: Metodo de pagamento por boleto no painel administrativo.
+
 # v0.2.6
 - Fix: Converte preço de produto para Real brasileiro caso o preço base não esteja configurado com moeda BRL.
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Módulo Oficial da Gerencianet para o Magento - Versão 0.2.6
+# Módulo Oficial da Gerencianet para o Magento - Versão 0.3.0
 
 **Em caso de dúvidas, você pode verificar a [Documentação](https://docs.gerencianet.com.br) da API na Gerencianet e, necessitando de mais detalhes ou informações, entre em contato com nossa consultoria técnica, via nossos [Canais de Comunicação](https://gerencianet.com.br/central-de-ajuda).**
 

diff --git a/app/code/local/Gerencianet/Transparent/Block/Billet/Form.php b/app/code/local/Gerencianet/Transparent/Block/Billet/Form.php
@@ -21,7 +21,8 @@ class Gerencianet_Transparent_Block_Billet_Form extends Mage_Payment_Block_Form
      */
     protected function _construct() {
     	parent::_construct();
-    	$order = Mage::getModel('checkout/session')->getQuote();
+        $sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+    	$order = Mage::getModel($sessionInstance)->getQuote();
 		$address = $order->getBillingAddress();
         $order_total = $order->getGrandTotal();
 
@@ -124,7 +125,8 @@ public function getOrder() {
 		if (!$this->_order) {
 			$this->_order = Mage::registry('current_order');
 			if (!$this->_order) {
-				$this->_order = Mage::getModel('checkout/session')->getQuote();
+				$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+                $this->_order = Mage::getModel($sessionInstance)->getQuote();
 				if (!$this->_order) {
 					return false;
 				}

diff --git a/app/code/local/Gerencianet/Transparent/Block/Card/Form.php b/app/code/local/Gerencianet/Transparent/Block/Card/Form.php
@@ -22,7 +22,8 @@ class Gerencianet_Transparent_Block_Card_Form extends Mage_Payment_Block_Form_Cc
     protected function _construct() {
     	parent::_construct();
 
-        $order = Mage::getModel('checkout/session')->getQuote();
+         $sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+        $order = Mage::getModel($sessionInstance)->getQuote();
         $address = $order->getBillingAddress();
         $order_total = $order->getGrandTotal();
 

diff --git a/app/code/local/Gerencianet/Transparent/Model/Billet.php b/app/code/local/Gerencianet/Transparent/Model/Billet.php
@@ -41,7 +41,8 @@ class Gerencianet_Transparent_Model_Billet extends Gerencianet_Transparent_Model
    */
   public function assignData($data) {
     $info = $this->getInfoInstance();
-    $quote = Mage::getModel('checkout/session')->getQuote();
+    $sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+    $quote = Mage::getModel($sessionInstance)->getQuote();
     $expires = Mage::getStoreConfig('payment/gerencianet_billet/duedate');
     $fine = floatval(Mage::getStoreConfig('payment/gerencianet_billet/fine'));
     if ($fine>0 && $fine<=10) {
@@ -76,7 +77,8 @@ public function assignData($data) {
    */
   public function authorize(Varien_Object $payment, $amount)
   {
-    $quote = Mage::getModel('checkout/session')->getQuote();
+    $sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+    $quote = Mage::getModel($sessionInstance)->getQuote();
     $order_total = $quote->getGrandTotal();
     if ($order_total<5) {
       Mage::throwException($this->_getHelper()->__("O valor mínimo para pagar com a Gerencianet é R$5,00."));

diff --git a/app/code/local/Gerencianet/Transparent/Model/Card.php b/app/code/local/Gerencianet/Transparent/Model/Card.php
@@ -28,7 +28,7 @@ class Gerencianet_Transparent_Model_Card extends Gerencianet_Transparent_Model_S
     protected $_canCapturePartial       = false;
     protected $_canRefund               = false;
     protected $_canVoid                 = true;
-    protected $_canUseInternal          = true;
+    protected $_canUseInternal          = false;
     protected $_canUseCheckout          = true;
     protected $_canUseForMultishipping  = true;
 
@@ -41,12 +41,10 @@ class Gerencianet_Transparent_Model_Card extends Gerencianet_Transparent_Model_S
      */
 	public function assignData($data) {
 		$info = $this->getInfoInstance();
-		$quote = Mage::getModel('checkout/session')->getQuote();
+		$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+		$quote = Mage::getModel($sessionInstance)->getQuote();
 		$additionaldata['card']['cc_token'] = $data->getCcToken();
 		$additionaldata['card']['cc_installments'] = $data->getCcInstallments();
-	    //$additionaldata['juridical']['data_pay_card_as_juridical'] = $data->getDataPayCardAsJuridical();
-	    //$additionaldata['juridical']['cc_data_corporate_name'] = $data->getCcDataCorporateName();
-	    //$additionaldata['juridical']['cc_data_cnpj'] = $data->getCcDataCnpj();
 		$additionaldata['customer']['cc_data_name_corporate'] = $data->getCcDataNameCorporate();
 	    $additionaldata['customer']['cc_data_cpf_cnpj'] = $data->getCcDataCpfCnpj();
 	    $additionaldata['customer']['cc_data_email'] = $data->getCcDataEmail();
@@ -81,7 +79,8 @@ public function assignData($data) {
 	 */
 	public function authorize(Varien_Object $payment, $amount)
 	{
-		$quote = Mage::getModel('checkout/session')->getQuote();
+		$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+		$quote = Mage::getModel($sessionInstance)->getQuote();
 	    $order_total = $quote->getGrandTotal();
 	    if ($order_total<5) {
 	      	Mage::throwException($this->_getHelper()->__("O valor mínimo para pagar com a Gerencianet é R$5,00."));

diff --git a/app/code/local/Gerencianet/Transparent/Model/Observer.php b/app/code/local/Gerencianet/Transparent/Model/Observer.php
@@ -54,4 +54,38 @@ public function setNew($event) {
         }
     }
 
+    public function adminPrepareLayoutBefore()
+    {
+        $this->_prepareLayoutBefore('admin');
+    }
+
+    public function frontendPrepareLayoutBefore()
+    {
+        $this->_prepareLayoutBefore('frontend');
+    }
+
+    protected function _prepareLayoutBefore($area)
+    {
+        switch($area){
+            case 'admin':
+                Mage::getModel('core/session')->setSessionQuote('adminhtml/session_quote');
+                break;
+
+            case 'frontend':
+                Mage::getModel('core/session')->setSessionQuote('checkout/session');
+                break;
+        }
+    }
+
+    public function prepareLayoutBefore(Varien_Event_Observer $observer)
+    {
+        $block = $observer->getEvent()->getBlock();
+        if ("head" == $block->getNameInLayout()) {
+            $block->addJs('gerencianet/jquery-1.12.3.min.js');
+            $block->addJs('gerencianet/jquery.maskedinput.js');
+            $block->addJs('gerencianet/jquery.noconflict.js');
+        }
+
+        return this;
+    }
 }
diff --git a/app/code/local/Gerencianet/Transparent/Model/Standard.php b/app/code/local/Gerencianet/Transparent/Model/Standard.php
@@ -67,7 +67,8 @@ public function isAvailable($quote = null)
 
 		$order = Mage::registry('current_order');
         if (!$order) {
-            $order = Mage::getModel('checkout/session')->getQuote();
+            $sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+            $order = Mage::getModel($sessionInstance)->getQuote();
         }
 		/*if ($order->getGrandTotal()<5) {
 			return false;
@@ -470,7 +471,8 @@ public function getOrder() {
 		if (!$this->_order) {
 			$this->_order = Mage::registry('current_order');
 			if (!$this->_order) {
-				$this->_order = Mage::getModel('checkout/session')->getQuote();
+				$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+				$this->_order = Mage::getModel($sessionInstance)->getQuote();
 				if (!$this->_order) {
 					return false;
 				}

diff --git a/app/code/local/Gerencianet/Transparent/controllers/PaymentController.php b/app/code/local/Gerencianet/Transparent/controllers/PaymentController.php
@@ -21,7 +21,8 @@ class Gerencianet_Transparent_PaymentController extends Mage_Core_Controller_Fro
 	 *
 	 */
 	protected function _expireAjax() {
-		if (!Mage::getSingleton('checkout/session')->getQuote()->hasItems()) {
+		$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+		if (!Mage::getSingleton($sessionInstance)->getQuote()->hasItems()) {
 			$this->getResponse()->setHeader('HTTP/1.1', '403 Session Expired');
 			exit;
 		}
@@ -80,7 +81,8 @@ public function notificationsbAction(){
 	public function installmentsAction() {
 		$brand = $this->getRequest()->getParam('brand');
 		$api = $this->getStandard()->getApi();
-    	$quote = Mage::getModel('checkout/session')->getQuote();
+    	$sessionInstance = Mage::getModel("core/session")->getSessionQuote();
+    	$quote = Mage::getModel($sessionInstance)->getQuote();
     	$params = array(
     			'total' => number_format($quote->getGrandTotal(),2,'',''),
     			'brand' => $brand

diff --git a/app/code/local/Gerencianet/Transparent/etc/config.xml b/app/code/local/Gerencianet/Transparent/etc/config.xml
@@ -19,7 +19,7 @@
 <config>
     <modules>
        <Gerencianet_Transparent>
-          <version>0.2.6</version>
+          <version>0.3.0</version>
        </Gerencianet_Transparent>
     </modules>
 
@@ -101,43 +101,109 @@
     </default>
 
     <frontend>
-		<events>
-		  <sales_order_place_after>
-		      <observers>
-		          <gerencianet_transparent_updatecharge>
-		              <type>model</type>
-		              <class>gerencianet_transparent/observer</class>
-		              <method>updatecharge</method>
-		          </gerencianet_transparent_updatecharge>
-		      </observers>
-		  </sales_order_place_after>
-		  <sales_order_payment_place_end>
-		      <observers>
-		          <gerencianet_transparent_updatecharge>
-		              <type>model</type>
-		              <class>gerencianet_transparent/observer</class>
-		              <method>setNew</method>
-		          </gerencianet_transparent_updatecharge>
-		      </observers>
-		  </sales_order_payment_place_end>
-		</events>
-		<routers>
-		  <gerencianet_transparent>
-		    <use>standard</use>
-		    <args>
-		      <module>Gerencianet_Transparent</module>
-		      <frontName>gerencianet</frontName>
-		    </args>
-		  </gerencianet_transparent>
-		</routers>
-		<layout>
-			<updates>
-				<gerencianet_transparent>
-		        	<file>gerencianet_transparent.xml</file>
-		    	</gerencianet_transparent>
-			</updates>
-		</layout>
+        <events>
+            <core_block_abstract_prepare_layout_after>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>frontendPrepareLayoutBefore</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </core_block_abstract_prepare_layout_after>
+            <sales_order_place_after>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>updatecharge</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </sales_order_place_after>
+            <sales_order_payment_place_end>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>setNew</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </sales_order_payment_place_end>
+        </events>
+        <routers>
+            <gerencianet_transparent>
+                <use>standard</use>
+                <args>
+                    <module>Gerencianet_Transparent</module>
+                    <frontName>gerencianet</frontName>
+                </args>
+            </gerencianet_transparent>
+        </routers>
+        <layout>
+            <updates>
+                <gerencianet_transparent>
+                    <file>gerencianet_transparent.xml</file>
+                </gerencianet_transparent>
+            </updates>
+        </layout>
     </frontend>
+
+    <adminhtml>
+        <events>
+            <core_block_abstract_prepare_layout_before>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>prepareLayoutBefore</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </core_block_abstract_prepare_layout_before>
+            <core_block_abstract_prepare_layout_after>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>adminPrepareLayoutBefore</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </core_block_abstract_prepare_layout_after>
+            <sales_order_place_after>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>updatecharge</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </sales_order_place_after>
+            <sales_order_payment_place_end>
+                <observers>
+                    <gerencianet_transparent_updatecharge>
+                        <type>model</type>
+                        <class>gerencianet_transparent/observer</class>
+                        <method>setNew</method>
+                    </gerencianet_transparent_updatecharge>
+                </observers>
+            </sales_order_payment_place_end>
+        </events>
+        <routers>
+            <gerencianet_transparent>
+                <use>standard</use>
+                <args>
+                    <module>Gerencianet_Transparent</module>
+                    <frontName>gerencianet</frontName>
+                </args>
+            </gerencianet_transparent>
+        </routers>
+        <layout>
+            <updates>
+                <gerencianet_transparent>
+                    <file>gerencianet_transparent.xml</file>
+                </gerencianet_transparent>
+            </updates>
+        </layout>
+    </adminhtml>
 
     <crontab>
     	<jobs>

diff --git a/app/code/local/Gerencianet/Transparent/etc/system.xml b/app/code/local/Gerencianet/Transparent/etc/system.xml
@@ -29,7 +29,7 @@
                     <show_in_store>1</show_in_store>
                     <fields>
                         <title_page translate="label">
-                            <label>Versão do Módulo: v0.2.6</label>
+                            <label>Versão do Módulo: v0.3.0</label>
                             <frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>