[OFBiz] SVN: r6505 - in trunk/specialized/opentravelsystem: . script/org/ofbiz/opentravelsystem servicedef src/org/ofbiz/opentravelsystem webapp/HotelSimple/data webapp/HotelSimple/includes webapp/hotelbackend/WEB-INF webapp/hotelbackend/catalog webapp/hotelbackend/includes webapp/hotelbackend/screens webapp/shop/html
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Sun Jan 15 21:41:01 CST 2006
Author: hansbak
Date: 2006-01-15 21:37:42 -0600 (Sun, 15 Jan 2006)
New Revision: 6505
Added:
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/OrderServices.xml
trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/FindServices.java
Modified:
trunk/specialized/opentravelsystem/README.odt
trunk/specialized/opentravelsystem/README.pdf
trunk/specialized/opentravelsystem/ofbiz-component.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/InvoiceServices.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml
trunk/specialized/opentravelsystem/servicedef/services.xml
trunk/specialized/opentravelsystem/webapp/HotelSimple/data/HotelSimple.xml
trunk/specialized/opentravelsystem/webapp/HotelSimple/includes/header.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/ProductStoreTabBar.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
trunk/specialized/opentravelsystem/webapp/shop/html/ecommain.css
Log:
OTS: updates and faultfixes
Modified: trunk/specialized/opentravelsystem/README.odt
===================================================================
(Binary files differ)
Modified: trunk/specialized/opentravelsystem/README.pdf
===================================================================
(Binary files differ)
Modified: trunk/specialized/opentravelsystem/ofbiz-component.xml
===================================================================
--- trunk/specialized/opentravelsystem/ofbiz-component.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/ofbiz-component.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -83,7 +83,7 @@
title="Hotel simplest, links in the site should open new window"
server="default-server"
location="webapp/HotelSimple"
- mount-point="/HotelSimple"
+ mount-point="/hotelsimple"
app-bar-display="false"/>
<webapp name="Shop"
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -52,40 +52,44 @@
</simple-method>
<simple-method method-name="createProduct" short-description="--Add a Product with the invoice prefix--">
- <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
- </check-permission>
- <check-errors/>
-
- <!-- create id using the invoice prefix -->
<entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
<field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
</entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
+ <check-errors/>
+
+ <!-- create id using the invoice prefix -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}Product" env-name="nextProductId"/>
+ <set field="parameters.productId" value="${partyAcctgPreference.invoiceIdPrefix}${nextProductId}"/>
+ </if-not-empty>
+ <!-- call original ofbiz service with preset ProductId -->
<set-service-fields service-name="createProductOfbiz" map-name="parameters" to-map-name="createProduct"/>
- <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}Product" env-name="nextProductId"/>
- <set field="createProduct.productId" value="${partyAcctgPreference.invoiceIdPrefix}${nextProductId}"/>
- <!-- call original ofbiz service with preset ProductId -->
<call-service service-name="createProductOfbiz" in-map-name="createProduct">
<result-to-result result-name="productId" service-result-name="productId"/>
</call-service>
</simple-method>
<simple-method method-name="createFixedAsset" short-description="--Add a FixedAsset with the invoice prefix--">
- <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
- </check-permission>
- <check-errors/>
-
- <!-- create id using the invoice prefix -->
<entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
<field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
</entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
+ <check-errors/>
+
+ <!-- create id using the invoice prefix -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}FixedAsset" env-name="nextFixedAssetId"/>
+ <set field="parameters.fixedAssetId" value="${partyAcctgPreference.invoiceIdPrefix}${nextFixedAssetId}"/>
+ </if-not-empty>
+ <!-- call original ofbiz service with preset FixedAssetId -->
<set-service-fields service-name="createFixedAssetOfbiz" map-name="parameters" to-map-name="createFixedAsset"/>
- <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}FixedAsset" env-name="nextFixedAssetId"/>
- <set field="createFixedAsset.fixedAssetId" value="${partyAcctgPreference.invoiceIdPrefix}${nextFixedAssetId}"/>
- <!-- call original ofbiz service with preset FixedAssetId -->
<call-service service-name="createFixedAssetOfbiz" in-map-name="createFixedAsset">
<result-to-result result-name="fixedAssetId" service-result-name="fixedAssetId"/>
</call-service>
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/InvoiceServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/InvoiceServices.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/InvoiceServices.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -22,58 +22,67 @@
* @author <a href="mailto:support at opentravelsystem.org">Hans Bakker</a>
* @version 1.0
-->
-
-<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
-
- <simple-method method-name="createInvoice" short-description="--Add a Invoice with the invoice prefix--">
- <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
- </check-permission>
- <check-errors/>
-
- <!-- create id using the invoice prefix -->
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false">
- <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
- </entity-one>
- <set-service-fields service-name="createInvoiceOfbiz" map-name="parameters" to-map-name="createInvoice"/>
- <if-compare field-name="parameters.invoiceTypeId" value="PURCHASE_INVOICE" operator="equals">
- <!-- switch/fill values if not set right -->
- <if-compare-field field-name="parameters.partyIdTo" operator="not-equals" to-field-name="parameters.userLogin.partyId">
- <if-empty field-name="parameters.partyIdTo"> <!-- if not supplied fill -->
- <set field="parameters.partIdTo" from-field="parameters.userLogin.partyId"/>
- <else><!-- assume they are the wrong way around so switch them -->
- <set field="partyIdTo" from-field="parameters.partyIdTo"/>
- <set field="parameters.partIdTo" from-field="parameters.userLogin.partyId"/>
- <set field="parameters.partyId" from-field="partyIdTo"/>
- </else>
- </if-empty>
- </if-compare-field>
- <!-- create purchase invoiceId -->
- <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}PInvoice" env-name="nextInvoiceId"/>
- <set field="createInvoice.invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}P${nextInvoiceId}"/>
- <else>
- <!-- switch/fill values if not set right -->
- <if-compare-field field-name="parameters.partyId" operator="not-equals" to-field-name="parameters.userLogin.partyId">
- <if-empty field-name="parameters.partyId"> <!-- if not supplied fill -->
- <set field="parameters.partyId" from-field="parameters.userLogin.partyId"/>
- <else><!-- assume they are the wrong way around so switch them -->
- <set field="partyId" from-field="parameters.partyId"/>
- <set field="parameters.partyId" from-field="parameters.userLogin.partyId"/>
- <set field="parameters.partyIdTo" from-field="partyId"/>
- </else>
- </if-empty>
- </if-compare-field>
- <!-- create sales invoiceId -->
- <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}SInvoice" env-name="nextInvoiceId"/>
- <set field="createInvoice.invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}S${nextInvoiceId}"/>
- </else>
- </if-compare>
- <call-service service-name="createInvoiceOfbiz" in-map-name="createInvoice">
- <result-to-result result-name="invoiceId" service-result-name="invoiceId"/>
- </call-service>
-
- </simple-method>
-
-</simple-methods>
\ No newline at end of file
+
+ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <simple-method method-name="createInvoice" short-description="--Add a Invoice with the invoice prefix--">
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
+ <check-errors/>
+
+ <!-- create id using the invoice prefix -->
+ <if-compare field-name="parameters.invoiceTypeId" value="PURCHASE_INVOICE" operator="equals">
+ <!-- switch/fill values if not set right -->
+ <if-compare-field field-name="parameters.partyId" operator="not-equals" to-field-name="parameters.userLogin.partyId">
+ <if-empty field-name="parameters.partyId"> <!-- if not supplied fill -->
+ <set field="parameters.partyId" from-field="parameters.userLogin.partyId"/>
+ <else><!-- assume they are the wrong way around so switch them -->
+ <set field="partyId" from-field="parameters.partyId"/>
+ <set field="parameters.partyId" from-field="parameters.userLogin.partyId"/>
+ <set field="parameters.partyIdFrom" from-field="partyId"/>
+ </else>
+ </if-empty>
+ </if-compare-field>
+ <!-- create purchase invoiceId -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}PInvoice" env-name="nextInvoiceId"/>
+ <set field="parameters.invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}P${nextInvoiceId}"/>
+ <else>
+ <!-- switch/fill values if not set right for sales invoice-->
+ <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="parameters.userLogin.partyId">
+ <if-empty field-name="parameters.partyIdFrom"> <!-- if not supplied fill -->
+ <set field="parameters.partyIdFrom" from-field="parameters.userLogin.partyId"/>
+ <else><!-- assume they are the wrong way around so switch them -->
+ <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
+ <set field="parameters.partyIdFrom" from-field="parameters.userLogin.partyId"/>
+ <set field="parameters.partyId" from-field="partyIdFrom"/>
+ </else>
+ </if-empty>
+ </if-compare-field>
+ <!-- create sales invoiceId -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}SInvoice" env-name="nextInvoiceId"/>
+ <set field="parameters.invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}S${nextInvoiceId}"/>
+ </else>
+ </if-compare>
+ <!--else>
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.partyIdFrom"/>
+ </entity-one>
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}SInvoice" env-name="nextInvoiceId"/>
+ <set field="parameters.invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}S${nextInvoiceId}"/>
+ </else-->
+ </if-not-empty>
+ <set-service-fields service-name="createInvoiceOfbiz" map-name="parameters" to-map-name="createInvoiceParam"/>
+ <call-service service-name="createInvoiceOfbiz" in-map-name="createInvoiceParam">
+ <result-to-result result-name="invoiceId" service-result-name="invoiceId"/>
+ </call-service>
+
+ </simple-method>
+
+ </simple-methods>
\ No newline at end of file
Added: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/OrderServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/OrderServices.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/OrderServices.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright (c) 2001-2005 The Open For Business Project and repective authors.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @author <a href="mailto:support at opentravelsystem.org">Hans Bakker</a>
+ * @version 1.0
+ -->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <!-- ================================================================ -->
+ <!-- Opentravelsystem Order Services -->
+ <!-- ================================================================ -->
+
+ <simple-method method-name="createOrderHeader" short-description="--Add a OrderHeader with the invoice prefix--">
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
+ <check-errors/>
+
+ <!-- create id using the invoice prefix -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}OrderHeader" env-name="nextOrderId"/>
+ <set field="parameters.orderId" value="${partyAcctgPreference.invoiceIdPrefix}${nextOrderId}"/>
+ <else><!-- customer enters an order, take prefix of company to pay from the productstore -->
+ <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field-name="productStore">
+ <field field-name="request" type="javax.servlet.ServletRequest"/>
+ </call-class-method>
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="productStore.payToPartyId"/>
+ </entity-one>
+ <!-- create id using the invoice prefix -->
+ <if-not-empty field-name="partyAcctgPreference.invoiceIdPrefix">
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}OrderHeader" env-name="nextOrderId"/>
+ <set field="parameters.orderId" value="${partyAcctgPreference.invoiceIdPrefix}${nextOrderId}"/>
+ <else><!-- if company not known use normal sequencing -->
+ <sequenced-id-to-env sequence-name="OrderHeader" env-name="parameters.orderId"/>
+ </else>
+ </if-not-empty>
+ </else>
+ </if-not-empty>
+ <log level="always" message="!!!!!!!!!! orderid: ${parameters.orderId}"></log>
+ <!-- call original ofbiz service with preset OrderHeaderId -->
+ <set-service-fields service-name="createOrderHeaderOfbiz" map-name="parameters" to-map-name="createOrderHeader"/>
+ <call-service service-name="createOrderHeaderOfbiz" in-map-name="createOrderHeader">
+ <result-to-result result-name="orderId" service-result-name="orderId"/>
+ </call-service>
+
+ </simple-method>
+
+
+</simple-methods>
\ No newline at end of file
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PartyServices.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -32,8 +32,8 @@
<simple-method method-name="addParty" short-description="--Add a Party--">
<check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.organizationPartyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.organizationPartyId}" in the "OPENTRAVELSYSTEM""/>
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${userLogin.partyId}" in the "OPENTRAVELSYSTEM""/>
</check-permission>
<check-errors/>
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -31,20 +31,22 @@
<!-- ================================================================ -->
<simple-method method-name="createPayment" short-description="--Add a payment with the invoice prefix--">
- <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
- <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
- <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
- </check-permission>
- <check-errors/>
-
- <!-- create id using the invoice prefix -->
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false">
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
<field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
</entity-one>
+ <if-not-empty field-name="partyAcctgPreference">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
+ <check-errors/>
+
+ <!-- create id using the invoice prefix -->
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}Payment" env-name="nextPaymentId"/>
+ <set field="parameters.paymentId" value="${partyAcctgPreference.invoiceIdPrefix}${nextPaymentId}"/>
+ </if-not-empty>
+ <!-- call original ofbiz service with preset paymentId -->
<set-service-fields service-name="createPaymentOfbiz" map-name="parameters" to-map-name="createPayment"/>
- <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}Payment" env-name="nextPaymentId"/>
- <set field="createPayment.paymentId" value="${partyAcctgPreference.invoiceIdPrefix}${nextPaymentId}"/>
- <!-- call original ofbiz service with preset paymentId -->
<call-service service-name="createPaymentOfbiz" in-map-name="createPayment">
<result-to-result result-name="paymentId" service-result-name="paymentId"/>
</call-service>
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -65,26 +65,24 @@
</and>
</condition>
<then>
-
- <transaction-begin/>
<!-- create invoice header -->
- <set from-field="payment.partyIdFrom" field="invoice.partyId"/>
- <set from-field="payment.partyIdTo" field="invoice.partyIdFrom"/>
- <set from-field="payment.currencyUomId" field="invoice.currencyUomId"/>
- <set from-field="payment.effectiveDate" field="invoice.invoiceDate"/>
- <set from-field="payment.effectiveDate" field="invoice.dueDate"/>
- <set value="Generated from Payment ${payment.paymentId}" field="invoice.description"/>
- <set value="INVOICE_IN_PROCESS" field="invoice.statusId"/>
+ <set from-field="payment.partyIdFrom" field="createInvoice.partyId"/>
+ <set from-field="payment.partyIdTo" field="createInvoice.partyIdFrom"/>
+ <set from-field="payment.currencyUomId" field="createInvoice.currencyUomId"/>
+ <set from-field="payment.effectiveDate" field="createInvoice.invoiceDate"/>
+ <set from-field="payment.effectiveDate" field="createInvoice.dueDate"/>
+ <set value="Generated from Payment ${payment.paymentId}" field="createInvoice.description"/>
+ <set value="INVOICE_IN_PROCESS" field="createInvoice.statusId"/>
<if-compare field-name="payment.partyIdFrom" operator="equals" value="${parameters.organizationPartyId}">
- <set value="PURCHASE_INVOICE" field="invoice.invoiceTypeId"/>
+ <set value="PURCHASE_INVOICE" field="createInvoice.invoiceTypeId"/>
<else>
- <set value="SALES_INVOICE" field="invoice.invoiceTypeId"/>
+ <set value="SALES_INVOICE" field="createInvoice.invoiceTypeId"/>
</else>
</if-compare>
- <call-service service-name="createInvoice" in-map-name="invoice">
- <result-to-field result-name="invoiceId" field-name="invoiceId"/>
+ <call-service service-name="createInvoice" in-map-name="createInvoice">
+ <result-to-field result-name="invoiceId" field-name="invoiceItem.invoiceId"/>
</call-service>
-
+ <clear-field field-name="createInvoice"/><!-- required because the invoiceId gets inserted in here, not good to create the next one.-->
<calculate field-name="invoicesCreated">
<calcop operator="add">
<calcop operator="get" field-name="invoicesCreated"/>
@@ -103,7 +101,6 @@
<find-by-and entity-name="PartyTaxAuthInfo" map-name="partyTaxInfoSearch" list-name="partyTaxInfos"/>
<filter-list-by-date list-name="partyTaxInfos" to-list-name="fPartyTaxInfos"/>
<first-from-list entry-name="partyTaxInfo" list-name="fPartyTaxInfos"/>
- <set value="${invoiceId}" field="invoiceItem.invoiceId"/>
<if>
<condition>
<and>
@@ -179,7 +176,7 @@
</if>
<!-- apply the payment to the invoice -->
- <set field="application.invoiceId" from-field="invoiceId"/>
+ <set field="application.invoiceId" from-field="invoiceItem.invoiceId"/>
<set field="application.paymentId" from-field="payment.paymentId"/>
<set field="application.amountApplied" from-field="payment.amount" />
<call-service service-name="updatePaymentApplication" in-map-name="application"/>
@@ -197,7 +194,7 @@
<string-append field-name="invoicesCreated" string=" invoices created, all processed."/>
<set value="${invoicesCreated}" field="_event_message_"/>
</simple-method>
-
+
<simple-method method-name="SendReceivePayments"
short-description="Set all payments with the 'not paid' status to send/received i.e. post payment" use-transaction="true">
<!--check-permission permission="CATALOG" action="_CREATE">
Modified: trunk/specialized/opentravelsystem/servicedef/services.xml
===================================================================
--- trunk/specialized/opentravelsystem/servicedef/services.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/servicedef/services.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -280,7 +280,7 @@
<service name="createInvoice" engine="simple" default-entity-name="Invoice"
location="org/ofbiz/opentravelsystem/InvoiceServices.xml" invoke="createInvoice">
<description>Create Invoice Record with company prefix</description>
- <auto-attributes mode="OUT" include="pk" optional="true"/>
+ <auto-attributes mode="OUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
<override name="invoiceTypeId" mode="IN" optional="false"/>
<override name="statusId" mode = "IN" optional="false"/>
@@ -349,5 +349,17 @@
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
+ <service name="prepareFind" auth="false" engine="java" invoke="prepareFind" location="org.ofbiz.opentravelsystem.FindServices">
+ <description>Generic service to return a entity conditions</description>
+ <attribute name="entityName" type="String" mode="IN" optional="false"/>
+ <attribute name="inputFields" type="java.util.Map" mode="IN" optional="false"/>
+ <attribute name="orderBy" type="String" mode="IN" optional="true"/>
+ <attribute name="noConditionFind" type="String" mode="IN" optional="true"><!-- find with no condition (empty entityConditionList) only done when this is Y --></attribute>
+ <attribute name="filterByDate" type="String" mode="IN" optional="true"/>
+ <attribute name="queryString" type="String" mode="OUT" optional="true"/>
+ <attribute name="queryStringMap" type="java.util.Map" mode="OUT" optional="true"/>
+ <attribute name="orderByList" type="java.util.List" mode="OUT" optional="true"/>
+ <attribute name="entityConditionList" type="org.ofbiz.entity.condition.EntityConditionList" mode="OUT" optional="true"/>
+ </service>
</services>
Added: trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/FindServices.java
===================================================================
--- trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/FindServices.java 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/FindServices.java 2006-01-16 03:37:42 UTC (rev 6505)
@@ -0,0 +1,181 @@
+/*
+ * $Id: FindServices.java 6206 2005-11-29 05:33:53Z jonesde $
+ *
+ * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package org.ofbiz.opentravelsystem;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.ofbiz.base.util.ObjectType;
+import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.condition.EntityComparisonOperator;
+import org.ofbiz.entity.condition.EntityConditionList;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityExpr;
+import org.ofbiz.entity.condition.EntityJoinOperator;
+import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.condition.EntityFunction;
+import org.ofbiz.entity.condition.EntityFieldValue;
+import org.ofbiz.entity.model.ModelEntity;
+import org.ofbiz.entity.util.EntityFindOptions;
+import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.base.util.Debug;
+
+/**
+ * FindServices Class
+ *
+ * @author <a href="mailto:byersa at automationgroups.com">Al Byers</a>
+ * @version $Rev: 6206 $
+ * @since 2.2
+ */
+public class FindServices {
+
+ public static final String module = FindServices.class.getName();
+
+
+ /**
+ * prepareFind
+ *
+ * This is a generic method that expects entity data affixed with special suffixes
+ * to indicate their purpose in formulating an SQL query statement.
+ */
+ public static Map prepareFind(DispatchContext dctx, Map context) {
+ String entityName = (String) context.get("entityName");
+ String orderBy = (String) context.get("orderBy");
+ Map inputFields = (Map) context.get("inputFields"); // Input
+ String noConditionFind = (String) context.get("noConditionFind");
+ if (UtilValidate.isEmpty(noConditionFind)) {
+ // try finding in inputFields Map
+ noConditionFind = (String) inputFields.get("noConditionFind");
+ }
+ noConditionFind = "Y"; // to show the full list, this line is added....
+ String filterByDate = (String) context.get("filterByDate");
+ if (UtilValidate.isEmpty(filterByDate)) {
+ // try finding in inputFields Map
+ filterByDate = (String) inputFields.get("filterByDate");
+ }
+
+ // parameters run thru UtilHttp.getParameterMap
+ Map queryStringMap = new HashMap();
+ Map origValueMap = new HashMap();
+ HashMap normalizedFields = org.ofbiz.common.FindServices.prepareField(inputFields, queryStringMap, origValueMap);
+
+ // Now use only the values that correspond to entity fields to build
+ // an EntityConditionList
+ GenericDelegator delegator = dctx.getDelegator();
+
+ GenericValue entityValue = delegator.makeValue(entityName, new HashMap());
+
+ ModelEntity modelEntity = entityValue.getModelEntity();
+ List keys = modelEntity.getAllFieldNames();
+ ArrayList tmpList = org.ofbiz.common.FindServices.createCondition(keys, normalizedFields, queryStringMap, origValueMap);
+
+ if (!UtilValidate.isEmpty(filterByDate) && "Y".equals(filterByDate)) {
+ EntityCondition filterByDateCondition = EntityUtil.getFilterByDateExpr();
+ tmpList.add(filterByDateCondition);
+ }
+
+ // get the organizationPartyId, if defined limit the search result depending on the entity
+ String organizationPartyId = (String) ((GenericValue) inputFields.get("userLogin")).getString("partyId");
+ if (organizationPartyId != null) {
+ GenericValue partyAcctgPreference = null;
+ try{
+ partyAcctgPreference = delegator.findByPrimaryKeyCache("PartyAcctgPreference",UtilMisc.toMap("partyId",organizationPartyId));
+ } catch (GenericEntityException ee) {
+ return ServiceUtil.returnError("Error getting partyAcctgPreference: " + ee.getMessage());
+ }
+
+ EntityCondition extraCond = null;
+ if (partyAcctgPreference != null) {
+ String companyPrefix = partyAcctgPreference.getString("invoiceIdPrefix").concat("%");
+ if (entityName.equals("Product")) {
+ extraCond = new EntityExpr("productId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("OrderHeader")) {
+ extraCond = new EntityExpr("orderId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("ProductCategory")) {
+ extraCond = new EntityExpr("productCategoryId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("FixedAsset")) {
+ extraCond = new EntityExpr("fixedAssetId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("Invoice")) {
+ extraCond = new EntityExpr("invoiceId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("Payment")) {
+ extraCond = new EntityExpr("paymentId", EntityOperator.LIKE, companyPrefix);
+ }
+ else if (entityName.equals("Party") || entityName.equals("PartyNameView") ) {
+ extraCond = new EntityExpr("partyId", EntityOperator.LIKE, companyPrefix);
+ }
+ else {
+ Debug.logInfo("OrganizationPartyId found but no limitation on entity: " + entityName,module);
+ }
+ }
+ // add extra condition if not empty
+ if (extraCond != null) {
+ tmpList.add(extraCond);
+ }
+ }
+
+ EntityConditionList exprList = null;
+ if (tmpList.size() > 0) {
+ exprList = new EntityConditionList(tmpList, (EntityJoinOperator) EntityOperator.AND);
+ }
+
+ List orderByList = null;
+ if (UtilValidate.isNotEmpty(orderBy)) {
+ orderByList = StringUtil.split(orderBy,"|");
+ }
+
+ Map results = ServiceUtil.returnSuccess();
+ Map reducedQueryStringMap = org.ofbiz.common.FindServices.buildReducedQueryString(inputFields, entityName, delegator);
+ reducedQueryStringMap.put("noConditionFind", noConditionFind);
+ reducedQueryStringMap.put("filterByDate", filterByDate);
+ String queryString = UtilHttp.urlEncodeArgs(reducedQueryStringMap);
+ results.put("queryString", queryString);
+ results.put("queryStringMap", reducedQueryStringMap);
+
+ results.put("orderByList", orderByList);
+ results.put("entityConditionList", exprList);
+ return results;
+ }
+}
Modified: trunk/specialized/opentravelsystem/webapp/HotelSimple/data/HotelSimple.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/HotelSimple/data/HotelSimple.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/HotelSimple/data/HotelSimple.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -29,21 +29,21 @@
<ProductStoreShipmentMeth productStoreId="HotelSimple" shipmentMethodTypeId="NO_SHIPPING" partyId="_NA_" roleTypeId="CARRIER" allowUspsAddr="N" requireUspsAddr="N" includeNoChargeItems="Y" sequenceNumber="6" lastUpdatedStamp="2004-12-24 20:42:34.457" lastUpdatedTxStamp="2004-12-24 20:42:33.912" createdStamp="2004-12-24 20:42:34.457" createdTxStamp="2004-12-24 20:42:33.912"/>
<ProductCategory productCategoryId="HotelSimple" productCategoryTypeId="CATALOG_CATEGORY" lastUpdatedStamp="2005-05-30 19:57:04.636" lastUpdatedTxStamp="2005-05-30 19:57:02.835" createdStamp="2004-12-30 10:12:55.985" createdTxStamp="2004-12-30 10:12:55.985"/>
<FixedAsset fixedAssetId="HotelSimple" fixedAssetTypeId="OTHER_FIXED_ASSET" fixedAssetName="Primary fixedAsset group for the ProductStore: HotelDemoStore" lastUpdatedStamp="2005-05-30 19:57:03.547" lastUpdatedTxStamp="2005-05-30 19:57:02.835" createdStamp="2005-05-30 19:57:03.547" createdTxStamp="2005-05-30 19:57:02.835"/>
- <Product productId="HS10000" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite Number 1" productName="Suite Nr 1" smallImageUrl="/HotelSimple/images/Suite13301.jpg" largeImageUrl="/HotelSimple/images/Suite13301.jpg" detailImageUrl="/HotelSimple/images/Suite13301.jpg" reservMaxPersons="2" createdDate="2005-05-30 20:31:30.408" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-04 11:09:19.24" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:52.573" lastUpdatedTxStamp="2005-06-04 11:11:52.517" createdStamp="2005-05-30 20:31:30.408" createdTxStamp="2005-05-30 20:31:30.408">
+ <Product productId="HS10000" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite Number 1" productName="Suite Nr 1" smallImageUrl="/hotelsimple/images/Suite13301.jpg" largeImageUrl="/hotelsimple/images/Suite13301.jpg" detailImageUrl="/hotelsimple/images/Suite13301.jpg" reservMaxPersons="2" createdDate="2005-05-30 20:31:30.408" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-04 11:09:19.24" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:52.573" lastUpdatedTxStamp="2005-06-04 11:11:52.517" createdStamp="2005-05-30 20:31:30.408" createdTxStamp="2005-05-30 20:31:30.408">
<description><![CDATA[Suite 1 is on the ground floor. Bath, shower and sinks are integrated in the bedroom. It has its own kitchenette.
]]></description>
<longDescription><![CDATA[Suite 1 has a living room in the conservatory. Four doors open to the terrace and to Dick Beijer's garden. Enjoy, especially Walter's cherry blossom painting, the 1890 ceiling, the light, and the quietness amidst the noises of the city. You won't believe your ears! The bedroom has its own fireplace. It is a non smoking area
]]></longDescription>
</Product>
<ProductPrice productId="HS10000" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2005-05-30 09:41:12.617" price="425" createdDate="2005-06-02 09:41:42.583" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-02 09:41:42.583" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-02 09:41:42.585" lastUpdatedTxStamp="2005-06-02 09:41:42.585" createdStamp="2005-06-02 09:41:42.585" createdTxStamp="2005-06-02 09:41:42.585"/>
- <Product productId="HS10010" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite number one" productName="Suite Nr 2" description="Situated on the second floor Suites 2 is our largest suite. It is frequently used as bridal suite. Bustes of Austrian emperor Franz Josef and his wife "Sissy" look after you. Bedroom and living room are very spacious and have their own fireplaces. " smallImageUrl="/HotelSimple/images/Suite2bed.jpg" largeImageUrl="/HotelSimple/images/Suite2bed.jpg" detailImageUrl="/HotelSimple/images/Suite2bed.jpg" reservMaxPersons="2" createdDate="2005-05-31 08:21:36.14" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-03 08:49:28.608" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:56.282" lastUpdatedTxStamp="2005-06-04 11:11:56.279" createdStamp="2005-05-31 08:21:36.141" createdTxStamp="2005-05-31 08:21:36.141">
+ <Product productId="HS10010" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite number one" productName="Suite Nr 2" description="Situated on the second floor Suites 2 is our largest suite. It is frequently used as bridal suite. Bustes of Austrian emperor Franz Josef and his wife "Sissy" look after you. Bedroom and living room are very spacious and have their own fireplaces. " smallImageUrl="/hotelsimple/images/Suite2bed.jpg" largeImageUrl="/hotelsimple/images/Suite2bed.jpg" detailImageUrl="/hotelsimple/images/Suite2bed.jpg" reservMaxPersons="2" createdDate="2005-05-31 08:21:36.14" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-03 08:49:28.608" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:56.282" lastUpdatedTxStamp="2005-06-04 11:11:56.279" createdStamp="2005-05-31 08:21:36.141" createdTxStamp="2005-05-31 08:21:36.141">
<longDescription><![CDATA[From the balcony one can enjoy the designer garden. It has an en suite bathroom with double bath and a mega shower. Its kitchen has all amenities, including stove, oven and Miele espresso machine.
It is a non smoking area.]]></longDescription>
</Product>
<ProductPrice productId="HS10010" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2005-06-02 09:45:34.961" price="425" createdDate="2005-06-02 09:46:15.814" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-02 09:46:15.814" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-02 09:46:15.815" lastUpdatedTxStamp="2005-06-02 09:46:15.815" createdStamp="2005-06-02 09:46:15.815" createdTxStamp="2005-06-02 09:46:15.815"/>
- <Product productId="HS10020" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite number 3" productName="Suite Nr 3" description="To reach this quiet third topfloor suite the use of the small lift is recommended. It is the more serene suite with almost black adobe walls. Both bedroom and living room have their own fireplace." longDescription="From the balcony one can enjoy the garden. It has a separate bathroom with double bath and a mega shower. Its kitchen has all amenities, including stove, oven and coffee-machine. It is a non smoking area." smallImageUrl="/HotelSimple/images/Homerechtsg330.jpg" largeImageUrl="/HotelSimple/images/Homerechtsg330.jpg" detailImageUrl="/HotelSimple/images/Homerechtsg330.jpg" reservMaxPersons="2" createdDate="2005-06-01 19:43:19.295" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-02 20:31:25.487" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:57.805" lastUpdatedTxStamp="2005-06-04 11:11:57.803" createdStamp="2005-06-01 19:43:19.296" createdTxStamp="2005-06-01 19:43:19.296"/>
+ <Product productId="HS10020" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Suite number 3" productName="Suite Nr 3" description="To reach this quiet third topfloor suite the use of the small lift is recommended. It is the more serene suite with almost black adobe walls. Both bedroom and living room have their own fireplace." longDescription="From the balcony one can enjoy the garden. It has a separate bathroom with double bath and a mega shower. Its kitchen has all amenities, including stove, oven and coffee-machine. It is a non smoking area." smallImageUrl="/hotelsimple/images/Homerechtsg330.jpg" largeImageUrl="/hotelsimple/images/Homerechtsg330.jpg" detailImageUrl="/hotelsimple/images/Homerechtsg330.jpg" reservMaxPersons="2" createdDate="2005-06-01 19:43:19.295" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-02 20:31:25.487" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:11:57.805" lastUpdatedTxStamp="2005-06-04 11:11:57.803" createdStamp="2005-06-01 19:43:19.296" createdTxStamp="2005-06-01 19:43:19.296"/>
<ProductPrice productId="HS10020" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2005-06-03 08:50:05.849" price="425" createdDate="2005-06-03 08:50:05.849" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-03 08:50:05.849" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-03 08:50:05.849" lastUpdatedTxStamp="2005-06-03 08:50:05.849" createdStamp="2005-06-03 08:50:05.849" createdTxStamp="2005-06-03 08:50:05.849"/>
- <Product productId="HS10021" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Whole Hotel" productName="Whole Hotel" description="All 3 suites rented together" longDescription="The rental of the whole hotel." smallImageUrl="/HotelSimple/images/garden3.jpg" largeImageUrl="/HotelSimple/images/garden3.jpg" detailImageUrl="/HotelSimple/images/garden3.jpg" reservMaxPersons="6" createdDate="2005-06-01 19:47:45.563" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-04 11:10:34.88" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:12:00.042" lastUpdatedTxStamp="2005-06-04 11:12:00.039" createdStamp="2005-06-01 19:47:45.563" createdTxStamp="2005-06-01 19:47:45.563"/>
+ <Product productId="HS10021" productTypeId="ASSET_USAGE" primaryProductCategoryId="HotelSimple" internalName="Whole Hotel" productName="Whole Hotel" description="All 3 suites rented together" longDescription="The rental of the whole hotel." smallImageUrl="/hotelsimple/images/garden3.jpg" largeImageUrl="/hotelsimple/images/garden3.jpg" detailImageUrl="/hotelsimple/images/garden3.jpg" reservMaxPersons="6" createdDate="2005-06-01 19:47:45.563" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-04 11:10:34.88" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-04 11:12:00.042" lastUpdatedTxStamp="2005-06-04 11:12:00.039" createdStamp="2005-06-01 19:47:45.563" createdTxStamp="2005-06-01 19:47:45.563"/>
<ProductPrice productId="HS10021" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2005-06-02 09:56:59.788" price="1025" createdDate="2005-06-02 09:57:27.782" createdByUserLogin="HotelSimple" lastModifiedDate="2005-06-02 09:57:27.782" lastModifiedByUserLogin="HotelSimple" lastUpdatedStamp="2005-06-02 09:57:27.782" lastUpdatedTxStamp="2005-06-02 09:57:27.782" createdStamp="2005-06-02 09:57:27.782" createdTxStamp="2005-06-02 09:57:27.782"/>
<FixedAsset fixedAssetId="HS10000" fixedAssetTypeId="EQUIPMENT" parentFixedAssetId="HotelSimple" fixedAssetName="Suite 1" productionCapacity="1" lastUpdatedStamp="2005-06-02 20:23:25.264" lastUpdatedTxStamp="2005-06-02 20:23:25.037" createdStamp="2005-05-30 20:30:27.33" createdTxStamp="2005-05-30 20:30:27.33"/>
<FixedAssetProduct fixedAssetId="HS10000" productId="HS10000" fixedAssetProductTypeId="FAPT_USE" fromDate="2005-05-30 20:33:13.309" lastUpdatedStamp="2005-05-30 20:33:13.309" lastUpdatedTxStamp="2005-05-30 20:33:13.309" createdStamp="2005-05-30 20:33:13.309" createdTxStamp="2005-05-30 20:33:13.309"/>
Modified: trunk/specialized/opentravelsystem/webapp/HotelSimple/includes/header.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/HotelSimple/includes/header.ftl 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/HotelSimple/includes/header.ftl 2006-01-16 03:37:42 UTC (rev 6505)
@@ -35,7 +35,7 @@
<script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/calendar1.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
- <link rel="stylesheet" href="<@ofbizContentUrl>${(productStore.styleSheet)?default("/HotelSimple/html/ecommain.css")}</@ofbizContentUrl>" type="text/css"/>
+ <link rel="stylesheet" href="<@ofbizContentUrl>${(productStore.styleSheet)?default("/hotelsimple/html/ecommain.css")}</@ofbizContentUrl>" type="text/css"/>
<#-- Append CSS for catalog -->
<#if catalogStyleSheet?exists>
@@ -52,40 +52,6 @@
<#if metaKeywords?exists>
<meta name="keywords" content="${metaKeywords}"/>
</#if>
- <#if includeHtmlArea>
- <#assign contextPath=request.getContextPath()/>
- <link rel="stylesheet" href="<@ofbizContentUrl>/HotelSimple/html/haagsestyles.css</@ofbizContentUrl>" type="text/css"/>
-
- <#assign primaryHTMLField=page.primaryHTMLField?if_exists/>
- <#if (dynamicPrimaryHTMLField?exists)>
- <#assign primaryHTMLField=dynamicPrimaryHTMLField/>
- </#if>
- <#assign secondaryHTMLField=page.secondaryHTMLField?if_exists/>
- <#if (primaryHTMLField?exists && (primaryHTMLField?length > 0))>
- <script type="text/javascript" language="javascript">
- _editor_url = "/content/images/htmlarea/"; // omit the final slash
- </script>
-
- <script language="javascript" src="<@ofbizContentUrl>/content/images/htmlarea/htmlarea.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/content/images/htmlarea/lang/en.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/content/images/htmlarea/dialog.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/content/images/htmlarea/popupwin.js</@ofbizContentUrl>" type="text/javascript"></script>
- <style type="text/css">
- @import url(<@ofbizContentUrl>/content/images/htmlarea/htmlarea.css</@ofbizContentUrl>);
- textarea { background-color: #fff; border: 1px solid 00f; }
- </style>
- <script type="text/javascript">
- var editor = null;
- var summary = null;
- function init_all() {
- primaryHTMLArea = new HTMLArea("${primaryHTMLField}"); primaryHTMLArea.generate();
- <#if secondaryHTMLField?exists>
- secondaryHTMLArea = new HTMLArea("${secondaryHTMLField}"); secondaryHTMLArea.generate();
- </#if>
- }
- </script>
- </#if>
- </#if>
<link href="/HaagscheSuites/html/haagsestyles.css" rel="stylesheet" type="text/css">
</head>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -118,12 +118,12 @@
<!-- hotelbackend specific Request Mappings -->
<request-map uri="main">
- <description>Check if access to productstores, when not log off, otherwise go to selectStore or main</description>
+ <description>Check if access to productstores, when not log off, otherwise go to selectStore or main (now disabled and using partyId of login</description>
<security https="true" auth="true"/>
- <event type="java" path="org.ofbiz.opentravelsystem.otsEvents" invoke="checkProductStore"/>
- <response name="selectStore" type="view" value="selectStore"/>
+ <!--event type="java" path="org.ofbiz.opentravelsystem.otsEvents" invoke="checkProductStore"/>
+ <response name="selectStore" type="view" value="selectStore"/-->
<response name="success" type="view" value="main" />
- <response name="error" type="view" value="noAccess" />
+ <response name="error" type="view" value="login" />
</request-map>
<request-map uri="intro">
@@ -299,13 +299,6 @@
<response name="error" type="view" value="ImportProduct"/>
</request-map>
- <!-- ================ ProductStore ================= -->
- <request-map uri="EditProductStore"><!-- show a tabular list of products connected -->
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductStore"/>
- </request-map>
-
-
<!-- ================ Orders ================= -->
<request-map uri="findorders">
<security https="true" auth="true"/>
@@ -2207,30 +2200,6 @@
<response name="error" type="view" value="EditProductStorePromos"/>
</request-map>
- <!-- ================ ProductStore ProdCatalogs Requests ================= -->
- <request-map uri="EditProductStoreCatalogs">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductStoreCatalogs"/>
- </request-map>
- <request-map uri="createProductStoreCatalog">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createProductStoreCatalog"/>
- <response name="success" type="view" value="EditProductStoreCatalogs"/>
- <response name="error" type="view" value="EditProductStoreCatalogs"/>
- </request-map>
- <request-map uri="updateProductStoreCatalog">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateProductStoreCatalog"/>
- <response name="success" type="view" value="EditProductStoreCatalogs"/>
- <response name="error" type="view" value="EditProductStoreCatalogs"/>
- </request-map>
- <request-map uri="deleteProductStoreCatalog">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteProductStoreCatalog"/>
- <response name="success" type="view" value="EditProductStoreCatalogs"/>
- <response name="error" type="view" value="EditProductStoreCatalogs"/>
- </request-map>
-
<!-- ================ ProductStore Email Requests ================= -->
<request-map uri="EditProductStoreEmails">
<security https="true" auth="true"/>
@@ -3043,12 +3012,12 @@
<view-map name="newFixedAssetProduct" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#newFixedAssetProduct"/>
<view-map name="EditProdCatalogCategories" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProdCatalogCategories"/>
<view-map name="EditCategoryRollup" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditCategoryRollup"/>
- <view-map name="EditProductStore" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStore"/>
+ <view-map name="EditProductStore" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProductStore"/>
<view-map name="EditProductStoreRoles" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreRoles"/>
<view-map name="EditProductStoreEmails" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreEmails"/>
<view-map name="EditProductStoreTaxSetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreTaxSetup"/>
<view-map name="EditProductStorePaySetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStorePaySetup"/>
- <view-map name="selectStore" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#selectStore"/>
+ <!--view-map name="selectStore" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#selectStore"/-->
<view-map name="ImportProduct" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#ImportProduct"/>
<view-map name="EditProductCategory" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProductCategory"/>
<view-map name="EditProducts" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProducts"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/ProductStoreTabBar.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/ProductStoreTabBar.ftl 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/ProductStoreTabBar.ftl 2006-01-16 03:37:42 UTC (rev 6505)
@@ -30,14 +30,14 @@
<#if productStoreId?has_content>
<div class='tabContainer'>
<a href="<@ofbizUrl>EditProductStore</@ofbizUrl>" class="${selectedClassMap.EditProductStore?default(unselectedClassName)}">${uiLabelMap.ProductStore}</a>
- <a href="<@ofbizUrl>EditProductStoreRoles</@ofbizUrl>" class="${selectedClassMap.EditProductStoreRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a>
+ <!--a href="<@ofbizUrl>EditProductStoreRoles?productStoreId=${parameters.userLogin.partyId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a-->
<!--a href="<@ofbizUrl>EditProductStorePromos</@ofbizUrl>" class="${selectedClassMap.EditProductStorePromos?default(unselectedClassName)}">${uiLabelMap.ProductPromos}</a>
<a href="<@ofbizUrl>EditProductStoreCatalogs</@ofbizUrl>" class="${selectedClassMap.EditProductStoreCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
<a href="<@ofbizUrl>EditProductStoreWebSites?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreWebSites?default(unselectedClassName)}">${uiLabelMap.ProductWebSites}</a>
---> <a href="<@ofbizUrl>EditProductStoreTaxSetup</@ofbizUrl>" class="${selectedClassMap.EditProductStoreTaxSetup?default(unselectedClassName)}">${uiLabelMap.ProductSalesTax}</a>
+--> <a href="<@ofbizUrl>EditProductStoreTaxSetup?productStoreId=${parameters.userLogin.partyId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreTaxSetup?default(unselectedClassName)}">${uiLabelMap.ProductSalesTax}</a>
<!--a href="<@ofbizUrl>EditProductStoreShipSetup?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipSetup?default(unselectedClassName)}">${uiLabelMap.OrderShipping}</a>
---> <a href="<@ofbizUrl>EditProductStorePaySetup</@ofbizUrl>" class="${selectedClassMap.EditProductStorePaySetup?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a>
- <a href="<@ofbizUrl>EditProductStoreEmails</@ofbizUrl>" class="${selectedClassMap.EditProductStoreEmails?default(unselectedClassName)}">${uiLabelMap.CommonEmails}</a>
+--> <a href="<@ofbizUrl>EditProductStorePaySetup?productStoreId=${parameters.userLogin.partyId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePaySetup?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a>
+ <a href="<@ofbizUrl>EditProductStoreEmails?productStoreId=${parameters.userLogin.partyId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreEmails?default(unselectedClassName)}">${uiLabelMap.CommonEmails}</a>
<!--a href="<@ofbizUrl>EditProductStoreSurveys</@ofbizUrl>" class="${selectedClassMap.EditProductStoreSurveys?default(unselectedClassName)}">Surveys</a>
<a href="<@ofbizUrl>editProductStoreKeywordOvrd</@ofbizUrl>" class="${selectedClassMap.EditProductStoreKeywordOvrd?default(unselectedClassName)}">${uiLabelMap.ProductOverride}</a>
--> </div>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/appheaderCatalog.ftl 2006-01-16 03:37:42 UTC (rev 6505)
@@ -41,7 +41,7 @@
<div class="col"><a href="<@ofbizUrl>EditProducts</@ofbizUrl>" class="${selectedLeftClassMap.products?default(unselectedLeftClassName)}">${uiLabelMap.opentravelsystemProducts}</a></div>
<div class="col"><a href="<@ofbizUrl>EditFixedAssets</@ofbizUrl>" class="${selectedLeftClassMap.fixedassets?default(unselectedLeftClassName)}">${uiLabelMap.opentravelsystemFixedAssets}</a></div>
<div class="col"><a href="<@ofbizUrl>EditProductStore</@ofbizUrl>" class="${selectedLeftClassMap.store?default(unselectedLeftClassName)}">${uiLabelMap.opentravelsystemStore}</a></div>
- <div class="col"><a href="<@ofbizUrl>selectStore</@ofbizUrl>" class="${selectedLeftClassMap.selectStore?default(unselectedLeftClassName)}">${uiLabelMap.selectStore}</a></div>
+ <!--div class="col"><a href="<@ofbizUrl>selectStore</@ofbizUrl>" class="${selectedLeftClassMap.selectStore?default(unselectedLeftClassName)}">${uiLabelMap.selectStore}</a></div-->
<div class="col"><a href="<@ofbizUrl>importProduct</@ofbizUrl>" class="${selectedLeftClassMap.importProduct?default(unselectedLeftClassName)}">importProduct</a></div>
<#if userLogin?has_content>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/appbar.ftl 2006-01-16 03:37:42 UTC (rev 6505)
@@ -35,13 +35,12 @@
<#if requestAttributes.userLogin?has_content>
<#assign displayApps = [
-<#-- {"title":"Main", "url":"main"} -->
{"title":"Product", "url":"mainCatalog"}
,{"title":"Reservations", "url":"findorders"}
,{"title":"Parties", "url":"findParties?statusId=PARTYREL-ACTIVE"}
,{"title":"Accounting", "url":"mainAccounting"}
- ,{"title":"Website", "url":"/${productStoreId?if_exists}"}
- ,{"title":"Logout", "url":"logout"}
+ ,{"title":"Website", "url":"/${parameters.userLogin.partyId}"}
+ ,{"title":"Logout", "url":"logout"}
]>
<#else>
<#assign displayApps = [
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -287,6 +287,7 @@
<auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/>
<field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field use-when="fixedAsset==null" name="fixedAssetId"><hidden/></field>
<field name="parentFixedAssetId"><hidden value="${productStoreId}"/></field>
<field name="partyId"><hidden/></field>
@@ -302,14 +303,14 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="selectStore" type="list" list-name="stores"
+ <!--form name="selectStore" type="list" list-name="stores"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" target="setStore">
<field name="productStoreId" title="${uiLabelMap.productStoreId}&nbsp;-&nbsp;[${uiLabelMap.StoreName}]" widget-style="tabletext"><display-entity entity-name="ProductStore" key-field-name="productStoreId" description="${productStoreId} - [${storeName}]"/></field>
<field name="roleTypeId" title="${uiLabelMap.CommonRoleType}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"> <display/></field>
<field name="submitButton" title="Select" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
+ </form-->
<form name="selectStoreAdmin" type="list" list-name="storesAdmin"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" target="setStore">
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -96,9 +96,12 @@
<actions>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="categories"/>
- <set field="productStoreId" from-scope="user" from-field="productStoreId"/>
- <set field="prodCatalogId" from-scope="user" from-field="prodCatalogId"/>
+ <set field="productStoreId" from-field="parameters.userLogin.partyId"/>
+ <set field="prodCatalogId" from-field="parameters.userLogin.partyId"/>
<!--set field="leftbarScreenName" value="leftbar"/-->
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" use-cache="true">
+ <field-map field-name="partyId" value="${parameters.userLogin.partyId}"/>
+ </entity-one>
<entity-one entity-name="ProdCatalog" value-name="prodCatalog" use-cache="true">
<field-map field-name="prodCatalogId" value="${prodCatalogId}"/>
</entity-one>
@@ -109,7 +112,7 @@
<order-by field-name="fromDate"/>
</entity-condition>
<entity-condition entity-name="ProductCategory" list-name="productCategories">
- <condition-expr field-name="productCategoryId" operator="like" value="${prefix}%"/>
+ <condition-expr field-name="productCategoryId" operator="like" value="${partyAcctgPreference.invoiceIdPrefix}%"/>
<order-by field-name="description"/>
</entity-condition>
<entity-condition entity-name="ProdCatalogCategoryType" list-name="prodCatalogCategoryTypes">
@@ -707,22 +710,22 @@
</widgets>
</section>
</screen>
- <screen name="selectStore">
+ <!--screen name="selectStore">
<section>
<actions>
<set field="page.headerItem" value="selectStore"/>
<set field="nowTimestamp" value="${UtilDateTime.nowTimestamp()}"/>
- <entity-condition entity-name="ProductStoreRole" list-name="stores"><!-- filter-by-date="nowTimestamp"-->
+ <entity-condition entity-name="ProductStoreRole" list-name="stores">
<condition-list>
<condition-expr field-name="partyId" operator="equals" value="${userLogin.partyId}" />
<condition-expr field-name="roleTypeId" operator="equals" value="ADMIN" />
</condition-list>
</entity-condition>
- <entity-condition entity-name="ProductStore" list-name="storesAdmin">
+ <entity-condition entity-name="ProductStore" list-name="storesAdmin"-->
<!--condition-list>
<condition-expr field-name="productStoreId" operator="not-equals" value="${userLogin.userLoginId}" />
</condition-list-->
- </entity-condition>
+ <!--entity-condition>
</actions>
<widgets>
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
@@ -744,7 +747,7 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen-->
<screen name="ImportProduct">
<section>
<actions>
@@ -766,4 +769,24 @@
</widgets>
</section>
</screen>
+ <screen name="EditProductStore">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditProductStore"/>
+ <set field="headerItem" value="store"/>
+ <set field="tabButtonItem" value="EditProductStore"/>
+ <set field="labelTitleProperty" value="ProductStore"/>
+
+ <set field="productStoreId" from-field="parameters.userLogin.partyId"/>
+ <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="EditProductStore" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-01-16 03:37:42 UTC (rev 6505)
@@ -40,24 +40,21 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="productStoreId" from-scope="user" from-field="productStoreId" global="true"/>
- <set field="organizationPartyId" from-scope="user" to-scope="application" from-field="productStoreId" global="true"/>
- <set field="organizationPartyId" from-scope="user" to-scope="screen" from-field="productStoreId" global="true"/>
- <set field="organizationPartyId" from-scope="user" to-scope="user" from-field="productStoreId" global="true"/>
- <set field="requestParameters.organizationPartyId" from-scope="user" from-field="productStoreId" />
- <set field="parameters.organizationPartyId" from-scope="user" from-field="productStoreId" />
+ <set field="productStoreId" from-field="parameters.userLogin.partyId" global="true"/>
+ <set field="prodCatalogId" from-field="parameters.userLogin.partyId" global="true"/>
+ <set field="organizationPartyId" from-field="parameters.userLogin.partyId" global="true"/>
<set field="activeApp" value="hotelbackend" global="true"/>
<set field="MainColumnStyle" value="nocolumns" global="true"/>
<entity-one entity-name="PartyGroup" value-name="partyGroup" use-cache="true">
- <field-map field-name="partyId" value="${organizationPartyId}"/>
+ <field-map field-name="partyId" value="${parameters.userLogin.partyId}"/>
</entity-one>
<set field="layoutSettings.companyName" value="${partyGroup.groupName}" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProductCompanySubtitle" global="true"/>
- <set field="layoutSettings.headerImageUrl" value="/${organizationPartyId}/html/images/company.jpg" global="true"/>
+ <set field="layoutSettings.headerImageUrl" value="/${parameters.userLogin.partyId}/html/images/company.jpg" global="true"/>
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<entity-one entity-name="PartyAcctgPreference" value-name="preference" use-cache="true">
- <field-map field-name="partyId" value="${organizationPartyId}"/>
+ <field-map field-name="partyId" value="${parameters.userLogin.partyId}"/>
</entity-one>
<set field="prefix" from-field="preference.invoiceIdPrefix" global="true"/>
</actions>
Modified: trunk/specialized/opentravelsystem/webapp/shop/html/ecommain.css
===================================================================
--- trunk/specialized/opentravelsystem/webapp/shop/html/ecommain.css 2006-01-15 03:15:18 UTC (rev 6504)
+++ trunk/specialized/opentravelsystem/webapp/shop/html/ecommain.css 2006-01-16 03:37:42 UTC (rev 6505)
@@ -201,11 +201,11 @@
margin-top: 10px;
}
#ecom-mainarea .center {
-margin-left: 160px;
+margin-left: 1px;
margin-right: 210px;
voice-family: "\"}\"";
voice-family: inherit;
-margin-left: 161px;
+margin-left: 1px;
margin-right: 211px;
}
#ecom-mainarea .leftonly {
More information about the Svn
mailing list