From a53dc991aa0c04c5b9a5d06256100af5e93943e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 10:34:30 +0000
Subject: apply byte values from prepaid cards as well as time value, RT#4995

---
 httemplate/misc/process/recharge_svc.html | 103 +++++++++++++++---------------
 1 file changed, 51 insertions(+), 52 deletions(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html
index 147b9533a..8c4d13e63 100755
--- a/httemplate/misc/process/recharge_svc.html
+++ b/httemplate/misc/process/recharge_svc.html
@@ -1,62 +1,13 @@
-%unless ($error) {
-%
-%  my ($amount, $seconds, $up, $down, $total) = (0, 0, 0, 0, 0);
-%  #should probably use payby.pm but whatever
-%  if ($payby eq 'PREP') {
-%    $error = $cust_main->get_prepay($prepaid, \$amount, \$seconds, \$up, \$down, \$total)
-%          || $svc_acct->increment_seconds($seconds)
-%          || $svc_acct->increment_upbytes($up)
-%          || $svc_acct->increment_downbytes($down)
-%          || $svc_acct->increment_totalbytes($total)
-%          || $cust_main->insert_cust_pay_prepay( $amount, $prepaid );
-%  } elsif ( $payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP)$/ ) {
-%    my $part_pkg = $svc_acct->cust_svc->cust_pkg->part_pkg;
-%    $amount = $part_pkg->option('recharge_amount', 1);
-%    my %rhash = map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_) }
-%      grep { $part_pkg->option($_, 1) }
-%      qw ( recharge_seconds recharge_upbytes recharge_downbytes
-%           recharge_totalbytes );
-%
-%    my $description = "Recharge";
-%    $description .= " $rhash{seconds}s" if $rhash{seconds};
-%    $description .= " $rhash{upbytes} up" if $rhash{upbytes};
-%    $description .= " $rhash{downbytes} down" if $rhash{downbytes};
-%    $description .= " $rhash{totalbytes} total" if $rhash{totalbytes};
-%
-%    $error = $cust_main->charge($amount, "Recharge " . $svc_acct->label,
-%                                $description, $part_pkg->taxclass);
-%
-%    if ($part_pkg->option('recharge_reset', 1)) {
-%      $error ||= $svc_acct->set_usage(\%rhash);
-%    }else{
-%      $error ||= $svc_acct->recharge(\%rhash);
-%    }
-%
-%    my $old_balance = $cust_main->balance;
-%    $error ||= $cust_main->bill;
-%    $error ||= $cust_main->apply_payments_and_credits;
-%    my $bill_error = $cust_main->collect('realtime' => 1) unless $error;
-%    $error ||= "Failed to collect - $bill_error"
-%      if $cust_main->balance > $old_balance && $cust_main->balance > 0
-%          && $payby ne 'BILL';
-%
-%  } else {
-%    $error = "fatal error - unknown payby: $payby";
-%  }
-%}
-%
 %if ($error) {
 %  $cgi->param('error', $error);
-%  $dbh->rollback if $oldAutoCommit;
-%  print $cgi->redirect(popurl(2). "recharge_svc.html?". $cgi->query_string );
-%}
-%$dbh->commit or die $dbh->errstr if $oldAutoCommit;
-%
+<% cgi->redirect(popurl(2). "recharge_svc.html?". $cgi->query_string ) %>
+%} else {
 <% header("Package recharged") %>
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();
   </SCRIPT>
   </BODY></HTML>
+%}
 <%init>
 
 my $conf = new FS::Conf;
