projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eek, fix silly problem in invoice sending refactoring
[freeside.git]
/
FS
/
FS
/
part_export.pm
diff --git
a/FS/FS/part_export.pm
b/FS/FS/part_export.pm
index
061f07d
..
3f677b2
100644
(file)
--- a/
FS/FS/part_export.pm
+++ b/
FS/FS/part_export.pm
@@
-377,31
+377,33
@@
sub option {
$part_export_option ? $part_export_option->optionvalue : '';
}
$part_export_option ? $part_export_option->optionvalue : '';
}
-=item rebless
+=item
_
rebless
Reblesses the object into the FS::part_export::EXPORTTYPE class, where
EXPORTTYPE is the object's I<exporttype> field. There should be better docs
Reblesses the object into the FS::part_export::EXPORTTYPE class, where
EXPORTTYPE is the object's I<exporttype> field. There should be better docs
-on how to create new exports (and they should live in their own files and be
-autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
+on how to create new exports, but until then, see L</NEW EXPORT CLASSES>.
=cut
=cut
-sub rebless {
+sub
_
rebless {
my $self = shift;
my $exporttype = $self->exporttype;
my $class = ref($self). "::$exporttype";
eval "use $class;";
my $self = shift;
my $exporttype = $self->exporttype;
my $class = ref($self). "::$exporttype";
eval "use $class;";
- die $@ if $@;
- bless($self, $class);
+ #die $@ if $@;
+ bless($self, $class) unless $@;
+ $self;
}
}
+#these should probably all go away, just let the subclasses define em
+
=item export_insert SVC_OBJECT
=cut
sub export_insert {
my $self = shift;
=item export_insert SVC_OBJECT
=cut
sub export_insert {
my $self = shift;
- $self->rebless;
+
#
$self->rebless;
$self->_export_insert(@_);
}
$self->_export_insert(@_);
}
@@
-420,7
+422,7
@@
sub export_insert {
sub export_replace {
my $self = shift;
sub export_replace {
my $self = shift;
- $self->rebless;
+
#
$self->rebless;
$self->_export_replace(@_);
}
$self->_export_replace(@_);
}
@@
-430,7
+432,7
@@
sub export_replace {
sub export_delete {
my $self = shift;
sub export_delete {
my $self = shift;
- $self->rebless;
+
#
$self->rebless;
$self->_export_delete(@_);
}
$self->_export_delete(@_);
}
@@
-440,7
+442,7
@@
sub export_delete {
sub export_suspend {
my $self = shift;
sub export_suspend {
my $self = shift;
- $self->rebless;
+
#
$self->rebless;
$self->_export_suspend(@_);
}
$self->_export_suspend(@_);
}
@@
-450,7
+452,7
@@
sub export_suspend {
sub export_unsuspend {
my $self = shift;
sub export_unsuspend {
my $self = shift;
- $self->rebless;
+
#
$self->rebless;
$self->_export_unsuspend(@_);
}
$self->_export_unsuspend(@_);
}
@@
-513,7
+515,7
@@
on the export:
sub export_info {
#warn $_[0];
sub export_info {
#warn $_[0];
- return $exports{$_[0]} if @_;
+ return $exports{$_[0]}
|| {}
if @_;
#{ map { %{$exports{$_}} } keys %exports };
my $r = { map { %{$exports{$_}} } keys %exports };
}
#{ map { %{$exports{$_}} } keys %exports };
my $r = { map { %{$exports{$_}} } keys %exports };
}