From 800cec1a0dfd69f3551aea6e708c1fc1684b7953 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Sun, 7 Apr 2013 12:04:18 +1000 Subject: [PATCH] Changed logic on jobs JS for exports. Dissalow AUD values --- app/views/jobs/get_editable_row.ctp | 239 ++++++++++++++-------------- 1 file changed, 120 insertions(+), 119 deletions(-) diff --git a/app/views/jobs/get_editable_row.ctp b/app/views/jobs/get_editable_row.ctp index 1aa1c929..21e60337 100755 --- a/app/views/jobs/get_editable_row.ctp +++ b/app/views/jobs/get_editable_row.ctp @@ -3,141 +3,142 @@ @@ -145,19 +146,19 @@ @@ -165,104 +166,104 @@ else { input('id', array('type'=>'hidden', 'value'=>$job['Job']['id'])); ?> input('date_order_received_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_received_display'));?> - input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?> + input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?> input('all_paid', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_paid'], 'class'=>'yesNo'));?> input('all_sent', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_sent'], 'class'=>'yesNo'));?> input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>''));?> - input('sale_category', array('id'=>$job['Job']['id'].'_sale_category', 'options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?> + input('sale_category', array('id'=>$job['Job']['id'].'_sale_category', 'options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?> - input('job_type', array('options'=>$job_type_options, 'label' => false, 'selected'=>$job['Job']['job_type']));?> -input('shipment_category', array('options'=>$shipment_category_options, - 'type'=>'select','label'=>false,'value'=>$job['Job']['shipment_category']));?> + input('job_type', array('options'=>$job_type_options, 'label' => false, 'selected'=>$job['Job']['job_type']));?> + input('shipment_category', array('options'=>$shipment_category_options, + 'type'=>'select','label'=>false,'value'=>$job['Job']['shipment_category']));?> link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?> link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?> link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?> link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id'])); - } - echo $poString; - ?> +} +echo $poString; +?> element('isEmptyDate', array('date'=>$po['issue_date'])); echo "
"; - } - ?> +} +?> link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?> - input('customer_order_number', array('value'=>$job['Job']['customer_order_number'], 'label'=>false));?> + input('customer_order_number', array('value'=>$job['Job']['customer_order_number'], 'label'=>false));?> - "; - } - ?> +} +?> - input('date_scheduled_ex_works_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_scheduled_ex_works_display'));?> - input('date_scheduled_ex_works', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_scheduled_ex_works', 'value'=>$job['Job']['date_scheduled_ex_works'])); ?> + input('date_scheduled_ex_works_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_scheduled_ex_works_display'));?> + input('date_scheduled_ex_works', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_scheduled_ex_works', 'value'=>$job['Job']['date_scheduled_ex_works'])); ?> - input('date_order_sent_to_customer_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_sent_to_customer_display'));?> - input('date_order_sent_to_customer', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_sent_to_customer', 'value'=>$job['Job']['date_order_sent_to_customer'])); ?> + input('date_order_sent_to_customer_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_sent_to_customer_display'));?> + input('date_order_sent_to_customer', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_sent_to_customer', 'value'=>$job['Job']['date_order_sent_to_customer'])); ?> input('domestic_freight_paid_by', array('type'=>'select','options'=>$freight_paid_by_options, 'value'=>$job['Job']['domestic_freight_paid_by'], 'label'=>false));?> - input('currency_id', array('id'=>$job['Job']['id']."_currency_id",'value'=>$job['Job']['currency_id'], 'type'=>'select', 'options'=>$currencies, 'label'=>false ));?> + input('currency_id', array('id'=>$job['Job']['id']."_currency_id",'value'=>$job['Job']['currency_id'], 'type'=>'select', 'options'=>$currencies, 'label'=>false ));?> - input('company_gross_sales_aud', array('id'=>$job['Job']['id']."_company_gross_sales_aud", 'value'=>$job['Job']['company_gross_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?> + input('company_gross_sales_aud', array('id'=>$job['Job']['id']."_company_gross_sales_aud", 'value'=>$job['Job']['company_gross_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?> - input('net_sales_aud', array('id'=>$job['Job']['id']."_net_sales_aud",'value'=>$job['Job']['net_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?> + input('net_sales_aud', array('id'=>$job['Job']['id']."_net_sales_aud",'value'=>$job['Job']['net_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?> input('gross_profit_aud', array('id'=>$job['Job']['id']."_gross_profit_aud",'value'=>$job['Job']['gross_profit_aud'], 'label'=>false,'class'=>'aust_sale_aud' ));?> - input('net_export_sales_aud', array('id'=>$job['Job']['id']."_net_export_sales_aud",'value'=>$job['Job']['net_export_sales_aud'], 'label'=>false,'class'=>'export_sale_aud' ));?> + input('net_export_sales_aud', array('id'=>$job['Job']['id']."_net_export_sales_aud",'value'=>$job['Job']['net_export_sales_aud'], 'label'=>false,'class'=>'export_sale_aud' ));?> - input('gross_profit_exports_aud', array('id'=>$job['Job']['id']."_gross_profit_exports_aud",'value'=>$job['Job']['gross_profit_exports_aud'], 'label'=>false,'class'=>'export_sale_aud'));?> + input('gross_profit_exports_aud', array('id'=>$job['Job']['id']."_gross_profit_exports_aud",'value'=>$job['Job']['gross_profit_exports_aud'], 'label'=>false,'class'=>'export_sale_aud'));?> - input('gp_percent', array('id'=>$job['Job']['id']."_gp_percent",'value'=>$job['Job']['gp_percent'], 'label'=>false));?> + input('gp_percent', array('id'=>$job['Job']['id']."_gp_percent",'value'=>$job['Job']['gp_percent'], 'label'=>false));?> - input('ato_exchange_rate', array('id'=>$job['Job']['id']."_ato_exchange_rate",'value'=>$job['Job']['ato_exchange_rate'], 'label'=>false, 'class'=>'exchange_rate'));?> + input('ato_exchange_rate', array('id'=>$job['Job']['id']."_ato_exchange_rate",'value'=>$job['Job']['ato_exchange_rate'], 'label'=>false, 'class'=>'exchange_rate'));?> input('gross_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_australian_sales_foreign_currency",'value'=>$job['Job']['gross_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?> - input('net_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_net_australian_sales_foreign_currency",'value'=>$job['Job']['net_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?> + input('net_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_net_australian_sales_foreign_currency",'value'=>$job['Job']['net_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?> input('gross_profit_value_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_profit_value_australian_sales_foreign_currency",'value'=>$job['Job']['gross_profit_value_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?> - input('gross_export_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_export_sales_foreign_currency",'value'=>$job['Job']['gross_export_sales_foreign_currency'], 'label'=>false, 'class'=>'export_sale_fc'));?> + input('gross_export_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_export_sales_foreign_currency",'value'=>$job['Job']['gross_export_sales_foreign_currency'], 'label'=>false, 'class'=>'export_sale_fc'));?> input('net_export_sales_foreign_currency', array('id'=>$job['Job']['id']."_net_export_sales_foreign_currency",'value'=>$job['Job']['net_export_sales_foreign_currency'], 'label'=>false,'class'=>'export_sale_fc'));?> 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, 'class'=>'commissions_any_currency'));?> + 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,'class'=>'commissions_any_currency'));?> - \ No newline at end of file +