Merge pull request #58 from wirecard/shopUpdate

Add 5.3 compatibility

Frontend/WirecardCheckoutSeamless/Bootstrap.php

@@ -64,7 +64,7 @@ public function getCapabilities()
      */
     public function getVersion()
     {
-        return '1.10.3';
+        return '1.10.4';
     }
 
     /**
@@ -848,7 +848,7 @@ protected function createPayments()
                     'active' => (isset($pm['active'])) ? (int)$pm['active'] : 0,
                     'position' => self::STARTPOSITION + $pos,
                     'pluginID' => $this->getId(),
-                    'additionalDescription' => ''
+                    'additionalDescription' => $pm['additionalDescription']
                 );
                 if (isset($pm['template']) && !is_null($pm['template'])) {
                     $payment['template'] = $pm['template'];
@@ -858,6 +858,15 @@ protected function createPayments()
                 if (isset($pm['template']) && !is_null($pm['template'])) {
                     $oPayment->setTemplate($pm['template']);
                 }
+                if (isset($pm['additionalDescription']) && $pm['additionalDescription'] != '') {
+                    $additional = $oPayment->getAdditionalDescription();
+                    if ( $additional === '' ) {
+                        if ($oPayment->getTemplate() == 'wirecard_brands.tpl') {
+                            $oPayment->setTemplate(null);
+                        }
+                        $oPayment->setAdditionalDescription($pm['additionalDescription']);
+                    }
+                }
             }
 
             $aTranslations[$oPayment->getId()] = $pm['translation'];

Frontend/WirecardCheckoutSeamless/Models/Config.php

@@ -558,161 +558,161 @@ public function getPaymentMethods()
         $pm[] = array(
             'name' => 'ccard',
             'description' => 'Kreditkarte',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_ccard.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::CCARD,
             'translation' => Array('description' => 'Wirecard Credit Card', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'maestro',
             'description' => 'Maestro SecureCode',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_maestro.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::MAESTRO,
             'translation' => Array('description' => 'Wirecard Maestro SecureCode', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'eps',
             'description' => 'eps Online-&Uuml;berweisung',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_eps.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::EPS,
             'translation' => Array('description' => 'Wirecard eps Online Bank Transfer', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'ideal',
             'description' => 'iDEAL',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_ideal.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::IDL,
             'translation' => Array('description' => 'Wirecard iDEAL', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'giropay',
             'description' => 'giropay',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_giropay.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::GIROPAY,
             'translation' => Array('description' => 'Wirecard giropay', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'sofortueberweisung',
             'description' => 'SOFORT &Uuml;berweisung',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_sofortueberweisung.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::SOFORTUEBERWEISUNG,
             'translation' => Array('description' => 'Wirecard SOFORT banking', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'bancontact_mistercash',
             'description' => 'Bancontact',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_bancontact_mistercash.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::BMC,
             'translation' => Array('description' => 'Wirecard Bancontact', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'przelewy24',
             'description' => 'Przelewy24',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_przelewy24.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::P24,
             'translation' => Array('description' => 'Wirecard Przelewy24', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'moneta',
             'description' => 'moneta.ru',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_moneta.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::MONETA,
             'translation' => Array('description' => 'Wirecard moneta.ru', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'poli',
             'description' => 'POLi',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_poli.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::POLI,
             'translation' => Array('description' => 'Wirecard POLi', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'pbx',
             'description' => 'paybox',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_pbx.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::PBX,
             'translation' => Array('description' => 'Wirecard paybox', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'psc',
             'description' => 'paysafecard',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_psc.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::PSC,
             'translation' => Array('description' => 'Wirecard paysafecard', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'paypal',
             'description' => 'PayPal',
-            'template' => 'wirecard_brands.tpl',
             'call' => WirecardCEE_QMore_PaymentType::PAYPAL,
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_paypal.png\'}" class="wirecard-brand"/>&nbsp;',
             'translation' => Array('description' => 'Wirecard PayPal', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'sepa-dd',
             'description' => 'SEPA Lastschrift',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_sepa-dd.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::SEPADD,
             'translation' => Array('description' => 'Wirecard SEPA Direct Debit', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'invoice',
             'description' => 'Kauf auf Rechnung',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_invoice.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::INVOICE,
             'translation' => Array('description' => 'Wirecard Invoice', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'installment',
             'description' => 'Kauf auf Raten',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_installment.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::INSTALLMENT,
             'translation' => Array('description' => 'Wirecard Installment', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'skrillwallet',
             'description' => 'Skrill Digital Wallet',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_skrillwallet.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::SKRILLWALLET,
             'translation' => Array('description' => 'Wirecard Skrill Digital Wallet', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'ekonto',
             'description' => 'eKonto',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_ekonto.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::EKONTO,
             'translation' => Array('description' => 'Wirecard eKonto', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'trustly',
             'description' => 'Trustly',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_trustly.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::TRUSTLY,
             'translation' => Array('description' => 'Wirecard Trustly', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'ccard-moto',
             'description' => 'Kreditkarte - Post / Telefonbestellung',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_ccard.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::CCARD_MOTO,
             'translation' => Array('description' => 'Wirecard Credit Card - Mail Order and Telephone Order', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'tatrapay',
             'description' => 'TatraPay',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_tatrapay.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::TATRAPAY,
             'translation' => Array('description' => 'Wirecard TatraPay', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'epay',
             'description' => 'ePay.bg',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_epay.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::EPAYBG,
             'translation' => Array('description' => 'Wirecard ePay.bg', 'additionalDescription' => '')
         );
         $pm[] = array(
             'name' => 'voucher',
             'description' => 'Gutschein',
-            'template' => 'wirecard_brands.tpl',
+            'additionalDescription' => '<img src="{link file=\'frontend/_public/images/wirecard_voucher.png\'}" class="wirecard-brand"/>&nbsp;',
             'call' => WirecardCEE_QMore_PaymentType::VOUCHER,
             'translation' => Array('description' => 'Wirecard Voucher', 'additionalDescription' => '')
         );

Frontend/WirecardCheckoutSeamless/Models/Seamless.php

@@ -246,7 +246,7 @@ protected function getShoppingBasket()
                  ->setUnitTaxAmount(number_format($cart_item['price'] - $cart_item['netprice'], 2, '.', ''))
                  ->setUnitTaxRate($cart_item['tax_rate'])
                  ->setDescription( substr( strip_tags( $cart_item['additional_details']['description']), 0, 127 ) )
-                 ->setName($cart_item['additional_details']['articleName'])
+                 ->setName(isset($cart_item['additional_details']['articleName']) ? $cart_item['additional_details']['articleName'] : 'Surcharge')
                  ->setImageUrl( isset($cart_item['image']) ? $cart_item['image']['source'] : '' );
 
             $basket->addItem( $item, $cart_item['quantity']);

Frontend/WirecardCheckoutSeamless/Views/frontend/_resources/styles/wirecard.css

@@ -59,7 +59,7 @@ div.wirecard_selectfi {
 #paymentIframe {
     min-width: 320px;
     width:100%;
-    height: 500px;
+    height: 780px;
     position: relative;
     bottom: 985px;
     left: 50%;

Frontend/WirecardCheckoutSeamless/Views/frontend/checkout/wirecard_seamless.tpl

@@ -37,7 +37,7 @@
 {block name="frontend_index_content"}
 <div id="payment" class="grid_20" style="margin:10px 0 10px 20px;width:959px;">
     <h2 class="headingbox_dark largesize">{s name="WirecardCheckoutSeamlessPaymentHeader"}Bitte f&uuml;hren Sie nun die Zahlung durch:{/s}</h2>
-    <div id="payment_loader" class="ajaxSlider" style="height:500px;border:0 none;display:none">
+    <div id="payment_loader" class="ajaxSlider" style="height:780px;border:0 none;display:none">
         <div class="loader" style="width:80px;margin-left:-50px;">{s name="WirecardCheckoutSeamlessPaymentInfoWait"}Bitte warten...{/s}</div>
         <div id="innerpayment_loader"></div>
     </div>

Frontend/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/less/all.less

@@ -54,7 +54,7 @@
 #paymentIframe {
   min-width: 320px;
   width:100%;
-  height: 500px;
+  height: 780px;
   border: none;
 }
 

Frontend/WirecardCheckoutSeamless/Views/responsive/frontend/plugins/payment/wirecard_brands.tpl

@@ -1,70 +1,67 @@
 {namespace name='frontend/plugins/payment/wirecard_brands'}
 {if $sUserData.additional.payment.name == 'wirecard_ccard' || $sUserData.additional.payment.name == 'wirecard_ccard-moto' }
-    <img src="{link file='frontend/_public/images/wirecard_ccard.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_ccard.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_maestro' }
-    <img src="{link file='frontend/_public/images/wirecard_maestro.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_maestro.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_eps' }
-    <img src="{link file='frontend/_public/images/wirecard_eps.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_eps.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_ideal' }
-    <img src="{link file='frontend/_public/images/wirecard_ideal.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_ideal.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_giropay' }
-    <img src="{link file='frontend/_public/images/wirecard_giropay.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_giropay.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_sofortueberweisung' }
-    <img src="{link file='frontend/_public/images/wirecard_sofortueberweisung.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_sofortueberweisung.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_bancontact_mistercash' }
-    <img src="{link file='frontend/_public/images/wirecard_bancontact_mistercash.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_bancontact_mistercash.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_przelewy24' }
-    <img src="{link file='frontend/_public/images/wirecard_przelewy24.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_przelewy24.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_moneta' }
-    <img src="{link file='frontend/_public/images/wirecard_moneta.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_moneta.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_poli' }
-    <img src="{link file='frontend/_public/images/wirecard_poli.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_poli.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_pbx' }
-    <img src="{link file='frontend/_public/images/wirecard_pbx.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_pbx.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_psc' }
-    <img src="{link file='frontend/_public/images/wirecard_psc.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_psc.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_paypal' }
-    <img src="{link file='frontend/_public/images/wirecard_paypal.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_paypal.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_sepa-dd' }
-    <img src="{link file='frontend/_public/images/wirecard_sepa-dd.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_sepa-dd.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_invoice' }
-    <img src="{link file='frontend/_public/images/wirecard_invoice.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_invoice.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_installment' }
-    <img src="{link file='frontend/_public/images/wirecard_installment.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_installment.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_skrillwallet' }
-    <img src="{link file='frontend/_public/images/wirecard_skrillwallet.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_skrillwallet.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_ekonto' }
-    <img src="{link file='frontend/_public/images/wirecard_ekonto.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_ekonto.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_trustly' }
-    <img src="{link file='frontend/_public/images/wirecard_trustly.png'}"/>
-{/if}
-{if $sUserData.additional.payment.name == 'wirecard_ccard-moto' }
-    <img src="{link file='frontend/_public/images/wirecard_ccard-moto.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_trustly.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_tatrapay' }
-    <img src="{link file='frontend/_public/images/wirecard_tatrapay.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_tatrapay.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_epay' }
-    <img src="{link file='frontend/_public/images/wirecard_epay.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_epay.png'}" class="wirecard-brand"/>&nbsp;
 {/if}
 {if $sUserData.additional.payment.name == 'wirecard_voucher' }
-    <img src="{link file='frontend/_public/images/wirecard_voucher.png'}"/>
+    <img src="{link file='frontend/_public/images/wirecard_voucher.png'}" class="wirecard-brand"/>&nbsp;
 {/if}