svn commit: r1626688 [39/46] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbi...

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Mon Sep 22 08:09:27 2014
@@ -144,7 +144,7 @@ under the License.
     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
 
     <PaymentMethod paymentMethodId="9015" paymentMethodTypeId="CREDIT_CARD" partyId="DemoCustomer" fromDate="2001-05-13 00:00:00.000"/>
-    <CreditCard paymentMethodId="9015" cardType="Visa" cardNumber="4111111111111111" expireDate="02/2021" companyNameOnCard=""
+    <CreditCard paymentMethodId="9015" cardType="CCT_VISA" cardNumber="4111111111111111" expireDate="02/2021" companyNameOnCard=""
         titleOnCard="" firstNameOnCard="DEMO" middleNameOnCard="" lastNameOnCard="CUSTOMER" suffixOnCard="" contactMechId="9015"/>
 
     <!-- EuroCustomer want invoices in euro and be located in Amsterdam -->
@@ -170,7 +170,7 @@ under the License.
     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
 
     <PaymentMethod paymentMethodId="EUROCUSTOMER" paymentMethodTypeId="CREDIT_CARD" partyId="EuroCustomer" fromDate="2001-05-13 00:00:00.000"/>
-    <CreditCard paymentMethodId="EUROCUSTOMER" cardType="Visa" cardNumber="4111111111111111" expireDate="02/2021" companyNameOnCard=""
+    <CreditCard paymentMethodId="EUROCUSTOMER" cardType="CCT_VISA" cardNumber="4111111111111111" expireDate="02/2021" companyNameOnCard=""
     titleOnCard="" firstNameOnCard="EURO" middleNameOnCard="" lastNameOnCard="CUSTOMER" suffixOnCard="" contactMechId="EUROCUSTOMER"/>
 
     <!-- FrenchCustomer want invoices in euro and be located in Poussan -->
@@ -196,7 +196,7 @@ under the License.
     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
 
     <PaymentMethod paymentMethodId="FRENCHCUSTOMER" paymentMethodTypeId="CREDIT_CARD" partyId="FrenchCustomer" fromDate="2009-01-09 00:00:00.000"/>
-    <CreditCard paymentMethodId="FRENCHCUSTOMER" cardType="Visa" cardNumber="4111111111111111" expireDate="02/2020" companyNameOnCard=""
+    <CreditCard paymentMethodId="FRENCHCUSTOMER" cardType="CCT_VISA" cardNumber="4111111111111111" expireDate="02/2020" companyNameOnCard=""
         titleOnCard="" firstNameOnCard="FRENCH" middleNameOnCard="" lastNameOnCard="CUSTOMER" suffixOnCard="" contactMechId="FRENCHCUSTOMER"/>
     
     <PartyTaxAuthInfo partyId="FrenchCustomer" taxAuthGeoId="FRA" taxAuthPartyId="FRA_TA" fromDate="2001-05-13 00:00:00.000" partyTaxId="FR-12345678901" isExempt="N"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Mon Sep 22 08:09:27 2014
@@ -25,7 +25,16 @@ under the License.
     <!-- ======== Anonymous Checkout Events ======== -->
     <!-- =========================================== -->
 
-    <simple-method method-name="createUpdateUser" short-description="Create or Update User" login-required="false">
+    <simple-method method-name="createUpdateCustomer" short-description="Create update customer and settings" login-required="false">
+        <set field="require_email" value="true"/>
+        <set field="require_phone" value="true"/>
+        <set field="require_login" value="false"/>
+        <set field="shipToPostalAddress" value="true"/>
+        <set field="billToPostalAddress" value="true"/>
+        <!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user -->
+        <set field="create_allow_password" value="true"/>
+
+        <set field="parameters.roleTypeId" value="CUSTOMER"/>
 
         <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
         <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
@@ -481,20 +490,7 @@ under the License.
             </else>
             </if-empty>
         </if-not-empty>
-    </simple-method>
-
-    <simple-method method-name="processCustomerSettings" short-description="Process Customer Settings; to be called as a Request Event" login-required="false">
-        <set field="require_email" value="true"/>
-        <set field="require_phone" value="true"/>
-        <set field="require_login" value="false"/>
-        <set field="shipToPostalAddress" value="true"/>
-        <set field="billToPostalAddress" value="true"/>
-        <!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user -->
-        <set field="create_allow_password" value="true"/>
-
-        <set field="parameters.roleTypeId" value="CUSTOMER"/>
 
