Merge pull request #33 from r-martins/geoip-e-correcoes-diversas

Comentado includes errados do GeoIP / Descomentado linhas do xml...
deivisonarthur · Nov 29, 2013 · ab092ed · ab092ed
2 parents 1e4da81 + f618eba
commit ab092ed
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/app/code/local/DeivisonArthur/OnepageCheckout/Model/Type/Geo.php b/app/code/local/DeivisonArthur/OnepageCheckout/Model/Type/Geo.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoip.inc");
-include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoipcity.inc");
-include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoipregionvars.php");
+// include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoip.inc");
+// include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoipcity.inc");
+// include_once(Mage::getBaseDir('lib')."/MaxMind/GeoIP/geoipregionvars.php");
 
 class DeivisonArthur_OnepageCheckout_Model_Type_Geo
 {

diff --git a/app/code/local/DeivisonArthur/OnepageCheckout/etc/system.xml b/app/code/local/DeivisonArthur/OnepageCheckout/etc/system.xml
@@ -141,7 +141,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </analytics>
-<!--
+
                         <guest_checkout1 translate="label" module="checkout">
                             <label>Exibir login padrao do OSC</label>
                             <frontend_type>select</frontend_type>
@@ -170,7 +170,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </habilitarcad>
--->
+
                         <shipping_address translate="label" module="onepagecheckout">
                             <label>Permitir entregar em outro endereco?</label>
                             <comment>Valido somente para compras por pessoa fisica</comment>
@@ -216,7 +216,7 @@
                     <show_in_website>1</show_in_website>
                     <show_in_store>1</show_in_store>
                     <fields>
-<!--
+
                         <cpfcnpjtaxvat translate="label" module="checkout">
                             <label>CPF/CNPJ pelo Taxvat</label>
                             <comment>Esse campo so funciona as opcoes (Nao exibir campo) e (Obrigatorio)</comment>
@@ -346,7 +346,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </country>
--->
+
                         <sexo translate="label" module="checkout">
                             <label>Sexo</label>
                             <frontend_type>select</frontend_type>
@@ -402,7 +402,7 @@
 
 
 
- <!--
+
                 <outrasopcoes translate="label">
                     <label>Tela do cadastro e edit do usuario</label>
                     <frontend_type>text</frontend_type>
@@ -491,7 +491,7 @@
 
                     </fields>
                 </outrasopcoes>
--->
+
 
                 <agreements translate="label" module="checkout">
                     <label>Termos e condicoes</label>
@@ -524,7 +524,7 @@
 
 
 
-<!--
+
                 <geo_ip translate="label">
                     <label>GeoIP</label>
                     <frontend_type>text</frontend_type>
@@ -572,7 +572,7 @@
                     </fields>
                 </geo_ip>
 
--->
+
 
             </groups>
         </onepagecheckout>

diff --git a/app/design/frontend/base/default/template/onepagecheckout/onepage/billing.phtml b/app/design/frontend/base/default/template/onepagecheckout/onepage/billing.phtml
@@ -412,7 +412,7 @@ $has_addr	= $this->customerHasAddresses();
                                 }
                                 ?>
             					<div class="data_area">
-            						<input type="text" id="celular" name="billing[celular]" value="<?php echo $this->htmlEscape($this->getBillAddress()->getCelular()) ?>" title="<?php echo $this->__('Celular') ?>" class="t1 required-entry" id="billing:fax" />
+            						<input type="text" id="celular" name="billing[celular]" value="<?php echo $this->htmlEscape($this->getBillAddress()->getCelular()) ?>" title="<?php echo $this->__('Celular') ?>" class="t1<?php if($celular === 'required') {echo ' class=" required-entry" ';}?>" id="billing:fax" />
             					</div>
             				</div>
                         <?php endif ?>

diff --git a/app/design/frontend/base/default/template/onepagecheckout/onepage/shipping.phtml b/app/design/frontend/base/default/template/onepagecheckout/onepage/shipping.phtml
@@ -43,7 +43,7 @@ if (!$this->getQuote()->isVirtual() && Mage::helper('onepagecheckout')->isShippi
 <ul>
     <li class="options">
         <input type="checkbox" class="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getShipAddress()->getSameAsBilling()){echo ' checked="checked" ';} ?> title="<?php echo $this->__('Ship to this address') ?>" onclick="shipping.setSameAsBilling(this.checked)" />
-        <label>
+        <label for="shipping:same_as_billing">
         	<?php echo $this->__('Ship to this address') ?>
         </label>
     </li>
@@ -202,7 +202,7 @@ if (!$this->getQuote()->isVirtual() && Mage::helper('onepagecheckout')->isShippi
                                 }
                                 ?>
             					<div class="data_area">
-            						<input type="text" id="celular" name="shipping[celular]" value="<?php echo $this->htmlEscape($this->getBillAddress()->getCelular()) ?>" title="<?php echo $this->__('Celular') ?>" class="t1 required-entry" id="billing:fax" />
+            						<input type="text" id="celular" name="shipping[celular]" value="<?php echo $this->htmlEscape($this->getBillAddress()->getCelular()) ?>" title="<?php echo $this->__('Celular') ?>" class="t1<?php if($celular_r === 'required') {echo ' class=" required-entry" ';}?>" id="billing:fax" />
             					</div>
             				</div>
                         <?php endif ?>

diff --git a/app/locale/pt_BR/DeivisonArthur_OnepageCheckout.csv b/app/locale/pt_BR/DeivisonArthur_OnepageCheckout.csv
@@ -36,7 +36,7 @@
 "Please select an option.","Selecione uma op&ccedil;&atilde;o."
 "Please make sure your passwords match.","As senhas n&atilde;o s&atilde;o iguais"
 "Please enter 6 or more characters. Leading or trailing spaces will be ignored.","A senha dever&aacute; ter no m&iacute;nimo 6 caracteres"
-"Already registered? Click here to login","Caso possua conta? Clique aqui e poupe tempo!"
+"Already registered? Click here to login","Já é cliente? Clique aqui e poupe tempo!"
 "Sorry, no quotes are available for this order at this time.","M&eacute;todo de envio n&atilde;o liberado para esse CEP"
 "New Shipping Address","Endere&ccedil;o de Entrega"
 "Taxvat","CNPJ/CPF"