Changeset 257

Timestamp:

02/28/08 17:18:41 (5 years ago)

Author:

d0nut

Message:

more paypal bugfixes

Location:

donation/optionals/de.easy-coding.wcf.donation.paypal

Files:

• acptemplates/donationPayPal.tpl (modified) (12 diffs)
• de.xml (modified) (1 diff)
• en.xml (modified) (2 diffs)
• files/lib/acp/form/DonationPayPalForm.class.php (modified) (1 diff)
• install.sql (modified) (1 diff)
• templates/donationPayPal.tpl (modified) (1 diff)

donation/optionals/de.easy-coding.wcf.donation.paypal/acptemplates/donationPayPal.tpl

@@ -1 +1 @@
 {include file='header'}
+<script type="text/javascript">
+//<![CDATA[
+var donationAmounts = new Array();
+function donationAmountSelect(val) {
+        for(var i=0; i<donationAmounts.length; i++) {
+                document.getElementById('donation_paypal_amount_'+donationAmounts[i]+'Div').style.display = (val == donationAmounts[i] ? 'block' : 'none');
+        }
+}
+//]]>
+</script>
 
 <div class="mainHeadline">
@@ -47 +57 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_businessHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.business.description{/lang}</p>
                 </div>
         </div>
@@ -65 +75 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_auth_tokenHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.auth_token.description{/lang}</p>
                 </div>
         </div>
@@ -83 +93 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_item_nameHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.item_name.description{/lang}</p>
                 </div>
         </div>
@@ -97 +107 @@
                 </div>
                 <div class="formField">
-                        <input type="text" class="inputText" id="donation_paypal_amount_type" name="values[donation_paypal_amount_type]" value="{@$paypal_amount_type}"/>
+                        <select id="donation_paypal_amount_type" name="values[donation_paypal_amount_type]" value="{@$paypal_amount_type}" onchange="donationAmountSelect(this.value)">
+                                <option value="hidden">{lang}wcf.donation.paypal.amount_type.hidden{/lang}</option>
+                                <option value="default">{lang}wcf.donation.paypal.amount_type.default{/lang}</option>
+                                <option value="select">{lang}wcf.donation.paypal.amount_type.select{/lang}</option>
+                        </select>
                 </div>
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_amount_typeHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.amount_type.description{/lang}</p>
                 </div>
         </div>
@@ -110 +124 @@
         </script>
         
-        <div id="donation_paypal_amount_defaultDiv" class="formElement">
+        <div id="donation_paypal_amount_defaultDiv" class="formElement" style="display:none">
                 <div class="formFieldLabel">
                         <label for="donation_paypal_amount_default">{lang}wcf.donation.paypal.amount_default{/lang}</label>
@@ -119 +133 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_amount_defaultHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.amount_default.description{/lang}</p>
                 </div>
         </div>
@@ -125 +139 @@
         //<![CDATA[
         inlineHelp.register('donation_paypal_amount_default');
-        //]]>
-        </script>
-        
-        <div id="donation_paypal_amount_selectDiv" class="formElement">
+        donationAmounts.push('default');
+        //]]>
+        </script>
+        
+        <div id="donation_paypal_amount_selectDiv" class="formElement" style="display:none">
                 <div class="formFieldLabel">
                         <label for="donation_paypal_amount_select">{lang}wcf.donation.paypal.amount_select{/lang}</label>
@@ -137 +152 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_amount_selectHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.amount_select.description{/lang}</p>
                 </div>
         </div>
@@ -143 +158 @@
         //<![CDATA[
         inlineHelp.register('donation_paypal_amount_select');
-        //]]>
-        </script>
-        
-        <div id="donation_paypal_lcDiv" class="formElement">
-                <div class="formFieldLabel">
-                        <label for="donation_paypal_lc">{lang}wcf.donation.paypal.lc{/lang}</label>
-                </div>
-                <div class="formField">
-                        <input type="text" class="inputText" id="donation_paypal_lc" name="values[donation_paypal_lc]" value="{@$paypal_lc}"/>
-                </div>
-                        
-                <div class="formFieldDesc hidden" id="donation_paypal_lcHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
-                </div>
-        </div>
-        <script type="text/javascript">
-        //<![CDATA[
-        inlineHelp.register('donation_paypal_lc');
+        donationAmounts.push('select');
         //]]>
         </script>
@@ -173 +171 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_currencyHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.currency.description{/lang}</p>
                 </div>
         </div>
@@ -191 +189 @@
                         
                 <div class="formFieldDesc hidden" id="donation_paypal_imgHelpMessage">
-                        <p>{lang}wcf.donation.paypal.code.description{/lang}</p>
+                        <p>{lang}wcf.donation.paypal.img.description{/lang}</p>
                 </div>
         </div>

donation/optionals/de.easy-coding.wcf.donation.paypal/de.xml

