ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hans...@apache.org
Subject svn commit: r918909 [2/2] - in /ofbiz/trunk/specialpurpose/ebaystore: config/ script/org/ofbiz/ebaystore/ servicedef/ src/org/ofbiz/ebaystore/ webapp/ebaystore/WEB-INF/ widget/
Date Thu, 04 Mar 2010 09:20:48 GMT
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=918909&r1=918908&r2=918909&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Thu Mar  4 09:20:47
2010
@@ -346,21 +346,33 @@
         <field name="condition2" title="Allow no more than" tooltip-style="h3" tooltip="items
per order"><text size="3" default-value="${ebayPrefCombine.condition2}" maxlength="2"></text></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
     </form>
-	<form name="EditEmailTemplate" type="single"  target="createEmailTemplate"
+    <form name="winningBuyerNotification" type="single" target="settingWinningBuyerNotification"
header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefCombine">
+                <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+                <field-map field-name="autoPrefEnumId" value="EBAY_AUTO_WIN_EMAIL"/>
+            </entity-one>
+            <set field="isRunWinnerNotify"  type="String" from-field="ebayPrefCombine.enabled"/>
+        </actions>
+        <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
+        <field name="isRunWinnerNotify" position="1" title="Enable send winner buyer notification
automatically"><check></check></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
+    </form>
+    <form name="EditEmailTemplate" type="single"  target="createEmailTemplate"
         header-row-style="header-row" default-table-style="basic-table">
          <actions>
-        	<set field="includePayment" value="${groovy:
-        		includePayment = &quot;N&quot;;
-        		if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_PAYMENT&quot;))
includePayment = &quot;Y&quot;;
-	   			if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_PAYMENT&quot;))
subject = subject.replace(&quot;INCLUDE_PAYMENT&quot;, &quot;&quot;);
-	   			return includePayment;
-        		}" type="String"/>
-        	<set field="includeCrossPromotions" value="${groovy:
-        		includeCrossPromotions = &quot;N&quot;;
-        		if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_CROSS_PROMOTIONS&quot;))
includeCrossPromotions = &quot;Y&quot;;
-	   			if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_CROSS_PROMOTIONS&quot;))
subject = subject.replace(&quot;INCLUDE_CROSS_PROMOTIONS&quot;, &quot;&quot;);
-	   			return includeCrossPromotions;
-        		}" type="String"/>
+            <set field="includePayment" value="${groovy:
+                includePayment = &quot;N&quot;;
+                if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_PAYMENT&quot;))
includePayment = &quot;Y&quot;;
+                   if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_PAYMENT&quot;))
subject = subject.replace(&quot;INCLUDE_PAYMENT&quot;, &quot;&quot;);
+                   return includePayment;
+                }" type="String"/>
+            <set field="includeCrossPromotions" value="${groovy:
+                includeCrossPromotions = &quot;N&quot;;
+                if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_CROSS_PROMOTIONS&quot;))
includeCrossPromotions = &quot;Y&quot;;
+                   if (subject != null &amp;&amp; subject.contains(&quot;INCLUDE_CROSS_PROMOTIONS&quot;))
subject = subject.replace(&quot;INCLUDE_CROSS_PROMOTIONS&quot;, &quot;&quot;);
+                   return includeCrossPromotions;
+                }" type="String"/>
         </actions>
         <alt-target use-when="emailSetting!=null" target="updateEmailTemplate"/>
         <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
@@ -371,57 +383,57 @@
         <field name="dataResourceId"><hidden value="${dataResourceId}"/></field>
         <field name="emailDetail" title="${uiLabelMap.CommonEmptyHeader}" widget-area-style="h2"><display
description="${uiLabelMap.EbayEmailDetail}"/></field>
         <field name="autoText" action="doSelect(this.id)" event="onchange" >
