svn commit: r585364 - in /ofbiz/trunk/applications/product: config/ script/org/ofbiz/product/store/ servicedef/ webapp/catalog/WEB-INF/ webapp/catalog/store/ widget/catalog/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r585364 - in /ofbiz/trunk/applications/product: config/ script/org/ofbiz/product/store/ servicedef/ webapp/catalog/WEB-INF/ webapp/catalog/store/ widget/catalog/

apatel-2
Author: apatel
Date: Tue Oct 16 21:35:37 2007
New Revision: 585364

URL: http://svn.apache.org/viewvc?rev=585364&view=rev
Log:
CRUD services and admin forms and screens for ProductStoreVendorShipment and ProductStoreVendorePayment entity.

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
    ofbiz/trunk/applications/product/servicedef/services_store.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Tue Oct 16 21:35:37 2007
@@ -87,6 +87,8 @@
 PageTitleEditConfigItem=Edit Config Item
 PageTitleEditConfigOptions=Edit Config Options
 PageTitleEditProductConfigItemContent=Edit Product Config Item Content
+PageTitleEditProductStoreVendorPayments=Edit Product Store Vendor Payments
+PageTitleEditProductStoreVendorShipments=Edit Product Store Vendor Shipments
 PageTitleEditFacilityContactMech=Edit Facility Contact Mech
 PageTitleEditFacilityGroup=Edit Facility Group
 PageTitleEditFacilityGroupMembers=Edit Facility Group Members
@@ -1050,6 +1052,8 @@
 ProductProductStore=Product Store
 ProductProductStoreEmailSettings=Product Store Email Settings
 ProductStoreFinAccountSettings=Product Store Financial Account Settings
+ProductStoreVendorPayments=Product Store Vendor Payments
+ProductStoreVendorShipments=Product Store Vendor Shipments
 ProductProductStoreGroup=Product Store Group
 ProductProductStoreGroupId=Product Store Group Id
 ProductProductStoreKeywordOverrideSettings=Product Store Keyword Override Settings
@@ -1435,6 +1439,8 @@
 ProductVariantProductIds=Variant Product IDs
 ProductVariantProductInventorySummary=Variant Product Inventory Summary
 ProductVariants=Variants
+ProductVendorPayments=Vendor Payments
+ProductVendorShipments=Vendor Shipments
 ProductViewEstimates=Shipping Estimates
 ProductViewLabelImage=View Label Image
 ProductViewPermissionError=You do not have permission to view this page. ("CATALOG_VIEW" or "CATALOG_ADMIN" needed)

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Oct 16 21:35:37 2007
@@ -201,6 +201,24 @@
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
+    <!-- ProductStore Vendor Payment Services -->
+    <simple-method method-name="createProductStoreVendorPayment" short-description="Create a ProductStoreVendorPayment">
+        <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreVendorPayment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-errors/>
+
+        <make-value entity-name="ProductStoreVendorPayment" value-name="newEntity"/>
+        <set-pk-fields value-name="newEntity" map-name="parameters"/>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="deleteProductStoreVendorPayment" short-description="Remove the ProductStoreVendorPayment">
+        <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreVendorPayment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-errors/>
+
+        <make-value entity-name="ProductStoreVendorPayment" value-name="lookedUpValue"/>
+        <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
+
     <!-- ProductStore Carrier Shipment Services -->
     <simple-method method-name="createProductStoreShipMeth" short-description="Create Product Store Carrier Shipment Method">
         <check-permission permission="CATALOG" action="_CREATE">
@@ -646,5 +664,22 @@
         </else>
         </if-compare>
     </simple-method>
+
+    <!-- ProductStore Vendor Shipment Services -->
+    <simple-method method-name="createProductStoreVendorShipment" short-description="Create a ProductStoreVendorShipment">
+        <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreVendorShipment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-errors/>
+        <make-value entity-name="ProductStoreVendorShipment" value-name="newEntity"/>
+        <set-pk-fields value-name="newEntity" map-name="parameters"/>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="deleteProductStoreVendorShipment" short-description="Remove the ProductStoreVendorShipment">
+        <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreVendorShipment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-errors/>
+        <make-value entity-name="ProductStoreVendorShipment" value-name="lookedUpValue"/>
+        <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
+
 </simple-methods>
 

Modified: ofbiz/trunk/applications/product/servicedef/services_store.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_store.xml?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_store.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_store.xml Tue Oct 16 21:35:37 2007
@@ -258,4 +258,25 @@
         <description>Remove ProductStoreFinActSetting</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+
+    <!--ProductStoreVendorPayment Services -->
+    <service name="createProductStoreVendorPayment" engine="simple" default-entity-name="ProductStoreVendorPayment"
+            location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreVendorPayment" auth="true">
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="deleteProductStoreVendorPayment" engine="simple" default-entity-name="ProductStoreVendorPayment"
+            location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreVendorPayment" auth="true">
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!--ProductStoreVendorShipment Services -->
+    <service name="createProductStoreVendorShipment" engine="simple" default-entity-name="ProductStoreVendorShipment"
+            location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreVendorShipment" auth="true">
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="deleteProductStoreVendorShipment" engine="simple" default-entity-name="ProductStoreVendorShipment"
+            location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreVendorShipment" auth="true">
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
 </services>

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Tue Oct 16 21:35:37 2007
@@ -2178,6 +2178,42 @@
         <response name="error" type="view" value="EditProductStoreFinAccountSettings"/>
     </request-map>
 
+    <!-- ================ ProductStore Vendor Payment Requests =========== -->
+    <request-map uri="EditProductStoreVendorPayments">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProductStoreVendorPayments"/>
+    </request-map>
+    <request-map uri="createProductStoreVendorPayment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createProductStoreVendorPayment"/>
+        <response name="success" type="view" value="EditProductStoreVendorPayments"/>
+        <response name="error" type="view" value="EditProductStoreVendorPayments"/>
+    </request-map>
+    <request-map uri="deleteProductStoreVendorPayment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteProductStoreVendorPayment"/>
+        <response name="success" type="view" value="EditProductStoreVendorPayments"/>
+        <response name="error" type="view" value="EditProductStoreVendorPayments"/>
+    </request-map>
+
+    <!-- ================ ProductStore Vendor Shipment Requests =========== -->
+    <request-map uri="EditProductStoreVendorShipments">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProductStoreVendorShipments"/>
+    </request-map>
+    <request-map uri="createProductStoreVendorShipment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createProductStoreVendorShipment"/>
+        <response name="success" type="view" value="EditProductStoreVendorShipments"/>
+        <response name="error" type="view" value="EditProductStoreVendorShipments"/>
+    </request-map>
+    <request-map uri="deleteProductStoreVendorShipment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteProductStoreVendorShipment"/>
+        <response name="success" type="view" value="EditProductStoreVendorShipments"/>
+        <response name="error" type="view" value="EditProductStoreVendorShipments"/>
+    </request-map>
+
     <!-- ================ Keyword Thesaurus Requests ================= -->
     <request-map uri="editKeywordThesaurus">
         <security https="true" auth="true"/>
@@ -2563,7 +2599,9 @@
     <view-map name="EditProductStoreKeywordOvrd" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreKeywordOvrd"/>
     <view-map name="ViewProductStoreSegments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#ViewProductStoreSegments"/>
     <view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/>    
-
+    <view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/>
+    <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
+    
     <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
 
     <view-map name="pendingReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#pendingReviews"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Tue Oct 16 21:35:37 2007
@@ -723,4 +723,52 @@
         </field>
         <field name="priceUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
     </form>
