WebSVN – wpShopGermany4 – Path Comparison

Ignore whitespace Rev 8379 → Rev 8325

/js/tiny-slider-2.9.2.min.js
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/css/tiny-slider.-2.9.4.min.css
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /mods/mod_rechnungen/invoice_pdf.phtml
 ,7 → 940,7
         } else {
-                if (($this->view['rebuild']??false) === false) $pdf->Output($oInvoice->getFilePath(), 'F');
+                $pdf->Output($oInvoice->getFilePath(), 'F');
                 // Hier wird der Dateiname an FPD übergeben. Er soll sich aus der Rechnungsnummer ergeben, auch wenn das Dokument über die ID gespeichert ist.
                 if ($this->view['output'] === true) $pdf->Output($this->view['filename_out'], 'I');

 /mods/mod_rechnungen/order_view.phtml
 ,25 → 30,17
                     <div>
                         <?php echo $oInvoice->getNr(true); ?>
                     </div>
-                    <div style="text-align:right; white-space:nowrap;">
-                                                <?php /*
-                                                <a target="_blank" href="<?php
-                                                        echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=rebuildadmin', 'wpsg-mod_invoice-order_ajax-rebuildadmin-'.$_REQUEST['edit_id']);
-                                                ?>" style="color:red;"><?php echo __('Neu erstellen', 'wpsg'); ?></a>
-                                                */ ?>
+                    <div style="text-align:right;">
                         <a target="_blank" onclick="if (!confirm('<?php echo __('Sind Sie sicher, dass Sie eine Kopie dieser Rechnung/Rechnungskorrektur erneut an den Kunden senden möchten?', 'wpsg'); ?>')) return false;" href="<?php
                             if ($r['o_id'] == '0') {
                                 // Multirechnung
                                 $r_o_ids = array_map('intval', explode(',', $r['o_ids']));
-                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$_REQUEST['edit_id']);
+                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$r_o_ids[0].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$r_o_ids[0]);
                             } else {
                                 // normale Rechnung
-                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$_REQUEST['edit_id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$_REQUEST['edit_id']);
+                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id='.$this->view['data']['id'].'&r_id='.$r['id'].'&do=copy', 'wpsg-mod_invoice-order_ajax-copy-'.$this->view['data']['id']);
                             }
                         ?>"><?php echo ' &nbsp;'.__("Kopie senden", "wpsg"); ?></a>&nbsp;
 ,6 → 59,6
 <style>
-    #wpsg_mod_rechnungen_order_view .grid { display:grid; width:100%; grid-template-columns:150px 1fr 250px; row-gap:0.25rem; column-gap:1rem; }
+    #wpsg_mod_rechnungen_order_view .grid { display:grid; width:100%; grid-template-columns:150px 1fr 100px; row-gap:0.25rem; }
 </style>

 /mods/mod_rechnungen/copymail.phtml
 ,13 → 1,13
 <?php
+   /*
+    *   Template für die Rechnungskopie
+    **/
-        /*
-         * Template für die Rechnungskopie
-         */
-        /** @var wpsg_order $oOrder */
-        $oOrder = wpsg_order::getInstance($this->view['order']['id']);
-?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), $oOrder->getInvoiceTitle(), $oOrder->getInvoiceFirstName(), $oOrder->getInvoiceName()); ?>
+    $arPflicht = $this->loadPflichtFeldDaten();
+    $arTitle = explode('|', $arPflicht['anrede_auswahl']);
+?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), @$arTitle[$this->view['basket']['checkout']['title']], $this->view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>
 <?php if (isset($this->view['rnr'])) { ?>
 <?php echo __("hiermit erhalten Sie die Kopie der Rechnung", "wpsg"); ?> <?php echo $this->view['rnr']; ?>.

 /mods/mod_deliverynote/order_view_content.phtml
 ,7 → 134,7
         function wpsg_mod_deliverynote_checkProducts()
         {
-                if (jQuery('.wpsg_mod_deliverynote_product_i:checked').length <= 0)
+                if (jQuery('.wpsg_mod_deliverynote_product:checked').length <= 0)
                 {
                         alert('<?php echo __('Bitte mindestens ein Produkt für den Lieferschein wählen', 'wpsg'); ?>');
 ,7 → 146,7
                         var arProductKeys = Array();
-                        jQuery('.wpsg_mod_deliverynote_product_i:checked').each(function() {
+                        jQuery('.wpsg_mod_deliverynote_product:checked').each(function() {
                                 arProductKeys.push(jQuery(this).val());
 ,7 → 153,6
                         } );
                         jQuery('#wpsg_mod_deliverynote_productindexes').val(arProductKeys.join(','));
                 }

 /mods/mod_deliverynote/order_view_row.phtml
 ,7 → 8,7
 <tr class="wpsg_<?php echo (($this->view['wpsg_mod_deliverynote']['i'] == 0)?'odd':'even'); ?>">
         <td align="left" colspan="<?php echo ((sizeof($this->view['arCalculation']['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'5':'4'); ?>">
                 <label style="font-weight:normal; display:flex; flex-direction:row; margin-bottom:0px;">
-                        <input checked="checked" type="checkbox" class="wpsg_mod_deliverynote_product_i" name="wpsg_mod_deliverynote_products[]" value="<?php echo $this->view['wpsg_mod_deliverynote']['product']['product_index']; ?>" style="margin:0px; margin-right:5px;" />
+                        <input checked="checked" type="checkbox" class="wpsg_mod_deliverynote_product" name="wpsg_mod_deliverynote_products[]" value="<?php echo $this->view['wpsg_mod_deliverynote']['product']['product_index']; ?>" style="margin:0px; margin-right:5px;" />
             <span>&nbsp;<?php echo __('Auf Lieferschein', 'wpsg'); ?></span>
                 </label>
         </td>

 /mods/mod_prepayment/mail_html.phtml
 ,54 → 30,4
                 <td><?php echo __('Betreff', 'wpsg'); ?>:</td>
                 <td style="text-align:right;"><?php echo wpsg_translate(__('#1#', 'wpsg'), $this->view['mod_prepayment']['subject']); ?></td>
         </tr>
-        <?php
-                if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {
-                        require_once WPSG_PATH_LIB.'phpgirocode.class.php';
-                        echo '<tr><td>'.__('Zahlen via QR Code', 'wpsg').':</td></tr>';
-                        if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') {
-                                $qrcodes = array();
-                                $qrcodes = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                                foreach ($qrcodes as $qr) {
-                                        if ($qr['title'] == 'QR-Rechnung') echo '<tr style="margin-top:25px;" >';
-                                        else echo '<tr>';
-                                                echo '<td>'.__($qr['title'], 'wpsg').'</td>';
-                                                echo '<td style="float:right;"><img style="max-width:120px;" width="120" height="120" src="data:image/png;base64,'.$qr['hash'].'" alt="qrcode" /></td>';
-                                        echo '</tr>';
-                                }
-                        } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') {
-                                $qrcode = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                                echo '
-                                        <tr>
-                                                <td>'.__($qrcode['title'], 'wpsg').':</td>
-                                                <td style="float:right;" alt="qrcode">'.$qrcode['hash'].'</td>
-                                        </tr>
-                                ';
-                        } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') {
-                                $qrcode = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                                echo '
-                                        <tr>
-                                                <td>'.__($qrcode['title'], 'wpsg').':</td>
-                                                <td style="float:right;" alt="qrcode">'.$qrcode['hash'].'</td>
-                                        </tr>
-                                ';
-                        }
-                }
-        ?>
-</table>
+ </table>

 /mods/mod_prepayment/order_done.phtml
 ,7 → 7,6
         //wpsg_debug($this->view['wpsg_mod_prepayment']['subject']);
 ?>
 <?php echo wpsg_translate(__('Sie haben die Zahlungsart "Vorkasse" gewählt. Überweisen Sie daher den Rechnungsbetrag von #1# auf folgendes Konto:', 'wpsg'), wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto'], $this->get_option('wpsg_currency'))); ?>
 <br /><br />
 <?php echo wpsg_translate(__('Kontoinhaber: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber'))); ?><br />
 ,168 → 15,21
 <?php echo wpsg_translate(__('BIC-/SWIFT-Code: #1#', 'wpsg'), $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_swift'))); ?>
 <br /><br />
 <?php echo wpsg_translate(__('Bitte als Betreff angeben: "#1#"', 'wpsg'), $this->view['wpsg_mod_prepayment']['subject']); ?>
-<br /><br />
-<?php return; if ( isset($this->view['wpsg_mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true) ) { ?>
-        <?php require_once WPSG_PATH_LIB.'phpgirocode.class.php'; ?>
-        <?php if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') { ?>
+<?php if (isset($this->view['wpsg_mod_prepayment']['subject'])) { ?>
+        <p>
+                <?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>
+        </p>
+        <?php
+                require_once WPSG_PATH_LIB.'phpgirocode.class.php';
+                $img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 8, PhpGirocode::OUTPUT_BASE64));
+                echo '<img src="data:image/png;base64,'.$img.'" />';
-                <!-- Girocode und QR-Rechnung -->
-                <?php
-                try {
-                        $img = array();
-                        $img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 10, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                ?>
-                <div class="wpsg_mod_prepayment_info_wrap">
-                        <?php foreach ($img as $i) { ?>
-                                <div class="wpsg_mod_prepayment_info">
-                                        <div class="wpsg_mod_prepayment_info_left">
-                    <div class="wpsg_mod_prepayment_info_left_qr-download">
-                                                <h4><?php echo wpsg_translate(__($i['title'], 'wpsg')); ?></h4>
-                                                <?php if (isset($i['filepath'])) { ?><a title="Downloadlink für die QR-Rechnung" target="_blank" href="<?php echo $this->callMod('wpsg_mod_prepayment', 'getFrontendLink', [$i['order_id']]); ?>"><i class="fa fa-download" aria-hidden="true"></i></a><?php } ?>
-                    </div>
-                        <br />
-                                                <?php echo '<img class="wpsg_mod_prepayment_info_left_qrcodeimg" src="data:image/png;base64,'.$i['hash'].'" />'; ?>
-                                                <br />
-                                                <div class="wpsg_mod_prepayment_info_left_wrap">
-                                                        <div class="wpsg_mod_prepayment_info_left_currency">
-                                                                <h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
-                                                                <?php echo $this->get_option('wpsg_currency'); ?>
-                                                        </div>
-                                                        <div class="wpsg_mod_prepayment_info_left_amount">
-                                                                <h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
-                                                                <?php echo sprintf("%.2f", $i['invoiceAmount']); ?>
-                                                        </div>
-                                                </div>
-                                        </div>
-                                        <div class="wpsg_mod_prepayment_info_right">
-                                                <h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
-                                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
-                                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
-                                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
-                                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
-                                                <?php if (!empty($i['referenceNumber'])) { ?>
-                                                        <h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
-                                                        <?php echo $i['referenceNumber']; ?><br />
-                                                <?php } ?>
-                                                <h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
-                                                <?php echo $i['additionalInformation']; ?><br />
-                                                <h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
-                                                <?php echo $i['customerdata']['vname'].' '.$i['customerdata']['name']; ?><br />
-                                                <?php echo $i['customerdata']['strasse'].' '.$i['customerdata']['nr']; ?><br />
-                                                <?php echo $i['customerdata']['plz'].' '.$i['customerdata']['ort']; ?><br />
-                                        </div>
-                                </div>
-                        <?php } ?>
-                </div>
-                <?php } catch (\Exception $e) { wpsg_debug($e); } ?>
-        <?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') { ?>
-                <!-- Girocode (EPC) -->
-                <p>
-                        <?php echo __('Wenn Ihre Banking-App Girocode unterstützt, können Sie diesen QRCode scannen.', 'wpsg'); ?>
-                </p>
-                <?php
-                        $img = array();
-                        $img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 10, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                ?>
-                <div class="wpsg_mod_prepayment_girocode">
-                        <div class="wpsg_mod_prepayment_girocode_left" >
-                                <h4><?php echo wpsg_translate(__($img['title'], 'wpsg')); ?></h4>
-                                <br />
-                                <?php echo '<img class="wpsg_mod_prepayment_girocode_left_qrcodeimg" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
-                                <br>
-                                <div class="wpsg_mod_prepayment_girocode_left_wrap">
-                                        <div class="wpsg_mod_prepayment_girocode_left_currency">
-                                                <h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
-                                                <?php echo $this->get_option('wpsg_currency'); ?>
-                                        </div>
-                                        <div class="wpsg_mod_prepayment_girocode_left_amount">
-                                                <h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
-                                                <?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
-                                        </div>
-                                </div>
-                        </div>
-                        <div class="wpsg_mod_prepayment_girocode_right">
-                                <h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
-                                <?php if (!empty($img['referenceNumber'])) { ?>
-                                        <h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
-                                        <?php echo $img['referenceNumber']; ?><br />
-                                <?php } ?>
-                                <h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
-                                <?php echo $img['additionalInformation']; ?><br />
-                                <h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
-                                <?php echo $img['customerdata']['vname'].' '.$img['customerdata']['name']; ?><br />
-                                <?php echo $img['customerdata']['strasse'].' '.$img['customerdata']['nr']; ?><br />
-                                <?php echo $img['customerdata']['plz'].' '.$img['customerdata']['ort']; ?><br />
-                        </div>
-                </div>
-        <?php } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') { ?>
-                <!-- QR-Rechnung (SWISS) -->
-                <?php
-                        $img = array();
-                        $img = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 10, PhpGirocode::OUTPUT_BASE64, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                ?>
-                <div class="wpsg_mod_prepayment_qrrechnung">
-                        <div class="wpsg_mod_prepayment_qrrechnung_left">
-                                <h4><?php echo wpsg_translate(__($img['title'], 'wpsg')); ?></h4>
-                                <br />
-                                <?php echo '<img class="wpsg_mod_prepayment_qrrechnung_left_qrcodeimg" src="data:image/png;base64,'.$img['hash'].'" />'; ?>
-                                <br>
-                                <div class="wpsg_mod_prepayment_qrrechnung_left_wrap">
-                                        <div class="wpsg_mod_prepayment_qrrechnung_left_currency">
-                                                <h4><?php echo wpsg_translate(__('Währung', 'wpsg')); ?></h4>
-                                                <?php echo $this->get_option('wpsg_currency'); ?>
-                                        </div>
-                                        <div class="wpsg_mod_prepayment_qrrechnung_left_amount">
-                                                <h4><?php echo wpsg_translate(__('Betrag', 'wpsg')); ?></h4>
-                                                <?php echo sprintf("%.2f", $img['invoiceAmount']); ?>
-                                        </div>
-                                </div>
-                        </div>
-                        <div class="wpsg_mod_prepayment_qrrechnung_right">
-                                <h4><?php echo wpsg_translate(__('Konto / Zahlbar an', 'wpsg')); ?></h4>
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_iban')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_mod_prepayment_kinhaber')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_street')); ?><br />
-                                <?php echo $this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_zip')).' '.$this->replaceUniversalPlatzhalter($this->get_option('wpsg_shopdata_city')); ?><br />
-                                <?php if (!empty($img['referenceNumber'])) { ?>
-                                        <h4><?php echo wpsg_translate(__('Referenz', 'wpsg')); ?></h4>
-                                        <?php echo $img['referenceNumber']; ?><br />
-                                <?php } ?>
-                                <h4><?php echo wpsg_translate(__('Zusätzliche Informationen', 'wpsg')); ?></h4>
-                                <?php echo $img['additionalInformation']; ?><br />
-                                <h4><?php echo wpsg_translate(__('Zahlbar durch', 'wpsg')); ?></h4>
-                                <?php echo $img['customerdata']['vname'].' '.$img['customerdata']['name']; ?><br />
-                                <?php echo $img['customerdata']['strasse'].' '.$img['customerdata']['nr']; ?><br />
-                                <?php echo $img['customerdata']['plz'].' '.$img['customerdata']['ort']; ?><br />
-                        </div>
-                </div>
-        <?php } ?>
+        ?>
 <?php } ?>

