OFBiz › OFBiz - Commits

svn commit: r1846227 - in /ofbiz/ofbiz-framework/trunk: ./ applications/accounting/config/ applications/accounting/minilang/payment/ applications/accounting/servicedef/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1846227 - in /ofbiz/ofbiz-framework/trunk: ./ applications/accounting/config/ applications/accounting/minilang/payment/ applications/accounting/servicedef/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/...

jleroux@apache.org
Author: jleroux
Date: Fri Nov  9 10:20:10 2018
New Revision: 1846227

URL: http://svn.apache.org/viewvc?rev=1846227&view=rev
Log:
Improved: Create patch for removal of IDEAL code in framework
(OFBIZ-5444)

Removes all iDEAL specifics from the framework (actually only applications)

Thanks: Pierre Smits

Removed:
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/readme
Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
    ofbiz/ofbiz-framework/trunk/applications/accounting/config/paymentTest.properties
    ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_paymentgateway.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/paymenttests.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
    ofbiz/ofbiz-framework/trunk/build.gradle

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Fri Nov  9 10:20:10 2018
@@ -780,67 +780,6 @@
         <value xml:lang="en">No authentification result available. Payment preference can't be checked.</value>
         <value xml:lang="de">Es ist kein Authentifizierungsergebnis vorhanden. Die Zahlungsmethode kann nicht überprüft werden.</value>
     </property>
-    <property key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference">
-        <value xml:lang="ar">فشل في تنفيذ خدمة CreatePaymentFromPreference</value>
-        <value xml:lang="de">Ausführen des Service CreatePaymentFromPreference fehlgeschlagen</value>
-        <value xml:lang="en">Failed To Execute Service CreatePaymentFromPreference</value>
-        <value xml:lang="fr">Échec sur l'execution du service de création d'un payment suivant les préférence (CreatePaymentFromPreference)</value>
-        <value xml:lang="hi-IN">सर्विस CreatePaymentFromPreference पर अमल(execute) करने में असफल</value>
-        <value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value>
-        <value xml:lang="zh">执行从设置创建支付（CreatePaymentFromPreference）这个服务时出错</value>
-        <value xml:lang="zh-TW">執行從偏好新建支付(CreatePaymentFromPreference)這個服務時出錯</value>
-    </property>
-    <property key="idealEvents.noValidOrderIdReturned">
-        <value xml:lang="ar">لا يوجد أمر بيع/شراء صحيح مسترجع</value>
-        <value xml:lang="de">Es wurde keine gültige BestellId zurückgegeben</value>
-        <value xml:lang="en">No Valid OrderId Returned</value>
-        <value xml:lang="fr">Référence commande retournée n'est pas valide</value>
-        <value xml:lang="hi-IN">मान्य OrderId वापस नहीं लौटा</value>
-        <value xml:lang="it">Nessun numero ordine restituito</value>
-        <value xml:lang="zh">返回的订单标识无效</value>
-        <value xml:lang="zh-TW">返回的訂單標識無效</value>
-    </property>
-    <property key="idealEvents.problemsConnectingWithIdeal">
-        <value xml:lang="de">Probleme bei der Verbindung zu iDEAL</value>
-        <value xml:lang="en">Problems Connecting With iDEAL</value>
-        <value xml:lang="fr">Problème rencontré dans la connexion avec iDEAL</value>
-        <value xml:lang="hi-IN">iDEAL के साथ जोड़ने में समस्या</value>
-        <value xml:lang="it">Problema nella connessione con iDEAL</value>
-        <value xml:lang="zh">连接 iDEAL 时出错</value>
-        <value xml:lang="zh-TW">連接 iDEAL 時出錯</value>
-    </property>
-    <property key="idealEvents.problemsGettingAuthenticationUser">
-        <value xml:lang="ar">مشاكل في مصادقة المستخدم</value>
-        <value xml:lang="de">Probleme beim Ermitteln des berechtigten Benutzers</value>
-        <value xml:lang="en">Problems Getting Authentication User</value>
-        <value xml:lang="fr">Problème sur l'authentification de l'utilisateur</value>
-        <value xml:lang="hi-IN">उपयोगकर्ता(user) के प्रमाणीकरण में समस्याएँ हो रही</value>
-        <value xml:lang="it">Problema durante l'autenticazione utente</value>
-        <value xml:lang="zh">获取认证用户时出错</value>
-        <value xml:lang="zh-TW">獲取認證使用者時出錯</value>
-    </property>
-    <property key="idealEvents.problemsGettingMerchantConfiguration">
-        <value xml:lang="ar">مشاكل في ترتيبات التاجر</value>
-        <value xml:lang="de">Probleme beim Ermitteln der Verkaufs-Konfiguration</value>
-        <value xml:lang="en">Problems Getting Merchant Configuration</value>
-        <value xml:lang="fr">Problème de récupération de la configuration marchand</value>
-        <value xml:lang="hi-IN">व्यापारी विन्यास में समस्याएँ हो रही</value>
-        <value xml:lang="it">Problema nel ricavare la configurazione del negoziante</value>
-        <value xml:lang="ja">マーチャント設定の取得時にエラー</value>
-        <value xml:lang="zh">获取商户配置时出错</value>
-        <value xml:lang="zh-TW">獲取商戶配置時出錯</value>
-    </property>
-    <property key="idealEvents.problemsGettingOrderHeader">
-        <value xml:lang="ar">مشاكل في رأس أمر البيع/الشراء</value>
-        <value xml:lang="de">Probleme beim Ermitteln des Bestellkopfs</value>
-        <value xml:lang="en">Problems Getting OrderHeader</value>
-        <value xml:lang="fr">Problème de récupération de la commande</value>
-        <value xml:lang="hi-IN">OrderHeader में समस्याएँ हो रही</value>
-        <value xml:lang="it">Problema nel ricavare la testata ordine</value>
-        <value xml:lang="ja">注文ヘッダ取得時にエラー</value>
-        <value xml:lang="zh">获取订单头时出错</value>
-        <value xml:lang="zh-TW">獲取訂單頭時出錯</value>
-    </property>
     <property key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="ar">فشل في تنفيذ خدمة createPaymentFromPreference</value>
         <value xml:lang="de">Der Service createPaymentFromPreference konnte nicht ausgeführt werden</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Nov  9 10:20:10 2018
