[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26769] trunk

[<li...@us...>]

Revision: 26769
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26769&view=rev
Author:   lindonb
Date:     2010-04-26 07:02:25 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
[ENH] Display dates on payment requests based on user's short date format instead of sql timestamp. Added function in tikilib to do the conversion - didn't seem to be one for this but let me know if I missed it.

Modified Paths:
--------------
    trunk/lib/payment/paymentlib.php
    trunk/lib/smarty_tiki/function.payment.php
    trunk/lib/tikilib.php
    trunk/templates/tiki-payment-single.tpl
    trunk/templates/tiki-payment-user.tpl

Modified: trunk/lib/payment/paymentlib.php
===================================================================
--- trunk/lib/payment/paymentlib.php	2010-04-26 02:20:22 UTC (rev 26768)
+++ trunk/lib/payment/paymentlib.php	2010-04-26 07:02:25 UTC (rev 26769)
@@ -59,7 +59,7 @@
 	}
 
 	function get_payment( $id ) {
-		global $tikilib, $prefs;
+		global $tikilib, $prefs, $user;
 		$info = reset( $this->fetchAll( 'SELECT * FROM `tiki_payment_requests` WHERE `paymentRequestId` = ?', array( $id ) ) );
 
 		if( $info ) {
@@ -77,10 +77,11 @@
 
 			$info['payments'] = array();
 			$payments = $this->fetchAll( 'SELECT * FROM `tiki_payment_received` WHERE `paymentRequestId` = ? ORDER BY `payment_date` DESC', array( $id ) );
-
+			include_once 'lib/tikilib.php';
 			foreach( $payments as $payment ) {
 				$payment['details'] = json_decode( $payment['details'], true );
 				$payment['amount_paid'] = number_format( $payment['amount'], 2, '.', ',' );
+				$payment['fpayment_date'] = $tikilib->format_sql_date($payment['payment_date']);
 				$info['payments'][] = $payment;
 			}
 

Modified: trunk/lib/smarty_tiki/function.payment.php
===================================================================
--- trunk/lib/smarty_tiki/function.payment.php	2010-04-26 02:20:22 UTC (rev 26768)
+++ trunk/lib/smarty_tiki/function.payment.php	2010-04-26 07:02:25 UTC (rev 26769)
@@ -6,17 +6,21 @@
 // $Id$
 
 function smarty_function_payment( $params, $smarty ) {
-	global $tikilib;
+	global $tikilib, $user;
 	global $paymentlib; require_once 'lib/payment/paymentlib.php';
 	$invoice = (int) $params['id'];
 
 	$objectperms = Perms::get( 'payment', $invoice );
 	$info = $paymentlib->get_payment( $invoice );
 
-	// Unpaid payments can be seen by anyone as long as they no the number
+	// Unpaid payments can be seen by anyone as long as they know the number
 	// Just like your bank account, anyone can drop money in it.
 	if( $info && $info['state'] == 'outstanding' || $info['state'] == 'overdue' || $objectperms->payment_view ) {
 		$info['fullview'] = $objectperms->payment_view;
+		//format for display based on user short display format and timezone
+		include_once 'lib/tikilib.php';
+		$info['frequest_date'] = $tikilib->format_sql_date($info['request_date']);
+		$info['fdue_date'] = $tikilib->format_sql_date($info['due_date']);
 		$smarty->assign( 'payment_info', $info );
 		$smarty->assign( 'payment_detail', $tikilib->parse_data( htmlspecialchars($info['detail']) ) );
 		return $smarty->fetch( 'tiki-payment-single.tpl' );

Modified: trunk/lib/tikilib.php
===================================================================
--- trunk/lib/tikilib.php	2010-04-26 02:20:22 UTC (rev 26768)
+++ trunk/lib/tikilib.php	2010-04-26 07:02:25 UTC (rev 26769)
@@ -7677,6 +7677,15 @@
 	function get_short_datetime($timestamp, $user = false) {
 		return $this->date_format($this->get_short_datetime_format(), $timestamp, $user);
 	}
+	
+	function format_sql_date($sqlstamp) {
+		global $user, $tikilib;
+		$tz = $tikilib->get_display_timezone($user);
+		$unixstamp = strtotime($sqlstamp . $tz);
+		$format = $tikilib->get_short_date_format();
+		$date = strftime($format, $unixstamp);
+		return $date;
+	}
 
 	/**
 		Per http://www.w3.org/TR/NOTE-datetime

Modified: trunk/templates/tiki-payment-single.tpl
===================================================================
--- trunk/templates/tiki-payment-single.tpl	2010-04-26 02:20:22 UTC (rev 26768)
+++ trunk/templates/tiki-payment-single.tpl	2010-04-26 07:02:25 UTC (rev 26769)
@@ -25,7 +25,7 @@
 			</form>
 		{/if}
 	</p>
-	<p>{tr 0=$payment_info.request_date 1=$payment_info.due_date}Payment request was sent on %0 and is due by %1.{/tr}
+	<p>{tr 0=$payment_info.frequest_date 1=$payment_info.fdue_date}Payment request was sent on %0 and is due by %1.{/tr}
 
 	{if $payment_info.fullview && $payment_info.payments|@count}
 		<ol>

Modified: trunk/templates/tiki-payment-user.tpl
===================================================================
--- trunk/templates/tiki-payment-user.tpl	2010-04-26 02:20:22 UTC (rev 26768)
+++ trunk/templates/tiki-payment-user.tpl	2010-04-26 07:02:25 UTC (rev 26769)
@@ -1,4 +1,4 @@
-<p>{$payment.amount_paid|escape}&nbsp;{$currency|escape} was paid on {$payment.payment_date|escape}.</p>
+<p>{$payment.amount_paid|escape}&nbsp;{$currency|escape} was paid on {$payment.fpayment_date|escape}.</p>
 {tr}Payment information{/tr}
 <p>By {$payment.details.user|userlink}</p>
 {if $payment.details.note}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.