X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=fd2aa2bfcf07e090dba21d7ee3a7b0b47e6747a6;hb=b5fbaadb1cb2893660e460a1d4a3cabe02774de7;hp=546e0711326a87a6b61684803aba4bdf1c942aaf;hpb=6fe8172b11d0369d0b1274d6825ec0c57afe8001;p=freeside.git
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 546e07113..fd2aa2bfc 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -20,11 +20,11 @@ if ( $cgi->param('error') ) {
map { $_, scalar($cgi->param($_)) } fields('part_pkg')
} );
}
+my $clone_part_pkg = '';
if ( $cgi->param('clone') ) {
- $action='Custom Pricing';
- my $old_part_pkg =
- qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
- $part_pkg ||= $old_part_pkg->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});
@@ -93,7 +93,12 @@ Package information
-
+
+ Promotional code |
+
+
+ |
+
Disable new orders |
@@ -171,7 +176,16 @@ END
my @fixups = ();
my $count = 0;
my $columns = 3;
-my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
+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
+ AND pkgpart = 72
+ )"
+);
foreach my $part_svc ( @part_svc ) {
my $svcpart = $part_svc->svcpart;
my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
@@ -201,7 +215,9 @@ foreach my $part_svc ( @part_svc ) {
print '> | ';
}
print qq!!, $part_svc->getfield('svc'), " |
";
+ qq!">!, $part_svc->getfield('svc'), '';
+ print ' (DISABLED)' if $part_svc->disabled =~ /^Y/i;
+ print '';
# print "$thead" if ++$count == int(scalar(@part_svc) / 2);
$count+=1;
foreach ( 1 .. $columns-1 ) {
@@ -230,7 +246,8 @@ print '';
tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
- split("\n", $part_pkg->plandata );
+ split("\n", ($clone_part_pkg||$part_pkg)->plandata );
+#warn join("\n", map { "$_: $plandata{$_}" } keys %plandata ). "\n";
tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
@@ -256,7 +273,9 @@ my $widget = new HTML::Widgets::SelectLayers(
'options' => \%options,
'form_name' => 'dummy',
'form_action' => 'process/part_pkg.cgi',
- 'form_text' => [ qw(pkg comment clone pkgnum pkgpart), @fixups ],
+ 'form_text' => [ qw(pkg comment promo_code clone pkgnum pkgpart),
+ @fixups
+ ],
'form_checkbox' => [ qw(setuptax recurtax disabled) ],
'form_radio' => \@form_radio,
'form_select' => \@form_select,
@@ -294,8 +313,17 @@ my $widget = new HTML::Widgets::SelectLayers(
? $plandata{$field}
: $href->{$field}{'default'} ).
qq!" onChange="fchanged(this)">!;
- } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
- $html .= qq! |