@@ -10686,35 +10686,6 @@
         <value xml:lang="zh">覆盖收入总账账户标识</value>
         <value xml:lang="zh-TW">覆蓋收入總帳科目識別</value>
     </property>
-    <property key="AccountingPaymentReceiveViaiDEAL">
-        <value xml:lang="de">Zahlung über iDEAL erhalten</value>
-        <value xml:lang="en">Payment receive via iDEAL</value>
-        <value xml:lang="fr">Paiement reçu par iDEAL</value>
-        <value xml:lang="hi-IN">भुगतान iDEAL के माध्यम से प्राप्त</value>
-        <value xml:lang="it">Pagamento ricevuto da iDEAL</value>
-        <value xml:lang="ja">iDEAL経由で支払を受取</value>
-        <value xml:lang="nl">Betalingsontvangst via iDEAL</value>
-        <value xml:lang="vi">Thanh toán nhận qua iDEAL</value>
-        <value xml:lang="zh">通过iDEAL接收到的支付</value>
-        <value xml:lang="zh-TW">通過iDEAL接收到的支付</value>
-    </property>
-    <property key="AccountingPayWithiDEAL">
-        <value xml:lang="cs">Platba prostřednictvím iDEAL</value>
-        <value xml:lang="de">Bezahlung mit iDEAL</value>
-        <value xml:lang="en">Pay With iDEAL</value>
-        <value xml:lang="es">Pagar con iDEAL</value>
-        <value xml:lang="fr">Paiement avec iDEAL</value>
-        <value xml:lang="it">Paga con iDEAL</value>
-        <value xml:lang="ja">iDEALで支払</value>
-        <value xml:lang="nl">Betaal met iDEAL</value>
-        <value xml:lang="pt-PT">&gt;Pagar Com iDEAL</value>
-        <value xml:lang="ro">Plateste cu iDEAL</value>
-        <value xml:lang="ru">Платить через iDEAL</value>
-        <value xml:lang="th">ชำระเงินผ่าน iDEAL</value>
-        <value xml:lang="vi">Chi trả với iDEAL</value>
-        <value xml:lang="zh">用iDEAL支付</value>
-        <value xml:lang="zh-TW">用iDEAL支付</value>
-    </property>
     <property key="AccountingPIN">
         <value xml:lang="ar">الرمز السري</value>
         <value xml:lang="de">PIN</value>
@@ -21712,16 +21683,6 @@
         <value xml:lang="zh">本年贷方余额</value>
         <value xml:lang="zh-TW">本年貸方餘額</value>
     </property>
