X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_cert.cgi;h=dc2cc3200485eb4554db018ab59a3292d785f4d2;hb=67d171a04ecbccbfd7d5fc2f1be2810299008c15;hp=89460f3e33a2fe4a3dc4a1f4d62e3e688ca302c0;hpb=2d73473ce78c22160b618e93802a9551c9c77d69;p=freeside.git
diff --git a/httemplate/edit/svc_cert.cgi b/httemplate/edit/svc_cert.cgi
index 89460f3e3..dc2cc3200 100644
--- a/httemplate/edit/svc_cert.cgi
+++ b/httemplate/edit/svc_cert.cgi
@@ -12,92 +12,112 @@
| Private key |
-% if ( $svc_cert->privatekey && $svc_cert->check_privatekey ) {
- Verification OK
-% # remove key & cert link? just unprovision?
- |
-
-
-% my $cust_main = $svc_cert->cust_svc->cust_pkg->cust_main;
-
- | Organization |
- |
-
+% if ( $svc_cert->privatekey && $svc_cert->check_privatekey ) {
-
- | Organization Unit |
- |
-
+ Verification OK
+% # remove key & cert link? just unprovision?
-
- | City |
- <% include('/elements/city.html',
- 'city' => $svc_cert->city || $cust_main->city,
- 'state' => $svc_cert->state || $cust_main->state,
- 'country' => $svc_cert->country || $cust_main->country,
- )
- %>
- |
-
+
-
- | State |
- <% include('/elements/select-state.html',
- 'city' => $svc_cert->city || $cust_main->city,
- 'state' => $svc_cert->state || $cust_main->state,
- 'country' => $svc_cert->country || $cust_main->country,
- )
- %>
- |
-
+% if (0) { #( $svc_cert->csr_submitted ) { #XXX add field? date? }
-
- | City |
- <% include('/elements/select-country.html',
- 'city' => $svc_cert->city || $cust_main->city,
- 'state' => $svc_cert->state || $cust_main->state,
- 'country' => $svc_cert->country || $cust_main->country,
- )
- %>
- |
-
+% # just show the fields once the csr has been submitted
% } else {
-% my $re = '';
-% if ( $svc_cert->privatekey ) {
- Verification error
-% $re = 'Clear and Re-';
-% }
- <% include('/elements/popup_link.html', {
- 'action' => "svc_cert/generate_privatekey.html$link_query",
- 'label' => $re.'Generate',
- 'actionlabel' => 'Generate private key',
- #opt
- 'width' => '350',
- 'height' => '150'
- #'color' => '#ff0000',
- #'closetext' => 'Go Away', # the value '' removes the link
- })%>
-
- or
-
- <% include('/elements/popup_link.html', {
- 'action' => "svc_cert/import_privatekey.html$link_query",
- 'label' => $re.'Import',
- 'actionlabel' => 'Import private key',
- #opt
- 'width' => '544',
- 'height' => '368',
- #'color' => '#ff0000',
- #'closetext' => 'Go Away', # the value '' removes the link
- })%>
-% if ( $svc_cert->privatekey ) {
-<% $svc_cert->privatekey |h %>
-% }
+
+% my $cust_main = $svc_cert->cust_svc->cust_pkg->cust_main;
+
+
+ | Common name |
+ |
+
+
+
+ | Organization |
+ |
+
+
+
+ | Organization Unit |
+ |
+
+
+
+ | City |
+ <% include('/elements/city.html',
+ 'city' => $svc_cert->city || $cust_main->city,
+ 'state' => $svc_cert->state || $cust_main->state,
+ 'country' => $svc_cert->country || $cust_main->country,
+ )
+ %>
+ |
+
+
+
+ | State |
+ <% include('/elements/select-state.html',
+ 'city' => $svc_cert->city || $cust_main->city,
+ 'state' => $svc_cert->state || $cust_main->state,
+ 'country' => $svc_cert->country || $cust_main->country,
+ )
+ %>
+ |
+
+
+
+ | Country |
+ <% include('/elements/select-country.html',
+ 'city' => $svc_cert->city || $cust_main->city,
+ 'state' => $svc_cert->state || $cust_main->state,
+ 'country' => $svc_cert->country || $cust_main->country,
+ )
+ %>
+ |
+
+
+
+ | Contact email |
+ |
+
+
+% }
+
+% } else {
+% my $re = '';
+% if ( $svc_cert->privatekey ) {
+ Verification error
+% $re = 'Clear and Re-';
+% }
+ <% include('/elements/popup_link.html', {
+ 'action' => "svc_cert/generate_privatekey.html$link_query",
+ 'label' => $re.'Generate',
+ 'actionlabel' => 'Generate private key',
+ #opt
+ 'width' => '350',
+ 'height' => '150'
+ #'color' => '#ff0000',
+ #'closetext' => 'Go Away', # the value '' removes the link
+ })%>
+
+ or
+
+ <% include('/elements/popup_link.html', {
+ 'action' => "svc_cert/import_privatekey.html$link_query",
+ 'label' => $re.'Import',
+ 'actionlabel' => 'Import private key',
+ #opt
+ 'width' => '544',
+ 'height' => '368',
+ #'color' => '#ff0000',
+ #'closetext' => 'Go Away', # the value '' removes the link
+ })%>
+% if ( $svc_cert->privatekey ) {
+ <% $svc_cert->privatekey |h %>
+% }
-% }
+% }
@@ -165,8 +185,6 @@ my $action = $svcnum ? 'Edit' : 'Add';
my $svc = $part_svc->getfield('svc');
-#my $otaker = getotaker;
-
my $p1 = popurl(1);
my $link_query = "?svcnum=$svcnum;pkgnum=$pkgnum;svcpart=$svcpart";