-        <call-simple-method method-name="createUpdateUser"/>
         <!-- see if we should continue now... -->
         <session-to-field field="cart" session-name="shoppingCart"/>
         <session-to-field field="userLogin"/>
@@ -517,7 +513,6 @@ under the License.
                     }
                 ]]></call-bsh>
             </if-not-empty>
-            <set from-field="partyId" field="partyId"/>
             <if-not-empty field="partyId">
                 <set field="lookupKeyValue.userLoginId" value="anonymous"/>
                 <find-by-primary-key map="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Sep 22 08:09:27 2014
@@ -470,7 +470,7 @@ under the License.
 
     <request-map uri="quickAnonProcessCustomerSettings">
         <security https="true" auth="false"/>
-        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processCustomerSettings"/>
+        <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="createUpdateCustomer"/>
         <response name="success" type="request" value="quickAnonOrderReview"/>
         <response name="error" type="view" value="quickAnonCustSetting"/>
     </request-map>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Mon Sep 22 08:09:27 2014
@@ -38,7 +38,7 @@ under the License.
     </#if>
     ${uiLabelMap.CommonInformation}
     <#if (orderHeader.orderId)??>
-      ${externalOrder!} [ <a href="<@ofbizUrl fullPath="true">order.pdf?orderId=${(orderHeader.orderId)!}</@ofbizUrl>" class="lightbuttontext">PDF</a> ]
+      ${externalOrder!} [ <a href="<@ofbizUrl fullPath="true">order.pdf?orderId=${(orderHeader.orderId)!}</@ofbizUrl>" target="_BLANK" class="lightbuttontext">PDF</a> ]
     </#if>
   </h3>
   <#-- placing customer information -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleEntityLabels.xml?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleEntityLabels.xml Mon Sep 22 08:09:27 2014
@@ -26,6 +26,7 @@
         <value xml:lang="ja">要望</value>
         <value xml:lang="th">ความต้องการ</value>
         <value xml:lang="zh">期望的</value>
+        <value xml:lang="zh_TW">期望的</value>
     </property>
     <property key="ExampleFeatureApplType.description.NOT_ALLOWED">
         <value xml:lang="en">Not Allowed</value>
@@ -34,6 +35,7 @@
         <value xml:lang="ja">不許可</value>
         <value xml:lang="th">ไม่อนุญาต</value>
         <value xml:lang="zh">不允许</value>
+        <value xml:lang="zh_TW">不允許</value>
     </property>
     <property key="ExampleFeatureApplType.description.REQUIRED">
         <value xml:lang="en">Required</value>
@@ -42,6 +44,7 @@
         <value xml:lang="ja">必須</value>
         <value xml:lang="th">ความต้องการ</value>
         <value xml:lang="zh">必须的</value>
+        <value xml:lang="zh_TW">必須的</value>
     </property>
     <property key="ExampleType.description.CONTRIVED">
         <value xml:lang="en">Contrived</value>
@@ -50,6 +53,7 @@
         <value xml:lang="ja">考案</value>
         <value xml:lang="th">เป็นไปตามที่วางแผนไว้</value>
         <value xml:lang="zh">人为的</value>
+        <value xml:lang="zh_TW">人為的</value>
     </property>
     <property key="ExampleType.description.INSPIRED">
         <value xml:lang="en">Inspired</value>
@@ -58,6 +62,7 @@
         <value xml:lang="ja">起因</value>
         <value xml:lang="th">ยอดเยี่ยม</value>
         <value xml:lang="zh">受启发的</value>
+        <value xml:lang="zh_TW">受啟發的</value>
     </property>
     <property key="ExampleType.description.MADE_UP">
         <value xml:lang="en">Made Up</value>
@@ -66,8 +71,9 @@
         <value xml:lang="ja">構築</value>
         <value xml:lang="th">ทำขึ้น</value>
         <value xml:lang="zh">制定</value>
+        <value xml:lang="zh_TW">制定</value>
     </property>
