}
my ($query) = $cgi->keywords;
-my $action = '';
+
my $part_pkg = '';
if ( $cgi->param('error') ) {
$part_pkg = new FS::part_pkg ( {
map { $_, scalar($cgi->param($_)) } fields('part_pkg')
} );
}
+
+my $action = '';
my $clone_part_pkg = '';
+my $pkgpart = '';
if ( $cgi->param('clone') ) {
+ $pkgpart = $cgi->param('clone');
$action = 'Custom Pricing';
$clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
$part_pkg ||= $clone_part_pkg->clone;
$part_pkg->disabled('Y');
} elsif ( $query && $query =~ /^(\d+)$/ ) {
$part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+ $pkgpart = $part_pkg->pkgpart;
} else {
unless ( $part_pkg ) {
$part_pkg = new FS::part_pkg {};
END
}
+
+my $where = "WHERE disabled IS NULL OR disabled = ''";
+if ( $pkgpart ) {
+ $where .= " OR 0 < ( SELECT quantity FROM pkg_svc
+ WHERE pkg_svc.svcpart = part_svc.svcpart
+ AND pkgpart = $pkgpart
+ )";
+}
+my @part_svc = qsearch('part_svc', {}, '', $where);
+my %pkg_svc = map { $_->svcpart => $_ } $part_pkg->pkg_svc;
+
my @fixups = ();
my $count = 0;
my $columns = 3;
-my @part_svc = qsearch(
- 'part_svc',
- {},
- '',
- "WHERE disabled IS NULL OR disabled = ''
- OR 0 < ( SELECT quantity FROM pkg_svc
- WHERE pkg_svc.svcpart = part_svc.svcpart
- )"
-);
foreach my $part_svc ( @part_svc ) {
my $svcpart = $part_svc->svcpart;
- my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
- my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
- 'pkgpart' => $pkgpart,
- 'svcpart' => $svcpart,
- } ) || new FS::pkg_svc ( {
- 'pkgpart' => $pkgpart,
- 'svcpart' => $svcpart,
- 'quantity' => 0,
- 'primary_svc' => '',
- });
- #? #next unless $pkg_svc;
+ my $pkg_svc = $pkg_svc{$svcpart}
+ || new FS::pkg_svc ( {
+ 'pkgpart' => $pkgpart,
+ 'svcpart' => $svcpart,
+ 'quantity' => 0,
+ 'primary_svc' => '',
+ } );
push @fixups, "pkg_svc$svcpart";