You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2010/02/04 07:01:07 UTC

svn commit: r906373 [2/2] - in /ofbiz/trunk: ./ applications/product/script/org/ofbiz/product/inventory/ specialpurpose/ebaystore/ specialpurpose/ebaystore/config/ specialpurpose/ebaystore/script/org/ofbiz/ebaystore/ specialpurpose/ebaystore/servicedef...

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayInventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayInventoryForms.xml?rev=906373&r1=906372&r2=906373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayInventoryForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayInventoryForms.xml Thu Feb  4 06:01:06 2010
@@ -44,15 +44,22 @@
     
     <form name="ListEbayProductInventoryDetail" type="multi" use-row-submit="true"  target="updateEbayStoreInventory" title=""  list-name="ebayProductStoreInventoryList"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="_rowSubmit"  position="1" title="${uiLabelMap.CommonSelect}"><check/></field>
         <field name="productStoreId"><hidden/></field>
         <field name="facilityId"><hidden/></field>
-        <field name="folderId"><hidden value="${parameters.folderId}"/></field>
-        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+        <field name="folderId" use-when="ebayfolderId != null"><hidden value="${ebayfolderId}"/></field>
+        <field name="folderId" use-when="ebayfolderId == null"><hidden value="${folderId}"/></field>
         <field name="productId"><display></display></field>
         <field name="productName" entry-name="productId">
             <display-entity entity-name="Product" key-field-name="productId" description="${productName}"></display-entity>
         </field>
-        <field name="quantityReserved"><display></display></field>
+        <field name="quantityReserved" >
+            <hyperlink  target="updateQuantityReserved" description="${quantityReserved}">
+                <parameter param-name="productStoreId"/>
+                <parameter param-name="facilityId"/>
+                <parameter param-name="productId"/>
+            </hyperlink>
+        </field>
         <field name="availableToPromiseListing"><display></display></field>
         <field name="scheduled"><display></display></field>
         <field name="ebayProductId"><display></display></field>
@@ -62,4 +69,22 @@
         <field name="reservedDate"><display></display></field>
         <field name="updateButton" title="${uiLabelMap.EbayUpdateInventory}"><submit button-type="button"/></field>
     </form>
+    
+    <form name="updateQuantityReserved" type="single"  target="updateProductQuantityReserved" default-entity-name="EbayProductStoreInventory" default-map-name="ebayProductStoreInventory"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="productStoreId"><display></display></field>
+        <field name="facilityId"><display></display></field>
+        <field name="productId"><display></display></field>
+        <field name="productName" entry-name="productId">
+            <display-entity entity-name="Product" key-field-name="productId" description="${productName}"></display-entity>
+        </field>
+        <field name="quantity" required-field="true"><text default-value="${ebayProductStoreInventory.quantityReserved}"></text></field>
+        <field name="actionType">
+            <drop-down allow-empty="false">
+                <option key="ADD" description="Add"/>
+                <option key="REMOVE" description="Remove"/>
+            </drop-down>
+        </field>
+        <field name="submitButton"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=906373&r1=906372&r2=906373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Thu Feb  4 06:01:06 2010
@@ -297,12 +297,12 @@
                                 <service service-name="getFolderInEbayStoreInventory" result-map="result">
                                     <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
                                 </service>
-                                <set field="parameters.folderId" value="${result.folderId}"/>
+                                <set field="ebayfolderId" value="${result.folderId}"/>
                             </actions>
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field="parameters.folderId"/></not>
+                                        <not><if-empty field="ebayfolderId"/></not>
                                     </condition>
                                     <widgets><include-screen name="ViewInventoryItemDetail"/></widgets>
                                     <fail-widgets><include-screen name="ebayStoreInventoryFail"/></fail-widgets>
@@ -345,9 +345,9 @@
                     <widgets>
                         <section>
                             <actions>
