X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_domain.cgi;h=3fd898ba5cc9c83ff1321ef8367dab7eac62a539;hp=1e93b946145c3ed2fbb156a1b47f4a2f29133efb;hb=e17528c356bb137bcff4c6934a2c7e254202838e;hpb=0cbb171da2cf3c7059612c0f2fbcf4a8bb80ab58
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 1e93b9461..3fd898ba5 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,20 +1,49 @@
-<% include("/elements/header.html",'Domain View', menubar(
- ( ( $pkgnum || $custnum )
- ? ( "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
- )
- : ( "Delete this (unaudited) domain" =>
- "javascript:areyousure('${p}misc/cancel-unaudited.cgi?$svcnum', 'Delete $domain and all records?' )" )
- )
-)) %>
+% if ( $custnum ) {
+
+%# <% include("/elements/header.html","View $svcdomain") %>
+ <% include("/elements/header.html","View domain") %>
+ <% include( '/elements/small_custview.html', $custnum, '', 1,
+ "${p}view/cust_main.cgi") %>
+
+
+% } else {
+
+ <% include("/elements/header.html",'View domain', menubar(
+ "Cancel this (unaudited) domain" =>
+ "javascript:areyousure('${p}misc/cancel-unaudited.cgi?$svcnum', 'Delete $domain and all records?')",
+ ))
+ %>
+
+% }
<% include('/elements/error.html') %>
-Service #<% $svcnum %>
-
Service: <% $part_svc->svc %>
-
Domain name: <% $domain %>
+Service #<% $svcnum %>
+% #if ( $conf->exists('svc_domain-edit_domain') ) {
+ | Edit this domain
+% #}
+
+<% &ntable("#cccccc") %>
<% &ntable("#cccccc",2) %>
+
+ |
+ Service |
+ <% $part_svc->svc %> |
+
+
+
+ Domain |
+
+ <% $domain %>
+ (view whois information)
+ |
+
+
% if ($export) {
-
Status: <% $status %>
-% if ( $FS::CurrentUser::CurrentUser->access_right('Change customer service') ) {
+
+ Registration status |
+ <% $status %>
+
+% if ( $FS::CurrentUser::CurrentUser->access_right('Manage domain registration') ) {
% if ( defined($ops{'register'}) ) {
Register at <% $registrar->{'name'} %>
% }
@@ -22,32 +51,62 @@ Service #<% $svcnum %>
Transfer to <% $registrar->{'name'} %>
% }
% if ( defined($ops{'renew'}) ) {
-
+ Renew at <% $registrar->{'name'} %>
% }
% if ( defined($ops{'revoke'}) ) {
Revoke
% }
% }
+
+ |
+
+% }
+
+% if ( $communigate ) {
+
+
+ Administrator domain |
+
+% if ( $svc_domain->parent_svcnum ) {
+% #XXX agent-virt aware the link
+ <% $svc_domain->parent_svc_x->domain %>
+% } else {
+ (none)
+% }
+ |
+
+
+
+ Aliases |
+ <% $svc_domain->cgp_aliases %> |
+
+
% }
+% if ( $communigate && $svc_domain->max_accounts ) {
+
+ Maximum number of Accounts |
+ <% $svc_domain->max_accounts %> |
+
+% }
+
+
+ Catch all email |
+ <% $email ? "$email" : '(none)' %>
% if ( $FS::CurrentUser::CurrentUser->access_right('Edit domain catchall') ) {
- Catch all email (change):
-% } else {
- Catch all email:
+ (change)
% }
+ |
+
+
+
+ Enabled services |
+ <% $svc_domain->cgp_accessmodes %> |
+
+
+
+
-<% $email ? "$email" : "(none)" %>
-
View whois information.
-
+DNS records
% my @records; if ( @records = $svc_domain->domain_record ) {
<% include('/elements/table-grid.html') %>
@@ -88,7 +148,7 @@ Service #<% $svcnum %>
% ) {
% ( my $recdata = $domain_record->recdata ) =~ s/"/\\'\\'/g;
(delete)
-% }
+% }
@@ -105,7 +165,6 @@ Service #<% $svcnum %>
% }
% if ( $FS::CurrentUser::CurrentUser->access_right('Edit domain nameservice') ) {
-
-
- or
-
-
% }
+
-
+<% include('elements/svc_export_settings.html', $svc_domain) %>
<% joblisting({'svcnum'=>$svcnum}, 1) %>
@@ -149,6 +205,8 @@ Service #<% $svcnum %>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('View customer services');
+my $conf = new FS::Conf;
+
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
my $svcnum = $1;
@@ -159,7 +217,9 @@ my $svc_domain = qsearchs({
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
' LEFT JOIN cust_main USING ( custnum ) ',
'hashref' => {'svcnum'=>$svcnum},
- 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+ 'null_right' => 'View/link unlinked services'
+ ),
});
die "Unknown svcnum" unless $svc_domain;
@@ -187,19 +247,16 @@ if ($svc_domain->catchall) {
my $domain = $svc_domain->domain;
-my $status = 'Unknown';
-my %ops = ();
-
-my @exports = $part_svc->part_export();
-
-my $registrar;
-my $export;
+my $communigate = scalar($part_svc->part_export('communigate_pro'));
+ # || scalar($part_svc->part_export('communigate_pro_singledomain'));
# Find the first export that does domain registration
-foreach (@exports) {
- $export = $_ if $_->can('registrar');
-}
+my @exports = grep $_->can('registrar'), $part_svc->part_export;
+my $export = $exports[0];
# If we have a domain registration export, get the registrar object
+my $registrar;
+my $status = 'Unknown';
+my %ops = ();
if ($export) {
$registrar = $export->registrar;
my $domstat = $export->get_status( $svc_domain );