diff --git a/bin/css/order.css b/bin/css/order.css index 0ab403c7ddcc665c6f77316ba865ac702f2f11f3..dab83db895d56996ed9ed6c63c1f3b0b1f33eafe 100644 --- a/bin/css/order.css +++ b/bin/css/order.css @@ -93,15 +93,22 @@ .quiqqer-order-basket-total { float: right; - margin-top: 40px; + margin-top: 20px; text-align: right; - width: 300px; + width: 100%; + background: #f8f8f8; + border: 1px solid #ddd; + padding: 5px 10px; } .quiqqer-order-basket-total td { padding-bottom: 5px; } +.quiqqer-order-basket-total td:last-child { + width: 150px; +} + .quiqqer-order-basket-total-sum { font-weight: bold; } @@ -136,6 +143,10 @@ margin-right: 20px; } +.quiqqer-order-customerData-edit .quiqqer-order-customerData-edit-salutation { + margin-top: 0; +} + .quiqqer-order-ordering-step .quiqqer-order-customerData-comment { align-self: flex-start; background: #f8f8f8; diff --git a/locale.xml b/locale.xml index 03287359cf3eefee4c5c3416ae199a59307b4fab..1724f4fb1a728bc134337a0e0d07ea7ff2742af9 100644 --- a/locale.xml +++ b/locale.xml @@ -282,11 +282,11 @@ <de><![CDATA[ <br />Aktiviert das Anzeigen von UVP (unverbindliche Preisempfehlung der Herstellers) neben dem aktuellen Preis. Die UVP wird nur dann angezeigt, wenn die sie in Produkt-Eigenschaften eingetragen ist. - <br /><strong>Die Einstellung hat Auswirkung nur auf das Template. Externe Bausteine können das selbst über ihre Einstellunge regeln.</strong>]]></de> + <br /><strong>Die Einstellung hat Auswirkung nur auf das Template. Externe Bausteine können das anders regeln.</strong>]]></de> <en><![CDATA[ <br />Display the recommended retail price next to the current price. The retail price field in product properties must be filled. - <br /><strong>The setting only affects the template. External bricks can control this themselves via their settings.</strong>]]></en> + <br /><strong>The setting only affects the template. External bricks can regulate this differently.</strong>]]></en> </locale> <!-- basket style --> diff --git a/src/QUI/TemplateCologne/Controls/Payments.php b/src/QUI/TemplateCologne/Controls/Payments.php index 8dcbc96489d0ff261130665b86f18e17e6814d4e..4d6e32cbfb3e385ebe8f502c4b33bf9d90eba6e2 100644 --- a/src/QUI/TemplateCologne/Controls/Payments.php +++ b/src/QUI/TemplateCologne/Controls/Payments.php @@ -63,6 +63,10 @@ public function getBody() return $Engine->fetch($this->getAttribute('customTemplate')); } + echo "<pre>"; + var_dump($this->getAttribute('template')); + echo "</pre>"; + // control template (if custom template not set) switch ($this->getAttribute('template')) { case 'list':