#0124929 - Merged changes from Ox7 branch to Ox6

Application/Controller/EasyCreditDispatcherController.php

@@ -54,6 +54,10 @@ class EasyCreditDispatcherController extends FrontendController
      */
     public function initializeandredirect()
     {
+        // Reset storage (EasyCredit transaction) for every new customer movement from payment to order controller
+        // Added because when customer changed order details like the address when the Easycredit data was already confirmed there were problems in the process
+        $this->getDicSession()->clearStorage();
+
         $this->calculateBasket($this->getApiConfig()->getEasyCreditInstalmentPaymentId(), $this->getBasket(), true);
 
         try {

Application/views/page/checkout/inc/oxpseasycredit_payment_easycreditinstallment.tpl

@@ -13,7 +13,7 @@
             </div>
         [{/if}]
     </dt>
-    <dd class="payment-option[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
+    <dd class="payment-option[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}] activePayment[{/if}]">
         [{if $easyCreditIsPossible}]
             <div class="col-lg-offset-3">
                 <img class="payment-logo-easycredit" src="[{$oViewConf->getModuleUrl('oxpseasycredit')}]out/pictures/eclogo.png" alt="Easy Credit">

Application/views/widgets/oxpseasycredit_examplecalculation.tpl

@@ -28,8 +28,14 @@
                         $('#easycredit-example-dialog').dialog({
                             close: true,
                             modal: true,
+                            draggable: false,
+                            resizable: false,
                             width: 570,
-                            height: 786
+                            height: 786,
+                            classes: {
+                                "ui-dialog": "easycredit-widget",
+                                "ui-dialog-titlebar-close": "btn-close"
+                            }
                         });
                     }
                 )

Core/Helper/EasyCreditInitializeRequestBuilder.php

@@ -589,11 +589,14 @@ protected function getContacts()
         $contacts = array(
             'email' => $customer->oxuser__oxusername->value
         );
+        /* EasyCredit redirect page is buggy with the telephone number at the moment - don't send a phone number and let the customer enter it on the EC site
+           Current telephone number implementation is not optimal in general with oxid having 3 different fields for phone number and the module only looking at the "landline" oxfon number instead of the mobile phone fields
         $phoneNumber = $customer->oxuser__oxfon->value;
         if( $this->isValidPhoneNumber($phoneNumber) ) {
             $contacts["mobilfunknummer"] = $phoneNumber;
             $contacts["pruefungMobilfunknummerUebergehen"] = true;
         }
+        */
         return $contacts;
     }
 
@@ -621,7 +624,10 @@ protected function getFurtherCustomerInfo()
     {
         $customer = $this->getUser();
         return array(
+            /* EasyCredit redirect page is buggy with the telephone number at the moment - don't send a phone number and let the customer enter it on the EC site
+               Current telephone number implementation is not optimal in general with oxid having 3 different fields for phone number and the module only looking at the "landline" oxfon number instead of the mobile phone fields
             'telefonnummer' => $customer->oxuser__oxfon->value,
+            */
         );
     }
 

out/src/css/oxpseasycredit_style.css

@@ -4,6 +4,8 @@
     background-repeat: no-repeat;
     padding: 10px 0 20px 60px;
     background-position-y: center;
+    max-width: 100%;
+    z-index: 1111!important;
 }
 
 .easycredit-link {