From cb786a4deaca0f9433887655dd57af26c936b58e Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Wed, 20 Apr 2011 14:47:20 +1000 Subject: [PATCH] Fixed JS handling of commisions on job index --- views/jobs/get_editable_row.ctp | 43 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index ab42229c..1838647b 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -75,24 +75,35 @@ } } - else { //Export Sale - if(currencyID == 2) {//Export Sale. AUD - $('.export_sale_aud').attr("readonly",false); - $(".export_sale_aud").addClass("highlighted"); - - $(".aust_sale_fc").attr("readonly",true); + else { + //Handle Commissions. + if(catID == 2 || catID == 5) { //Commission. Australian Supplier. $(".aust_sale_aud").attr("readonly",true); + $(".aust_sale_fc").attr("readonly",true); $('.export_sale_fc').attr("readonly",true); - - } - else { //Export Sale. Foreign Currency. - $('.export_sale_fc').attr("readonly",false); - $(".export_sale_fc").addClass("highlighted"); - - $(".aust_sale_fc").attr("readonly",true); - $(".aust_sale_aud").attr("readonly",true); $('.export_sale_aud').attr("readonly",true); + $('.commissions_any_currency').addClass("highlighted"); + } + else { + //Export Sale + if(currencyID == 2) {//Export Sale. AUD + $('.export_sale_aud').attr("readonly",false); + $(".export_sale_aud").addClass("highlighted"); + $(".aust_sale_fc").attr("readonly",true); + $(".aust_sale_aud").attr("readonly",true); + $('.export_sale_fc').attr("readonly",true); + + } + else { //Export Sale. Foreign Currency. + $('.export_sale_fc').attr("readonly",false); + $(".export_sale_fc").addClass("highlighted"); + + $(".aust_sale_fc").attr("readonly",true); + $(".aust_sale_aud").attr("readonly",true); + $('.export_sale_aud').attr("readonly",true); + + } } } @@ -239,9 +250,9 @@ else { input('gross_profit_value_after_discount_exports_foreign_currency', array('id'=>$job['Job']['id']."_gross_profit_value_after_discount_exports_foreign_currency",'value'=>$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'], 'label'=>false, 'class'=>'export_sale_fc'));?> - input('gross_commissions', array('id'=>$job['Job']['id']."_gross_commissions",'value'=>$job['Job']['gross_commissions'], 'label'=>false));?> + input('gross_commissions', array('id'=>$job['Job']['id']."_gross_commissions",'value'=>$job['Job']['gross_commissions'], 'label'=>false, 'class'=>'commissions_any_currency'));?> - input('net_commissions', array('id'=>$job['Job']['id']."_net_commissions",'value'=>$job['Job']['net_commissions'], 'label'=>false));?> + input('net_commissions', array('id'=>$job['Job']['id']."_net_commissions",'value'=>$job['Job']['net_commissions'], 'label'=>false,'class'=>'commissions_any_currency'));?>