-    <!-- Example entity labels -->
+  <!-- Example entity labels -->
     <property key="ExampleType.description.REAL_WORLD">
         <value xml:lang="en">Real World</value>
         <value xml:lang="fr">Monde réel</value>
@@ -75,23 +81,21 @@
         <value xml:lang="ja">現実世界</value>
         <value xml:lang="th">สภาพที่เป็นจริง</value>
         <value xml:lang="zh">真实世界</value>
+        <value xml:lang="zh_TW">真實世界</value>
     </property>
-
-    <!-- Entity descriptions. The Web Tools component will use these properties
+  <!-- Entity descriptions. The Web Tools component will use these properties
         for online documentation. Entity description property keys have the form:
         EntityDescription.[entityname].
     -->
     <property key="EntityDescription.Example">
         <value xml:lang="en">Example Entity</value>
     </property>
-
-    <!-- Entity field descriptions. The Web Tools component will use these properties
+  <!-- Entity field descriptions. The Web Tools component will use these properties
         for online documentation. Field description property keys have two forms:
         FieldDescription.[fieldname] - will be used for all fields of that name
         FieldDescription.[entityname].[fieldname] - will be used for the specified
         entity field
     -->
-
     <property key="FieldDescription.Example.exampleId">
         <value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value>
         <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
@@ -99,6 +103,7 @@
         <value xml:lang="ja">固有サンプルID。IDを入力しない場合は、自動的に生成します。</value>
         <value xml:lang="th">รหัสตัวอย่าง ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
         <value xml:lang="zh">一个唯一的样例表示。如果你没有指定一个标识，那么会自动生成一个</value>
+        <value xml:lang="zh_TW">一個唯一的範例表示.如果你沒有指定一個識別,那麼會自動產生一個</value>
     </property>
     <property key="FieldDescription.ExampleItem.exampleItemSeqId">
         <value xml:lang="en">A unique Example Item sequence ID. If you don't assign an ID, one will be generated automatically</value>
@@ -107,6 +112,7 @@
         <value xml:lang="ja">固有サンプルアイテム連番ID。IDを入力しない場合は、自動的に生成します。</value>
         <value xml:lang="th">รหัสตัวอย่างสินค้า ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
         <value xml:lang="zh">一个唯一的样例明细序号。如果你没有指定一个标识，那么会自动生成一个</value>
+        <value xml:lang="zh_TW">一個唯一的範例細項序號.如果你沒有指定一個識別,那麼會自動產生一個</value>
     </property>
     <property key="FieldDescription.ExampleType.exampleTypeId">
         <value xml:lang="en">A unique Example Type ID. If you don't assign an ID, one will be generated automatically</value>
@@ -115,11 +121,13 @@
         <value xml:lang="ja">固有サンプル種類ID。IDを入力しない場合は、自動的に生成します。</value>
         <value xml:lang="th">รหัสตัวอย่างประเภท ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
         <value xml:lang="zh">一个唯一的样例类型序号。如果你没有指定一个标识，那么会自动生成一个</value>
+        <value xml:lang="zh_TW">一個唯一的範例類型序號.如果你沒有指定一個識別,那麼會自動產生一個</value>
     </property>
     <property key="FieldDescription.Example.exampleTypeId">
         <value xml:lang="en">The type of Example.</value>
         <value xml:lang="fr">Le type de l'exemple.</value>
         <value xml:lang="zh">样例类型。</value>
+        <value xml:lang="zh_TW">範例類型.</value>
     </property>
     <property key="FieldDescription.amount">
         <value xml:lang="de">Betrag</value>
@@ -130,6 +138,7 @@
         <value xml:lang="ro">Import</value>
         <value xml:lang="th">จำนวน</value>
         <value xml:lang="zh">金额</value>
+        <value xml:lang="zh_TW">金額</value>
     </property>
     <property key="FieldDescription.anotherDate">
         <value xml:lang="en">Another Date</value>
@@ -138,6 +147,8 @@
         <value xml:lang="ja">別の日</value>
         <value xml:lang="th">วันที่อื่น ๆ</value>
         <value xml:lang="zh">另一个日期</value>
+        <value xml:lang="zh_TW">另一個日期</value>
+        <value xml:lang="zh_TW">另一個日期</value>
     </property>
     <property key="FieldDescription.anotherText">
         <value xml:lang="en">Another Text</value>
