svn commit: r912516 - in /ofbiz/trunk/specialpurpose/eb
Locked
 
|
Author: hansbak
Date: Mon Feb 22 08:56:24 2010 New Revision: 912516 URL: http://svn.apache.org/viewvc?rev=912516&view=rev Log: missed some files in previous ebaystore commit: fixed error rendering selling manager screen in ebayStore component. Added: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Added: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=912516&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (added) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Mon Feb 22 08:56:24 2010 @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. + +value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + <!-- Automation Preference --> + <form name="EditAutomationRelistSoldItems" target="createEbayAutomaticRelistItems" type="single"> + <alt-target use-when="job!=null" target="updateEbayAutomaticRelistItems"/> + <field name="jobId" use-when="job!=null"><hidden value="${job.jobId}"/></field> + <field name="jobId" use-when="job==null"><hidden value="${jobId}"/></field> + <field name="authUserLoginId"><hidden value="${userLoginId}"/></field> + <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> + <field name="startDateTime"><date-time default-value="${job.startDateTime}"/></field> + <field name="finishDateTime"><date-time default-value="${job.finishDateTime}"/></field> + <field name="submit" title="${uiLabelMap.CommonUpdate}"><submit/></field> + </form> + <!-- Sold Listing --> + <form name="SoldItemList" type="list" target="doAction" list-name="soldItemList" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" use-row-submit="true" separate-columns="true"> + <row-actions> + <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy"/> + </row-actions> + <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> + <field name="itemId"><display description="${itemId} - ${title}"/></field> + <field name="buyer"><display description="${buyer}"/></field> + <field name="listingType"><display description="${listingType}"/></field> + <field name="quantity"><display description="${quantity}"/></field> + <field name="transactionId"><display description="${transactionId}"/></field> + <field name="salePrice"><display description="${salePrice}"/></field> + <field name="totalAmount"><display description="${totalAmount}"/></field> + <field name="creationTime"><display description="${creationTime}" type="date"/></field> + <field name="paidTime"><display description="${paidTime}" type="date"/></field> + <field name="checkoutStatus"><display description="${checkoutStatus}"/></field> + <field name="unpaidItemStatus"><display description="${unpaidItemStatus}"/></field> + <field name="action" use-when=""${hasAction}"=="true""> + <drop-down> + <list-options key-name="action" list-name="actionList" description="${actionName}"/> + </drop-down> + </field> + <field name="submitButton" use-when=""${hasAction}"=="true"" title="${uiLabelMap.CommonSubmit}"><submit/></field> + </form> + <form name="OpenUnpaid" type="single" target="addDispute"> + <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> + <field name="itemId"><hidden value="${parameters.itemId}"/></field> + <field name="item"><text disabled="true" default-value="${parameters.itemId} - ${parameters.title}"/></field> + <field name="listingType"><text disabled="true" default-value="${parameters.listingType}"/></field> + <field name="quantity"><text disabled="true" default-value="${parameters.quantity}"/></field> + <field name="salePrice"><text disabled="true" default-value="${parameters.salePrice}"/></field> + <field name="transactionId"><hidden value="${parameters.transactionId}"/></field> + <field name="transaction"><text disabled="true" default-value="${parameters.transactionId}"/></field> + <field name="disputeReasonCodeType"> + <radio no-current-selected-key="TransactionMutuallyCanceled"> + <option key="BUYER_HAS_NOT_PAID" description="The buyer has not paid for the item"/> + <option key="TRANSACTION_MUTUALLY_CANCELED" description="We have both agreed not to complete the transaction"/> + </radio> + </field> + <field name="disputeExplanationCodeType"> + <drop-down> + <option key="" description="- - Select One - -"/> + <option key="BUYER_PURCHASING_MISTAKE" description="Buyer purchased item by mistake or changed mind"/> + <option key="BUYER_RETURNED_ITEM_FOR_REFUND" description="Buyer is returning item for a refund"/> + <option key="UNABLE_TO_RESOLVE_TERMS" description="Buyer and I disagreed over terms"/> + <option key="BUYER_HAS_NOT_RESPONDED" description="Buyer is unresponsive"/> + <option key="PAYMENT_METHOD_NOT_SUPPORTED" description="Buyer's payment hasn't been received or hasn't cleared"/> + <option key="SHIPPING_ADDRESS_NOT_CONFIRMED" description="Buyer requested shipment to an unconfirmed address"/> + <option key="SHIP_COUNTRY_NOT_SUPPORTED" description="Seller doesn't ship to the country requested by buyer"/> + <option key="OTHER_EXPLANATION" description="Other reason"/> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" position="1"><submit/></field> + <field name="cancelButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" position="2"> + <hyperlink target="soldListing" description="${uiLabelMap.CommonCancel}"> + <parameter param-name="productStoreId" from-field="parameters.productStoreId"/> + </hyperlink> + </field> + </form> + <!-- Inventory --> + <form name="EbayStoreFacilityList" type="single" list-name="productStoreFacilityList" target="ebayStoreInventory" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> + <field name="isFacilityId"><hidden value="Y"/></field> + <field name="facilityId" > + <drop-down current="selected" > + <list-options list-name="productStoreFacilityList" description="${facilityId}" key-name="facilityId"/> + </drop-down> + </field> + <field name="submitButton" ><submit button-type="button"/></field> + </form> + + <form name="reserveEbayProductInventory" type="single" list-name="" target="reserveProductInventory" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="productStoreId"><display description="${parameters.productStoreId}"></display></field> + <field name="facilityId"><display description="${parameters.facilityId}"></display></field> + <field name="productId"><lookup target-form-name="LookupProduct"></lookup></field> + <field name="quantity"><text></text></field> + <field name="submitButton" ><submit button-type="button"/></field> + </form> + + <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" 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" > + <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> + <field name="activeListing"><display></display></field> + <field name="sold"><display></display></field> + <field name="unSold"><display></display></field> + <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> \ No newline at end of file Added: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=912516&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (added) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Mon Feb 22 08:56:24 2010 @@ -0,0 +1,338 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <!-- Store reserve inventory --> + <screen name="ebayStoreInventory"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="inventory"/> + <entity-and entity-name="ProductStoreFacility" list="productStoreFacilityList"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </entity-and> + <set field="check" value="${groovy: + check= "false"; + if(productStoreFacilityList!=null && productStoreFacilityList.size()== 1) check = "true"; + return check; + }" type="String"/> + <set field="facilityId" value="${groovy: + if(check.equals("true")) facility = productStoreFacilityList.get(0); + if(facility!=null) facilityId = facility.facilityId; + return facilityId;}" type="String"/> + </actions> + <widgets> + <section> + <condition> + <if-compare field="check" operator="equals" value="true"/> + </condition> + <widgets> + <section> + <actions> + <set field="parameters.facilityId" value="${facilityId}"/> + <set field="parameters.productStoreId" from-field="parameters.productStoreId"/> + <service service-name="getFolderInEbayStoreInventory" result-map="result"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </service> + <set field="ebayfolderId" value="${result.folderId}"/> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field="ebayfolderId"/></not> + </condition> + <widgets><include-screen name="ViewInventoryItemDetail"/></widgets> + <fail-widgets><include-screen name="ebayStoreInventoryFail"/></fail-widgets> + </section> + </widgets> + </section> + </widgets> + <fail-widgets> + <section> + <actions> + <set field="parameters.facilityId" value="${facilityId}"/> + <set field="parameters.productStoreId" from-field="parameters.productStoreId"/> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet> + <include-form name="EbayStoreFacilityList" location="component://ebaystore/widget/EbayInventoryForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </fail-widgets> + </section> + </widgets> + </section> + </screen> + <screen name="ebayLoadStoreInventory"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="inventory"/> + <entity-and entity-name="ProductStoreFacility" list="productStoreFacilityList"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </entity-and> + </actions> + <widgets> + <section> + <widgets> + <section> + <actions> + <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> + </widgets> + </section> + </widgets> + </section> + </screen> + <screen name="ViewInventoryItemDetail"> + <section> + <actions> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="PageTitleEditInventoryItem"/> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="inventory"/> + + <set field="facilityId" from-field="parameters.facilityId"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="ProductStore" value-field="productStore"> + <field-map field-name="productStoreId" from-field="productStoreId"/> + <select-field field-name="storeName"/> + </entity-one> + <entity-one entity-name="Facility" value-field="facility"> + <field-map field-name="facilityId" from-field="facilityId"/> + <select-field field-name="facilityName"/> + </entity-one> + <entity-and entity-name="EbayProductStoreInventory" list="ebayProductStoreInventoryList"> + <field-map field-name="productStoreId" from-field="productStoreId"/> + <field-map field-name="facilityId" from-field="facilityId"/> + </entity-and> + <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.ProductStoreNameId} : ${productStore.storeName}[${productStore.productStoreId}] ${uiLabelMap.FacilityFacility} : ${facility.facilityName}"> + <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/EbaySellingManagerForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="reserveEbayProductInventory"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="inventory"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="Facility" value-field="facility"> + <field-map field-name="facilityId" value="${parameters.facilityId}"/> + <select-field field-name="facilityName"/> + </entity-one> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.EbayReserveProductFrom} : ${facility.facilityName}"> + <include-form name="reserveEbayProductInventory" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="ebayStoreInventoryFail"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="inventory"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <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="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="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 "To upgrade store level for sandbox site""></label> + <label text="- Go to "Selling Related links" section"></label> + <label text="- Click on "Edit my eBay store""></label> + <label text="- Page Manage my eBay store will show up"></label> + <label text="- Go to "Store Usage Information" section"></label> + <label text="- Click upgrade at "Subscription level" then select "Premium Store" and "Selling Manager Pro" then submit."></label> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="updateQuantityReserved"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" 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="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="Inventory Quantities"> + <include-form name="updateQuantityReserved" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <!-- Automation Preferences --> + <screen name="EbayAutomationPreferences"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="sellingManagerItem" value="automationPreferences"/> + <service service-name="getEbayStoreUser" result-map="result"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </service> + <set field="userLoginId" from-field="result.userLoginId"/> + <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy"/> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-section-include name="body"/> + <include-screen name="AutomationRelistSoldItems"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="AutomationRelistSoldItems"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.EbayAutomationRelistItems}"> + <include-form name="EditAutomationRelistSoldItems" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <!-- Sold --> + <screen name="EbaySoldListing"> + <section> + <actions> + <set field="sellingManagerItem" value="soldListing"/> + </actions> + <widgets> + <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-section-include name="body"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="SoldListing"> + <section> + <actions> + <service service-name="getEbaySoldItems" result-map="result"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + <field-map field-name="status" from-field="parameters.status"/> + <field-map field-name="period" from-field="parameters.period"/> + </service> + <set field="soldItemList" from-field="result.soldItems"/> + </actions> + <widgets> + <decorator-screen name="EbaySoldListing"> + <decorator-section name="body"> + <screenlet title="Sold Listing"> + <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="SoldItemList"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="OpenUnpaid"> + <section> + <widgets> + <decorator-screen name="EbaySoldListing"> + <decorator-section name="body"> + <screenlet title="Open Unpaid"> + <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="OpenUnpaid"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="MakeSecondChanceOffer"> + <section> + <actions> + <service service-name="getEbayAllBidders" result-map="results"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + <field-map field-name="itemId" from-field="parameters.itemId"/> + </service> + <set field="allBidders" from-field="results.allBidders"/> + </actions> + <widgets> + <decorator-screen name="EbaySoldListing"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.EbayAddSecondChanceOffer}"> + <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="MakeSecondChanceOffer"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |