projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
discounts, RT#6679
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
dd4f2c5
..
8ca30c2
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-140,8
+140,8
@@
otherwise returns false.
The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be
defined. An FS::cust_svc record will be created and inserted.
The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be
defined. An FS::cust_svc record will be created and inserted.
-The additional field I<action> should be set to I<N> for new domains
or
I<M>
-for transfers.
+The additional field I<action> should be set to I<N> for new domains
,
I<M>
+for transfers
, or I<I> for no action (registered elsewhere)
.
A registration or transfer email will be submitted unless
$FS::svc_domain::whois_hack is true.
A registration or transfer email will be submitted unless
$FS::svc_domain::whois_hack is true.
@@
-181,13
+181,6
@@
sub insert {
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- $error = $self->check;
- return $error if $error;
-
- return "Domain in use (here)"
- if qsearchs( 'svc_domain', { 'domain' => $self->domain } );
-
-
$error = $self->SUPER::insert(@_);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
$error = $self->SUPER::insert(@_);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
@@
-300,7
+293,7
@@
sub replace {
if $old->getfield('domain') ne $new->getfield('domain');
# Better to do it here than to force the caller to remember that svc_domain is weird.
if $old->getfield('domain') ne $new->getfield('domain');
# Better to do it here than to force the caller to remember that svc_domain is weird.
- $new->setfield(action => '
M
');
+ $new->setfield(action => '
I
');
my $error = $new->SUPER::replace($old, @_);
return $error if $error;
}
my $error = $new->SUPER::replace($old, @_);
return $error if $error;
}
@@
-392,6
+385,18
@@
sub check {
}
}
+sub _check_duplicate {
+ my $self = shift;
+
+ $self->lock_table;
+
+ if ( qsearchs( 'svc_domain', { 'domain' => $self->domain } ) ) {
+ return "Domain in use (here)";
+ } else {
+ return '';
+ }
+}
+
=item domain_record
=cut
=item domain_record
=cut