From 013646e6629fc94b4cda03c495aa56677f2de381 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 4 Jan 2014 23:31:16 -0800 Subject: time/data/etc. unit pricing add-ons, RT#24392 --- httemplate/edit/part_pkg.cgi | 33 ++++++ httemplate/edit/process/part_pkg.cgi | 4 + httemplate/elements/part_pkg_usageprice.html | 137 ++++++++++++++++++++++++ httemplate/elements/tr-part_pkg_usageprice.html | 24 +++++ 4 files changed, 198 insertions(+) create mode 100644 httemplate/elements/part_pkg_usageprice.html create mode 100644 httemplate/elements/tr-part_pkg_usageprice.html (limited to 'httemplate') diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 7f8a70710..23de7c146 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -59,6 +59,7 @@ } $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', @@ -245,6 +246,16 @@ { 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', @@ -684,6 +695,28 @@ my $discount_error_callback = sub { $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 { diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index db4fcb921..82c4e1e15 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -269,6 +269,10 @@ my @process_o2m = ( 'table' => 'part_pkg_msgcat', 'fields' => [qw( locale pkg )], }, + { + 'table' => 'part_pkg_usageprice', + 'fields' => [qw( price currency action target amount )], + } ); diff --git a/httemplate/elements/part_pkg_usageprice.html b/httemplate/elements/part_pkg_usageprice.html new file mode 100644 index 000000000..5663469c2 --- /dev/null +++ b/httemplate/elements/part_pkg_usageprice.html @@ -0,0 +1,137 @@ +% unless ( $opt{'js_only'} ) { + + + + + + +% ### +% # price +% ### + + +% ### +% # action +% ### + + +% ### +% # target +% ### + + +% ### +% # amount +% ### + + + +
+ + + + + + +% #XXX lots more work for multi-currency... maybe larger UI changes :/ +% foreach my $currency ( () ) { +% #foreach my $currency ( sort $conf->config('currencies') ) { + + + + +% } + +
Price<% $money_char %> + >
<% $currency %><% currency_symbol($currency, SYM_HTML) %> + >
+
+ + + + + > +
+ +% } +<%init> + +tie my %targets, 'Tie::IxHash', # once? + #'svc_acct.totalbytes' => { label => 'Megabytes', + # mult => 1048576, + # }, + 'svc_acct.totalbytes' => { label => 'Gigabytes', + mult => 1073741824, + }, + 'svc_acct.seconds' => { label => 'Hours', + mult => 3600, + }, + 'svc_conferencing.participants' => { label => 'Conference Participants', + mult => 1, + }, +#this will take more work: set action, not increment.. +# and then value comes from a select, not a text field +# 'svc_conferencing.confqualitynum' => { label => 'Conference Quality', +# }, +; + +my( %opt ) = @_; + +my $conf = new FS::Conf; +my $money_char = $conf->config('money_char') || '$'; + +my $name = $opt{'element_name'} || $opt{'field'} || 'usagepricepart'; +my $id = $opt{'id'} || 'usagepricepart'; + +my $curr_value = $opt{'curr_value'} || $opt{'value'}; + +my $onchange = ''; +if ( $opt{'onchange'} ) { + $onchange = $opt{'onchange'}; + $onchange .= '(this)' unless $onchange =~ /\(\w*\);?$/; + $onchange =~ s/\(what\);/\(this\);/g; #ugh, terrible hack. all onchange + #callbacks should act the same + $onchange = 'onChange="'. $onchange. '"'; +} + +my $part_pkg_usageprice = $curr_value + ? qsearchs('part_pkg_usageprice', { 'usagepricepart' => $curr_value } ) + : new FS::part_pkg_usageprice {}; + + diff --git a/httemplate/elements/tr-part_pkg_usageprice.html b/httemplate/elements/tr-part_pkg_usageprice.html new file mode 100644 index 000000000..1b78ae471 --- /dev/null +++ b/httemplate/elements/tr-part_pkg_usageprice.html @@ -0,0 +1,24 @@ +% unless ( $opt{'js_only'} ) { + + <% include('tr-td-label.html', %opt) %> + > + +% } +% + <% include( '/elements/part_pkg_usageprice.html', %opt ) %> +% +% unless ( $opt{'js_only'} ) { + + + + +% } +<%init> + +my( %opt ) = @_; + +my $cell_style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : ''; + +#$opt{'label'} ||= 'XXX Something'; + + -- cgit v1.2.1