@@ -146,6 +157,8 @@
         <value xml:lang="ja">別のテキスト</value>
         <value xml:lang="th">ตัวอักษรอื่น ๆ</value>
         <value xml:lang="zh">另一个文本</value>
+        <value xml:lang="zh_TW">另一個文本</value>
+        <value xml:lang="zh_TW">另一個本文</value>
     </property>
     <property key="FieldDescription.comments">
         <value xml:lang="de">Kommentare</value>
@@ -156,6 +169,8 @@
         <value xml:lang="ro">Comentarii</value>
         <value xml:lang="th">ความคิดเห็น</value>
         <value xml:lang="zh">评论</value>
+        <value xml:lang="zh_TW">評論</value>
+        <value xml:lang="zh_TW">評論</value>
     </property>
     <property key="FieldDescription.exampleDate">
         <value xml:lang="en">Example Date</value>
@@ -165,6 +180,7 @@
         <value xml:lang="ro">Data Exemplu</value>
         <value xml:lang="th">ตัวอย่างวันที่</value>
         <value xml:lang="zh">样例日期</value>
+        <value xml:lang="zh_TW">範例日期</value>
     </property>
     <property key="FieldDescription.exampleId">
         <value xml:lang="en">Example ID</value>
@@ -174,6 +190,7 @@
         <value xml:lang="ro">Cod Exemplu</value>
         <value xml:lang="th">รหัสตัวอย่าง</value>
         <value xml:lang="zh">样例标识</value>
+        <value xml:lang="zh_TW">範例識別</value>
     </property>
     <property key="FieldDescription.exampleItemSeqId">
         <value xml:lang="en">Example Item sequence ID</value>
@@ -182,6 +199,7 @@
         <value xml:lang="ja">サンプルアイテム連番ID</value>
         <value xml:lang="th">รหัสลำดับตัวอย่างสินค้า</value>
         <value xml:lang="zh">样例明细序号</value>
+        <value xml:lang="zh_TW">範例細項序號</value>
     </property>
     <property key="FieldDescription.exampleName">
         <value xml:lang="en">Example Name</value>
@@ -191,6 +209,7 @@
         <value xml:lang="ro">Nume Exemplu</value>
         <value xml:lang="th">ชื่อตัวอย่าง</value>
         <value xml:lang="zh">样例名称</value>
+        <value xml:lang="zh_TW">範例名稱</value>
     </property>
     <property key="FieldDescription.exampleSize">
         <value xml:lang="en">Example Size</value>
@@ -200,6 +219,7 @@
         <value xml:lang="ro">Marime-size Exemplu</value>
         <value xml:lang="th">ขนาดตัวอย่าง</value>
         <value xml:lang="zh">样例尺寸</value>
+        <value xml:lang="zh_TW">範例尺寸</value>
     </property>
     <property key="FieldDescription.exampleTypeId">
         <value xml:lang="en">Example Type ID</value>
@@ -208,6 +228,7 @@
         <value xml:lang="ja">サンプル種類ID</value>
         <value xml:lang="th">รหัสประเภทตัวอย่าง</value>
         <value xml:lang="zh">样例类型标识</value>
+        <value xml:lang="zh_TW">範例類型識別</value>
     </property>
     <property key="FieldDescription.longDescription">
         <value xml:lang="en">Long Description</value>
@@ -217,5 +238,6 @@
         <value xml:lang="ro">Descriere Lunga</value>
         <value xml:lang="th">รายละเอียด</value>
         <value xml:lang="zh">详细描述</value>
+        <value xml:lang="zh_TW">詳細描述</value>
     </property>
 </resource>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleHelpUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleHelpUiLabels.xml?rev=1626688&r1=1626687&r2=1626688&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleHelpUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/config/ExampleHelpUiLabels.xml Mon Sep 22 08:09:27 2014
@@ -25,5 +25,6 @@
         <value xml:lang="it">Un esempio di schermata di aiuto.</value>
         <value xml:lang="ja">ヘルプ画面のサンプル。</value>
         <value xml:lang="zh">帮助屏幕的样例</value>
+        <value xml:lang="zh_TW">説明螢幕的範例</value>
     </property>
 </resource>