-    <property key="IdealSuccessful">
-        <value xml:lang="de">Die Transaktion war erfolgreich.</value>
-        <value xml:lang="en">The transaction has been successful.</value>
-        <value xml:lang="fr">La transaction a été réussie.</value>
-        <value xml:lang="ja">トランザクションは成功しました。</value>
-        <value xml:lang="nl">De betaling is met succes ontvangen.</value>
-        <value xml:lang="vi">Bút toán đã thành công.</value>
-        <value xml:lang="zh">交易成功了。</value>
-        <value xml:lang="zh-TW">交易成功了.</value>
-    </property>
     <property key="FormFieldTitle_yearToDateBalanceDebit">
         <value xml:lang="ar">رصيد المدين لسنة من تاريخه</value>
         <value xml:lang="de">Jahr heutiger Saldo Soll</value>
@@ -23686,17 +23647,6 @@
         <value xml:lang="zh">更新eWay支付网关配置</value>
         <value xml:lang="zh-TW">更新eWay支付閘道配置</value>
     </property>
-    <property key="PageTitleUpdatePaymentGatewayConfigiDEAL">
-        <value xml:lang="de">Bezahl-Schnittstelle iDEAL aktualisieren</value>
-        <value xml:lang="en">Update Payment Gateway Config iDEAL</value>
-        <value xml:lang="fr">Mise à jour de la configuration de l'interface iDEAL</value>
-        <value xml:lang="hi-IN">भुगतान गेटवे विन्यास iDEAL उन्नत करे</value>
-        <value xml:lang="it">Aggiorna configurazione gateway pagamento iDEAL</value>
-        <value xml:lang="ja">iDEAL支払ゲートウェイ設定を更新</value>
-        <value xml:lang="vi">Cập nhật cấu hình cổng thanh toán iDEAL</value>
-        <value xml:lang="zh">更新iDEAL支付网关配置</value>
-        <value xml:lang="zh-TW">更新iDEAL支付閘道配置</value>
-    </property>
     <property key="PageTitleUpdatePaymentGatewayConfigPayPal">
         <value xml:lang="de">Bezahl-Schnittstelle PayPal aktualisieren</value>
         <value xml:lang="en">Update Payment Gateway Config PayPal</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties Fri Nov  9 10:20:10 2018
@@ -409,51 +409,3 @@ payment.securepay.serverurl=https://api.
 
 #Enable rounds the currency amount to .00 (Y For test server / N for live server)
 payment.securepay.enableamountround=N
