From d86c2687d55370e9aee258b7ed9b34ab181ffbf1 Mon Sep 17 00:00:00 2001 From: levinse Date: Thu, 4 Nov 2010 23:39:34 +0000 Subject: [PATCH] Fix display of export option defaults for all HTTP exports --- FS/FS/part_export/acct_http.pm | 58 +++++++++++++++++++++++++------------ FS/FS/part_export/cust_http.pm | 66 ++++++++++++++++++++++++++++-------------- 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/FS/FS/part_export/acct_http.pm b/FS/FS/part_export/acct_http.pm index d6b7d38a0..b4c64ac62 100644 --- a/FS/FS/part_export/acct_http.pm +++ b/FS/FS/part_export/acct_http.pm @@ -6,24 +6,46 @@ use Tie::IxHash; @ISA = qw( FS::part_export::http ); -tie my %options, 'Tie::IxHash', %FS::part_export::http::options; - -$options{'insert_data'}->{'default'} = join("\n", - "action 'add'", - "username \$svc_x->username", - "password \$svc_x->_password", - "prismid \$cust_main->agent_custid ? \$cust_main->agent_custid : \$cust_main->custnum ", - "name \$cust_main->first.' '.\$cust_main->last", -); -$options{'delete_data'}->{'default'} = join("\n", - "action 'remove'", - "username \$svc_x->username", -); -$options{'replace_data'}->{'default'} = join("\n", - "action 'update'", - "username \$old->username", - "password \$new->_password", -); +tie %options, 'Tie::IxHash', + 'method' => { label =>'Method', + type =>'select', + #options =>[qw(POST GET)], + options =>[qw(POST)], + default =>'POST' }, + 'url' => { label => 'URL', default => 'http://', }, + 'insert_data' => { + label => 'Insert data', + type => 'textarea', + default => join("\n", + "action 'add'", + "username \$svc_x->username", + "password \$svc_x->_password", + "prismid \$cust_main->agent_custid ? \$cust_main->agent_custid : \$cust_main->custnum ", + "name \$cust_main->first.' '.\$cust_main->last", + ), + }, + 'delete_data' => { + label => 'Delete data', + type => 'textarea', + default => join("\n", + "action 'remove'", + "username \$svc_x->username", + ), + }, + 'replace_data' => { + label => 'Replace data', + type => 'textarea', + default => join("\n", + "action 'update'", + "username \$old->username", + "password \$new->_password", + ), + }, + 'success_regexp' => { + label => 'Success Regexp', + default => '', + }, +; %info = ( 'svc' => 'svc_acct', diff --git a/FS/FS/part_export/cust_http.pm b/FS/FS/part_export/cust_http.pm index 59503e811..e8b677be2 100644 --- a/FS/FS/part_export/cust_http.pm +++ b/FS/FS/part_export/cust_http.pm @@ -6,28 +6,50 @@ use Tie::IxHash; @ISA = qw( FS::part_export::http ); -tie my %options, 'Tie::IxHash', %FS::part_export::http::options; - -$options{'insert_data'}->{'default'} = join("\n", - "action 'insert'", - "custnum \$cust_main->custnum", - "first \$cust_main->first", - "last \$cust_main->get('last')", - ( map "$_ \$cust_main->$_", qw( company address1 address2 city county state zip country daytime night fax last ) ), - "email \$cust_main->invoicing_list_emailonly_scalar", -); -$options{'delete_data'}->{'default'} = join("\n", - "action 'delete'", - "custnum \$cust_main->custnum", -); -$options{'replace_data'}->{'default'} = join("\n", - "action 'replace'", - "custnum \$new_cust_main->custnum", - "first \$new_cust_main->first", - "last \$new_cust_main->get('last')", - ( map "$_ \$cust_main->$_", qw( company address1 address2 city county state zip country daytime night fax last ) ), - "email \$new_cust_main->invoicing_list_emailonly_scalar", -); +tie %options, 'Tie::IxHash', + 'method' => { label =>'Method', + type =>'select', + #options =>[qw(POST GET)], + options =>[qw(POST)], + default =>'POST' }, + 'url' => { label => 'URL', default => 'http://', }, + 'insert_data' => { + label => 'Insert data', + type => 'textarea', + default => join("\n", + "action 'insert'", + "custnum \$cust_main->custnum", + "first \$cust_main->first", + "last \$cust_main->get('last')", + ( map "$_ \$cust_main->$_", qw( company address1 address2 city county state zip country daytime night fax last ) ), + "email \$cust_main->invoicing_list_emailonly_scalar", + ), + }, + 'delete_data' => { + label => 'Delete data', + type => 'textarea', + default => join("\n", + "action 'delete'", + "custnum \$cust_main->custnum", + ), + }, + 'replace_data' => { + label => 'Replace data', + type => 'textarea', + default => join("\n", + "action 'replace'", + "custnum \$new_cust_main->custnum", + "first \$new_cust_main->first", + "last \$new_cust_main->get('last')", + ( map "$_ \$cust_main->$_", qw( company address1 address2 city county state zip country daytime night fax last ) ), + "email \$new_cust_main->invoicing_list_emailonly_scalar", + ), + }, + 'success_regexp' => { + label => 'Success Regexp', + default => '', + }, +; %info = ( 'svc' => 'cust_main', -- 2.11.0