/mods/mod_prepayment/settings_edit.phtml
22,3 → 22,4
<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_bank', __('Bank', 'wpsg'), $this->get_option('wpsg_mod_prepayment_bank'), array('help' => 'wpsg_mod_prepayment_bank')); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_iban', __('IBAN', 'wpsg'), $this->get_option('wpsg_mod_prepayment_iban'), array('help' => 'wpsg_mod_prepayment_iban')); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_swift', __('BIC-/SWIFT Code', 'wpsg'), $this->get_option('wpsg_mod_prepayment_swift'), array('help' => 'wpsg_mod_prepayment_swift')); ?>

 /mods/mod_legaltexts/form_haendlerbund.phtml
 ,45 → 8,17
 <style type="text/css">
-        .wphb_form_field {
-                width: 100%;
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-        }
-        .wphb_form_field input {
-                width: 100%;
-        }
-        .wphb_form_left {
-                width: 50% !important;
-                flex-grow: 0;
-                flex-shrink: 0;
-        }
-        .wphb_form_right {
-                width: 50% !important;
-                flex-grow: 0;
-                flex-shrink: 0;
-        }
-        .wphb_table {
-                width: 100%;
-                border-spacing: 0px;
-                border-collapse: collapse;
-        }
-        .wphb_table input {
-                min-height: unset !important;
-        }
-        .wphb_table select {
-                width: 100%;
-        }
-        .col0 {
-                width: 50%;
-        }
-        .col1 {
-                width: 50%;
-        }
+        .wphb_clear { clear:both; }
+        .wphb_form_field { width:770px; margin-bottom:5px; }
+        .wphb_form_field .wphb_form_left { line-height:24px; font-weight:bold; width:350px; float:left; }
+        .wphb_form_field .wphb_form_right { width:420px; float:left; position:relative; line-height:28px; }
+        .wphb_form_field .wphb_form_right select, .wphb_form_field .wphb_form_right input { width:95%; }
+        .wphb_form_field .wphb_form_right input.checkbox { width:auto !important; float:left; margin-left:2px; margin-top:5px; }
+        .wphb_form_field .wphb_form_right p { padding:4px 0px 4px 6px; margin:0px; }
+        .wphb_form { padding:10px; }
+        .wphb_date { float:right; padding-right:5%; }
+        .wphb_hinweis { font-style:italic; }
 </style>
 <?php if ($this->view['wpsg_mod_legaltexts']['form'] == false) { ?>

 /order/index.phtml
 ,7 → 79,7
                                 <select name="filter[cdate_m]" class="form-control input-sm">
                                     <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
                                     <?php for ($i = 1; $i <= 12; $i ++) { ?>
-                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo __(date('F', mktime(0, 0, 0, $i, 1, 2000))); ?></option>
+                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
                                     <?php } ?>
                                 </select>
                             </div>

/produkt/addedit_texte.phtml
42,7 → 42,6
?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>

<?php $this->callMods('product_addedit_before_longtext'); ?>
<?php echo wpsg_drawForm_AdminboxStart(__('Langtext', 'wpsg')); ?>
<?php

 /admin/shopdata.phtml
 ,12 → 21,6
         <form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">
                 <?php \wp_nonce_field('wpsg-save-admin-shopdata'); ?>
-                <?php
-                        $countrys = array();
-                        $arCountry = wpsg_country::find();
-                        foreach ($arCountry as $oCountry) $countrys[$oCountry->getId()] = $oCountry->getName();
-                ?>
                 <div class="panel panel-default">
                         <div class="panel-heading clearfix">
 ,7 → 29,6
                         <div class="panel-body">
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_name', __('Name des Shops / Firma', 'wpsg'), $this->get_option('wpsg_shopdata_name'), array('help' => 'wpsg_shopdata_name')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_owner', __('Inhaber des Shops', 'wpsg'), $this->get_option('wpsg_shopdata_owner'), array('help' => 'wpsg_shopdata_owner')); ?>
-                                <br />
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_tel', __('Telefonnummer', 'wpsg'), $this->get_option('wpsg_shopdata_tel'), array('help' => 'wpsg_shopdata_tel')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_fax', __('Faxnummer', 'wpsg'), $this->get_option('wpsg_shopdata_fax'), array('help' => 'wpsg_shopdata_fax')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_email'), array('help' => 'wpsg_shopdata_email')); ?>
 ,10 → 42,16
                         <h3 class="panel-title"><?php echo __('Anschrift', 'wpsg'); ?></h3>
                 </div>
                         <div class="panel-body">
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_street'), array('help' => 'wpsg_shopdata_street')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_zip'), array('help' => 'wpsg_shopdata_zip')); ?>
-                                <?php echo wpsg_drawForm_Input('wpsg_shopdata_city', __('Ort', 'wpsg'), $this->get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?>
-                                <?php echo wpsg_drawForm_Select('wpsg_shopdata_country', __('Land', 'wpsg'), $countrys, $this->get_option('wpsg_shopdata_country'), array('help' => 'wpsg_shopdata_country')); ?>
+                                <?php echo wpsg_drawForm_Input('wpsg_shopdata_city', __('Ort', 'wpsg'), $this->get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?>
+                                <?php echo wpsg_drawForm_Select('wpsg_shopdata_eu', __('Hauptsitz des Shopbetreiber befindet sich:', 'wpsg'), Array(
+                                        wpsg_AdminController::SHOPDATA_EU_GERMANY => __('in Deutschland', 'wpsg'),
+                                        wpsg_AdminController::SHOPDATA_EU_EU => __('innerhalb der EU', 'wpsg'),
+                                        wpsg_AdminController::SHOPDATA_EU_WORLD => __('im europäischen Ausland', 'wpsg')
+                                ), $this->get_option('wpsg_shopdata_eu'), array('help' => 'wpsg_shopdata_eu')); ?>
                         </div>
                 </div>
 ,17 → 60,16
                         <h3 class="panel-title"><?php echo __('Zweigstelle', 'wpsg'); ?></h3>
                 </div>
                         <div class="panel-body">
-                                <?php echo wpsg_drawForm_Checkbox('wpsg_shopdata_2', __('Zweigstelle vorhanden', 'wpsg'), $this->get_option('wpsg_shopdata_2'), array('help' => 'wpsg_shopdata_2')); ?>
-                                <div class="wpsg_shopdata_2_activ" style="display:none;">
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_2_street')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_2_zip')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_city', __('Ort', 'wpsg'), $this->get_option('wpsg_shopdata_2_city')); ?>
-                                        <?php echo wpsg_drawForm_Select('wpsg_shopdata_2_country', __('Land', 'wpsg'), $countrys, $this->get_option('wpsg_shopdata_2_country')); ?>
-                                        <br />
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_tel', __('Telefon', 'wpsg'), $this->get_option('wpsg_shopdata_2_tel')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_fax', __('Fax', 'wpsg'), $this->get_option('wpsg_shopdata_2_fax')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_2_email')); ?>
-                                </div>
+                                <?php echo wpsg_drawForm_Checkbox('wpsg_shopdata_2', __('Zweigstelle vorhanden', 'wpsg'), $this->get_option('wpsg_shopdata_2')); ?>
+                                        <div class="wpsg_shopdata_2_activ" style="display:none;">
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_2_street'), array('help' => 'wpsg_shopdata_2_street')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_2_zip'), array('help' => 'wpsg_shopdata_2_zip')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_city', __('Ort', 'wpsg'), $this->get_option('wpsg_shopdata_2_city'), array('help' => 'wpsg_shopdata_2_city')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_country', __('Land', 'wpsg'), $this->get_option('wpsg_shopdata_2_country'), array('help' => 'wpsg_shopdata_2_country')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_tel', __('Telefon', 'wpsg'), $this->get_option('wpsg_shopdata_2_tel'), array('help' => 'wpsg_shopdata_2_tel')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_fax', __('Fax', 'wpsg'), $this->get_option('wpsg_shopdata_2_fax'), array('help' => 'wpsg_shopdata_2_fax')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_2_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_2_email'), array('help' => 'wpsg_shopdata_2_email')); ?>
+                                        </div>
                         </div>
                 </div>
 ,32 → 78,32
                         <h3 class="panel-title"><?php echo __('Bankdaten', 'wpsg'); ?></h3>
                 </div>
                         <div class="panel-body">
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_name', __('Name der Bank', 'wpsg'), $this->get_option('wpsg_shopdata_bank_name'), array('help' => 'wpsg_shopdata_bank_name')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_owner', __('Kontoinhaber', 'wpsg'), $this->get_option('wpsg_shopdata_bank_owner'), array('help' => 'wpsg_shopdata_bank_owner')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_iban', __('IBAN Nummer', 'wpsg'), $this->get_option('wpsg_shopdata_bank_iban'), array('help' => 'wpsg_shopdata_bank_iban')); ?>
                                 <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_bic', __('BIC Nummer', 'wpsg'), $this->get_option('wpsg_shopdata_bank_bic'), array('help' => 'wpsg_shopdata_bank_bic')); ?>
