From: ivan Date: Tue, 3 Jun 2008 21:06:22 +0000 (+0000) Subject: very basic start at adding quantities X-Git-Tag: root_of_webpay_support~604 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=59e56007d602991c13fcb18e928762c070c394e6 very basic start at adding quantities --- diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 9e7b07f19..5963312ae 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -496,6 +496,9 @@ sub tables_hashref { 'sdate', @date_type, '', '', 'edate', @date_type, '', '', 'itemdesc', 'varchar', 'NULL', $char_d, '', '', + 'quantity', 'int', 'NULL', '', '', '', + 'unitsetup', @money_type, '', '', + 'unitrecur', @money_type, '', '', ], 'primary_key' => 'billpkgnum', 'unique' => [], @@ -908,6 +911,7 @@ sub tables_hashref { 'change_pkgnum', 'int', 'NULL', '', '', '', 'change_pkgpart', 'int', 'NULL', '', '', '', 'manual_flag', 'char', 'NULL', 1, '', '', + 'quantity', 'int', 'NULL', '', '', '', ], 'primary_key' => 'pkgnum', 'unique' => [], diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 69c572200..0ce68ec1a 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1834,7 +1834,7 @@ sub print_generic { 'state' => &$escape_function($cust_main->state), 'zip' => &$escape_function($cust_main->zip), 'returnaddress' => $returnaddress, - 'quantity' => 1, + #'quantity' => 1, 'terms' => $self->terms, 'template' => $params{'template'}, #'notes' => join("\n", $conf->config('invoice_latexnotes') ), @@ -1990,10 +1990,8 @@ sub print_generic { &$escape_function($_); } @{$line_item->{'ext_description'}}; } - { - my $money = $old_latex ? '' : $money_char; - $detail->{'amount'} = $money. $line_item->{'amount'}; - } + $detail->{'amount'} = ( $old_latex ? '' : $money_char). + $line_item->{'amount'}; $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A'; push @detail_items, $detail; @@ -2031,16 +2029,16 @@ sub print_generic { ext_description => [], }; $detail->{'ref'} = $line_item->{'pkgnum'}; - $detail->{'quantity'} = 1; + $detail->{'quantity'} = $line_item->{'quantity'}; $detail->{'section'} = $section; $detail->{'description'} = &$escape_function($line_item->{'description'}); if ( exists $line_item->{'ext_description'} ) { @{$detail->{'ext_description'}} = @{$line_item->{'ext_description'}}; } - { - my $money = $old_latex ? '' : $money_char; - $detail->{'amount'} = $money. $line_item->{'amount'}; - } + $detail->{'amount'} = ( $old_latex ? '' : $money_char ). + $line_item->{'amount'}; + $detail->{'unit_amount'} = ( $old_latex ? '' : $money_char ). + $line_item->{'unit_amount'}; $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A'; push @detail_items, $detail; @@ -2623,6 +2621,8 @@ sub _items_cust_bill_pkg { #pkgpart => $part_pkg->pkgpart, pkgnum => $cust_bill_pkg->pkgnum, amount => sprintf("%.2f", $cust_bill_pkg->setup), + unit_amount => sprintf("%.2f", $cust_bill_pkg->unitsetup), + quantity => $cust_bill_pkg->quantity, ext_description => \@d, }; } @@ -2648,8 +2648,9 @@ sub _items_cust_bill_pkg { #pkgpart => $part_pkg->pkgpart, pkgnum => $cust_bill_pkg->pkgnum, amount => sprintf("%.2f", $cust_bill_pkg->recur), + unit_amount => sprintf("%.2f", $cust_bill_pkg->unitrecur), + quantity => $cust_bill_pkg->quantity, ext_description => \@d, - }; } diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm index 31d5378a7..d15200e0c 100644 --- a/FS/FS/cust_bill_pkg.pm +++ b/FS/FS/cust_bill_pkg.pm @@ -57,6 +57,12 @@ supported: =item itemdesc - Line item description (currentlty used only when pkgnum is 0 or -1) +=item quantity - If not set, defaults to 1 + +=item unitsetup - If not set, defaults to setup + +=item unitrecur - If not set, defaults to recur + =back sdate and edate are specified as UNIX timestamps; see L. Also @@ -367,6 +373,46 @@ sub units { $self->part_pkg->calc_units($self->cust_pkg); } +=item quantity + +=cut + +sub quantity { + my( $self, $value ) = @_; + if ( defined($value) ) { + $self->setfield('quantity', $value); + } + $self->getfield('quantity') || 1; +} + +=item unitsetup + +=cut + +sub unitsetup { + my( $self, $value ) = @_; + if ( defined($value) ) { + $self->setfield('unitsetup', $value); + } + $self->getfield('unitsetup') eq '' + ? $self->getfield('setup') + : $self->getfield('unitsetup'); +} + +=item unitrecur + +=cut + +sub unitrecur { + my( $self, $value ) = @_; + if ( defined($value) ) { + $self->setfield('unitrecur', $value); + } + $self->getfield('unitrecur') eq '' + ? $self->getfield('recur') + : $self->getfield('unitrecur'); +} + =back =head1 BUGS diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 98b50cb67..49968725b 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -128,6 +128,8 @@ inherits from FS::Record. The following fields are currently supported: =item manual_flag - If this field is set to 1, disables the automatic unsuspension of this package when using the B config file. +=item quantity - If not set, defaults to 1 + =back Note: setup, bill, adjourn, susp, expire and cancel are specified as UNIX timestamps; @@ -1335,6 +1337,18 @@ sub attribute_since_sqlradacct { } +=item quantity + +=cut + +sub quantity { + my( $self, $value ) = @_; + if ( defined($value) ) { + $self->setfield('quantity', $value); + } + $self->getfield('quantity') || 1; +} + =item transfer DEST_PKGNUM | DEST_CUST_PKG, [ OPTION => VALUE ... ] Transfers as many services as possible from this package to another package. diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index bc2f0cbce..6c63ed412 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -6,6 +6,7 @@ 'count_query' => $count_query, #'redirect' => $link, 'header' => [ '#', + 'Quan.', 'Package', 'Class', 'Status', @@ -25,6 +26,7 @@ ], 'fields' => [ 'pkgnum', + 'quantity', sub { #my $part_pkg = $part_pkg{shift->pkgpart}; #$part_pkg->pkg; # ' - '. $part_pkg->comment; $_[0]->pkg; # ' - '. $_[0]->comment; @@ -87,6 +89,7 @@ '', '', '', + '', sub { shift->statuscolor; }, '', '', @@ -100,13 +103,14 @@ FS::UI::Web::cust_colors(), '', ], - 'style' => [ '', '', '', 'b', '', '', '', '', '', '', '', '', '', + 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', FS::UI::Web::cust_styles() ], - 'size' => [ '', '', '', '-1' ], - 'align' => 'rlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r', + 'size' => [ '', '', '', '', '-1' ], + 'align' => 'rrlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r', 'links' => [ $link, $link, + $link, '', '', '', diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 783494167..b71bdee31 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -87,6 +87,10 @@ Current packages <% $part_pkg->pkg %> - <% $part_pkg->comment %>
+% if ( $cust_pkg->quantity > 1 ) { +       Quantity: <% $cust_pkg->quantity %>
+% } + % unless ( $cust_pkg->get('cancel') ) { % my $br = 0;