diff options
| author | levinse <levinse> | 2011-06-08 05:38:55 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-06-08 05:38:55 +0000 |
| commit | 9a59cc9d51350d7eefb25697cd0d99188f686ea5 (patch) | |
| tree | 76323a99701f5bd702663b228813c7b1b6a79c3b /httemplate/edit | |
| parent | c647fbae23dc64cdecb1c6fa6fee671cca7e8e7a (diff) | |
DID inventory/import / bulk DID orders - phase 2, RT12754
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/did_order.html | 8 | ||||
| -rw-r--r-- | httemplate/edit/process/did_order.html | 27 |
2 files changed, 25 insertions, 10 deletions
diff --git a/httemplate/edit/did_order.html b/httemplate/edit/did_order.html index 5837d438c..6912117de 100644 --- a/httemplate/edit/did_order.html +++ b/httemplate/edit/did_order.html @@ -12,6 +12,12 @@ { field => 'confirmed', type => 'hidden', }, + { field => 'received', + type => 'hidden', + }, + { field => 'submitted', + type => 'hidden', + }, { field => 'stock_or_customer', type => 'radio', options => [ 'Stock', 'Customer', ], @@ -104,12 +110,12 @@ my $javascript = <<END; if ( f.stock_or_customer_Stock.checked ) { custnum_search.disabled = true; custnum_select.disabled = true; + custnum.value = ''; } else if ( f.stock_or_customer_Customer.checked ) { custnum_search.disabled = false; custnum_select.disabled = false; } - custnum.value = ''; } /* o2m or something else is broken, can't put this in the actual diff --git a/httemplate/edit/process/did_order.html b/httemplate/edit/process/did_order.html index a7d30c36c..6a2884413 100644 --- a/httemplate/edit/process/did_order.html +++ b/httemplate/edit/process/did_order.html @@ -5,7 +5,7 @@ 'process_o2m' => { 'table' => 'did_order_item', 'fields' => [ qw( msanum npa latanum ratecenternum state - quantity ) ], + quantity custnum ) ], }, ) %> @@ -25,14 +25,23 @@ my $value_callback = sub { my @params = $cgi->param; foreach my $param ( @params ) { - next unless $param =~ /^(orderitemnum[0-9]+)_rc_new$/; - my $prefix = $1; - my $value = $cgi->param($param); - next unless $value =~ /^[A-Za-z0-9\- ]+$/; - my $rc = new FS::rate_center({ description => $value }); - my $error = $rc->insert; - die "error inserting new rate center: $error" if $error; - $cgi->param("${prefix}_ratecenternum",$rc->ratecenternum); + if ( $param =~ /^(orderitemnum[0-9]+)_rc_new$/ ) { + my $prefix = $1; + my $value = $cgi->param($param); + if( $value =~ /^[A-Za-z0-9\- ]+$/ ) { + my $rc = new FS::rate_center({ description => $value }); + my $error = $rc->insert; + die "error inserting new rate center: $error" if $error; + $cgi->param("${prefix}_ratecenternum",$rc->ratecenternum); + } + } + elsif ( $param =~ /^(orderitemnum[0-9]+)_custnum$/ ) { + my $prefix = $1; + my $value = $cgi->param($param); + if ( $value =~ /^\d+$/ ) { + $cgi->param("custnum",''); + } + } } </%init> |