X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=0a0b01e1148d63ea132cb1c22fb239fd93b5dda3;hb=d9880fb208858d882d02462bba4c3c57db3b377c;hp=2ec3481e5cab483c1f516cf551cbbd443774ee51;hpb=6156461dcd934da26e53f78a4aed450259e4ae55;p=freeside.git
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 2ec3481e5..0a0b01e11 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -9,8 +9,10 @@
#'viewall_dir' => 'browse',
'viewall_url' => $p.'browse/part_pkg.cgi',
'html_init' => include('/elements/init_overlib.html').
+ include('/elements/init_calendar.html').
$javascript,
'html_bottom' => $html_bottom,
+ 'extra_fields_validate' => $validate_priceplan_fields,
'body_etc' =>
'onLoad="agent_changed(document.edit_topform.agentnum);
aux_planchanged(document.edit_topform.plan);
@@ -28,7 +30,7 @@
'onsubmit' => 'confirm_submit',
- 'labels' => {
+ 'labels' => {
'pkgpart' => 'Package Definition',
'pkg' => 'Package',
%locale_field_labels,
@@ -40,16 +42,17 @@
'setuptax' => 'Setup fee tax exempt',
'recurtax' => 'Recurring fee tax exempt',
'taxclass' => 'Tax class',
- 'taxproduct_select'=> 'Tax products',
'plan' => 'Price plan',
'disabled' => 'Disable new orders',
'disable_line_item_date_ranges' => 'Disable line item date ranges',
+ 'start_on_hold' => 'Start on hold',
'setup_cost' => 'Setup cost',
'recur_cost' => 'Recur cost',
'pay_weight' => 'Payment weight',
'credit_weight' => 'Credit weight',
'agent_pkgpartid' => 'External ID',
'agentnum' => 'Agent',
+ 'agent_type' => ' ', #just its title headingn is fine
'setup_fee' => 'Setup fee',
'setup_show_zero' => 'Show zero setup',
'recur_fee' => 'Recurring fee',
@@ -66,9 +69,12 @@
'svc_dst_pkgpart' => 'Include services of package',
'supp_dst_pkgpart' => 'When ordering package, also order',
'report_option' => 'Report classes',
- 'fcc_ds0s' => 'Voice-grade equivalents',
- 'fcc_voip_class' => 'Category',
'delay_start' => 'Default delay (days)',
+ 'adjourn_months' => 'Suspend the package after ',
+ 'contract_end_months' => 'Contract ends after ',
+ 'expire_months' => 'Cancel the package after ',
+ 'change_to_pkgpart'=> 'and replace it with ',
+ 'units_taxproductnum' => 'Per-line tax product',
},
'fields' => [
@@ -88,7 +94,7 @@
{ type => 'columnstart' },
{ field => 'pkg',
- type => 'text',
+ type => 'input-locale-text',
size => 40, #32
maxlength => 50,
},
@@ -110,6 +116,10 @@
),
{field=>'disabled', type=>$disabled_type, value=>'Y'},
{field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'},
+ { field => 'start_on_hold',
+ type => 'checkbox',
+ value => 'Y'
+ },
{ type => 'tablebreak-tr-title',
value => 'Pricing', #better name?
@@ -160,14 +170,44 @@
sort $conf->config('currencies')
),
+ ( $conf->exists('part_pkg-delay_start')
+ ? ( { type => 'tablebreak-tr-title',
+ value => 'Delayed start',
+ },
+ { field => 'delay_start',
+ type => 'text', size => 6 },
+ )
+ : ()
+ ),
+
+ { type => 'tablebreak-tr-title',
+ value => 'Limited duration',
+ },
+ { field => 'adjourn_months',
+ type => 'select-months',
+ },
+ { field => 'contract_end_months',
+ type => 'select-months',
+ },
+ { field => 'expire_months',
+ type => 'select-expire_months',
+ },
+ { field => 'change_to_pkgpart',
+ type => 'select-part_pkg',
+ extra_sql => sub { $pkgpart
+ ? "AND part_pkg.pkgpart != $pkgpart"
+ : ''
+ },
+ empty_label => 'no package',
+ },
+
#price plan
#setup fee
#recurring frequency
#recurring fee (auto-disable)
- { type => 'columnnext' },
+ { type => 'columnnext', value=>'Taxation', },
- {type=>'justtitle', value=>'Taxation' },
{field=>'setuptax', type=>'checkbox', value=>'Y'},
{field=>'recurtax', type=>'checkbox', value=>'Y'},
{field=>'taxclass', type=>'select-taxclass' },
@@ -175,23 +215,15 @@
type => 'hidden',
value => join(',', @taxproductnums),
},
- { field => 'taxproduct_select',
- type => 'selectlayers',
- options => [ '(default)', @taxproductnums ],
- curr_value => '(default)',
- labels => { ( '(default)' => '(default)' ),
- map {($_=>$usage_class{$_})}
- @taxproductnums
- },
- layer_fields => \%taxproduct_fields,
- layer_values_callback => $taxproduct_values,
- layers_only => !$taxproducts,
- cell_style => ( !$taxproducts
- ? 'display:none'
- : ''
- ),
+ { field => 'taxproductnum',
+ type => 'part_pkg-taxproducts',
+ include_opt_callback =>
+ sub { pkgpart => $_[0]->pkgpart },
+ },
+ { field => 'units_taxproductnum',
+ type => ($tax_data_vendor ?
+ 'select-taxproduct' : 'hidden'),
},
-
{ type => 'tablebreak-tr-title',
value => 'Promotions', #better name?
},
@@ -200,24 +232,23 @@
{ type => 'tablebreak-tr-title',
value => 'Cost tracking', #better name?
},
- { field=>'setup_cost', type=>'money', },
- { field=>'recur_cost', type=>'money', },
- ( $conf->exists('part_pkg-delay_start')
- ? ( { type => 'tablebreak-tr-title',
- value => 'Delayed start',
- },
- { field => 'delay_start',
- type => 'text', size => 6 },
+ ( $curuser->access_right('Edit package definition costs')
+ ? ( { field=>'setup_cost', type=>'money', },
+ { field=>'recur_cost', type=>'money', },
+ )
+ : ( { field=>'setup_cost', type=>'fixed', },
+ { field=>'recur_cost', type=>'fixed', },
)
- : ()
),
- { type => 'columnnext' },
+ { type => 'columnnext', value=>'Agent (reseller) types' },
- { field => 'agent_type',
- type => 'select-agent_types',
- disabled => ! $acl_edit_global,
+ { field => 'agent_type',
+ type => 'select-agent_type',
+ disabled => ! $acl_edit_global,
+ element_etc => 'size="10"',
+ multiple => '1', #cause edit.html is dum
curr_value_callback => sub {
my($cgi, $object, $field) = @_;
#in the other callbacks..? hmm.
@@ -225,17 +256,25 @@
},
},
- ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
- ? (
- { type => 'tablebreak-tr-title',
- value => 'FCC Form 477 information',
- },
- { field=>'fcc_voip_class',
- type=>'select-voip_class',
- },
- { field=>'fcc_ds0s', type=>'text', size=>6 },
- )
- : ()
+ ($fcc_opts ? (
+ { type => 'tablebreak-tr-title',
+ value => 'FCC Form 477 information',
+ },
+ { field => 'fcc_options_string',
+ type => 'input-fcc_options',
+ curr_value_callback => sub {
+ my ($cgi, $part_pkg, $fref) = @_;
+ if ( $cgi->param('fcc_options_string') ) {
+ # error redirect
+ return $cgi->param('fcc_options_string');
+ }
+ my %hash;
+ %hash = $part_pkg->fcc_options
+ if ($part_pkg->pkgpart);
+ return encode_json(\%hash);
+ },
+ },
+ ) : ()
),
{ type => 'tablebreak-tr-title',
@@ -244,7 +283,7 @@
{ field=>'agent_pkgpartid', type=>'text', size=>21 },
{ type => 'tablebreak-tr-title',
- value => 'Line-item revenue recogition', #better name?
+ value => 'Line-item revenue recognition', #better name?
},
{ field=>'pay_weight', type=>'text', size=>6 },
{ field=>'credit_weight', type=>'text', size=>6 },
@@ -273,6 +312,7 @@
'name_col' => 'name',
'hashref' => { 'disabled' => '' },
'multiple' => 1,
+ 'curr_value_callback' => $report_option_value_callback,
},
{ 'type' => 'tablebreak-tr-title',
@@ -298,9 +338,10 @@
{ 'field' => 'bill_dst_pkgpart',
'type' => 'select-part_pkg',
'extra_sql' => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
+ 'label_callback' => sub { shift->pkg_comment_only },
'm2_label' => 'Include line item(s) from package',
'm2m_method' => 'bill_part_pkg_link',
'm2m_dstcol' => 'dst_pkgpart',
@@ -324,9 +365,10 @@
'label' => 'Also include services from package: ',
'type' => 'select-part_pkg',
'extra_sql' => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
+ 'label_callback' => sub { shift->pkg_comment_only },
'm2_label' => 'Include services of package: ',
'm2m_method' => 'svc_part_pkg_link',
'm2m_dstcol' => 'dst_pkgpart',
@@ -343,6 +385,7 @@
},
{ 'field' => 'supp_dst_pkgpart',
'type' => 'select-part_pkg',
+ 'label_callback' => sub { shift->pkg_comment_only },
'm2_label' => 'When ordering package, also order',
'm2m_method' => 'supp_part_pkg_link',
'm2m_dstcol' => 'dst_pkgpart',
@@ -388,7 +431,9 @@ my $agent_clone_extra_sql =
' ) ';
my $conf = new FS::Conf;
-my $taxproducts = $conf->exists('enable_taxproducts');
+my $tax_data_vendor = $conf->config('tax_data_vendor');
+
+my $fcc_opts = $conf->exists('part_pkg-show_fcc_options');
my @locales = grep { ! /^en_/i } $conf->config('available-locales'); #should filter from the default locale lang instead of en_
my %locale_labels = map {
@@ -437,42 +482,6 @@ my $recur_show_zero_disabled = 1;
my $pkgpart = '';
-my $splice_locale_fields = sub {
- my( $fields, $pkey_value_callback, $pkg_value_callback ) = @_;
-
- my $n = 0;
- my @locale_fields = (
- map {
- my $pkey_value= $pkey_value_callback ? &$pkey_value_callback($_) : '';
- my $pkg_value = $pkg_value_callback
- ? $pkg_value_callback eq 'cgiparam'
- ? $cgi->param('pkgpartmsgnum'. $n. '_pkg')
- : &$pkg_value_callback($_)
- : '';
- (
- { field => 'pkgpartmsgnum'. $n,
- type => 'hidden',
- value => $pkey_value,
- },
- { field => 'pkgpartmsgnum'. $n. '_locale',
- type => 'hidden',
- value => $_,
- },
- { field => 'pkgpartmsgnum'. $n++. '_pkg',
- type => 'text',
- size => 40,
- #maxlength => 50,
- value => $pkg_value,
- },
- );
-
- }
- @locales
- );
- splice(@$fields, 7, 0, @locale_fields); #XXX 7 is arbitrary above
-
-};
-
my $error_callback = sub {
my($cgi, $object, $fields, $opt ) = @_;
@@ -521,15 +530,10 @@ my $error_callback = sub {
$pkgpart = $object->pkgpart;
- &$splice_locale_fields(
- $fields,
- sub {
- my $locale = shift;
- my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
- $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : '';
- },
- 'cgiparam'
- );
+ if ( $cgi->param('error') =~ / is suggested with / ) {
+ #yeah, detection is a shitty kludge, but we don't have exception objects
+ $opt->{form_init} = ' Override suggestion
';
+ }
};
@@ -546,29 +550,42 @@ my $new_object_callback = sub {
};
+my $report_option_value_callback = sub {
+ my ($cgi, $object) = @_;
+ my @report_option;
+ if ( defined $cgi->param('report_option') ) {
+ @report_option = $cgi->param('report_option');
+ } else {
+ foreach ($object->options) {
+ /^report_option_(\d+)$/ && (push @report_option, $1);
+ }
+ }
+ join(',', @report_option);
+};
+
sub set_report_option {
my($cgi, $object, $fields ) = @_; #, $opt
my @report_option = ();
foreach ($object->options) {
/^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
- /^report_option_(\d+)$/ && (push @report_option, $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);
- }
+# $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);
+# }
}
@@ -602,20 +619,6 @@ my $edit_callback = sub {
$pkgpart = $object->pkgpart;
- &$splice_locale_fields(
- $fields,
- sub {
- my $locale = shift;
- my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
- $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : '';
- },
- sub {
- my $locale = shift;
- my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
- $part_pkg_msgcat ? $part_pkg_msgcat->pkg : '';
- }
- );
-
};
my $new_callback = sub {
@@ -624,14 +627,11 @@ my $new_callback = sub {
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',{});
+ @agent_type = map {$_->typenum} qsearch('agent_type', { 'disabled'=>'' });
}
$options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
- &$splice_locale_fields($fields, '', '');
-
};
my $clone_callback = sub {
@@ -639,7 +639,7 @@ my $clone_callback = sub {
if ( $cgi->param('pkgnum') ) {
- my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } );
+ my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => scalar($cgi->param('pkgnum')) } );
$object->agentnum( $cust_pkg->cust_main->agentnum );
$opt->{action} = 'Custom';
@@ -664,23 +664,18 @@ my $clone_callback = sub {
$object->set($_ => $options{$_})
foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+ $recur_disabled = $object->freq ? 0 : 1;
+ $recur_show_zero_disabled =
+ $object->freq
+ ? $object->option('recur_fee') > 0 ? 1 : 0
+ : 1;
+
foreach my $currency ( $conf->config('currencies') ) {
my %part_pkg_currency = $object->part_pkg_currency_options($currency);
$object->set( $_.'_'.$currency, $part_pkg_currency{$_} )
foreach keys %part_pkg_currency;
}
- $recur_disabled = $object->freq ? 0 : 1;
-
- &$splice_locale_fields(
- $fields,
- '',
- sub {
- my $locale = shift;
- my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
- $part_pkg_msgcat ? $part_pkg_msgcat->pkg : '';
- }
- );
};
my $discount_error_callback = sub {
@@ -707,7 +702,7 @@ my $usageprice_error_callback = sub {
&& $cgi->param("usagepricepart$1_price") )
{
new FS::part_pkg_usageprice {
- 'usagepricepart' => $cgi->param("usagepricepart$1"),
+ 'usagepricepart' => scalar($cgi->param("usagepricepart$1")),
'pkgpart' => $object->pkgpart,
'price' => scalar($cgi->param("usagepricepart$1_price")),
#'currency
@@ -859,12 +854,18 @@ my $javascript = <<'END';
supp_pkg_rows[0].style.display = 'none';
var button = document.getElementById('show_supp_pkgs');
button.onclick = show_supp_pkgs_click;
- button.style.backgroundColor = '#cccccc';
- button.style.border = '1px solid #7e0079';
+ //button.style.backgroundColor = '#cccccc';
+ //button.style.border = '1px solid #7e0079';
+ button.style.border = 'thin solid #999999';
button.style.padding = '1px';
}
}
+ function finish_edit_fcc(id) {
+ cClick();
+ show_fcc_options(id); // refresh the display
+ }
+
END
my $warning =
@@ -894,6 +895,15 @@ tie my %plan_labels, 'Tie::IxHash',
map { $_ => ( $plans{$_}->{'shortname'} || $plans{$_}->{'name'} ) }
keys %plans;
+my $validate_priceplan_fields = {};
+foreach my $priceplan (keys %plans) {
+ my $plan_fields = $plans{$priceplan}->{fields};
+ foreach my $price_plan_field (keys %$plan_fields) {
+ $validate_priceplan_fields->{$priceplan."__".$price_plan_field} = $plan_fields->{$price_plan_field}->{"js_validate"}
+ if exists $plan_fields->{$price_plan_field}->{"js_validate"};
+ }
+}
+
my $html_bottom = sub {
my( $object ) = @_;
@@ -902,7 +912,7 @@ my $html_bottom = sub {
my $layer_callback = sub {
my $layer = shift;
- my $html = ntable("#cccccc",2);
+ my $html = '
'. $href->{$field}{'name'}. ' | '; + $html .= ' |
'. $href->{$field}{'name'}. ' | + '; my $format = sub { shift }; $format = $href->{$field}{'format'} if exists($href->{$field}{'format'}); @@ -947,7 +985,10 @@ my $html_bottom = sub { #XXX these should use elements/ fields... (or this whole thing should #just use layer_fields instead of layer_callback) - if ( ! exists($href->{$field}{'type'}) ) { + if (exists($dependencies->{$field}) && !$dependencies->{$field}{'are_met'}()) { + $html .= q!N/A!; + + } elsif ( ! exists($href->{$field}{'type'}) ) { $html .= qq!!; + } elsif ( $href->{$field}{'type'} eq 'textarea' ) { + + $html .= qq!!; + } elsif ( $href->{$field}{'type'} eq 'checkbox' ) { $html .= qq!'; - + + } elsif ( $href->{$field}{'type'} eq 'date' ) { + + $html .= include('/elements/input-date-field.html', { + 'name' => $layer.'__'.$field, + 'value' => $options{$field}, + }); + + } elsif ( $href->{$field}{'type'} =~ /^select-rt-/ ) { + + $html .= include('/elements/'.$href->{$field}{'type'}.'.html', + 'name' => $layer.'__'.$field, + 'curr_value' => $options{$field}, + map { $_ => $href->{$field}{$_} } + grep { $_ !~ /^(name|type|parse)$/ } + keys %{ $href->{$field} } + ); + + } elsif ( $href->{$field}{'type'} eq 'select-rate' ) { + + $html .= include('/elements/select-rate.html', + 'field' => $layer.'__'.$field, + 'curr_value' => $options{$field}, + map { $_ => $href->{$field}{$_} } + grep { $_ !~ /^(name|type)$/ } + keys %{ $href->{$field} } + ); + } elsif ( $href->{$field}{'type'} =~ /^select/ ) { $html .= ' |