-
-############################################
-# iDEAL Configuration
-############################################
-
-## Account information
-# Id van de webshop, door de acceptant te verkrijgen via het iDEAL Dashboard
-merchantId=
-
-# Sub Id van de webshop, alleen te wijzigen na overleg met de acquirer
-merchantSubId=0
-
-# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de iDEAL transactie
-#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
-merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
-
-## acquirer attributes
-# URL van de acquirer van de acceptant; niet wijzigen
-# https://idealtest.secure-ing.com/ideal/iDeal voor test
-# https://ideal.secure-ing.com/ideal/iDeal voor productie
-acquirerURL=https://idealtest.secure-ing.com/ideal/iDeal
-
-# Connection timeout in seconds
-# Default:10 seconds
-acquirerTimeout=10
-
-# Vervaltijd per transactie; zie paragraaf 3.3.1 van het document
-# iDEAL_010 standaarden voor de toegestane waarden en de default
-# Default: If not set the issuer will use the default value of PT1H (one hour)
-expirationPeriod=PT1H
-
-## crypto attributes
-# Naam van de acceptant-organisatie zoals opgegeven tijdens
-# de creatie van het certificaat
-privateCert=
-
-# Keystore File and Password of the merchant certificate
-# used for signing requests. See Ideal Advanced Java
-# integration manual for details.
-# Note: file must be available on the classpath!
-merchantKeyStoreFilename=
-merchantKeyStorePassword=
-
-# Truststore File and Password with the acquirer public
-# key used for verifying acquirer responses.
-# Note: file must be available on the classpath!
-acquirerKeyStoreFilename=acquirer.keystore
-acquirerKeyStorePassword={xor}MiYPPiwsKDAtOw==

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/config/paymentTest.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/paymentTest.properties?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/config/paymentTest.properties (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/config/paymentTest.properties Fri Nov  9 10:20:10 2018
@@ -65,51 +65,3 @@ payment.securepay.serverurl=https://test
 
 #Enable rounds the currency amount to .00 (Y For test server / N for live server)
 payment.securepay.enableamountround=Y
-
-############################################
-# iDEAL Test Configuration
-############################################
-
-## Account information
-# Id van de webshop, door de acceptant te verkrijgen via het iDEAL Dashboard
-merchantId=xxxxxxx
-
-# Sub Id van de webshop, alleen te wijzigen na overleg met de acquirer
-merchantSubId=0
-
-# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de iDEAL transactie
-#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
-merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
-
-## acquirer attributes
-# URL van de acquirer van de acceptant; niet wijzigen
-# https://idealtest.secure-ing.com/ideal/iDeal voor test
-# https://ideal.secure-ing.com/ideal/iDeal voor productie
-acquirerURL=https://idealtest.secure-ing.com/ideal/iDeal
-
-# Connection timeout in seconds
-# Default:10 seconds
-acquirerTimeout=10
-
-# Vervaltijd per transactie; zie paragraaf 3.3.1 van het document
-# iDEAL_010 standaarden voor de toegestane waarden en de default
-# Default: If not set the issuer will use the default value of PT1H (one hour)
-expirationPeriod=PT1H
-
-## crypto attributes
-# Naam van de acceptant-organisatie zoals opgegeven tijdens
-# de creatie van het certificaat
-privateCert=acquirer.keystore
-
-# Keystore File and Password of the merchant certificate
-# used for signing requests. See Ideal Advanced Java
-# integration manual for details.
-# Note: file must be available on the classpath!
-merchantKeyStoreFilename=merchant.keystore
-merchantKeyStorePassword=xxxxxxx
-
-# Truststore File and Password with the acquirer public
-# key used for verifying acquirer responses.
-# Note: file must be available on the classpath!
-acquirerKeyStoreFilename=acquirer.keystore
-acquirerKeyStorePassword=xxxxxxx

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml Fri Nov  9 10:20:10 2018
@@ -56,10 +56,4 @@ under the License.
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
-
-    <simple-method method-name="updatePaymentGatewayConfigiDEAL" short-description="Update Payment Gateway Config iDEAL">
-        <entity-one entity-name="PaymentGatewayiDEAL" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
 </simple-methods>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_paymentgateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_paymentgateway.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_paymentgateway.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_paymentgateway.xml Fri Nov  9 10:20:10 2018
@@ -125,10 +125,4 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    
-    <service name="updatePaymentGatewayConfigiDEAL" engine="simple" location="component://accounting/minilang/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigiDEAL">
-        <description>Update Payment Gateway Config iDEAL</description>
-        <auto-attributes entity-name="PaymentGatewayiDEAL" include="pk" mode="IN" optional="false"/>
-        <auto-attributes entity-name="PaymentGatewayiDEAL" include="nonpk" mode="IN" optional="true"/>
-    </service>
 </services>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/paymenttests.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/paymenttests.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/paymenttests.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/paymenttests.xml Fri Nov  9 10:20:10 2018
@@ -30,10 +30,4 @@
     <!-- test-case case-name="cc-tests">
         <junit-test-suite class-name="org.apache.ofbiz.accounting.thirdparty.securepay.SecurePayServiceTest"/>
     </test-case-->
-    
-    <!-- enable when you get acquirer.keystore, merchant.crt, merchant.keystore from sandbox and copy to /applications/accounting/config and configured -->
-    <!-- <test-case case-name="ideal-payment-tests">
-        <junit-test-suite class-name="org.apache.ofbiz.accounting.thirdparty.ideal.IdealPaymentServiceTest"/>
-    </test-case>-->
-    
 </test-suite>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Nov  9 10:20:10 2018
@@ -582,12 +582,6 @@ under the License.
         <response name="success" type="view" value="EditPaymentGatewayConfig"/>
         <response name="error" type="view" value="EditPaymentGatewayConfig"/>
     </request-map>
-    <request-map uri="UpdatePaymentGatewayConfigiDEAL">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePaymentGatewayConfigiDEAL"/>
-        <response name="success" type="view" value="EditPaymentGatewayConfig"/>
-        <response name="error" type="view" value="EditPaymentGatewayConfig"/>
-    </request-map>
 
     <!-- transaction action requests -->
     <request-map uri="processAuthorizeTransaction">

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Fri Nov  9 10:20:10 2018
@@ -471,12 +471,4 @@ under the License.
             <submit button-type="button"/>
         </field>
     </form>
-    
-    <form name="EditPaymentGatewayConfigiDEAL" type="single" target="UpdatePaymentGatewayConfigiDEAL" default-map-name="paymentGatewayiDEAL" header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-entity entity-name="PaymentGatewayiDEAL" default-field-type="edit"/>
-        <field name="paymentGatewayConfigId"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </field>
-    </form>
 </forms>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Fri Nov  9 10:20:10 2018
@@ -114,9 +114,6 @@ under the License.
                 <entity-one entity-name="PaymentGatewaySecurePay" value-field="paymentGatewaySecurePay">
                     <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
                 </entity-one>
-                <entity-one entity-name="PaymentGatewayiDEAL" value-field="paymentGatewayiDEAL">
-                    <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
-                </entity-one>
             </actions>
             <widgets>
                 <decorator-screen name="GenericPaymentGatewayConfigDecorator">
@@ -225,16 +222,6 @@ under the License.
                                 </screenlet>
                             </widgets>
                         </section>
-                        <section>
-                            <condition>
-                                <not><if-empty field="paymentGatewayiDEAL"/></not>
-                            </condition>
-                            <widgets>
-                                <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigiDEAL}">
-                                    <include-form name="EditPaymentGatewayConfigiDEAL" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/>
-                                </screenlet>
-                            </widgets>
-                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml Fri Nov  9 10:20:10 2018
@@ -131,9 +131,6 @@ under the License.
     <PaymentGatewayConfig paymentGatewayConfigId="SECUREPAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_SECUREPAY" description="SecurePay Config"/>
     <PaymentGatewaySecurePay paymentGatewayConfigId="SECUREPAY_CONFIG" merchantId="[SecurePay MerchantID]" pwd="[SecurePay Password]" serverURL="[SecurePay serverURL]" processTimeout="80" enableAmountRound="N"/>
 
