From 16fc0b4e57edc57d97e64d0cffdce42078a52740 Mon Sep 17 00:00:00 2001 From: fSerny Date: Thu, 22 Dec 2011 14:01:05 +0000 Subject: [PATCH] // Preparing partial refund update --- install-dev/sql/upgrade/1.5.0.2.sql | 6 +++++- js/admin_order.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install-dev/sql/upgrade/1.5.0.2.sql b/install-dev/sql/upgrade/1.5.0.2.sql index f05b9865c..52b2d9abd 100644 --- a/install-dev/sql/upgrade/1.5.0.2.sql +++ b/install-dev/sql/upgrade/1.5.0.2.sql @@ -411,4 +411,8 @@ SET `position` = ( FROM `PREFIX_tab` WHERE `id_parent` = 0 ) -WHERE `class_name` = 'AdminAccounting'; \ No newline at end of file +WHERE `class_name` = 'AdminAccounting'; + +ALTER TABLE `PREFIX_order_slip_detail` CHANGE `amount` `amount_tax_excl` DECIMAL( 10, 2 ) NOT NULL; +ALTER TABLE `PREFIX_order_slip_detail` ADD COLUMN `amount_tax_incl` DECIMAL(10,2) NOT NULL AFTER `amount_tax_excl`; + diff --git a/js/admin_order.js b/js/admin_order.js index deaac952a..66d5b909c 100644 --- a/js/admin_order.js +++ b/js/admin_order.js @@ -768,7 +768,7 @@ function init() var flagRefund = ''; $(document).ready(function() { - $('.standard_refund').click(function() { + $('#desc-order-standard_refund').click(function() { $('.cancel_product_change_link:visible').trigger('click'); closeAddProduct(); @@ -791,7 +791,7 @@ $(document).ready(function() { return false; }); - $('.partial_refund').click(function() { + $('#desc-order-partial_refund').click(function() { $('.cancel_product_change_link:visible').trigger('click'); closeAddProduct();