From 3ce7691203a7737406bf2d4442f7fd84b81f847e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Aug 2006 22:25:39 +0000
Subject: Will things ever be the same again? It's the final masonize

---
 httemplate/edit/process/quick-charge.cgi | 76 ++++++++++++++++----------------
 1 file changed, 39 insertions(+), 37 deletions(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 928e3daad..70778c1cc 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -1,41 +1,43 @@
-<%
+%
+%
+%#untaint custnum
+%$cgi->param('custnum') =~ /^(\d+)$/
+%  or die 'illegal custnum '. $cgi->param('custnum');
+%my $custnum = $1;
+%
+%$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
+%  or die 'illegal amount '. $cgi->param('amount');
+%my $amount = $1;
+%
+%my( $error, $cust_main);
+%if ( $cgi->param('taxclass') eq '(select)' ) {
+%
+%
+% $error = 'Must select a tax class';
+%} else {
+%
+%  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+%    or die "unknown custnum $custnum";
+%
+%  $error = $cust_main->charge(
+%    $amount,
+%    $cgi->param('pkg'),
+%    '$'. sprintf("%.2f",$amount),
+%    $cgi->param('taxclass')
+%  );
+%
+%}
+%
+%if ($error) {
+%
 
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
-my $custnum = $1;
-
-$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
-  or die 'illegal amount '. $cgi->param('amount');
-my $amount = $1;
-
-my( $error, $cust_main);
-if ( $cgi->param('taxclass') eq '(select)' ) {
-
-
- $error = 'Must select a tax class';
-} else {
-
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-    or die "unknown custnum $custnum";
-
-  $error = $cust_main->charge(
-    $amount,
-    $cgi->param('pkg'),
-    '$'. sprintf("%.2f",$amount),
-    $cgi->param('taxclass')
-  );
-
-}
-
-if ($error) {
-%>
 <!-- mason kludge -->
-<%
-  eidiot($error);
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
-}
+%
+%  eidiot($error);
+%} else {
+%  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
+%}
+%
+%
 
-%>
 
-- 
cgit v1.2.1


From d8c39492e9192d9c66858d21c6c69b069968eec7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Dec 2006 13:36:07 +0000
Subject: some javascript validation magic to give one-time charges better UI

---
 httemplate/edit/process/quick-charge.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 70778c1cc..cb2654bb5 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -5,7 +5,7 @@
 %  or die 'illegal custnum '. $cgi->param('custnum');
 %my $custnum = $1;
 %
-%$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
+%$cgi->param('amount') =~ /^\s*\$?\s*(\d+(\.\d{1,2})?)\s*$/
 %  or die 'illegal amount '. $cgi->param('amount');
 %my $amount = $1;
 %
-- 
cgit v1.2.1


From d60a734b5602b3a94164f17f7b0ee74d11443008 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 29 Dec 2006 08:34:59 +0000
Subject: whitespace

---
 httemplate/edit/process/quick-charge.cgi | 2 --
 1 file changed, 2 deletions(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index cb2654bb5..2c5ac81b0 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -1,5 +1,3 @@
-%
-%
 %#untaint custnum
 %$cgi->param('custnum') =~ /^(\d+)$/
 %  or die 'illegal custnum '. $cgi->param('custnum');
-- 
cgit v1.2.1


From 2a863bbb144830dfb8fca4afb3af76a84a647c76 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 12 Jan 2007 02:04:50 +0000
Subject: one-time charge enhancements

---
 httemplate/edit/process/quick-charge.cgi | 84 +++++++++++++++++---------------
 1 file changed, 45 insertions(+), 39 deletions(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 2c5ac81b0..f614dd5cf 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -1,41 +1,47 @@
-%#untaint custnum
-%$cgi->param('custnum') =~ /^(\d+)$/
-%  or die 'illegal custnum '. $cgi->param('custnum');
-%my $custnum = $1;
 %
-%$cgi->param('amount') =~ /^\s*\$?\s*(\d+(\.\d{1,2})?)\s*$/
-%  or die 'illegal amount '. $cgi->param('amount');
-%my $amount = $1;
-%
-%my( $error, $cust_main);
-%if ( $cgi->param('taxclass') eq '(select)' ) {
-%
-%
-% $error = 'Must select a tax class';
-%} else {
-%
-%  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-%    or die "unknown custnum $custnum";
-%
-%  $error = $cust_main->charge(
-%    $amount,
-%    $cgi->param('pkg'),
-%    '$'. sprintf("%.2f",$amount),
-%    $cgi->param('taxclass')
-%  );
-%
-%}
-%
-%if ($error) {
-%
-
-<!-- mason kludge -->
-%
-%  eidiot($error);
-%} else {
-%  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
-%}
-%
-%
-
+%  my $error = '';
+%  my $param = $cgi->Vars;
+%
+%  my @description = ();
+%  for ( my $row = 0; exists($param->{"description$row"}); $row++ ) {
+%    push @description, $param->{"description$row"};
+%  }
+%  pop @description until ($description[$#description]);
+%
+%  $param->{"custnum"} =~ /^(\d+)$/
+%    or $error .= "Illegal customer number " . $param->{"custnum"} . "  ";
+%  my $custnum = $1;
+%
+%  $param->{"amount"} =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
+%    or $error .= "Illegal amount " . $param->{"amount"} . "  ";
+%  my $amount = $1;
+%
+%  if ( $param->{'taxclass'} eq '(select)' ) {
+%    $error .= "Must select a tax class.  ";
+%  }
+%
+%  unless ( $error ) {
+%    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+%      or $error .= "Unknown customer number $custnum.  ";
+%
+%    $error ||= $cust_main->charge({ 'amount'   => $amount,
+%                                   'pkg'      => $cgi->param('pkg'),
+%                                   'taxclass' => $cgi->param('taxclass'),
+%                                   'additional' => \@description,
+%                                 }
+%                               );
+%  }
+%
+%  if ( $error ) {
+%
+%    $cgi->param('error', "$error" );
+%    
+<% $cgi->redirect($p.'quick-charge.html?'. $cgi->query_string) %>
+%
+% }
+<% header("One-time charge added") %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+  </BODY></HTML>
 
-- 
cgit v1.2.1


From 810f6c351cbc38838daca5b795838ade12711999 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 15 Jan 2007 22:15:26 +0000
Subject: that was DUM

---
 httemplate/edit/process/quick-charge.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index f614dd5cf..a2eba3abc 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -6,7 +6,7 @@
 %  for ( my $row = 0; exists($param->{"description$row"}); $row++ ) {
 %    push @description, $param->{"description$row"};
 %  }
-%  pop @description until ($description[$#description]);
+%  pop @description until (!@description || $description[$#description]);
 %
 %  $param->{"custnum"} =~ /^(\d+)$/
 %    or $error .= "Illegal customer number " . $param->{"custnum"} . "  ";
-- 
cgit v1.2.1


From bc85a6042dca1848a23623be5d6612e495121da5 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 20 Jan 2007 00:08:39 +0000
Subject: strip all blank lines, not just trailing ones

---
 httemplate/edit/process/quick-charge.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit/process/quick-charge.cgi')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index a2eba3abc..024a281e0 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -4,9 +4,9 @@
 %
 %  my @description = ();
 %  for ( my $row = 0; exists($param->{"description$row"}); $row++ ) {
-%    push @description, $param->{"description$row"};
+%    push @description, $param->{"description$row"}
+%      if ($param->{"description$row"} =~ /\S/);
 %  }
-%  pop @description until (!@description || $description[$#description]);
 %
 %  $param->{"custnum"} =~ /^(\d+)$/
 %    or $error .= "Illegal customer number " . $param->{"custnum"} . "  ";
-- 
cgit v1.2.1