-    <PaymentGatewayConfig paymentGatewayConfigId="IDEAL_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_IDEAL" description="iDEAL Config"/>
-    <PaymentGatewayiDEAL paymentGatewayConfigId="IDEAL_CONFIG" merchantId="[iDEAL MerchantID]" merchantSubId="[iDEAL MerchantSubID]" merchantReturnURL="[iDEAL MerchantReturnURL]" acquirerURL="[iDEAL AcquirerURL]" acquirerTimeout="10" privateCert="[iDEAL PrivateCert]" acquirerKeyStoreFilename="[iDEAL AcquirerKeyStoreFilename]" acquirerKeyStorePassword="[iDEAL AcquirerKeyStorePassword]" merchantKeyStoreFilename="[iDEAL MerchantKeyStoreFilename]" merchantKeyStorePassword="[iDEAL MerchantKeyStorePassword]" expirationPeriod="[iDEAL ExpirationPeriod]"/>
-
     <!-- General Chart of Accounts Demo Data -->
     <GlAccount glAccountId="100000" accountCode="100000"
                glAccountClassId="ASSET" glResourceTypeId="MONEY"

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml Fri Nov  9 10:20:10 2018
@@ -702,7 +702,6 @@ under the License.
     <PaymentMethodType description="Offline Payment" paymentMethodTypeId="EXT_OFFLINE"/>
     <PaymentMethodType description="PayPal" paymentMethodTypeId="EXT_PAYPAL"/>
     <PaymentMethodType description="RBS WorldPay" paymentMethodTypeId="EXT_WORLDPAY"/>
-    <PaymentMethodType description="iDEAL" paymentMethodTypeId="EXT_IDEAL"/>
 
     <PaymentType description="Disbursement" hasTable="N" paymentTypeId="DISBURSEMENT"/>
     <PaymentType description="Customer Refund" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="CUSTOMER_REFUND"/> <!-- a refund TO the customer -->
@@ -1135,8 +1134,7 @@ under the License.
     <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAY_GATWY_WORLDPAY" hasTable="Y" description="Payment Gateway RBS WorldPay"/>
     <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAY_GATWY_ORBITAL" hasTable="Y" description="Payment Gateway Orbital"/>
     <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAY_GATWY_SECUREPAY" hasTable="Y" description="Payment Gateway SecurePay"/>
-    <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAY_GATWY_IDEAL" hasTable="Y" description="Payment Gateway iDEAL"/>
-
+    
     <!-- US Tax Account Groups -->
     <GlAccountGroupType glAccountGroupTypeId="TAX_FIELD_US" description="Tax Form Field: USA"/>
 

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Fri Nov  9 10:20:10 2018
@@ -3719,27 +3719,6 @@ under the License.
         <key-map field-name="paymentGatewayConfigId"/>
       </relation>
     </entity>
