'pkg' => 'Package (customer-visible)',
'comment' => 'Comment (customer-hidden)',
'classnum' => 'Package class',
+ 'addon_classnum' => 'Restrict additional orders to package class',
'promo_code' => 'Promotional code',
'freq' => 'Recurring fee frequency',
'setuptax' => 'Setup fee tax exempt',
'taxproduct_select'=> 'Tax products',
'plan' => 'Price plan',
'disabled' => 'Disable new orders',
+ 'disable_line_item_date_ranges' => 'Disable line item date ranges',
'setup_cost' => 'Setup cost',
'recur_cost' => 'Recur cost',
'pay_weight' => 'Payment weight',
'credit_weight' => 'Credit weight',
'agentnum' => 'Agent',
'setup_fee' => 'Setup fee',
+ 'setup_show_zero' => 'Show zero setup',
'recur_fee' => 'Recurring fee',
+ 'recur_show_zero' => 'Show zero recurring',
+ 'discountnum' => 'Offer discounts for longer terms',
'bill_dst_pkgpart' => 'Include line item(s) from package',
'svc_dst_pkgpart' => 'Include services of package',
+ 'report_option' => 'Report classes',
+ 'fcc_ds0s' => 'Voice-grade equivalents',
},
'fields' => [
onchange => 'agent_changed',
},
{field=>'classnum', type=>'select-pkg_class' },
+ ( $conf->exists('pkg-addon_classnum')
+ ? ( { field=>'addon_classnum',
+ type =>'select-pkg_class',
+ }
+ )
+ : ()
+ ),
{field=>'disabled', type=>$disabled_type, value=>'Y'},
+ {field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'},
- { type => 'tablebreak-tr-title',
- value => 'Pricing', #better name?
+ { type => 'tablebreak-tr-title',
+ value => 'Pricing', #better name?
+ },
+ { field => 'plan',
+ type => 'selectlayers-select',
+ options => [ keys %plan_labels ],
+ labels => \%plan_labels,
+ onchange => 'aux_planchanged(what);',
},
- { field => 'plan',
- type => 'selectlayers-select',
- options => [ keys %plan_labels ],
- labels => \%plan_labels,
+ { field => 'setup_fee',
+ type => 'money',
+ onchange => 'setup_changed',
},
- { field => 'setup_fee',
- type => 'money',
+ { field => 'setup_show_zero',
+ type => 'checkbox',
+ value => 'Y',
+ disabled => sub { $setup_show_zero_disabled },
},
{ field => 'freq',
type => 'part_pkg_freq',
{ field => 'recur_fee',
type => 'money',
disabled => sub { $recur_disabled },
+ onchange => 'recur_changed',
},
-
+
+ { field => 'recur_show_zero',
+ type => 'checkbox',
+ value => 'Y',
+ disabled => sub { $recur_show_zero_disabled },
+ },
+
#price plan
#setup fee
#recurring frequency
{ field=>'pay_weight', type=>'text', size=>6 },
{ field=>'credit_weight', type=>'text', size=>6 },
+ ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
+ ? (
+ { type => 'tablebreak-tr-title',
+ value => 'FCC Form 477 information',
+ },
+ { field=>'fcc_ds0s', type=>'text', size=>6 },
+ )
+ : ()
+ ),
+
{ type => 'columnend' },
- { 'type' => 'tablebreak-tr-title',
- 'value' => 'Pricing add-ons',
+ { 'type' => $report_option ? 'tablebreak-tr-title'
+ : 'hidden',
+ 'value' => 'Optional report classes',
+ 'field' => 'census_title',
+ },
+ { 'field' => 'report_option',
+ 'type' => $report_option ? 'select-table'
+ : 'hidden',
+ 'table' => 'part_pkg_report_option',
+ 'name_col' => 'name',
+ 'hashref' => { 'disabled' => '' },
+ 'multiple' => 1,
+ },
+
+ { 'type' => 'tablebreak-tr-title',
+ 'value' => 'Term discounts',
+ },
+ { 'field' => 'discountnum',
+ 'type' => 'select-table',
+ 'table' => 'discount',
+ 'name_col' => 'name',
+ 'hashref' => { %$discountnum_hashref },
+ #'extra_sql' => 'AND (months IS NOT NULL OR months != 0)',
+ 'empty_label'=> 'Select discount',
+ 'm2_label' => 'Offer discounts for longer terms',
+ 'm2m_method' => 'part_pkg_discount',
+ 'm2m_dstcol' => 'discountnum',
+ 'm2_error_callback' => $discount_error_callback,
+ },
+
+ { 'type' => 'tablebreak-tr-title',
+ 'value' => 'Pricing add-ons',
+ 'colspan' => 4,
},
{ 'field' => 'bill_dst_pkgpart',
'type' => 'select-part_pkg',
+ 'extra_sql' => sub { $pkgpart
+ ? "AND pkgpart != $pkgpart"
+ : ''
+ },
'm2_label' => 'Include line item(s) from package',
'm2m_method' => 'bill_part_pkg_link',
'm2m_dstcol' => 'dst_pkgpart',
'm2_error_callback' =>
&{$m2_error_callback_maker}('bill'),
+ 'm2_fields' => [ { 'field' => 'hidden',
+ 'type' => 'checkbox',
+ 'value' => 'Y',
+ 'curr_value' => '',
+ 'label' => 'Bundle',
+ },
+ ],
},
{ type => 'tablebreak-tr-title',
{ 'field' => 'svc_dst_pkgpart',
'label' => 'Also include services from package: ',
'type' => 'select-part_pkg',
+ 'extra_sql' => sub { $pkgpart
+ ? "AND pkgpart != $pkgpart"
+ : ''
+ },
'm2_label' => 'Include services of package: ',
'm2m_method' => 'svc_part_pkg_link',
'm2m_dstcol' => 'dst_pkgpart',
my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden';
+#arg. access rights for cloning are Hard.
+# on the one hand we don't really want cloning (customizing a package) to fail
+# for want of finding the source package in normal usage
+# on the other hand, we don't want people using the clone link to be able to
+# see
my $agent_clone_extra_sql =
' ( '. FS::part_pkg->curuser_pkgs_sql.
" OR ( part_pkg.custom = 'Y' ) ".
my $conf = new FS::Conf;
my $taxproducts = $conf->exists('enable_taxproducts');
+my $sth = dbh->prepare("SELECT COUNT(*) FROM part_pkg_report_option".
+ " WHERE disabled IS NULL OR disabled = '' ")
+ or die dbh->errstr;
+$sth->execute or die $sth->errstr;
+my $report_option = $sth->fetchrow_arrayref->[0];
+
#XXX
# - tr-part_pkg_freq: month_increments_only (from price plans)
# - test cloning
my %options = ();
my $recur_disabled = 1;
+my $setup_show_zero_disabled = 0;
+my $recur_show_zero_disabled = 1;
+
+my $pkgpart = '';
my $error_callback = sub {
my($cgi, $object, $fields, $opt ) = @_;
$opt->{action} = 'Custom' if $cgi->param('pkgnum');
+ $setup_show_zero_disabled = ($cgi->param('setup_fee') > 0) ? 1 : 0;
+
$recur_disabled = $cgi->param('freq') ? 0 : 1;
+ $recur_show_zero_disabled =
+ $cgi->param('freq')
+ ? $cgi->param('recur_fee') > 0 ? 1 : 0
+ : 1;
foreach ($cgi->param) {
/^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
}
@options;
- #$cgi->param($_, $options{$_}) foreach (qw( setup_fee recur_fee ));
$object->set($_ => scalar($cgi->param($_)) )
- foreach (qw( setup_fee recur_fee ));
+ foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+ $pkgpart = $object->pkgpart;
};
my $part_pkg = FS::part_pkg->new( $hashref );
$part_pkg->set($_ => '0')
- foreach (qw( setup_fee recur_fee ));
+ foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
$part_pkg;
my $edit_callback = sub {
my( $cgi, $object, $fields, $opt ) = @_;
+ $setup_show_zero_disabled = ($object->option('setup_fee') > 0) ? 1 : 0;
+
$recur_disabled = $object->freq ? 0 : 1;
- (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1});
+ $recur_show_zero_disabled =
+ $object->freq
+ ? $object->option('recur_fee') > 0 ? 1 : 0
+ : 1;
+ (@agent_type) =
+ map {$_->typenum} qsearch('type_pkgs', { 'pkgpart' => $object->pkgpart } );
+
+ my @report_option = ();
foreach ($object->options) {
/^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
+ /^report_option_(\d+)$/ && (push @report_option, $1);
}
foreach ($object->part_pkg_taxoverride) {
$taxproductnums{$_->usage_class} = 1
if $_->usage_class;
}
+ $cgi->param('report_option', join(',', @report_option));
+ foreach my $field ( @$fields ) {
+ next unless (
+ ref($field) eq 'HASH' &&
+ $field->{field} &&
+ $field->{field} eq 'report_option'
+ );
+ #$field->{curr_value} = join(',', @report_option);
+ $field->{value} = join(',', @report_option);
+ }
+
%options = $object->options;
- $object->set($_ => $object->option($_))
- foreach (qw( setup_fee recur_fee ));
+ $object->set($_ => $object->option($_, 1))
+ foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+ $pkgpart = $object->pkgpart;
};
my( $cgi, $object, $fields ) = @_;
my $conf = new FS::Conf;
+
if ( $conf->exists('agent_defaultpkg') ) {
#my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
@agent_type = map {$_->typenum} qsearch('agent_type',{});
}
+ $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
+
};
my $clone_callback = sub {
$object->disabled('Y');
+ } else { #not when cloning...
+
+ (@agent_type) =
+ map {$_->typenum} qsearch('type_pkgs',{ 'pkgpart' => $object->pkgpart } );
+
}
%options = $object->options;
$object->set($_ => $options{$_})
- foreach (qw( setup_fee recur_fee ));
+ foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
$recur_disabled = $object->freq ? 0 : 1;
};
+my $discount_error_callback = sub {
+ my( $cgi, $object ) = @_;
+ map {
+ if ( /^discountnum(\d+)$/ &&
+ ( my $discountnum = $cgi->param("discountnum$1") ) )
+ {
+ new FS::part_pkg_discount {
+ 'pkgpart' => $object->pkgpart,
+ 'discountnum' => $discountnum,
+ };
+ } else {
+ ();
+ }
+ }
+ $cgi->param;
+};
+
my $m2_error_callback_maker = sub {
my $link_type = shift; #yay closures
return sub {
my( $cgi, $object ) = @_;
- map {
- new FS::part_pkg_link {
- 'link_type' => $link_type,
- 'src_pkgpart' => $object->pkgpart,
- 'dst_pkgpart' => $_,
- };
- }
- grep $_,
- map $cgi->param($_),
- grep /^${link_type}_dst_pkgpart(\d+)$/, $cgi->param;
+ map {
+
+ if ( /^${link_type}_dst_pkgpart(\d+)$/ &&
+ ( my $dst = $cgi->param("${link_type}_dst_pkgpart$1") ) )
+ {
+
+ my $hidden = $cgi->param("${link_type}_dst_pkgpart__hidden$1")
+ || '';
+ new FS::part_pkg_link {
+ 'link_type' => $link_type,
+ 'src_pkgpart' => $object->pkgpart,
+ 'dst_pkgpart' => $dst,
+ 'hidden' => $hidden,
+ };
+ } else {
+ ();
+ }
+ }
+ $cgi->param;
};
};
if ( freq == '0' ) {
what.form.recur_fee.disabled = true;
what.form.recur_fee.style.backgroundColor = '#dddddd';
+ what.form.recur_show_zero.disabled = true;
+ //what.form.recur_show_zero.style.backgroundColor= '#dddddd';
} else {
what.form.recur_fee.disabled = false;
what.form.recur_fee.style.backgroundColor = '#ffffff';
+ recur_changed( what.form.recur_fee );
+ //what.form.recur_show_zero.style.backgroundColor= '#ffffff';
+ }
+
+ }
+
+ function setup_changed(what) {
+ var setup = what.value;
+ if ( parseFloat(setup) == 0 ) {
+ what.form.setup_show_zero.disabled = false;
+ } else {
+ what.form.setup_show_zero.disabled = true;
}
+ }
+ function recur_changed(what) {
+ var recur = what.value;
+ if ( parseFloat(recur) == 0 ) {
+ what.form.recur_show_zero.disabled = false;
+ } else {
+ what.form.recur_show_zero.disabled = true;
+ }
}
function agent_changed(what) {
- var agentnum = what.options[what.selectedIndex].value;
+ var agentnum;
+ if ( what.type == 'select-one' ) {
+ agentnum = what.options[what.selectedIndex].value;
+ } else {
+ agentnum = what.value;
+ }
if ( agentnum == 0 ) {
what.form.agent_type.disabled = false;
}
+ function aux_planchanged(what) {
+
+ alert('called!');
+ var plan = what.options[what.selectedIndex].value;
+ var table = document.getElementById('TableNumber7') // XXX NOT ROBUST
+
+ if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
+ //table.disabled = false;
+ table.style.visibility = '';
+ } else {
+ //table.disabled = true;
+ table.style.visibility = 'hidden';
+ }
+
+ }
+
</SCRIPT>
END
# $html .= ' SELECTED' if $freq eq $part_pkg->freq;
# $html .= ">$freq{$freq}";
#}
- #$html .= '</SELECT></TD></TR>';
+
+ #$html .= '</SELECT></TD></TR>';
my $href = $plans{$layer}->{'fields'};
my @fields = exists($plans{$layer}->{'fieldorder'})
foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
+ if(!exists($href->{$field})) {
+ # shouldn't happen
+ warn "nonexistent part_pkg option: '$field'\n";
+ next;
+ }
+
$html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
my $format = sub { shift };
$html .= ' MULTIPLE'
if $href->{$field}{'type'} eq 'select_multiple';
$html .= qq! NAME="${layer}__$field">!;
+
+ $html .= '<OPTION VALUE="">'. $href->{$field}{'empty_label'}
+ if exists($href->{$field}{'disable_empty'})
+ && ! $href->{$field}{'disable_empty'};
if ( $href->{$field}{'select_table'} ) {
foreach my $record (
}
};
+my $discountnum_hashref = {
+ 'disabled' => '',
+ 'months' => { 'op' => '>', 'value' => 1 },
+ };
+
</%init>
projects / freeside.git / blobdiff