[freeside-commits] branch master updated. 0af38652da3b3be7da2d35b048285ef6f2194e1a

[Ivan]

The branch, master has been updated
       via  0af38652da3b3be7da2d35b048285ef6f2194e1a (commit)
       via  a8e1cb65cd92239721b8e81ef9fdf99f60fb3c3c (commit)
       via  916836bcfff6d378e3bbdfde981bcf496b5c527c (commit)
      from  51b5bd15c154065a9a0f521565bd6187609c8348 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0af38652da3b3be7da2d35b048285ef6f2194e1a
Merge: a8e1cb6 51b5bd1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 4 20:25:37 2012 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit a8e1cb65cd92239721b8e81ef9fdf99f60fb3c3c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 4 20:22:19 2012 -0700

    fix quantity-less ordering

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index ba4c5b1..3063198 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -48,9 +48,9 @@ die 'unknown custnum' unless $cust_main;
 $cgi->param('pkgpart') =~ /^(\d+)$/
   or die 'illegal pkgpart '. $cgi->param('pkgpart');
 my $pkgpart = $1;
-$cgi->param('quantity') =~ /^(\d+)$/
+$cgi->param('quantity') =~ /^(\d*)$/
   or die 'illegal quantity '. $cgi->param('quantity');
-my $quantity = $1;
+my $quantity = $1 || 1;
 $cgi->param('refnum') =~ /^(\d*)$/
   or die 'illegal refnum '. $cgi->param('refnum');
 my $refnum = $1;

commit 916836bcfff6d378e3bbdfde981bcf496b5c527c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 4 20:14:51 2012 -0700

    fix unlinked service display, fallout from RT#17067

diff --git a/httemplate/elements/table-tickets.html b/httemplate/elements/table-tickets.html
index 6d1a45a..ffcaf06 100644
--- a/httemplate/elements/table-tickets.html
+++ b/httemplate/elements/table-tickets.html
@@ -94,12 +94,12 @@ View
 </TABLE>
 
 <%init>
-use Date::Parse qw(str2time);
-use Date::Format qw(time2str);
 
 my %opt = @_;
 my $conf = new FS::Conf;
 
+return '' unless $conf->config('ticket_system');
+
 my $object = $opt{'object'};
 $object = $object->cust_svc if $object->isa('FS::svc_Common');
 my( @tickets )  = $object->tickets;
@@ -116,8 +116,10 @@ if ( $object->isa('FS::cust_main') ) {
                     $object->custnum,
                     { 'statuses' => [ 'resolved' ] }
                   );
-}
-elsif ( $object->isa('FS::cust_svc') ) {
+} elsif ( $object->isa('FS::cust_svc') ) {
+
+  return '' unless $object->pkgnum;
+
   $thing = 'service';
   $open_link = FS::TicketSystem->href_service_tickets($object->svcnum);
 
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 04d2b29..f7c685c 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -114,9 +114,7 @@ function areyousure(href) {
 
 % }
 
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 3ad21bb..1995913 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -76,9 +76,7 @@
 
 <& elements/svc_export_settings.html, $svc_acct &>
 
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <BR>
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index fcccd74..c9592a5 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -36,9 +36,7 @@
 
 <% include('elements/svc_export_settings.html', $svc_domain) %>
 
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 72e5535..077dc77 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -24,9 +24,7 @@
 
 </TABLE></TD></TR></TABLE>
 
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <BR><% joblisting({'svcnum'=>$svcnum}, 1) %>
 
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 2cb78eb..75c8f5c 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -53,9 +53,7 @@
 
 <% include('elements/svc_export_settings.html', $svc_forward) %>
 
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index fbb02a0..f51c760 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -49,9 +49,7 @@
 </TABLE>
 
 <BR>
-% if ( $conf->config('ticket_system') ) {
 <& /elements/table-tickets.html, object => $cust_svc &>
-% }
 
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/process/quick-cust_pkg.cgi |    4 ++--
 httemplate/elements/table-tickets.html     |   10 ++++++----
 httemplate/view/elements/svc_Common.html   |    2 --
 httemplate/view/svc_acct.cgi               |    2 --
 httemplate/view/svc_domain.cgi             |    2 --
 httemplate/view/svc_external.cgi           |    2 --
 httemplate/view/svc_forward.cgi            |    2 --
 httemplate/view/svc_www.cgi                |    2 --
 8 files changed, 8 insertions(+), 18 deletions(-)