@@ -89,4 +40,52 @@ my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 
+unless ($error) {
+
+  #should probably use payby.pm but whatever
+  if ($payby eq 'PREP') {
+    $error = $cust_main->recharge_prepay( $prepaid );
+  } elsif ( $payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP)$/ ) {
+    my $part_pkg = $svc_acct->cust_svc->cust_pkg->part_pkg;
+    $amount = $part_pkg->option('recharge_amount', 1);
+    my %rhash = map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_) }
+      grep { $part_pkg->option($_, 1) }
+      qw ( recharge_seconds recharge_upbytes recharge_downbytes
+           recharge_totalbytes );
+
+    my $description = "Recharge";
+    $description .= " $rhash{seconds}s" if $rhash{seconds};
+    $description .= " $rhash{upbytes} up" if $rhash{upbytes};
+    $description .= " $rhash{downbytes} down" if $rhash{downbytes};
+    $description .= " $rhash{totalbytes} total" if $rhash{totalbytes};
+
+    $error = $cust_main->charge($amount, "Recharge " . $svc_acct->label,
+                                $description, $part_pkg->taxclass);
+
+    if ($part_pkg->option('recharge_reset', 1)) {
+      $error ||= $svc_acct->set_usage(\%rhash);
+    }else{
+      $error ||= $svc_acct->recharge(\%rhash);
+    }
+
+    my $old_balance = $cust_main->balance;
+    $error ||= $cust_main->bill;
+    $error ||= $cust_main->apply_payments_and_credits;
+    my $bill_error = $cust_main->collect('realtime' => 1) unless $error;
+    $error ||= "Failed to collect - $bill_error"
+      if $cust_main->balance > $old_balance && $cust_main->balance > 0
+          && $payby ne 'BILL';
+
+  } else {
+    $error = "fatal error - unknown payby: $payby";
+  }
+
+}
+
+if ($error) {
+  $dbh->rollback if $oldAutoCommit;
+} else {
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+}
+
 </%init>
-- 
cgit v1.2.1


From 26119738eaf2b519d91c855c23986f873303887f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Mar 2009 07:14:29 +0000
Subject: allow country selection on credit card entry, RT#4997

