From dcd4c9bd771e48c52907acbcbbfef9ad9461de6a Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 21 Jul 2005 18:16:40 +0000 Subject: [PATCH 1/1] view-izing the base payment table and adding the "payment_type" field git-svn-id: svn://svn.open-ils.org/ILS/trunk@1341 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Storage/CDBI/money.pm | 2 +- .../perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm | 3 +-- Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm | 4 +++- Open-ILS/src/sql/Postgres/080.schema.money.sql | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm index 32c2568e10..1f3daa671c 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm @@ -48,7 +48,7 @@ package money::payment; use base qw/money/; __PACKAGE__->table('money_payment'); __PACKAGE__->columns(Primary => 'id'); -__PACKAGE__->columns(Essential => qw/xact amount payment_ts/); +__PACKAGE__->columns(Essential => qw/xact amount payment_ts payment_type/); __PACKAGE__->columns(Others => qw/note/); #------------------------------------------------------------------------------- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm index 5c13c91908..c42791d606 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm @@ -14,8 +14,7 @@ #--------------------------------------------------------------------- package money::payment; - money::payment->table( 'money.payment' ); - money::payment->sequence( 'money.payment_id_seq' ); + money::payment->table( 'money.payment_view' ); #--------------------------------------------------------------------- package money::cash_payment; diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm index 9b55f88fd3..98fab9df04 100644 --- a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm @@ -128,7 +128,9 @@ sub _init { fixed_fields => 1 } }, #'Fieldmapper::biblio::record_marc' => { hint => 'brx' }, # now it's inside record_entry - 'Fieldmapper::money::payment' => { hint => 'mp' }, + 'Fieldmapper::money::payment' => { hint => 'mp', + readonly => 1 }, + 'Fieldmapper::money::cash_payment' => { hint => 'mcp' }, 'Fieldmapper::money::check_payment' => { hint => 'mckp' }, 'Fieldmapper::money::credit_payment' => { hint => 'mcrp' }, diff --git a/Open-ILS/src/sql/Postgres/080.schema.money.sql b/Open-ILS/src/sql/Postgres/080.schema.money.sql index 2328c33e41..19ee3b11e1 100644 --- a/Open-ILS/src/sql/Postgres/080.schema.money.sql +++ b/Open-ILS/src/sql/Postgres/080.schema.money.sql @@ -32,6 +32,12 @@ CREATE TABLE money.payment ( ); CREATE INDEX m_p_xact_idx ON money.payment (xact); +CREATE OR REPLACE VIEW money.payment_view AS + SELECT p.*,c.relname AS payment_type + FROM money.payment p + JOIN pg_class c ON (p.tableoid = c.oid); + + CREATE OR REPLACE VIEW money.billable_xact_summary AS SELECT xact.id AS id, xact.usr AS usr, -- 2.43.2