-        	<drop-down allow-empty="true">
-        		<option key="$\{buyerUserId}" description="Buyer User ID"/>
-        		<option key="$\{buyerName}" description="Buyer name"/>
-        		<option key="$\{buyerFirstName}" description="Buyer First name"/>
-        		<option key="$\{buyerLastName}" description="Buyer Last name"/>
-        		<option key="$\{buyerStreet1}" description="Buyer street 1"/>
-        		<option key="$\{buyerStreet2}" description="Buyer street 2"/>
-        		<option key="$\{buyerCity}" description="Buyer City"/>
-        		<option key="$\{buyerState}" description="Buyer State"/>
-        		<option key="$\{buyerZipCode}" description="Buyer zip code"/>
-        		<option key="$\{buyerCountry}" description="Buyer Country"/>
-        		<option key="$\{itemId}" description="Item Number"/>
-        		<option key="$\{itemTitle}" description="Item Title"/>
-        		<option key="$\{linkToListing}" description="Link to listing"/>
-        		<option key="$\{Quantity}" description="Quantity"/>
-        		<option key="$\{favoriteslist}" description="Favorites list"/>
-        		<option key="$\{feedbackLink}" description="Feedback link"/>
-        		<option key="$\{closingDateTime}" description="Closing Date/Time"/>
-        		<option key="$\{totalPrice}" description="Total price"/>
-        		<option key="$\{closingPrice}" description="Closing price"/>
-        		<option key="$\{SHFee}" description="S&amp;H fee"/>
-        		<option key="$\{insuranceCost}" description="Insurance cost"/>
-        		<option key="$\{insuranceOption}" description="Insurance option"/>
-        		<option key="$\{tax}" description="Tax"/>
-        		<option key="$\{taxState}" description="Tax State"/>
-        		<option key="$\{paymentAcceped}" description="Payment accepted"/>
-        		<option key="$\{paymentInstructions}" description="Payment instructions"/>
-        		<option key="$\{sellerUserId}" description="Seller User ID"/>
-        		<option key="$\{sellerName}" description="Seller name"/>
-        		<option key="$\{sellerFirstName}" description="Seller First name"/>
-        		<option key="$\{sellerLastName}" description="Seller Last name"/>
-        		<option key="$\{sellerStreet1}" description="Seller street 1"/>
-        		<option key="$\{sellerStreet2}" description="Seller street 2"/>
-        		<option key="$\{sellerCity}" description="Seller city"/>
-        		<option key="$\{sellerState}" description="Seller state"/>
-        		<option key="$\{sellerZipCode}" description="Seller zip code"/>
-        		<option key="$\{sellerCountry}" description="Seller country"/>
-        		<option key="$\{sellerEmail}" description="Seller email"/>
-        		<option key="$\{sellerPhone}" description="Seller phone"/>
-        		<option key="$\{salesRecordNumber}" description="Sales record number"/>
-        		<option key="$\{shippedDate}" description="Shipped date"/>
-        		<option key="$\{transactionTable}" description="Transaction table"/>
-        		<option key="$\{checkoutLink}" description="Checkout link"/>
-        		<option key="$\{shippingCalculator}" description="Shipping Calculator"/>
-        		<option key="$\{trackShipmentLink}" description="Track shipment link"/>
-        		<option key="$\{shippingOptions}" description="Shipping Options"/>
-        		<option key="$\{notesToBuyer}" description="Notes to buyer"/>
-        		<option key="$\{DiscountsOrCharges}" description="Discounts or Charges"/>
-        		<option key="$\{refundAmount}" description="Refund Amount"/>
-        		<option key="$\{variationDetails}" description="Variation details"/>
-        	</drop-down>
+            <drop-down allow-empty="true">
+                <option key="$\{buyerUserId}" description="Buyer User ID"/>
+                <option key="$\{buyerName}" description="Buyer name"/>
+                <option key="$\{buyerFirstName}" description="Buyer First name"/>
+                <option key="$\{buyerLastName}" description="Buyer Last name"/>
+                <option key="$\{buyerStreet1}" description="Buyer street 1"/>
+                <option key="$\{buyerStreet2}" description="Buyer street 2"/>
+                <option key="$\{buyerCity}" description="Buyer City"/>
+                <option key="$\{buyerState}" description="Buyer State"/>
+                <option key="$\{buyerZipCode}" description="Buyer zip code"/>
+                <option key="$\{buyerCountry}" description="Buyer Country"/>
+                <option key="$\{itemId}" description="Item Number"/>
+                <option key="$\{itemTitle}" description="Item Title"/>
+                <option key="$\{linkToListing}" description="Link to listing"/>
+                <option key="$\{Quantity}" description="Quantity"/>
+                <option key="$\{favoriteslist}" description="Favorites list"/>
+                <option key="$\{feedbackLink}" description="Feedback link"/>
+                <option key="$\{closingDateTime}" description="Closing Date/Time"/>
+                <option key="$\{totalPrice}" description="Total price"/>
+                <option key="$\{closingPrice}" description="Closing price"/>
+                <option key="$\{SHFee}" description="S&amp;H fee"/>
+                <option key="$\{insuranceCost}" description="Insurance cost"/>
+                <option key="$\{insuranceOption}" description="Insurance option"/>
+                <option key="$\{tax}" description="Tax"/>
+                <option key="$\{taxState}" description="Tax State"/>
+                <option key="$\{paymentAcceped}" description="Payment accepted"/>
+                <option key="$\{paymentInstructions}" description="Payment instructions"/>
+                <option key="$\{sellerUserId}" description="Seller User ID"/>
+                <option key="$\{sellerName}" description="Seller name"/>
+                <option key="$\{sellerFirstName}" description="Seller First name"/>
+                <option key="$\{sellerLastName}" description="Seller Last name"/>
+                <option key="$\{sellerStreet1}" description="Seller street 1"/>
+                <option key="$\{sellerStreet2}" description="Seller street 2"/>
+                <option key="$\{sellerCity}" description="Seller city"/>
+                <option key="$\{sellerState}" description="Seller state"/>
+                <option key="$\{sellerZipCode}" description="Seller zip code"/>
+                <option key="$\{sellerCountry}" description="Seller country"/>
+                <option key="$\{sellerEmail}" description="Seller email"/>
+                <option key="$\{sellerPhone}" description="Seller phone"/>
+                <option key="$\{salesRecordNumber}" description="Sales record number"/>
+                <option key="$\{shippedDate}" description="Shipped date"/>
+                <option key="$\{transactionTable}" description="Transaction table"/>
+                <option key="$\{checkoutLink}" description="Checkout link"/>
+                <option key="$\{shippingCalculator}" description="Shipping Calculator"/>
+                <option key="$\{trackShipmentLink}" description="Track shipment link"/>
+                <option key="$\{shippingOptions}" description="Shipping Options"/>
+                <option key="$\{notesToBuyer}" description="Notes to buyer"/>
+                <option key="$\{DiscountsOrCharges}" description="Discounts or Charges"/>
+                <option key="$\{refundAmount}" description="Refund Amount"/>
+                <option key="$\{variationDetails}" description="Variation details"/>
+            </drop-down>
         </field>
         <field name="subject"><text/></field>
         <field name="textData" title="${uiLabelMap.CommonMessage}"><textarea visual-editor-enable="true"
