dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Pizza fix :D

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10641 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fSerny
2011-11-23 23:24:22 +00:00
parent 1657c1c5b1
commit a3a06d737b
1 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin_order.js
+76 -12
View File
@@ -19,7 +19,7 @@
* *
* @author PrestaShop SA <contact@prestashop.com> * @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA * @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 7310 $ * @version Release: $Revision: 10575 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
@@ -32,6 +32,7 @@ $(document).ready(function() {
$('.add_product_fields').show(); $('.add_product_fields').show();
$('.edit_product_fields').hide(); $('.edit_product_fields').hide();
$('.standard_refund_fields').hide(); $('.standard_refund_fields').hide();
$('.partial_refund_fields').hide();
$('tr#new_product').slideDown('fast', function () { $('tr#new_product').slideDown('fast', function () {
$('tr#new_product td').fadeIn('fast'); $('tr#new_product td').fadeIn('fast');
}); });
@@ -216,22 +217,22 @@ $(document).ready(function() {
return false; return false;
}); });
$('#edit_shipping_number_link').click(function() { $('.edit_shipping_number_link').click(function() {
$('#shipping_number_show').hide(); $(this).parent().find('.shipping_number_show').hide();
$('#shipping_number_edit').show(); $(this).parent().find('.shipping_number_edit').show();
$('#edit_shipping_number_link').hide(); $(this).parent().find('.edit_shipping_number_link').hide();
$('#cancel_shipping_number_link').show(); $(this).parent().find('.cancel_shipping_number_link').show();
return false; return false;
}); });
$('#cancel_shipping_number_link').click(function() { $('.cancel_shipping_number_link').click(function() {
$('#shipping_number_show').show(); $(this).parent().find('.shipping_number_show').show();
$('#shipping_number_edit').hide(); $(this).parent().find('.shipping_number_edit').hide();
$('#edit_shipping_number_link').show(); $(this).parent().find('.edit_shipping_number_link').show();
$('#cancel_shipping_number_link').hide(); $(this).parent().find('.cancel_shipping_number_link').hide();
return false; return false;
}); });
@@ -574,4 +575,67 @@ function closeAddProduct()
$('#add_product_product_attribute_area').hide(); $('#add_product_product_attribute_area').hide();
$('#add_product_product_stock').html('0'); $('#add_product_product_stock').html('0');
current_product = null; current_product = null;
} }
/* Refund system script */
var flagRefund = '';
$(document).ready(function() {
$('.standard_refund').click(function() {
$('.cancel_product_change_link:visible').trigger('click');
closeAddProduct();
$.scrollTo('#refundForm', 1200, {offset: -100});
if (flagRefund == 'standard')
{
flagRefund = '';
$('.partial_refund_fields').hide();
$('.standard_refund_fields').hide();
}
else
{
flagRefund = 'standard';
$('.partial_refund_fields').hide();
$('.standard_refund_fields').fadeIn();
}
return false;
});
$('.partial_refund').click(function() {
$('.cancel_product_change_link:visible').trigger('click');
closeAddProduct();
$.scrollTo('#refundForm', 1200, {offset: -100});
if (flagRefund == 'partial')
{
flagRefund = '';
$('.partial_refund_fields').hide();
$('.standard_refund_fields').hide();
}
else
{
flagRefund = 'partial';
$('.standard_refund_fields').hide();
$('.partial_refund_fields').fadeIn();
}
return false;
});
});