[freeside-commits] freeside/httemplate/edit svc_acct.cgi, 1.53.2.3, 1.53.2.4 part_svc.cgi, 1.62.2.2, 1.62.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv18028/httemplate/edit

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_acct.cgi part_svc.cgi 
Log Message:
communigate, RT#7083

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.62.2.2
retrieving revision 1.62.2.3
diff -u -d -r1.62.2.2 -r1.62.2.3
--- part_svc.cgi	25 Jan 2010 22:17:29 -0000	1.62.2.2
+++ part_svc.cgi	21 Feb 2010 03:16:04 -0000	1.62.2.3
@@ -292,6 +292,7 @@
 %        } elsif ( $def->{type} eq 'select-svc_pbx.html' ) {
 %
 %          $html .= include('/elements/select-svc_pbx.html',
+%                             'curr_value'   => $value,
 %                             'element_name' => "${layer}__${field}",
 %                             'element_etc'  => $disabled,
 %                             'multiple'     => ($flag eq 'S'),
@@ -305,6 +306,14 @@
 %          $html .= FS::svc_acct::radius_usergroup_selector(
 %            [ split(',', $value) ], "${layer}__${field}" );
 %
+%        } elsif ( $def->{type} eq 'communigate_pro-accessmodes' ) {
+%
+%          $html .= include('/elements/communigate_pro-accessmodes.html',
+%                             'element_name_prefix' => "${layer}__${field}_",
+%                             'curr_value'          => $value,
+%                             #doesn't work#'element_etc'  => $disabled,
+%                          );
+%
 %        } elsif ( $def->{type} eq 'disabled' ) {
 %
 %          $html .=

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.53.2.3
retrieving revision 1.53.2.4
diff -u -d -r1.53.2.3 -r1.53.2.4
--- svc_acct.cgi	20 Feb 2010 22:33:10 -0000	1.53.2.3
+++ svc_acct.cgi	21 Feb 2010 03:16:04 -0000	1.53.2.4
@@ -243,7 +243,9 @@
 % } 
 
 
-% if ( $communigate ) {
+% if ( $communigate
+%      && $part_svc->part_svc_column('cgp_type')->columnflag ne 'F' )
+% {
 
   <TR>
     <TD ALIGN="right">Mailbox type</TD>
@@ -258,17 +260,27 @@
     </TD>
   </TR>
 
-    <TR>
+% } else {
+    <INPUT TYPE="hidden" NAME="cgp_type" VALUE="<% $svc_acct->cgp_type() %>">
+% }
+
+
+% if ( $communigate
+%      && $part_svc->part_svc_column('cgp_accessmodes')->columnflag ne 'F' )
+% {
+
   <TR>
-    <TD ALIGN="right">Mailbox type</TD>
-    <TD>XXX checkbox thingie!!
+    <TD ALIGN="right">Enabled services</TD>
+    <TD>
+      <% include( '/elements/communigate_pro-accessmodes.html',
+                    'curr_value' => $svc_acct->cgp_accessmodes,
+                )
+      %>
     </TD>
   </TR>
-   
 
 % } else {
-    <INPUT TYPE="hidden" NAME="cgp_type" VALUE="<% $svc_acct->cgp_type() %>">
-    <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_acct->cgp_accessmodes() %>">
+    <INPUT TYPE="hidden" NAME="cgp_accessmodes" VALUE="<% $svc_acct->cgp_accessmodes() |h %>">
 % }