projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-8' of https://github.com/gjones2/Freeside (#13854 as this bug...
[freeside.git]
/
FS
/
FS
/
part_export
/
http.pm
diff --git
a/FS/FS/part_export/http.pm
b/FS/FS/part_export/http.pm
index
55d8329
..
0d62409
100644
(file)
--- a/
FS/FS/part_export/http.pm
+++ b/
FS/FS/part_export/http.pm
@@
-1,12
+1,10
@@
package FS::part_export::http;
package FS::part_export::http;
-use vars qw(@ISA %info);
+use base qw( FS::part_export );
+use vars qw( %options %info );
use Tie::IxHash;
use Tie::IxHash;
-use FS::part_export;
-@ISA = qw(FS::part_export);
-
-tie my %options, 'Tie::IxHash',
+tie %options, 'Tie::IxHash',
'method' => { label =>'Method',
type =>'select',
#options =>[qw(POST GET)],
'method' => { label =>'Method',
type =>'select',
#options =>[qw(POST GET)],
@@
-35,12
+33,29
@@
tie my %options, 'Tie::IxHash',
default => join("\n",
),
},
default => join("\n",
),
},
+ 'suspend_data' => {
+ label => 'Suspend data',
+ type => 'textarea',
+ default => join("\n",
+ ),
+ },
+ 'unsuspend_data' => {
+ label => 'Unsuspend data',
+ type => 'textarea',
+ default => join("\n",
+ ),
+ },
+ 'success_regexp' => {
+ label => 'Success Regexp',
+ default => '',
+ },
;
%info = (
'svc' => 'svc_domain',
'desc' => 'Send an HTTP or HTTPS GET or POST request',
'options' => \%options,
;
%info = (
'svc' => 'svc_domain',
'desc' => 'Send an HTTP or HTTPS GET or POST request',
'options' => \%options,
+ 'no_machine' => 1,
'notes' => <<'END'
Send an HTTP or HTTPS GET or POST to the specified URL. For HTTPS support,
<a href="http://search.cpan.org/dist/Crypt-SSLeay">Crypt::SSLeay</a>
'notes' => <<'END'
Send an HTTP or HTTPS GET or POST to the specified URL. For HTTPS support,
<a href="http://search.cpan.org/dist/Crypt-SSLeay">Crypt::SSLeay</a>
@@
-61,14
+76,29
@@
sub _export_delete {
$self->_export_command('delete', @_);
}
$self->_export_command('delete', @_);
}
+sub _export_suspend {
+ my $self = shift;
+ $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+ my $self = shift;
+ $self->_export_command('unsuspend', @_);
+}
+
sub _export_command {
my( $self, $action, $svc_x ) = ( shift, shift, shift );
return unless $self->option("${action}_data");
sub _export_command {
my( $self, $action, $svc_x ) = ( shift, shift, shift );
return unless $self->option("${action}_data");
+ my $cust_main = $svc_x->table eq 'cust_main'
+ ? $svc_x
+ : $svc_x->cust_svc->cust_pkg->cust_main;
+
$self->http_queue( $svc_x->svcnum,
$self->option('method'),
$self->option('url'),
$self->http_queue( $svc_x->svcnum,
$self->option('method'),
$self->option('url'),
+ $self->option('success_regexp'),
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
@@
-85,12
+115,19
@@
sub _export_replace {
return unless $self->option('replace_data');
return unless $self->option('replace_data');
- $self->http_queue( $svc_x->svcnum,
+ my $new_cust_main = $new->table eq 'cust_main'
+ ? $new
+ : $new->cust_svc->cust_pkg->cust_main;
+ my $cust_main = $new_cust_main; #so folks can use $new_cust_main or $cust_main
+
+ $self->http_queue( $new->svcnum,
$self->option('method'),
$self->option('url'),
$self->option('method'),
$self->option('url'),
+ $self->option('success_regexp'),
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
map {
/^\s*(\S+)\s+(.*)$/ or /()()/;
my( $field, $value_expression ) = ( $1, $2 );
+ my $value = eval $value_expression;
die $@ if $@;
( $field, $value );
} split(/\n/, $self->option('replace_data') )
die $@ if $@;
( $field, $value );
} split(/\n/, $self->option('replace_data') )
@@
-100,15
+137,13
@@
sub _export_replace {
sub http_queue {
my($self, $svcnum) = (shift, shift);
sub http_queue {
my($self, $svcnum) = (shift, shift);
- my $queue = new FS::queue {
- 'svcnum' => $svcnum,
- 'job' => "FS::part_export::http::http",
- };
+ my $queue = new FS::queue { 'job' => "FS::part_export::http::http" };
+ $queue->svcnum($svcnum) if $svcnum;
$queue->insert( @_ );
}
sub http {
$queue->insert( @_ );
}
sub http {
- my($method, $url, @data) = @_;
+ my($method, $url,
$success_regexp,
@data) = @_;
$method = lc($method);
$method = lc($method);
@@
-128,6
+163,11
@@
sub http {
die $response->error_as_HTML if $response->is_error;
die $response->error_as_HTML if $response->is_error;
+ if(length($success_regexp) > 1) {
+ my $response_content = $response->content;
+ die $response_content unless $response_content =~ /$success_regexp/;
+ }
+
}
1;
}
1;