From e08ec4c94552ac53d0275fabb879e017c8908133 Mon Sep 17 00:00:00 2001
From: Jeremy Seipelt <js@prograp.de>
Date: Fri, 15 Oct 2021 13:39:50 +0200
Subject: [PATCH] changed badge offset

---
 Resources/config/config.xml                   | 60 +++++++------------
 Resources/views/storefront/base.html.twig     | 26 +-------
 .../storefront/layout/footer/footer.html.twig | 12 ++--
 .../components/badge.html.twig                | 22 ++++++-
 4 files changed, 51 insertions(+), 69 deletions(-)

diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index f7931dc..1788d9e 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -55,6 +55,26 @@
                     <name>Add Manually</name>
                     <name lang="de-DE">Manuell Einfügen</name>
                 </option>
+                <option>
+                    <id>top_left</id>
+                    <name>top left</name>
+                    <name lang="de-DE">oben links</name>
+                </option>
+                <option>
+                    <id>top_right</id>
+                    <name>top right</name>
+                    <name lang="de-DE">oben rechts</name>
+                </option>
+                <option>
+                    <id>bottom_left</id>
+                    <name>bottom left</name>
+                    <name lang="de-DE">unten links</name>
+                </option>
+                <option>
+                    <id>bottom_right</id>
+                    <name>bottom right</name>
+                    <name lang="de-DE">unten rechts</name>
+                </option>
             </options>
         </input-field>
 
@@ -82,44 +102,8 @@
             </options>
         </input-field>
 
-        <input-field type="single-select">
-            <name>float</name>
-            <label>Badge Float</label>
-            <label lang="de-DE">Badge Float</label>
-            <helpText>Select if the badge should be floating instead of being part of the footer</helpText>
-            <helpText lang="de-DE">Wählen Sie ob das Badge am Bildschirm klebt, anstelle Teil des Footers zu sein</helpText>
-            <defaultValue>none</defaultValue>
-            <options>
-                <option>
-                    <id>none</id>
-                    <name>none</name>
-                    <name lang="de-DE">keins</name>
-                </option>
-                <option>
-                    <id>top_left</id>
-                    <name>top left</name>
-                    <name lang="de-DE">oben links</name>
-                </option>
-                <option>
-                    <id>top_right</id>
-                    <name>top right</name>
-                    <name lang="de-DE">oben rechts</name>
-                </option>
-                <option>
-                    <id>bottom_left</id>
-                    <name>bottom left</name>
-                    <name lang="de-DE">unten links</name>
-                </option>
-                <option>
-                    <id>bottom_right</id>
-                    <name>bottom right</name>
-                    <name lang="de-DE">unten rechts</name>
-                </option>
-            </options>
-        </input-field>
-
         <input-field type="int">
-            <name>offsetX</name>
+            <name>floatingOffsetX</name>
             <label>Offset X axis</label>
             <label lang="de-DE">Abstand X Achse</label>
             <helpText>Offset on the X axis from the nearest edge. Only affects floating badges!</helpText>
@@ -128,7 +112,7 @@
         </input-field>
 
         <input-field type="int">
-            <name>offsetY</name>
+            <name>floatingOffsetY</name>
             <label>Offset Y axis</label>
             <label lang="de-DE">Abstand Y Achse</label>
             <helpText>Offset on the Y axis from the nearest edge. Only affects floating badges!</helpText>
diff --git a/Resources/views/storefront/base.html.twig b/Resources/views/storefront/base.html.twig
index e750433..7de2c68 100644
--- a/Resources/views/storefront/base.html.twig
+++ b/Resources/views/storefront/base.html.twig
@@ -1,32 +1,12 @@
 {% sw_extends '@Storefront/storefront/base.html.twig' %}
 
-{% set float = config('ZmbGoogleCustomerReviews.config.float') %}
-{% set offsetY = config('ZmbGoogleCustomerReviews.config.offsetY') %}
-{% set offsetX = config('ZmbGoogleCustomerReviews.config.offsetX') %}
-
-{% macro offset(context) %}
-    {% if context.float == "top_left" %}
-        {% set axisY = "top" %}
-        {% set axisX = "left" %}
-    {% elseif context.float == "top_right" %}
-        {% set axisY = "top" %}
-        {% set axisX = "right" %}
-    {% elseif context.float == "bottom_left" %}
-        {% set axisY = "bottom" %}
-        {% set axisX = "left" %}
-    {% elseif context.float == "bottom_right" %}
-        {% set axisY = "bottom" %}
-        {% set axisX = "right" %}
-    {% endif %}
-    {{axisY}}:{{context.offsetY}}px;{{axisX}}:{{context.offsetX}}px;
-{% endmacro %}
-
+{% set position = config('ZmbGoogleCustomerReviews.config.position') %}
 
 {% block base_body_inner %}
     {{parent()}}
 
-    {% if float != 'none' %}
-        {% sw_include '@Storefront/pro-customer-reviews/components/badge.html.twig' with { class: "floating", offset: _self.offset(_context) } %}
+    {% if position == 'top_left' or position == 'top_right' or position == 'bottom_right' or position == 'bottom_left' %}
+        {% sw_include '@Storefront/pro-customer-reviews/components/badge.html.twig' with { class: "floating" } %}
     {% endif %}
 
 {% endblock %}
