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/26 04:07:25 UTC
svn commit: r916548 - in /ofbiz/trunk/specialpurpose/ebaystore:
config/EbayStoreUiLabels.xml data/EbayStoreTypeData.xml
servicedef/services.xml webapp/ebaystore/WEB-INF/controller.xml
widget/EbaySellingManagerForms.xml widget/EbaySellingManagerScreens.xml
Author: hansbak
Date: Fri Feb 26 03:07:25 2010
New Revision: 916548
URL: http://svn.apache.org/viewvc?rev=916548&view=rev
Log:
EbayStore update:
function for seller set automatically leave the following positive feedback.(when buyer has paid or left positive feedback to seller)
Modified:
ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Fri Feb 26 03:07:25 2010
@@ -205,6 +205,8 @@
<property key="requireEbayInventory">
<value xml:lang="en">Require eBay Inventory</value>
</property>
+
+ <!-- Selling Manager preferences -->
<property key="EbayAutomationDispute">
<value xml:lang="en">Automation Dispute</value>
</property>
@@ -226,4 +228,32 @@
<property key="EbayAddSecondChanceOffer">
<value xml:lang="en">Add Second Chance Offer</value>
</property>
-</resource>
+ <property key="EbayIsAutoPositiveFeedback">
+ <value xml:lang="en">Automatically leave the positive feedback</value>
+ </property>
+ <property key="EbaySituations">
+ <value xml:lang="en">Situations</value>
+ </property>
+ <property key="EbayTxtPaymentReceive">
+ <value xml:lang="en">Buyer has paid for this item.</value>
+ </property>
+ <property key="EbayTxtPaymentReceiveAndPositive">
+ <value xml:lang="en">Buyer has paid for this item and left me positive feedback. </value>
+ </property>
+ <property key="EbayTxtAutoPositiveFeedbackBuyer">
+ <value xml:lang="en">Automated Positive Feedback for Buyers</value>
+ </property>
+
+ <property key="EbayIsAutoFeedbackReminder">
+ <value xml:lang="en">Automatically send a Feedback Reminder email</value>
+ </property>
+ <property key="EbayIsAutoFeedbackReminderTooltip">
+ <value xml:lang="en">Automatically send a Feedback Reminder email if feedback has not been received</value>
+ </property>
+ <property key="EbayIsSendCopyEmailToSeller">
+ <value xml:lang="en">Copy and Send to Seller</value>
+ </property>
+ <property key="EbayIsSendCopyEmailTooltip">
+ <value xml:lang="en">How many days after shipping you want this email sent?</value>
+ </property>
+</resource>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml Fri Feb 26 03:07:25 2010
@@ -24,10 +24,12 @@
<EnumerationType description="Inventory Reservation For Ebay Store" enumTypeId="EBAY_INV_RESERVE" hasTable="N" parentTypeId=""/>
<Enumeration description="ebay inventory reserve" enumCode="EBAY_INV" enumId="EBAY_INV_RES" sequenceId="01" enumTypeId="EBAY_INV_RESERVE"/>
-
+
<EnumerationType description="Ebay setting auto preferences" enumTypeId="EBAY_AUTO_PREF" hasTable="N" parentTypeId=""/>
<Enumeration enumId="EBAY_AUTO_DISPUTE1" description="Automatic Dispute not complete" enumTypeId="EBAY_AUTO_PREF"/>
<Enumeration enumId="EBAY_AUTO_DISPUTE2" description="Automatic Dispute not pay" enumTypeId="EBAY_AUTO_PREF"/>
<Enumeration enumId="EBAY_AUTO_RELISTING" description="Automatic Relisting" enumTypeId="EBAY_AUTO_PREF"/>
+ <Enumeration enumId="EBAY_AUTO_PIT_FB" description="Automatic leave positive feedback when buyer has paid for item" enumTypeId="EBAY_AUTO_PREF"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml Fri Feb 26 03:07:25 2010
@@ -325,7 +325,7 @@
<attribute name="productStoreId" mode="IN" type="String" optional="false"/>
<attribute name="itemId" mode="IN" type="String" optional="false"/>
<attribute name="checkVerify" mode="OUT" type="Boolean" optional="false"/>
- </service>
+ </service>
<service name="startEbayAutoPreference" engine="java" transaction-timeout="3600"
location="org.ofbiz.ebaystore.EbayStoreHelper" invoke="startEbayAutoPreference" auth="true">
<attribute name="productStoreId" mode="IN" type="String" optional="false"/>
@@ -349,4 +349,8 @@
<attribute name="enabled" mode="IN" type="String" optional="false" default-value="N"/>
<attribute name="serviceName" mode="IN" type="String" optional="false"/>
</service>
+ <service name="autoPrefLeaveFeedbackOption" engine="java" transaction-timeout="10800"
+ location="org.ofbiz.ebaystore.EbayStoreAutoPreferences" invoke="autoPrefLeaveFeedbackOption" auth="true">
+ <attribute name="productStoreId" mode="IN" type="String" optional="false"/>
+ </service>
</services>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Fri Feb 26 03:07:25 2010
@@ -137,6 +137,12 @@
<response name="success" type="view" value="AutomationPreferences"/>
<response name="error" type="view" value="AutomationPreferences"/>
</request-map>
+ <request-map uri="autoPrefLeaveFeedbackOptions">
+ <security auth="true" https="true"/>
+ <event type="java" path="org.ofbiz.ebaystore.EbayStoreAutoPreferences" invoke="autoPrefLeaveFeedbackOptions"/>
+ <response name="success" type="view" value="AutomationPreferences"/>
+ <response name="error" type="view" value="AutomationPreferences"/>
+ </request-map>
<!-- Block item out of stock -->
<request-map uri="blockItemOutOfStock">
<security https="true" auth="true"/>
@@ -275,7 +281,7 @@
<!-- store Inventory -->
<view-map name="ebayStoreInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayStoreInventory"/>
<view-map name="ebayLoadStoreInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayLoadStoreInventory"/>
- <view-map name="reserveEbayProductInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml.xml#reserveEbayProductInventory"/>
+ <view-map name="reserveEbayProductInventory" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#reserveEbayProductInventory"/>
<view-map name="updateQuantityReserved" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#updateQuantityReserved"/>
<view-map name="exportProductListing" type="screen" page="component://ebaystore/widget/EbayStoreScreens.xml#exportProductListing"/>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Fri Feb 26 03:07:25 2010
@@ -216,4 +216,78 @@
</field>
<field name="submitButton"><submit button-type="button"/></field>
</form>
+ <!-- Automatically leave the following positive feedback -->
+ <form name="autoPositiveFeedbackForBuyers" type="single" target="autoPrefLeaveFeedbackOptions"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-one entity-name="EbayProductStorePref" value-field="ebayProductStorePref">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ <field-map field-name="autoPrefEnumId" value="EBAY_AUTO_PIT_FB"/>
+ </entity-one>
+ <set field="isAutoPositiveFeedback" type="String" from-field="ebayProductStorePref.enabled"/>
+ <set field="feedbackEventCode" type="String" from-field="ebayProductStorePref.condition1"/>
+ <set field="ebayProductStorePref.condition2" type="String" default-value="none" from-field="ebayProductStorePref.condition2"/>
+ <set field="comment_1" value="${groovy:
+ comment_1 = "";
+ if(ebayProductStorePref.condition2!=null) comment_1 = ebayProductStorePref.condition2;
+ if(comment_1!=null && comment_1.indexOf("[,]")!= -1) comment_1 = comment_1.substring(0,comment_1.indexOf("[,]"));
+ if(ebayProductStorePref.condition2.indexOf("[,]")!=-1) comment_1 = comment_1+"[,]";
+ if(comment_1!=null && comment_1.length()>0) ebayProductStorePref.condition2 = ebayProductStorePref.condition2.replace(comment_1,"");
+ if(comment_1!=null && comment_1.indexOf("[,]")!= -1) comment_1 =comment_1.replace("[,]","");
+ return comment_1;
+ }" type="String"/>
+ <set field="comment_2" value="${groovy:
+ comment_2 = "";
+ if( ebayProductStorePref.condition2!=null) comment_2 = ebayProductStorePref.condition2;
+ if(comment_2!=null && comment_2.indexOf("[,]")!= -1) comment_2 = comment_2.substring(0,comment_2.indexOf("[,]"));
+ if(ebayProductStorePref.condition2.indexOf("[,]")!=-1) comment_2 = comment_2+"[,]";
+ if(comment_2!=null && comment_2.length()>0) ebayProductStorePref.condition2 = ebayProductStorePref.condition2.replace(comment_2,"");
+ if(comment_2!=null && comment_2.indexOf("[,]")!= -1) comment_2 =comment_2.replace("[,]","");
+ return comment_2;
+ }" type="String"/>
+ <set field="comment_3" value="${groovy:
+ comment_3 = "";
+ if( ebayProductStorePref.condition2!=null) comment_3 = ebayProductStorePref.condition2;
+ if(comment_3!=null && comment_3.indexOf("[,]")!= -1) comment_3 = comment_3.substring(0,comment_3.indexOf("[,]"));
+ if(ebayProductStorePref.condition2.indexOf("[,]")!=-1) comment_3 = comment_3+"[,]";
+ if(comment_3!=null && comment_3.length()>0) ebayProductStorePref.condition2 = ebayProductStorePref.condition2.replace(comment_3,"");
+ if(comment_3!=null && comment_3.indexOf("[,]")!= -1) comment_3 = comment_3.replace("[,]","");
+ return comment_3;
+ }" type="String"/>
+ <set field="comment_4" value="${groovy:
+ comment_4 = "";
+ if( ebayProductStorePref.condition2!=null) comment_4 = ebayProductStorePref.condition2;
+ if(comment_4!=null && comment_4.indexOf("[,]")!= -1) comment_4 = comment_4.substring(0,comment_4.indexOf("[,]"));
+ if(ebayProductStorePref.condition2.indexOf("[,]")!=-1) comment_4 = comment_4+"[,]";
+ if(comment_4!=null && comment_4.length()>0) ebayProductStorePref.condition2 = ebayProductStorePref.condition2.replace(comment_4,"");
+ if(comment_4!=null && comment_4.indexOf("[,]")!= -1) comment_4 = comment_4.replace("[,]","");
+ return comment_4;
+ }" type="String"/>
+ <set field="comment_5" value="${groovy:
+ comment_5 = "";System.out.println(parameters.comments);
+ if( ebayProductStorePref.condition2!=null) comment_5 = ebayProductStorePref.condition2;
+ if(comment_5!=null && comment_5.indexOf("[,]")!= -1) comment_5 = comment_5.substring(0,comment_5.indexOf("[,]"));
+ if(ebayProductStorePref.condition2.indexOf("[,]")!=-1) comment_5 = comment_5+"[,]";
+ if(comment_5!=null && comment_5.length()>0) ebayProductStorePref.condition2 = ebayProductStorePref.condition2.replace(comment_5,"");
+ if(comment_5!=null && comment_5.indexOf("[,]")!= -1) comment_5 = comment_5.replace("[,]","");
+ return comment_5;
+ }" type="String"/>
+ </actions>
+ <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
+ <field name="isAutoPositiveFeedback" position="1" title="${uiLabelMap.EbayIsAutoPositiveFeedback}"><check></check></field>
+ <field name="feedbackEventCode" position="2" title="${uiLabelMap.EbaySituations}">
+ <radio>
+ <option key="PAYMENT_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceive}"/>
+ <option key="POSITIVE_FEEDBACK_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceiveAndPositive}"/>
+ </radio>
+ </field>
+ <field name="headerLabel" title=" " encode-output="false"><display type="text" description="<br/><b>Your stored positive feedback comments.</b>"></display></field>
+ <field name="comment_1" title="comments" position="1"><text size="80"></text></field>
+ <field name="comment_3" title=" " position="2"><text size="50"></text></field>
+ <field name="comment_2" title=" " position="1"><text size="80"></text></field>
+ <field name="comment_5" title=" " position="2"><text size="50"></text></field>
+ <field name="comment_4" title=" " position="1"><text size="80"></text></field>
+ <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field>
+ </form>
+
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=916548&r1=916547&r2=916548&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Fri Feb 26 03:07:25 2010
@@ -74,7 +74,7 @@
<decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <include-form name="EbayStoreFacilityList" location="component://ebaystore/widget/EbayInventoryForms.xml"/>
+ <include-form name="EbayStoreFacilityList" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -249,6 +249,9 @@
<decorator-section-include name="body"/>
<include-screen name="AutomationRelistSoldItems"/>
<include-screen name="AutomationDispute"/>
+ <screenlet title="${uiLabelMap.EbayTxtAutoPositiveFeedbackBuyer}" id="autoPositiveFeedback" collapsible="false" initially-collapsed="true">
+ <include-form name="autoPositiveFeedbackForBuyers" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -371,5 +374,5 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
</screens>