+    <form name="ListProductStoreVendorPayments" type="list" list-name="productStoreVendorPaymentList" target="deleteProductStoreVendorPayment" paginate-target="EditProductStoreVendorPayments">
+        <field name="productStoreId"><hidden/></field>
+        <field name="vendorPartyId"><display/></field>
+        <field name="paymentMethodTypeId">
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+        </field>
+        <field name="creditCardEnumId">
+            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="EditProductStoreVendorPayment" type="single" target="createProductStoreVendorPayment">
+        <field name="productStoreId"><hidden/></field>
+        <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="paymentMethodTypeId">
+            <drop-down current="selected" allow-empty="false">
+                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="creditCardEnumId">
+            <drop-down current="selected" allow-empty="false">
+                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${enumCode} - ${description}">
+                    <entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListProductStoreVendorShipments" type="list" list-name="productStoreVendorShipmentList" target="deleteProductStoreVendorShipment" paginate-target="EditProductStoreVendorShipments">
+        <field name="productStoreId"><hidden/></field>
+        <field name="carrierPartyId"><display/></field>
+        <field name="vendorPartyId"><display/></field>
+        <field name="shipmentMethodTypeId">
+            <display-entity entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="EditProductStoreVendorShipment" type="single" target="createProductStoreVendorShipment">
+        <field name="productStoreId"><hidden/></field>
+        <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="shipmentMethodTypeId">
+            <drop-down current="selected" allow-empty="false">
+                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl Tue Oct 16 21:35:37 2007
@@ -34,5 +34,7 @@
       <a href="<@ofbizUrl>EditProductStoreSurveys?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreSurveys?default(unselectedClassName)}">${uiLabelMap.CommonSurveys}</a>
       <a href="<@ofbizUrl>editProductStoreKeywordOvrd?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreKeywordOvrd?default(unselectedClassName)}">${uiLabelMap.ProductOverride}</a>
       <a href="<@ofbizUrl>ViewProductStoreSegments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.ViewProductStoreSegments?default(unselectedClassName)}">${uiLabelMap.ProductSegments}</a>
+      <a href="<@ofbizUrl>EditProductStoreVendorPayments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorPayments?default(unselectedClassName)}">${uiLabelMap.ProductVendorPayments}</a>
+      <a href="<@ofbizUrl>EditProductStoreVendorShipments?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreVendorShipments?default(unselectedClassName)}">${uiLabelMap.ProductVendorShipments}</a>
     </div>
-  </#if>  
+  </#if>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=585364&r1=585363&r2=585364&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Tue Oct 16 21:35:37 2007
@@ -438,4 +438,62 @@
             </widgets>
        </section>
     </screen>
+
+    <screen name="EditProductStoreVendorPayments">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditProductStoreVendorPayments"/>
+                <set field="headerItem" value="store"/>
+                <set field="tabButtonItem" value="EditProductStoreVendorPayments"/>
+                <set field="labelTitleProperty" value="ProductStoreVendorPayments"/>
+            
+                <set field="productStoreId" from-field="parameters.productStoreId"/>
+                
+                <entity-condition entity-name="ProductStoreVendorPayment" list-name="productStoreVendorPaymentList">
+                    <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="widget-container">
+                            <include-form name="ListProductStoreVendorPayments" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+                        </container>
+                        <container style="widget-container">
+                            <include-form name="EditProductStoreVendorPayment" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EditProductStoreVendorShipments">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditProductStoreVendorShipments"/>
+                <set field="headerItem" value="store"/>
+                <set field="tabButtonItem" value="EditProductStoreVendorShipments"/>
+                <set field="labelTitleProperty" value="ProductStoreVendorShipments"/>
+
+                <set field="productStoreId" from-field="parameters.productStoreId"/>
+
+                <entity-condition entity-name="ProductStoreVendorShipment" list-name="productStoreVendorShipmentList">
+                    <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="widget-container">
+                            <include-form name="ListProductStoreVendorShipments" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+                        </container>
+                        <container style="widget-container">
+                            <include-form name="EditProductStoreVendorShipment" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>