diff --git a/Application/Controller/EasyCreditDispatcherController.php b/Application/Controller/EasyCreditDispatcherController.php index f452633..c3ae35e 100644 --- a/Application/Controller/EasyCreditDispatcherController.php +++ b/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 { diff --git a/Application/views/page/checkout/inc/oxpseasycredit_payment_easycreditinstallment.tpl b/Application/views/page/checkout/inc/oxpseasycredit_payment_easycreditinstallment.tpl index 496a5eb..90759d2 100644 --- a/Application/views/page/checkout/inc/oxpseasycredit_payment_easycreditinstallment.tpl +++ b/Application/views/page/checkout/inc/oxpseasycredit_payment_easycreditinstallment.tpl @@ -13,7 +13,7 @@ [{/if}] -
diff --git a/Application/views/widgets/oxpseasycredit_examplecalculation.tpl b/Application/views/widgets/oxpseasycredit_examplecalculation.tpl
index 6b0a4bd..bb89ff6 100644
--- a/Application/views/widgets/oxpseasycredit_examplecalculation.tpl
+++ b/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"
+ }
});
}
)
diff --git a/Core/Helper/EasyCreditInitializeRequestBuilder.php b/Core/Helper/EasyCreditInitializeRequestBuilder.php
index 8f94343..d74e800 100644
--- a/Core/Helper/EasyCreditInitializeRequestBuilder.php
+++ b/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,
+ */
);
}
diff --git a/out/src/css/oxpseasycredit_style.css b/out/src/css/oxpseasycredit_style.css
index 2d8026a..8f03fc8 100644
--- a/out/src/css/oxpseasycredit_style.css
+++ b/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 {