Skip to content

Commit 36907b7

Browse files
hreinbergerhreinberger
authored
Merge pull request #139 from andrefatchip/OX6-42
Ox6 42
2 parents ec1393e + 013473b commit 36907b7

File tree

15 files changed

+362
-27
lines changed

15 files changed

+362
-27
lines changed

‎application/models/fcpoconfigexport.php

+1
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ protected function _getPaymentAbbreviation($sPaymentId)
537537
'fcpo_ideal' => 'sb',
538538
'fcpo_p24' => 'sb',
539539
'fcpo_bancontact' => 'sb',
540+
'fcporp_debitnote' => 'fnc',
540541
);
541542

542543
if (isset($aAbbreviations[$sPaymentId])) {

‎application/translations/de/fcPayOne_lang.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,15 @@
195195
'FCPO_SECINVOICE_NO_COMPANY' => 'Keine Firma? Klicken Sie <a href="index.php?cl=account_user" style="color:green;">hier</a> um Ihre Addresse zu ändern.',
196196
'FCPO_NOT_ADULT' => 'Sie sind aufgrund Ihres Alters leider nicht berechtigt die gewählte Zahlart zu verwenden. Bitte wählen Sie eine andere Zahlart.',
197197
'FCPO_BIRTHDATE_INVALID' => 'Ihr Geburtsdatum wurde nicht korrekt eingegeben',
198-
199198
'FCPO_CC_HOSTED_ERROR_CARDTYPE' => 'Bitte wählen Sie einen Kartentyp',
200199
'FCPO_CC_HOSTED_ERROR_CVC' => 'Bitte CVC-Eingabe überprüfen',
201200
'FCPO_CC_HOSTED_ERROR_INCOMPLETE' => 'Eingaben unvollständig',
201+
'FCPO_RATEPAY_AGREE' => '<p>Im Rahmen des Bestellvorgangs übermitteln wir Ihre Daten zum Zwecke der Identitäts- und Bonitätsprüfung sowie der Vertragsabwicklung an RATEPAY. Es gelten die <a href="//ratepay.com/legal" title="Legal - RatePAY" target="_blank">zusätzlichen AGB für RATEPAY-Zahlungsarten und die Datenschutzhinweise der RatePAY GmbH</a> für SEPA-Lastschrift.</p>',
202+
'FCPO_RATEPAY_NOT_AGREED' => 'Sie haben die Einwilligung zur Übertragung der erforderlichen Daten an Ratepay nicht bestätigt.',
203+
'FCPO_RATEPAY_SEPA_NOT_AGREED' => 'Sie haben das SEPA Lastschriftmandat noch nicht erteilt.',
204+
'FCPO_RATEPAY_SEPA_AGREE' => '<p>Ich ermächtige die RatePAY GmbH, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich mein Kreditinstitut an, die von der RatePAY GmbH auf mein Konto gezogenen Lastschriften einzulösen.</p><p>Hinweis: Ich kann innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen.</p>',
205+
'FCPO_RATEPAY_ACCOUNTHOLDER' => 'Kontoinhaber',
206+
'FCPO_RATEPAY_MANDATE_IDENTIFICATION' => '<p>RatePAY GmbH, Franklinstraße 28-29, D-10587 Berlin<br> Gläubiger-ID: DE39RPY00000568463<br> Mandatsreferenz: WIRD SEPARAT MITGETEILT</p>',
202207
'FCPO_EMAIL_CLEARING_SUBJECT' => 'Ihre Überweisungsdaten zur Bestellnummer',
203208
'FCPO_EMAIL_CLEARING_BODY_WELCOME' => "Hallo %NAME% %SURNAME%,\nzur Begleichung der Rechnung verwenden Sie bitte folgende Daten zur Überweisung:\n\n",
204209
'FCPO_EMAIL_CLEARING_BODY_THANKYOU' => 'Vielen Dank, dein %SHOPNAME%-Team',

‎application/translations/en/fcPayOne_lang.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,12 @@
187187
'FCPO_SECINVOICE_NO_COMPANY' => 'Not a company? Click <a href="index.php?cl=account_user" style="color:green;">here</a> for changing your address.',
188188
'FCPO_NOT_ADULT' => 'Due to your age you are not allowed to use this payment. Please select another payment method',
189189
'FCPO_BIRTHDATE_INVALID' => 'Your birthdate has been entered incorrect.',
190-
190+
'FCPO_RATEPAY_AGREE' => '<p>Within the order process, we will be sending your data to RatePAY GmbH for the purpose of verifying your identity and creditworthiness as well as the performance of the contract. The <a href="//ratepay.com/legal/" title="Legal - RatePAY" target="_blank">Additional Terms and Conditions and Data Protection Notice of RatePAY GmbH</a> apply.</p>',
191+
'FCPO_RATEPAY_NOT_AGREED' => 'You did not agree to send your data to RatePAY.',
192+
'FCPO_RATEPAY_SEPA_NOT_AGREED' => 'You did not authorized RatePAY to collect payments from your account.',
193+
'FCPO_RATEPAY_SEPA_AGREE' => '<p>I hereby authorise RatePAY GmbH to collect payments from my account by direct debit. At the same time, I authorise my bank to debit my account in accordance with the instructions from RatePAY GmbH.</p><p>Note: As part of my rights, I am entitled to a refund from my ibank under the terms and conditions of my agreement with my bank. A refund must be claimed within 8 weeks starting from the date on which my account was debited. My rights are explained in a statement that I can obtain from my bank.</p>',
194+
'FCPO_RATEPAY_ACCOUNTHOLDER' => 'Accountholder',
195+
'FCPO_RATEPAY_MANDATE_IDENTIFICATION' => '<p>RatePAY GmbH, Franklinstraße 28-29, D-10587 Berlin, Germany<br> Creditor ID: DE39RPY00000568463<br> Mandate Reference: WILL BE COMMUNICATED SEPARATELY</p>',
191196
'FCPO_CC_HOSTED_ERROR_CARDTYPE' => 'Please select a cardtype',
192197
'FCPO_CC_HOSTED_ERROR_CVC' => 'Please check CVC',
193198
'FCPO_CC_HOSTED_ERROR_INCOMPLETE' => 'Input incomplete',

‎application/views/admin/de/fcPayOne_lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
'fcpo_clearingtype_fcpopo_bill' => 'Paysafe Pay Later™ Rechnungskauf',
6767
'fcpo_clearingtype_fcpopo_debitnote' => 'Paysafe Pay Later™ Lastschrift',
6868
'fcpo_clearingtype_fcpopo_installment' => 'Paysafe Pay Later™ Ratenkauf',
69+
'fcpo_clearingtype_fcporp_debitnote' => 'Ratepay Lastschrift',
70+
'fcpo_clearingtype_fcporp_bill' => 'Ratepay Rechnungskauf',
6971
'FCPO_CAPTURE_APPROVED' => 'Buchung war erfolgreich',
7072
'FCPO_CAPTURE_ERROR' => 'Fehler bei Buchung: ',
7173
'FCPO_DEBIT_APPROVED' => 'Gutschrift war erfolgreich',

‎application/views/admin/en/fcPayOne_lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
'fcpo_clearingtype_fcpopo_bill' => 'Paysafe Pay Later™ Invoice',
6767
'fcpo_clearingtype_fcpopo_debitnote' => 'Paysafe Pay Later™ Debit',
6868
'fcpo_clearingtype_fcpopo_installment' => 'Paysafe Pay Later™ Installment',
69+
'fcpo_clearingtype_fcporp_debitnote' => 'Ratepay Debit',
70+
'fcpo_clearingtype_fcporp_bill' => 'Ratepay Invoice',
6971
'FCPO_CAPTURE_APPROVED' => 'Booking was successfull',
7072
'FCPO_CAPTURE_ERROR' => 'Error occured during booking: ',
7173
'FCPO_DEBIT_APPROVED' => 'Credit was successfull',

‎application/views/admin/tpl/fcpayone_main.tpl

+2-1
Original file line numberDiff line numberDiff line change
@@ -745,9 +745,10 @@
745745
[{oxmultilang ident="FCPO_PROFILES_RATEPAY_PAYMENT"}]:
746746
<select class="edittext" name="aRatepayProfiles[[{$sOxid}]][paymentid]">
747747
<option value="fcporp_bill" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_bill'}]selected[{/if}]>RatePay Rechnung</option>
748+
<option value="fcporp_debitnote" [{if $aRatePayProfile.OXPAYMENTID == 'fcporp_debitnote'}]selected[{/if}]>RatePay Lastschrift</option>
748749
</select>
749750
<input type="submit" class="edittext" name="aRatepayProfiles[[{$sOxid}]][delete]" value="[{oxmultilang ident="FCPO_RATEPAY_DELETE_PROFILE"}]" onClick="Javascript:document.myedit.fnc.value='save'" [{$readonly}]><br>
750-
[{if $aRatePayProfile.merchant_name =='PayONE'}]
751+
[{if $aRatePayProfile.merchant_name != ''}]
751752
<input type="checkbox" value="[{$sOxid}]" onclick="Javascript:handleRatePayShowDetails(this)"> [{oxmultilang ident="FCPO_RATEPAY_PROFILE_TOGGLE_DETAILS"}]
752753
[{/if}]
753754
</dd>

‎application/views/frontend/tpl/azure/fcpo_payment_ratepay_debitnote.tpl

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
[{if $oView->fcpoRatePayAllowed('fcporp_debitnote')}]
2+
<dl>
3+
<dt>
4+
<input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
5+
<label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
6+
</dt>
7+
<dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
8+
<input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">
9+
<ul class="form fcporp_debitnote_form">
10+
<input type="hidden" name="dynvalue[fcporp_debitnote_profileid]" value="[{$oView->fcpoGetRatePayMatchedProfile('fcporp_debitnote')}]">
11+
[{if $oView->fcpoRatePayShowUstid()}]
12+
<li>
13+
<label>[{oxmultilang ident="FCPO_RATEPAY_USTID"}]</label>
14+
<input placeholder="[{oxmultilang ident="FCPO_RATEPAY_USTID"}]" type='text' name="dynvalue[fcporp_debitnote_ustid]" value="[{$oView->fcpoGetUserValue('oxustid')}]">
15+
</li>
16+
[{/if}]
17+
[{if $oView->fcpoRatePayShowBirthdate()}]
18+
<li>
19+
<label>[{oxmultilang ident="FCPO_RATEPAY_BIRTHDATE"}]</label>
20+
<select name="dynvalue[fcporp_debitnote_birthdate_day]">
21+
[{foreach from=$oView->fcpoGetDayRange() item='sDay'}]
22+
<option value="[{$sDay}]" [{if $sDay == $oView->fcpoGetBirthdayField('day')}]selected[{/if}]>[{$sDay}]</option>
23+
[{/foreach}]
24+
</select>
25+
&nbsp;
26+
<select name="dynvalue[fcporp_debitnote_birthdate_month]">
27+
[{foreach from=$oView->fcpoGetMonthRange() item='sMonth'}]
28+
<option value="[{$sMonth}]" [{if $sMonth == $oView->fcpoGetBirthdayField('month')}]selected[{/if}]>[{$sMonth}]</option>
29+
[{/foreach}]
30+
</select>
31+
&nbsp;
32+
<select name="dynvalue[fcporp_debitnote_birthdate_year]">
33+
[{foreach from=$oView->fcpoGetYearRange() item='sYear'}]
34+
<option value="[{$sYear}]" [{if $sYear == $oView->fcpoGetBirthdayField('year')}]selected[{/if}]>[{$sYear}]</option>
35+
[{/foreach}]
36+
</select>
37+
</li>
38+
[{/if}]
39+
[{if $oView->fcpoRatePayShowFon()}]
40+
<li>
41+
<label>[{oxmultilang ident="FCPO_RATEPAY_FON"}]</label>
42+
<input placeholder="[{oxmultilang ident="FCPO_RATEPAY_FON"}]" type='text' name="dynvalue[fcporp_debitnote_fon]" value="[{$oView->fcpoGetUserValue('oxfon')}]">
43+
</li>
44+
[{/if}]
45+
<li>
46+
<label>[{oxmultilang ident="FCPO_BANK_IBAN"}]</label>
47+
<input placeholder="[{oxmultilang ident="FCPO_BANK_IBAN"}]" autocomplete="off" type="text" size="20" maxlength="64" name="dynvalue[fcpo_ratepay_debitnote_iban]" value="[{$dynvalue.fcpo_ratepay_debitnote_iban}]" onkeyup="fcHandleDebitInputs();return false;">
48+
<div id="fcpo_payolution_iban_invalid" class="fcpo_check_error">
49+
<p class="oxValidateError" style="display: block;">
50+
[{oxmultilang ident="FCPO_IBAN_INVALID"}]
51+
</p>
52+
</div>
53+
</li>
54+
<li>
55+
<label>[{oxmultilang ident="FCPO_BANK_BIC"}]</label>
56+
<input placeholder="[{oxmultilang ident="FCPO_BANK_BIC"}]" autocomplete="off" type="text" size="20" maxlength="64" name="dynvalue[fcpo_ratepay_debitnote_bic]" value="[{$dynvalue.fcpo_ratepay_debitnote_bic}]" onkeyup="fcHandleDebitInputs();return false;">
57+
<div id="fcpo_payolution_bic_invalid" class="fcpo_check_error">
58+
<p class="oxValidateError" style="display: block;">
59+
[{oxmultilang ident="FCPO_BIC_INVALID"}]
60+
</p>
61+
</div>
62+
</li>
63+
<li>
64+
<input name="dynvalue[fcpo_ratepay_debitnote_agreed]" value="agreed" type="checkbox">[{oxmultilang ident="FCPO_RATEPAY_AGREE"}] [{oxmultilang ident="FCPO_RATEPAY_AGREEMENT_PART_2"}]
65+
</li>
66+
<li>
67+
<input name="dynvalue[fcpo_ratepay_debitnote_sepa_agreed]" value="agreed" type="checkbox">&nbsp;[{oxmultilang ident="FCPO_RATEPAY_SEPA_AGREEMENT_PART_1"}] [{oxmultilang ident="FCPO_RATEPAY_SEPA_AGREE"}]
68+
</li>
69+
</ul>
70+
[{block name="checkout_payment_longdesc"}]
71+
[{if $paymentmethod->oxpayments__oxlongdesc->value}]
72+
<div class="desc">
73+
[{$paymentmethod->oxpayments__oxlongdesc->getRawValue()}]
74+
</div>
75+
[{/if}]
76+
[{/block}]
77+
</dd>
78+
</dl>
79+
[{/if}]

‎application/views/frontend/tpl/flow/fcpo_payment_ratepay_debitnote.tpl

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
[{if $oView->fcpoRatePayAllowed('fcporp_debitnote')}]
2+
<dl>
3+
<dt>
4+
<input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
5+
<label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}] [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</b></label>
6+
</dt>
7+
<dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
8+
<input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">
9+
<input type="hidden" name="dynvalue[fcporp_debitnote_profileid]" value="[{$oView->fcpoGetRatePayMatchedProfile('fcporp_debitnote')}]">
10+
[{if $oView->fcpoRatePayShowUstid()}]
11+
<div class="form-group fcporp_debitnote_ustid">
12+
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_RATEPAY_USTID"}]</label>
13+
<div class="col-lg-9">
14+
<input placeholder="[{oxmultilang ident="FCPO_RATEPAY_USTID"}]" class="form-control" type="text" size="20" maxlength="64" name="dynvalue[fcporp_debitnote_ustid]" value="[{$oView->fcpoGetUserValue('oxustid')}]">
15+
</div>
16+
</div>
17+
[{/if}]
18+
[{if $oView->fcpoRatePayShowBirthdate()}]
19+
<div class="form-group fcporp_debitnote_birthdate">
20+
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_RATEPAY_BIRTHDATE"}]</label>
21+
<div class="col-lg-9">
22+
<select name="dynvalue[fcporp_debitnote_birthdate_day]">
23+
[{foreach from=$oView->fcpoGetDayRange() item='sDay'}]
24+
<option value="[{$sDay}]" [{if $sDay == $oView->fcpoGetBirthdayField('day')}]selected[{/if}]>[{$sDay}]</option>
25+
[{/foreach}]
26+
</select>
27+
&nbsp;
28+
<select name="dynvalue[fcporp_debitnote_birthdate_month]">
29+
[{foreach from=$oView->fcpoGetMonthRange() item='sMonth'}]
30+
<option value="[{$sMonth}]" [{if $sMonth == $oView->fcpoGetBirthdayField('month')}]selected[{/if}]>[{$sMonth}]</option>
31+
[{/foreach}]
32+
</select>
33+
&nbsp;
34+
<select name="dynvalue[fcporp_debitnote_birthdate_year]">
35+
[{foreach from=$oView->fcpoGetYearRange() item='sYear'}]
36+
<option value="[{$sYear}]" [{if $sYear == $oView->fcpoGetBirthdayField('year')}]selected[{/if}]>[{$sYear}]</option>
37+
[{/foreach}]
38+
</select>
39+
</div>
40+
</div>
41+
[{/if}]
42+
[{if $oView->fcpoRatePayShowFon()}]
43+
<div class="form-group fcporp_debitnote_fon">
44+
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_RATEPAY_FON"}]</label>
45+
<div class="col-lg-9">
46+
<input placeholder="[{oxmultilang ident="FCPO_RATEPAY_FON"}]" class="form-control" type="text" size="20" maxlength="64" name="dynvalue[fcporp_debitnote_fon]" value="[{$oView->fcpoGetUserValue('oxfon')}]">
47+
</div>
48+
</div>
49+
[{/if}]
50+
<div class="form-group fcpo_ratepay_debitnote_iban">
51+
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_BANK_IBAN"}]</label>
52+
<div class="col-lg-9">
53+
<input placeholder="[{oxmultilang ident="FCPO_BANK_IBAN"}]" class="form-control js-oxValidate js-oxValidate_notEmpty" type="text" size="20" maxlength="64" name="dynvalue[fcpo_ratepay_debitnote_iban]" value="[{$dynvalue.fcpo_ratepay_debitnote_iban}]" onkeyup="fcHandleDebitInputs();return false;" required="required">
54+
<div id="fcpo_ratepay_iban_invalid" class="fcpo_check_error">
55+
<p class="oxValidateError" style="display: block;">
56+
[{oxmultilang ident="FCPO_IBAN_INVALID"}]
57+
</p>
58+
</div>
59+
</div>
60+
</div>
61+
<div class="form-group fcpo_ratepay_debitnote_bic">
62+
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_BANK_BIC"}]</label>
63+
<div class="col-lg-9">
64+
<input class="form-control js-oxValidate js-oxValidate_notEmpty" autocomplete="off" type="text" size="20" maxlength="64" name="dynvalue[fcpo_ratepay_debitnote_bic]" value="[{$dynvalue.fcpo_ratepay_debitnote_bic}]" onkeyup="fcHandleDebitInputs();return false;" required="required">
65+
<div id="fcpo_ratepay_bic_invalid" class="fcpo_check_error">
66+
<p class="oxValidateError" style="display: block;">
67+
[{oxmultilang ident="FCPO_BIC_INVALID"}]
68+
</p>
69+
</div>
70+
</div>
71+
</div>
72+
73+
<div class="alert alert-info col-lg-offset-3 desc">
74+
[{oxmultilang ident='FCPO_RATEPAY_MANDATE_IDENTIFICATION'}]
75+
</div>
76+
<div class="alert alert-info col-lg-offset-3 desc">
77+
<input name="dynvalue[fcpo_ratepay_debitnote_agreed]" value="agreed" type="checkbox"> [{oxmultilang ident="FCPO_RATEPAY_AGREE"}]
78+
</div>
79+
<div class="alert alert-info col-lg-offset-3 desc">
80+
<input name="dynvalue[fcpo_ratepay_debitnote_sepa_agreed]" value="agreed" type="checkbox">&nbsp;[{oxmultilang ident="FCPO_RATEPAY_SEPA_AGREE"}]
81+
</div>
82+
83+
[{block name="checkout_payment_longdesc"}]
84+
[{if $paymentmethod->oxpayments__oxlongdesc->value}]
85+
<div class="desc">
86+
[{$paymentmethod->oxpayments__oxlongdesc->getRawValue()}]
87+
</div>
88+
[{/if}]
89+
[{/block}]
90+
</dd>
91+
</dl>
92+
[{/if}]

‎core/fcpayone_events.php

+1
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ class fcpayone_events
379379
'fcpo_ideal' => 'iDeal',
380380
'fcpo_p24' => 'P24',
381381
'fcpo_bancontact' => 'Bancontact',
382+
'fcporp_debitnote' => 'Ratepay Lastschrift',
382383
);
383384

384385
/**

0 commit comments

Comments
 (0)