Merge branch 'master' of http://github.com/dioscouri/tienda

dioscouri · Nov 20, 2012 · 87481ad · 87481ad
2 parents 6d6a85c + d10dd81
commit 87481ad
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 21 deletions.
diff --git a/tienda/admin/controllers/products.php b/tienda/admin/controllers/products.php
@@ -830,7 +830,8 @@ function savequantities()
 			}
 		}
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -957,7 +958,8 @@ function saveprices()
 			}
 		}
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -1076,7 +1078,8 @@ function saveissues()
 			}
 		}
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -1198,7 +1201,8 @@ function saveattributes()
 		}
 		$row->reorder();
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -1408,7 +1412,8 @@ function saveattributeoptions()
 		}
 		$row->reorder();
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -1462,7 +1467,8 @@ function saveattributeoptionvalues()
 		}
 		$row->reorder();
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{
@@ -1693,7 +1699,8 @@ function savefiles()
 		}
 		$row->reorder();
 
-		$model->clearCache();
+		$productModel = $this->getModel('products');
+		$productModel->clearCache();
 
 		if ($error)
 		{

diff --git a/tienda/admin/views/geozones/tmpl/selectplugins.php b/tienda/admin/views/geozones/tmpl/selectplugins.php
@@ -5,9 +5,9 @@
 <?php $form = @$this->form; ?>
 <?php $items = @$this->items; ?>
 <?php $row = @$this->row; ?>
-<?php $suffix = ucfirst(@$this->suffix);?>
+<?php $suffix = 'COM_TIENDA_' . strtoupper(@$this->suffix);?>
 
-<h1 style="margin-left: 2%; margin-top: 2%;"><?php echo JText::sprintf('COM_TIENDA_SELECT_SUFFIX_PLUGINS_FOR', $suffix); ?>: <?php echo $row->geozone_name; ?></h1>
+<h1 style="margin-left: 2%; margin-top: 2%;"><?php echo JText::sprintf('COM_TIENDA_SELECT_SUFFIX_PLUGINS_FOR', JText::_( $suffix ) ); ?>: <?php echo $row->geozone_name; ?></h1>
 
 
 <div class="note_green" style="width: 95%; text-align: center; margin-left: auto; margin-right: auto;">

diff --git a/tienda/admin/views/productattributeoptions/tmpl/default.php b/tienda/admin/views/productattributeoptions/tmpl/default.php
@@ -43,16 +43,16 @@
                         <?php echo TiendaSelect::productattributeoptionprefix( "+", 'createproductattributeoption_prefix' ); ?>
                     </td>
                     <td>
-                        <input type="text" id="createproductattributeoption_price" name="createproductattributeoption_price" value="" size="10" />
+                        <input type="text" id="createproductattributeoption_price" name="createproductattributeoption_price" value="" size="10" class="input-tiny" />
                     </td>
                     <td>
                         <?php echo TiendaSelect::productattributeoptionprefix( "+", 'createproductattributeoption_prefix_weight' ); ?>
                     </td>
                     <td>
-                        <input type="text" id="createproductattributeoption_weight" name="createproductattributeoption_weight" value="" size="10" />
+                        <input type="text" id="createproductattributeoption_weight" name="createproductattributeoption_weight" value="" size="10" class="input-tiny" />
                     </td>
                     <td>
-                        <input type="text" id="createproductattributeoption_code" name="createproductattributeoption_code" value="" />
+                        <input type="text" id="createproductattributeoption_code" name="createproductattributeoption_code" value="" size="10" class="input-tiny" />
                     </td>
                     <td>
 	                    <?php echo TiendaSelect::booleans( 0, 'createproductattributeoption_blank', array('class' => 'inputbox', 'size' => '1'), null, false, 'Select State', 'Yes', 'No' );?>
@@ -126,16 +126,16 @@
                     <?php echo TiendaSelect::productattributeoptionprefix( $item->productattributeoption_prefix, "prefix[{$item->productattributeoption_id}]" ); ?>
                 </td>
                 <td style="text-align: center;">
-                    <input type="text" name="price[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_price; ?>" size="10" />
+                    <input type="text" name="price[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_price; ?>" size="10" class="input-tiny" />
                 </td>
                 <td style="text-align: center;">
                     <?php echo TiendaSelect::productattributeoptionprefix( $item->productattributeoption_prefix_weight, "prefix_weight[{$item->productattributeoption_id}]" ); ?>
                 </td>
                 <td style="text-align: center;">
-                    <input type="text" name="weight[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_weight; ?>" size="10" />
+                    <input type="text" name="weight[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_weight; ?>" size="10" class="input-tiny" />
                 </td>
                 <td style="text-align: center;">
-                    <input type="text" name="code[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_code; ?>" size="10" />
+                    <input type="text" name="code[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->productattributeoption_code; ?>" size="10" class="input-tiny" />
                 </td>
                 <td style="text-align: left;">
 					<?php
@@ -173,7 +173,7 @@
 	      	<?php echo TiendaSelect::booleans( $item->is_blank, 'blank['.$item->productattributeoption_id.']', array('class' => 'inputbox', 'size' => '1'), null, false, 'Select State', 'Yes', 'No' );?>
 				</td>
 				<td style="text-align: center;">
-					<input type="text" name="ordering[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->ordering; ?>" size="10" />
+					<input type="text" name="ordering[<?php echo $item->productattributeoption_id; ?>]" value="<?php echo $item->ordering; ?>" size="10" class="input-tiny" />
 				</td>
 				<td style="text-align: center;">
 					[<?php echo TiendaUrl::popup( "index.php?option=com_tienda&controller=products&task=setattributeoptionvalues&id=".$item->productattributeoption_id."&tmpl=component", JText::_('COM_TIENDA_SET_VALUES') ); ?>]

diff --git a/tienda/admin/views/productattributes/tmpl/default.php b/tienda/admin/views/productattributes/tmpl/default.php
@@ -106,7 +106,7 @@
 					</div>
 				</td>
 				<td style="text-align: center;">
-					<input type="text" name="ordering[<?php echo $item->productattribute_id; ?>]" value="<?php echo $item->ordering; ?>" size="10" />
+					<input type="text" name="ordering[<?php echo $item->productattribute_id; ?>]" value="<?php echo $item->ordering; ?>" size="10" class="input-tiny" />
 				</td>
 				<td style="text-align: center;">
 					[<a href="index.php?option=com_tienda&controller=productattributes&task=delete&cid[]=<?php echo $item->productattribute_id; ?>&return=<?php echo base64_encode("index.php?option=com_tienda&controller=products&task=setattributes&id={$row->product_id}&tmpl=component"); ?>">

diff --git a/tienda/media/js/tienda.js b/tienda/media/js/tienda.js
@@ -631,4 +631,10 @@ function tiendaGetFormInputData(form) {
 		str[i] = postvar;
 	}
 	return str;
+}
+
+function tiendaDeleteGrayDivs() {
+    $$('.tiendaAjaxGrayDiv').each(function(el) {
+        el.destroy();
+    });
 }
diff --git a/tienda/media/js/tienda_checkout.js b/tienda/media/js/tienda_checkout.js
@@ -124,7 +124,10 @@ function tiendaDisableShippingAddressControls(checkbox, form)
 {
 
 	var disable = false;
-    if (checkbox.checked){disable = true;tiendaGetShippingRates( 'onCheckoutShipping_wrapper', form );}  
+    if (checkbox.checked){
+        disable = true;
+        tiendaGetShippingRates( 'onCheckoutShipping_wrapper', form );
+    }
 
     var fields = "address_name;address_id;title;first_name;middle_name;last_name;company;tax_number;address_1;address_2;city;country_id;zone_id;postal_code;phone_1;phone_2;fax";
     var fieldList = fields.split(';');
@@ -158,6 +161,8 @@ function tiendaDisableShippingAddressControls(checkbox, form)
             }
         }
     }
