Merge branch 'master' of github.com:freeside/Freeside into Proj42404

Author: fozzmoo

FS/FS/Conf.pm

@@ -3855,7 +3855,7 @@ and customer address. Include units.',
   {
     'key'         => 'batchconfig-eft_canada',
     'section'     => 'billing',
-    'description' => 'Configuration for EFT Canada batching, four lines: 1. SFTP username, 2. SFTP password, 3. Transaction code, 4. Number of days to delay process date.  If you are using separate per-agent batches (batch-spoolagent), you must set this option separately for each agent, as the global setting will be ignored.',
+    'description' => 'Configuration for EFT Canada batching, five lines: 1. SFTP username, 2. SFTP password, 3. Business transaction code, 4. Personal transaction code, 5. Number of days to delay process date.  If you are using separate per-agent batches (batch-spoolagent), you must set this option separately for each agent, as the global setting will be ignored.',
     'type'        => 'textarea',
     'per_agent'   => 1,
   },

FS/FS/cdr/cx3.pm

@@ -10,40 +10,33 @@ use Date::Parse;
 %info = (
   'name'          => '3CX',
   'weight'        => 120,
-  'header'        => 1,
   'import_fields' => [
 
 
-sub {                 
-      	my ($cdr, $data, $conf, $param) = @_;
-      	 	$param->{skiprow} = 1 unless $data =~ 'CallDetail'; # skip non-detail records
+	sub {                 
+      		my ($cdr, $data, $conf, $param) = @_;
+      	 	$param->{skiprow} = 1 unless $data =~ /Call\s/ ; # skip non-detail records
 	},		# record type
-	skip(2),	# unknown, callid ( not unique )
-	'src',		# source
-	'dst',		# destination
-sub { my ($cdr, $calldate, $param) = @_;
-
-	if ($calldate =~ /^(\d{2})\/(\d{2})\/(\d{4})\s*(\d{2}):(\d{2}):(\d{2})$/){
+	skip(1),	# unknown, callid ( not unique )
+	sub { my ($cdr, $duration) = @_;
+	
+		my ($hour,$min,$sec) = split(/:/,$duration);
+		$sec = sprintf ("%.0f", $sec);
+		$sec += $min * 60;
+		$sec += $hour * 60 * 60;
+		$cdr->set('billsec', $sec);
+
+	},		# duration
+	skip(1),		
+	sub { my ($cdr, $calldate, $param) = @_;
 
 		$cdr->set('calldate', $calldate);
-                my $tmp_date = "$2/$1/$3 $4:$5:$6";
-
-                $tmp_date = str2time($tmp_date);
-                $cdr->set('startdate', $tmp_date);
-                }          
 	},              #date
-sub { my ($cdr, $duration) = @_;
-               
-	my ($hour,$min,$sec) = split(/:/,$duration);
-	$sec += $min * 60;
-	$sec += $hour * 60 * 60;
-	$sec = sprintf ("%.0f", $sec);
-	$cdr->set('billsec', $sec);
-
-},			#duration
-	skip(1),        # unknown
-	'disposition',  # call status
+	skip(4),          
 	'accountcode',  # AccountCode
+	skip(6),		
+	'src',		# source
+	'dst',		# destination
 
   ],
 );

FS/FS/pay_batch/eft_canada.pm

@@ -15,7 +15,7 @@ $name = 'eft_canada';
 
 %import_info = ( filetype  => 'NONE' ); # see FS/bin/freeside-eftca-download
 
-my ($trans_code, $process_date);
+my ($business_trans_code, $personal_trans_code, $trans_code, $process_date);
 
 #ref http://gocanada.about.com/od/canadatravelplanner/a/canada_holidays.htm
 my %holiday_yearly = (
@@ -66,7 +66,8 @@ my %holiday = (
       @config = $conf->config('batchconfig-eft_canada');
     }
     # SFTP login, password, trans code, delay time
-    ($trans_code) = $config[2];
+    ($business_trans_code) = $config[2];
+    ($personal_trans_code) = $config[3];
 
     $process_date = time2str('%D', process_date($conf, $agentnum));
   },
@@ -82,12 +83,14 @@ my %holiday = (
     my $company = sprintf('%.64s', $cust_pay_batch->cust_main->company);
     if ( $company ) {
       push @fields, 'Business';
-      push @fields, $company, ''
+      push @fields, $company, '';
+      $trans_code = $business_trans_code;
     }
     else {
       push @fields, 'Personal';
       push @fields, map { sprintf('%.64s', $_) } 
         $cust_pay_batch->first, $cust_pay_batch->last;
+        $trans_code = $personal_trans_code;
     }
     my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
     my($bankno, $branch);

debian/rules

@@ -160,6 +160,11 @@ install-stamp: build-stamp
 
 	# Install interfaces
 	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
+	
+	# Install tex
+	install -D -o freeside -m 444 etc/longtable.sty \
+	$(TMP)-lib/usr/local/share/texmf/tex/latex/longtable.sty
+	texhash $(TMP)-lib/usr/local/share/texmf
 
 	# Create Apache configurations
 	install -d $(APACHE_CONF)

httemplate/elements/calendar.js

@@ -1635,6 +1635,17 @@ Date.parseDate = function(str, fmt) {
 		    case "%M":
 			min = parseInt(a[i], 10);
 			break;
+
+                    case "%r":
+                        hr = parseInt(a[i], 10);
+                        min = parseInt(a[++i], 10);
+                        var sec = parseInt(a[++i], 10);
+			if (/pm/i.test(a[++i]) && hr < 12)
+				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
+			break;
+
 		}
 	}
 	if (isNaN(y)) y = today.getFullYear();
@@ -1759,7 +1770,13 @@ Date.prototype.print = function (str) {
 	s["%n"] = "\n";		// a newline character
 	s["%p"] = pm ? "PM" : "AM";
 	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+
+	// %r : the time in am/pm notation %I:%M:%S %p
+        s["%r"] = ( (ir  < 10) ? ("0" + ir ) : ir  ) + ':'
+                + ( (min < 10) ? ("0" + min) : min ) + ':'
+                + ( (sec < 10) ? ("0" + sec) : sec ) + ' '
+                + (pm ? "PM" : "AM" );
+
 	// FIXME: %R : the time in 24-hour notation %H:%M
 	s["%s"] = Math.floor(this.getTime() / 1000);
 	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
@@ -1790,6 +1807,7 @@ Date.prototype.print = function (str) {
 	return str;
 };
 
+if ( !Date.prototype.__msh_oldSetFullYear ) {
 Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
 Date.prototype.setFullYear = function(y) {
 	var d = new Date(this);
@@ -1798,6 +1816,7 @@ Date.prototype.setFullYear = function(y) {
 		this.setDate(28);
 	this.__msh_oldSetFullYear(y);
 };
+}
 
 // END: DATE OBJECT PATCHES
 

httemplate/elements/calendar_stripped.js

@@ -14,6 +14,11 @@
     ifFormat:   "<% $format %>",
     button:     "<% $name %>_button",
     align:      "BR"
+%   if ( $format =~ /\%r/ ) {
+      ,
+      showsTime: true,
+      timeFormat: 12
+%   }
   });
 </SCRIPT>
 

httemplate/elements/input-date-field.html

@@ -26,7 +26,7 @@
 
 <TR>
   <TD ALIGN="right"><% $label %></TD>
-  <TD>
+  <TD COLSPAN=<% $colspan %>>
     <INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
     <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
   </TD>
@@ -38,12 +38,17 @@
     ifFormat:   "<% $format %>",
     button:     "<% $name %>_button",
     align:      "BR"
+%   if ( $format =~ /\%r/ ) {
+      ,
+      showsTime: true,
+      timeFormat: 12
+%   }
   });
 </SCRIPT>
 
 <%init>
 
-my($name, $value, $label, $format, $usedatetime, $noinit);
+my($name, $value, $label, $format, $usedatetime, $noinit, $colspan);
 if ( ref($_[0]) ) {
   my $opt = shift;
   $name        = $opt->{'name'};
@@ -52,8 +57,10 @@
   $format      = $opt->{'format'};
   $usedatetime = $opt->{'usedatetime'};
   $noinit      = $opt->{'noinit'};
+  $colspan     = $opt->{'colspan'} || 1;
 } else {
   ($name, $value, $label, $format, $usedatetime) = @_;
+  $colspan = 1;
 }
 
 my $conf = new FS::Conf;