rows="20" cols="120" default-value="${textData}"/></field>
@@ -429,6 +441,6 @@
         <field name="includePayment" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.EbayIncludePayNowButtonAndAcceptPaymentMethods}"
tooltip-style="h3"><check/></field>
         <field name="crossPromotions" title="${uiLabelMap.CommonEmptyHeader}" widget-area-style="h2"><display
description="${uiLabelMap.EbayCrossPromotions}"/></field>
         <field name="includeCrossPromotions" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.EbayIncludeMyDefaultCrossPromotionInThisEmail}"
tooltip-style="h3"><check/></field-->
-		<field name="submitButton"><submit/></field>
-	</form>
+        <field name="submitButton"><submit/></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=918909&r1=918908&r2=918909&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Thu Mar  4 09:20:47
2010
@@ -246,18 +246,23 @@
                 <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <decorator-section-include name="body"/>
-                        <include-screen name="combinedOrderSetting"/>
                         <include-screen name="AutomationRelistSoldItems"/>
                         <include-screen name="AutomationDispute"/>
-                        <screenlet title="${uiLabelMap.EbayTxtAutoPositiveFeedbackBuyer}"
id="autoPositiveFeedback" collapsible="false" initially-collapsed="true">
+                        <screenlet title="${uiLabelMap.EbayTxtAutoPositiveFeedbackBuyer}"
id="autoPositiveFeedback" collapsible="true" initially-collapsed="true">
                             <include-form name="autoPositiveFeedbackForBuyers" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.EbayIsAutoFeedbackReminder}" id="autoSendFeedbackReminder"