+
+    tiendaDeleteGrayDivs();
 }
 
 function tiendaManageShippingRates()

diff --git a/tienda/site/views/checkout/tmpl/onepage-1col.php b/tienda/site/views/checkout/tmpl/onepage-1col.php
@@ -139,7 +139,7 @@
 					<!--    SHIPPING ADDRESS  -->	         
 	                <?php if (empty($this->shipping_address)) : ?>
 	                    <div>
-	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' );"/>&nbsp;
+	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' ); tiendaGetShippingRates( 'onCheckoutShipping_wrapper', document.adminForm ); tiendaGetPaymentOptions( 'onCheckoutPayment_wrapper', document.adminForm ); "/>&nbsp;
 	                        <?php echo JText::_('COM_TIENDA_SAME_AS_BILLING_ADDRESS'); ?>
 	                    </div>
 					<?php endif; ?>

diff --git a/tienda/site/views/checkout/tmpl/onepage-2cols.php b/tienda/site/views/checkout/tmpl/onepage-2cols.php
@@ -139,7 +139,7 @@
 					<!--    SHIPPING ADDRESS  -->	         
 	                <?php if (empty($this->shipping_address)) : ?>
 	                    <div>
-	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' );"/>&nbsp;
+	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' ); tiendaGetShippingRates( 'onCheckoutShipping_wrapper', document.adminForm ); tiendaGetPaymentOptions( 'onCheckoutPayment_wrapper', document.adminForm ); "/>&nbsp;
 	                        <?php echo JText::_('COM_TIENDA_SAME_AS_BILLING_ADDRESS'); ?>
 	                    </div>
 					<?php endif; ?>

diff --git a/tienda/site/views/checkout/tmpl/onepage-opc.php b/tienda/site/views/checkout/tmpl/onepage-opc.php
@@ -138,7 +138,7 @@
 					<!--    SHIPPING ADDRESS  -->	         
 	                <?php if (empty($this->shipping_address)) : ?>
 	                    <div>
-	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' );"/>&nbsp;
+	                        <input id="sameasbilling" name="sameasbilling" type="checkbox" checked="checked" onclick="tiendaShowHideDiv( 'shipping_input_addressForm' ); tiendaGetShippingRates( 'onCheckoutShipping_wrapper', document.adminForm ); tiendaGetPaymentOptions( 'onCheckoutPayment_wrapper', document.adminForm ); "/>&nbsp;
 	                        <?php echo JText::_('COM_TIENDA_SAME_AS_BILLING_ADDRESS'); ?>
 	                    </div>
 					<?php endif; ?>