@@ -14 +14 @@
                 <item name="wcf.donation.paypal.code"><![CDATA[Code]]></item>
                 <item name="wcf.donation.paypal.code.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.business"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.business"><![CDATA[PayPal E-Mail]]></item>
                 <item name="wcf.donation.paypal.business.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.auth_token"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.auth_token"><![CDATA[IdentitÀtstoken]]></item>
                 <item name="wcf.donation.paypal.auth_token.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.item_name"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.item_name"><![CDATA[Titel]]></item>
                 <item name="wcf.donation.paypal.item_name.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.amount_type"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.amount_type"><![CDATA[Betrag]]></item>
+                <item name="wcf.donation.paypal.amount_type.hidden"><![CDATA[Versteckt]]></item>
+                <item name="wcf.donation.paypal.amount_type.default"><![CDATA[Benutzer entscheidet]]></item>
+                <item name="wcf.donation.paypal.amount_type.select"><![CDATA[Wahl zwischen BetrÀgen]]></item>
                 <item name="wcf.donation.paypal.amount_type.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.amount_default"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.amount_default.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.amount_select"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.amount_select.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.lc"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.lc.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.currency"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.amount_default"><![CDATA[Standardbetrag]]></item>
+                <item name="wcf.donation.paypal.amount_default.description"><![CDATA[Der Benutzer kann eine Eingabe machen. Geben Sie hier die Vorbelegung ein.]]></item>
+                <item name="wcf.donation.paypal.amount_select"><![CDATA[Wahl zwischen BetrÀgen]]></item>
+                <item name="wcf.donation.paypal.amount_select.description"><![CDATA[Geben Sie hier eine kommaseparierte Liste mit BetrÀgen an.]]></item>
+                <item name="wcf.donation.paypal.currency"><![CDATA[WÀhrung]]></item>
                 <item name="wcf.donation.paypal.currency.description"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.img"><![CDATA[]]></item>

donation/optionals/de.easy-coding.wcf.donation.paypal/en.xml

@@ -21 +21 @@
                 <item name="wcf.donation.paypal.item_name.description"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.amount_type"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.amount_type.hidden"><![CDATA[Fixed amount]]></item>
+                <item name="wcf.donation.paypal.amount_type.input"><![CDATA[User can decide]]></item>
+                <item name="wcf.donation.paypal.amount_type.select"><![CDATA[User must choose]]></item>
                 <item name="wcf.donation.paypal.amount_type.description"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.amount_default"><![CDATA[]]></item>
@@ -26 +29 @@
                 <item name="wcf.donation.paypal.amount_select"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.amount_select.description"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.lc"><![CDATA[]]></item>
-                <item name="wcf.donation.paypal.lc.description"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.currency"><![CDATA[]]></item>
                 <item name="wcf.donation.paypal.currency.description"><![CDATA[]]></item>

donation/optionals/de.easy-coding.wcf.donation.paypal/files/lib/acp/form/DonationPayPalForm.class.php

@@ -15 +15 @@
         
         //data
-        protected $arr = array('paypal_enable', 'paypal_business', 'paypal_auth_token', 'paypal_item_name', 'paypal_amount_type', 'paypal_amount_default', 'paypal_amount_select', 'paypal_lc', 'paypal_currency', 'paypal_img');
+        protected $arr = array('paypal_enable', 'paypal_business', 'paypal_auth_token', 'paypal_item_name', 'paypal_amount_type', 'paypal_amount_default', 'paypal_amount_select', 'paypal_currency', 'paypal_img');
         
         /**

donation/optionals/de.easy-coding.wcf.donation.paypal/install.sql

@@ -6 +6 @@
 INSERT INTO wcf1_donation_option (optionName, optionValue) VALUES ('paypal_amount_default','');
 INSERT INTO wcf1_donation_option (optionName, optionValue) VALUES ('paypal_amount_select','');
-INSERT INTO wcf1_donation_option (optionName, optionValue) VALUES ('paypal_lc','DE');
 INSERT INTO wcf1_donation_option (optionName, optionValue) VALUES ('paypal_currency','EUR');
 INSERT INTO wcf1_donation_option (optionName, optionValue) VALUES ('paypal_img','https://www.paypal.com/de_DE/i/btn/x-click-but04.gif');

donation/optionals/de.easy-coding.wcf.donation.paypal/templates/donationPayPal.tpl

@@ -13 +13 @@
                 <input type="hidden" name="currency_code" value="{$paypal_currency}"/>
                 <input type="hidden" name="tax" value="0"/>
-                <input type="hidden" name="lc" value="{$paypal_lc}"/>
                 <input type="hidden" name="bn" value="PP-DonationsBF"/>
                 {if paypal_amount_type == "hidden"}
                 <input type="hidden" name="amount" value="{$paypal_amount_default}"/>
-                {elseif paypal_amount_type == "input"}
+                {elseif paypal_amount_type == "default"}
                 <input type="text" name="amount" value="{$paypal_amount_default}"/> {$paypal_currency}
                 {elseif paypal_amount_type == "select"}