-                                <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_qriban', __('QR-IBAN Nummer', 'wpsg'), $this->get_option('wpsg_shopdata_bank_qriban'), array('help' => 'wpsg_shopdata_bank_qriban')); ?>
-                                <?php echo wpsg_drawForm_Input('wpsg_shopdata_bank_besr', __('BESR-ID', 'wpsg'), $this->get_option('wpsg_shopdata_bank_besr'), array('help' => 'wpsg_shopdata_bank_besr')); ?>
                         </div>
                 </div>
-                <div class="panel panel-default">
-                        <div class="panel-heading clearfix">
-                                <h3 class="panel-title"><?php echo __('EU-Vertreter', 'wpsg'); ?></h3>
-                        </div>
-                        <div class="panel-body">
-                                <?php echo wpsg_drawForm_Checkbox('wpsg_shopdata_3', __('EU-Vertreter vorhanden', 'wpsg'), $this->get_option('wpsg_shopdata_3'), array('help' => 'wpsg_shopdata_3')); ?>
-                                <div class="wpsg_shopdata_3_activ" style="display:none;">
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_name', __('Name des EU-Vertreters', 'wpsg'), $this->get_option('wpsg_shopdata_eu_name')); ?>
+                <?php /* only Standort = Ausland */ ?>
+                <div class="wpsg_shopdata_eu wpsg_shopdata_eu_<?php echo wpsg_AdminController::SHOPDATA_EU_WORLD; ?>" style="display:<?php echo (($this->get_option('wpsg_shopdata_eu') == wpsg_AdminController::SHOPDATA_EU_WORLD || $this->get_option('wpsg_shopdata_eu') === false)?'block':'none'); ?>;">
+                        <div class="panel panel-default">
+                                <div class="panel-heading clearfix">
+                                        <h3 class="panel-title"><?php echo __('EU-Vertreter', 'wpsg'); ?></h3>
+                                </div>
+                                <div class="panel-body">
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_name', __('Name des EU-Vertreters', 'wpsg'), $this->get_option('wpsg_shopdata_eu_name'), array('help' => 'wpsg_shopdata_eu_name')); ?>
                                         <br />
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_eu_street')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_eu_zip')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_city', __('Stadt', 'wpsg'), $this->get_option('wpsg_shopdata_eu_city')); ?>
-                                        <?php echo wpsg_drawForm_Select('wpsg_shopdata_eu_country', __('Land', 'wpsg'), $countrys, $this->get_option('wpsg_shopdata_eu_country')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_eu_street'), array('help' => 'wpsg_shopdata_eu_street')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_eu_zip'), array('help' => 'wpsg_shopdata_eu_zip')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_city', __('Stadt', 'wpsg'), $this->get_option('wpsg_shopdata_eu_city'), array('help' => 'wpsg_shopdata_eu_city')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_country', __('Land', 'wpsg'), $this->get_option('wpsg_shopdata_eu_country'), array('help' => 'wpsg_shopdata_eu_country')); ?>
                                         <br />
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_tel', __('Telefonnummer', 'wpsg'), $this->get_option('wpsg_shopdata_eu_tel')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_fax', __('Faxnummer', 'wpsg'), $this->get_option('wpsg_shopdata_eu_fax')); ?>
-                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_eu_email')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_tel', __('Telefonnummer', 'wpsg'), $this->get_option('wpsg_shopdata_eu_tel'), array('help' => 'wpsg_shopdata_eu_tel')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_fax', __('Faxnummer', 'wpsg'), $this->get_option('wpsg_shopdata_eu_fax'), array('help' => 'wpsg_shopdata_eu_fax')); ?>
+                                        <?php echo wpsg_drawForm_Input('wpsg_shopdata_eu_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_eu_email'), array('help' => 'wpsg_shopdata_eu_email')); ?>
                                 </div>
                         </div>
                 </div>
 ,13 → 121,7
                                 } ).change();
