oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some bugs, added human friendly order number to transactions

Browse source
This commit is contained in:
JT Smith 2008-03-17 17:02:27 +00:00
parent 00e0035a3d
commit 537824fdc9
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/upgrades/upgrade_7.5.2-7.5.3.pl
View file

@ -48,6 +48,7 @@ sub convertTransactionLog {
$session->db->write("create table transaction (
transactionId varchar(22) binary not null primary key,
isSuccessful bool not null default 0,
orderNumber int not null auto_increment unique,
transactionCode varchar(100),
statusCode varchar(35),
statusMessage varchar(100),

4
lib/WebGUI/Content/Shop.pm
View file

@ -167,7 +167,7 @@ sub www_tax {
my $session = shift;
my $output = undef;
my $method = "www_".$session->form->get("method");
my $tax = WebGUI::Shop::Tax->create($session);
my $tax = WebGUI::Shop::Tax->new($session);
if ($method ne "www_" && $tax->can($method)) {
$output = $tax->$method();
}
@ -186,7 +186,7 @@ sub www_transaction {
my $session = shift;
my $output = undef;
my $method = "www_".$session->form->get("method");
my $transaction = WebGUI::Shop::Transaction->create($session);
my $transaction = WebGUI::Shop::Transaction->new($session);
if ($method ne "www_" && $transaction->can($method)) {
$output = $transaction->$method();
}

16
lib/WebGUI/Shop/Transaction.pm
View file

@ -343,7 +343,7 @@ sub www_getTransactionsAsJson {
my ($db, $form) = $self->session->quick(qw(db form));
my $startIndex = $form->get('startIndex') || 0;
my $numberOfResults = $form->get('results') || 25;
my $transactions = $db->read('select transactionId, transactionCode, paymentDriverLabel,
my $transactions = $db->read('select orderNumber, transactionId, transactionCode, paymentDriverLabel,
dateOfPurchase, username, amount, isSuccessful, statusCode, statusMessage
from transaction order by dateOfPurchase desc limit ?,?', [$startIndex, $numberOfResults]);
my $totalRecords = $db->quickScalar('select found_rows()');
@ -404,7 +404,7 @@ YAHOO.util.Event.onDOMReady(function () {
mySource.responseSchema = {
resultsList : 'records',
totalRecords: 'totalRecords',
fields : [ 'transactionCode', 'paymentDriverLabel',
fields : [ 'transactionCode', 'orderNumber', 'paymentDriverLabel',
'transactionId', 'dateOfPurchase', 'username', 'amount', 'isSuccessful', 'statusCode', 'statusMessage']
};
@ -417,26 +417,26 @@ YAHOO.util.Event.onDOMReady(function () {
containers : ['paging'],
pageLinks : 5,
rowsPerPage : 25,
rowsPerPageOptions : [25,50,100],
rowsPerPageOptions : [10,25,50,100],
template : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink} {RowsPerPageDropdown}"
});
var myTableConfig = {
initialRequest : ';startIndex=0;results=25',
initialRequest : ';startIndex=0',
generateRequest : buildQueryString,
paginationEventHandler : DataTable.handleDataSourcePagination,
paginator : myPaginator
};
YAHOO.widget.DataTable.formatViewTransaction = function(elCell, oRecord, oColumn, transactionId) {
YAHOO.widget.DataTable.formatViewTransaction = function(elCell, oRecord, oColumn, orderNumber) {
STOP
$output .= q{elCell.innerHTML = '<a href="}.$url->page('shop=transaction;method=viewTransaction')
.q{;transactionId=' + transactionId + '">' + transactionId + '</a>'; };
$output .= q{elCell.innerHTML = '<a href="}.$url->page(q{shop=transaction;method=viewTransaction})
.q{;transactionId=' + oRecord.getData('transactionId') + '">' + orderNumber + '</a>'; };
$output .= '
};
var myColumnDefs = [
';
$output .= '{key:"transactionId", label:"'.$i18n->get('transaction id').'", formatter:YAHOO.widget.DataTable.formatViewTransaction},';
$output .= '{key:"orderNumber", label:"'.$i18n->get('order number').'", formatter:YAHOO.widget.DataTable.formatViewTransaction},';
$output .= '{key:"dateOfPurchase", label:"'.$i18n->get('date').'",formatter:YAHOO.widget.DataTable.formatDate},';
$output .= '{key:"username", label:"'.$i18n->get('username').'"},';
$output .= '{key:"amount", label:"'.$i18n->get('price').'",formatter:YAHOO.widget.DataTable.formatCurrency},';

4
lib/WebGUI/i18n/English/Shop.pm
View file

@ -15,8 +15,8 @@ our $I18N = {
context => q|field label|
},
'transaction id' => {
message => q|Transaction Id|,
'order number' => {
message => q|Order #|,
lastUpdated => 0,
context => q|field label|
},