From 2acfbd2168a4f72682fe84171be7592731eae970 Mon Sep 17 00:00:00 2001
From: Youri Westerman <youri.westerman@nedac.eu>
Date: Thu, 3 Jun 2021 15:59:02 +0200
Subject: [PATCH 1/2] Add recipe for Nedac Sylius Minimum Ordr Value plugin

---
 ...dac_sylius_minimum_order_value_plugin.yaml |  2 +
 .../1.0/manifest.json                         | 10 ++
 .../1.0/src/Entity/Channel/Channel.php        | 20 ++++
 .../SyliusAdminBundle/Channel/_form.html.twig | 93 +++++++++++++++++++
 .../Cart/Summary/_checkout.html.twig          | 20 ++++
 .../Cart/Widget/_popup.html.twig              | 20 ++++
 .../SyliusShopBundle/Cart/_widget.html.twig   |  6 ++
 7 files changed, 171 insertions(+)
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/config/packages/nedac_sylius_minimum_order_value_plugin.yaml
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/src/Entity/Channel/Channel.php
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
 create mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig

diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/config/packages/nedac_sylius_minimum_order_value_plugin.yaml b/nedac/sylius-minimum-order-value-plugin/1.0/config/packages/nedac_sylius_minimum_order_value_plugin.yaml
new file mode 100644
index 00000000..64e5c242
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/config/packages/nedac_sylius_minimum_order_value_plugin.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "@NedacSyliusMinimumOrderValuePlugin/Resources/config/config.yaml" }
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json b/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
new file mode 100644
index 00000000..68498200
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
@@ -0,0 +1,10 @@
+{
+    "bundles": {
+        "Nedac\\SyliusMinimumOrderValuePlugin\\NedacSyliusMinimumOrderValuePlugin": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/",
+        "src/": "%SRC_DIR%",
+        "templates/": "templates/"
+    }
+}
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/src/Entity/Channel/Channel.php b/nedac/sylius-minimum-order-value-plugin/1.0/src/Entity/Channel/Channel.php
new file mode 100644
index 00000000..635918c2
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/src/Entity/Channel/Channel.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Channel;
+
+use Doctrine\ORM\Mapping as ORM;
+use Nedac\SyliusMinimumOrderValuePlugin\Model\ChannelInterface as NedacSyliusMinimumOrderValuePluginChannelInterface;
+use Nedac\SyliusMinimumOrderValuePlugin\Model\MinimumOrderValueTrait as
+    NedacSyliusMinimumOrderValuePluginMinimumOrderValueTrait;
+use Sylius\Component\Core\Model\Channel as BaseChannel;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="sylius_channel")
+ */
+class Channel extends BaseChannel implements NedacSyliusMinimumOrderValuePluginChannelInterface
+{
+    use NedacSyliusMinimumOrderValuePluginMinimumOrderValueTrait;
+}
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
new file mode 100644
index 00000000..93064b42
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
@@ -0,0 +1,93 @@
+{{ form_errors(form) }}
+<div class="ui two column stackable grid">
+    <div class="column">
+        <h4 class="ui top attached large header">{{ 'sylius.ui.general'|trans }}</h4>
+        <div class="ui attached segment">
+            {{ form_errors(form) }}
+            <div class="fields">
+                <div class="six wide field">
+                    {{ form_row(form.code) }}
+                </div>
+                <div class="seven wide field">
+                    {{ form_row(form.name) }}
+                </div>
+                <div class="three wide field">
+                    {{ form_row(form.color) }}
+                </div>
+            </div>
+            <div class="ui hidden divider"></div>
+            {{ form_row(form.enabled) }}
+        </div>
+        <div class="ui attached segment">
+            <div class="field">
+                {{ form_label(form.hostname) }}
+                <div class="ui labeled input">
+                    <div class="ui label">http://</div>
+                    {{ form_widget(form.hostname) }}
+                </div>
+                {{ form_errors(form.hostname) }}
+            </div>
+            {{ form_row(form.contactEmail) }}
+            {{ form_row(form.description, {'attr': {'rows' : '3'}}) }}
+        </div>
+        <div class="ui attached segment">
+            {{ form_row(form.countries) }}
+        </div>
+        <div class="ui hidden divider"></div>
+        <h4 class="ui top attached large header">{{ 'sylius.ui.money'|trans }}</h4>
+        <div class="ui attached segment">
+            <div class="two fields">
+                {{ form_row(form.baseCurrency) }}
+                {{ form_row(form.currencies) }}
+            </div>
+        </div>
+        <div class="ui attached segment">
+            {{ form_row(form.defaultTaxZone) }}
+            {{ form_row(form.taxCalculationStrategy) }}
+        </div>
+    </div>
+    <div class="column">
+        <h4 class="ui top attached large header">{{ form_label(form.shopBillingData) }}</h4>
+        <div class="ui attached segment">
+            <div class="two fields">
+                {{ form_row(form.shopBillingData.company) }}
+                {{ form_row(form.shopBillingData.taxId) }}
+            </div>
+            <div class="two fields">
+                {{ form_row(form.shopBillingData.countryCode) }}
+                {{ form_row(form.shopBillingData.street) }}
+            </div>
+            <div class="two fields">
+                {{ form_row(form.shopBillingData.city) }}
+                {{ form_row(form.shopBillingData.postcode) }}
+            </div>
+        </div>
+        <div class="ui hidden divider"></div>
+        <h4 class="ui top attached large header">{{ 'sylius.ui.look_and_feel'|trans }}</h4>
+        <div class="ui attached segment">
+            {{ form_row(form.themeName) }}
+        </div>
+        <div class="ui attached segment">
+            {{ form_row(form.locales) }}
+            {{ form_row(form.defaultLocale) }}
+        </div>
+        <div class="ui attached segment">
+            {{ form_row(form.menuTaxon) }}
+        </div>
+        <div class="ui hidden divider"></div>
+        <div id="nedac-sylius-minimum-order-value-plugin-admin-before" class="ui attached segment">
+            {{ form_row(form.skippingShippingStepAllowed) }}
+            {{ form_row(form.skippingPaymentStepAllowed) }}
+            {{ form_row(form.accountVerificationRequired) }}
+        </div>
+        {% if form.minimumOrderValue is defined %}
+            <div id="nedac-sylius-minimum-order-value-plugin-admin-segment" class="ui segment">
+                {{ form_row(form.minimumOrderValue) }}
+                <div class="ui toggle checkbox">
+                    <input id="nedac-sylius-minimum-order-value-plugin-admin-toggle" type="checkbox" name="public">
+                    <label>{{ 'nedac_sylius_minimum_order_value_plugin.ui.enabled'|trans }}</label>
+                </div>
+            </div>
+        {% endif %}
+    </div>
+</div>
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
new file mode 100644
index 00000000..1a69d0fd
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
@@ -0,0 +1,20 @@
+{% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
+
+{% set minimumOrderValue = cart.channel.minimumOrderValue %}
+{% set total = sylius_order_items_subtotal(cart) %}
+
+{% if total >= minimumOrderValue %}
+    {% set buttonClass = "ui huge primary fluid labeled icon button" %}
+{% else %}
+    {% set buttonClass = "ui huge primary fluid labeled icon button disabled" %}
+    {% set formattedMinimum = money.convertAndFormat(minimumOrderValue) %}
+    {% set formattedDifference = money.convertAndFormat(minimumOrderValue - total) %}
+    <div class="ui icon negative message">
+        <i class="warning icon"></i>
+        <div class="content">
+            <div class="header">{{ 'nedac_sylius_minimum_order_value_plugin.ui.attention'|trans }}</div>
+            <p id="nedac-sylius-minimum-order-value-plugin-message" {{ sylius_test_html_attribute('minimum-order-value-plugin-message') }}>{{ 'nedac_sylius_minimum_order_value_plugin.ui.minimum_not_yet_reached'|trans({ '%minimumOrderValue% ': formattedMinimum, '%difference%': formattedDifference })|raw('br') }}</p>
+        </div>
+    </div>
+{% endif %}
+<a href="{{ path('sylius_shop_checkout_start') }}" class="{{ buttonClass }}" id="nedac-checkout-button" {{ sylius_test_html_attribute('checkout-button') }}><i class="check icon"></i> {{ 'sylius.ui.checkout'|trans }}</a>
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
new file mode 100644
index 00000000..96f6b88b
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
@@ -0,0 +1,20 @@
+{% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
+
+{% set minimumOrderValue = cart.channel.minimumOrderValue %}
+{% set total = sylius_order_items_subtotal(cart) %}
+
+{% if cart.empty %}
+    {{ 'sylius.ui.your_cart_is_empty'|trans }}.
+{% else %}
+    <div class="ui list">
+        {% for item in cart.items %}
+            <div class="item">{{ item.quantity }} x <strong>{{ item.product }}</strong> {{ money.convertAndFormat(item.unitPrice) }}</div>
+        {% endfor %}
+        <div class="item"><strong>{{ 'sylius.ui.subtotal'|trans }}</strong>: {{ money.convertAndFormat(cart.itemsTotal) }}</div>
+    </div>
+    <a href="{{ path('sylius_shop_cart_summary') }}" class="ui fluid basic text button">{{ 'sylius.ui.view_and_edit_cart'|trans }}</a>
+    {% if total >= minimumOrderValue %}
+        <div class="ui divider"></div>
+        <a href="{{ path('sylius_shop_checkout_start') }}" class="ui fluid primary button">{{ 'sylius.ui.checkout'|trans }}</a>
+    {% endif %}
+{% endif %}
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig
new file mode 100644
index 00000000..2ca25ac8
--- /dev/null
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig
@@ -0,0 +1,6 @@
+<div id="sylius-cart-button" class="ui circular cart button" {{ sylius_test_html_attribute('cart-button') }}>
+    {{ sylius_template_event('sylius.shop.cart.widget.button', {'cart': cart}) }}
+</div>
+<div class="ui large flowing cart hidden popup" id="nedac-sylius-minimum-order-value-plugin-popup" {{ sylius_test_html_attribute('widget-popup') }}>
+    {{ sylius_template_event('sylius.shop.cart.widget.popup', {'cart': cart}) }}
+</div>

From 2762f04dfb7cddd2143b19d4ba0b25a5df5821f6 Mon Sep 17 00:00:00 2001
From: Youri Westerman <youri.westerman@nedac.eu>
Date: Fri, 11 Jun 2021 09:31:58 +0200
Subject: [PATCH 2/2] Copying templates from package

---
 .../1.0/manifest.json                         |  6 +-
 .../SyliusAdminBundle/Channel/_form.html.twig | 93 -------------------
 .../Cart/Summary/_checkout.html.twig          | 20 ----
 .../Cart/Widget/_popup.html.twig              | 20 ----
 .../SyliusShopBundle/Cart/_widget.html.twig   |  6 --
 5 files changed, 4 insertions(+), 141 deletions(-)
 delete mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
 delete mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
 delete mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
 delete mode 100644 nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig

diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json b/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
index 68498200..2b42f3c5 100644
--- a/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
+++ b/nedac/sylius-minimum-order-value-plugin/1.0/manifest.json
@@ -4,7 +4,9 @@
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/",
-        "src/": "%SRC_DIR%",
-        "templates/": "templates/"
+        "src/": "%SRC_DIR%"
+    },
+    "copy-from-package": {
+        "src/Resources/views/bundles/": "templates/bundles/"
     }
 }
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
deleted file mode 100644
index 93064b42..00000000
--- a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusAdminBundle/Channel/_form.html.twig
+++ /dev/null
@@ -1,93 +0,0 @@
-{{ form_errors(form) }}
-<div class="ui two column stackable grid">
-    <div class="column">
-        <h4 class="ui top attached large header">{{ 'sylius.ui.general'|trans }}</h4>
-        <div class="ui attached segment">
-            {{ form_errors(form) }}
-            <div class="fields">
-                <div class="six wide field">
-                    {{ form_row(form.code) }}
-                </div>
-                <div class="seven wide field">
-                    {{ form_row(form.name) }}
-                </div>
-                <div class="three wide field">
-                    {{ form_row(form.color) }}
-                </div>
-            </div>
-            <div class="ui hidden divider"></div>
-            {{ form_row(form.enabled) }}
-        </div>
-        <div class="ui attached segment">
-            <div class="field">
-                {{ form_label(form.hostname) }}
-                <div class="ui labeled input">
-                    <div class="ui label">http://</div>
-                    {{ form_widget(form.hostname) }}
-                </div>
-                {{ form_errors(form.hostname) }}
-            </div>
-            {{ form_row(form.contactEmail) }}
-            {{ form_row(form.description, {'attr': {'rows' : '3'}}) }}
-        </div>
-        <div class="ui attached segment">
-            {{ form_row(form.countries) }}
-        </div>
-        <div class="ui hidden divider"></div>
-        <h4 class="ui top attached large header">{{ 'sylius.ui.money'|trans }}</h4>
-        <div class="ui attached segment">
-            <div class="two fields">
-                {{ form_row(form.baseCurrency) }}
-                {{ form_row(form.currencies) }}
-            </div>
-        </div>
-        <div class="ui attached segment">
-            {{ form_row(form.defaultTaxZone) }}
-            {{ form_row(form.taxCalculationStrategy) }}
-        </div>
-    </div>
-    <div class="column">
-        <h4 class="ui top attached large header">{{ form_label(form.shopBillingData) }}</h4>
-        <div class="ui attached segment">
-            <div class="two fields">
-                {{ form_row(form.shopBillingData.company) }}
-                {{ form_row(form.shopBillingData.taxId) }}
-            </div>
-            <div class="two fields">
-                {{ form_row(form.shopBillingData.countryCode) }}
-                {{ form_row(form.shopBillingData.street) }}
-            </div>
-            <div class="two fields">
-                {{ form_row(form.shopBillingData.city) }}
-                {{ form_row(form.shopBillingData.postcode) }}
-            </div>
-        </div>
-        <div class="ui hidden divider"></div>
-        <h4 class="ui top attached large header">{{ 'sylius.ui.look_and_feel'|trans }}</h4>
-        <div class="ui attached segment">
-            {{ form_row(form.themeName) }}
-        </div>
-        <div class="ui attached segment">
-            {{ form_row(form.locales) }}
-            {{ form_row(form.defaultLocale) }}
-        </div>
-        <div class="ui attached segment">
-            {{ form_row(form.menuTaxon) }}
-        </div>
-        <div class="ui hidden divider"></div>
-        <div id="nedac-sylius-minimum-order-value-plugin-admin-before" class="ui attached segment">
-            {{ form_row(form.skippingShippingStepAllowed) }}
-            {{ form_row(form.skippingPaymentStepAllowed) }}
-            {{ form_row(form.accountVerificationRequired) }}
-        </div>
-        {% if form.minimumOrderValue is defined %}
-            <div id="nedac-sylius-minimum-order-value-plugin-admin-segment" class="ui segment">
-                {{ form_row(form.minimumOrderValue) }}
-                <div class="ui toggle checkbox">
-                    <input id="nedac-sylius-minimum-order-value-plugin-admin-toggle" type="checkbox" name="public">
-                    <label>{{ 'nedac_sylius_minimum_order_value_plugin.ui.enabled'|trans }}</label>
-                </div>
-            </div>
-        {% endif %}
-    </div>
-</div>
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
deleted file mode 100644
index 1a69d0fd..00000000
--- a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
-
-{% set minimumOrderValue = cart.channel.minimumOrderValue %}
-{% set total = sylius_order_items_subtotal(cart) %}
-
-{% if total >= minimumOrderValue %}
-    {% set buttonClass = "ui huge primary fluid labeled icon button" %}
-{% else %}
-    {% set buttonClass = "ui huge primary fluid labeled icon button disabled" %}
-    {% set formattedMinimum = money.convertAndFormat(minimumOrderValue) %}
-    {% set formattedDifference = money.convertAndFormat(minimumOrderValue - total) %}
-    <div class="ui icon negative message">
-        <i class="warning icon"></i>
-        <div class="content">
-            <div class="header">{{ 'nedac_sylius_minimum_order_value_plugin.ui.attention'|trans }}</div>
-            <p id="nedac-sylius-minimum-order-value-plugin-message" {{ sylius_test_html_attribute('minimum-order-value-plugin-message') }}>{{ 'nedac_sylius_minimum_order_value_plugin.ui.minimum_not_yet_reached'|trans({ '%minimumOrderValue% ': formattedMinimum, '%difference%': formattedDifference })|raw('br') }}</p>
-        </div>
-    </div>
-{% endif %}
-<a href="{{ path('sylius_shop_checkout_start') }}" class="{{ buttonClass }}" id="nedac-checkout-button" {{ sylius_test_html_attribute('checkout-button') }}><i class="check icon"></i> {{ 'sylius.ui.checkout'|trans }}</a>
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
deleted file mode 100644
index 96f6b88b..00000000
--- a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
-
-{% set minimumOrderValue = cart.channel.minimumOrderValue %}
-{% set total = sylius_order_items_subtotal(cart) %}
-
-{% if cart.empty %}
-    {{ 'sylius.ui.your_cart_is_empty'|trans }}.
-{% else %}
-    <div class="ui list">
-        {% for item in cart.items %}
-            <div class="item">{{ item.quantity }} x <strong>{{ item.product }}</strong> {{ money.convertAndFormat(item.unitPrice) }}</div>
-        {% endfor %}
-        <div class="item"><strong>{{ 'sylius.ui.subtotal'|trans }}</strong>: {{ money.convertAndFormat(cart.itemsTotal) }}</div>
-    </div>
-    <a href="{{ path('sylius_shop_cart_summary') }}" class="ui fluid basic text button">{{ 'sylius.ui.view_and_edit_cart'|trans }}</a>
-    {% if total >= minimumOrderValue %}
-        <div class="ui divider"></div>
-        <a href="{{ path('sylius_shop_checkout_start') }}" class="ui fluid primary button">{{ 'sylius.ui.checkout'|trans }}</a>
-    {% endif %}
-{% endif %}
diff --git a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig b/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig
deleted file mode 100644
index 2ca25ac8..00000000
--- a/nedac/sylius-minimum-order-value-plugin/1.0/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="sylius-cart-button" class="ui circular cart button" {{ sylius_test_html_attribute('cart-button') }}>
-    {{ sylius_template_event('sylius.shop.cart.widget.button', {'cart': cart}) }}
-</div>
-<div class="ui large flowing cart hidden popup" id="nedac-sylius-minimum-order-value-plugin-popup" {{ sylius_test_html_attribute('widget-popup') }}>
-    {{ sylius_template_event('sylius.shop.cart.widget.popup', {'cart': cart}) }}
-</div>