-                                jQuery('#wpsg_shopdata_3').bind('change', function() {
-                                        if (jQuery(this).is(':checked')) jQuery('.wpsg_shopdata_3_activ').show();
-                                        else jQuery('.wpsg_shopdata_3_activ').hide();
-                                } ).change();
                         } );
                 /* ]]> */</script>

/warenkorb/basket.phtml
6,7 → 6,6

//wpsg_debug($this->view['basket']);
//wpsg_debug($this->view['basket']['arCalculation']);

//wpsg_debug($_SESSION['wpsg']);
//wpsg_debug($this->arShipping);

 /mailtemplates/html/customer.phtml
 ,28 → 169,12
         require_once WPSG_PATH_LIB.'phpgirocode.class.php';
-        if (isset($this->view['mod_prepayment']['subject']) && ($this->get_option('wpsg_mod_prepayment_qrcode') == true)) {
+        if (isset($this->view['mod_prepayment']['subject'])) {
                 if (in_array('kundenmail.phtml', $this->arTemplateStack)) {
-                        if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '0') {
+                        echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE));
-                                $qrcodes = array();
-                                $qrcodes = $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['wpsg_mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                                foreach ($qrcodes as $qr) echo $qr;
-                        } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '1') {
-                                echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                        } else if ($this->get_option('wpsg_mod_prepayment_qrcode_country') == '2') {
-                                echo $this->callMod('wpsg_mod_prepayment', 'genQRCode', array($this->view['o_id'], $this->view['mod_prepayment']['subject'], $this->view['basket']['sum']['preis_gesamt_brutto'], 3, PhpGirocode::OUTPUT_FILE, $this->get_option('wpsg_mod_prepayment_qrcode_country'), $this->view['basket']));
-                        }
                 }
         }

 /css/frontend.css
 ,11 → 78,7
 .wpsg_basket .wpsg_checkoutbutton { float:right; padding:0.75em 1em; }
 .wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; }