---
 httemplate/misc/process/payment.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index 2baca1e39..ea0c7946d 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -44,7 +44,7 @@ $cgi->param('payby') =~ /^(CARD|CHEK)$/
   or errorpage("illegal payby ". $cgi->param('payby'));
 my $payby = $1;
 my %payby2fields = (
-  'CARD' => [ qw( address1 address2 city state zip ) ],
+  'CARD' => [ qw( address1 address2 city county state zip country ) ],
   'CHEK' => [ qw( ss paytype paystate stateid stateid_state ) ],
 );
 my %type = ( 'CARD' => 'credit card',
-- 
cgit v1.2.1


From 42682206b4ba30de01c82743042f5fb9d48a93ed Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 23 Mar 2009 23:33:04 +0000
Subject: more DTRT with usage on service transfer between packages and
 recharges  RT #2884, #5040 + #4995 fallout

---
 httemplate/misc/process/recharge_svc.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html
index 8c4d13e63..5f68bf151 100755
--- a/httemplate/misc/process/recharge_svc.html
+++ b/httemplate/misc/process/recharge_svc.html
@@ -1,6 +1,6 @@
 %if ($error) {
 %  $cgi->param('error', $error);
-<% cgi->redirect(popurl(2). "recharge_svc.html?". $cgi->query_string ) %>
+<% $cgi->redirect(popurl(2). "recharge_svc.html?". $cgi->query_string ) %>
 %} else {
 <% header("Package recharged") %>
   <SCRIPT TYPE="text/javascript">
@@ -47,7 +47,7 @@ unless ($error) {
     $error = $cust_main->recharge_prepay( $prepaid );
   } elsif ( $payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP)$/ ) {
     my $part_pkg = $svc_acct->cust_svc->cust_pkg->part_pkg;
-    $amount = $part_pkg->option('recharge_amount', 1);
+    my $amount = $part_pkg->option('recharge_amount', 1);
     my %rhash = map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_) }
       grep { $part_pkg->option($_, 1) }
       qw ( recharge_seconds recharge_upbytes recharge_downbytes
@@ -63,7 +63,7 @@ unless ($error) {
                                 $description, $part_pkg->taxclass);
 
     if ($part_pkg->option('recharge_reset', 1)) {
-      $error ||= $svc_acct->set_usage(\%rhash);
+      $error ||= $svc_acct->set_usage(\%rhash, 'null' => 1);
     }else{
       $error ||= $svc_acct->recharge(\%rhash);
     }
-- 
cgit v1.2.1


From 1442c00818afaf86855090126c5f9bfbf8242d77 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 14 Apr 2009 16:12:54 +0000
Subject: better at least

---
 httemplate/misc/process/tax-import.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/tax-import.cgi b/httemplate/misc/process/tax-import.cgi
index 016d4b60c..537af490f 100644
--- a/httemplate/misc/process/tax-import.cgi
+++ b/httemplate/misc/process/tax-import.cgi
@@ -2,7 +2,7 @@
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Resend invoices');
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch_import', $cgi; 
 
-- 
cgit v1.2.1


From 437f7374ed17088113c4067df42201295b6d6c43 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 14 Apr 2009 16:14:48 +0000
Subject: hmmm

---
 httemplate/misc/process/tax-import.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/tax-import.cgi b/httemplate/misc/process/tax-import.cgi
index 537af490f..f800dbd5b 100644
--- a/httemplate/misc/process/tax-import.cgi
+++ b/httemplate/misc/process/tax-import.cgi
@@ -2,7 +2,7 @@
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+  unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
 my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch_import', $cgi; 
 
-- 
cgit v1.2.1


From ec71691725b6c5211b6967323cbc56a03038385d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 23 Apr 2009 20:31:26 +0000
Subject: autodownload and update of cch tax data

---
 httemplate/misc/process/tax-fetch_and_import.cgi | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 httemplate/misc/process/tax-fetch_and_import.cgi

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/tax-fetch_and_import.cgi b/httemplate/misc/process/tax-fetch_and_import.cgi
new file mode 100644
index 000000000..553c7551a
--- /dev/null
+++ b/httemplate/misc/process/tax-fetch_and_import.cgi
@@ -0,0 +1,9 @@
+<% $server->process %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_download_and_update', $cgi; 
+
+</%init>
-- 
cgit v1.2.1


From 791b34f7cb476e7c645d8eb7019dde9fdf5cf663 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 May 2009 10:40:15 +0000
Subject: finish the import portion of excel rate edit, RT#5108

---
 httemplate/misc/process/rate_edit_excel.html | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 httemplate/misc/process/rate_edit_excel.html

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/rate_edit_excel.html b/httemplate/misc/process/rate_edit_excel.html
new file mode 100644
index 000000000..acd5f4995
--- /dev/null
+++ b/httemplate/misc/process/rate_edit_excel.html
@@ -0,0 +1,10 @@
+<% $server->process %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $server = new FS::UI::Web::JSRPC 'FS::rate_detail::process_edit_import', $cgi;
+
+</%init>
+
-- 
cgit v1.2.1


From bc521ca75f4189ebd6d927aa263bdcce500150a5 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 1 Jun 2009 05:43:11 +0000
Subject: a 'start over' function for the taxproduct based tax data loading

---
 httemplate/misc/process/tax-fetch_and_replace.cgi | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 httemplate/misc/process/tax-fetch_and_replace.cgi

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/tax-fetch_and_replace.cgi b/httemplate/misc/process/tax-fetch_and_replace.cgi
new file mode 100644
index 000000000..1a9b62628
--- /dev/null
+++ b/httemplate/misc/process/tax-fetch_and_replace.cgi
@@ -0,0 +1,9 @@
+<% $server->process %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_download_and_reload', $cgi; 
+
+</%init>
-- 
cgit v1.2.1


From 3a02c437eadd9a39f7e56056ca987a4846650209 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Jun 2009 02:39:09 +0000
Subject: finish up initial work on customer view tabs (ensure links back to
 customer view call include show=packages if default view isn't jumbo or
 packages already), RT#5586

---
 httemplate/misc/process/link.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index df15dca72..77546f3f7 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,14 +1,20 @@
 %unless ($error) {
 %  #no errors, so let's view this customer.
 %  my $custnum = $new->cust_pkg->custnum;
-<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg$pkgnum" ) %>
+%  my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+%               ? ''
+%               : ';show=packages';
+%  my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag" ) %>
 %} else {
 % errorpage($error);
 %}
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View/link unlinked services');
+  unless $curuser->access_right('View/link unlinked services');
 
 my $DEBUG = 0;
 
-- 
cgit v1.2.1


From 665067cef48a5516e0bfb2dd79d99b8495e25ee5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 01:42:56 +0000
Subject: phone devices (for netsapiens integration), RT#5226

---
 httemplate/misc/process/part_device-import.html | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 httemplate/misc/process/part_device-import.html

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/part_device-import.html b/httemplate/misc/process/part_device-import.html
new file mode 100644
index 000000000..eac111a40
--- /dev/null
+++ b/httemplate/misc/process/part_device-import.html
@@ -0,0 +1,9 @@
+<% $server->process %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Import');
+
+my $server = new FS::UI::Web::JSRPC 'FS::part_device::process_batch_import', $cgi;
+
+</%init>
-- 
cgit v1.2.1


From 8800e519dc0e4b8eee4ab2cddc74d52c205bc536 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 2009 12:29:16 +0000
Subject: processing fee on credit card recharges, RT#5889

---
 httemplate/misc/process/payment.cgi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index ea0c7946d..d41bc0f14 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -32,6 +32,11 @@ $cgi->param('amount') =~ /^\s*(\d*(\.\d\d)?)\s*$/
 my $amount = $1;
 errorpage("amount <= 0") unless $amount > 0;
 
+if ( $cgi->param('fee') =~ /^\s*(\d*(\.\d\d)?)\s*$/ ) {
+  my $fee = $1;
+  $amount = sprintf('%.2f', $amount + $fee);
+}
+
 $cgi->param('year') =~ /^(\d+)$/
   or errorpage("illegal year ". $cgi->param('year'));
 my $year = $1;
@@ -143,6 +148,15 @@ if ( $cgi->param('batch') ) {
   );
   errorpage($error) if $error;
 
+  #no error, so order the fee package if applicable...
+  if ( $cgi->param('fee_pkgpart') =~ /^(\d+)$/ ) {
+    my $error = $cust_main->order_pkg(
+      'cust_pkg' => new FS::cust_pkg { 'pkgpart' => $1 }
+    );
+    errorpage("payment processed successfully, but error ordering fee: $error")
+      if $error;
+  }
+
   $cust_main->apply_payments;
 
 }
