money.desk_payment_view support

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5765 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 046570f..f8847f4 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -1876,6 +1876,7 @@
                        <field name="payment_ts" oils_obj:array_position="6" oils_persist:virtual="false" />
                        <field name="payment_type" oils_obj:array_position="7" oils_persist:virtual="false" />
                        <field name="xact" oils_obj:array_position="8" oils_persist:virtual="false" />
+                       <field name="voided" oils_obj:array_position="9" oils_persist:virtual="false" />
                </fields>
                <links>
                        <link field="cash_payment" reltype="might_have" key="id" map="" class="mcp"/>
@@ -1887,6 +1888,30 @@
                        <link field="xact" reltype="has_a" key="id" map="" class="mbt"/>
                </links>
        </class>
+       <class id="mdp" oils_obj:fieldmapper="money::desk_payment" oils_persist:tablename="money.desk_payment_view">
+               <fields oils_persist:primary="id" oils_persist:sequence="">
+                       <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
+                       <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
+                       <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
+                       <field name="amount" oils_obj:array_position="3" oils_persist:virtual="false" />
+                       <field name="id" oils_obj:array_position="4" oils_persist:virtual="false" />
+                       <field name="note" oils_obj:array_position="5" oils_persist:virtual="false" />
+                       <field name="payment_ts" oils_obj:array_position="6" oils_persist:virtual="false" />
+                       <field name="payment_type" oils_obj:array_position="7" oils_persist:virtual="false" />
+                       <field name="xact" oils_obj:array_position="8" oils_persist:virtual="false" />
+                       <field name="accepting_usr" oils_obj:array_position="9" oils_persist:virtual="false" />
+                       <field name="cash_drawer" oils_obj:array_position="10" oils_persist:virtual="false" />
+                       <field name="voided" oils_obj:array_position="11" oils_persist:virtual="false" />
+               </fields>
+               <links>
+                       <link field="cash_payment" reltype="might_have" key="id" map="" class="mcp"/>
+                       <link field="credit_card_payment" reltype="might_have" key="id" map="" class="mccp"/>
+                       <link field="check_payment" reltype="might_have" key="id" map="" class="mckp"/>
+                       <link field="xact" reltype="has_a" key="id" map="" class="mbt"/>
+                       <link field="accepting_usr" reltype="has_a" key="id" map="" class="au"/>
+                       <link field="cash_drawer" reltype="has_a" key="id" map="" class="aws"/>
+               </links>
+       </class>
        <class id="cbrebi" oils_obj:fieldmapper="container::biblio_record_entry_bucket_item" oils_persist:tablename="container.biblio_record_entry_bucket_item">
                <fields oils_persist:primary="id" oils_persist:sequence="container.biblio_record_entry_bucket_item_id_seq">
                        <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />

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 37f4060..0864ff3 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm
@@ -89,6 +89,13 @@ __PACKAGE__->columns(Primary => 'id');
 __PACKAGE__->columns(Essential => qw/xact amount payment_ts payment_type note/);
 #-------------------------------------------------------------------------------
 
+package money::desk_payment;
+use base qw/money/;
+__PACKAGE__->table('money_desk_payment');
+__PACKAGE__->columns(Primary => 'id');
+__PACKAGE__->columns(Essential => qw/xact amount payment_ts voided amount_collected accepting_usr cash_drawer payment_type note/);
+#-------------------------------------------------------------------------------
+
 package money::cash_payment;
 use base qw/money/;
 __PACKAGE__->table('money_cash_payment');

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 956bc18..8862d60 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm
@@ -73,6 +73,11 @@
        money::billing->sequence( 'money.billing_id_seq' );
 
        #---------------------------------------------------------------------
+       package money::desk_payment;
+       
+       money::desk_payment->table( 'money.desk_payment_view' );
+
+       #---------------------------------------------------------------------
        package money::payment;
        
        money::payment->table( 'money.payment_view' );