-.wpsg_checkout2 .wpsg_overviewbutton,
-.wpsg_checkout2 .wpsg_checkoutbutton,
-.wpsg_overview .wpsg_orderbutton,
-.wpsg_overview .wpsg_checkoutbutton,
-.wpsg_basket .wpsg_refreshbutton, .wpsg_checkout2button, .wpsg_basketbutton { float:left; padding:0.75em 1em; }
+.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; padding:0.75em 1em; }
 .wpsg_basket .wpsg_basket_weiter_shoppen {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;}
 .wpsg_basket .product_action_printshop .label { align-self:flex-start; }
 .wpsg_basket .product_action_printshop .files ul li { list-style:none; display:flex; align-items:center; justify-content:flex-end; }
 ,7 → 250,7
 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_informationarea { margin-top:1.5em; margin-bottom:1.5em; }
 .wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; }
 .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:48%; float:left; box-sizing:border-box; padding:0.7em; line-height:1.5em; font-size:1rem; }
-.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; cursor:pointer; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; }
+.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; }
 .wpsg_productform .wpsg_product_layer { position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); padding:0.75em; margin:-0.75em; box-sizing:content-box; }
 .wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; }
 .wpsg_productform .wpsg_produkt_produktbilder { max-width:200px; }
 ,7 → 451,7
 .wpsg_progress:after { border:1px solid #C5C5C5; height:10px; background-color:#F2F2F2; box-sizing:border-box; display:block; width:100%; content:" "; }
 .wpsg_progress span.step { width:25%; display:block; float:left; list-style:none; position:relative; }
 .wpsg_progress span.step > .text { margin-top:30px; text-align:center; width:100%; display:block; }
-.wpsg_progress span.step > .dot { position:absolute; z-index:2; background-color:#C5C5C5; width:20px; height:20px; left:50%; top:0%; margin-left:-14px; margin-top:-4px; border-radius:10px; }
+.wpsg_progress span.step > .dot { position:absolute; z-index:2; background-color:#C5C5C5; width:20px; height:20px; left:50%; top:0%; margin-left:-15px; margin-top:-5px; border-radius:10px; }
 .wpsg_progress span.step:before { border:1px solid #C5C5C5; position:absolute; z-index:2; left:50%; margin-left:-20px; text-align:center; line-height:40px; background-color:#F2F2F2; content:" "; display:block; width:30px; height:30px; border-radius:25px; margin-top:-10px; }
 .wpsg_progress span.step1:before { content:""; }
 .wpsg_progress span.step2:before { content:""; }
 ,30 → 555,4
 /* wpsg_mod_amazon_v2 */
 #AmazonPayButton_wrap { text-align:right; margin-bottom:2rem; width:100%; justify-content:flex-end; display:flex; }
 #AmazonPayButton_wrap #AmazonPayButton { width:210px; }
-#AmazonLoginButton_wrap { text-align:right; margin-bottom:2rem; width:100%; justify-content:flex-end; display:flex; }
-/* wpsg_mod_prepayment - QR-Code auf Bestellabschlussseite */
-.wpsg_mod_prepayment_info_wrap { display:flex; justify-content:center; flex-direction:column; gap:20px; }
-.wpsg_mod_prepayment_info { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px; }
-.wpsg_mod_prepayment_info h4{ margin: 0; }
-.wpsg_mod_prepayment_info_left { display: flex; flex-direction: column; }
-.wpsg_mod_prepayment_info_left_qrcodeimg { width:240px; height:240px; }
-.wpsg_mod_prepayment_info_left_wrap { display:flex; gap:25%; }
-.wpsg_mod_prepayment_info_left_currency { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_info_left_amount { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_girocode { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px;}
-.wpsg_mod_prepayment_girocode h4{ margin: 0; }
-.wpsg_mod_prepayment_girocode_left { display: flex; flex-direction: column; }
-.wpsg_mod_prepayment_girocode_left_qrcodeimg { width:240px; height:240px; }
-.wpsg_mod_prepayment_girocode_left_wrap { display:flex; gap:25%; }
-.wpsg_mod_prepayment_girocode_left_currency { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_girocode_left_amount { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_qrrechnung { display: flex; gap: 20px; border: 1px solid #000000; padding: 20px; }
-.wpsg_mod_prepayment_qrrechnung h4{ margin: 0; }
-.wpsg_mod_prepayment_qrrechnung_left { display: flex; flex-direction: column; }
-.wpsg_mod_prepayment_qrrechnung_left_qrcodeimg { width:240px; height:240px; }
-.wpsg_mod_prepayment_qrrechnung_left_wrap { display:flex; gap:25%; }
-.wpsg_mod_prepayment_qrrechnung_left_currency { display:flex; flex-direction:column; }
-.wpsg_mod_prepayment_qrrechnung_left_amount { display:flex; flex-direction:column; }
+#AmazonLoginButton_wrap { text-align:right; margin-bottom:2rem; width:100%; justify-content:flex-end; display:flex; }

Subversion Repositories wpShopGermany4

Compare Revisions

Ignore whitespace Rev 8379 → Rev 8325