Added a much more user friendly way to present the data1-4 labels for each type, now that we have a tender_types table. Still not a perfect solution, but definitely good enough for now. Modified the application to recognize the new tender_types table. There may be other modifications necessary, but this gets the most obvious spot.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@378 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-24 02:07:43 +00:00
parent b408d86a98
commit 1e0b96953e
6 changed files with 46 additions and 14 deletions

View File

@@ -543,25 +543,36 @@ foreach my $tender_name ('Cash', 'Check', 'Money Order', 'ACH',
#'Debit Card', 'Credit Card',
) {
my ($tillable, $fields) = (0, 0);
my ($name1, $name2, $name3, $name4);
$tillable = 1
if ($tender_name =~ /^Cash|Check|Money Order$/);
$fields = 1 # Check / Money Order Number
if ($tender_name =~ /^Check|Money Order$/);
($name1) = ('Check Number')
if ($tender_name eq 'Check');
$fields = 2 # Routing Number, Account Number
if ($tender_name =~ /^ACH$/);
($name1) = ('Money Order Number')
if ($tender_name eq 'Money Order');
$fields = 3 # Card Number, Expiration, Billing Zip
if ($tender_name =~ / Card$/);
($name1, $name2) = ('Routing Number', 'Account Number')
if ($tender_name eq 'ACH');
($name1, $name2) = ('Debit Card Number', 'Expiration Date')
if ($tender_name eq 'Debit Card');
($name1, $name2, $name3) = ('Debit Card Number', 'Expiration Date', 'Billing Zip Code')
if ($tender_name eq 'Credit Card');
addRow('tender_types', {
'name' => $tender_name,
'account_id' => $newdb{'lookup'}{'account'}{$tender_name}{'account_id'},
'tillable' => $tillable,
'data_fields' => $fields,
'data1_name' => $name1,
'data2_name' => $name2,
'data3_name' => $name3,
'data4_name' => $name4,
});
$newdb{'lookup'}{'tender_type'}{$tender_name}
= { 'tender_type_id' => $newdb{'tables'}{'tender_types'}{'autoid'},
'account_id' => $newdb{'lookup'}{'account'}{$tender_name}{'account_id'},
@@ -613,6 +624,7 @@ foreach my $account_type (keys(%SITELINK_ACCOUNT_TYPE)) {
$newdb{'lookup'}{'_closing'}
= { 'name' => 'Closing',
'amount' => 0,
'tender_type_id' => undef,
'debit_account_id' => $newdb{'lookup'}{'account'}{'Closing'}{'account_id'},
'debit_ledger_id' => $newdb{'lookup'}{'account'}{'Closing'}{'ledger_id'},