'html_bottom' => $html_bottom,
'body_etc' =>
'onLoad="agent_changed(document.edit_topform.agentnum);
- aux_planchanged(document.edit_topform.plan)"',
+ aux_planchanged(document.edit_topform.plan);
+ hide_supp_pkgs()"',
'begin_callback' => $begin_callback,
'end_callback' => $end_callback,
'recur_cost' => 'Recur cost',
'pay_weight' => 'Payment weight',
'credit_weight' => 'Credit weight',
+ 'agent_pkgpartid' => 'External ID',
'agentnum' => 'Agent',
'setup_fee' => 'Setup fee',
'setup_show_zero' => 'Show zero setup',
}
$conf->config('currencies')
),
+ 'usagepricepart' => ' ',
'discountnum' => 'Offer discounts for longer terms',
'bill_dst_pkgpart' => 'Include line item(s) from package',
'svc_dst_pkgpart' => 'Include services of package',
- 'supp_dst_pkgpart' => 'Include complete 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)',
},
'fields' => [
{ type => 'tablebreak-tr-title',
value => 'Cost tracking', #better name?
},
- { field=>'setup_cost', type=>'money', },
- { field=>'recur_cost', type=>'money', },
+
+ ( $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', },
+ )
+ ),
+
+ ( $conf->exists('part_pkg-delay_start')
+ ? ( { type => 'tablebreak-tr-title',
+ value => 'Delayed start',
+ },
+ { field => 'delay_start',
+ type => 'text', size => 6 },
+ )
+ : ()
+ ),
{ type => 'columnnext' },
},
},
- { type => 'tablebreak-tr-title',
- value => 'Line-item revenue recogition', #better name?
- },
- { 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',
: ()
),
+ { type => 'tablebreak-tr-title',
+ value => 'External Links', #better name?
+ },
+ { field=>'agent_pkgpartid', type=>'text', size=>21 },
+
+ { type => 'tablebreak-tr-title',
+ value => 'Line-item revenue recogition', #better name?
+ },
+ { field=>'pay_weight', type=>'text', size=>6 },
+ { field=>'credit_weight', type=>'text', size=>6 },
{ type => 'columnend' },
+ { type => 'tablebreak-tr-title',
+ value => 'Usage pricing add-ons', #better name? just 'Usage pricing' ? there's also CDR usage pricing, RADIUS usage pricing, etc :/
+ },
+ { 'field' => 'usagepricepart',
+ 'type' => 'part_pkg_usageprice',
+ 'o2m_table' => 'part_pkg_usageprice',
+ 'm2_label' => ' ',
+ 'm2_error_callback' => $usageprice_error_callback,
+ },
+
{ 'type' => $report_option ? 'tablebreak-tr-title'
: 'hidden',
'value' => 'Optional report classes',
'm2_error_callback' => $discount_error_callback,
},
- { 'type' => 'tablebreak-tr-title',
- 'value' => 'Supplemental packages',
- 'colspan' => '4',
- },
- { 'field' => 'supp_dst_pkgpart',
- 'type' => 'select-part_pkg',
- 'm2_label' => 'Include complete package',
- 'm2m_method' => 'supp_part_pkg_link',
- 'm2m_dstcol' => 'dst_pkgpart',
- 'm2_error_callback' =>
- &{$m2_error_callback_maker}('supp'),
- },
-
{ 'type' => 'tablebreak-tr-title',
'value' => 'Pricing add-ons',
'colspan' => 4,
&{$m2_error_callback_maker}('svc'),
},
+ { 'type' => 'tablebreak-tr-title',
+ 'value' => 'Supplemental packages',
+ 'colspan' => '4',
+ 'include_opt_callback' => sub {
+ 'id' => 'show_supp_pkgs',
+ },
+ },
+ { 'field' => 'supp_dst_pkgpart',
+ 'type' => 'select-part_pkg',
+ 'm2_label' => 'When ordering package, also order',
+ 'm2m_method' => 'supp_part_pkg_link',
+ 'm2m_dstcol' => 'dst_pkgpart',
+ 'm2_error_callback' =>
+ &{$m2_error_callback_maker}('supp'),
+ },
+
{ type => 'tablebreak-tr-title',
value => 'Price plan options',
},
$cgi->param;
};
+my $usageprice_error_callback = sub {
+ my( $cgi, $object ) = @_;
+ map {
+ if ( /^usagepricepart(\d+)_price$/
+ && $cgi->param("usagepricepart$1_price") )
+ {
+ new FS::part_pkg_usageprice {
+ 'usagepricepart' => $cgi->param("usagepricepart$1"),
+ 'pkgpart' => $object->pkgpart,
+ 'price' => scalar($cgi->param("usagepricepart$1_price")),
+ #'currency
+ 'action' => scalar($cgi->param("usagepricepart$1_action")),
+ 'target' => scalar($cgi->param("usagepricepart$1_target")),
+ 'amount' => scalar($cgi->param("usagepricepart$1_amount")),
+ };
+ } else {
+ ();
+ }
+ }
+ $cgi->param;
+};
+
my $m2_error_callback_maker = sub {
my $link_type = shift; #yay closures
return sub {
var plan = what.options[what.selectedIndex].value;
- var term_table = document.getElementById('TableNumber7') // XXX NOT ROBUST
+ var term_table = document.getElementById('TableNumber8') // XXX NOT ROBUST
if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
//term_table.disabled = false;
- term_table.style.visibility = '';
+ //term_table.style.visibility = '';
+ term_table.style.display = '';
} else {
//term_table.disabled = true;
- term_table.style.visibility = 'hidden';
+ //term_table.style.visibility = 'hidden';
+ term_table.style.display = 'none';
}
var currency_regex = /^(setup|recur)_fee_[A-Z]{3}$/;
}
+ // some magic to make "supplemental packages" less obvious
+ var supp_pkg_rows = [];
+ function show_supp_pkgs_click() {
+ supp_pkg_rows[0].style.display = '';
+ this.onclick = '';
+ this.style.backgroundColor = '';
+ this.style.border = '';
+ this.style.padding = '';
+ }
+
+ function hide_supp_pkgs() {
+ var all_selects = document.getElementsByTagName('select');
+ for (var i=0; i < all_selects.length; i++) {
+ if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) {
+ supp_pkg_rows.push( all_selects[i].parentNode.parentNode );
+ }
+ }
+ if ( supp_pkg_rows.length == 1 ) {
+ // there are none configured, so hide the row to create a new one
+ 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.padding = '1px';
+ }
+ }
+
END
my $warning =
foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
- if(!exists($href->{$field})) {
+ if(!exists($href->{$field})) {
# shouldn't happen
warn "nonexistent part_pkg option: '$field'\n";
next;
}
+ if ( exists($href->{$field}->{display_if}) ) {
+ my %args = ( 'plan' => $layer ); # anything else?
+ my $display = &{ $href->{$field}->{display_if} }(%args);
+ next if !$display;
+ }
$html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';