diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-03-12 22:53:21 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-03-12 22:53:21 -0700 |
| commit | 5983b3190e9b59e90f9dffc6a9d80cdcdeaa151a (patch) | |
| tree | 9b6142e3873b468ee74761ff4d33983f58506eb6 | |
| parent | 821f900c5a594cdf3cff082e5d527eade23f2e18 (diff) | |
| parent | 7af9fc1ac91f9e8673f12849153d7ac2a5f900f2 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
| -rw-r--r-- | FS/FS/cust_pkg.pm | 8 | ||||
| -rw-r--r-- | FS/FS/cust_svc.pm | 3 | ||||
| -rw-r--r-- | FS/bin/freeside-ipifony-download | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 92aa43f8e..87acf0e52 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3337,6 +3337,12 @@ sub apply_usage { my $dbh = dbh; my $order = FS::Conf->new->config('cdr-minutes_priority'); + my $is_classnum; + if ( $classnum ) { + $is_classnum = ' part_pkg_usage_class.classnum = '.$classnum; + } else { + $is_classnum = ' part_pkg_usage_class.classnum IS NULL'; + } my @usage_recs = qsearch({ 'table' => 'cust_pkg_usage', 'addl_from' => ' JOIN part_pkg_usage USING (pkgusagepart)'. @@ -3346,7 +3352,7 @@ sub apply_usage { 'extra_sql' => " WHERE ( cust_pkg.pkgnum = $pkgnum OR ". " ( cust_pkg.custnum = $custnum AND ". " part_pkg_usage.shared IS NOT NULL ) ) AND ". - " part_pkg_usage_class.classnum = $classnum AND ". + $is_classnum . ' AND '. " cust_pkg_usage.minutes > 0", 'order_by' => " ORDER BY priority ASC", }); diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index b608b2349..bbf4eedf8 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -13,6 +13,7 @@ use FS::pkg_svc; use FS::domain_record; use FS::part_export; use FS::cdr; +use FS::UI::Web; #most FS::svc_ classes are autoloaded in svc_x emthod use FS::svc_acct; #this one is used in the cache stuff @@ -883,7 +884,7 @@ sub smart_search_param { my $extra_sql = ' WHERE '.join(' AND ', @extra_sql); #for agentnum my $addl_from = ' LEFT JOIN cust_pkg USING ( pkgnum )'. - ' LEFT JOIN cust_main USING ( custnum )'. + FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg'). ' LEFT JOIN part_svc USING ( svcpart )'; ( diff --git a/FS/bin/freeside-ipifony-download b/FS/bin/freeside-ipifony-download index e2d7e972d..36d3e8e75 100644 --- a/FS/bin/freeside-ipifony-download +++ b/FS/bin/freeside-ipifony-download @@ -188,7 +188,8 @@ FILE: foreach my $filename (@$files) { amount => $amount, quantity => $hash{quantity}, start_date => $cust_main->next_bill_date, - pkg => $hash{date_desc}, + pkg => $hash{date_desc} . + ' (' . $hash{quantity} . ' @ $' . $hash{unit_price} . ' ea)', taxclass => $TAXCLASSES{ $hash{taxclass} }, ); if (my $classname = $hash{classname}) { |