X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=770facb7e242f40c7e430229cacbf54a25b1fbac;hp=d32702668f8702cf073151ce7fcb3faaff515acc;hb=0e8861ca6b3b04b99ea9477e8c1555561b21c929;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index d32702668..770facb7e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -29,8 +29,10 @@ if ( $cgi->param('clone') ) {
} elsif ( $query && $query =~ /^(\d+)$/ ) {
$part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
} else {
- $part_pkg ||= new FS::part_pkg {};
- $part_pkg->plan('flat');
+ unless ( $part_pkg ) {
+ $part_pkg = new FS::part_pkg {};
+ $part_pkg->plan('flat');
+ }
}
unless ( $part_pkg->plan ) { #backwards-compat
$part_pkg->plan('flat');
@@ -40,24 +42,12 @@ unless ( $part_pkg->plan ) { #backwards-compat
$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
my $hashref = $part_pkg->hashref;
-%>
-
-
-
-<%
print header("$action Package Definition", menubar(
'Main Menu' => popurl(2),
'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-), ' onLoad="visualize()"');
+));
+#), ' onLoad="visualize()"');
print qq!Error: !, $cgi->param('error'),
""
@@ -98,6 +88,23 @@ print '>';
print '';
+my $conf = new FS::Conf;
+if ( $conf->exists('enable_taxclasses') ) {
+ print '
Tax class | |
';
+} else {
+ print
+ '';
+}
+
print 'Disable new orders | ';
print '{disabled} eq "Y";
@@ -105,10 +112,15 @@ print '>';
print ' |
';
my $thead = "\n\n". ntable('#cccccc', 2). <Quan. | Service |
+
+Quan. |
+Service |
+
END
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
#print <', $thead;
Enter the quantity of each service this package includes.
@@ -133,7 +145,9 @@ foreach my $part_svc ( @part_svc ) {
push @fixups, "pkg_svc$svcpart";
- unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+ #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+ #dunno why...
+ unless ( 0 ) {
print ' | '; # if $count == 0 ;
print qq!quantity || 0,
@@ -151,16 +165,32 @@ foreach my $part_svc ( @part_svc ) {
}
}
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
print " |
";
#print "";
}
+print qq!Default service
\n!;
+
+
+foreach my $f ( qw( clone pkgnum ) ) {
+ print qq!';
+}
+print '';
+
# prolly should be in database
-use Tie::IxHash;
tie my %plans, 'Tie::IxHash',
'flat' => {
- 'name' => 'Flat rate',
+ 'name' => 'Flat rate (anniversary billing)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -174,8 +204,26 @@ tie my %plans, 'Tie::IxHash',
'recur' => 'what.recur_fee.value',
},
+ 'flat_delayed' => {
+ 'name' => 'Free for X days, then flat rate (anniversary billing)',
+ 'fields' => {
+ 'free_days' => { 'name' => 'Initial free days',
+ 'default' => 0,
+ },
+ 'setup_fee' => { 'name' => 'Setup fee for this package',
+ 'default' => 0,
+ },
+ 'recur_fee' => { 'name' => 'Recurring fee for this package',
+ 'default' => 0,
+ },
+ },
+ 'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
+ 'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
+ 'recur' => 'what.recur_fee.value',
+ },
+
'prorate' => {
- 'name' => 'First month pro-rated, then flat-rate',
+ 'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -189,6 +237,21 @@ tie my %plans, 'Tie::IxHash',
'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
},
+ 'subscription' => {
+ 'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+ 'fields' => {
+ 'setup_fee' => { 'name' => 'Setup fee for this package',
+ 'default' => 0,
+ },
+ 'recur_fee' => { 'name' => 'Recurring fee for this package',
+ 'default' => 0,
+ },
+ },
+ 'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+ 'setup' => 'what.setup_fee.value',
+ 'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+ },
+
'flat_comission_cust' => {
'name' => 'Flat rate with recurring comission per active customer',
'fields' => {
@@ -211,7 +274,7 @@ tie my %plans, 'Tie::IxHash',
},
'flat_comission' => {
- 'name' => 'Flat rate with recurring comission per active package',
+ 'name' => 'Flat rate with recurring comission per (any) active package',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -232,7 +295,7 @@ tie my %plans, 'Tie::IxHash',
},
'flat_comission_pkg' => {
- 'name' => 'Flat rate with recurring comission per active (selected) package',
+ 'name' => 'Flat rate with recurring comission per (selected) active package',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
@@ -279,7 +342,7 @@ tie my %plans, 'Tie::IxHash',
},
'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
'setup' => 'what.setup_fee.value',
- 'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+ 'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
},
'sesmon_minute' => {
@@ -300,165 +363,114 @@ tie my %plans, 'Tie::IxHash',
},
'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
'setup' => 'what.setup_fee.value',
- 'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+ 'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
},
;
-%>
-
-
-
-Price plan
-
-
-
-<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
- split("\n", $part_pkg->plandata );
- #foreach my $layer ( 'konq_kludge', keys %plans ) {
- foreach my $layer ( 'konq_kludge', keys %plans ) {
- my $visibility = "hidden";
-%>
-
-
-