-- 
cgit v1.2.1


From 0c2679eee18b3b073bc91657fcf85c5dd2e5efc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Oct 2009 02:16:46 +0000
Subject: add manual_process-display config to subtract fee from amount instead
 of adding, RT#5889

---
 httemplate/misc/process/payment.cgi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'httemplate/misc/process')

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index d41bc0f14..1e9501df8 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -150,11 +150,18 @@ if ( $cgi->param('batch') ) {
 
   #no error, so order the fee package if applicable...
   if ( $cgi->param('fee_pkgpart') =~ /^(\d+)$/ ) {
-    my $error = $cust_main->order_pkg(
-      'cust_pkg' => new FS::cust_pkg { 'pkgpart' => $1 }
-    );
+
+    my $cust_pkg = new FS::cust_pkg { 'pkgpart' => $1 };
+
+    my $error = $cust_main->order_pkg( 'cust_pkg' => $cust_pkg );
     errorpage("payment processed successfully, but error ordering fee: $error")
       if $error;
+
+    #and generate an invoice for it now too
+    $error = $cust_main->bill( 'pkg_list' => [ $cust_pkg ] );
+    errorpage("payment processed and fee ordered sucessfully, but error billing fee: $error")
+      if $error;
+
   }
 
   $cust_main->apply_payments;
-- 
cgit v1.2.1