Merge pull request #79 from BoulangerV/OXID-233-OXID612-Ausklappen-de…

…r-Zahlarten-im-Wave-Theme OXID-233: add templates for Wave Theme from flow
PAYONE-GmbH · May 13, 2019 · 5af43bb · 5af43bb
2 parents ad0620d + 6fd4160
commit 5af43bb
Show file tree

Hide file tree

Showing 50 changed files with 1,574 additions and 303 deletions.
diff --git a/application/translations/de/fcPayOne_lang.php b/application/translations/de/fcPayOne_lang.php
@@ -135,8 +135,11 @@
 'FCPO_PAYOLUTION_YEAR'                          => 'Jahr',
 'FCPO_PAYOLUTION_MONTH'                         => 'Monat',
 'FCPO_PAYOLUTION_DAY'                           => 'Tag',
-'FCPO_PAYOLUTION_AGREEMENT_PART_1'              => 'Mit der Übermittlung der für die Abwicklung des Rechnungskaufes und einer Identitätsprüfung und Bonitätsprüfung erforderlicher Daten an payolution bin ich einverstanden.<br>Meine',
-'FCPO_PAYOLUTION_AGREEMENT_PART_2'              => 'kann ich jederzeit mit Wirkung für die Zukunft wiederrufen',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1'              => 'Mit der Übermittlung der für die Abwicklung %s und einer Identitätsprüfung und Bonitätsprüfung erforderlicher Daten an payolution bin ich einverstanden.<br>Meine',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_DEBITNOTE'             => 'der Lastschrift',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_INSTALLMENT'           => 'des Ratenkaufes',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_BILL'                  => 'des Rechnungskaufes',
+'FCPO_PAYOLUTION_AGREEMENT_PART_2'              => 'kann ich jederzeit mit Wirkung für die Zukunft widerrufen',
 'FCPO_PAYOLUTION_AGREE'                         => 'Einwilligung',
 'FCPO_PAYOLUTION_EMAIL_CLEARING'                => 'Payolution Referenzcode:',
 'FCPO_PAYOLUTION_NOT_AGREED'                    => 'Sie haben die Einwilligung zur Übertragung der erforderlichen Daten an payolution nicht bestätigt.',

diff --git a/application/translations/en/fcPayOne_lang.php b/application/translations/en/fcPayOne_lang.php
@@ -134,7 +134,10 @@
 'FCPO_PAYOLUTION_DAY'                           => 'Day',
 'FCPO_PAYOLUTION_PLEASE SELECT'                 => 'Please choose...',
 'FCPO_PAYOLUTION_BIRTHDATE_INVALID'             => 'Your birthdate has been entered incorrect.',
-'FCPO_PAYOLUTION_AGREEMENT_PART_1'              => 'I confirm transmission of my personal data, which is needed for processing bill payment, identity- and boni-check.<br>My',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1'              => 'I confirm transmission of my personal data, which is needed for processing %s, identity- and boni-check.<br>My',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_DEBITNOTE'             => 'debitnote payment',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_INSTALLMENT'           => 'installment payment',
+'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_BILL'                  => 'bill payment',
 'FCPO_PAYOLUTION_AGREEMENT_PART_2'              => 'can be cancelled by writing any time later.',
 'FCPO_PAYOLUTION_AGREE'                         => 'consent',
 'FCPO_PAYOLUTION_EMAIL_CLEARING'                => 'Payolution Reference code:',

diff --git a/application/translations/nl/fcPayOne_lang.php b/application/translations/nl/fcPayOne_lang.php
@@ -130,7 +130,10 @@
     'FCPO_PAYOLUTION_YEAR' => 'Year',
     'FCPO_PAYOLUTION_MONTH' => 'Month',
     'FCPO_PAYOLUTION_DAY' => 'Day',
-    'FCPO_PAYOLUTION_AGREEMENT_PART_1' => 'Ik aanvaard de overdracht van de benodigde gegevens voor de afwikkeling van de aankoop op factuur en een controle van mijn identiteit en kredietwaardigheid.<br>Deze',
+    'FCPO_PAYOLUTION_AGREEMENT_PART_1' => 'Ik aanvaard de overdracht van de benodigde gegevens voor de afwikkeling van %s en een controle van mijn identiteit en kredietwaardigheid.<br>Deze',
+    'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_DEBITNOTE'             => 'de debetbetaling',
+    'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_INSTALLMENT'           => 'de termijnbetaling',
+    'FCPO_PAYOLUTION_AGREEMENT_PART_1_FCPOPO_BILL'                  => 'de aankoop op factuur',
     'FCPO_PAYOLUTION_AGREEMENT_PART_2' => 'kan ik op elk gewenst moment met onmiddellijke ingang herroepen.',
     'FCPO_PAYOLUTION_AGREE' => 'inwilliging',
     'FCPO_PAYOLUTION_EMAIL_CLEARING' => 'Payolution Reference code:',

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_creditcard_ajax.tpl b/application/views/frontend/tpl/azure/fcpo_payment_creditcard_ajax.tpl
@@ -2,22 +2,7 @@
     <dl id="fcpoCreditcard" style="display:none;">
         <dt>
             <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-            <label for="payment_[{$sPaymentID}]">
