Index: openacs-4/packages/value-based-shipping/value-based-shipping.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/value-based-shipping.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/value-based-shipping/value-based-shipping.info 12 Sep 2002 02:10:01 -0000 1.2 +++ openacs-4/packages/value-based-shipping/value-based-shipping.info 12 Sep 2002 20:11:05 -0000 1.3 @@ -21,6 +21,10 @@ <requires url="shipping-gateway" version="4.5b"/> <files> + <file type="data_model_create" db_type="oracle" path="sql/oracle/value-based-shipping-create.sql"/> + <file type="data_model_drop" db_type="oracle" path="sql/oracle/value-based-shipping-drop.sql"/> + <file type="data_model" db_type="oracle" path="sql/oracle/value-based-shipping-sc-create.sql"/> + <file type="data_model" db_type="oracle" path="sql/oracle/value-based-shipping-sc-drop.sql"/> <file type="data_model_create" db_type="postgresql" path="sql/postgresql/value-based-shipping-create.sql"/> <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/value-based-shipping-drop.sql"/> <file type="data_model" db_type="postgresql" path="sql/postgresql/value-based-shipping-sc-create.sql"/> @@ -40,12 +44,16 @@ <file type="content_page" path="www/admin/levels.adp"/> <file type="content_page" path="www/admin/levels.tcl"/> <file type="query_file" path="www/admin/levels.xql"/> + <file type="query_file" db_type="oracle" path="www/admin/rate-delete-oracle.xql"/> + <file type="query_file" db_type="postgresql" path="www/admin/rate-delete-postgresql.xql"/> <file type="content_page" path="www/admin/rate-delete.adp"/> <file type="content_page" path="www/admin/rate-delete.tcl"/> <file type="query_file" path="www/admin/rate-delete.xql"/> <file type="content_page" path="www/admin/rate-edit.adp"/> <file type="content_page" path="www/admin/rate-edit.tcl"/> <file type="query_file" path="www/admin/rate-edit.xql"/> + <file type="query_file" db_type="oracle" path="www/admin/rates-oracle.xql"/> + <file type="query_file" db_type="postgresql" path="www/admin/rates-postgresql.xql"/> <file type="content_page" path="www/admin/rates.adp"/> <file type="content_page" path="www/admin/rates.tcl"/> <file type="query_file" path="www/admin/rates.xql"/> Index: openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 12 Sep 2002 19:45:01 -0000 1.4 +++ openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 12 Sep 2002 20:11:09 -0000 1.5 @@ -54,7 +54,7 @@ # The request didn't include a service level ID. - template::element::set_value level_edit service_level_id [db_nextval vbs_service_level_id_sequence] + template::element::set_value level_edit service_level_id [db_nextval vbs_service_level_id_seq] } else { Index: openacs-4/packages/value-based-shipping/www/admin/rate-delete.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-delete.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/value-based-shipping/www/admin/rate-delete.xql 21 May 2002 18:35:37 -0000 1.1 +++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.xql 12 Sep 2002 20:11:09 -0000 1.2 @@ -18,15 +18,4 @@ </querytext> </fullquery> - - <fullquery name="get_shipping_rate"> - <querytext> - select l.service_level_description, c.default_name as country, round(r.from_value, 2) as from_value, round(r.to_value, 2) as to_value, - r.from_zip_code, r.to_zip_code, round(r.shipping_rate, 2) as shipping_rate - from vbs_rates r left join countries c on (r.country_iso = c.iso), vbs_service_levels l - where r.shipping_rate_id = :shipping_rate_id - and r.service_level_id = l.service_level_id - </querytext> - </fullquery> - </queryset> Index: openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 12 Sep 2002 19:45:01 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 12 Sep 2002 20:11:09 -0000 1.4 @@ -116,7 +116,7 @@ # The request didn't include a shipping rate ID. - template::element set_value rate_edit shipping_rate_id [db_nextval vbs_shipping_rate_id_sequence] + template::element set_value rate_edit shipping_rate_id [db_nextval vbs_shipping_rate_id_seq] } else { Index: openacs-4/packages/value-based-shipping/www/admin/rates.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/value-based-shipping/www/admin/rates.xql 16 Aug 2002 00:06:56 -0000 1.2 +++ openacs-4/packages/value-based-shipping/www/admin/rates.xql 12 Sep 2002 20:11:09 -0000 1.3 @@ -11,14 +11,4 @@ </querytext> </fullquery> - <fullquery name="get_shipping_rates"> - <querytext> - select r.shipping_rate_id, l.service_level_description, c.default_name as country, round(r.from_value, 2) as from_value, round(r.to_value, 2) as to_value, - r.from_zip_code, r.to_zip_code, round(r.shipping_rate, 2) as shipping_rate - from vbs_rates r left join countries c on (r.country_iso = c.iso), vbs_service_levels l - where r.service_level_id = l.service_level_id - order by l.service_level_description, c.default_name, r.from_value, coalesce(r.to_value, 0), coalesce(r.from_zip_code, '0') - </querytext> - </fullquery> - </queryset>