diff --git a/Resources/views/storefront/layout/footer/footer.html.twig b/Resources/views/storefront/layout/footer/footer.html.twig
index 61d3d8f..97aec1e 100644
--- a/Resources/views/storefront/layout/footer/footer.html.twig
+++ b/Resources/views/storefront/layout/footer/footer.html.twig
@@ -7,7 +7,7 @@
 {% block layout_footer_navigation_columns %}
     {{parent()}}
 
-    {% if positon == "new-column" and float == "none" %}
+    {% if positon == "new-column" %}
         <div class="col-md-4 footer-column js-footer-column">
             <div class="footer-column-headline footer-headline">
                 &nbsp;
@@ -24,21 +24,19 @@
 {% block layout_footer_navigation_information_links %}
     {{parent()}}
 
-    {% if position == "footer-nav" and loop.last and float == "none" %}
-        {% sw_include '@ZmbGoogleCustomerReviews/storefront/pro-customer-reviews/components/badge.html.twig' %}
+    {% if position == "footer-nav" and loop.last %}
     {% endif %}
 {% endblock %}
 
 {% block layout_footer_shipping_logos %}
     {{parent()}}
 
-    {% if position == "shipping-payment" and float == "none" %}
-        {% sw_include '@ZmbGoogleCustomerReviews/storefront/pro-customer-reviews/components/badge.html.twig' with { class: "footer-logo" } %}
+    {% if position == "shipping-payment" %}
     {% endif %}
 {% endblock %}
 
 {% block layout_footer_copyright %}
-    {% if position == "copyright-before" and float == "none" %}
+    {% if position == "copyright-before" %}
         <div class="footer-copyright" style="margin-bottom: 16px">
             {% sw_include '@ZmbGoogleCustomerReviews/storefront/pro-customer-reviews/components/badge.html.twig' %}
         </div>
@@ -46,7 +44,7 @@
 
     {{parent()}}
 
-    {% if position == "copyright-after" and float == "none" %}
+    {% if position == "copyright-after" %}
         <div class="footer-copyright" style="margin-top: 16px">
             {% sw_include '@ZmbGoogleCustomerReviews/storefront/pro-customer-reviews/components/badge.html.twig' %}
         </div>
diff --git a/Resources/views/storefront/pro-customer-reviews/components/badge.html.twig b/Resources/views/storefront/pro-customer-reviews/components/badge.html.twig
index abcad2f..ebdc798 100644
--- a/Resources/views/storefront/pro-customer-reviews/components/badge.html.twig
+++ b/Resources/views/storefront/pro-customer-reviews/components/badge.html.twig
@@ -1,7 +1,27 @@
 {% block pro_customer_reviews_badge %}{% apply spaceless %}
     {% set theme = theme ?: config('ZmbGoogleCustomerReviews.config.theme') %}
+    {% set position = config('ZmbGoogleCustomerReviews.config.position') %}
+    {% set offsetY = config('ZmbGoogleCustomerReviews.config.floatingOffsetY') %}
+    {% set offsetX = config('ZmbGoogleCustomerReviews.config.floatingOffsetX') %}
 
-  <a data-pro-customer-reviews target="_blank" data-key="{{ config('ZmbGoogleCustomerReviews.config.apiKey') }}" data-id="{{ config('ZmbGoogleCustomerReviews.config.placeId') }}" data-load-lib="{{ config('ZmbGoogleCustomerReviews.config.loadLib') }}" class="theme-{{theme}}{% if class %} {{ class }}{% endif %}" style="{% if offset %} {{ offset }}{% endif %}">
+    {% macro offset(context) %}
+        {% if context.position == "top_left" %}
+            {% set axisY = "top" %}
+            {% set axisX = "left" %}
+        {% elseif context.position == "top_right" %}
+            {% set axisY = "top" %}
+            {% set axisX = "right" %}
+        {% elseif context.position == "bottom_left" %}
+            {% set axisY = "bottom" %}
+            {% set axisX = "left" %}
+        {% elseif context.position == "bottom_right" %}
+            {% set axisY = "bottom" %}
+            {% set axisX = "right" %}
+        {% endif %}
+        {{axisY}}:{{context.offsetY}}px;{{axisX}}:{{context.offsetX}}px;
+    {% endmacro %}
+
+  <a data-pro-customer-reviews target="_blank" data-key="{{ config('ZmbGoogleCustomerReviews.config.apiKey') }}" data-id="{{ config('ZmbGoogleCustomerReviews.config.placeId') }}" data-load-lib="{{ config('ZmbGoogleCustomerReviews.config.loadLib') }}" class="theme-{{theme}}{% if class %} {{ class }}{% endif %}" style="{% if class == 'floating' %} {{ _self.offset(_context) }}{% endif %}">
         {% block pro_customer_reviews_badge_content %}
             {% block pro_customer_reviews_badge_rating %}
                 <div class="rating">