-                <b>
-                    [{$paymentmethod->oxpayments__oxdesc->value}]
-                    [{if $paymentmethod->getPrice()}]
-                    [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                    [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                    ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                    [{if $oPaymentPrice->getVatValue() > 0}]
-                    [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                    [{/if}])
-                    [{else}]
-                    ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                    [{/if}]
-                    [{/if}]
-                </b>
-            </label>
+            <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
         </dt>
         <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
             <input type="hidden" name="fcpo_cc_type" value="ajax">

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_creditcard_hosted.tpl b/application/views/frontend/tpl/azure/fcpo_payment_creditcard_hosted.tpl
@@ -3,22 +3,7 @@
     <dl id="fcpoCreditcard" style="display:none;">
         <dt>
             <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-            <label for="payment_[{$sPaymentID}]">
-                <b>
-                    [{$paymentmethod->oxpayments__oxdesc->value}]
-                    [{if $paymentmethod->getPrice()}]
-                    [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                    [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                    ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                    [{if $oPaymentPrice->getVatValue() > 0}]
-                    [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                    [{/if}])
-                    [{else}]
-                    ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                    [{/if}]
-                    [{/if}]
-                </b>
-            </label>
+            <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
         </dt>
         <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
             <script type="text/javascript" src="[{$oViewConf->fcpoGetHostedPayoneJs()}]"></script>

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_debitnote.tpl b/application/views/frontend/tpl/azure/fcpo_payment_debitnote.tpl
@@ -1,22 +1,7 @@
 <dl>
     <dt>
         <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-        <label for="payment_[{$sPaymentID}]">
-            <b>
-                [{$paymentmethod->oxpayments__oxdesc->value}]
-                [{if $paymentmethod->getPrice()}]
-                [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                [{if $oPaymentPrice->getVatValue() > 0}]
-                [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                [{/if}])
-                [{else}]
-                ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                [{/if}]
-                [{/if}]
-            </b>
-        </label>
+        <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
     </dt>
     <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
         <input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_default.tpl b/application/views/frontend/tpl/azure/fcpo_payment_default.tpl
@@ -0,0 +1,27 @@
+<dl>
+    <dt>
+        <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
+        <label for="payment_[{$sPaymentID}]"><b>[{ $paymentmethod->oxpayments__oxdesc->value}] [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</b></label>
+    </dt>
+    <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
+        [{assign var="aDynValues" value=$paymentmethod->getDynValues()}]
+        [{if $aDynValues}]
+        <ul>
+            [{foreach from=$aDynValues item=value name=PaymentDynValues}]
+            <li>
+                <label>[{ $value->name}]</label>
+                <input id="[{$sPaymentID}]_[{$smarty.foreach.PaymentDynValues.iteration}]" type="text" class="textbox" size="20" maxlength="64" name="dynvalue[[{$value->name}]]" value="[{ $value->value}]">
+            </li>
+            [{/foreach}]
+        </ul>
+        [{/if}]
+
+        [{block name="checkout_payment_longdesc"}]
+        [{if $paymentmethod->oxpayments__oxlongdesc->value|trim}]
+        <div class="desc">
+            [{ $paymentmethod->oxpayments__oxlongdesc->getRawValue()}]
+        </div>
+        [{/if}]
+        [{/block}]
+    </dd>
+</dl>
diff --git a/application/views/frontend/tpl/azure/fcpo_payment_klarna.tpl b/application/views/frontend/tpl/azure/fcpo_payment_klarna.tpl
@@ -1,22 +1,7 @@
 <dl>
     <dt>
         <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-        <label for="payment_[{$sPaymentID}]">
-            <b>
-                [{$paymentmethod->oxpayments__oxdesc->value}]
-                [{if $paymentmethod->getPrice()}]
-                [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                [{if $oPaymentPrice->getVatValue() > 0}]
-                [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                [{/if}])
-                [{else}]
-                ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                [{/if}]
-                [{/if}]
-            </b>
-        </label>
+        <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
     </dt>
     <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
         <ul class="form fcpo_klarna_form">

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_onlinetransfer.tpl b/application/views/frontend/tpl/azure/fcpo_payment_onlinetransfer.tpl
@@ -3,22 +3,7 @@
     <dl>
         <dt>
             <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-            <label for="payment_[{$sPaymentID}]">
-                <b>
-                    [{$paymentmethod->oxpayments__oxdesc->value}]
-                    [{if $paymentmethod->getPrice()}]
-                    [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                    [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                    ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                    [{if $oPaymentPrice->getVatValue() > 0}]
-                    [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                    [{/if}])
-                    [{else}]
-                    ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                    [{/if}]
-                    [{/if}]
-                </b>
-            </label>
+            <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
         </dt>
         <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
             <input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_payolution_bill.tpl b/application/views/frontend/tpl/azure/fcpo_payment_payolution_bill.tpl
@@ -1,22 +1,7 @@
 <dl>
     <dt>
         <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-        <label for="payment_[{$sPaymentID}]">
-            <b>
-                [{$paymentmethod->oxpayments__oxdesc->value}]
-                [{if $paymentmethod->getPrice()}]
-                [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                [{if $oPaymentPrice->getVatValue() > 0}]
-                [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                [{/if}])
-                [{else}]
-                ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                [{/if}]
-                [{/if}]
-            </b>
-        </label>
+        <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
     </dt>
     <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
         <input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">
@@ -58,7 +43,7 @@
                 </li>
             [{/if}]
             <li>
-                <input name="dynvalue[fcpo_payolution_bill_agreed]" value="agreed" type="checkbox">&nbsp;[{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_1"}] <a href='[{$oView->fcpoGetPayolutionAgreementLink()}]' class="lightview fcpoPayolutionAgreeRed" data-lightview-type="iframe" data-lightview-options="width: 800, height: 600, viewport: 'scale',background: { color: '#fff', opacity: 1 },skin: 'light'">[{oxmultilang ident="FCPO_PAYOLUTION_AGREE"}]</a> [{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_2"}]
+                <input name="dynvalue[fcpo_payolution_bill_agreed]" value="agreed" type="checkbox">&nbsp;[{$oView->fcpoGetPoAgreementInit($sPaymentID)}] <a href='[{$oView->fcpoGetPayolutionAgreementLink()}]' class="lightview fcpoPayolutionAgreeRed" data-lightview-type="iframe" data-lightview-options="width: 800, height: 600, viewport: 'scale',background: { color: '#fff', opacity: 1 },skin: 'light'">[{oxmultilang ident="FCPO_PAYOLUTION_AGREE"}]</a> [{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_2"}]
             </li>
         </ul>
         [{block name="checkout_payment_longdesc"}]

diff --git a/application/views/frontend/tpl/azure/fcpo_payment_payolution_debitnote.tpl b/application/views/frontend/tpl/azure/fcpo_payment_payolution_debitnote.tpl
@@ -1,22 +1,7 @@
 <dl>
     <dt>
         <input id="payment_[{$sPaymentID}]" type="radio" name="paymentid" value="[{$sPaymentID}]" [{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]>
-        <label for="payment_[{$sPaymentID}]">
-            <b>
-                [{$paymentmethod->oxpayments__oxdesc->value}]
-                [{if $paymentmethod->getPrice()}]
-                [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}]
-                [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}]
-                ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}]
-                [{if $oPaymentPrice->getVatValue() > 0}]
-                [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}]
-                [{/if}])
-                [{else}]
-                ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}])
-                [{/if}]
-                [{/if}]
-            </b>
-        </label>
+        <label for="payment_[{$sPaymentID}]"><b>[{$paymentmethod->oxpayments__oxdesc->value}]</b> [{$oView->fcpoGetFormattedPaymentCosts($paymentmethod)}]</label>
     </dt>
     <dd class="[{if $oView->getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]activePayment[{/if}]">
         <input type="hidden" name="fcpo_mode_[{$sPaymentID}]" value="[{$paymentmethod->fcpoGetOperationMode()}]">
@@ -74,7 +59,7 @@
                 </div>
             </li>
             <li>
-                <input name="dynvalue[fcpo_payolution_debitnote_agreed]" value="agreed" type="checkbox">&nbsp;[{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_1"}] <a href='[{$oView->fcpoGetPayolutionAgreementLink()}]' class="lightview fcpoPayolutionAgreeRed" data-lightview-type="iframe" data-lightview-options="width: 800, height: 600, viewport: 'scale',background: { color: '#fff', opacity: 1 },skin: 'light'">[{oxmultilang ident="FCPO_PAYOLUTION_AGREE"}]</a> [{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_2"}]
+                <input name="dynvalue[fcpo_payolution_debitnote_agreed]" value="agreed" type="checkbox">&nbsp;[{$oView->fcpoGetPoAgreementInit($sPaymentID)}] <a href='[{$oView->fcpoGetPayolutionAgreementLink()}]' class="lightview fcpoPayolutionAgreeRed" data-lightview-type="iframe" data-lightview-options="width: 800, height: 600, viewport: 'scale',background: { color: '#fff', opacity: 1 },skin: 'light'">[{oxmultilang ident="FCPO_PAYOLUTION_AGREE"}]</a> [{oxmultilang ident="FCPO_PAYOLUTION_AGREEMENT_PART_2"}]
             </li>
             <li>
                 <input name="dynvalue[fcpo_payolution_debitnote_sepa_agreed]" value="agreed" type="checkbox">&nbsp;[{oxmultilang ident="FCPO_PAYOLUTION_SEPA_AGREEMENT_PART_1"}] <a href='[{$oView->fcpoGetPayolutionSepaAgreementLink()}]' class="lightview fcpoPayolutionAgreeRed" data-lightview-type="iframe" data-lightview-options="width: 800, height: 600, viewport: 'scale',background: { color: '#fff', opacity: 1 },skin: 'light'">[{oxmultilang ident="FCPO_PAYOLUTION_SEPA_AGREE"}]</a>