[Astpp-commit] SF.net SVN: astpp: [2160] trunk

[<dar...@us...>]

Revision: 2160
          http://astpp.svn.sourceforge.net/astpp/?rev=2160&view=rev
Author:   darrenkw
Date:     2007-11-17 15:15:16 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Resolved: [ 1827828 ] SIP user not created due to type = NULL
Also resolved an issue preventing pricelists from showing when creating a callshop.

Modified Paths:
--------------
    trunk/astpp-admin.cgi
    trunk/templates/account-create.tpl

Modified: trunk/astpp-admin.cgi
===================================================================
--- trunk/astpp-admin.cgi	2007-11-17 22:28:28 UTC (rev 2159)
+++ trunk/astpp-admin.cgi	2007-11-17 23:15:16 UTC (rev 2160)
@@ -2252,6 +2252,13 @@
         )
     );
     $template->param(
+	devicetype => popup_menu(
+            -name    => "devicetype",
+            -values  => \@devicetypes,
+            -default => $config->{rt_sip_type}
+          )
+    );
+    $template->param(
         sweep_menu => popup_menu( -name => "sweep", -values => \%sweeplist ) );
     $template->param( default_context => $config->{default_context} );
     $template->param(
@@ -10543,7 +10550,7 @@
         -values  => \@language,
         -default => $config->{default_language}
     );
-	@pricelists = $ASTPP->list_pricelists(reseller => $params->{logged_in_reseller});
+    @pricelists = $ASTPP->list_pricelists(reseller => $params->{logged_in_reseller});
     $pricelists = popup_menu(
         -name   => "pricelist",
         -values => \@pricelists
@@ -11273,6 +11280,7 @@
             '4' => gettext("Customer Service"),
             '5' => gettext("CallShops")
         );
+	$params->{logged_in_reseller} = $params->{username};
 
     }
     else {

Modified: trunk/templates/account-create.tpl
===================================================================
--- trunk/templates/account-create.tpl	2007-11-17 22:28:28 UTC (rev 2159)
+++ trunk/templates/account-create.tpl	2007-11-17 23:15:16 UTC (rev 2160)
@@ -60,7 +60,8 @@
 	<tr class="rowtwo">
 		<td><input type="text" name="postal_code"  size="20" /></td>
 		<td><input type="text" name="province"  size="20" /></td>
-	<td colspan=2><TMPL_VAR NAME="country_menu"></td>
+		<td colspan=2><TMPL_VAR NAME="country_menu"></td>
+		<td><TMPL_VAR NAME="devicetype"></td>
 	</tr>
 	<tr class="header">
 		<td>Telephone #1</td>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.