X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=dd8cb13a2ab388f776dcd386dfb0e283146da68e;hb=409cd8958c687ac468b4d4fbe84fefb8f1e2feec;hp=ba615bbbe2d816387830aca6d3f4e7d191e05c7e;hpb=a66b6c5609a308c654c56aa858a645fbdfb82495;p=freeside.git
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ba615bbbe..dd8cb13a2 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -9,6 +9,7 @@
#'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,
'body_etc' =>
@@ -40,7 +41,6 @@
'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',
@@ -73,6 +73,7 @@
'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' => [
@@ -92,7 +93,7 @@
{ type => 'columnstart' },
{ field => 'pkg',
- type => 'text',
+ type => 'input-locale-text',
size => 40, #32
maxlength => 50,
},
@@ -193,7 +194,7 @@
{ field => 'change_to_pkgpart',
type => 'select-part_pkg',
extra_sql => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
empty_label => 'no package',
@@ -214,28 +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?
},
@@ -326,6 +314,7 @@
'name_col' => 'name',
'hashref' => { 'disabled' => '' },
'multiple' => 1,
+ 'curr_value_callback' => $report_option_value_callback,
},
{ 'type' => 'tablebreak-tr-title',
@@ -351,7 +340,7 @@
{ '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 },
@@ -378,7 +367,7 @@
'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 },
@@ -444,7 +433,7 @@ my $agent_clone_extra_sql =
' ) ';
my $conf = new FS::Conf;
-my $taxproducts = $conf->config('tax_data_vendor') ne '';
+my $tax_data_vendor = $conf->config('tax_data_vendor');
my $fcc_opts = $conf->exists('part_pkg-show_fcc_options');
@@ -495,42 +484,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 ) = @_;
@@ -579,16 +532,6 @@ 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
';
@@ -609,29 +552,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);
+# }
}
@@ -665,20 +621,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 {
@@ -692,8 +634,6 @@ my $new_callback = sub {
$options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
- &$splice_locale_fields($fields, '', '');
-
};
my $clone_callback = sub {
@@ -701,7 +641,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';
@@ -726,23 +666,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 {
@@ -769,7 +704,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
@@ -1053,6 +988,14 @@ my $html_bottom = sub {
: $href->{$field}{'default'} ).
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',
@@ -1155,13 +1115,8 @@ my $html_bottom = sub {
my $return =
include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ).
'';
+ include('/elements/selectlayers.html', %selectlayers, 'js_only'=>1 ) .
+ '';
$return;
@@ -1242,16 +1197,8 @@ my $field_callback = sub {
my $field = $fieldref->{field};
if ($field eq 'taxproductnums') {
$fieldref->{value} = join(',', @taxproductnums);
- } elsif ($field eq 'taxproduct_select') {
- $fieldref->{options} = [ '(default)', @taxproductnums ];
- $fieldref->{labels} = { ( '(default)' => '(default)' ),
- map {( $_ => ($usage_class{$_} || $_) )}
- @taxproductnums
- };
- $fieldref->{layer_fields} = \%taxproduct_fields;
- $fieldref->{layer_values_callback} = $taxproduct_values;
} elsif ($field eq 'taxproductnum') { # part_pkg-taxproduct, new style
- if ( !$taxproducts ) {
+ if ( !$tax_data_vendor ) {
# then make the widget go away
$fieldref->{type} = 'hidden';
}