-                                <set field="facilityId" value="parameters.facilityId"/>
-                                <set field="parameters.productStoreId" from-field="parameters.productStoreId"/>
-                                <set field="folderId" value="parameters.folderId"/>
+                                <set field="facilityId" from-field="parameters.facilityId"/>
+                                <set field="productStoreId" from-field="parameters.productStoreId"/>
+                                <set field="ebayfolderId" from-field="parameters.folderId"/>
                             </actions>
                             <widgets><include-screen name="ViewInventoryItemDetail"/></widgets>
                         </section>
@@ -384,10 +384,18 @@
                 <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.ProductStoreNameId} : ${productStore.storeName}[${productStore.productStoreId}] ${uiLabelMap.FacilityFacility} : ${facility.facilityName}">
-                            <link target="reserveEbayProductInventory"  style="buttontext" text="${uiLabelMap.EbayReserveProductInventory}">
-                                <parameter param-name="productStoreId" from-field="productStoreId"/>
-                                <parameter param-name="facilityId" from-field="facilityId"/>
-                            </link>
+                            <section>
+                                <widgets>
+                                    <link name="updateEbayInventoryStatus" secure="true" target="updateEbayInventoryStatus"  style="buttontext" text="${uiLabelMap.EbayUpdateInventoryStatus}">
+                                        <parameter param-name="productStoreId" from-field="productStoreId"/>
+                                        <parameter param-name="facilityId" from-field="facilityId"/>
+                                    </link>
+                                    <link name="reserveEbayProductInventory" target="reserveEbayProductInventory"  style="buttontext" text="${uiLabelMap.EbayReserveProductInventory}">
+                                        <parameter param-name="productStoreId" from-field="productStoreId"/>
+                                        <parameter param-name="facilityId" from-field="facilityId"/>
+                                    </link>
+                                </widgets>
+                            </section>
                             <include-form name="ListEbayProductInventoryDetail" location="component://ebaystore/widget/EbayInventoryForms.xml"/>
                         </screenlet>
                     </decorator-section>
@@ -429,10 +437,11 @@
                     <decorator-section name="body">
                         <screenlet title="notes">
                             <label style="label" text="Please subscribed to Selling Manager Pro before you use this function because ebay product inventory will open when you start selling manager pro on ebay site."></label>
+                            <label style="label" text="if you subscribed already then still can not use, please check you internet connection."></label>
                             <label text="- To subscribe for production site"></label>
-                            <link target="link : http://pages.ebay.com/selling_manager_pro" text="http://pages.ebay.com/selling_manager_pro"  target-window="_BLANK" url-mode="plain"></link>
+                            <link target="http://pages.ebay.com/selling_manager_pro" text="http://pages.ebay.com/selling_manager_pro"  target-window="_BLANK" url-mode="plain"></link>
                             <label text="- To upgrade store level sandbox site"></label>
-                            <link target="link : http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings" target-window="_BLANK" url-mode="plain" text="http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings"></link>
+                            <link target="http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings" target-window="_BLANK" url-mode="plain" text="http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings"></link>
                         </screenlet>
                         <screenlet title="How to upgrade sandbox store level?">
                             <label text="- Click on the link &quot;To upgrade store level for sandbox site&quot;"></label>
@@ -447,4 +456,26 @@
             </widgets>
         </section>
     </screen>
+    <screen name="updateQuantityReserved">
+        <section>
+            <actions>
+                <set field="headerItem" value="ebayStore"/>
+                <set field="tabButtonItem" value="inventory"/>
+                <entity-one entity-name="EbayProductStoreInventory" value-field="ebayProductStoreInventory">
+                    <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+                    <field-map field-name="facilityId" from-field="parameters.facilityId"/>
+                    <field-map field-name="productId" from-field="parameters.productId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="Inventory Quantities">
+                            <include-form name="updateQuantityReserved" location="component://ebaystore/widget/EbayInventoryForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>
\ No newline at end of file