collapsible="false" initially-collapsed="true">
+                        <screenlet title="${uiLabelMap.EbayIsAutoFeedbackReminder}" id="autoSendFeedbackReminder"
collapsible="true" initially-collapsed="true">
                             <include-form name="autoSendFeedbackReminder" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.EbayAutoPaymentReceviedEmail}"
id="autoSendPaymentReceivedEmail" collapsible="false" initially-collapsed="true">
+                        <screenlet title="${uiLabelMap.EbayAutoPaymentReceviedEmail}"
id="autoSendPaymentReceivedEmail" collapsible="true" initially-collapsed="true">
                             <include-form name="autoSendPaymentReceivedEmail" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                         </screenlet>
+                        <screenlet title="${uiLabelMap.EbayCombineOrderSetting}" id="combineOrdersSetting"
collapsible="true" initially-collapsed="true">
+                            <include-form name="combineOrdersSetting" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.EbayAutoSendWinBuyerEmail}" id="winningBuyerNotification"
collapsible="true" initially-collapsed="true">
+                            <include-form name="winningBuyerNotification" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -312,15 +317,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="combinedOrderSetting">
-        <section>
-            <widgets>
-                <screenlet title="Combine Orders Setting">
-                    <include-form name="combineOrdersSetting" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
     <!-- Sold -->
     <screen name="EbaySoldListing">
         <section>
@@ -399,34 +395,34 @@
                     <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
                 </service>
                 <service service-name="getEbayUser" result-map="ebayUser">
-					<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
-				</service>
+                    <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+                </service>
                 <set field="userLoginId" from-field="result.userLoginId"/>
                 <set field="emailType" from-field="parameters.emailType"/>
                 <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting">
-                	<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
-                	<field-map field-name="emailType" from-field="emailType"/>
+                    <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+                    <field-map field-name="emailType" from-field="emailType"/>
                 </entity-one>
                 <set field="subject" from-field="emailSetting.subject"/>
                 <set field="bodyScreenLocation" value="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"/>
-               	<set field="fromAddress" from-field="ebayUser.email"/>
-               	<entity-one value-field="userLoginCheck" entity-name="UserLogin">
-               		<field-map field-name="userLoginId" from-field="userLoginId"/>
-               	</entity-one>
-               	<set field="partyId" from-field="userLoginCheck.partyId"/>
-               	<script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy"/>
-               	<entity-one value-field="templateContent" entity-name="Content"/>
-               	<get-related-one value-field="templateContent" relation-name="DataResource"
to-value-field="templateDataResource"/>
-               	<get-related-one value-field="templateDataResource" relation-name="ElectronicText"
to-value-field="templateData"/>
-               	<set field="textData" from-field="templateData.textData"/>
-               	<set field="dataResourceId" from-field="templateData.dataResourceId"/>
+                   <set field="fromAddress" from-field="ebayUser.email"/>
+                   <entity-one value-field="userLoginCheck" entity-name="UserLogin">
+                       <field-map field-name="userLoginId" from-field="userLoginId"/>
+                   </entity-one>
+                   <set field="partyId" from-field="userLoginCheck.partyId"/>
+                   <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy"/>
+                   <entity-one value-field="templateContent" entity-name="Content"/>
+                   <get-related-one value-field="templateContent" relation-name="DataResource"
to-value-field="templateDataResource"/>
+                   <get-related-one value-field="templateDataResource" relation-name="ElectronicText"
to-value-field="templateData"/>
+                   <set field="textData" from-field="templateData.textData"/>
+                   <set field="dataResourceId" from-field="templateData.dataResourceId"/>
             </actions>
             <widgets>
                 <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                    	<screenlet title="${uiLabelMap.EbayEditEmailTemplate}">
-                    		<include-form name="EditEmailTemplate"  location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
-                    	</screenlet>
+                        <screenlet title="${uiLabelMap.EbayEditEmailTemplate}">
+                            <include-form name="EditEmailTemplate"  location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>



Mime
View raw message