svn commit: r1846229 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/order/CheckoutPayment.ftl webapp/ecommerce/WEB-INF/controller.xml

Author: jleroux
Date: Fri Nov  9 10:30:52 2018
New Revision: 1846229

URL: http://svn.apache.org/viewvc?rev=1846229&view=rev
Log:
Improved: Have eCommerce component reflect the new situation re iDEAL
(OFBIZ-5445)

Remove IDEAL related code from the ecommerce component.

When the IDEAL solution isn't part of the accounting component, the code in
ecommerce should be removed as well.

Thanks: Pierre Smits

Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl?rev=1846229&r1=1846228&r2=1846229&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl Fri Nov  9 10:30:52 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>
 
 
@@ -134,24 +109,6 @@ var issuerId = "";
                   ${uiLabelMap.AccountingPayWithPayPal}</label>
               </div>
               </#if>
-              <#if productStorePaymentMethodTypeIdMap.EXT_IDEAL??>
-              <div class="form-check">
-                  <label class="form-check-label" for="checkOutPaymentId_IDEAL">
-                  <input class="form-check-input" type="radio" id="checkOutPaymentId_IDEAL" name="checkOutPaymentId" value="EXT_IDEAL" <#if "EXT_IDEAL" == checkOutPaymentId>checked="checked"</#if> />
-                  ${uiLabelMap.AccountingPayWithiDEAL}</label>
-              </div>
-
-              <div id="issuers">
-              <div><label >${uiLabelMap.AccountingBank}</label></div>
-                <select name="issuer" id="issuer">
-                <#if issuerList?has_content>
-                    <#list issuerList as issuer>
-                        <option value="${issuer.getIssuerID()}" >${issuer.getIssuerName()}</option>
-                    </#list>
-                </#if>
-              </select>
-              </div>
-              </#if>
               <hr>
               <#if !paymentMethodList?has_content>
               <div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1846229&r1=1846228&r2=1846229&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri Nov  9 10:30:52 2018
@@ -754,7 +754,6 @@ under the License.
         <response name="paypal" type="request" value="callPayPal"/>
         <response name="billact" type="request" value="emailorder"/>
         <response name="cod" type="request" value="emailorder"/>
-        <response name="ideal" type="request" value="callIdeal"/>
         <response name="error" type="view" value="checkoutreview"/>
     </request-map>
 
@@ -796,18 +795,6 @@ under the License.
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
-    <request-map uri="callIdeal">
-        <security https="true" direct-request="false"/>
-        <event type="java" path="org.apache.ofbiz.accounting.thirdparty.ideal.IdealEvents" invoke="callIdeal"/>
-        <response name="success" type="none"/>
-        <response name="error" type="view" value="checkoutreview"/>
-    </request-map>
-    <request-map uri="idealNotify">
-        <security https="false"/>
-        <event type="java" path="org.apache.ofbiz.accounting.thirdparty.ideal.IdealEvents" invoke="idealNotify"/>
-        <response name="success" type="view" value="ordercomplete"/>
-        <response name="error" type="view" value="checkoutreview"/>
-    </request-map>
 
     <!-- PayPal Express Checkout Requests -->
     <request-map uri="setPayPalCheckout">