-    <entity entity-name="PaymentGatewayiDEAL"
-            package-name="org.apache.ofbiz.accounting.payment"
-            title="iDEAL Payment Gateway Config">
-      <field name="paymentGatewayConfigId" type="id"></field>
-      <field name="merchantId" type="value"><description>The ID of the webshop, received by the acceptor during the registration process</description></field>
-      <field name="merchantSubId" type="value"><description>SubID of the webshop, default value = 0 (zero); only to be changed in consultation with the acquirer</description></field>
-      <field name="merchantReturnURL" type="value"><description>URL of the page in the webshop to which the consumer is redirected after an iDEAL transaction. This value can be overruled as necessary in the webshop implementation</description></field>
-      <field name="acquirerURL" type="value"><description>URL of the acceptor’s acquirer; the following prescribed values apply to ING</description></field>
-      <field name="acquirerTimeout" type="value"><description>Number of seconds (default = 10) of waiting time for a response from the iDEAL services. If no response is received during that time, an exception is displayed</description></field>
-      <field name="privateCert" type="value"><description>Name of the acceptor’s organization as given during the creation of his or her own certificate. See section 0 for more information about the acceptor’s certificate</description></field>
-      <field name="acquirerKeyStoreFilename" type="value"><description>Keystore file and acquirer’s password</description></field>
-      <field name="acquirerKeyStorePassword" type="value" encrypt="true"><description>Password of the Acquirer keystore</description></field>
-      <field name="merchantKeyStoreFilename" type="value"><description>Keystore file and merchant’s password</description></field>
-      <field name="merchantKeyStorePassword" type="value" encrypt="true"><description>Password of the Merchant keystore</description></field>
-      <field name="expirationPeriod" type="value"><description>Expiration period of the transaction</description></field>
-      <prim-key field="paymentGatewayConfigId"/>
-      <relation type="one" fk-name="PGID_PGC" rel-entity-name="PaymentGatewayConfig">
-        <key-map field-name="paymentGatewayConfigId"/>
-      </relation>
-    </entity>
-    
     <entity entity-name="PaymentGatewayRespMsg"
             package-name="org.apache.ofbiz.accounting.payment"
             title="Payment Gateway Response Message">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy Fri Nov  9 10:20:10 2018
@@ -53,21 +53,4 @@ if (billingAccountList) {
     context.billingAccountList = billingAccountList
 }
 
-checkIdealPayment = false
-productStore = ProductStoreWorker.getProductStore(request)
-productStorePaymentSettingList = productStore.getRelated("ProductStorePaymentSetting", null, null, true)
-productStorePaymentSettingIter = productStorePaymentSettingList.iterator()
-while (productStorePaymentSettingIter.hasNext()) {
-    productStorePaymentSetting = productStorePaymentSettingIter.next()
-    if (productStorePaymentSetting.get("paymentMethodTypeId") == "EXT_IDEAL") {
-        checkIdealPayment = true
-    }
-    
-}
 
-if (checkIdealPayment) {
-    issuerList = org.apache.ofbiz.accounting.thirdparty.ideal.IdealEvents.getIssuerList()
-    if (issuerList) {
-        context.issuerList = issuerList
-    }
-}

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl Fri Nov  9 10:20:10 2018
@@ -56,31 +56,6 @@ function submitForm(form, mode, value) {
         form.submit();
 }
 //]]>
-$(document).ready(function(){
-var issuerId = "";
-    if ($('#checkOutPaymentId_IDEAL').attr('checked') == true) {
-        $('#issuers').show();
-        issuerId = $('#issuer').val();
-        $('#issuerId').val(issuerId);
-    } else {
-        $('#issuers').hide();
-        $('#issuerId').val('');
-    }
-    $('input:radio').click(function(){
-        if ($(this).val() == "EXT_IDEAL") {
-            $('#issuers').show();
-            issuerId = $('#issuer').val();
-            $('#issuerId').val(issuerId);
-        } else {
-            $('#issuers').hide();
-            $('#issuerId').val('');
-        }
-    });
-    $('#issuer').change(function(){
-        issuerId = $(this).val();
-        $('#issuerId').val(issuerId);
-    });
-});
 </script>
 
 

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1846227&r1=1846226&r2=1846227&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Fri Nov  9 10:20:10 2018
@@ -203,8 +203,6 @@ dependencies {
 
 def excludedJavaSources = [
     'org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java',
-    'org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java',
-    'org/apache/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java',
     'org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java',
     'org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java',
     'org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java',


Free forum by Nabble Edit this page