Added ability to move an existing customer into a vacant unit. Changed out all of the 'amount' fields with 'rent', since it's much more self-explanatory. We still need the ability to add customers and contacts. I'll consider doing this by using the insert row ability of jqGrid.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@204 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -550,6 +550,43 @@ $newdb{'ids'}{'monetary_source'}{'Closing'} =
|
||||
## UNITS
|
||||
##
|
||||
|
||||
my @unit_sort_order =
|
||||
qw(
|
||||
A01 A02 A03 A04 A05 A06
|
||||
B01 B02 B03 B04 B05 B06 B07
|
||||
C01 C02 C03 C04 C05 C06 C07 C08 C09
|
||||
10 11 12 13 14 15 16 17 18 19 22 23 24 25 26 27 28 29
|
||||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
|
||||
D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11
|
||||
APT
|
||||
Y01 Y02 Y03 Y04 Y05 Y06 Y07 Y08 Y09 Y10
|
||||
);
|
||||
my $unit_sort_order = 0;
|
||||
my %unit_sort_order;
|
||||
foreach (@unit_sort_order) {
|
||||
$unit_sort_order += 1; # use 100 for later insertion
|
||||
$unit_sort_order{$_} = $unit_sort_order;
|
||||
}
|
||||
|
||||
my @unit_walk_order =
|
||||
qw(
|
||||
19 18 17 16 15 14 13 12 11 10
|
||||
C01 C02 C03 C04 C05 C06 C07 C08 C09
|
||||
APT
|
||||
38 37 36 35 34 33 32 31 30 29 28
|
||||
B01 B02 B03 B04 B05 B06 B07
|
||||
A01 A02 A03 A04 A05 A06
|
||||
27 26 25 24 23 22
|
||||
D11 D10 D09 D08 D07 D06 D05 D04 D03 D02 D01
|
||||
45 44 43 42 41 40 39
|
||||
Y01 Y02 Y03 Y04 Y05 Y06 Y07 Y08 Y09 Y10
|
||||
);
|
||||
my $unit_walk_order = 0;
|
||||
my %unit_walk_order;
|
||||
foreach (@unit_walk_order) {
|
||||
$unit_walk_order += 1; # use 100 for later insertion
|
||||
$unit_walk_order{$_} = $unit_walk_order;
|
||||
}
|
||||
|
||||
######################################################################
|
||||
## Unit Types
|
||||
@@ -582,7 +619,7 @@ foreach $row (@{query($sdbh, $query)}) {
|
||||
'width' => $internal_adjustment_factor * $row->{'Width'},
|
||||
'depth' => $internal_adjustment_factor * $row->{'Depth'},
|
||||
'deposit' => $row->{'StdSecDep'},
|
||||
'amount' => $row->{'StdRent'} });
|
||||
'rent' => $row->{'StdRent'} });
|
||||
|
||||
$newdb{'lookup'}{'unit_size'}{$sz}
|
||||
= { 'id' => $newdb{'tables'}{'unit_sizes'}{'autoid'},
|
||||
@@ -604,10 +641,10 @@ foreach $row (@{query($sdbh, $query)}) {
|
||||
'code' => $row->{'UnitID'},
|
||||
'name' => $row->{'UnitID'},
|
||||
'status' => $row->{'Rented'} ?'OCCUPIED' :($row->{'Rentable'} ?'VACANT' :'UNAVAILABLE'),
|
||||
'sort_order' => $newdb{'tables'}{'units'}{'autoid'},
|
||||
'walk_order' => $newdb{'tables'}{'units'}{'autoid'},
|
||||
'sort_order' => $unit_sort_order{$row->{'UnitID'}},
|
||||
'walk_order' => $unit_walk_order{$row->{'UnitID'}},
|
||||
'deposit' => $row->{'StdSecDep'},
|
||||
'amount' => $row->{'StdRent'} });
|
||||
'rent' => $row->{'StdRent'} });
|
||||
|
||||
$newdb{'lookup'}{'unit'}{$row->{'UnitID'}}
|
||||
= { 'id' => $newdb{'tables'}{'units'}{'autoid'} };
|
||||
@@ -820,8 +857,8 @@ foreach $row (@{query($sdbh, $query)}) {
|
||||
= { 'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'} };
|
||||
|
||||
addRow('leases',
|
||||
{ #'number' => $newdb{'tables'}{'leases'}{'autoid'}+1,
|
||||
'number' => $row->{'LedgerID'},
|
||||
{ 'number' => $newdb{'tables'}{'leases'}{'autoid'}+1,
|
||||
#'number' => $row->{'LedgerID'},
|
||||
'lease_type_id' => $newdb{'tables'}{'lease_types'}{'autoid'},
|
||||
'unit_id' => $newdb{'lookup'}{'unit'}{$row->{'UnitID'}}{'id'},
|
||||
'customer_id' => $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'customer_id'},
|
||||
@@ -829,7 +866,7 @@ foreach $row (@{query($sdbh, $query)}) {
|
||||
'movein_date' => datefmt($row->{'DateIn'}),
|
||||
'moveout_date' => datefmt($row->{'DateOut'}),
|
||||
'close_date' => datefmt($row->{'DateClosed'}),
|
||||
'amount' => $row->{'Rent'} });
|
||||
'rent' => $row->{'Rent'} });
|
||||
|
||||
$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'lease_id'} =
|
||||
$newdb{'tables'}{'leases'}{'autoid'};
|
||||
@@ -1525,3 +1562,4 @@ $query = "UPDATE pmgr_units U, pmgr_leases L
|
||||
WHERE L.unit_id = U.id AND L.close_date IS NULL";
|
||||
query($db_handle, $query);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user